libxtrans mesa pixman xkeyboard-config git update 31 jan 2013

libxtrans: bd53f4c8543faf910a7a151241ee07661b4d57ad
mesa: a527b2192e3cb4a68af927ab405e38181d2fcf75
pixman: 958bd334b3c17f529c80f2eeef4224f45c62f292
xkeyboard-config: 46cfd7a3b5c6b6e00648407bd4c0dd56ae86d65a

49 files changed, 21348 insertions, 13775 deletions

diff --git a/X11/xtrans/doc/xtrans.xml b/X11/xtrans/doc/xtrans.xml
index 12dbe3c7f..59daa3fc0 100644
--- a/X11/xtrans/doc/xtrans.xml
+++ b/X11/xtrans/doc/xtrans.xml
@@ -24,7 +24,7 @@
      </othercredit>
    </authorgroup>
    <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
-   <releaseinfo>Version 0.7</releaseinfo>
+   <releaseinfo>Version 1.2</releaseinfo>
    <copyright><year>1993</year><year>1994</year>
      <holder>NCR Corporation - Dayton, Ohio, USA</holder>
    </copyright>
@@ -378,7 +378,8 @@ provide a more familiar interface that can be used to port existing code.
 <para>
 A macro is defined in Xtrans.h for TRANS(func) that creates a unique function
 name depending on where the code is compiled. For example, when built for
-Xlib, TRANS(OpenCOTSClient) becomes <function>_X11TransOpenCOTSClient</function>.
+Xlib, <function>TRANS(OpenCOTSClient)</function> becomes
+<function>_X11TransOpenCOTSClient</function>.
 </para>
 <para>
 All failures are considered fatal, and the connection should be closed
@@ -389,64 +390,85 @@ errno will be available for debugging purposes.
 <title>Core Interface API</title>
 <itemizedlist mark='bullet'>
   <listitem>
-    <para>
-XtransConnInfo TRANS(OpenCOTSClient)(char *address)
-    </para>
+    <funcsynopsis id='TRANSOpenCOTSClient'>
+      <funcprototype>
+        <funcdef>XtransConnInfo <function>TRANS(OpenCOTSClient)</function></funcdef>
+        <paramdef>char *<parameter>address</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function creates a Connection-Oriented Transport that is
 suitable for use by a client. The parameter <parameter>address</parameter>
-contains the full address of the server to which this endpoint will be connected.  This
-functions returns an opaque transport connection object on success, or
-NULL on failure.
+contains the full address of the server to which this endpoint will be
+connected.  This function returns an opaque transport connection object on
+success, or <constant>NULL</constant> on failure.
     </para>
   </listitem>
   <listitem>
-    <para>
-XtransConnInfo TRANS(OpenCOTSServer)(char *address)
-    </para>
+    <funcsynopsis id='TRANSOpenCOTSServer'>
+      <funcprototype>
+        <funcdef>XtransConnInfo <function>TRANS(OpenCOTSServer)</function></funcdef>
+        <paramdef>char *<parameter>address</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function creates a Connection-Oriented Transport that is suitable
 for use by a server. The parameter <parameter>address</parameter> contains the
-full address to which this server will be bound. This functions returns an opaque
-transport connection object on success, or NULL on failure.
+full address to which this server will be bound. This function returns an
+opaque transport connection object on success, or <constant>NULL</constant>
+on failure.
     </para>
   </listitem>
   <listitem>
-    <para>
-XtransConnInfo TRANS(OpenCLTSClient)(char *address)
-    </para>
+    <funcsynopsis id='TRANSOpenCLTSClient'>
+      <funcprototype>
+        <funcdef>XtransConnInfo <function>TRANS(OpenCLTSClient)</function></funcdef>
+        <paramdef>char *<parameter>address</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function creates a Connection-Less Transport that is suitable for
 use by a client. The parameter <parameter>address</parameter> contains the
-full address of the server to which this endpoint will be connected. This functions
-returns an opaque transport connection object on success, or NULL on failure.
+full address of the server to which this endpoint will be connected. This
+function returns an opaque transport connection object on success, or
+<constant>NULL</constant> on failure.
     </para>
   </listitem>
   <listitem>
-    <para>
-XtransConnInfo TRANS(OpenCLTSServer)(char *address)
-    </para>
+    <funcsynopsis id='TRANSOpenCLTSServer'>
+      <funcprototype>
+        <funcdef>XtransConnInfo <function>TRANS(OpenCLTSServer)</function></funcdef>
+        <paramdef>char *<parameter>address</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function creates a Connection-Less Transport that is suitable for
 use by a server. The parameter <parameter>address</parameter> contains the
-full address to which this server will be bound. This functions returns an opaque
-transport connection object on success, or NULL on failure.
+full address to which this server will be bound. This function returns an
+opaque transport connection object on success, or <constant>NULL</constant>
+on failure.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(SetOption)(XtransConnInfo connection, int option, int arg)
-    </para>
+    <funcsynopsis id='TRANSSetOption'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(SetOption)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+        <paramdef>int <parameter>option</parameter></paramdef>
+        <paramdef>int <parameter>arg</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function sets transport options, similar to the way
 <function>setsockopt()</function> and <function>ioctl()</function> work.
 The parameter <parameter>connection</parameter> is an endpoint
-that was obtained from _XTransOpen*() functions. The parameter
-<parameter>option</parameter> contains the option that will be set. The actual
-values for option are defined in a later section. The parameter
-<parameter>arg</parameter> can be used to pass in an additional value that may
-be required by some options. This function return 0 on
-success and -1 on failure.
+that was obtained from <function>_XTransOpen*()</function> functions.
+The parameter <parameter>option</parameter> contains the option that will
+be set. The actual values for <parameter>option</parameter> are defined in a
+<link linkend='Transport_Option_Definition'>later section</link>.
+The parameter <parameter>arg</parameter> can be used to pass
+in an additional value that may be required by some options.
+This function returns 0 on success and -1 on failure.
     </para>
     <note><para>
 Based on current usage, the complimentary function
@@ -454,16 +476,21 @@ Based on current usage, the complimentary function
     </para></note>
   </listitem>
   <listitem>
-    <para>
-int TRANS(CreateListener)(XtransConnInfo connection, char *port, int flags)
-    </para>
+    <funcsynopsis id='TRANSCreateListener'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(CreateListener)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+        <paramdef>char *<parameter>port</parameter></paramdef>
+        <paramdef>int <parameter>flags</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function sets up the server endpoint for listening. The parameter
 <parameter>connection</parameter> is an endpoint that was obtained from
 <function>TRANS(OpenCOTSServer)()</function> or
 <function>TRANS(OpenCLTSServer)()</function>. The parameter
-<parameter>port</parameter> specifies the
-port to which this endpoint should be bound for listening. If port is NULL,
+<parameter>port</parameter> specifies the port to which this endpoint
+should be bound for listening. If port is <constant>NULL</constant>,
 then the transport may attempt to allocate any available TSAP for this
 connection. If the transport cannot support this, then this function will
 return a failure. The <parameter>flags</parameter> parameter can be set
@@ -474,9 +501,12 @@ function itself to fail. This function return 0 on success and -1 on failure.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(ResetListener)(XtransConnInfo connection)
-    </para>
+    <funcsynopsis id='TRANSResetListener'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(ResetListener)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 When a server is restarted, certain listen ports may need to be reset.
 For example, unix domain needs to check that the file used for
@@ -491,44 +521,61 @@ This function will return one of the following values:
     </para>
   </listitem>
   <listitem>
-    <para>
-XtransConnInfo TRANS(Accept)(XtransConnInfo connection)
-    </para>
+    <funcsynopsis id='TRANSAccept'>
+      <funcprototype>
+        <funcdef>XtransConnInfo <function>TRANS(Accept)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 Once a connection indication is received, this function can be called to
 accept the connection. The parameter <parameter>connection</parameter> is
 an opened and bound endpoint that was obtained from
 <function>TRANS(OpenCOTSServer)()</function> and passed to
 <function>TRANS(CreateListener)()</function>. This function will return a
-new opaque transport connection object upon success, NULL otherwise.
+new opaque transport connection object upon success,
+<constant>NULL</constant> otherwise.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(Connect)(XtransConnInfo connection, char *address)
-    </para>
+    <funcsynopsis id='TRANSConnect'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(Connect)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+        <paramdef>char *<parameter>address</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function creates a connection to a server. The parameter
 <parameter>connection</parameter> is an endpoint that was obtained
 from <function>TRANS(OpenCOTSClient)()</function>. The parameter
 <parameter>address</parameter> specifies the TSAP to which this endpoint
-should connect. If the
-protocol is included in the address, it will be ignored. This function
-return 0 on success and -1 on failure.
+should connect. If the protocol is included in the address, it will be
+ignored. This function returns 0 on success and -1 on failure.
     </para>
   </listitem>
   <listitem>
+    <funcsynopsis id='TRANSBytesReadable'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(BytesReadable)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+        <paramdef>BytesReadable_t *<parameter>pend</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
-int TRANS(BytesReadable)(XtransConnInfo connection, BytesReadable_t *pend);
-    </para>
-    <para>
-This function provides the same functionality as the BytesReadable macro.
+This function provides the same functionality as the
+<function>BytesReadable</function> macro.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(Read)(XtransConnInfo connection, char *buf, int size)
-    </para>
+    <funcsynopsis id='TRANSRead'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(Read)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+        <paramdef>char *<parameter>buf</parameter></paramdef>
+        <paramdef>int <parameter>size</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function will return the number of bytes requested on a COTS
 connection, and will return the minimum of the number bytes requested or
@@ -536,34 +583,52 @@ the size of the incoming packet on a CLTS connection.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(Write)(XtransConnInfo connection, char *buf, int size)
-    </para>
+    <funcsynopsis id='TRANSWrite'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(Write)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+        <paramdef>char *<parameter>buf</parameter></paramdef>
+        <paramdef>int <parameter>size</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function will write the requested number of bytes on a COTS
 connection, and will send a packet of the requested size on a CLTS connection.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(Readv)(XtransConnInfo connection, struct iovec *buf, int size)
-    </para>
+    <funcsynopsis id='TRANSReadv'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(Readv)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+        <paramdef>struct iovec *<parameter>buf</parameter></paramdef>
+        <paramdef>int <parameter>size</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 Similar to <function>TRANS(Read)()</function>.
     </para>
   </listitem>
   <listitem>
-    <para>
-  int TRANS(Writev)(XtransConnInfo connection, struct iovec *buf, int size)
-    </para>
+    <funcsynopsis id='TRANSWritev'>
+      <funcprototype>
+        <funcdef>  int <function>TRANS(Writev)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+        <paramdef>struct iovec *<parameter>buf</parameter></paramdef>
+        <paramdef>int <parameter>size</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 Similar to <function>TRANS(Write)()</function>.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(Disconnect)(XtransConnInfo connection)
-    </para>
+    <funcsynopsis id='TRANSDisconnect'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(Disconnect)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function is used when an orderly disconnect is desired. This function
 breaks the connection on the transport. It is similar to the socket function
@@ -571,9 +636,12 @@ breaks the connection on the transport. It is similar to the socket function
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(Close)(XtransConnInfo connection)
-    </para>
+    <funcsynopsis id='TRANSClose'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(Close)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function closes the transport, unbinds it, and frees all resources that
 was associated with the transport. If a <function>TRANS(Disconnect)</function>
@@ -581,58 +649,75 @@ call was not made on the connection, a disorderly disconnect may occur.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(IsLocal)(XtransConnInfo connection)
-    </para>
+    <funcsynopsis id='TRANSIsLocal'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(IsLocal)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 Returns TRUE if it is a local transport.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(GetMyAddr)(XtransConnInfo connection, int *familyp, int *addrlenp,
-Xtransaddr **addrp)
-    </para>
-    <para>
-This function is similar to
-<function>getsockname()</function>.
+    <funcsynopsis id='TRANSGetMyAddr'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(GetMyAddr)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+        <paramdef>int *<parameter>familyp</parameter></paramdef>
+        <paramdef>int *<parameter>addrlenp</parameter></paramdef>
+        <paramdef>Xtransaddr **<parameter>addrp</parameter></paramdef>
+       </funcprototype>
+    </funcsynopsis>
+    <para>
+This function is similar to <function>getsockname()</function>.
 This function will allocate space for the address, so it must be freed by
 the caller. Not all transports will have a valid address until a connection
 is established.  This function should not be used until the connection is
-established with
-<function>Connect()</function> or
+established with <function>Connect()</function> or
 <function>Accept()</function>.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(GetPeerAddr)(XtransConnInfo connection, int *familyp, int *addrlenp,
-Xtransaddr **addrp)
-    </para>
-    <para>
-This function is similar to
-<function>getpeername()</function>.
+    <funcsynopsis id='TRANSGetPeerAddr'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(GetPeerAddr)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+        <paramdef>int *<parameter>familyp</parameter></paramdef>
+        <paramdef>int *<parameter>addrlenp</parameter></paramdef>
+        <paramdef>Xtransaddr **<parameter>addrp</parameter></paramdef>
+       </funcprototype>
+    </funcsynopsis>
+    <para>
+This function is similar to <function>getpeername()</function>.
 This function will allocate space for the address, so it must be freed by
 the caller. Not all transports will have a valid address until a connection
 is established.  This function should not be used until the connection is
-established with
-<function>Connect()</function> or
+established with <function>Connect()</function> or
 <function>Accept()</function>.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(GetConnectionNumber)(XtransConnInfo connection)
-    </para>
+    <funcsynopsis id='TRANSGetConnectionNumber'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(GetConnectionNumber)</function></funcdef>
+        <paramdef>XtransConnInfo <parameter>connection</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 Returns the file descriptor associated with this transport.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(MakeAllCOTSServerListeners)(char *port, int *partial_ret,
-int *count_ret, XtransConnInfo **connections_ret)
-    </para>
+    <funcsynopsis id='TRANSMakeAllCOTSServerListeners'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(MakeAllCOTSServerListeners)</function></funcdef>
+        <paramdef>char *<parameter>port</parameter></paramdef>
+        <paramdef>int *<parameter>partial_ret</parameter></paramdef>
+        <paramdef>int *<parameter>count_ret</parameter></paramdef>
+        <paramdef>XtransConnInfo **<parameter>connections_ret</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function should be used by most servers. It will try to establish
 a COTS server endpoint for each transport listed in the transport table.
@@ -643,10 +728,15 @@ is the list of transports.
     </para>
   </listitem>
   <listitem>
-    <para>
-int TRANS(MakeAllCLTSServerListeners)( char *port, int *partial_ret,
-int *count_ret, XtransConnInfo **connections_ret)
-    </para>
+    <funcsynopsis id='TRANSMakeAllCLTSServerListeners'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(MakeAllCLTSServerListeners)</function></funcdef>
+        <paramdef>char *<parameter>port</parameter></paramdef>
+        <paramdef>int *<parameter>partial_ret</parameter></paramdef>
+        <paramdef>int *<parameter>count_ret</parameter></paramdef>
+        <paramdef>XtransConnInfo **<parameter>connections_ret</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function should be used by most servers. It will try to establish a
 CLTS server endpoint for each transport listed in the transport table.
@@ -668,13 +758,19 @@ convenience.
 </para>
 <itemizedlist mark='bullet'>
   <listitem>
-    <para>
-int TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr *addrp)
-    </para>
+    <funcsynopsis id='TRANSConvertAddress'>
+      <funcprototype>
+        <funcdef>int <function>TRANS(ConvertAddress)</function></funcdef>
+        <paramdef>int *<parameter>familyp</parameter></paramdef>
+        <paramdef>int *<parameter>addrlenp</parameter></paramdef>
+        <paramdef>Xtransaddr *<parameter>addrp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function converts a sockaddr based address to an X authorization based
-address (ie AF_INET, AF_UNIX to the X protocol definition (ie FamilyInternet,
-FamilyLocal)).
+address (ie <symbol>AF_INET</symbol>, <symbol>AF_UNIX</symbol> to the X
+protocol definition (ie <symbol>FamilyInternet</symbol>,
+<symbol>FamilyLocal</symbol>)).
     </para>
   </listitem>
 </itemizedlist>
@@ -685,8 +781,8 @@ FamilyLocal)).
 <title>Transport Option Definition</title>
 <para>
 The following options are defined for the
-<function>TRANS(SetOption)()</function>
- function. If an OS or transport does not support any of these options,
+<link linkend='TRANSSetOption'><function>TRANS(SetOption)()</function></link>
+function. If an OS or transport does not support any of these options,
 then it will silently ignore the option.
 </para>
 
@@ -726,18 +822,22 @@ the <code>#ifdef SUNSYSV</code> should be handled inside these functions.
 
 <itemizedlist mark='bullet'>
   <listitem>
-    <para>
-XtransConnInfo *OpenCOTSClient (
-struct _Xtransport *thistrans, char *protocol, char *host, char *port)
-    </para>
+    <funcsynopsis id='OpenCOTSClient'>
+      <funcprototype>
+        <funcdef>XtransConnInfo *<function>OpenCOTSClient</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>char *<parameter>protocol</parameter></paramdef>
+        <paramdef>char *<parameter>host</parameter></paramdef>
+        <paramdef>char *<parameter>port</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function creates a Connection-Oriented Transport. The parameter
-<parameter>thistrans</parameter>
-points to an Xtransport entry in the transport table. The parameters
-<parameter>protocol</parameter>,
-<parameter>host</parameter>,  and
-<parameter>port</parameter>, point to strings containing the corresponding
-parts of the address that was passed into <function>TRANS(OpenCOTSClient)()</function>.
+<parameter>thistrans</parameter> points to an Xtransport entry in the
+transport table. The parameters <parameter>protocol</parameter>,
+<parameter>host</parameter>, and <parameter>port</parameter>, point to
+strings containing the corresponding parts of the address that was passed into
+<link linkend='TRANSOpenCOTSClient'><function>TRANS(OpenCOTSClient)()</function></link>.
 This function must allocate and initialize the contents of the XtransConnInfo
 structure that is returned by this function. This function will open the
 transport, and bind it into the transport namespace if applicable. The local
@@ -746,39 +846,44 @@ this function.
     </para>
   </listitem>
   <listitem>
-    <para>
-XtransConnInfo *OpenCOTSServer (
-struct _Xtransport *thistrans, char *protocol, char *host, char *port)
-    </para>
+    <funcsynopsis id='OpenCOTSServer'>
+      <funcprototype>
+        <funcdef>XtransConnInfo *<function>OpenCOTSServer</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>char *<parameter>protocol</parameter></paramdef>
+        <paramdef>char *<parameter>host</parameter></paramdef>
+        <paramdef>char *<parameter>port</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function creates a Connection-Oriented Transport. The parameter
-<parameter>thistrans</parameter>
-points to an Xtransport entry in the transport table. The
-parameters
-<parameter>protocol</parameter>,
-<parameter>host</parameter>, and
-<parameter>port</parameter> point to strings containing the
-corresponding parts of the address that was passed into
-<function>TRANS(OpenCOTSClient)()</function>.
+<parameter>thistrans</parameter> points to an Xtransport entry in the
+transport table. The parameters <parameter>protocol</parameter>,
+<parameter>host</parameter>, and <parameter>port</parameter> point to
+strings containing the corresponding parts of the address that was passed into
+<link linkend='TRANSOpenCOTSServer'><function>TRANS(OpenCOTSServer)()</function></link>.
 This function must allocate and initialize the contents of the
 XtransConnInfo structure that is returned by this function. This function
 will open the transport.
     </para>
   </listitem>
   <listitem>
-    <para>
-XtransConnInfo *OpenCLTSClient (
-struct _Xtransport *thistrans, char *protocol, char *host, char *port)
-    </para>
+    <funcsynopsis id='OpenCLTSClient'>
+      <funcprototype>
+        <funcdef>XtransConnInfo *<function>OpenCLTSClient</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>char *<parameter>protocol</parameter></paramdef>
+        <paramdef>char *<parameter>host</parameter></paramdef>
+        <paramdef>char *<parameter>port</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function creates a Connection-Less Transport. The parameter
-<parameter>thistrans</parameter>
-points to an Xtransport entry in the transport table. The parameters
-<parameter>protocol</parameter>,
-<parameter>host</parameter>, and
-<parameter>port</parameter> point to strings containing the
-corresponding parts of the address that was passed into
-<function>TRANS(OpenCOTSClient)()</function>.
+<parameter>thistrans</parameter> points to an Xtransport entry in the
+transport table. The parameters <parameter>protocol</parameter>,
+<parameter>host</parameter>, and <parameter>port</parameter> point to strings
+containing the corresponding parts of the address that was passed into
+<link linkend='TRANSOpenCLTSClient'><function>TRANS(OpenCLTSClient)()</function></link>.
 This function must allocate and initialize the contents of the XtransConnInfo
 structure that is returned by this function. This function will open the
 transport, and bind it into the transport namespace if applicable. The
@@ -787,28 +892,36 @@ in by this function.
     </para>
   </listitem>
   <listitem>
-    <para>
-XtransConnInfo *OpenCLTSServer (
-struct _Xtransport *thistrans, char *protocol, char *host, char *port)
-    </para>
+    <funcsynopsis id='OpenCLTSServer'>
+      <funcprototype>
+        <funcdef>XtransConnInfo *<function>OpenCLTSServer</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>char *<parameter>protocol</parameter></paramdef>
+        <paramdef>char *<parameter>host</parameter></paramdef>
+        <paramdef>char *<parameter>port</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function creates a Connection-Less Transport. The parameter
-<parameter>thistrans</parameter>
-points to an Xtransport entry in the transport table. The  parameters
-<parameter>protocol</parameter>,
-<parameter>host</parameter>, and
-<parameter>port</parameter> point to strings containing the
-corresponding parts of the address that was passed into
-<function>TRANS(OpenCOTSClient)()</function>.
+<parameter>thistrans</parameter> points to an Xtransport entry in the
+transport table. The parameters <parameter>protocol</parameter>,
+<parameter>host</parameter>, and <parameter>port</parameter> point to strings
+containing the corresponding parts of the address that was passed into
+<link linkend='TRANSOpenCLTSServer'><function>TRANS(OpenCLTSServer)()</function></link>.
 This function must allocate and initialize the contents of the
 XtransConnInfo structure that is returned by this function. This
 function will open the transport.
     </para>
   </listitem>
   <listitem>
-    <para>
-int SetOption (struct _Xtransport *thistrans, int option, int arg)
-    </para>
+    <funcsynopsis id='SetOption'>
+      <funcprototype>
+        <funcdef>int <function>SetOption</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>int <parameter>option</parameter></paramdef>
+        <paramdef>int <parameter>arg</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function provides a transport dependent way of implementing the
 options defined by the X Transport Interface. In the current prototype,
@@ -818,9 +931,14 @@ different transport type is added, or a transport dependent option is defined.
     </para>
   </listitem>
   <listitem>
-    <para>
-int CreateListener (struct _Xtransport *thistrans, char *port, int flags )
-    </para>
+    <funcsynopsis id='CreateListener'>
+      <funcprototype>
+        <funcdef>int <function>CreateListener</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>char <parameter>*port</parameter></paramdef>
+        <paramdef>int <parameter>flags</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function takes a transport endpoint opened for a server, and sets it
 up to listen for incoming connection requests. The parameter
@@ -838,17 +956,23 @@ listen for incoming connection requests.
     </para>
   </listitem>
   <listitem>
-    <para>
-int ResetListener (struct _Xtransport *thistrans)
-    </para>
+    <funcsynopsis id='ResetListener'>
+      <funcprototype>
+        <funcdef>int <function>ResetListener</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function resets the transport for listening.
     </para>
   </listitem>
   <listitem>
-    <para>
- XtransConnInfo Accept(struct _Xtransport *thistrans)
-    </para>
+    <funcsynopsis id='Accept'>
+      <funcprototype>
+        <funcdef> XtransConnInfo <function>Accept</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function creates a new transport endpoint as a result of an
 incoming connection request. The parameter
@@ -859,13 +983,17 @@ structure describing the new endpoint is returned from this function
     </para>
   </listitem>
   <listitem>
-    <para>
-int Connect(struct _Xtransport *thistrans, char *host, char *port )
-    </para>
+    <funcsynopsis id='Connect'>
+      <funcprototype>
+        <funcdef>int <function>Connect</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>char *<parameter>host</parameter></paramdef>
+        <paramdef>char *<parameter>port</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function establishes a connection to a server. The parameters
-<parameter>host</parameter>  and
-<parameter>port</parameter>
+<parameter>host</parameter> and <parameter>port</parameter>
 describe the server to which the connection should be
 established. The connection will be established so that
 <function>Read()</function> and
@@ -873,52 +1001,80 @@ established. The connection will be established so that
     </para>
   </listitem>
   <listitem>
-    <para>
-int BytesReadable(struct _Xtransport *thistrans, BytesReadable_t *pend )
-    </para>
-    <para>
-This function replaces the
-<function>BytesReadable()</function>
-macro. This allows each transport to have it’s own mechanism for determining
+    <funcsynopsis id='BytesReadable'>
+      <funcprototype>
+        <funcdef>int <function>BytesReadable</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>BytesReadable_t *<parameter>pend</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <para>
+This function replaces the <function>BytesReadable()</function>
+macro. This allows each transport to have its own mechanism for determining
 how much data is ready to be read.
     </para>
   </listitem>
   <listitem>
-    <para>
-int Read(struct _Xtransport *thistrans, char *buf, int size )
-    </para>
-    <para>
-This function reads size bytes into buf from the connection.
+    <funcsynopsis id='Read'>
+      <funcprototype>
+        <funcdef>int <function>Read</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>char *<parameter>buf</parameter></paramdef>
+        <paramdef>int <parameter>size</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <para>
+This function reads <parameter>size</parameter> bytes into
+<parameter>buf</parameter> from the connection.
     </para>
   </listitem>
   <listitem>
-    <para>
-int Write(struct _Xtransport *thistrans, char *buf, int size )
-    </para>
-    <para>
-This function writes size bytes from buf to the connection.
+    <funcsynopsis id='Write'>
+      <funcprototype>
+        <funcdef>int <function>Write</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>char *<parameter>buf</parameter></paramdef>
+        <paramdef>int <parameter>size</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+    <para>
+This function writes <parameter>size</parameter> bytes from
+<parameter>buf</parameter> to the connection.
     </para>
   </listitem>
   <listitem>
-    <para>
-int Readv(struct _Xtransport *thistrans, struct iovec *buf, int size )
-    </para>
+    <funcsynopsis id='Readv'>
+      <funcprototype>
+        <funcdef>int <function>Readv</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>struct iovec *<parameter>buf</parameter></paramdef>
+        <paramdef>int <parameter>size</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function performs a <function>readv()</function> on the connection.
     </para>
   </listitem>
   <listitem>
-    <para>
-int Writev(struct _Xtransport *thistrans, struct iovec *buf, int size )
-    </para>
+    <funcsynopsis id='Writev'>
+      <funcprototype>
+        <funcdef>int <function>Writev</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+        <paramdef>struct iovec *<parameter>buf</parameter></paramdef>
+        <paramdef>int <parameter>size</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function performs a <function>writev()</function> on the connection.
     </para>
   </listitem>
   <listitem>
-    <para>
-int Disconnect(struct _Xtransport *thistrans)
-    </para>
+    <funcsynopsis id='Disconnect'>
+      <funcprototype>
+        <funcdef>int <function>Disconnect</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function initiates an orderly shutdown of a connection. If a
 transport does not distinguish between orderly and disorderly
@@ -926,9 +1082,12 @@ disconnects, then a call to this function will have no affect.
     </para>
   </listitem>
   <listitem>
-    <para>
-int Close(struct _Xtransport *thistrans)
-    </para>
+    <funcsynopsis id='Close'>
+      <funcprototype>
+        <funcdef>int <function>Close</function></funcdef>
+        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
     <para>
 This function will break the connection, and close the endpoint.
     </para>
@@ -1100,11 +1259,7 @@ All functions names in the source are of the format
 <function>TRANS()</function>
 macro is defined as
 <programlisting language="C">
-#if (__STDC__ &amp;&amp; !defined(UNIXCPP)) || defined(ANSICPP)
 #define TRANS(func) _PROTOCOLTrans##func
-#else
-#define TRANS(func) _PROTOCOLTrans/**/func
-#endif
 </programlisting>
 </para>
 
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 9cc5c4ae5..564ca3ccf 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -57,10 +57,10 @@ LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
 AX_PROG_BISON([],
-              AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"]
+              AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"],
                     [AC_MSG_ERROR([bison not found - unable to compile glcpp-parse.y])]))
 AX_PROG_FLEX([],
-             AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-lex.c"]
+             AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-lex.c"],
                    [AC_MSG_ERROR([flex not found - unable to compile glcpp-lex.l])]))
 
 AC_PATH_PROG([PERL], [perl])
@@ -1834,14 +1834,12 @@ if test "x$with_gallium_drivers" != x; then
             if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then
                 radeon_llvm_check
                 NEED_RADEON_GALLIUM=yes;
-                LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo"
+                R600_NEED_RADEON_GALLIUM=yes;
+                LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo bitreader asmparser"
             fi
             if test "x$enable_r600_llvm" = xyes; then
                 USE_R600_LLVM_COMPILER=yes;
             fi
-            if test "x$enable_opencl" = xyes -a "x$with_llvm_shared_libs" = xno; then
-                LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser"
-            fi
             gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600"
             ;;
         xradeonsi)
@@ -1990,6 +1988,7 @@ AM_CONDITIONAL(HAVE_GALAHAD_GALLIUM, test x$HAVE_GALAHAD_GALLIUM = xyes)
 AM_CONDITIONAL(HAVE_IDENTITY_GALLIUM, test x$HAVE_IDENTITY_GALLIUM = xyes)
 AM_CONDITIONAL(HAVE_NOOP_GALLIUM, test x$HAVE_NOOP_GALLIUM = xyes)
 AM_CONDITIONAL(NEED_RADEON_GALLIUM, test x$NEED_RADEON_GALLIUM = xyes)
+AM_CONDITIONAL(R600_NEED_RADEON_GALLIUM, test x$R600_NEED_RADEON_GALLIUM = xyes)
 AM_CONDITIONAL(USE_R600_LLVM_COMPILER, test x$USE_R600_LLVM_COMPILER = xyes)
 AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes)
 AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes)
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 21c37c008..88621e330 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -149,7 +149,7 @@ ARB_robust_buffer_access_behavior                    not started
 ARB_shader_image_size                                not started
 ARB_shader_storage_buffer_object                     not started
 ARB_stencil_texturing                                not started
-ARB_texture_buffer_range                             not started
+ARB_texture_buffer_range                             DONE (nv50, nvc0)
 ARB_texture_query_levels                             not started
 ARB_texture_storage_multisample                      not started
 ARB_texture_view                                     not started
diff --git a/mesalib/docs/relnotes-9.1.html b/mesalib/docs/relnotes-9.1.html
index ffca27539..350ae2766 100644
--- a/mesalib/docs/relnotes-9.1.html
+++ b/mesalib/docs/relnotes-9.1.html
@@ -44,9 +44,18 @@ Note: some of the new features are only available with certain drivers.
 </p>
 
 <ul>
+<li>GL_ANGLE_texture_compression_dxt3</li>
+<li>GL_ANGLE_texture_compression_dxt5</li>
+<li>GL_ARB_ES3_compatibility</li>
+<li>GL_ARB_internalformat_query</li>
 <li>GL_ARB_map_buffer_alignment</li>
-<li>GL_ARB_texture_cube_map_array</li>
+<li>GL_ARB_shading_language_packing</li>
 <li>GL_ARB_texture_buffer_object_rgb32</li>
+<li>GL_ARB_texture_cube_map_array</li>
+<li>GL_EXT_color_buffer_float</li>
+<li>GL_OES_depth_texture_cube_map</li>
+<li>OpenGL 3.1 core profile support on Radeon HD2000 up to HD6000 series </li>
+<li>Multisample anti-aliasing support on Radeon X1000 series</li>
 </ul>
 
 
diff --git a/mesalib/docs/vmware-guest.html b/mesalib/docs/vmware-guest.html
index ac5f03c9c..b5f136f33 100644
--- a/mesalib/docs/vmware-guest.html
+++ b/mesalib/docs/vmware-guest.html
@@ -29,6 +29,7 @@ MacOS are all supported.
 <p>
 End users shouldn't have to go through all these steps once the driver is
 included in newer Linux distributions.
+Fedora 18 and Ubuntu 12.10 include the VMware guest GL driver, for example.
 </p>
 
 <p>
@@ -162,6 +163,22 @@ Then
   sudo cp 00-vmwgfx.rules /etc/udev/rules.d
   sudo depmod -ae
   </pre>
+
+Note: some distros put DRM kernel drivers in different directories.
+For example, sometimes vmwgfx.ko might be found in
+<code>/lib/modules/{version}/extra/vmwgfx.ko</code> or in
+<code>/lib/modules/{version}/kernel/drivers/gpu/drm/vmwgfx/vmwgfx.ko</code>.
+<p>
+After installing vmwgfx.ko you might want to run the following command to
+check that the new kernel module is in the expected place:
+<pre>
+  find /lib/modules -name vmwgfx.ko -exec ls -l '{}' \;
+</pre>
+If you see the kernel module listed in more than one place, you may need to
+move things around.
+<p>
+Finally, if you update your kernel you'll probably have to rebuild and
+reinstall the vmwgfx.ko module again.
 </ul>
 
 
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_range.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_range.xml
new file mode 100644
index 000000000..2176c08ef
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_range.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_texture_buffer_range" number="139">
+
+    <enum name="TEXTURE_BUFFER_OFFSET"                  value="0x919D"/>
+    <enum name="TEXTURE_BUFFER_SIZE"                    value="0x919E"/>
+    <enum name="TEXTURE_BUFFER_OFFSET_ALIGNMENT"        value="0x919F"/>
+
+    <function name="TexBufferRange" offset="assign">
+        <param name="target" type="GLenum"/>
+        <param name="internalformat" type="GLenum"/>
+        <param name="buffer" type="GLuint"/>
+        <param name="offset" type="GLintptr"/>
+        <param name="size" type="GLsizeiptr"/>
+    </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index f869d28e5..4d51bbca6 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -108,6 +108,7 @@ API_XML = \
 	ARB_seamless_cube_map.xml \
 	ARB_sync.xml \
 	ARB_texture_buffer_object.xml \
+	ARB_texture_buffer_range.xml \
 	ARB_texture_compression_rgtc.xml \
 	ARB_texture_float.xml \
 	ARB_texture_rg.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 404ccea8e..4cbd72462 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8316,6 +8316,10 @@
 
 <xi:include href="ARB_invalidate_subdata.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<!-- ARB extensions #133...#138 -->
+
+<xi:include href="ARB_texture_buffer_range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!-- Non-ARB extensions sorted by extension number. -->
 
 <category name="GL_EXT_blend_color" number="2">
diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.c b/mesalib/src/mesa/drivers/common/driverfuncs.c
index cf6b686dd..aab61e1a4 100644
--- a/mesalib/src/mesa/drivers/common/driverfuncs.c
+++ b/mesalib/src/mesa/drivers/common/driverfuncs.c
@@ -75,7 +75,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->UpdateState = NULL;  /* REQUIRED! */
    driver->GetBufferSize = NULL;  /* REQUIRED! */
    driver->ResizeBuffers = _mesa_resize_framebuffer;
-   driver->Error = NULL;
 
    driver->Finish = NULL;
    driver->Flush = NULL;
diff --git a/mesalib/src/mesa/main/APIspec.dtd b/mesalib/src/mesa/main/APIspec.dtd
deleted file mode 100644
index efcfa31f1..000000000
--- a/mesalib/src/mesa/main/APIspec.dtd
+++ /dev/null
@@ -1,52 +0,0 @@
-<!ELEMENT apispec (template|api)+>
-
-<!ELEMENT api (category*, function*)>
-<!ELEMENT category EMPTY>
-<!ELEMENT function EMPTY>
-
-<!ELEMENT template (proto, desc*)>
-<!ELEMENT proto (return, (param|vector)*)>
-<!ELEMENT return EMPTY>
-<!ELEMENT param EMPTY>
-<!ELEMENT vector (param*)>
-<!ELEMENT desc ((value|range)*, desc*)>
-<!ELEMENT value EMPTY>
-<!ELEMENT range EMPTY>
-
-<!ATTLIST api      name                NMTOKEN #REQUIRED
-                   implementation      (true | false) "false">
-<!ATTLIST category name                NMTOKEN #REQUIRED>
-<!ATTLIST function name                NMTOKEN #REQUIRED
-                   default_prefix      NMTOKEN "_mesa_"
-                   external            (true | false) "false"
-                   template            NMTOKEN #REQUIRED
-                   gltype              CDATA #IMPLIED
-                   vector_size         NMTOKEN #IMPLIED
-                   expand_vector       (true | false) "false"
-                   skip_desc           (true | false) "false">
-
-<!ATTLIST template name                NMTOKEN #REQUIRED
-                   direction           (set | get) "set">
-
-<!ATTLIST return   type                CDATA #REQUIRED>
-<!ATTLIST param    name                NMTOKEN #REQUIRED
-                   type                CDATA #REQUIRED
-                   hide_if_expanded    (true | false) "false"
-                   category            NMTOKEN #IMPLIED>
-<!ATTLIST vector   name                NMTOKEN #REQUIRED
-                   type                CDATA #REQUIRED
-                   size                NMTOKEN #REQUIRED
-                   category            NMTOKEN #IMPLIED>
-
-<!ATTLIST desc     name                NMTOKEN #REQUIRED
-                   vector_size         CDATA #IMPLIED
-                   convert             (true | false) #IMPLIED
-                   error               NMTOKEN "GL_INVALID_ENUM"
-                   category            NMTOKEN #IMPLIED>
-
-<!ATTLIST value    name                CDATA #REQUIRED
-                   category            NMTOKEN #IMPLIED>
-<!ATTLIST range    from                NMTOKEN #REQUIRED
-                   to                  NMTOKEN #REQUIRED
-                   base                NMTOKEN #IMPLIED
-                   category            NMTOKEN #IMPLIED>
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index 5e9e539b2..e5ed97f00 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -564,6 +564,7 @@ _mesa_init_constants(struct gl_context *ctx)
    ctx->Const.MaxTextureMaxAnisotropy = MAX_TEXTURE_MAX_ANISOTROPY;
    ctx->Const.MaxTextureLodBias = MAX_TEXTURE_LOD_BIAS;
    ctx->Const.MaxTextureBufferSize = 65536;
+   ctx->Const.TextureBufferOffsetAlignment = 1;
    ctx->Const.MaxArrayLockSize = MAX_ARRAY_LOCK_SIZE;
    ctx->Const.SubPixelBits = SUB_PIXEL_BITS;
    ctx->Const.MinPointSize = MIN_POINT_SIZE;
@@ -1663,11 +1664,6 @@ _mesa_record_error(struct gl_context *ctx, GLenum error)
    if (ctx->ErrorValue == GL_NO_ERROR) {
       ctx->ErrorValue = error;
    }
-
-   /* Call device driver's error handler, if any.  This is used on the Mac. */
-   if (ctx->Driver.Error) {
-      ctx->Driver.Error(ctx);
-   }
 }
 
 
diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index f91fd4120..9a75fd954 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -109,12 +109,6 @@ struct dd_function_table {
                           GLuint width, GLuint height);
 
    /**
-    * Called whenever an error is generated.  
-    * __struct gl_contextRec::ErrorValue contains the error value.
-    */
-   void (*Error)( struct gl_context *ctx );
-
-   /**
     * This is called whenever glFinish() is called.
     */
    void (*Finish)( struct gl_context *ctx );
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 7ae07fb5a..c9638a1af 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -131,6 +131,7 @@ static const struct extension extension_table[] = {
    { "GL_ARB_texture_border_clamp",                o(ARB_texture_border_clamp),                GLL,            2000 },
    { "GL_ARB_texture_buffer_object",               o(ARB_texture_buffer_object),               GLC,            2008 },
    { "GL_ARB_texture_buffer_object_rgb32",         o(ARB_texture_buffer_object_rgb32),         GLC,            2009 },
+   { "GL_ARB_texture_buffer_range",                o(ARB_texture_buffer_range),                GLC,            2012 },
    { "GL_ARB_texture_compression",                 o(dummy_true),                              GLL,            2000 },
    { "GL_ARB_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },
    { "GL_ARB_texture_cube_map",                    o(ARB_texture_cube_map),                    GLL,            1999 },
@@ -418,7 +419,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
    ctx->Extensions.EXT_fog_coord = GL_TRUE;
    ctx->Extensions.EXT_framebuffer_object = GL_TRUE;
    ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
-   ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
    ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
    ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
    ctx->Extensions.EXT_point_parameters = GL_TRUE;
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index 47a1d6802..1c9e63377 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -2649,7 +2649,7 @@ _mesa_format_to_type_and_comps(gl_format format,
 }
 
 /**
- * Check if a gl_format exactly matches a GL formaat/type combination
+ * Check if a gl_format exactly matches a GL format/type combination
  * such that we can use memcpy() from one to the other.
  * \param gl_format  a MESA_FORMAT_x value
  * \param format  the user-specified image format
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 5f4e2fa51..da1e01cb5 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -353,6 +353,7 @@ EXTRA_EXT(ARB_uniform_buffer_object);
 EXTRA_EXT(ARB_timer_query);
 EXTRA_EXT(ARB_map_buffer_alignment);
 EXTRA_EXT(ARB_texture_cube_map_array);
+EXTRA_EXT(ARB_texture_buffer_range);
 
 static const int
 extra_NV_primitive_restart[] = {
diff --git a/mesalib/src/mesa/main/get_hash_params.py b/mesalib/src/mesa/main/get_hash_params.py
index 26a722a87..b6bed809c 100644
--- a/mesalib/src/mesa/main/get_hash_params.py
+++ b/mesalib/src/mesa/main/get_hash_params.py
@@ -701,6 +701,12 @@ descriptor=[
 
 # GL_ARB_texture_cube_map_array
   [ "TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB", "LOC_CUSTOM, TYPE_INT, TEXTURE_CUBE_ARRAY_INDEX, extra_ARB_texture_cube_map_array" ],
+]},
+
+# Enums restricted to OpenGL Core profile
+{ "apis": ["GL_CORE"], "params": [
+# GL_ARB_texture_buffer_range
+  [ "TEXTURE_BUFFER_OFFSET_ALIGNMENT", "CONTEXT_INT(Const.TextureBufferOffsetAlignment), extra_ARB_texture_buffer_range" ],
 ]}
 
 ]
diff --git a/mesalib/src/mesa/main/glformats.c b/mesalib/src/mesa/main/glformats.c
index 6160d8ecd..8728540cf 100644
--- a/mesalib/src/mesa/main/glformats.c
+++ b/mesalib/src/mesa/main/glformats.c
@@ -1485,18 +1485,8 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
          else if (ctx->Extensions.ARB_depth_buffer_float &&
              type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV)
             return GL_NO_ERROR;
-         switch (type) {
-         case GL_BYTE:
-         case GL_UNSIGNED_BYTE:
-         case GL_SHORT:
-         case GL_UNSIGNED_SHORT:
-         case GL_INT:
-         case GL_UNSIGNED_INT:
-         case GL_FLOAT:
-            return GL_INVALID_OPERATION;
-         default:
+         else
             return GL_INVALID_ENUM;
-         }
 
       case GL_DUDV_ATI:
       case GL_DU8DV8_ATI:
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 3369623f7..b92f98e7d 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -1295,6 +1295,9 @@ struct gl_texture_object
    GLenum BufferObjectFormat;
    /** Equivalent Mesa format for BufferObjectFormat. */
    gl_format _BufferObjectFormat;
+   /** GL_ARB_texture_buffer_range */
+   GLintptr BufferOffset;
+   GLsizeiptr BufferSize; /**< if this is -1, use BufferObject->Size instead */
 
    /** GL_OES_EGL_image_external */
    GLint RequiredTextureImageUnits;
@@ -2851,6 +2854,8 @@ struct gl_constants
    GLfloat MaxTextureLodBias;        /**< GL_EXT_texture_lod_bias */
    GLuint MaxTextureBufferSize;      /**< GL_ARB_texture_buffer_object */
 
+   GLuint TextureBufferOffsetAlignment; /**< GL_ARB_texture_buffer_range */
+
    GLuint MaxArrayLockSize;
 
    GLint SubPixelBits;
@@ -3075,6 +3080,7 @@ struct gl_extensions
    GLboolean ARB_texture_border_clamp;
    GLboolean ARB_texture_buffer_object;
    GLboolean ARB_texture_buffer_object_rgb32;
+   GLboolean ARB_texture_buffer_range;
    GLboolean ARB_texture_compression_rgtc;
    GLboolean ARB_texture_cube_map;
    GLboolean ARB_texture_cube_map_array;
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 31a559e9d..f03e84ad8 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -3994,23 +3994,16 @@ validate_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
 }
 
 
-/** GL_ARB_texture_buffer_object */
-void GLAPIENTRY
-_mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
+static void
+texbufferrange(struct gl_context *ctx, GLenum target, GLenum internalFormat,
+               struct gl_buffer_object *bufObj,
+               GLintptr offset, GLsizeiptr size)
 {
    struct gl_texture_object *texObj;
-   struct gl_buffer_object *bufObj;
    gl_format format;
 
-   GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
 
-   if (!(ctx->API == API_OPENGL_CORE &&
-         ctx->Extensions.ARB_texture_buffer_object)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBuffer");
-      return;
-   }
-
    if (target != GL_TEXTURE_BUFFER_ARB) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(target)");
       return;
@@ -4023,12 +4016,6 @@ _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
       return;
    }
 
-   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
-   if (buffer && !bufObj) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBuffer(buffer %u)", buffer);
-      return;
-   }
-
    texObj = _mesa_get_current_tex_object(ctx, target);
 
    _mesa_lock_texture(ctx, texObj);
@@ -4036,6 +4023,74 @@ _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
       _mesa_reference_buffer_object(ctx, &texObj->BufferObject, bufObj);
       texObj->BufferObjectFormat = internalFormat;
       texObj->_BufferObjectFormat = format;
+      texObj->BufferOffset = offset;
+      texObj->BufferSize = size;
    }
    _mesa_unlock_texture(ctx, texObj);
 }
+
+/** GL_ARB_texture_buffer_object */
+void GLAPIENTRY
+_mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
+{
+   struct gl_buffer_object *bufObj;
+
+   GET_CURRENT_CONTEXT(ctx);
+
+   /* NOTE: ARB_texture_buffer_object has interactions with
+    * the compatibility profile that are not implemented.
+    */
+   if (!(ctx->API == API_OPENGL_CORE &&
+         ctx->Extensions.ARB_texture_buffer_object)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBuffer");
+      return;
+   }
+
+   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
+   if (!bufObj && buffer) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBuffer(buffer %u)", buffer);
+      return;
+   }
+
+   texbufferrange(ctx, target, internalFormat, bufObj, 0, buffer ? -1 : 0);
+}
+
+/** GL_ARB_texture_buffer_range */
+void GLAPIENTRY
+_mesa_TexBufferRange(GLenum target, GLenum internalFormat, GLuint buffer,
+                     GLintptr offset, GLsizeiptr size)
+{
+   struct gl_buffer_object *bufObj;
+
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!(ctx->API == API_OPENGL_CORE &&
+         ctx->Extensions.ARB_texture_buffer_range)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBufferRange");
+      return;
+   }
+
+   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
+   if (bufObj) {
+      if (offset < 0 ||
+          size <= 0 ||
+          (offset + size) > bufObj->Size) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glTexBufferRange");
+         return;
+      }
+      if (offset % ctx->Const.TextureBufferOffsetAlignment) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glTexBufferRange(invalid offset alignment)");
+         return;
+      }
+   } else if (buffer) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBufferRange(buffer %u)",
+                  buffer);
+      return;
+   } else {
+      offset = 0;
+      size = 0;
+   }
+
+   texbufferrange(ctx, target, internalFormat, bufObj, offset, size);
+}
diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h
index 65e933371..7124cac52 100644
--- a/mesalib/src/mesa/main/teximage.h
+++ b/mesalib/src/mesa/main/teximage.h
@@ -289,6 +289,10 @@ _mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset,
 extern void GLAPIENTRY
 _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer);
 
+extern void GLAPIENTRY
+_mesa_TexBufferRange(GLenum target, GLenum internalFormat, GLuint buffer,
+                     GLintptr offset, GLsizeiptr size);
+
 
 /*@}*/
 
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index 52ede13c0..b6afd35ba 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -1181,6 +1181,18 @@ get_tex_level_parameter_buffer(struct gl_context *ctx,
          *params = _mesa_get_format_bits(texFormat, pname);
          break;
 
+      /* GL_ARB_texture_buffer_range */
+      case GL_TEXTURE_BUFFER_OFFSET:
+         if (!ctx->Extensions.ARB_texture_buffer_range)
+            goto invalid_pname;
+         *params = texObj->BufferOffset;
+         break;
+      case GL_TEXTURE_BUFFER_SIZE:
+         if (!ctx->Extensions.ARB_texture_buffer_range)
+            goto invalid_pname;
+         *params = (texObj->BufferSize == -1) ? bo->Size : texObj->BufferSize;
+         break;
+
       /* GL_ARB_texture_compression */
       case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
          /* Always illegal for GL_TEXTURE_BUFFER */
diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c
index dba1d829c..4b43b2a7d 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c
@@ -152,7 +152,27 @@ st_create_texture_sampler_view_from_stobj(struct pipe_context *pipe,
    u_sampler_view_default_template(&templ,
                                    stObj->pt,
                                    format);
-   templ.u.tex.first_level = stObj->base.BaseLevel;
+
+   if (stObj->pt->target == PIPE_BUFFER) {
+      unsigned base, size;
+      unsigned f, n;
+      const struct util_format_description *desc
+         = util_format_description(templ.format);
+
+      base = stObj->base.BufferOffset;
+      if (base >= stObj->pt->width0)
+         return NULL;
+      size = MIN2(stObj->pt->width0 - base, (unsigned)stObj->base.BufferSize);
+
+      f = ((base * 8) / desc->block.bits) * desc->block.width;
+      n = ((size * 8) / desc->block.bits) * desc->block.width;
+      if (!n)
+         return NULL;
+      templ.u.buf.first_element = f;
+      templ.u.buf.last_element  = f + (n - 1);
+   } else {
+      templ.u.tex.first_level = stObj->base.BaseLevel;
+   }
 
    if (swizzle != SWIZZLE_NOOP) {
       templ.swizzle_r = GET_SWZ(swizzle, 0);
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index af54cf7c8..214588f1f 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -534,7 +534,6 @@ void st_init_extensions(struct st_context *st)
    ctx->Extensions.EXT_blend_minmax = GL_TRUE;
    ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
    ctx->Extensions.EXT_framebuffer_object = GL_TRUE;
-   ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
    ctx->Extensions.EXT_fog_coord = GL_TRUE;
    ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
    ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
@@ -653,6 +652,13 @@ void st_init_extensions(struct st_context *st)
          break;
       }
    }
+   if (ctx->Const.MaxSamples == 1) {
+      /* one sample doesn't really make sense */
+      ctx->Const.MaxSamples = 0;
+   }
+   else if (ctx->Const.MaxSamples >= 2) {
+      ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
+   }
 
    if (ctx->Const.MaxDualSourceDrawBuffers > 0)
       ctx->Extensions.ARB_blend_func_extended = GL_TRUE;
@@ -679,6 +685,13 @@ void st_init_extensions(struct st_context *st)
    }
    if (screen->get_param(screen, PIPE_CAP_TEXTURE_BUFFER_OBJECTS)) {
       ctx->Extensions.ARB_texture_buffer_object = GL_TRUE;
+
+      ctx->Const.TextureBufferOffsetAlignment =
+         screen->get_param(screen, PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT);
+
+      if (ctx->Const.TextureBufferOffsetAlignment)
+         ctx->Extensions.ARB_texture_buffer_range = GL_TRUE;
+
       init_format_extensions(st, tbo_rgb32, Elements(tbo_rgb32),
                              PIPE_BUFFER, PIPE_BIND_SAMPLER_VIEW);
    }
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 88ff897be..5137c9ea3 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -10,7 +10,7 @@ snapshot:
 	test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git rev-parse HEAD | cut -c 1-6`; \
 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" dist
 
-GPGKEY=6FF7C1A8
+GPGKEY=3892336E
 USERNAME=$$USER
 RELEASE_OR_SNAPSHOT = $$(if test "x$(PIXMAN_VERSION_MINOR)" = "x$$(echo "$(PIXMAN_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi)
 RELEASE_CAIRO_HOST =	$(USERNAME)@cairographics.org
@@ -121,7 +121,7 @@ release-publish-message: $(HASHFILES) ensure-prev
 	@echo ""
 	@echo "GPG signature:"
 	@echo "	$(RELEASE_CAIRO_URL)/$(gpg_file)"
-	@echo "	(signed by `git config --get user.name` <`git config --get user.email`>)"
+	@echo "	(signed by`gpg --list-keys $(GPGKEY) | grep uid | cut -b4- | tr -s " "`)"
 	@echo ""
 	@echo "Git:"
 	@echo "	git://git.freedesktop.org/git/pixman"
diff --git a/pixman/configure.ac b/pixman/configure.ac
index a93e2905b..38f89b31e 100644
--- a/pixman/configure.ac
+++ b/pixman/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 29)
-m4_define([pixman_micro], 1)
+m4_define([pixman_micro], 3)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/pixman/pixman/Makefile.am b/pixman/pixman/Makefile.am
index beebdd086..b9ea75424 100644
--- a/pixman/pixman/Makefile.am
+++ b/pixman/pixman/Makefile.am
@@ -58,7 +58,9 @@ noinst_LTLIBRARIES += libpixman-arm-simd.la
 libpixman_arm_simd_la_SOURCES = \
 	pixman-arm-simd.c	\
 	pixman-arm-common.h	\
-	pixman-arm-simd-asm.S
+	pixman-arm-simd-asm.S   \
+	pixman-arm-simd-asm-scaled.S \
+	pixman-arm-simd-asm.h
 libpixman_1_la_LIBADD += libpixman-arm-simd.la
 
 ASM_CFLAGS_arm_simd=
diff --git a/pixman/pixman/pixman-arm-simd-asm-scaled.S b/pixman/pixman/pixman-arm-simd-asm-scaled.S
new file mode 100644
index 000000000..711099548
--- /dev/null
+++ b/pixman/pixman/pixman-arm-simd-asm-scaled.S
@@ -0,0 +1,165 @@
+/*
+ * Copyright © 2008 Mozilla Corporation
+ * Copyright © 2010 Nokia Corporation
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Mozilla Corporation not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Mozilla Corporation makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ *
+ * Author:  Jeff Muizelaar (jeff@infidigm.net)
+ *
+ */
+
+/* Prevent the stack from becoming executable */
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+
+	.text
+	.arch armv6
+	.object_arch armv4
+	.arm
+	.altmacro
+	.p2align 2
+
+/* Supplementary macro for setting function attributes */
+.macro pixman_asm_function fname
+	.func fname
+	.global fname
+#ifdef __ELF__
+	.hidden fname
+	.type fname, %function
+#endif
+fname:
+.endm
+
+/*
+ * Note: This code is only using armv5te instructions (not even armv6),
+ *       but is scheduled for ARM Cortex-A8 pipeline. So it might need to
+ *       be split into a few variants, tuned for each microarchitecture.
+ *
+ * TODO: In order to get good performance on ARM9/ARM11 cores (which don't
+ * have efficient write combining), it needs to be changed to use 16-byte
+ * aligned writes using STM instruction.
+ *
+ * Nearest scanline scaler macro template uses the following arguments:
+ *  fname                     - name of the function to generate
+ *  bpp_shift                 - (1 << bpp_shift) is the size of pixel in bytes
+ *  t                         - type suffix for LDR/STR instructions
+ *  prefetch_distance         - prefetch in the source image by that many
+ *                              pixels ahead
+ *  prefetch_braking_distance - stop prefetching when that many pixels are
+ *                              remaining before the end of scanline
+ */
+
+.macro generate_nearest_scanline_func fname, bpp_shift, t,      \
+                                      prefetch_distance,        \
+                                      prefetch_braking_distance
+
+pixman_asm_function fname
+	W		.req	r0
+	DST		.req	r1
+	SRC		.req	r2
+	VX		.req	r3
+	UNIT_X		.req	ip
+	TMP1		.req	r4
+	TMP2		.req	r5
+	VXMASK		.req	r6
+	PF_OFFS		.req	r7
+	SRC_WIDTH_FIXED	.req	r8
+
+	ldr	UNIT_X, [sp]
+	push	{r4, r5, r6, r7, r8, r10}
+	mvn	VXMASK, #((1 << bpp_shift) - 1)
+	ldr	SRC_WIDTH_FIXED, [sp, #28]
+
+	/* define helper macro */
+	.macro	scale_2_pixels
+		ldr&t	TMP1, [SRC, TMP1]
+		and	TMP2, VXMASK, VX, asr #(16 - bpp_shift)
+		adds	VX, VX, UNIT_X
+		str&t	TMP1, [DST], #(1 << bpp_shift)
+9:		subpls	VX, VX, SRC_WIDTH_FIXED
+		bpl	9b
+
+		ldr&t	TMP2, [SRC, TMP2]
+		and	TMP1, VXMASK, VX, asr #(16 - bpp_shift)
+		adds	VX, VX, UNIT_X
+		str&t	TMP2, [DST], #(1 << bpp_shift)
+9:		subpls	VX, VX, SRC_WIDTH_FIXED
+		bpl	9b
+	.endm
+
+	/* now do the scaling */
+	and	TMP1, VXMASK, VX, asr #(16 - bpp_shift)
+	adds	VX, VX, UNIT_X
+9:	subpls	VX, VX, SRC_WIDTH_FIXED
+	bpl	9b
+	subs	W, W, #(8 + prefetch_braking_distance)
+	blt	2f
+	/* calculate prefetch offset */
+	mov	PF_OFFS, #prefetch_distance
+	mla	PF_OFFS, UNIT_X, PF_OFFS, VX
+1:	/* main loop, process 8 pixels per iteration with prefetch */
+	pld	[SRC, PF_OFFS, asr #(16 - bpp_shift)]
+	add	PF_OFFS, UNIT_X, lsl #3
+	scale_2_pixels
+	scale_2_pixels
+	scale_2_pixels
+	scale_2_pixels
+	subs	W, W, #8
+	bge	1b
+2:
+	subs	W, W, #(4 - 8 - prefetch_braking_distance)
+	blt	2f
+1:	/* process the remaining pixels */
+	scale_2_pixels
+	scale_2_pixels
+	subs	W, W, #4
+	bge	1b
+2:
+	tst	W, #2
+	beq	2f
+	scale_2_pixels
+2:
+	tst	W, #1
+	ldrne&t	TMP1, [SRC, TMP1]
+	strne&t	TMP1, [DST]
+	/* cleanup helper macro */
+	.purgem	scale_2_pixels
+	.unreq	DST
+	.unreq	SRC
+	.unreq	W
+	.unreq	VX
+	.unreq	UNIT_X
+	.unreq	TMP1
+	.unreq	TMP2
+	.unreq	VXMASK
+	.unreq	PF_OFFS
+	.unreq  SRC_WIDTH_FIXED
+	/* return */
+	pop	{r4, r5, r6, r7, r8, r10}
+	bx	lr
+.endfunc
+.endm
+
+generate_nearest_scanline_func \
+    pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6, 1, h, 80, 32
+
+generate_nearest_scanline_func \
+    pixman_scaled_nearest_scanline_8888_8888_SRC_asm_armv6, 2,  , 48, 32
diff --git a/pixman/pixman/pixman-arm-simd-asm.S b/pixman/pixman/pixman-arm-simd-asm.S
index b438001d3..c20968879 100644
--- a/pixman/pixman/pixman-arm-simd-asm.S
+++ b/pixman/pixman/pixman-arm-simd-asm.S
@@ -1,14 +1,14 @@
 /*
- * Copyright © 2008 Mozilla Corporation
- * Copyright © 2010 Nokia Corporation
+ * Copyright © 2012 Raspberry Pi Foundation
+ * Copyright © 2012 RISC OS Open Ltd
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
  * the above copyright notice appear in all copies and that both that
  * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Mozilla Corporation not be used in
+ * documentation, and that the name of the copyright holders not be used in
  * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Mozilla Corporation makes no
+ * specific, written prior permission.  The copyright holders make no
  * representations about the suitability of this software for any purpose.  It
  * is provided "as is" without express or implied warranty.
  *
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  *
- * Author:  Jeff Muizelaar (jeff@infidigm.net)
+ * Author:  Ben Avison (bavison@riscosopen.org)
  *
  */
 
@@ -37,412 +37,577 @@
 	.altmacro
 	.p2align 2
 
-/* Supplementary macro for setting function attributes */
-.macro pixman_asm_function fname
-	.func fname
-	.global fname
-#ifdef __ELF__
-	.hidden fname
-	.type fname, %function
-#endif
-fname:
-.endm
+#include "pixman-arm-simd-asm.h"
 
-/*
- * The code below was generated by gcc 4.3.4 from the commented out
- * functions in 'pixman-arm-simd.c' file with the following optimization
- * options: "-O3 -mcpu=arm1136jf-s -fomit-frame-pointer"
- *
- * TODO: replace gcc generated code with hand tuned versions because
- * the code quality is not very good, introduce symbolic register
- * aliases for better readability and maintainability.
+/* A head macro should do all processing which results in an output of up to
+ * 16 bytes, as far as the final load instruction. The corresponding tail macro
+ * should complete the processing of the up-to-16 bytes. The calling macro will
+ * sometimes choose to insert a preload or a decrement of X between them.
+ *   cond           ARM condition code for code block
+ *   numbytes       Number of output bytes that should be generated this time
+ *   firstreg       First WK register in which to place output
+ *   unaligned_src  Whether to use non-wordaligned loads of source image
+ *   unaligned_mask Whether to use non-wordaligned loads of mask image
+ *   preload        If outputting 16 bytes causes 64 bytes to be read, whether an extra preload should be output
  */
 
-pixman_asm_function pixman_composite_add_8_8_asm_armv6
-	push	{r4, r5, r6, r7, r8, r9, r10, r11}
-	mov	r10, r1
-	sub	sp, sp, #4
-	subs	r10, r10, #1
-	mov	r11, r0
-	mov	r8, r2
-	str	r3, [sp]
-	ldr	r7, [sp, #36]
-	bcc	0f
-6:	cmp	r11, #0
-	beq	1f
-	orr	r3, r8, r7
-	tst	r3, #3
-	beq	2f
-	mov	r1, r8
-	mov	r0, r7
-	mov	r12, r11
-	b	3f
-5:	tst	r3, #3
-	beq	4f
-3:	ldrb	r2, [r0], #1
-	subs	r12, r12, #1
-	ldrb	r3, [r1]
-	uqadd8	r3, r2, r3
-	strb	r3, [r1], #1
-	orr	r3, r1, r0
-	bne	5b
-1:	ldr	r3, [sp]
-	add	r8, r8, r3
-	ldr	r3, [sp, #40]
-	add	r7, r7, r3
-10:	subs	r10, r10, #1
-	bcs	6b
-0:	add	sp, sp, #4
-	pop	{r4, r5, r6, r7, r8, r9, r10, r11}
-	bx	lr
-2:	mov	r12, r11
-	mov	r1, r8
-	mov	r0, r7
-4:	cmp	r12, #3
-	subgt	r6, r12, #4
-	movgt	r9, r12
-	lsrgt	r5, r6, #2
-	addgt	r3, r5, #1
-	movgt	r12, #0
-	lslgt	r4, r3, #2
-	ble	7f
-8:	ldr	r3, [r0, r12]
-	ldr	r2, [r1, r12]
-	uqadd8	r3, r3, r2
-	str	r3, [r1, r12]
-	add	r12, r12, #4
-	cmp	r12, r4
-	bne	8b
-	sub	r3, r9, #4
-	bic	r3, r3, #3
-	add	r3, r3, #4
-	subs	r12, r6, r5, lsl #2
-	add	r1, r1, r3
-	add	r0, r0, r3
-	beq	1b
-7:	mov	r4, #0
-9:	ldrb	r3, [r1, r4]
-	ldrb	r2, [r0, r4]
-	uqadd8	r3, r2, r3
-	strb	r3, [r1, r4]
-	add	r4, r4, #1
-	cmp	r4, r12
-	bne	9b
-	ldr	r3, [sp]
-	add	r8, r8, r3
-	ldr	r3, [sp, #40]
-	add	r7, r7, r3
-	b	10b
-.endfunc
-
-pixman_asm_function pixman_composite_over_8888_8888_asm_armv6
-	push	{r4, r5, r6, r7, r8, r9, r10, r11}
-	sub	sp, sp, #20
-	cmp	r1, #0
-	mov	r12, r2
-	str	r1, [sp, #12]
-	str	r0, [sp, #16]
-	ldr	r2, [sp, #52]
-	beq	0f
-	lsl	r3, r3, #2
-	str	r3, [sp]
-	ldr	r3, [sp, #56]
-	mov	r10, #0
-	lsl	r3, r3, #2
-	str	r3, [sp, #8]
-	mov	r11, r3
-	b	1f
-6:	ldr	r11, [sp, #8]
-1:	ldr	r9, [sp]
-	mov	r0, r12
-	add	r12, r12, r9
-	mov	r1, r2
-	str	r12, [sp, #4]
-	add	r2, r2, r11
-	ldr	r12, [sp, #16]
-	ldr	r3, =0x00800080
-	ldr	r9, =0xff00ff00
-	mov	r11, #255
-	cmp	r12, #0
-	beq	4f
-5:	ldr	r5, [r1], #4
-	ldr	r4, [r0]
-	sub	r8, r11, r5, lsr #24
-	uxtb16	r6, r4
-	uxtb16	r7, r4, ror #8
-	mla	r6, r6, r8, r3
-	mla	r7, r7, r8, r3
-	uxtab16	r6, r6, r6, ror #8
-	uxtab16	r7, r7, r7, ror #8
-	and	r7, r7, r9
-	uxtab16	r6, r7, r6, ror #8
-	uqadd8	r5, r6, r5
-	str	r5, [r0], #4
-	subs	r12, r12, #1
-	bne	5b
-4:	ldr	r3, [sp, #12]
-	add	r10, r10, #1
-	cmp	r10, r3
-	ldr	r12, [sp, #4]
-	bne	6b
-0:	add	sp, sp, #20
-	pop	{r4, r5, r6, r7, r8, r9, r10, r11}
-	bx	lr
-.endfunc
-
-pixman_asm_function pixman_composite_over_8888_n_8888_asm_armv6
-	push	{r4, r5, r6, r7, r8, r9, r10, r11}
-	sub	sp, sp, #28
-	cmp	r1, #0
-	str	r1, [sp, #12]
-	ldrb	r1, [sp, #71]
-	mov	r12, r2
-	str	r0, [sp, #16]
-	ldr	r2, [sp, #60]
-	str	r1, [sp, #24]
-	beq	0f
-	lsl	r3, r3, #2
-	str	r3, [sp, #20]
-	ldr	r3, [sp, #64]
-	mov	r10, #0
-	lsl	r3, r3, #2
-	str	r3, [sp, #8]
-	mov	r11, r3
-	b	1f
-5:	ldr	r11, [sp, #8]
-1:	ldr	r4, [sp, #20]
-	mov	r0, r12
-	mov	r1, r2
-	add	r12, r12, r4
-	add	r2, r2, r11
-	str	r12, [sp]
-	str	r2, [sp, #4]
-	ldr	r12, [sp, #16]
-	ldr	r2, =0x00800080
-	ldr	r3, [sp, #24]
-	mov	r11, #255
-	cmp	r12, #0
-	beq	3f
-4:	ldr	r5, [r1], #4
-	ldr	r4, [r0]
-	uxtb16	r6, r5
-	uxtb16	r7, r5, ror #8
-	mla	r6, r6, r3, r2
-	mla	r7, r7, r3, r2
-	uxtab16	r6, r6, r6, ror #8
-	uxtab16	r7, r7, r7, ror #8
-	uxtb16	r6, r6, ror #8
-	uxtb16	r7, r7, ror #8
-	orr	r5, r6, r7, lsl #8
-	uxtb16	r6, r4
-	uxtb16	r7, r4, ror #8
-	sub	r8, r11, r5, lsr #24
-	mla	r6, r6, r8, r2
-	mla	r7, r7, r8, r2
-	uxtab16	r6, r6, r6, ror #8
-	uxtab16	r7, r7, r7, ror #8
-	uxtb16	r6, r6, ror #8
-	uxtb16	r7, r7, ror #8
-	orr	r6, r6, r7, lsl #8
-	uqadd8	r5, r6, r5
-	str	r5, [r0], #4
-	subs	r12, r12, #1
-	bne	4b
-3:	ldr	r1, [sp, #12]
-	add	r10, r10, #1
-	cmp	r10, r1
-	ldr	r12, [sp]
-	ldr	r2, [sp, #4]
-	bne	5b
-0:	add	sp, sp, #28
-	pop	{r4, r5, r6, r7, r8, r9, r10, r11}
-	bx	lr
-.endfunc
-
-pixman_asm_function pixman_composite_over_n_8_8888_asm_armv6
-	push	{r4, r5, r6, r7, r8, r9, r10, r11}
-	sub	sp, sp, #28
-	cmp	r1, #0
-	ldr	r9, [sp, #60]
-	str	r1, [sp, #12]
-	bic	r1, r9, #-16777216
-	str	r1, [sp, #20]
-	mov	r12, r2
-	lsr	r1, r9, #8
-	ldr	r2, [sp, #20]
-	bic	r1, r1, #-16777216
-	bic	r2, r2, #65280
-	bic	r1, r1, #65280
-	str	r2, [sp, #20]
-	str	r0, [sp, #16]
-	str	r1, [sp, #4]
-	ldr	r2, [sp, #68]
-	beq	0f
-	lsl	r3, r3, #2
-	str	r3, [sp, #24]
-	mov	r0, #0
-	b	1f
-5:	ldr	r3, [sp, #24]
-1:	ldr	r4, [sp, #72]
-	mov	r10, r12
-	mov	r1, r2
-	add	r12, r12, r3
-	add	r2, r2, r4
-	str	r12, [sp, #8]
-	str	r2, [sp]
-	ldr	r12, [sp, #16]
-	ldr	r11, =0x00800080
-	ldr	r2, [sp, #4]
-	ldr	r3, [sp, #20]
-	cmp	r12, #0
-	beq	3f
-4:	ldrb	r5, [r1], #1
-	ldr	r4, [r10]
-	mla	r6, r3, r5, r11
-	mla	r7, r2, r5, r11
-	uxtab16	r6, r6, r6, ror #8
-	uxtab16	r7, r7, r7, ror #8
-	uxtb16	r6, r6, ror #8
-	uxtb16	r7, r7, ror #8
-	orr	r5, r6, r7, lsl #8
-	uxtb16	r6, r4
-	uxtb16	r7, r4, ror #8
-	mvn	r8, r5
-	lsr	r8, r8, #24
-	mla	r6, r6, r8, r11
-	mla	r7, r7, r8, r11
-	uxtab16	r6, r6, r6, ror #8
-	uxtab16	r7, r7, r7, ror #8
-	uxtb16	r6, r6, ror #8
-	uxtb16	r7, r7, ror #8
-	orr	r6, r6, r7, lsl #8
-	uqadd8	r5, r6, r5
-	str	r5, [r10], #4
-	subs	r12, r12, #1
-	bne	4b
-3:	ldr	r4, [sp, #12]
-	add	r0, r0, #1
-	cmp	r0, r4
-	ldr	r12, [sp, #8]
-	ldr	r2, [sp]
-	bne	5b
-0:	add	sp, sp, #28
-	pop	{r4, r5, r6, r7, r8, r9, r10, r11}
-	bx	lr
-.endfunc
+.macro blit_init
+        line_saved_regs STRIDE_D, STRIDE_S
+.endm
 
-/*
- * Note: This code is only using armv5te instructions (not even armv6),
- *       but is scheduled for ARM Cortex-A8 pipeline. So it might need to
- *       be split into a few variants, tuned for each microarchitecture.
- *
- * TODO: In order to get good performance on ARM9/ARM11 cores (which don't
- * have efficient write combining), it needs to be changed to use 16-byte
- * aligned writes using STM instruction.
- *
- * Nearest scanline scaler macro template uses the following arguments:
- *  fname                     - name of the function to generate
- *  bpp_shift                 - (1 << bpp_shift) is the size of pixel in bytes
- *  t                         - type suffix for LDR/STR instructions
- *  prefetch_distance         - prefetch in the source image by that many
- *                              pixels ahead
- *  prefetch_braking_distance - stop prefetching when that many pixels are
- *                              remaining before the end of scanline
+.macro blit_process_head   cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload
+        pixld   cond, numbytes, firstreg, SRC, unaligned_src
+.endm
+
+.macro blit_inner_loop  process_head, process_tail, unaligned_src, unaligned_mask, dst_alignment
+    WK4     .req    STRIDE_D
+    WK5     .req    STRIDE_S
+    WK6     .req    MASK
+    WK7     .req    STRIDE_M
+110:    pixld   , 16, 0, SRC, unaligned_src
+        pixld   , 16, 4, SRC, unaligned_src
+        pld     [SRC, SCRATCH]
+        pixst   , 16, 0, DST
+        pixst   , 16, 4, DST
+        subs    X, X, #32*8/src_bpp
+        bhs     110b
+    .unreq  WK4
+    .unreq  WK5
+    .unreq  WK6
+    .unreq  WK7
+.endm
+
+generate_composite_function \
+    pixman_composite_src_8888_8888_asm_armv6, 32, 0, 32, \
+    FLAG_DST_WRITEONLY | FLAG_COND_EXEC | FLAG_SPILL_LINE_VARS_WIDE | FLAG_PROCESS_PRESERVES_SCRATCH, \
+    4, /* prefetch distance */ \
+    blit_init, \
+    nop_macro, /* newline */ \
+    nop_macro, /* cleanup */ \
+    blit_process_head, \
+    nop_macro, /* process tail */ \
+    blit_inner_loop
+
+generate_composite_function \
+    pixman_composite_src_0565_0565_asm_armv6, 16, 0, 16, \
+    FLAG_DST_WRITEONLY | FLAG_COND_EXEC | FLAG_SPILL_LINE_VARS_WIDE | FLAG_PROCESS_PRESERVES_SCRATCH, \
+    4, /* prefetch distance */ \
+    blit_init, \
+    nop_macro, /* newline */ \
+    nop_macro, /* cleanup */ \
+    blit_process_head, \
+    nop_macro, /* process tail */ \
+    blit_inner_loop
+
+generate_composite_function \
+    pixman_composite_src_8_8_asm_armv6, 8, 0, 8, \
+    FLAG_DST_WRITEONLY | FLAG_COND_EXEC | FLAG_SPILL_LINE_VARS_WIDE | FLAG_PROCESS_PRESERVES_SCRATCH, \
+    3, /* prefetch distance */ \
+    blit_init, \
+    nop_macro, /* newline */ \
+    nop_macro, /* cleanup */ \
+    blit_process_head, \
+    nop_macro, /* process tail */ \
+    blit_inner_loop
+
+/******************************************************************************/
+
+.macro src_n_8888_init
+        ldr     SRC, [sp, #ARGS_STACK_OFFSET]
+        mov     STRIDE_S, SRC
+        mov     MASK, SRC
+        mov     STRIDE_M, SRC
+.endm
+
+.macro src_n_0565_init
+        ldrh    SRC, [sp, #ARGS_STACK_OFFSET]
+        orr     SRC, SRC, lsl #16
+        mov     STRIDE_S, SRC
+        mov     MASK, SRC
+        mov     STRIDE_M, SRC
+.endm
+
+.macro src_n_8_init
+        ldrb    SRC, [sp, #ARGS_STACK_OFFSET]
+        orr     SRC, SRC, lsl #8
+        orr     SRC, SRC, lsl #16
+        mov     STRIDE_S, SRC
+        mov     MASK, SRC
+        mov     STRIDE_M, SRC
+.endm
+
+.macro fill_process_tail  cond, numbytes, firstreg
+    WK4     .req    SRC
+    WK5     .req    STRIDE_S
+    WK6     .req    MASK
+    WK7     .req    STRIDE_M
+        pixst   cond, numbytes, 4, DST
+    .unreq  WK4
+    .unreq  WK5
+    .unreq  WK6
+    .unreq  WK7
+.endm
+
+generate_composite_function \
+    pixman_composite_src_n_8888_asm_armv6, 0, 0, 32, \
+    FLAG_DST_WRITEONLY | FLAG_COND_EXEC | FLAG_PROCESS_PRESERVES_PSR | FLAG_PROCESS_DOES_STORE | FLAG_PROCESS_PRESERVES_SCRATCH \
+    0, /* prefetch distance doesn't apply */ \
+    src_n_8888_init \
+    nop_macro, /* newline */ \
+    nop_macro /* cleanup */ \
+    nop_macro /* process head */ \
+    fill_process_tail
+
+generate_composite_function \
+    pixman_composite_src_n_0565_asm_armv6, 0, 0, 16, \
+    FLAG_DST_WRITEONLY | FLAG_COND_EXEC | FLAG_PROCESS_PRESERVES_PSR | FLAG_PROCESS_DOES_STORE | FLAG_PROCESS_PRESERVES_SCRATCH \
+    0, /* prefetch distance doesn't apply */ \
+    src_n_0565_init \
+    nop_macro, /* newline */ \
+    nop_macro /* cleanup */ \
+    nop_macro /* process head */ \
+    fill_process_tail
+
+generate_composite_function \
+    pixman_composite_src_n_8_asm_armv6, 0, 0, 8, \
+    FLAG_DST_WRITEONLY | FLAG_COND_EXEC | FLAG_PROCESS_PRESERVES_PSR | FLAG_PROCESS_DOES_STORE | FLAG_PROCESS_PRESERVES_SCRATCH \
+    0, /* prefetch distance doesn't apply */ \
+    src_n_8_init \
+    nop_macro, /* newline */ \
+    nop_macro /* cleanup */ \
+    nop_macro /* process head */ \
+    fill_process_tail
+
+/******************************************************************************/
+
+.macro src_x888_8888_pixel, cond, reg
+        orr&cond WK&reg, WK&reg, #0xFF000000
+.endm
+
+.macro pixman_composite_src_x888_8888_process_head   cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload
+        pixld   cond, numbytes, firstreg, SRC, unaligned_src
+.endm
+
+.macro pixman_composite_src_x888_8888_process_tail   cond, numbytes, firstreg
+        src_x888_8888_pixel cond, %(firstreg+0)
+ .if numbytes >= 8
+        src_x888_8888_pixel cond, %(firstreg+1)
+  .if numbytes == 16
+        src_x888_8888_pixel cond, %(firstreg+2)
+        src_x888_8888_pixel cond, %(firstreg+3)
+  .endif
+ .endif
+.endm
+
+generate_composite_function \
+    pixman_composite_src_x888_8888_asm_armv6, 32, 0, 32, \
+    FLAG_DST_WRITEONLY | FLAG_COND_EXEC | FLAG_PROCESS_PRESERVES_SCRATCH, \
+    3, /* prefetch distance */ \
+    nop_macro, /* init */ \
+    nop_macro, /* newline */ \
+    nop_macro, /* cleanup */ \
+    pixman_composite_src_x888_8888_process_head, \
+    pixman_composite_src_x888_8888_process_tail
+
+/******************************************************************************/
+
+.macro src_0565_8888_init
+        /* Hold loop invariants in MASK and STRIDE_M */
+        ldr     MASK, =0x07E007E0
+        mov     STRIDE_M, #0xFF000000
+        /* Set GE[3:0] to 1010 so SEL instructions do what we want */
+        ldr     SCRATCH, =0x80008000
+        uadd8   SCRATCH, SCRATCH, SCRATCH
+.endm
+
+.macro src_0565_8888_2pixels, reg1, reg2
+        and     SCRATCH, WK&reg1, MASK             @ 00000GGGGGG0000000000gggggg00000
+        bic     WK&reg2, WK&reg1, MASK             @ RRRRR000000BBBBBrrrrr000000bbbbb
+        orr     SCRATCH, SCRATCH, SCRATCH, lsr #6  @ 00000GGGGGGGGGGGG0000ggggggggggg
+        mov     WK&reg1, WK&reg2, lsl #16          @ rrrrr000000bbbbb0000000000000000
+        mov     SCRATCH, SCRATCH, ror #19          @ GGGG0000ggggggggggg00000GGGGGGGG
+        bic     WK&reg2, WK&reg2, WK&reg1, lsr #16 @ RRRRR000000BBBBB0000000000000000
+        orr     WK&reg1, WK&reg1, WK&reg1, lsr #5  @ rrrrrrrrrr0bbbbbbbbbb00000000000
+        orr     WK&reg2, WK&reg2, WK&reg2, lsr #5  @ RRRRRRRRRR0BBBBBBBBBB00000000000
+        pkhtb   WK&reg1, WK&reg1, WK&reg1, asr #5  @ rrrrrrrr--------bbbbbbbb--------
+        sel     WK&reg1, WK&reg1, SCRATCH          @ rrrrrrrrggggggggbbbbbbbb--------
+        mov     SCRATCH, SCRATCH, ror #16          @ ggg00000GGGGGGGGGGGG0000gggggggg
+        pkhtb   WK&reg2, WK&reg2, WK&reg2, asr #5  @ RRRRRRRR--------BBBBBBBB--------
+        sel     WK&reg2, WK&reg2, SCRATCH          @ RRRRRRRRGGGGGGGGBBBBBBBB--------
+        orr     WK&reg1, STRIDE_M, WK&reg1, lsr #8 @ 11111111rrrrrrrrggggggggbbbbbbbb
+        orr     WK&reg2, STRIDE_M, WK&reg2, lsr #8 @ 11111111RRRRRRRRGGGGGGGGBBBBBBBB
+.endm
+
+/* This version doesn't need STRIDE_M, but is one instruction longer.
+   It would however be preferable for an XRGB target, since we could knock off the last 2 instructions, but is that a common case?
+        and     SCRATCH, WK&reg1, MASK             @ 00000GGGGGG0000000000gggggg00000
+        bic     WK&reg1, WK&reg1, MASK             @ RRRRR000000BBBBBrrrrr000000bbbbb
+        orr     SCRATCH, SCRATCH, SCRATCH, lsr #6  @ 00000GGGGGGGGGGGG0000ggggggggggg
+        mov     WK&reg2, WK&reg1, lsr #16          @ 0000000000000000RRRRR000000BBBBB
+        mov     SCRATCH, SCRATCH, ror #27          @ GGGGGGGGGGGG0000ggggggggggg00000
+        bic     WK&reg1, WK&reg1, WK&reg2, lsl #16 @ 0000000000000000rrrrr000000bbbbb
+        mov     WK&reg2, WK&reg2, lsl #3           @ 0000000000000RRRRR000000BBBBB000
+        mov     WK&reg1, WK&reg1, lsl #3           @ 0000000000000rrrrr000000bbbbb000
+        orr     WK&reg2, WK&reg2, WK&reg2, lsr #5  @ 0000000000000RRRRRRRRRR0BBBBBBBB
+        orr     WK&reg1, WK&reg1, WK&reg1, lsr #5  @ 0000000000000rrrrrrrrrr0bbbbbbbb
+        pkhbt   WK&reg2, WK&reg2, WK&reg2, lsl #5  @ --------RRRRRRRR--------BBBBBBBB
+        pkhbt   WK&reg1, WK&reg1, WK&reg1, lsl #5  @ --------rrrrrrrr--------bbbbbbbb
+        sel     WK&reg2, SCRATCH, WK&reg2          @ --------RRRRRRRRGGGGGGGGBBBBBBBB
+        sel     WK&reg1, SCRATCH, WK&reg1          @ --------rrrrrrrrggggggggbbbbbbbb
+        orr     WK&reg2, WK&reg2, #0xFF000000      @ 11111111RRRRRRRRGGGGGGGGBBBBBBBB
+        orr     WK&reg1, WK&reg1, #0xFF000000      @ 11111111rrrrrrrrggggggggbbbbbbbb
+*/
+
+.macro src_0565_8888_1pixel, reg
+        bic     SCRATCH, WK&reg, MASK              @ 0000000000000000rrrrr000000bbbbb
+        and     WK&reg, WK&reg, MASK               @ 000000000000000000000gggggg00000
+        mov     SCRATCH, SCRATCH, lsl #3           @ 0000000000000rrrrr000000bbbbb000
+        mov     WK&reg, WK&reg, lsl #5             @ 0000000000000000gggggg0000000000
+        orr     SCRATCH, SCRATCH, SCRATCH, lsr #5  @ 0000000000000rrrrrrrrrr0bbbbbbbb
+        orr     WK&reg, WK&reg, WK&reg, lsr #6     @ 000000000000000gggggggggggg00000
+        pkhbt   SCRATCH, SCRATCH, SCRATCH, lsl #5  @ --------rrrrrrrr--------bbbbbbbb
+        sel     WK&reg, WK&reg, SCRATCH            @ --------rrrrrrrrggggggggbbbbbbbb
+        orr     WK&reg, WK&reg, #0xFF000000        @ 11111111rrrrrrrrggggggggbbbbbbbb
+.endm
+
+.macro src_0565_8888_process_head   cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload
+ .if numbytes == 16
+        pixldst ld,, 8, firstreg, %(firstreg+2),,, SRC, unaligned_src
+ .elseif numbytes == 8
+        pixld   , 4, firstreg, SRC, unaligned_src
+ .elseif numbytes == 4
+        pixld   , 2, firstreg, SRC, unaligned_src
+ .endif
+.endm
+
+.macro src_0565_8888_process_tail   cond, numbytes, firstreg
+ .if numbytes == 16
+        src_0565_8888_2pixels firstreg, %(firstreg+1)
+        src_0565_8888_2pixels %(firstreg+2), %(firstreg+3)
+ .elseif numbytes == 8
+        src_0565_8888_2pixels firstreg, %(firstreg+1)
+ .else
+        src_0565_8888_1pixel firstreg
+ .endif
+.endm
+
+generate_composite_function \
+    pixman_composite_src_0565_8888_asm_armv6, 16, 0, 32, \
+    FLAG_DST_WRITEONLY | FLAG_BRANCH_OVER, \
+    3, /* prefetch distance */ \
+    src_0565_8888_init, \
+    nop_macro, /* newline */ \
+    nop_macro, /* cleanup */ \
+    src_0565_8888_process_head, \
+    src_0565_8888_process_tail
+
+/******************************************************************************/
+
+.macro add_8_8_8pixels  cond, dst1, dst2
+        uqadd8&cond  WK&dst1, WK&dst1, MASK
+        uqadd8&cond  WK&dst2, WK&dst2, STRIDE_M
+.endm
+
+.macro add_8_8_4pixels  cond, dst
+        uqadd8&cond  WK&dst, WK&dst, MASK
+.endm
+
+.macro add_8_8_process_head  cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload
+    WK4     .req    MASK
+    WK5     .req    STRIDE_M
+ .if numbytes == 16
+        pixld   cond, 8, 4, SRC, unaligned_src
+        pixld   cond, 16, firstreg, DST, 0
+        add_8_8_8pixels cond, firstreg, %(firstreg+1)
+        pixld   cond, 8, 4, SRC, unaligned_src
+ .else
+        pixld   cond, numbytes, 4, SRC, unaligned_src
+        pixld   cond, numbytes, firstreg, DST, 0
+ .endif
+    .unreq  WK4
+    .unreq  WK5
+.endm
+
+.macro add_8_8_process_tail  cond, numbytes, firstreg
+ .if numbytes == 16
+        add_8_8_8pixels cond, %(firstreg+2), %(firstreg+3)
+ .elseif numbytes == 8
+        add_8_8_8pixels cond, firstreg, %(firstreg+1)
+ .else
+        add_8_8_4pixels cond, firstreg
+ .endif
+.endm
+
+generate_composite_function \
+    pixman_composite_add_8_8_asm_armv6, 8, 0, 8, \
+    FLAG_DST_READWRITE | FLAG_BRANCH_OVER | FLAG_PROCESS_PRESERVES_SCRATCH, \
+    2, /* prefetch distance */ \
+    nop_macro, /* init */ \
+    nop_macro, /* newline */ \
+    nop_macro, /* cleanup */ \
+    add_8_8_process_head, \
+    add_8_8_process_tail
+
+/******************************************************************************/
+
+.macro over_8888_8888_init
+        /* Hold loop invariant in MASK */
+        ldr     MASK, =0x00800080
+        /* Set GE[3:0] to 0101 so SEL instructions do what we want */
+        uadd8   SCRATCH, MASK, MASK
+        line_saved_regs STRIDE_D, STRIDE_S, ORIG_W
+.endm
+
+.macro over_8888_8888_process_head  cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload
+    WK4     .req    STRIDE_D
+    WK5     .req    STRIDE_S
+    WK6     .req    STRIDE_M
+    WK7     .req    ORIG_W
+        pixld   , numbytes, %(4+firstreg), SRC, unaligned_src
+        pixld   , numbytes, firstreg, DST, 0
+    .unreq  WK4
+    .unreq  WK5
+    .unreq  WK6
+    .unreq  WK7
+.endm
+
+.macro over_8888_8888_check_transparent  numbytes, reg0, reg1, reg2, reg3
+        /* Since these colours a premultiplied by alpha, only 0 indicates transparent (any other colour with 0 in the alpha byte is luminous) */
+        teq     WK&reg0, #0
+ .if numbytes > 4
+        teqeq   WK&reg1, #0
+  .if numbytes > 8
+        teqeq   WK&reg2, #0
+        teqeq   WK&reg3, #0
+  .endif
+ .endif
+.endm
+
+.macro over_8888_8888_prepare  next
+        mov     WK&next, WK&next, lsr #24
+.endm
+
+.macro over_8888_8888_1pixel src, dst, offset, next
+        /* src = destination component multiplier */
+        rsb     WK&src, WK&src, #255
+        /* Split even/odd bytes of dst into SCRATCH/dst */
+        uxtb16  SCRATCH, WK&dst
+        uxtb16  WK&dst, WK&dst, ror #8
+        /* Multiply through, adding 0.5 to the upper byte of result for rounding */
+        mla     SCRATCH, SCRATCH, WK&src, MASK
+        mla     WK&dst, WK&dst, WK&src, MASK
+        /* Where we would have had a stall between the result of the first MLA and the shifter input,
+         * reload the complete source pixel */
+        ldr     WK&src, [SRC, #offset]
+        /* Multiply by 257/256 to approximate 256/255 */
+        uxtab16 SCRATCH, SCRATCH, SCRATCH, ror #8
+        /* In this stall, start processing the next pixel */
+ .if offset < -4
+        mov     WK&next, WK&next, lsr #24
+ .endif
+        uxtab16 WK&dst, WK&dst, WK&dst, ror #8
+        /* Recombine even/odd bytes of multiplied destination */
+        mov     SCRATCH, SCRATCH, ror #8
+        sel     WK&dst, SCRATCH, WK&dst
+        /* Saturated add of source to multiplied destination */
+        uqadd8  WK&dst, WK&dst, WK&src
+.endm
+
+.macro over_8888_8888_process_tail  cond, numbytes, firstreg
+    WK4     .req    STRIDE_D
+    WK5     .req    STRIDE_S
+    WK6     .req    STRIDE_M
+    WK7     .req    ORIG_W
+        over_8888_8888_check_transparent numbytes, %(4+firstreg), %(5+firstreg), %(6+firstreg), %(7+firstreg)
+        beq     10f
+        over_8888_8888_prepare  %(4+firstreg)
+ .set PROCESS_REG, firstreg
+ .set PROCESS_OFF, -numbytes
+ .rept numbytes / 4
+        over_8888_8888_1pixel %(4+PROCESS_REG), %(0+PROCESS_REG), PROCESS_OFF, %(5+PROCESS_REG)
+  .set PROCESS_REG, PROCESS_REG+1
+  .set PROCESS_OFF, PROCESS_OFF+4
+ .endr
+        pixst   , numbytes, firstreg, DST
+10:
+    .unreq  WK4
+    .unreq  WK5
+    .unreq  WK6
+    .unreq  WK7
+.endm
+
+generate_composite_function \
+    pixman_composite_over_8888_8888_asm_armv6, 32, 0, 32 \
+    FLAG_DST_READWRITE | FLAG_BRANCH_OVER | FLAG_PROCESS_CORRUPTS_PSR | FLAG_PROCESS_DOES_STORE | FLAG_SPILL_LINE_VARS \
+    2, /* prefetch distance */ \
+    over_8888_8888_init, \
+    nop_macro, /* newline */ \
+    nop_macro, /* cleanup */ \
+    over_8888_8888_process_head, \
+    over_8888_8888_process_tail
+
+/******************************************************************************/
+
+/* Multiply each byte of a word by a byte.
+ * Useful when there aren't any obvious ways to fill the stalls with other instructions.
+ * word  Register containing 4 bytes
+ * byte  Register containing byte multiplier (bits 8-31 must be 0)
+ * tmp   Scratch register
+ * half  Register containing the constant 0x00800080
+ * GE[3:0] bits must contain 0101
  */
+.macro mul_8888_8  word, byte, tmp, half
+        /* Split even/odd bytes of word apart */
+        uxtb16  tmp, word
+        uxtb16  word, word, ror #8
+        /* Multiply bytes together with rounding, then by 257/256 */
+        mla     tmp, tmp, byte, half
+        mla     word, word, byte, half /* 1 stall follows */
+        uxtab16 tmp, tmp, tmp, ror #8  /* 1 stall follows */
+        uxtab16 word, word, word, ror #8
+        /* Recombine bytes */
+        mov     tmp, tmp, ror #8
+        sel     word, tmp, word
+.endm
+
+/******************************************************************************/
+
+.macro over_8888_n_8888_init
+        /* Mask is constant */
+        ldr     MASK, [sp, #ARGS_STACK_OFFSET+8]
+        /* Hold loop invariant in STRIDE_M */
+        ldr     STRIDE_M, =0x00800080
+        /* We only want the alpha bits of the constant mask */
+        mov     MASK, MASK, lsr #24
+        /* Set GE[3:0] to 0101 so SEL instructions do what we want */
+        uadd8   SCRATCH, STRIDE_M, STRIDE_M
+        line_saved_regs Y, STRIDE_D, STRIDE_S, ORIG_W
+.endm
+
+.macro over_8888_n_8888_process_head  cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload
+    WK4     .req    Y
+    WK5     .req    STRIDE_D
+    WK6     .req    STRIDE_S
+    WK7     .req    ORIG_W
+        pixld   , numbytes, %(4+(firstreg%2)), SRC, unaligned_src
+        pixld   , numbytes, firstreg, DST, 0
+    .unreq  WK4
+    .unreq  WK5
+    .unreq  WK6
+    .unreq  WK7
+.endm
+
+.macro over_8888_n_8888_1pixel src, dst
+        mul_8888_8  WK&src, MASK, SCRATCH, STRIDE_M
+        sub     WK7, WK6, WK&src, lsr #24
+        mul_8888_8  WK&dst, WK7, SCRATCH, STRIDE_M
+        uqadd8  WK&dst, WK&dst, WK&src
+.endm
+
+.macro over_8888_n_8888_process_tail  cond, numbytes, firstreg
+    WK4     .req    Y
+    WK5     .req    STRIDE_D
+    WK6     .req    STRIDE_S
+    WK7     .req    ORIG_W
+        over_8888_8888_check_transparent numbytes, %(4+(firstreg%2)), %(5+(firstreg%2)), %(6+firstreg), %(7+firstreg)
+        beq     10f
+        mov     WK6, #255
+ .set PROCESS_REG, firstreg
+ .rept numbytes / 4
+  .if numbytes == 16 && PROCESS_REG == 2
+        /* We're using WK6 and WK7 as temporaries, so half way through
+         * 4 pixels, reload the second two source pixels but this time
+         * into WK4 and WK5 */
+        ldmdb   SRC, {WK4, WK5}
+  .endif
+        over_8888_n_8888_1pixel  %(4+(PROCESS_REG%2)), %(PROCESS_REG)
+  .set PROCESS_REG, PROCESS_REG+1
+ .endr
+        pixst   , numbytes, firstreg, DST
+10:
+    .unreq  WK4
+    .unreq  WK5
+    .unreq  WK6
+    .unreq  WK7
+.endm
+
+generate_composite_function \
+    pixman_composite_over_8888_n_8888_asm_armv6, 32, 0, 32 \
+    FLAG_DST_READWRITE | FLAG_BRANCH_OVER | FLAG_PROCESS_CORRUPTS_PSR | FLAG_PROCESS_DOES_STORE | FLAG_SPILL_LINE_VARS \
+    2, /* prefetch distance */ \
+    over_8888_n_8888_init, \
+    nop_macro, /* newline */ \
+    nop_macro, /* cleanup */ \
+    over_8888_n_8888_process_head, \
+    over_8888_n_8888_process_tail
+
+/******************************************************************************/
+
+.macro over_n_8_8888_init
+        /* Source is constant, but splitting it into even/odd bytes is a loop invariant */
+        ldr     SRC, [sp, #ARGS_STACK_OFFSET]
+        /* Not enough registers to hold this constant, but we still use it here to set GE[3:0] */
+        ldr     SCRATCH, =0x00800080
+        uxtb16  STRIDE_S, SRC
+        uxtb16  SRC, SRC, ror #8
+        /* Set GE[3:0] to 0101 so SEL instructions do what we want */
+        uadd8   SCRATCH, SCRATCH, SCRATCH
+        line_saved_regs Y, STRIDE_D, STRIDE_M, ORIG_W
+.endm
+
+.macro over_n_8_8888_newline
+        ldr     STRIDE_D, =0x00800080
+        b       1f
+ .ltorg
+1:
+.endm
+
+.macro over_n_8_8888_process_head  cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload
+    WK4     .req    STRIDE_M
+        pixld   , numbytes/4, 4, MASK, unaligned_mask
+        pixld   , numbytes, firstreg, DST, 0
+    .unreq  WK4
+.endm
+
+.macro over_n_8_8888_1pixel src, dst
+        uxtb    Y, WK4, ror #src*8
+        /* Trailing part of multiplication of source */
+        mla     SCRATCH, STRIDE_S, Y, STRIDE_D
+        mla     Y, SRC, Y, STRIDE_D
+        mov     ORIG_W, #255
+        uxtab16 SCRATCH, SCRATCH, SCRATCH, ror #8
+        uxtab16 Y, Y, Y, ror #8
+        mov     SCRATCH, SCRATCH, ror #8
+        sub     ORIG_W, ORIG_W, Y, lsr #24
+        sel     Y, SCRATCH, Y
+        /* Then multiply the destination */
+        mul_8888_8  WK&dst, ORIG_W, SCRATCH, STRIDE_D
+        uqadd8  WK&dst, WK&dst, Y
+.endm
+
+.macro over_n_8_8888_process_tail  cond, numbytes, firstreg
+    WK4     .req    STRIDE_M
+        teq     WK4, #0
+        beq     10f
+ .set PROCESS_REG, firstreg
+ .rept numbytes / 4
+        over_n_8_8888_1pixel  %(PROCESS_REG-firstreg), %(PROCESS_REG)
+  .set PROCESS_REG, PROCESS_REG+1
+ .endr
+        pixst   , numbytes, firstreg, DST
+10:
+    .unreq  WK4
+.endm
+
+generate_composite_function \
+    pixman_composite_over_n_8_8888_asm_armv6, 0, 8, 32 \
+    FLAG_DST_READWRITE | FLAG_BRANCH_OVER | FLAG_PROCESS_CORRUPTS_PSR | FLAG_PROCESS_DOES_STORE | FLAG_SPILL_LINE_VARS \
+    2, /* prefetch distance */ \
+    over_n_8_8888_init, \
+    over_n_8_8888_newline, \
+    nop_macro, /* cleanup */ \
+    over_n_8_8888_process_head, \
+    over_n_8_8888_process_tail
+
+/******************************************************************************/
 
-.macro generate_nearest_scanline_func fname, bpp_shift, t,      \
-                                      prefetch_distance,        \
-                                      prefetch_braking_distance
-
-pixman_asm_function fname
-	W		.req	r0
-	DST		.req	r1
-	SRC		.req	r2
-	VX		.req	r3
-	UNIT_X		.req	ip
-	TMP1		.req	r4
-	TMP2		.req	r5
-	VXMASK		.req	r6
-	PF_OFFS		.req	r7
-	SRC_WIDTH_FIXED	.req	r8
-
-	ldr	UNIT_X, [sp]
-	push	{r4, r5, r6, r7, r8, r10}
-	mvn	VXMASK, #((1 << bpp_shift) - 1)
-	ldr	SRC_WIDTH_FIXED, [sp, #28]
-
-	/* define helper macro */
-	.macro	scale_2_pixels
-		ldr&t	TMP1, [SRC, TMP1]
-		and	TMP2, VXMASK, VX, asr #(16 - bpp_shift)
-		adds	VX, VX, UNIT_X
-		str&t	TMP1, [DST], #(1 << bpp_shift)
-9:		subpls	VX, VX, SRC_WIDTH_FIXED
-		bpl	9b
-
-		ldr&t	TMP2, [SRC, TMP2]
-		and	TMP1, VXMASK, VX, asr #(16 - bpp_shift)
-		adds	VX, VX, UNIT_X
-		str&t	TMP2, [DST], #(1 << bpp_shift)
-9:		subpls	VX, VX, SRC_WIDTH_FIXED
-		bpl	9b
-	.endm
-
-	/* now do the scaling */
-	and	TMP1, VXMASK, VX, asr #(16 - bpp_shift)
-	adds	VX, VX, UNIT_X
-9:	subpls	VX, VX, SRC_WIDTH_FIXED
-	bpl	9b
-	subs	W, W, #(8 + prefetch_braking_distance)
-	blt	2f
-	/* calculate prefetch offset */
-	mov	PF_OFFS, #prefetch_distance
-	mla	PF_OFFS, UNIT_X, PF_OFFS, VX
-1:	/* main loop, process 8 pixels per iteration with prefetch */
-	pld	[SRC, PF_OFFS, asr #(16 - bpp_shift)]
-	add	PF_OFFS, UNIT_X, lsl #3
-	scale_2_pixels
-	scale_2_pixels
-	scale_2_pixels
-	scale_2_pixels
-	subs	W, W, #8
-	bge	1b
-2:
-	subs	W, W, #(4 - 8 - prefetch_braking_distance)
-	blt	2f
-1:	/* process the remaining pixels */
-	scale_2_pixels
-	scale_2_pixels
-	subs	W, W, #4
-	bge	1b
-2:
-	tst	W, #2
-	beq	2f
-	scale_2_pixels
-2:
-	tst	W, #1
-	ldrne&t	TMP1, [SRC, TMP1]
-	strne&t	TMP1, [DST]
-	/* cleanup helper macro */
-	.purgem	scale_2_pixels
-	.unreq	DST
-	.unreq	SRC
-	.unreq	W
-	.unreq	VX
-	.unreq	UNIT_X
-	.unreq	TMP1
-	.unreq	TMP2
-	.unreq	VXMASK
-	.unreq	PF_OFFS
-	.unreq  SRC_WIDTH_FIXED
-	/* return */
-	pop	{r4, r5, r6, r7, r8, r10}
-	bx	lr
-.endfunc
-.endm
-
-generate_nearest_scanline_func \
-    pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6, 1, h, 80, 32
-
-generate_nearest_scanline_func \
-    pixman_scaled_nearest_scanline_8888_8888_SRC_asm_armv6, 2,  , 48, 32
diff --git a/pixman/pixman/pixman-arm-simd-asm.h b/pixman/pixman/pixman-arm-simd-asm.h
new file mode 100644
index 000000000..65436062b
--- /dev/null
+++ b/pixman/pixman/pixman-arm-simd-asm.h
@@ -0,0 +1,908 @@
+/*
+ * Copyright © 2012 Raspberry Pi Foundation
+ * Copyright © 2012 RISC OS Open Ltd
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the copyright holders not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  The copyright holders make no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ *
+ * Author:  Ben Avison (bavison@riscosopen.org)
+ *
+ */
+
+/*
+ * Because the alignment of pixel data to cachelines, and even the number of
+ * cachelines per row can vary from row to row, and because of the need to
+ * preload each scanline once and only once, this prefetch strategy treats
+ * each row of pixels independently. When a pixel row is long enough, there
+ * are three distinct phases of prefetch:
+ * * an inner loop section, where each time a cacheline of data is
+ *    processed, another cacheline is preloaded (the exact distance ahead is
+ *    determined empirically using profiling results from lowlevel-blt-bench)
+ * * a leading section, where enough cachelines are preloaded to ensure no
+ *    cachelines escape being preloaded when the inner loop starts
+ * * a trailing section, where a limited number (0 or more) of cachelines
+ *    are preloaded to deal with data (if any) that hangs off the end of the
+ *    last iteration of the inner loop, plus any trailing bytes that were not
+ *    enough to make up one whole iteration of the inner loop
+ * 
+ * There are (in general) three distinct code paths, selected between
+ * depending upon how long the pixel row is. If it is long enough that there
+ * is at least one iteration of the inner loop (as described above) then
+ * this is described as the "wide" case. If it is shorter than that, but
+ * there are still enough bytes output that there is at least one 16-byte-
+ * long, 16-byte-aligned write to the destination (the optimum type of
+ * write), then this is the "medium" case. If it is not even this long, then
+ * this is the "narrow" case, and there is no attempt to align writes to
+ * 16-byte boundaries. In the "medium" and "narrow" cases, all the
+ * cachelines containing data from the pixel row are prefetched up-front.
+ */
+
+/*
+ * Determine whether we put the arguments on the stack for debugging.
+ */
+#undef DEBUG_PARAMS
+
+/*
+ * Bit flags for 'generate_composite_function' macro which are used
+ * to tune generated functions behavior.
+ */
+.set FLAG_DST_WRITEONLY,         0
+.set FLAG_DST_READWRITE,         1
+.set FLAG_COND_EXEC,             0
+.set FLAG_BRANCH_OVER,           2
+.set FLAG_PROCESS_PRESERVES_PSR, 0
+.set FLAG_PROCESS_CORRUPTS_PSR,  4
+.set FLAG_PROCESS_DOESNT_STORE,  0
+.set FLAG_PROCESS_DOES_STORE,    8 /* usually because it needs to conditionally skip it */
+.set FLAG_NO_SPILL_LINE_VARS,        0
+.set FLAG_SPILL_LINE_VARS_WIDE,      16
+.set FLAG_SPILL_LINE_VARS_NON_WIDE,  32
+.set FLAG_SPILL_LINE_VARS,           48
+.set FLAG_PROCESS_CORRUPTS_SCRATCH,  0
+.set FLAG_PROCESS_PRESERVES_SCRATCH, 64
+
+/*
+ * Offset into stack where mask and source pointer/stride can be accessed.
+ */
+#ifdef DEBUG_PARAMS
+.set ARGS_STACK_OFFSET,        (9*4+9*4)
+#else
+.set ARGS_STACK_OFFSET,        (9*4)
+#endif
+
+/*
+ * Constants for selecting preferable prefetch type.
+ */
+.set PREFETCH_TYPE_NONE,       0
+.set PREFETCH_TYPE_STANDARD,   1
+
+/*
+ * Definitions of macros for load/store of pixel data.
+ */
+
+.macro pixldst op, cond=al, numbytes, reg0, reg1, reg2, reg3, base, unaligned=0
+ .if numbytes == 16
+  .if unaligned == 1
+        op&r&cond    WK&reg0, [base], #4
+        op&r&cond    WK&reg1, [base], #4
+        op&r&cond    WK&reg2, [base], #4
+        op&r&cond    WK&reg3, [base], #4
+  .else
+        op&m&cond&ia base!, {WK&reg0,WK&reg1,WK&reg2,WK&reg3}
+  .endif
+ .elseif numbytes == 8
+  .if unaligned == 1
+        op&r&cond    WK&reg0, [base], #4
+        op&r&cond    WK&reg1, [base], #4
+  .else
+        op&m&cond&ia base!, {WK&reg0,WK&reg1}
+  .endif
+ .elseif numbytes == 4
+        op&r&cond    WK&reg0, [base], #4
+ .elseif numbytes == 2
+        op&r&cond&h  WK&reg0, [base], #2
+ .elseif numbytes == 1
+        op&r&cond&b  WK&reg0, [base], #1
+ .else
+  .error "unsupported size: numbytes"
+ .endif
+.endm
+
+.macro pixst_baseupdated cond, numbytes, reg0, reg1, reg2, reg3, base
+ .if numbytes == 16
+        stm&cond&db base, {WK&reg0,WK&reg1,WK&reg2,WK&reg3}
+ .elseif numbytes == 8
+        stm&cond&db base, {WK&reg0,WK&reg1}
+ .elseif numbytes == 4
+        str&cond    WK&reg0, [base, #-4]
+ .elseif numbytes == 2
+        str&cond&h  WK&reg0, [base, #-2]
+ .elseif numbytes == 1
+        str&cond&b  WK&reg0, [base, #-1]
+ .else
+  .error "unsupported size: numbytes"
+ .endif
+.endm
+
+.macro pixld cond, numbytes, firstreg, base, unaligned
+        pixldst ld, cond, numbytes, %(firstreg+0), %(firstreg+1), %(firstreg+2), %(firstreg+3), base, unaligned
+.endm
+
+.macro pixst cond, numbytes, firstreg, base
+ .if (flags) & FLAG_DST_READWRITE
+        pixst_baseupdated cond, numbytes, %(firstreg+0), %(firstreg+1), %(firstreg+2), %(firstreg+3), base
+ .else
+        pixldst st, cond, numbytes, %(firstreg+0), %(firstreg+1), %(firstreg+2), %(firstreg+3), base
+ .endif
+.endm
+
+.macro PF a, x:vararg
+ .if (PREFETCH_TYPE_CURRENT == PREFETCH_TYPE_STANDARD)
+        a x
+ .endif
+.endm
+
+
+.macro preload_leading_step1  bpp, ptr, base
+/* If the destination is already 16-byte aligned, then we need to preload
+ * between 0 and prefetch_distance (inclusive) cache lines ahead so there
+ * are no gaps when the inner loop starts.
+ */
+ .if bpp > 0
+        PF  bic,    ptr, base, #31
+  .set OFFSET, 0
+  .rept prefetch_distance+1
+        PF  pld,    [ptr, #OFFSET]
+   .set OFFSET, OFFSET+32
+  .endr
+ .endif
+.endm
+
+.macro preload_leading_step2  bpp, bpp_shift, ptr, base
+/* However, if the destination is not 16-byte aligned, we may need to
+ * preload more cache lines than that. The question we need to ask is:
+ * are the bytes corresponding to the leading pixels more than the amount
+ * by which the source pointer will be rounded down for preloading, and if
+ * so, by how many cache lines? Effectively, we want to calculate
+ *     leading_bytes = ((-dst)&15)*src_bpp/dst_bpp
+ *     inner_loop_offset = (src+leading_bytes)&31
+ *     extra_needed = leading_bytes - inner_loop_offset
+ * and test if extra_needed is <= 0, <= 32, or > 32 (where > 32 is only
+ * possible when there are 4 src bytes for every 1 dst byte).
+ */
+ .if bpp > 0
+  .ifc base,DST
+        /* The test can be simplified further when preloading the destination */
+        PF  tst,    base, #16
+        PF  beq,    61f
+  .else
+   .if bpp/dst_w_bpp == 4
+        PF  add,    SCRATCH, base, WK0, lsl #bpp_shift-dst_bpp_shift
+        PF  and,    SCRATCH, SCRATCH, #31
+        PF  rsb,    SCRATCH, SCRATCH, WK0, lsl #bpp_shift-dst_bpp_shift
+        PF  sub,    SCRATCH, SCRATCH, #1    /* so now ranges are -16..-1 / 0..31 / 32..63 */
+        PF  movs,   SCRATCH, SCRATCH, #32-6 /* so this sets         NC   /  nc   /   Nc   */
+        PF  bcs,    61f
+        PF  bpl,    60f
+        PF  pld,    [ptr, #32*(prefetch_distance+2)]
+   .else
+        PF  mov,    SCRATCH, base, lsl #32-5
+        PF  add,    SCRATCH, SCRATCH, WK0, lsl #32-5+bpp_shift-dst_bpp_shift
+        PF  rsbs,   SCRATCH, SCRATCH, WK0, lsl #32-5+bpp_shift-dst_bpp_shift
+        PF  bls,    61f
+   .endif
+  .endif
+60:     PF  pld,    [ptr, #32*(prefetch_distance+1)]
+61:
+ .endif
+.endm
+
+#define IS_END_OF_GROUP(INDEX,SIZE) ((SIZE) < 2 || ((INDEX) & ~((INDEX)+1)) & ((SIZE)/2))
+.macro preload_middle   bpp, base, scratch_holds_offset
+ .if bpp > 0
+        /* prefetch distance = 256/bpp, stm distance = 128/dst_w_bpp */
+  .if IS_END_OF_GROUP(SUBBLOCK,256/128*dst_w_bpp/bpp)
+   .if scratch_holds_offset
+        PF  pld,    [base, SCRATCH]
+   .else
+        PF  bic,    SCRATCH, base, #31
+        PF  pld,    [SCRATCH, #32*prefetch_distance]
+   .endif
+  .endif
+ .endif
+.endm
+
+.macro preload_trailing  bpp, bpp_shift, base
+ .if bpp > 0
+  .if bpp*pix_per_block > 256
+        /* Calculations are more complex if more than one fetch per block */
+        PF  and,    WK1, base, #31
+        PF  add,    WK1, WK1, WK0, lsl #bpp_shift
+        PF  add,    WK1, WK1, #32*(bpp*pix_per_block/256-1)*(prefetch_distance+1)
+        PF  bic,    SCRATCH, base, #31
+80:     PF  pld,    [SCRATCH, #32*(prefetch_distance+1)]
+        PF  add,    SCRATCH, SCRATCH, #32
+        PF  subs,   WK1, WK1, #32
+        PF  bhi,    80b
+  .else
+        /* If exactly one fetch per block, then we need either 0, 1 or 2 extra preloads */
+        PF  mov,    SCRATCH, base, lsl #32-5
+        PF  adds,   SCRATCH, SCRATCH, X, lsl #32-5+bpp_shift
+        PF  adceqs, SCRATCH, SCRATCH, #0
+        /* The instruction above has two effects: ensures Z is only
+         * set if C was clear (so Z indicates that both shifted quantities
+         * were 0), and clears C if Z was set (so C indicates that the sum
+         * of the shifted quantities was greater and not equal to 32) */
+        PF  beq,    82f
+        PF  bic,    SCRATCH, base, #31
+        PF  bcc,    81f
+        PF  pld,    [SCRATCH, #32*(prefetch_distance+2)]
+81:     PF  pld,    [SCRATCH, #32*(prefetch_distance+1)]
+82:
+  .endif
+ .endif
+.endm
+
+
+.macro preload_line    narrow_case, bpp, bpp_shift, base
+/* "narrow_case" - just means that the macro was invoked from the "narrow"
+ *    code path rather than the "medium" one - because in the narrow case,
+ *    the row of pixels is known to output no more than 30 bytes, then
+ *    (assuming the source pixels are no wider than the the destination
+ *    pixels) they cannot possibly straddle more than 2 32-byte cachelines,
+ *    meaning there's no need for a loop.
+ * "bpp" - number of bits per pixel in the channel (source, mask or
+ *    destination) that's being preloaded, or 0 if this channel is not used
+ *    for reading
+ * "bpp_shift" - log2 of ("bpp"/8) (except if "bpp"=0 of course)
+ * "base" - base address register of channel to preload (SRC, MASK or DST)
+ */
+ .if bpp > 0
+  .if narrow_case && (bpp <= dst_w_bpp)
+        /* In these cases, each line for each channel is in either 1 or 2 cache lines */
+        PF  bic,    WK0, base, #31
+        PF  pld,    [WK0]
+        PF  add,    WK1, base, X, LSL #bpp_shift
+        PF  sub,    WK1, WK1, #1
+        PF  bic,    WK1, WK1, #31
+        PF  cmp,    WK1, WK0
+        PF  beq,    90f
+        PF  pld,    [WK1]
+90:
+  .else
+        PF  bic,    WK0, base, #31
+        PF  pld,    [WK0]
+        PF  add,    WK1, base, X, lsl #bpp_shift
+        PF  sub,    WK1, WK1, #1
+        PF  bic,    WK1, WK1, #31
+        PF  cmp,    WK1, WK0
+        PF  beq,    92f
+91:     PF  add,    WK0, WK0, #32
+        PF  cmp,    WK0, WK1
+        PF  pld,    [WK0]
+        PF  bne,    91b
+92:
+  .endif
+ .endif
+.endm
+
+
+.macro conditional_process1_helper  cond, process_head, process_tail, numbytes, firstreg, unaligned_src, unaligned_mask, decrementx
+        process_head  cond, numbytes, firstreg, unaligned_src, unaligned_mask, 0
+ .if decrementx
+        sub&cond X, X, #8*numbytes/dst_w_bpp
+ .endif
+        process_tail  cond, numbytes, firstreg
+ .if !((flags) & FLAG_PROCESS_DOES_STORE)
+        pixst   cond, numbytes, firstreg, DST
+ .endif
+.endm
+
+.macro conditional_process1  cond, process_head, process_tail, numbytes, firstreg, unaligned_src, unaligned_mask, decrementx
+ .if (flags) & FLAG_BRANCH_OVER
+  .ifc cond,mi
+        bpl     100f
+  .endif
+  .ifc cond,cs
+        bcc     100f
+  .endif
+  .ifc cond,ne
+        beq     100f
+  .endif
+        conditional_process1_helper  , process_head, process_tail, numbytes, firstreg, unaligned_src, unaligned_mask, decrementx
+100:
+ .else
+        conditional_process1_helper  cond, process_head, process_tail, numbytes, firstreg, unaligned_src, unaligned_mask, decrementx
+ .endif
+.endm
+
+.macro conditional_process2  test, cond1, cond2, process_head, process_tail, numbytes1, numbytes2, firstreg1, firstreg2, unaligned_src, unaligned_mask, decrementx
+ .if (flags) & (FLAG_DST_READWRITE | FLAG_BRANCH_OVER | FLAG_PROCESS_CORRUPTS_PSR | FLAG_PROCESS_DOES_STORE)
+        /* Can't interleave reads and writes */
+        test
+        conditional_process1  cond1, process_head, process_tail, numbytes1, firstreg1, unaligned_src, unaligned_mask, decrementx
+  .if (flags) & FLAG_PROCESS_CORRUPTS_PSR
+        test
+  .endif
+        conditional_process1  cond2, process_head, process_tail, numbytes2, firstreg2, unaligned_src, unaligned_mask, decrementx
+ .else
+        /* Can interleave reads and writes for better scheduling */
+        test
+        process_head  cond1, numbytes1, firstreg1, unaligned_src, unaligned_mask, 0
+        process_head  cond2, numbytes2, firstreg2, unaligned_src, unaligned_mask, 0
+  .if decrementx
+        sub&cond1 X, X, #8*numbytes1/dst_w_bpp
+        sub&cond2 X, X, #8*numbytes2/dst_w_bpp
+  .endif
+        process_tail  cond1, numbytes1, firstreg1
+        process_tail  cond2, numbytes2, firstreg2
+        pixst   cond1, numbytes1, firstreg1, DST
+        pixst   cond2, numbytes2, firstreg2, DST
+ .endif
+.endm
+
+
+.macro test_bits_1_0_ptr
+        movs    SCRATCH, WK0, lsl #32-1  /* C,N = bits 1,0 of DST */
+.endm
+
+.macro test_bits_3_2_ptr
+        movs    SCRATCH, WK0, lsl #32-3  /* C,N = bits 3, 2 of DST */
+.endm
+
+.macro leading_15bytes  process_head, process_tail
+        /* On entry, WK0 bits 0-3 = number of bytes until destination is 16-byte aligned */
+        /* Use unaligned loads in all cases for simplicity */
+ .if dst_w_bpp == 8
+        conditional_process2  test_bits_1_0_ptr, mi, cs, process_head, process_tail, 1, 2, 1, 2, 1, 1, 1
+ .elseif dst_w_bpp == 16
+        test_bits_1_0_ptr
+        conditional_process1  cs, process_head, process_tail, 2, 2, 1, 1, 1
+ .endif
+        conditional_process2  test_bits_3_2_ptr, mi, cs, process_head, process_tail, 4, 8, 1, 2, 1, 1, 1
+.endm
+
+.macro test_bits_3_2_pix
+        movs    SCRATCH, X, lsl #dst_bpp_shift+32-3
+.endm
+
+.macro test_bits_1_0_pix
+ .if dst_w_bpp == 8
+        movs    SCRATCH, X, lsl #dst_bpp_shift+32-1
+ .else
+        movs    SCRATCH, X, lsr #1
+ .endif
+.endm
+
+.macro trailing_15bytes  process_head, process_tail, unaligned_src, unaligned_mask
+        conditional_process2  test_bits_3_2_pix, cs, mi, process_head, process_tail, 8, 4, 0, 2, unaligned_src, unaligned_mask, 0
+ .if dst_w_bpp == 16
+        test_bits_1_0_pix
+        conditional_process1  cs, process_head, process_tail, 2, 0, unaligned_src, unaligned_mask, 0
+ .elseif dst_w_bpp == 8
+        conditional_process2  test_bits_1_0_pix, cs, mi, process_head, process_tail, 2, 1, 0, 1, unaligned_src, unaligned_mask, 0
+ .endif
+.endm
+
+
+.macro wide_case_inner_loop  process_head, process_tail, unaligned_src, unaligned_mask, dst_alignment
+110:
+ .set SUBBLOCK, 0 /* this is a count of STMs; there can be up to 8 STMs per block */
+ .rept pix_per_block*dst_w_bpp/128
+        process_head  , 16, 0, unaligned_src, unaligned_mask, 1
+  .if (src_bpp > 0) && (mask_bpp == 0) && ((flags) & FLAG_PROCESS_PRESERVES_SCRATCH)
+        preload_middle  src_bpp, SRC, 1
+  .elseif (src_bpp == 0) && (mask_bpp > 0) && ((flags) & FLAG_PROCESS_PRESERVES_SCRATCH)
+        preload_middle  mask_bpp, MASK, 1
+  .else
+        preload_middle  src_bpp, SRC, 0
+        preload_middle  mask_bpp, MASK, 0
+  .endif
+  .if (dst_r_bpp > 0) && ((SUBBLOCK % 2) == 0)
+        /* Because we know that writes are 16-byte aligned, it's relatively easy to ensure that
+         * destination prefetches are 32-byte aligned. It's also the easiest channel to offset
+         * preloads for, to achieve staggered prefetches for multiple channels, because there are
+         * always two STMs per prefetch, so there is always an opposite STM on which to put the
+         * preload. Note, no need to BIC the base register here */
+        PF  pld,    [DST, #32*prefetch_distance - dst_alignment]
+  .endif
+        process_tail  , 16, 0
+  .if !((flags) & FLAG_PROCESS_DOES_STORE)
+        pixst   , 16, 0, DST
+  .endif
+  .set SUBBLOCK, SUBBLOCK+1
+ .endr
+        subs    X, X, #pix_per_block
+        bhs     110b
+.endm
+
+.macro wide_case_inner_loop_and_trailing_pixels  process_head, process_tail, process_inner_loop, exit_label, unaligned_src, unaligned_mask
+        /* Destination now 16-byte aligned; we have at least one block before we have to stop preloading */
+ .if dst_r_bpp > 0
+        tst     DST, #16
+        bne     111f
+        process_inner_loop  process_head, process_tail, unaligned_src, unaligned_mask, 16
+        b       112f
+111:
+ .endif
+        process_inner_loop  process_head, process_tail, unaligned_src, unaligned_mask, 0
+112:
+        /* Just before the final (prefetch_distance+1) 32-byte blocks, deal with final preloads */
+ .if (src_bpp*pix_per_block > 256) || (mask_bpp*pix_per_block > 256) || (dst_r_bpp*pix_per_block > 256)
+        PF  and,    WK0, X, #pix_per_block-1
+ .endif
+        preload_trailing  src_bpp, src_bpp_shift, SRC
+        preload_trailing  mask_bpp, mask_bpp_shift, MASK
+        preload_trailing  dst_r_bpp, dst_bpp_shift, DST
+        add     X, X, #(prefetch_distance+2)*pix_per_block - 128/dst_w_bpp
+        /* The remainder of the line is handled identically to the medium case */
+        medium_case_inner_loop_and_trailing_pixels  process_head, process_tail,, exit_label, unaligned_src, unaligned_mask
+.endm
+
+.macro medium_case_inner_loop_and_trailing_pixels  process_head, process_tail, unused, exit_label, unaligned_src, unaligned_mask
+120:
+        process_head  , 16, 0, unaligned_src, unaligned_mask, 0
+        process_tail  , 16, 0
+ .if !((flags) & FLAG_PROCESS_DOES_STORE)
+        pixst   , 16, 0, DST
+ .endif
+        subs    X, X, #128/dst_w_bpp
+        bhs     120b
+        /* Trailing pixels */
+        tst     X, #128/dst_w_bpp - 1
+        beq     exit_label
+        trailing_15bytes  process_head, process_tail, unaligned_src, unaligned_mask
+.endm
+
+.macro narrow_case_inner_loop_and_trailing_pixels  process_head, process_tail, unused, exit_label, unaligned_src, unaligned_mask
+        tst     X, #16*8/dst_w_bpp
+        conditional_process1  ne, process_head, process_tail, 16, 0, unaligned_src, unaligned_mask, 0
+        /* Trailing pixels */
+        /* In narrow case, it's relatively unlikely to be aligned, so let's do without a branch here */
+        trailing_15bytes  process_head, process_tail, unaligned_src, unaligned_mask
+.endm
+
+.macro switch_on_alignment  action, process_head, process_tail, process_inner_loop, exit_label
+ /* Note that if we're reading the destination, it's already guaranteed to be aligned at this point */
+ .if mask_bpp == 8 || mask_bpp == 16
+        tst     MASK, #3
+        bne     141f
+ .endif
+  .if src_bpp == 8 || src_bpp == 16
+        tst     SRC, #3
+        bne     140f
+  .endif
+        action  process_head, process_tail, process_inner_loop, exit_label, 0, 0
+  .if src_bpp == 8 || src_bpp == 16
+        b       exit_label
+140:
+        action  process_head, process_tail, process_inner_loop, exit_label, 1, 0
+  .endif
+ .if mask_bpp == 8 || mask_bpp == 16
+        b       exit_label
+141:
+  .if src_bpp == 8 || src_bpp == 16
+        tst     SRC, #3
+        bne     142f
+  .endif
+        action  process_head, process_tail, process_inner_loop, exit_label, 0, 1
+  .if src_bpp == 8 || src_bpp == 16
+        b       exit_label
+142:
+        action  process_head, process_tail, process_inner_loop, exit_label, 1, 1
+  .endif
+ .endif
+.endm
+
+
+.macro end_of_line      restore_x, vars_spilled, loop_label, last_one
+ .if vars_spilled
+        /* Sadly, GAS doesn't seem have an equivalent of the DCI directive? */
+        /* This is ldmia sp,{} */
+        .word   0xE89D0000 | LINE_SAVED_REGS
+ .endif
+        subs    Y, Y, #1
+ .if vars_spilled
+  .if (LINE_SAVED_REGS) & (1<<1)
+        str     Y, [sp]
+  .endif
+ .endif
+        add     DST, DST, STRIDE_D
+ .if src_bpp > 0
+        add     SRC, SRC, STRIDE_S
+ .endif
+ .if mask_bpp > 0
+        add     MASK, MASK, STRIDE_M
+ .endif
+ .if restore_x
+        mov     X, ORIG_W
+ .endif
+        bhs     loop_label
+ .ifc "last_one",""
+  .if vars_spilled
+        b       197f
+  .else
+        b       198f
+  .endif
+ .else
+  .if (!vars_spilled) && ((flags) & FLAG_SPILL_LINE_VARS)
+        b       198f
+  .endif
+ .endif
+.endm
+
+
+.macro generate_composite_function fname, \
+                                   src_bpp_, \
+                                   mask_bpp_, \
+                                   dst_w_bpp_, \
+                                   flags_, \
+                                   prefetch_distance_, \
+                                   init, \
+                                   newline, \
+                                   cleanup, \
+                                   process_head, \
+                                   process_tail, \
+                                   process_inner_loop
+
+ .func fname
+ .global fname
+ /* For ELF format also set function visibility to hidden */
+#ifdef __ELF__
+ .hidden fname
+ .type fname, %function
+#endif
+
+/*
+ * Make some macro arguments globally visible and accessible
+ * from other macros
+ */
+ .set src_bpp, src_bpp_
+ .set mask_bpp, mask_bpp_
+ .set dst_w_bpp, dst_w_bpp_
+ .set flags, flags_
+ .set prefetch_distance, prefetch_distance_
+
+/*
+ * Select prefetch type for this function.
+ */
+ .if prefetch_distance == 0
+  .set PREFETCH_TYPE_CURRENT, PREFETCH_TYPE_NONE
+ .else
+  .set PREFETCH_TYPE_CURRENT, PREFETCH_TYPE_STANDARD
+ .endif
+
+ .if src_bpp == 32
+  .set src_bpp_shift, 2
+ .elseif src_bpp == 24
+  .set src_bpp_shift, 0
+ .elseif src_bpp == 16
+  .set src_bpp_shift, 1
+ .elseif src_bpp == 8
+  .set src_bpp_shift, 0
+ .elseif src_bpp == 0
+  .set src_bpp_shift, -1
+ .else
+  .error "requested src bpp (src_bpp) is not supported"
+ .endif
+
+ .if mask_bpp == 32
+  .set mask_bpp_shift, 2
+ .elseif mask_bpp == 24
+  .set mask_bpp_shift, 0
+ .elseif mask_bpp == 8
+  .set mask_bpp_shift, 0
+ .elseif mask_bpp == 0
+  .set mask_bpp_shift, -1
+ .else
+  .error "requested mask bpp (mask_bpp) is not supported"
+ .endif
+
+ .if dst_w_bpp == 32
+  .set dst_bpp_shift, 2
+ .elseif dst_w_bpp == 24
+  .set dst_bpp_shift, 0
+ .elseif dst_w_bpp == 16
+  .set dst_bpp_shift, 1
+ .elseif dst_w_bpp == 8
+  .set dst_bpp_shift, 0
+ .else
+  .error "requested dst bpp (dst_w_bpp) is not supported"
+ .endif
+
+ .if (((flags) & FLAG_DST_READWRITE) != 0)
+  .set dst_r_bpp, dst_w_bpp
+ .else
+  .set dst_r_bpp, 0
+ .endif
+
+ .set pix_per_block, 16*8/dst_w_bpp
+ .if src_bpp != 0
+  .if 32*8/src_bpp > pix_per_block
+   .set pix_per_block, 32*8/src_bpp
+  .endif
+ .endif
+ .if mask_bpp != 0
+  .if 32*8/mask_bpp > pix_per_block
+   .set pix_per_block, 32*8/mask_bpp
+  .endif
+ .endif
+ .if dst_r_bpp != 0
+  .if 32*8/dst_r_bpp > pix_per_block
+   .set pix_per_block, 32*8/dst_r_bpp
+  .endif
+ .endif
+
+/* The standard entry conditions set up by pixman-arm-common.h are:
+ * r0 = width (pixels)
+ * r1 = height (rows)
+ * r2 = pointer to top-left pixel of destination
+ * r3 = destination stride (pixels)
+ * [sp] = source pixel value, or pointer to top-left pixel of source
+ * [sp,#4] = 0 or source stride (pixels)
+ * The following arguments are unused for non-mask operations
+ * [sp,#8] = mask pixel value, or pointer to top-left pixel of mask
+ * [sp,#12] = 0 or mask stride (pixels)
+ */
+
+/*
+ * Assign symbolic names to registers
+ */
+    X           .req    r0  /* pixels to go on this line */
+    Y           .req    r1  /* lines to go */
+    DST         .req    r2  /* destination pixel pointer */
+    STRIDE_D    .req    r3  /* destination stride (bytes, minus width) */
+    SRC         .req    r4  /* source pixel pointer */
+    STRIDE_S    .req    r5  /* source stride (bytes, minus width) */
+    MASK        .req    r6  /* mask pixel pointer (if applicable) */
+    STRIDE_M    .req    r7  /* mask stride (bytes, minus width) */
+    WK0         .req    r8  /* pixel data registers */
+    WK1         .req    r9
+    WK2         .req    r10
+    WK3         .req    r11
+    SCRATCH     .req    r12
+    ORIG_W      .req    r14 /* width (pixels) */
+
+fname:
+        push    {r4-r11, lr}        /* save all registers */
+
+        subs    Y, Y, #1
+        blo     199f
+
+#ifdef DEBUG_PARAMS
+        sub     sp, sp, #9*4
+#endif
+
+ .if src_bpp > 0
+        ldr     SRC, [sp, #ARGS_STACK_OFFSET]
+        ldr     STRIDE_S, [sp, #ARGS_STACK_OFFSET+4]
+ .endif
+ .if mask_bpp > 0
+        ldr     MASK, [sp, #ARGS_STACK_OFFSET+8]
+        ldr     STRIDE_M, [sp, #ARGS_STACK_OFFSET+12]
+ .endif
+        
+#ifdef DEBUG_PARAMS
+        add     Y, Y, #1
+        stmia   sp, {r0-r7,pc}
+        sub     Y, Y, #1
+#endif
+
+        init
+        
+        lsl     STRIDE_D, #dst_bpp_shift /* stride in bytes */
+        sub     STRIDE_D, STRIDE_D, X, lsl #dst_bpp_shift
+ .if src_bpp > 0
+        lsl     STRIDE_S, #src_bpp_shift
+        sub     STRIDE_S, STRIDE_S, X, lsl #src_bpp_shift
+ .endif
+ .if mask_bpp > 0
+        lsl     STRIDE_M, #mask_bpp_shift
+        sub     STRIDE_M, STRIDE_M, X, lsl #mask_bpp_shift
+ .endif
+ 
+        /* Are we not even wide enough to have one 16-byte aligned 16-byte block write? */
+        cmp     X, #2*16*8/dst_w_bpp - 1
+        blo     170f
+ .if src_bpp || mask_bpp || dst_r_bpp /* Wide and medium cases are the same for fill */
+        /* To preload ahead on the current line, we need at least (prefetch_distance+2) 32-byte blocks on all prefetch channels */
+        cmp     X, #(prefetch_distance+3)*pix_per_block - 1
+        blo     160f
+
+        /* Wide case */
+        /* Adjust X so that the decrement instruction can also test for
+         * inner loop termination. We want it to stop when there are
+         * (prefetch_distance+1) complete blocks to go. */
+        sub     X, X, #(prefetch_distance+2)*pix_per_block
+        mov     ORIG_W, X
+  .if (flags) & FLAG_SPILL_LINE_VARS_WIDE
+        /* This is stmdb sp!,{} */
+        .word   0xE92D0000 | LINE_SAVED_REGS
+  .endif
+151:    /* New line */
+        newline
+        preload_leading_step1  src_bpp, WK1, SRC
+        preload_leading_step1  mask_bpp, WK2, MASK
+        preload_leading_step1  dst_r_bpp, WK3, DST
+        
+        tst     DST, #15
+        beq     154f
+        rsb     WK0, DST, #0 /* bits 0-3 = number of leading bytes until destination aligned */
+  .if (src_bpp != 0 && src_bpp != 2*dst_w_bpp) || (mask_bpp != 0 && mask_bpp != 2*dst_w_bpp)
+        PF  and,    WK0, WK0, #15
+  .endif
+
+        preload_leading_step2  src_bpp, src_bpp_shift, WK1, SRC
+        preload_leading_step2  mask_bpp, mask_bpp_shift, WK2, MASK
+        preload_leading_step2  dst_r_bpp, dst_bpp_shift, WK3, DST
+
+        leading_15bytes  process_head, process_tail
+        
+154:    /* Destination now 16-byte aligned; we have at least one prefetch on each channel as well as at least one 16-byte output block */
+ .if (src_bpp > 0) && (mask_bpp == 0) && ((flags) & FLAG_PROCESS_PRESERVES_SCRATCH)
+        and     SCRATCH, SRC, #31
+        rsb     SCRATCH, SCRATCH, #32*prefetch_distance
+ .elseif (src_bpp == 0) && (mask_bpp > 0) && ((flags) & FLAG_PROCESS_PRESERVES_SCRATCH)
+        and     SCRATCH, MASK, #31
+        rsb     SCRATCH, SCRATCH, #32*prefetch_distance
+ .endif
+ .ifc "process_inner_loop",""
+        switch_on_alignment  wide_case_inner_loop_and_trailing_pixels, process_head, process_tail, wide_case_inner_loop, 157f
+ .else
+        switch_on_alignment  wide_case_inner_loop_and_trailing_pixels, process_head, process_tail, process_inner_loop, 157f
+ .endif
+
+157:    /* Check for another line */
+        end_of_line 1, %((flags) & FLAG_SPILL_LINE_VARS_WIDE), 151b
+ .endif
+
+ .ltorg
+
+160:    /* Medium case */
+        mov     ORIG_W, X
+ .if (flags) & FLAG_SPILL_LINE_VARS_NON_WIDE
+        /* This is stmdb sp!,{} */
+        .word   0xE92D0000 | LINE_SAVED_REGS
+ .endif
+161:    /* New line */
+        newline
+        preload_line 0, src_bpp, src_bpp_shift, SRC  /* in: X, corrupts: WK0-WK1 */
+        preload_line 0, mask_bpp, mask_bpp_shift, MASK
+        preload_line 0, dst_r_bpp, dst_bpp_shift, DST
+        
+        sub     X, X, #128/dst_w_bpp     /* simplifies inner loop termination */
+        tst     DST, #15
+        beq     164f
+        rsb     WK0, DST, #0 /* bits 0-3 = number of leading bytes until destination aligned */
+        
+        leading_15bytes  process_head, process_tail
+        
+164:    /* Destination now 16-byte aligned; we have at least one 16-byte output block */
+        switch_on_alignment  medium_case_inner_loop_and_trailing_pixels, process_head, process_tail,, 167f
+        
+167:    /* Check for another line */
+        end_of_line 1, %((flags) & FLAG_SPILL_LINE_VARS_NON_WIDE), 161b
+
+ .ltorg
+
+170:    /* Narrow case, less than 31 bytes, so no guarantee of at least one 16-byte block */
+ .if dst_w_bpp < 32
+        mov     ORIG_W, X
+ .endif
+ .if (flags) & FLAG_SPILL_LINE_VARS_NON_WIDE
+        /* This is stmdb sp!,{} */
+        .word   0xE92D0000 | LINE_SAVED_REGS
+ .endif
+171:    /* New line */
+        newline
+        preload_line 1, src_bpp, src_bpp_shift, SRC  /* in: X, corrupts: WK0-WK1 */
+        preload_line 1, mask_bpp, mask_bpp_shift, MASK
+        preload_line 1, dst_r_bpp, dst_bpp_shift, DST
+        
+ .if dst_w_bpp == 8
+        tst     DST, #3
+        beq     174f
+172:    subs    X, X, #1
+        blo     177f
+        process_head  , 1, 0, 1, 1, 0
+        process_tail  , 1, 0
+  .if !((flags) & FLAG_PROCESS_DOES_STORE)
+        pixst   , 1, 0, DST
+  .endif
+        tst     DST, #3
+        bne     172b
+ .elseif dst_w_bpp == 16
+        tst     DST, #2
+        beq     174f
+        subs    X, X, #1
+        blo     177f
+        process_head  , 2, 0, 1, 1, 0
+        process_tail  , 2, 0
+  .if !((flags) & FLAG_PROCESS_DOES_STORE)
+        pixst   , 2, 0, DST
+  .endif
+ .endif
+
+174:    /* Destination now 4-byte aligned; we have 0 or more output bytes to go */
+        switch_on_alignment  narrow_case_inner_loop_and_trailing_pixels, process_head, process_tail,, 177f
+
+177:    /* Check for another line */
+        end_of_line %(dst_w_bpp < 32), %((flags) & FLAG_SPILL_LINE_VARS_NON_WIDE), 171b, last_one
+
+197:
+ .if (flags) & FLAG_SPILL_LINE_VARS
+        add     sp, sp, #LINE_SAVED_REG_COUNT*4
+ .endif
+198:
+        cleanup
+
+#ifdef DEBUG_PARAMS
+        add     sp, sp, #9*4 /* junk the debug copy of arguments */
+#endif
+199:
+        pop     {r4-r11, pc}  /* exit */
+
+ .ltorg
+
+    .unreq  X
+    .unreq  Y
+    .unreq  DST
+    .unreq  STRIDE_D
+    .unreq  SRC
+    .unreq  STRIDE_S
+    .unreq  MASK
+    .unreq  STRIDE_M
+    .unreq  WK0
+    .unreq  WK1
+    .unreq  WK2
+    .unreq  WK3
+    .unreq  SCRATCH
+    .unreq  ORIG_W
+    .endfunc
+.endm
+
+.macro line_saved_regs  x:vararg
+ .set LINE_SAVED_REGS, 0
+ .set LINE_SAVED_REG_COUNT, 0
+ .irp SAVED_REG,x
+  .ifc "SAVED_REG","Y"
+   .set LINE_SAVED_REGS, LINE_SAVED_REGS | (1<<1)
+   .set LINE_SAVED_REG_COUNT, LINE_SAVED_REG_COUNT + 1
+  .endif
+  .ifc "SAVED_REG","STRIDE_D"
+   .set LINE_SAVED_REGS, LINE_SAVED_REGS | (1<<3)
+   .set LINE_SAVED_REG_COUNT, LINE_SAVED_REG_COUNT + 1
+  .endif
+  .ifc "SAVED_REG","STRIDE_S"
+   .set LINE_SAVED_REGS, LINE_SAVED_REGS | (1<<5)
+   .set LINE_SAVED_REG_COUNT, LINE_SAVED_REG_COUNT + 1
+  .endif
+  .ifc "SAVED_REG","STRIDE_M"
+   .set LINE_SAVED_REGS, LINE_SAVED_REGS | (1<<7)
+   .set LINE_SAVED_REG_COUNT, LINE_SAVED_REG_COUNT + 1
+  .endif
+  .ifc "SAVED_REG","ORIG_W"
+   .set LINE_SAVED_REGS, LINE_SAVED_REGS | (1<<14)
+   .set LINE_SAVED_REG_COUNT, LINE_SAVED_REG_COUNT + 1
+  .endif
+ .endr
+.endm
+
+.macro nop_macro x:vararg
+.endm
diff --git a/pixman/pixman/pixman-arm-simd.c b/pixman/pixman/pixman-arm-simd.c
index 94f9a0caf..af062e19d 100644
--- a/pixman/pixman/pixman-arm-simd.c
+++ b/pixman/pixman/pixman-arm-simd.c
@@ -31,369 +31,191 @@
 #include "pixman-arm-common.h"
 #include "pixman-inlines.h"
 
-#if 0 /* This code was moved to 'pixman-arm-simd-asm.S' */
-
-void
-pixman_composite_add_8_8_asm_armv6 (int32_t  width,
-				    int32_t  height,
-				    uint8_t *dst_line,
-				    int32_t  dst_stride,
-				    uint8_t *src_line,
-				    int32_t  src_stride)
-{
-    uint8_t *dst, *src;
-    int32_t w;
-    uint8_t s, d;
-
-    while (height--)
-    {
-	dst = dst_line;
-	dst_line += dst_stride;
-	src = src_line;
-	src_line += src_stride;
-	w = width;
-
-	/* ensure both src and dst are properly aligned before doing 32 bit reads
-	 * we'll stay in this loop if src and dst have differing alignments
-	 */
-	while (w && (((uintptr_t)dst & 3) || ((uintptr_t)src & 3)))
-	{
-	    s = *src;
-	    d = *dst;
-	    asm ("uqadd8 %0, %1, %2" : "+r" (d) : "r" (s));
-	    *dst = d;
-
-	    dst++;
-	    src++;
-	    w--;
-	}
+PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, src_8888_8888,
+		                   uint32_t, 1, uint32_t, 1)
+PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, src_x888_8888,
+                                   uint32_t, 1, uint32_t, 1)
+PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, src_0565_0565,
+                                   uint16_t, 1, uint16_t, 1)
+PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, src_8_8,
+                                   uint8_t, 1, uint8_t, 1)
+PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, src_0565_8888,
+                                   uint16_t, 1, uint32_t, 1)
 
-	while (w >= 4)
-	{
-	    asm ("uqadd8 %0, %1, %2"
-		 : "=r" (*(uint32_t*)dst)
-		 : "r" (*(uint32_t*)src), "r" (*(uint32_t*)dst));
-	    dst += 4;
-	    src += 4;
-	    w -= 4;
-	}
+PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, add_8_8,
+                                   uint8_t, 1, uint8_t, 1)
+PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, over_8888_8888,
+                                   uint32_t, 1, uint32_t, 1)
 
-	while (w)
-	{
-	    s = *src;
-	    d = *dst;
-	    asm ("uqadd8 %0, %1, %2" : "+r" (d) : "r" (s));
-	    *dst = d;
+PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST (SKIP_ZERO_MASK, armv6, over_8888_n_8888,
+                                     uint32_t, 1, uint32_t, 1)
 
-	    dst++;
-	    src++;
-	    w--;
-	}
-    }
+PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, armv6, over_n_8_8888,
+                                      uint8_t, 1, uint32_t, 1)
 
-}
+PIXMAN_ARM_BIND_SCALED_NEAREST_SRC_DST (armv6, 0565_0565, SRC,
+                                        uint16_t, uint16_t)
+PIXMAN_ARM_BIND_SCALED_NEAREST_SRC_DST (armv6, 8888_8888, SRC,
+                                        uint32_t, uint32_t)
 
 void
-pixman_composite_over_8888_8888_asm_armv6 (int32_t   width,
-                                           int32_t   height,
-                                           uint32_t *dst_line,
-                                           int32_t   dst_stride,
-                                           uint32_t *src_line,
-                                           int32_t   src_stride)
-{
-    uint32_t    *dst;
-    uint32_t    *src;
-    int32_t w;
-    uint32_t component_half = 0x800080;
-    uint32_t upper_component_mask = 0xff00ff00;
-    uint32_t alpha_mask = 0xff;
-
-    while (height--)
-    {
-	dst = dst_line;
-	dst_line += dst_stride;
-	src = src_line;
-	src_line += src_stride;
-	w = width;
+pixman_composite_src_n_8888_asm_armv6 (int32_t   w,
+                                       int32_t   h,
+                                       uint32_t *dst,
+                                       int32_t   dst_stride,
+                                       uint32_t  src);
 
-/* #define inner_branch */
-	asm volatile (
-	    "cmp %[w], #0\n\t"
-	    "beq 2f\n\t"
-	    "1:\n\t"
-	    /* load src */
-	    "ldr r5, [%[src]], #4\n\t"
-#ifdef inner_branch
-	    /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
-	     * The 0x0 case also allows us to avoid doing an unecessary data
-	     * write which is more valuable so we only check for that
-	     */
-	    "cmp r5, #0\n\t"
-	    "beq 3f\n\t"
-
-	    /* = 255 - alpha */
-	    "sub r8, %[alpha_mask], r5, lsr #24\n\t"
-
-	    "ldr r4, [%[dest]] \n\t"
-
-#else
-	    "ldr r4, [%[dest]] \n\t"
-
-	    /* = 255 - alpha */
-	    "sub r8, %[alpha_mask], r5, lsr #24\n\t"
-#endif
-	    "uxtb16 r6, r4\n\t"
-	    "uxtb16 r7, r4, ror #8\n\t"
-
-	    /* multiply by 257 and divide by 65536 */
-	    "mla r6, r6, r8, %[component_half]\n\t"
-	    "mla r7, r7, r8, %[component_half]\n\t"
-
-	    "uxtab16 r6, r6, r6, ror #8\n\t"
-	    "uxtab16 r7, r7, r7, ror #8\n\t"
-
-	    /* recombine the 0xff00ff00 bytes of r6 and r7 */
-	    "and r7, r7, %[upper_component_mask]\n\t"
-	    "uxtab16 r6, r7, r6, ror #8\n\t"
-
-	    "uqadd8 r5, r6, r5\n\t"
-
-#ifdef inner_branch
-	    "3:\n\t"
-
-#endif
-	    "str r5, [%[dest]], #4\n\t"
-	    /* increment counter and jmp to top */
-	    "subs	%[w], %[w], #1\n\t"
-	    "bne	1b\n\t"
-	    "2:\n\t"
-	    : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
-	    : [component_half] "r" (component_half), [upper_component_mask] "r" (upper_component_mask),
-	      [alpha_mask] "r" (alpha_mask)
-	    : "r4", "r5", "r6", "r7", "r8", "cc", "memory"
-	    );
-    }
-}
+void
+pixman_composite_src_n_0565_asm_armv6 (int32_t   w,
+                                       int32_t   h,
+                                       uint16_t *dst,
+                                       int32_t   dst_stride,
+                                       uint16_t  src);
 
 void
-pixman_composite_over_8888_n_8888_asm_armv6 (int32_t   width,
-                                             int32_t   height,
-                                             uint32_t *dst_line,
-                                             int32_t   dst_stride,
-                                             uint32_t *src_line,
-                                             int32_t   src_stride,
-                                             uint32_t  mask)
+pixman_composite_src_n_8_asm_armv6 (int32_t   w,
+                                    int32_t   h,
+                                    uint8_t  *dst,
+                                    int32_t   dst_stride,
+                                    uint8_t  src);
+
+static pixman_bool_t
+arm_simd_fill (pixman_implementation_t *imp,
+               uint32_t *               bits,
+               int                      stride, /* in 32-bit words */
+               int                      bpp,
+               int                      x,
+               int                      y,
+               int                      width,
+               int                      height,
+               uint32_t                 _xor)
 {
-    uint32_t *dst;
-    uint32_t *src;
-    int32_t w;
-    uint32_t component_half = 0x800080;
-    uint32_t alpha_mask = 0xff;
-
-    mask = (mask) >> 24;
+    /* stride is always multiple of 32bit units in pixman */
+    uint32_t byte_stride = stride * sizeof(uint32_t);
 
-    while (height--)
+    switch (bpp)
     {
-	dst = dst_line;
-	dst_line += dst_stride;
-	src = src_line;
-	src_line += src_stride;
-	w = width;
-
-/* #define inner_branch */
-	asm volatile (
-	    "cmp %[w], #0\n\t"
-	    "beq 2f\n\t"
-	    "1:\n\t"
-	    /* load src */
-	    "ldr r5, [%[src]], #4\n\t"
-#ifdef inner_branch
-	    /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
-	     * The 0x0 case also allows us to avoid doing an unecessary data
-	     * write which is more valuable so we only check for that
-	     */
-	    "cmp r5, #0\n\t"
-	    "beq 3f\n\t"
-
-#endif
-	    "ldr r4, [%[dest]] \n\t"
-
-	    "uxtb16 r6, r5\n\t"
-	    "uxtb16 r7, r5, ror #8\n\t"
-
-	    /* multiply by alpha (r8) then by 257 and divide by 65536 */
-	    "mla r6, r6, %[mask_alpha], %[component_half]\n\t"
-	    "mla r7, r7, %[mask_alpha], %[component_half]\n\t"
-
-	    "uxtab16 r6, r6, r6, ror #8\n\t"
-	    "uxtab16 r7, r7, r7, ror #8\n\t"
-
-	    "uxtb16 r6, r6, ror #8\n\t"
-	    "uxtb16 r7, r7, ror #8\n\t"
-
-	    /* recombine */
-	    "orr r5, r6, r7, lsl #8\n\t"
-
-	    "uxtb16 r6, r4\n\t"
-	    "uxtb16 r7, r4, ror #8\n\t"
-
-	    /* 255 - alpha */
-	    "sub r8, %[alpha_mask], r5, lsr #24\n\t"
-
-	    /* multiply by alpha (r8) then by 257 and divide by 65536 */
-	    "mla r6, r6, r8, %[component_half]\n\t"
-	    "mla r7, r7, r8, %[component_half]\n\t"
-
-	    "uxtab16 r6, r6, r6, ror #8\n\t"
-	    "uxtab16 r7, r7, r7, ror #8\n\t"
-
-	    "uxtb16 r6, r6, ror #8\n\t"
-	    "uxtb16 r7, r7, ror #8\n\t"
-
-	    /* recombine */
-	    "orr r6, r6, r7, lsl #8\n\t"
-
-	    "uqadd8 r5, r6, r5\n\t"
-
-#ifdef inner_branch
-	    "3:\n\t"
-
-#endif
-	    "str r5, [%[dest]], #4\n\t"
-	    /* increment counter and jmp to top */
-	    "subs	%[w], %[w], #1\n\t"
-	    "bne	1b\n\t"
-	    "2:\n\t"
-	    : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
-	    : [component_half] "r" (component_half), [mask_alpha] "r" (mask),
-	      [alpha_mask] "r" (alpha_mask)
-	    : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory"
-	    );
+    case 8:
+	pixman_composite_src_n_8_asm_armv6 (
+		width,
+		height,
+		(uint8_t *)(((char *) bits) + y * byte_stride + x),
+		byte_stride,
+		_xor & 0xff);
+	return TRUE;
+    case 16:
+	pixman_composite_src_n_0565_asm_armv6 (
+		width,
+		height,
+		(uint16_t *)(((char *) bits) + y * byte_stride + x * 2),
+		byte_stride / 2,
+		_xor & 0xffff);
+	return TRUE;
+    case 32:
+	pixman_composite_src_n_8888_asm_armv6 (
+		width,
+		height,
+		(uint32_t *)(((char *) bits) + y * byte_stride + x * 4),
+		byte_stride / 4,
+		_xor);
+	return TRUE;
+    default:
+	return FALSE;
     }
 }
 
-void
-pixman_composite_over_n_8_8888_asm_armv6 (int32_t   width,
-                                          int32_t   height,
-                                          uint32_t *dst_line,
-                                          int32_t   dst_stride,
-                                          uint32_t  src,
-                                          int32_t   unused,
-                                          uint8_t  *mask_line,
-                                          int32_t   mask_stride)
+static pixman_bool_t
+arm_simd_blt (pixman_implementation_t *imp,
+              uint32_t *               src_bits,
+              uint32_t *               dst_bits,
+              int                      src_stride, /* in 32-bit words */
+              int                      dst_stride, /* in 32-bit words */
+              int                      src_bpp,
+              int                      dst_bpp,
+              int                      src_x,
+              int                      src_y,
+              int                      dest_x,
+              int                      dest_y,
+              int                      width,
+              int                      height)
 {
-    uint32_t  srca;
-    uint32_t *dst;
-    uint8_t  *mask;
-    int32_t w;
-
-    srca = src >> 24;
-
-    uint32_t component_mask = 0xff00ff;
-    uint32_t component_half = 0x800080;
-
-    uint32_t src_hi = (src >> 8) & component_mask;
-    uint32_t src_lo = src & component_mask;
+    if (src_bpp != dst_bpp)
+	return FALSE;
 
-    while (height--)
+    switch (src_bpp)
     {
-	dst = dst_line;
-	dst_line += dst_stride;
-	mask = mask_line;
-	mask_line += mask_stride;
-	w = width;
-
-/* #define inner_branch */
-	asm volatile (
-	    "cmp %[w], #0\n\t"
-	    "beq 2f\n\t"
-	    "1:\n\t"
-	    /* load mask */
-	    "ldrb r5, [%[mask]], #1\n\t"
-#ifdef inner_branch
-	    /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
-	     * The 0x0 case also allows us to avoid doing an unecessary data
-	     * write which is more valuable so we only check for that
-	     */
-	    "cmp r5, #0\n\t"
-	    "beq 3f\n\t"
-
-#endif
-	    "ldr r4, [%[dest]] \n\t"
-
-	    /* multiply by alpha (r8) then by 257 and divide by 65536 */
-	    "mla r6, %[src_lo], r5, %[component_half]\n\t"
-	    "mla r7, %[src_hi], r5, %[component_half]\n\t"
-
-	    "uxtab16 r6, r6, r6, ror #8\n\t"
-	    "uxtab16 r7, r7, r7, ror #8\n\t"
-
-	    "uxtb16 r6, r6, ror #8\n\t"
-	    "uxtb16 r7, r7, ror #8\n\t"
-
-	    /* recombine */
-	    "orr r5, r6, r7, lsl #8\n\t"
-
-	    "uxtb16 r6, r4\n\t"
-	    "uxtb16 r7, r4, ror #8\n\t"
-
-	    /* we could simplify this to use 'sub' if we were
-	     * willing to give up a register for alpha_mask
-	     */
-	    "mvn r8, r5\n\t"
-	    "mov r8, r8, lsr #24\n\t"
-
-	    /* multiply by alpha (r8) then by 257 and divide by 65536 */
-	    "mla r6, r6, r8, %[component_half]\n\t"
-	    "mla r7, r7, r8, %[component_half]\n\t"
-
-	    "uxtab16 r6, r6, r6, ror #8\n\t"
-	    "uxtab16 r7, r7, r7, ror #8\n\t"
-
-	    "uxtb16 r6, r6, ror #8\n\t"
-	    "uxtb16 r7, r7, ror #8\n\t"
-
-	    /* recombine */
-	    "orr r6, r6, r7, lsl #8\n\t"
-
-	    "uqadd8 r5, r6, r5\n\t"
-
-#ifdef inner_branch
-	    "3:\n\t"
-
-#endif
-	    "str r5, [%[dest]], #4\n\t"
-	    /* increment counter and jmp to top */
-	    "subs	%[w], %[w], #1\n\t"
-	    "bne	1b\n\t"
-	    "2:\n\t"
-	    : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src), [mask] "+r" (mask)
-	    : [component_half] "r" (component_half),
-	      [src_hi] "r" (src_hi), [src_lo] "r" (src_lo)
-	    : "r4", "r5", "r6", "r7", "r8", "cc", "memory");
+    case 8:
+        pixman_composite_src_8_8_asm_armv6 (
+                width, height,
+                (uint8_t *)(((char *) dst_bits) +
+                dest_y * dst_stride * 4 + dest_x * 1), dst_stride * 4,
+                (uint8_t *)(((char *) src_bits) +
+                src_y * src_stride * 4 + src_x * 1), src_stride * 4);
+        return TRUE;
+    case 16:
+	pixman_composite_src_0565_0565_asm_armv6 (
+		width, height,
+		(uint16_t *)(((char *) dst_bits) +
+		dest_y * dst_stride * 4 + dest_x * 2), dst_stride * 2,
+		(uint16_t *)(((char *) src_bits) +
+		src_y * src_stride * 4 + src_x * 2), src_stride * 2);
+	return TRUE;
+    case 32:
+	pixman_composite_src_8888_8888_asm_armv6 (
+		width, height,
+		(uint32_t *)(((char *) dst_bits) +
+		dest_y * dst_stride * 4 + dest_x * 4), dst_stride,
+		(uint32_t *)(((char *) src_bits) +
+		src_y * src_stride * 4 + src_x * 4), src_stride);
+	return TRUE;
+    default:
+	return FALSE;
     }
 }
 
-#endif
-
-PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, add_8_8,
-                                   uint8_t, 1, uint8_t, 1)
-PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, over_8888_8888,
-                                   uint32_t, 1, uint32_t, 1)
-
-PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST (SKIP_ZERO_MASK, armv6, over_8888_n_8888,
-                                     uint32_t, 1, uint32_t, 1)
-
-PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, armv6, over_n_8_8888,
-                                      uint8_t, 1, uint32_t, 1)
-
-PIXMAN_ARM_BIND_SCALED_NEAREST_SRC_DST (armv6, 0565_0565, SRC,
-                                        uint16_t, uint16_t)
-PIXMAN_ARM_BIND_SCALED_NEAREST_SRC_DST (armv6, 8888_8888, SRC,
-                                        uint32_t, uint32_t)
-
 static const pixman_fast_path_t arm_simd_fast_paths[] =
 {
+    PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, a8r8g8b8, armv6_composite_src_8888_8888),
+    PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, a8b8g8r8, armv6_composite_src_8888_8888),
+    PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, x8r8g8b8, armv6_composite_src_8888_8888),
+    PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, x8b8g8r8, armv6_composite_src_8888_8888),
+    PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, x8r8g8b8, armv6_composite_src_8888_8888),
+    PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, x8b8g8r8, armv6_composite_src_8888_8888),
+
+    PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, a8b8g8r8, armv6_composite_src_x888_8888),
+    PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, a8r8g8b8, armv6_composite_src_x888_8888),
+
+    PIXMAN_STD_FAST_PATH (SRC, r5g6b5, null, r5g6b5, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, b5g6r5, null, b5g6r5, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, a1r5g5b5, null, a1r5g5b5, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, a1b5g5r5, null, a1b5g5r5, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, a1r5g5b5, null, x1r5g5b5, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, a1b5g5r5, null, x1b5g5r5, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, x1r5g5b5, null, x1r5g5b5, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, x1b5g5r5, null, x1b5g5r5, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, a4r4g4b4, null, a4r4g4b4, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, a4b4g4r4, null, a4b4g4r4, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, a4r4g4b4, null, x4r4g4b4, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, a4b4g4r4, null, x4b4g4r4, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, x4r4g4b4, null, x4r4g4b4, armv6_composite_src_0565_0565),
+    PIXMAN_STD_FAST_PATH (SRC, x4b4g4r4, null, x4b4g4r4, armv6_composite_src_0565_0565),
+
+    PIXMAN_STD_FAST_PATH (SRC, a8, null, a8, armv6_composite_src_8_8),
+    PIXMAN_STD_FAST_PATH (SRC, r3g3b2, null, r3g3b2, armv6_composite_src_8_8),
+    PIXMAN_STD_FAST_PATH (SRC, b2g3r3, null, b2g3r3, armv6_composite_src_8_8),
+    PIXMAN_STD_FAST_PATH (SRC, a2r2g2b2, null, a2r2g2b2, armv6_composite_src_8_8),
+    PIXMAN_STD_FAST_PATH (SRC, a2b2g2r2, null, a2b2g2r2, armv6_composite_src_8_8),
+    PIXMAN_STD_FAST_PATH (SRC, c8, null, c8, armv6_composite_src_8_8),
+    PIXMAN_STD_FAST_PATH (SRC, g8, null, g8, armv6_composite_src_8_8),
+    PIXMAN_STD_FAST_PATH (SRC, x4a4, null, x4a4, armv6_composite_src_8_8),
+    PIXMAN_STD_FAST_PATH (SRC, x4c4, null, x4c4, armv6_composite_src_8_8),
+    PIXMAN_STD_FAST_PATH (SRC, x4g4, null, x4g4, armv6_composite_src_8_8),
+
+    PIXMAN_STD_FAST_PATH (SRC, r5g6b5, null, a8r8g8b8, armv6_composite_src_0565_8888),
+    PIXMAN_STD_FAST_PATH (SRC, r5g6b5, null, x8r8g8b8, armv6_composite_src_0565_8888),
+    PIXMAN_STD_FAST_PATH (SRC, b5g6r5, null, a8b8g8r8, armv6_composite_src_0565_8888),
+    PIXMAN_STD_FAST_PATH (SRC, b5g6r5, null, x8b8g8r8, armv6_composite_src_0565_8888),
+
     PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, a8r8g8b8, armv6_composite_over_8888_8888),
     PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, x8r8g8b8, armv6_composite_over_8888_8888),
     PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, a8b8g8r8, armv6_composite_over_8888_8888),
@@ -428,5 +250,8 @@ _pixman_implementation_create_arm_simd (pixman_implementation_t *fallback)
 {
     pixman_implementation_t *imp = _pixman_implementation_create (fallback, arm_simd_fast_paths);
 
+    imp->blt = arm_simd_blt;
+    imp->fill = arm_simd_fill;
+
     return imp;
 }
diff --git a/pixman/pixman/pixman-combine-float.c b/pixman/pixman/pixman-combine-float.c
index c916df8a3..06ce2037e 100644
--- a/pixman/pixman/pixman-combine-float.c
+++ b/pixman/pixman/pixman-combine-float.c
@@ -653,10 +653,12 @@ clip_color (rgb_t *color, float a)
     float l = get_lum (color);
     float n = channel_min (color);
     float x = channel_max (color);
+    float t;
 
     if (n < 0.0f)
     {
-	if ((l - n) < 4 * FLT_EPSILON)
+	t = l - n;
+	if (IS_ZERO (t))
 	{
 	    color->r = 0.0f;
 	    color->g = 0.0f;
@@ -664,14 +666,15 @@ clip_color (rgb_t *color, float a)
 	}
 	else
 	{
-	    color->r = l + (((color->r - l) * l) / (l - n));
-	    color->g = l + (((color->g - l) * l) / (l - n));
-	    color->b = l + (((color->b - l) * l) / (l - n));
+	    color->r = l + (((color->r - l) * l) / t);
+	    color->g = l + (((color->g - l) * l) / t);
+	    color->b = l + (((color->b - l) * l) / t);
 	}
     }
     if (x > a)
     {
-	if ((x - l) < 4 * FLT_EPSILON)
+	t = x - l;
+	if (IS_ZERO (t))
 	{
 	    color->r = a;
 	    color->g = a;
@@ -679,9 +682,9 @@ clip_color (rgb_t *color, float a)
 	}
 	else
 	{
-	    color->r = l + (((color->r - l) * (a - l) / (x - l)));
-	    color->g = l + (((color->g - l) * (a - l) / (x - l)));
-	    color->b = l + (((color->b - l) * (a - l) / (x - l)));
+	    color->r = l + (((color->r - l) * (a - l) / t));
+	    color->g = l + (((color->g - l) * (a - l) / t));
+	    color->b = l + (((color->b - l) * (a - l) / t));
 	}
     }
 }
@@ -702,6 +705,7 @@ static void
 set_sat (rgb_t *src, float sat)
 {
     float *max, *mid, *min;
+    float t;
 
     if (src->r > src->g)
     {
@@ -752,14 +756,16 @@ set_sat (rgb_t *src, float sat)
 	}
     }
 
-    if (*max > *min)
+    t = *max - *min;
+
+    if (IS_ZERO (t))
     {
-	*mid = (((*mid - *min) * sat) / (*max - *min));
-	*max = sat;
+	*mid = *max = 0.0f;
     }
     else
     {
-	*mid = *max = 0.0f;
+	*mid = ((*mid - *min) * sat) / t;
+	*max = sat;
     }
 
     *min = 0.0f;
diff --git a/pixman/test/lowlevel-blt-bench.c b/pixman/test/lowlevel-blt-bench.c
index 7336fa0d5..8e80b4280 100644
--- a/pixman/test/lowlevel-blt-bench.c
+++ b/pixman/test/lowlevel-blt-bench.c
@@ -33,6 +33,14 @@
 #define L1CACHE_SIZE (8 * 1024)
 #define L2CACHE_SIZE (128 * 1024)
 
+/* This is applied to both L1 and L2 tests - alternatively, you could
+ * parameterise bench_L or split it into two functions. It could be
+ * read at runtime on some architectures, but it only really matters
+ * that it's a number that's an integer divisor of both cacheline
+ * lengths, and further, it only really matters for caches that don't
+ * do allocate0on-write. */
+#define CACHELINE_LENGTH (32) /* bytes */
+
 #define WIDTH  1920
 #define HEIGHT 1080
 #define BUFSIZE (WIDTH * HEIGHT * 4)
@@ -168,18 +176,29 @@ bench_L  (pixman_op_t              op,
           int                      width,
           int                      lines_count)
 {
-    int64_t      i, j;
+    int64_t      i, j, k;
     int          x = 0;
     int          q = 0;
     volatile int qx;
 
     for (i = 0; i < n; i++)
     {
-	/* touch destination buffer to fetch it into L1 cache */
-	for (j = 0; j < width + 64; j += 16) {
-	    q += dst[j];
-	    q += src[j];
-	}
+        /* For caches without allocate-on-write, we need to force the
+         * destination buffer back into the cache on each iteration,
+         * otherwise if they are evicted during the test, they remain
+         * uncached. This doesn't matter for tests which read the
+         * destination buffer, or for caches that do allocate-on-write,
+         * but in those cases this loop just adds constant time, which
+         * should be successfully cancelled out.
+         */
+        for (j = 0; j < lines_count; j++)
+        {
+            for (k = 0; k < width + 62; k += CACHELINE_LENGTH / sizeof *dst)
+            {
+                q += dst[j * WIDTH + k];
+            }
+            q += dst[j * WIDTH + width + 62];
+        }
 	if (++x >= 64)
 	    x = 0;
 	call_func (func, op, src_img, mask_img, dst_img, x, 0, x, 0, 63 - x, 0, width, lines_count);
diff --git a/pixman/test/stress-test.c b/pixman/test/stress-test.c
index 9d949afad..1f03c7543 100644
--- a/pixman/test/stress-test.c
+++ b/pixman/test/stress-test.c
@@ -205,13 +205,21 @@ rand_y (pixman_image_t *image)
 	return log_rand ();
 }
 
+typedef enum
+{
+    DONT_CARE,
+    PREFER_ALPHA,
+    REQUIRE_ALPHA
+} alpha_preference_t;
+
 static pixman_format_code_t
-random_format (pixman_bool_t prefer_alpha)
+random_format (alpha_preference_t alpha)
 {
     pixman_format_code_t format;
     int n = prng_rand_n (ARRAY_LENGTH (image_formats));
 
-    if (prefer_alpha && prng_rand_n (4) != 0)
+    if (alpha >= PREFER_ALPHA &&
+	(alpha == REQUIRE_ALPHA || prng_rand_n (4) != 0))
     {
         do
         {
@@ -227,7 +235,7 @@ random_format (pixman_bool_t prefer_alpha)
 }
 
 static pixman_image_t *
-create_random_bits_image (pixman_bool_t prefer_alpha)
+create_random_bits_image (alpha_preference_t alpha_preference)
 {
     pixman_format_code_t format;
     pixman_indexed_t *indexed;
@@ -241,7 +249,7 @@ create_random_bits_image (pixman_bool_t prefer_alpha)
     int n_coefficients = 0;
 
     /* format */
-    format = random_format (prefer_alpha);
+    format = random_format (alpha_preference);
 
     indexed = NULL;
     if (PIXMAN_FORMAT_TYPE (format) == PIXMAN_TYPE_COLOR)
@@ -410,7 +418,7 @@ set_general_properties (pixman_image_t *image, pixman_bool_t allow_alpha_map)
 	pixman_image_t *alpha_map;
 	int16_t x, y;
 
-	alpha_map = create_random_bits_image (FALSE);
+	alpha_map = create_random_bits_image (DONT_CARE);
 
 	if (alpha_map)
 	{
@@ -493,7 +501,7 @@ set_general_properties (pixman_image_t *image, pixman_bool_t allow_alpha_map)
 		    width = INT32_MAX - x;
 		if (height + y < y)
 		    height = INT32_MAX - y;
-		
+
 		pixman_region32_union_rect (
 		    &region, &region, x, y, width, height);
 	    }
@@ -716,7 +724,7 @@ create_random_image (void)
     {
     default:
     case 0:
-	result = create_random_bits_image (FALSE);
+	result = create_random_bits_image (DONT_CARE);
 	break;
 
     case 1:
@@ -848,62 +856,66 @@ run_test (uint32_t seed, pixman_bool_t verbose, uint32_t mod)
     }
 
     source = mask = dest = NULL;
-    
+
     prng_srand (seed);
 
     if (prng_rand_n (8) == 0)
     {
         int n_traps;
         pixman_trapezoid_t *trapezoids;
+	int p = prng_rand_n (3);
 
-        dest = create_random_bits_image (TRUE);
+	if (p == 0)
+	    dest = create_random_bits_image (DONT_CARE);
+	else
+	    dest = create_random_bits_image (REQUIRE_ALPHA);
 
-        if (dest)
-        {
-            set_general_properties (dest, TRUE);
+	if (!dest)
+	    goto out;
+
+	set_general_properties (dest, TRUE);
+
+	if (!(trapezoids = create_random_trapezoids (
+		  &n_traps, dest->bits.width, dest->bits.height)))
+	{
+	    goto out;
+	}
 
-            trapezoids = create_random_trapezoids (
-                &n_traps, dest->bits.width, dest->bits.height);
-
-            if (trapezoids)
-            {
-                switch (prng_rand_n (3))
-                {
-                case 0:
-                    pixman_rasterize_trapezoid (
-                        dest, &trapezoids[prng_rand_n (n_traps)],
-                        rand_x (dest), rand_y (dest));
-                    break;
-
-                case 1:
-                    source = create_random_image ();
-
-                    if (source)
-                    {
-                        op = op_list [prng_rand_n (ARRAY_LENGTH (op_list))];
-                        
-                        pixman_composite_trapezoids (
-                            op, source, dest,
-                            random_format (TRUE),
-                            rand_x (source), rand_y (source),
-                            rand_x (dest), rand_y (dest),
-                            n_traps, trapezoids);
-                    }
-                    break;
-
-                case 2:
-                    pixman_add_trapezoids (
-                        dest, rand_x (dest), rand_y (dest), n_traps, trapezoids);
-                    break;
-                }
-
-                free (trapezoids);
-            }
+	switch (p)
+	{
+	case 0:
+	    source = create_random_image ();
+
+	    if (source)
+	    {
+		op = op_list [prng_rand_n (ARRAY_LENGTH (op_list))];
+
+		pixman_composite_trapezoids (
+		    op, source, dest,
+		    random_format (REQUIRE_ALPHA),
+		    rand_x (source), rand_y (source),
+		    rand_x (dest), rand_y (dest),
+		    n_traps, trapezoids);
+	    }
+	    break;
+
+	case 1:
+	    pixman_rasterize_trapezoid (
+		dest, &trapezoids[prng_rand_n (n_traps)],
+		rand_x (dest), rand_y (dest));
+	    break;
+
+	case 2:
+	    pixman_add_trapezoids (
+		dest, rand_x (dest), rand_y (dest), n_traps, trapezoids);
+	    break;
         }
+
+	free (trapezoids);
     }
     else
     {
-        dest = create_random_bits_image (FALSE);
+        dest = create_random_bits_image (DONT_CARE);
         source = create_random_image ();
         mask = create_random_image ();
 
@@ -917,16 +929,17 @@ run_test (uint32_t seed, pixman_bool_t verbose, uint32_t mod)
                                       source, mask, dest,
                                       rand_x (source), rand_y (source),
                                       rand_x (mask), rand_y (mask),
-                                      0, 0, 
+                                      0, 0,
                                       dest->bits.width,
                                       dest->bits.height);
         }
     }
 
-        if (source)
-            pixman_image_unref (source);
-        if (mask)
-            pixman_image_unref (mask);
+out:
+    if (source)
+	pixman_image_unref (source);
+    if (mask)
+	pixman_image_unref (mask);
     if (dest)
 	pixman_image_unref (dest);
 }
diff --git a/xorg-server/xkeyboard-config/NEWS b/xorg-server/xkeyboard-config/NEWS
index 731a2e474..1125d2c55 100644
--- a/xorg-server/xkeyboard-config/NEWS
+++ b/xorg-server/xkeyboard-config/NEWS
@@ -1,3 +1,6 @@
+2.8	18 bugs fixed
+	Most important change: a lot of materials updated from Oracle (Sun keyboards)
+	Updated translations
 2.7	8 bugs fixed, most important:
 	- Fxx fixed (CTRL+ALT type)
 	- *.dir files not produced any more
diff --git a/xorg-server/xkeyboard-config/configure.ac b/xorg-server/xkeyboard-config/configure.ac
index e3d2abfe4..d48a3bbe8 100644
--- a/xorg-server/xkeyboard-config/configure.ac
+++ b/xorg-server/xkeyboard-config/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 2.7.99)
+AC_INIT(xkeyboard-config, 2.8)
 AC_CONFIG_SRCDIR(rules/base.xml.in)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -72,7 +72,7 @@ GETTEXT_PACKAGE=xkeyboard-config
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 
-ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ja ka ko ky lt nb nl pl ro ru rw sk sl sq sr 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 gl hr hu id it ja ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
 
 AC_SUBST(xkb_base)
 AC_SUBST(xkb_rules_symlink)
diff --git a/xorg-server/xkeyboard-config/po/bg.po b/xorg-server/xkeyboard-config/po/bg.po
index bbe6940a7..fac5cfbd2 100644
--- a/xorg-server/xkeyboard-config/po/bg.po
+++ b/xorg-server/xkeyboard-config/po/bg.po
@@ -1,8 +1,8 @@
 # Bulgarian translation of xkeyboard-config.
 # Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 # This file is distributed under the same license as the xkeyboard-config package.
-# Alexander Shopov <ash@kambanaria.org>, 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
+# Alexander Shopov <ash@kambanaria.org>, 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
 # Damyan Ivanov <dam+gnome@ktnx.net>, 2010.
 #
 #
@@ -48,10 +48,10 @@
 # Предпочита се дълго тире „—“ пред скоби „()“.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.6.99\n"
+"Project-Id-Version: xkeyboard-config-2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-09-12 00:25+0100\n"
-"PO-Revision-Date: 2012-09-17 14:47+0300\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-19 10:07+0200\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -741,3095 +741,3146 @@ msgid "OLPC"
 msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Sun Type 5/6"
-msgstr "На Sun, вид 5/6"
+msgid "Sun Type 7 USB"
+msgstr "На Sun, вид 7 USB"
 
 #: ../rules/base.xml.in.h:172
+msgid "Sun Type 7 USB (European layout)"
+msgstr "На Sun, вид 7 USB — европейска"
+
+#: ../rules/base.xml.in.h:173
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "На Sun, вид 7 USB — за Unix"
+
+#: ../rules/base.xml.in.h:174
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "На Sun, вид 7 USB — японска/японска със 106 клавиша"
+
+#: ../rules/base.xml.in.h:175
+msgid "Sun Type 6/7 USB"
+msgstr "На Sun, вид 6/7 USB"
+
+#: ../rules/base.xml.in.h:176
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "На Sun, вид 6/7 USB — европейска"
+
+#: ../rules/base.xml.in.h:177
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "На Sun, вид 6 USB — за Unix"
+
+#: ../rules/base.xml.in.h:178
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "На Sun, вид 7 USB — японска"
+
+#: ../rules/base.xml.in.h:179
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "На Sun, вид 7 — японска"
+
+#: ../rules/base.xml.in.h:180
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:181
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:182
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:183
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000 — безжична"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:184
 msgid "Htc Dream phone"
 msgstr "Телефон HTC Dream"
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
 msgid "en"
 msgstr "Анг"
 
-#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
 msgid "English (US)"
 msgstr "английска — американска"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:189
 msgid "chr"
 msgstr "Чрк"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:190
 msgid "Cherokee"
 msgstr "черокска"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:191
 msgid "English (US, with euro on 5)"
 msgstr "английска — американска, c „€“ при 5"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:192
 msgid "English (US, international with dead keys)"
 msgstr "английска — американска, международна, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:193
 msgid "English (US, alternative international)"
 msgstr "английска — американска, международна, алтернативна"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:194
 msgid "English (Colemak)"
 msgstr "английска — Коулмак"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:195
 msgid "English (Dvorak)"
 msgstr "английска — Дворак"
 
-#: ../rules/base.xml.in.h:188
-msgid "English (Dvorak international with dead keys)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
 msgstr "английска — Дворак, международна, с „мъртви“ клавиши"
 
 # FIXME алтернативна да е след международна
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:197
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "английска — Дворак, международна, алтернативна, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:198
 msgid "English (left handed Dvorak)"
 msgstr "английска — Дворак за левичари"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:199
 msgid "English (right handed Dvorak)"
 msgstr "английска — Дворак за десничари"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:200
 msgid "English (classic Dvorak)"
 msgstr "английска — класически Дворак"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:201
 msgid "English (programmer Dvorak)"
 msgstr "английска — Дворак за програмисти"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
 msgid "ru"
 msgstr "Рск"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:204
 msgid "Russian (US, phonetic)"
 msgstr "руска — американска, фонетична"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
 msgstr "английска — за Макинтош"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:206
 msgid "English (international AltGr dead keys)"
 msgstr "английска — международна, с „мъртви“ клавиши чрез AltGr"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:207
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "английска — смяна на подредбата при натискане на „*“ и „/“"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:208
 msgid "Serbo-Croatian (US)"
 msgstr "сърбохърватска — американска"
 
-#. Keyboard indicator for Catalan layouts
-#: ../rules/base.xml.in.h:202
-msgid "ca"
-msgstr "Ктл"
+#: ../rules/base.xml.in.h:209
+msgid "English (Workman)"
+msgstr "английска — Уъркман"
 
-#: ../rules/base.xml.in.h:203
-msgid "Catalan"
-msgstr "каталунска"
+#: ../rules/base.xml.in.h:210
+msgid "English (Workman, international with dead keys)"
+msgstr "английска — Уъркман, международна, с „мъртви“ клавиши"
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
 msgid "fa"
 msgstr "Прс"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:213
 msgid "Afghani"
 msgstr "афганистанска"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:215
 msgid "ps"
 msgstr "Пщн"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:216
 msgid "Pashto"
 msgstr "пащунска"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:218
 msgid "uz"
 msgstr "Узб"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:219
 msgid "Uzbek (Afghanistan)"
 msgstr "узбекска — афганистанска"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:220
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "пащунска — афганистанска, OLPC"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:221
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "персийска — афганистанска, дарийски OLPC"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:222
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "узбекска — афганистанска, OLPC"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
 msgid "ar"
 msgstr "Арб"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
 msgid "Arabic"
 msgstr "арабска"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:226
 msgid "Arabic (azerty)"
 msgstr "арабска — azerty"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:227
 msgid "Arabic (azerty/digits)"
 msgstr "арабска — azerty/цифри"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:228
 msgid "Arabic (digits)"
 msgstr "арабска — цифри"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:229
 msgid "Arabic (qwerty)"
 msgstr "арабска — qwerty"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:230
 msgid "Arabic (qwerty/digits)"
 msgstr "арабска — querty/цифри"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:231
 msgid "Arabic (Buckwalter)"
 msgstr "арабска — транслитерация по Бъкуолтър"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:233
 msgid "sq"
 msgstr "Алб"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:234
 msgid "Albanian"
 msgstr "албанска"
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
 msgid "hy"
 msgstr "Арм"
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
 msgid "Armenian"
 msgstr "арменска"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:238
 msgid "Armenian (phonetic)"
 msgstr "арменска — фонетична"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:239
 msgid "Armenian (alternative phonetic)"
 msgstr "арменска — фонетична, алтернативна"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:240
 msgid "Armenian (eastern)"
 msgstr "арменска — източна"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:241
 msgid "Armenian (western)"
 msgstr "арменска — западна"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:242
 msgid "Armenian (alternative eastern)"
 msgstr "арменска — източна, алтернативна"
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
 msgid "de"
 msgstr "Нмс"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:245
 msgid "German (Austria)"
 msgstr "немска — австрийска"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:246
+msgid "German (legacy)"
+msgstr "немска — остаряла"
+
+#: ../rules/base.xml.in.h:247
 msgid "German (Austria, eliminate dead keys)"
 msgstr "немска, австрийска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:248
 msgid "German (Austria, Sun dead keys)"
 msgstr "немска — австрийска, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:249
 msgid "German (Austria, Macintosh)"
 msgstr "немска — австрийска, за Макинтош"
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:251
 msgid "az"
 msgstr "Азр"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:252
 msgid "Azerbaijani"
 msgstr "азърбейджанска"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:253
 msgid "Azerbaijani (Cyrillic)"
 msgstr "азърбейджанска — кирилица"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:255
 msgid "by"
 msgstr "Блр"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:256
 msgid "Belarusian"
 msgstr "беларуска"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:257
 msgid "Belarusian (legacy)"
 msgstr "беларуска — остаряла"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:258
 msgid "Belarusian (Latin)"
 msgstr "беларуска — латиница"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
 msgid "be"
 msgstr "Бел"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
 msgid "Belgian"
 msgstr "белгийска"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:262
 msgid "Belgian (alternative)"
 msgstr "белгийска — алтернативна"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:263
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "белгийска — алтернативна, само латиница по ISO 8859-9"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:264
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "белгийска — алтернативна, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:265
 msgid "Belgian (ISO alternate)"
 msgstr "белгийска — алтернативна по ISO"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:266
 msgid "Belgian (eliminate dead keys)"
 msgstr "белгийска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:267
 msgid "Belgian (Sun dead keys)"
 msgstr "белгийска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:268
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "белгийска — Wang, модел 724, azerty"
 
 #. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:270
 msgid "bn"
 msgstr "Бнг"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:271
 msgid "Bengali"
 msgstr "бенгалска"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:272
 msgid "Bengali (Probhat)"
 msgstr "бенгалска — пробхат"
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:274
 msgid "in"
 msgstr "Инд"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:275
 msgid "Indian"
 msgstr "индийска"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:276
 msgid "Bengali (India)"
 msgstr "бенгалска — индийска"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:277
 msgid "Bengali (India, Probhat)"
 msgstr "бенгалска — индийска, пробхат"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:278
 msgid "Bengali (India, Baishakhi)"
 msgstr "бенгалска — индийска, байшаки"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:279
 msgid "Bengali (India, Bornona)"
 msgstr "бенгалска — индийска, борона"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:280
 msgid "Bengali (India, Uni Gitanjali)"
 msgstr "бенгалска — индийска, уни гитанжали"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:281
 msgid "Bengali (India, Baishakhi Inscript)"
 msgstr "бенгалска — индийска, байшаки, инскрипт"
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:283
 msgid "gu"
 msgstr "Гдж"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:284
 msgid "Gujarati"
 msgstr "гуджарати"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:286
 msgid "pa"
 msgstr "Пнд"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:287
 msgid "Punjabi (Gurmukhi)"
 msgstr "панджаби — гурмуки"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:288
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "панджаби — гурмуки джелум"
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:290
 msgid "kn"
 msgstr "Кнр"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:291
 msgid "Kannada"
 msgstr "канареска"
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:293
 msgid "ml"
 msgstr "Млл"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:294
 msgid "Malayalam"
 msgstr "малаяламска"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:295
 msgid "Malayalam (Lalitha)"
 msgstr "малаяламска — лалита"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:296
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "малаяламска — разширена индийска инскрипт с „₨“"
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:298
 msgid "or"
 msgstr "Ори"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:299
 msgid "Oriya"
 msgstr "орийска"
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:301
 msgid "ta"
 msgstr "Тмл"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:302
 msgid "Tamil (Unicode)"
 msgstr "тамилска — Уникод"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:303
 msgid "Tamil (keyboard with numerals)"
 msgstr "тамилска — с таймилски цифри"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:304
 msgid "Tamil (TAB typewriter)"
 msgstr "тамилска — за пишеща машина, кодиране TAB"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:305
 msgid "Tamil (TSCII typewriter)"
 msgstr "тамилска — за пишеща машина, кодиране TSCII"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:306
 msgid "Tamil"
 msgstr "тамилска"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:308
 msgid "te"
 msgstr "Тлг"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:309
 msgid "Telugu"
 msgstr "телугу"
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:311
 msgid "ur"
 msgstr "Урд"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:312
 msgid "Urdu (phonetic)"
 msgstr "урду — фонетична"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:313
 msgid "Urdu (alternative phonetic)"
 msgstr "урду — фонетична, алтернативна"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:314
 msgid "Urdu (WinKeys)"
 msgstr "урду — с клавиши на Windows"
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:316
 msgid "hi"
 msgstr "Хнд"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:317
 msgid "Hindi (Bolnagri)"
 msgstr "хинди — Болнагри"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:318
 msgid "Hindi (Wx)"
 msgstr "хинди — Wx"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:319
 msgid "English (India, with RupeeSign)"
 msgstr "английска — индийска, с „₨“"
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:321
 msgid "bs"
 msgstr "Бсн"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:322
 msgid "Bosnian"
 msgstr "босненска"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:323
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "босненска — с „«»“"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:324
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "босненска — с босненски диграфи"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:325
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "босненска — американска с босненски диграфи"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:326
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "босненска — американска с босненски букви"
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
 msgid "pt"
 msgstr "Прт"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
 msgid "Portuguese (Brazil)"
 msgstr "португалска — бразилска"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:330
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "португалска — бразилска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:331
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "португалска — бразилска, Дворак"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:332
 msgid "Portuguese (Brazil, nativo)"
 msgstr "португалска — бразилска, нативна"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:333
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "португалска — бразилска, нативна за САЩ"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:334
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "португалска — бразилска, нативна за есперанто"
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:336
 msgid "bg"
 msgstr "Бъл"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:337
 msgid "Bulgarian"
 msgstr "българска"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:338
 msgid "Bulgarian (traditional phonetic)"
 msgstr "българска — традиционна фонетична"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:339
 msgid "Bulgarian (new phonetic)"
 msgstr "българска — нова фонетична"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:340
 msgid "Arabic (Morocco)"
 msgstr "арабска — мароканска"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr "Фрн"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:343
 msgid "French (Morocco)"
 msgstr "френска — мароканска"
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:345
 msgid "ber"
 msgstr "Брб"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:346
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "берберска — мароканска, за тифинах"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:347
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "берберска — мароканска, за тифинах, алтернативна"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:348
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "берберска — мароканска, фонетична за тифинах, алтернативна"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:349
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "берберска — мароканска, разширена за тифинах"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:350
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "берберска — мароканска, фонетична за тифинах"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:351
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "берберска — мароканска, разширена фонетична за тифинах"
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "cm"
 msgstr "Кмр"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
 msgid "English (Cameroon)"
 msgstr "английска — камерунска"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:355
 msgid "French (Cameroon)"
 msgstr "френска — камерунска"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:356
 msgid "Cameroon Multilingual (qwerty)"
 msgstr "камерунска — многоезична, qwerty"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:357
 msgid "Cameroon Multilingual (azerty)"
 msgstr "камерунска — многоезична, azerty"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:358
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr "камерунска — многоезична, Дворак"
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:360
 msgid "my"
 msgstr "Брм"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:361
 msgid "Burmese"
 msgstr "бурманска"
 
-#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr "френска — канадска"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:363
 msgid "French (Canada, Dvorak)"
 msgstr "френска — канадска, Дворак"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:364
 msgid "French (Canada, legacy)"
 msgstr "френска — канадска, остаряла"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:365
 msgid "Canadian Multilingual"
 msgstr "канадска — многоезична"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:366
 msgid "Canadian Multilingual (first part)"
 msgstr "канадска — многоезична, първа част"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:367
 msgid "Canadian Multilingual (second part)"
 msgstr "канадска — многоезична, втора част"
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:369
 msgid "ike"
 msgstr "Еск"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:370
 msgid "Inuktitut"
 msgstr "ескимоска"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:371
 msgid "English (Canada)"
 msgstr "английска — канадска"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:372
 msgid "French (Democratic Republic of the Congo)"
 msgstr "френска — конгоанска"
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:374
 msgid "zh"
 msgstr "Ктс"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:375
 msgid "Chinese"
 msgstr "китайска"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:376
 msgid "Tibetan"
 msgstr "тибетска"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:377
 msgid "Tibetan (with ASCII numerals)"
 msgstr "тибетска — с цифри от ASCII"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:378
 msgid "Uyghur"
 msgstr "уйгурска"
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:380
 msgid "hr"
 msgstr "Хрв"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:381
 msgid "Croatian"
 msgstr "хърватска"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:382
 msgid "Croatian (use guillemets for quotes)"
 msgstr "хърватска — с „«»“"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:383
 msgid "Croatian (use Croatian digraphs)"
 msgstr "хърватска — с хърватски диграфи"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:384
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "хърватска — американска с хърватски диграфи"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:385
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "хърватска — американска с хърватски букви"
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
 msgid "cs"
 msgstr "Чшк"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
 msgid "Czech"
 msgstr "чешка"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:389
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "чешка — с „\\|“"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:390
 msgid "Czech (qwerty)"
 msgstr "чешка — qwerty"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:391
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "чешка — qwerty с „\\“"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:392
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "чешка — UCW, само букви с надредни знаци"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:393
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "чешка — американски Дворак с поддръжка на UCW"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
 msgid "da"
 msgstr "Дтс"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
 msgid "Danish"
 msgstr "датска"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:397
 msgid "Danish (eliminate dead keys)"
 msgstr "датска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:398
 msgid "Danish (Macintosh)"
 msgstr "датска — за Макинтош"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:399
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "датска — за Макинтош, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:400
 msgid "Danish (Dvorak)"
 msgstr "датска — Дворак"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
 msgid "nl"
 msgstr "Хлн"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
 msgid "Dutch"
 msgstr "холандска"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:404
 msgid "Dutch (Sun dead keys)"
 msgstr "холандска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:405
 msgid "Dutch (Macintosh)"
 msgstr "холандска — за Макинтош"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:406
 msgid "Dutch (standard)"
 msgstr "холандска — стандартна"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:408
 msgid "dz"
 msgstr "Дзн"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:409
 msgid "Dzongkha"
 msgstr "дзонка"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
 msgid "et"
 msgstr "Ест"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
 msgid "Estonian"
 msgstr "естонска"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:413
 msgid "Estonian (eliminate dead keys)"
 msgstr "естонска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:414
 msgid "Estonian (Dvorak)"
 msgstr "естонска — Дворак"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "естонска — американска с естонски букви"
 
-#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
 msgid "Persian"
 msgstr "персийска"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Persian (with Persian Keypad)"
 msgstr "персийска — с персийска цифрова клавиатура"
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 msgid "ku"
 msgstr "Крд"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "кюрдска — иранска, латиница, „Q“ горе-вляво"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 msgid "Kurdish (Iran, F)"
 msgstr "кюрдска — иранска, „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "кюрдска — иранска, латиница, „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "кюрдска — иранска, арабски и латински букви"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
 msgid "Iraqi"
 msgstr "иракска"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:425
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "кюрдска — иракска, латиница, „Q“ горе-вляво"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:426
 msgid "Kurdish (Iraq, F)"
 msgstr "кюрдска — иракска, „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:427
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "кюрдска — иракска, латиница, „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:428
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "кюрдска — иракска, арабски и латински букви"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:430
 msgid "fo"
 msgstr "Фрр"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:431
 msgid "Faroese"
 msgstr "фарьорска"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:432
 msgid "Faroese (eliminate dead keys)"
 msgstr "фарьорска — без „мъртви“ клавиши"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
 msgid "fi"
 msgstr "Фнл"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
 msgid "Finnish"
 msgstr "финландска"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:436
 msgid "Finnish (classic)"
 msgstr "финландска — класическа"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "финландска — класическа, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Northern Saami (Finland)"
 msgstr "северносамска — финландска"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Finnish (Macintosh)"
 msgstr "финландска — за Макинтош"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
 msgid "French"
 msgstr "френска"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:441
 msgid "French (eliminate dead keys)"
 msgstr "френска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "French (Sun dead keys)"
 msgstr "френска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "French (alternative)"
 msgstr "френска — алтернативна"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "French (alternative, latin-9 only)"
 msgstr "френска — алтернативна, само латиница по ISO 8859-9"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "French (alternative, eliminate dead keys)"
 msgstr "френска — алтернативна, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "French (alternative, Sun dead keys)"
 msgstr "френска — алтернативна, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "French (legacy, alternative)"
 msgstr "френска — алтернативна, остаряла"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "френска — алтернативна, остаряла, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "френска — алтернативна, остаряла, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "френска — Дворак, bépo, ергономична"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "френска — Дворак, bépo, ергономична, само латиница по ISO 8859-9"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:452
 msgid "French (Dvorak)"
 msgstr "френска — Дворак"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:453
 msgid "French (Macintosh)"
 msgstr "френска — за Макинтош"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:454
 msgid "French (Breton)"
 msgstr "френска — бретонска"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:455
 msgid "Occitan"
 msgstr "провансалска"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:456
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "грузинска — azerty на Цкапо"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:457
 msgid "English (Ghana)"
 msgstr "английска — ганайска"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:458
 msgid "English (Ghana, multilingual)"
 msgstr "английска — ганайска, международна"
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:460
 msgid "ak"
 msgstr "Акн"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:461
 msgid "Akan"
 msgstr "аканска"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:463
 msgid "ee"
 msgstr "Еве"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:464
 msgid "Ewe"
 msgstr "еве"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:466
 msgid "ff"
 msgstr "Фла"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:467
 msgid "Fula"
 msgstr "фула"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:469
 msgid "gaa"
 msgstr "Га "
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:470
 msgid "Ga"
 msgstr "га"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:472
 msgid "ha"
 msgstr "Хск"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:473
 msgid "Hausa"
 msgstr "хауска"
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:475
 msgid "avn"
 msgstr "Авт"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:476
 msgid "Avatime"
 msgstr "аватимска"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:477
 msgid "English (Ghana, GILLBT)"
 msgstr "английска — ганайска, GILLBT"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:478
 msgid "French (Guinea)"
 msgstr "френска — гвинейска"
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:480
 msgid "ka"
 msgstr "Грз"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:481
 msgid "Georgian"
 msgstr "грузинска"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:482
 msgid "Georgian (ergonomic)"
 msgstr "грузинска — ергономична"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:483
 msgid "Georgian (MESS)"
 msgstr "грузинска — MESS"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:484
 msgid "Russian (Georgia)"
 msgstr "руска — грузинска"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:485
 msgid "Ossetian (Georgia)"
 msgstr "осетинска — грузинска"
 
-#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
 msgid "German"
 msgstr "немска"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:487
 msgid "German (dead acute)"
 msgstr "немска — с „мъртво“ ударение"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:488
 msgid "German (dead grave acute)"
 msgstr "немска — с „мъртво“ тежко ударение"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:489
 msgid "German (eliminate dead keys)"
 msgstr "немска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:490
 msgid "Romanian (Germany)"
 msgstr "румънска — немска"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:491
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "немска — немска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:492
 msgid "German (Dvorak)"
 msgstr "немска — Дворак"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:493
 msgid "German (Sun dead keys)"
 msgstr "немска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:494
 msgid "German (Neo 2)"
 msgstr "немска — Neo 2, добавени гръцки букви"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:495
 msgid "German (Macintosh)"
 msgstr "немска — за Макинтош"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:496
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "немска — за Макинтош, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:497
 msgid "Lower Sorbian"
 msgstr "долно сорбска"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:498
 msgid "Lower Sorbian (qwertz)"
 msgstr "долно сорбска — qwertz"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:499
 msgid "German (qwerty)"
 msgstr "немска — qwerty"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:500
 msgid "Russian (Germany, phonetic)"
 msgstr "руска — германска, фонетична"
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
 msgid "gr"
 msgstr "Грц"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
 msgid "Greek"
 msgstr "гръцка"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:504
 msgid "Greek (simple)"
 msgstr "гръцка — опростена"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:505
 msgid "Greek (extended)"
 msgstr "гръцка — разширена"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:506
 msgid "Greek (eliminate dead keys)"
 msgstr "гръцка — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:507
 msgid "Greek (polytonic)"
 msgstr "гръцка — политонална"
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:509
 msgid "hu"
 msgstr "Унг"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian"
 msgstr "унгарска"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (standard)"
 msgstr "унгарска — стандартна"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (eliminate dead keys)"
 msgstr "унгарска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (qwerty)"
 msgstr "унгарска — qwerty"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "унгарска — 101 клавиша, qwertz, „,“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "унгарска — 101 клавиша, qwertz, „,“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "унгарска — 101 клавиша, qwertz, „.“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "унгарска — 101 клавиша, qwertz, „.“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "унгарска — 101 клавиша, qwerty, „,“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "унгарска — 101 клавиша, qwerty, „,“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "унгарска — 101 клавиша, qwerty, „.“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:521
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "унгарска — 101 клавиша, qwerty, „.“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:522
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "унгарска — 102 клавиша, qwertz, „,“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:523
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "унгарска — 102 клавиша, qwertz, „,“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:524
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "унгарска — 102 клавиша, qwertz, „.“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:525
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "унгарска — 102 клавиша, qwertz, „.“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:526
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "унгарска — 102 клавиша, qwerty, „,“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:527
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "унгарска — 102 клавиша, qwerty, „,“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:528
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "унгарска — 102 клавиша, qwerty, „.“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:529
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "унгарска — 102 клавиша, qwerty, „.“, без „мъртви“ клавиши"
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:531
 msgid "is"
 msgstr "Еск"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:532
 msgid "Icelandic"
 msgstr "исландска"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:533
 msgid "Icelandic (Sun dead keys)"
 msgstr "исландска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:534
 msgid "Icelandic (eliminate dead keys)"
 msgstr "исландска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:535
 msgid "Icelandic (Macintosh)"
 msgstr "исландска — за Макинтош"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:536
 msgid "Icelandic (Dvorak)"
 msgstr "исландска — Дворак"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
 msgid "he"
 msgstr "Ивр"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
 msgid "Hebrew"
 msgstr "иврит"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:540
 msgid "Hebrew (lyx)"
 msgstr "иврит — LyX"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:541
 msgid "Hebrew (phonetic)"
 msgstr "иврит — фонетична"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:542
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "иврит — библейска, Тиро"
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
 msgid "it"
 msgstr "Итл"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
 msgid "Italian"
 msgstr "италианска"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:546
 msgid "Italian (eliminate dead keys)"
 msgstr "италианска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:547
 msgid "Italian (Macintosh)"
 msgstr "италианска — за Макинтош"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:548
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "италианска — американска с италиански букви"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:549
 msgid "Georgian (Italy)"
 msgstr "грузинска — италианска"
 
+#: ../rules/base.xml.in.h:550
+msgid "Italian (IBM 142)"
+msgstr "италианска — IBM 142"
+
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
 msgid "ja"
 msgstr "Япн"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
 msgid "Japanese"
 msgstr "японска"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:554
 msgid "Japanese (Kana)"
 msgstr "японска — кана"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:555
 msgid "Japanese (Kana 86)"
 msgstr "японска — кана 86"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:556
 msgid "Japanese (OADG 109A)"
 msgstr "японска — OADG 109A"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:557
 msgid "Japanese (Macintosh)"
 msgstr "японска — за Макинтош"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:558
 msgid "Japanese (Dvorak)"
 msgstr "японска — Дворак"
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:560
 msgid "ki"
 msgstr "Крг"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:561
 msgid "Kyrgyz"
 msgstr "киргистанска"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:562
 msgid "Kyrgyz (phonetic)"
 msgstr "киргистанска — фонетична"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:564
 msgid "km"
 msgstr "Кхм"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:565
 msgid "Khmer (Cambodia)"
 msgstr "кхмерска — камбоджанска"
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:567
 msgid "kk"
 msgstr "Кзх"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:568
 msgid "Kazakh"
 msgstr "казахска"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:569
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "руска — казахстанска, за казахски"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:570
 msgid "Kazakh (with Russian)"
 msgstr "казахска с руски букви"
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:572
 msgid "lo"
 msgstr "Лск"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:573
 msgid "Lao"
 msgstr "лаоска"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:574
 msgid "Lao (STEA proposed standard layout)"
 msgstr "лаоска — стандартна подредба по STEA"
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
 msgid "es"
 msgstr "Исп"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:577
 msgid "Spanish (Latin American)"
 msgstr "испанска — латиноамериканска"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:578
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "испанска — латиноамериканска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:579
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "испанска — латиноамериканска, с мъртва „~“"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:580
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "испанска — латиноамериканска, с „мъртви“ клавиши на Sun"
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
 msgid "lt"
 msgstr "Лит"
 
-#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
 msgid "Lithuanian"
 msgstr "литовска"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:584
 msgid "Lithuanian (standard)"
 msgstr "литовска — стандартна"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:585
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "литовска — американска с литовски букви"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:586
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "литовска — IBM LST 1205-92"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:587
 msgid "Lithuanian (LEKP)"
 msgstr "литовска — LEKP"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:588
 msgid "Lithuanian (LEKPa)"
 msgstr "литовска — LEKPa"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
 msgid "lv"
 msgstr "Лат"
 
-#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
 msgid "Latvian"
 msgstr "латвийска"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:592
 msgid "Latvian (apostrophe variant)"
 msgstr "латвийска — с „'“"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:593
 msgid "Latvian (tilde variant)"
 msgstr "латвийска — с „~“"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:594
 msgid "Latvian (F variant)"
 msgstr "латвийска — с „F“"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:595
 msgid "Latvian (modern)"
 msgstr "латвийска — модерна"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:596
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "латвийска — ергономична, ūgjrmv"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:597
 msgid "Latvian (adapted)"
 msgstr "латвийска — адаптирана"
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:599
 msgid "mi"
 msgstr "Мрс"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:600
 msgid "Maori"
 msgstr "маорска"
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "Срб"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:603
 msgid "Montenegrin"
 msgstr "черногорска"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:604
 msgid "Montenegrin (Cyrillic)"
 msgstr "черногорска — кирилица"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:605
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "черногорска — кирилица с разменени „З“ и „Ж“"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:606
 msgid "Montenegrin (Latin Unicode)"
 msgstr "черногорска — латиница за Уникод"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:607
 msgid "Montenegrin (Latin qwerty)"
 msgstr "черногорска — латиница, qwerty"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:608
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "черногорска — латиница за Уникод, qwerty"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:609
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "черногорска — кирилица с „«»“"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:610
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "черногорска — латиница с „«»“"
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:612
 msgid "mk"
 msgstr "Мкд"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:613
 msgid "Macedonian"
 msgstr "македонска"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:614
 msgid "Macedonian (eliminate dead keys)"
 msgstr "македонска — без „мъртви“ клавиши"
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:616
 msgid "mt"
 msgstr "Млт"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:617
 msgid "Maltese"
 msgstr "малтийска"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:618
 msgid "Maltese (with US layout)"
 msgstr "малтийска — американска подредба"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:620
 msgid "mn"
 msgstr "Мнг"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:621
 msgid "Mongolian"
 msgstr "монголска"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
 msgid "no"
 msgstr "Нрв"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
 msgid "Norwegian"
 msgstr "норвежка"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:625
 msgid "Norwegian (eliminate dead keys)"
 msgstr "норвежка — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:626
 msgid "Norwegian (Dvorak)"
 msgstr "норвежка — Дворак"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:627
 msgid "Northern Saami (Norway)"
 msgstr "северносамска — норвежка"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:628
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "северносамска — норвежка, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:629
 msgid "Norwegian (Macintosh)"
 msgstr "норвежка — за Макинтош"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:630
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "норвежка — за Макинтош, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:631
 msgid "Norwegian (Colemak)"
 msgstr "норвежка — Коулмак"
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
 msgid "pl"
 msgstr "Плс"
 
-#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
 msgid "Polish"
 msgstr "палска"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:635
+msgid "Polish (legacy)"
+msgstr "полска — остаряла"
+
+#: ../rules/base.xml.in.h:636
 msgid "Polish (qwertz)"
 msgstr "полска — qwertz"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:637
 msgid "Polish (Dvorak)"
 msgstr "полска — Дворак"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:638
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "полска — Дворак, «„”» при «'\"»"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:639
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "полска — Дворак, «„”» при «1»"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:640
 msgid "Kashubian"
 msgstr "кашубска"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:641
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "руска — полска, фонетична, Дворак"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:642
 msgid "Polish (programmer Dvorak)"
 msgstr "полска — Дворак за програмисти"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
 msgid "Portuguese"
 msgstr "португалска"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:644
 msgid "Portuguese (eliminate dead keys)"
 msgstr "португалска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:645
 msgid "Portuguese (Sun dead keys)"
 msgstr "португалска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:646
 msgid "Portuguese (Macintosh)"
 msgstr "португалска — за Макинтош"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:647
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "португалска — за Макинтош, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:648
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "португалска — за Макинтош, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:649
 msgid "Portuguese (Nativo)"
 msgstr "португалска — нативна"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:650
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "португалска — нативна за САЩ"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:651
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "есперантска — португалска, нативна"
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
 msgid "ro"
 msgstr "Рмн"
 
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
 msgid "Romanian"
 msgstr "румънска"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
 msgstr "румънска — букви с „¸“"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "румънска — стандартна"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard cedilla)"
 msgstr "румънска — стандартна, букви с „¸“"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:658
 msgid "Romanian (WinKeys)"
 msgstr "румънска — с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "руска"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:660
 msgid "Russian (phonetic)"
 msgstr "руска — фонетична"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:661
 msgid "Russian (phonetic WinKeys)"
 msgstr "руска — фонетична, с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:662
 msgid "Russian (typewriter)"
 msgstr "руска — за пишеща машина"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:663
 msgid "Russian (legacy)"
 msgstr "руска — остаряла"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:664
 msgid "Russian (typewriter, legacy)"
 msgstr "руска — за пишеща машина, остаряла"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:665
 msgid "Tatar"
 msgstr "татарска"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Ossetian (legacy)"
 msgstr "осетинска — остаряла"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:667
 msgid "Ossetian (WinKeys)"
 msgstr "осетинска — с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:668
 msgid "Chuvash"
 msgstr "чувашка"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:669
 msgid "Chuvash (Latin)"
 msgstr "чувашка — латиница"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:670
 msgid "Udmurt"
 msgstr "удмуртска"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:671
 msgid "Komi"
 msgstr "комска"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:672
 msgid "Yakut"
 msgstr "якутска"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:673
 msgid "Kalmyk"
 msgstr "калмикска"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:674
 msgid "Russian (DOS)"
 msgstr "руска — DOS"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:675
 msgid "Serbian (Russia)"
 msgstr "сръбска — руска"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:676
 msgid "Bashkirian"
 msgstr "башкирска"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:677
 msgid "Mari"
 msgstr "марийска"
 
-#: ../rules/base.xml.in.h:668
-msgid "Serbian (Cyrillic)"
-msgstr "сръбска — кирилица"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "сръбска"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:679
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr "сръбска — кирилица с разменени „З“ и „Ж“"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:680
 msgid "Serbian (Latin)"
 msgstr "сръбска — латиница"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:681
 msgid "Serbian (Latin Unicode)"
 msgstr "сръбска — латиница за Уникод"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:682
 msgid "Serbian (Latin qwerty)"
 msgstr "сръбска — латиница, qwerty"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:683
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "сръбска — латиница за Уникод, qwerty"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr "сръбска — кирилица с „«»“"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin with guillemets)"
 msgstr "сръбска — латиница с „«»“"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:686
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "панонска русинска — еднозвучна"
 
-# славенска
+# словенска
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:688
 msgid "sl"
 msgstr "Слн"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:689
 msgid "Slovenian"
 msgstr "словенска"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:690
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "словенска — с „«»“"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:691
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "словенска — американска със словенски букви"
 
 # славашка
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
 msgid "sk"
 msgstr "Слш"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
 msgid "Slovak"
 msgstr "словашка"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:695
 msgid "Slovak (extended Backslash)"
 msgstr "словашка — с „\\“"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:696
 msgid "Slovak (qwerty)"
 msgstr "словашка — qwerty"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:697
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "словашка — qwerty, с „\\“"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
 msgid "Spanish"
 msgstr "испанска"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:699
 msgid "Spanish (eliminate dead keys)"
 msgstr "испанска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:700
 msgid "Spanish (include dead tilde)"
 msgstr "испанска — с „мъртва“ тилда"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:701
 msgid "Spanish (Sun dead keys)"
 msgstr "испанска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:702
 msgid "Spanish (Dvorak)"
 msgstr "испанска — Дворак"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:703
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr "астурска — испанска с „Ḥ“ и „Ḷ“"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:704
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "каталунска — испанска с „Ŀ“"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:705
 msgid "Spanish (Macintosh)"
 msgstr "испанска — за Макинтош"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
 msgid "sv"
 msgstr "Швд"
 
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
 msgid "Swedish"
 msgstr "шведска"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:709
 msgid "Swedish (eliminate dead keys)"
 msgstr "шведска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:710
 msgid "Swedish (Dvorak)"
 msgstr "шведска — Дворак"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:711
 msgid "Russian (Sweden, phonetic)"
 msgstr "руска — шведска, фонетична"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:712
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "руска — шведска, фонетична, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:713
 msgid "Northern Saami (Sweden)"
 msgstr "северносамска — шведска"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:714
 msgid "Swedish (Macintosh)"
 msgstr "шведска — за Макинтош"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:715
 msgid "Swedish (Svdvorak)"
 msgstr "шведска — шведски Дворак"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:716
 msgid "Swedish Sign Language"
 msgstr "шведска — жестомимична"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:717
 msgid "German (Switzerland)"
 msgstr "немска — швейцарска"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:718
 msgid "German (Switzerland, legacy)"
 msgstr "немска — швейцарска, остаряла"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:719
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "немска — швейцарска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:720
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "немска — швейцарска, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:721
 msgid "French (Switzerland)"
 msgstr "френска — швейцарска"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:722
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "френска — швейцарска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "френска — швейцарска, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
 msgid "French (Switzerland, Macintosh)"
 msgstr "френска — швейцарска, за Макинтош"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
 msgid "German (Switzerland, Macintosh)"
 msgstr "немска — швейцарска, за Макинтош"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
 msgid "Arabic (Syria)"
 msgstr "арабска — сирийска"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:728
 msgid "syc"
 msgstr "Срк"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:729
 msgid "Syriac"
 msgstr "сириакска"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:730
 msgid "Syriac (phonetic)"
 msgstr "сириакска — фонетична"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "кюрдска — сирийска, латиница, „Q“ горе-вляво"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
 msgid "Kurdish (Syria, F)"
 msgstr "кюрдска — сирийска, „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "кюрдска — сирийска, латиница, „Q“ горе-вляво, алтернативна"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
 msgid "tg"
 msgstr "Тдж"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
 msgid "Tajik"
 msgstr "таджикска"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "таджикска — остаряла"
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:739
 msgid "si"
 msgstr "Снх"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
 msgid "Sinhala (phonetic)"
 msgstr "синхала — фонетична"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "тамилска — шриланкска, Уникод"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "тамилска — шриланкска, за пишеща машина, кодиране TAB"
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
 msgid "th"
 msgstr "Тск"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
 msgid "Thai"
 msgstr "тайландска"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
 msgid "Thai (TIS-820.2538)"
 msgstr "тайландска — TIS-820.2538"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "тайландска — патачотска"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
 msgid "tr"
 msgstr "Трс"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
 msgid "Turkish"
 msgstr "турска"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
 msgid "Turkish (F)"
 msgstr "турска — „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
 msgid "Turkish (Alt-Q)"
 msgstr "турска — „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
 msgid "Turkish (Sun dead keys)"
 msgstr "турска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "кюрдска — турска, латиница, „Q“ горе-вляво"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
 msgid "Kurdish (Turkey, F)"
 msgstr "кюрдска — турска, „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:756
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "кюрдска — турска, латиница, „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
 msgid "Turkish (international with dead keys)"
 msgstr "турска — международна, с „мъртви“ клавиши"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
 msgid "crh"
 msgstr "Ттр"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:760
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "кримски татарски — турска, „Q“ горе-вляво"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
 msgid "Crimean Tatar (Turkish F)"
 msgstr "кримски татарски — турска, „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "кримски татарски — турска, „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
 msgid "Taiwanese"
 msgstr "тайванска"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
 msgid "Taiwanese (indigenous)"
 msgstr "тайванска — туземна"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
 msgid "xsy"
 msgstr "Сст"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
 msgid "Saisiyat (Taiwan)"
 msgstr "сайсиятска — тайванска"
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
 msgid "uk"
 msgstr "Укр"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
 msgid "Ukrainian"
 msgstr "украинска"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:771
 msgid "Ukrainian (phonetic)"
 msgstr "украинска — фонетична"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:772
 msgid "Ukrainian (typewriter)"
 msgstr "украинска — за пишеща машина"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
 msgid "Ukrainian (WinKeys)"
 msgstr "украинска — с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (legacy)"
 msgstr "украинска — остаряла"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (standard RSTU)"
 msgstr "украинска — републикански стандарт"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "руска — украинска, републикански стандарт"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "украинска — еднозвучна, алтернативна"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
 msgid "English (UK)"
 msgstr "английска — великобританска"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
 msgid "English (UK, extended WinKeys)"
 msgstr "английска  — великобританска, разширена, с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:780
 msgid "English (UK, international with dead keys)"
 msgstr "английска  — великобританска, международна, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:781
 msgid "English (UK, Dvorak)"
 msgstr "английска — великобританска, Дворак"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "английска — великобританска, с пунктуация на Обединеното кралство, Дворак"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
 msgid "English (UK, Macintosh)"
 msgstr "английска — великобританска, за Макинтош"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
 msgid "English (UK, Macintosh international)"
 msgstr "английска  — великобританска, за Макинтош, международна"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
 msgid "English (UK, Colemak)"
 msgstr "английска — великобританска, Коулмак"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
 msgid "Uzbek"
 msgstr "узбекска"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:787
 msgid "Uzbek (Latin)"
 msgstr "узбекска — латиница"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
 msgid "vi"
 msgstr "Втн"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:790
 msgid "Vietnamese"
 msgstr "виетнамска"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
 msgid "ko"
 msgstr "Крс"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
 msgid "Korean"
 msgstr "корейска"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
 msgid "Korean (101/104 key compatible)"
 msgstr "корейска — съвместима със 101/104 клавиша"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
 msgid "Japanese (PC-98xx Series)"
 msgstr "японска — серии PC-98xx"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
 msgid "ie"
 msgstr "Ирл"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
 msgid "Irish"
 msgstr "ирландска"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
 msgid "CloGaelach"
 msgstr "келтска латиница"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:800
 msgid "Irish (UnicodeExpert)"
 msgstr "ирландска — експертна за Уникод"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
 msgid "Ogham"
 msgstr "огамска"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
 msgid "Ogham (IS434)"
 msgstr "огамска — IS434"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
 msgid "Urdu (Pakistan)"
 msgstr "урду — пакистанска"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "урду — пакистанска, CRULP"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
 msgid "Urdu (Pakistan, NLA)"
 msgstr "урду — пакистанска, NLA"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
 msgid "Arabic (Pakistan)"
 msgstr "арабска — пакистанска"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
 msgid "sd"
 msgstr "Снд"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
 msgid "Sindhi"
 msgstr "синдхи"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
 msgid "dv"
 msgstr "Две"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
 msgid "Dhivehi"
 msgstr "дивеи"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:813
 msgid "English (South Africa)"
 msgstr "английска — южноафриканска"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:815
 msgid "eo"
 msgstr "Есп"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
 msgid "Esperanto"
 msgstr "есперантска"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "есперантска — разменени „;“ и „\"“, остаряла"
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
 msgid "ne"
 msgstr "Нпл"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
 msgid "Nepali"
 msgstr "непалска"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
 msgid "English (Nigeria)"
 msgstr "английска — нигерийска"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
 msgid "ig"
 msgstr "Игб"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
 msgid "Igbo"
 msgstr "игбо"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
 msgid "yo"
 msgstr "Йрб"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
 msgid "Yoruba"
 msgstr "йоруба"
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:829
 msgid "am"
 msgstr "Амх"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
 msgid "Amharic"
 msgstr "амхарска"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:832
 msgid "wo"
 msgstr "Улф"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
 msgid "Wolof"
 msgstr "Уолоф"
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "Брл"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:836
 msgid "Braille"
 msgstr "брайл"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
 msgid "Braille (left hand)"
 msgstr "брайл за левичари"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
 msgid "Braille (right hand)"
 msgstr "брайл за десничари"
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:840
 msgid "tk"
 msgstr "Трк"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
 msgid "Turkmen"
 msgstr "тюркменска"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
 msgid "Turkmen (Alt-Q)"
 msgstr "тюркменска — „Q“ горе-вляво, алтернативна"
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:844
 msgid "bm"
 msgstr "Бмб"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
 msgid "Bambara"
 msgstr "бамбарска"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
 msgid "French (Mali, alternative)"
 msgstr "френска — малийска, алтернативна"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:847
 msgid "English (Mali, US Macintosh)"
 msgstr "английска — малийска, американска за Макинтош"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
 msgid "English (Mali, US international)"
 msgstr "английска — малийска, американска международна"
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:850
 msgid "sw"
 msgstr "Схл"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
 msgid "Swahili (Tanzania)"
 msgstr "суахили — танзанийска"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
 msgid "Swahili (Kenya)"
 msgstr "суахили — кенийска"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:853
 msgid "Kikuyu"
 msgstr "кикуйска"
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
 msgid "tn"
 msgstr "Тсн"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:856
 msgid "Tswana"
 msgstr "тсуанска"
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
 msgid "ph"
 msgstr "Флп"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
 msgid "Filipino"
 msgstr "филипинска"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "филипинска — QWERTY за байбаин"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:861
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "филипинска — Дворак на Кейпуел за латиница"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "филипинска — Дворак на Кейпуел за байбаин"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "филипинска — QWERF 2006 на Кейпуел за латиница"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "филипинска — QWERF 2006 на Кейпуел за байбаин"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:865
 msgid "Filipino (Colemak Latin)"
 msgstr "филипинска — Коулмак за латиница"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
 msgid "Filipino (Colemak Baybayin)"
 msgstr "филипинска — Коулмак за байбаин"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
 msgid "Filipino (Dvorak Latin)"
 msgstr "филипинска — Дворак за латиница"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "филипинска — Дворак за байбаин"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
 msgid "md"
 msgstr "Млд"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
 msgid "Moldavian"
 msgstr "молдовска"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:871
 msgid "gag"
 msgstr "Ггз"
 
-#: ../rules/base.xml.in.h:862
-msgid "Gagauz"
-msgstr "гагаузка"
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "молдовска — гагаузка"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
 msgid "Key(s) to change layout"
 msgstr "Клавиш(и) за смяна на подредбата"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
 msgid "Right Alt (while pressed)"
 msgstr "Десният Alt (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
 msgid "Left Alt (while pressed)"
 msgstr "Левият Alt (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:876
 msgid "Left Win (while pressed)"
 msgstr "Левият Win (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
 msgid "Right Win (while pressed)"
 msgstr "Десният Win (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
 msgid "Any Win key (while pressed)"
 msgstr "Всеки Win (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:879
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (докато е натиснат), Alt+Caps Lock замества Caps Lock"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
 msgid "Right Ctrl (while pressed)"
 msgstr "Десният Ctrl (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
 msgid "Right Alt"
 msgstr "Десният Alt"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
 msgid "Left Alt"
 msgstr "Левият Alt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (към първата подредба), Shift+Caps Lock (към последната)"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Левият Win (към първата подредба), десният Win/Menu (към последната)"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Левият Ctrl (към първата подредба), десният Ctrl (към последната)"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
 msgid "Both Shift keys together"
 msgstr "Двата Shift-а заедно"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
 msgid "Both Alt keys together"
 msgstr "Двата Alt-а заедно"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
 msgid "Both Ctrl keys together"
 msgstr "Двата Ctrl-а заедно"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
 msgid "Left Ctrl+Left Shift"
 msgstr "Левият Ctrl+левият Shift"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
 msgid "Right Ctrl+Right Shift"
 msgstr "Десният Ctrl+десният Shift"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
 msgid "Left Alt+Left Shift"
 msgstr "Левият Alt+левият Shift"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
 msgid "Alt+Space"
 msgstr "Alt+Space"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
 msgid "Left Win"
 msgstr "Левият Win"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
 msgid "Right Win"
 msgstr "Десният Win"
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
 msgid "Left Shift"
 msgstr "Левият Shift"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
 msgid "Right Shift"
 msgstr "Десният Shift"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl"
 msgstr "Левият Ctrl"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
 msgid "Right Ctrl"
 msgstr "Десният Ctrl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Левият Ctrl+левият Win (към първата подредба), десният Ctrl+Menu (към последната)"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
 msgid "Key to choose 3rd level"
 msgstr "Клавиш за избор третото ниво"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
 msgid "Any Win key"
 msgstr "Всеки Win"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
 msgid "Any Alt key"
 msgstr "Всеки Alt"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Десният Alt, Shift+десният Alt са Multi"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:912
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Десният Alt никога не избира третото ниво"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
 msgid "Enter on keypad"
 msgstr "Enter на цифровата клавиатура"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
 msgid "Backslash"
 msgstr "Обратно наклонена черта"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
 msgid "&lt;Less/Greater&gt;"
 msgstr "„&lt;&gt;“"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
 msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Caps Lock избира третото ниво и еднократно го заключва заедно с друг клавиш за трето ниво"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
 msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Обратно наклонената черта избира третото ниво и еднократно го заключва заедно с друг клавиш за трето ниво"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
 msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "„&lt;&gt;“ избира третото ниво и еднократно го заключва заедно с друг клавиш за трето ниво"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
 msgid "Ctrl key position"
 msgstr "Положение на Ctrl"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
 msgid "Caps Lock as Ctrl"
 msgstr "Caps Lock е Ctrl"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
 msgid "Left Ctrl as Meta"
 msgstr "Левият Ctrl е Meta"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Размяна на Ctrl и Caps Lock"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
 msgid "At left of 'A'"
 msgstr "Вляво от „A“"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:924
 msgid "At bottom left"
 msgstr "Долу вляво"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:925
 msgid "Right Ctrl as Right Alt"
 msgstr "Десният Ctrl е десен Alt"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:926
 msgid "Menu as Right Ctrl"
 msgstr "Menu е десният Ctrl"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:927
 msgid "Right Alt as Right Ctrl"
 msgstr "Десният Alt е десен Ctrl"
 
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:928
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Индикация чрез клавиатурен светодиод за смяна на подредбата"
 
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:929
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:930
 msgid "Numeric keypad layout selection"
 msgstr "Избор на подредбата на цифровата клавиатура"
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:931
 msgid "Legacy"
 msgstr "остаряла"
 
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:932
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Допълненията от Уникод (стрелки и математически операции)"
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:933
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
 
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:934
 msgid "Legacy Wang 724"
 msgstr "Остаряла Wang 724"
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:935
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Цифрова клавиатура — Wang 724, с допълненията от Уникод (стрелки и математически операции)"
 
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:936
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Цифрова клавиатура Wang 724, с допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
 
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:937
 msgid "Hexadecimal"
 msgstr "шестнадесетична"
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:938
 msgid "ATM/phone-style"
 msgstr "Като банкомат/телефон"
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:939
 msgid "Numeric keypad delete key behaviour"
 msgstr "Поведение на клавиша за триене на цифровата клавиатура"
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:940
 msgid "Legacy key with dot"
 msgstr "Остарял клавиш с десетична точка"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:942
 msgid "Legacy key with comma"
 msgstr "Остарял клавиш с десетична запетая"
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:943
 msgid "Four-level key with dot"
 msgstr "Клавиш на четири нива с десетична точка"
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:944
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Клавиш на четири нива с десетична точка, само латиница по ISO-8859-9"
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:945
 msgid "Four-level key with comma"
 msgstr "Клавиш на четири нива с десетична запетая"
 
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:946
 msgid "Four-level key with momayyez"
 msgstr "Клавиш на четири нива с арабска десетична запетая"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:949
 msgid "Four-level key with abstract separators"
 msgstr "Клавиш на четири нива с абстрактни разделители"
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:950
 msgid "Semi-colon on third level"
 msgstr "Точка и запетая на третото ниво"
 
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:951
 msgid "Caps Lock key behavior"
 msgstr "Поведение на Caps Lock"
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:952
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock използва вътрешна промяна на регистъра. Shift временно отменя Caps Lock"
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:953
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock използва вътрешна промяна на регистъра. Shift не влияе на Caps Lock"
 
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:954
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock работи като Shift със заключване. Shift временно отменя Caps Lock"
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:955
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock работи като Shift със заключване. Shift не влияе на Caps Lock"
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:956
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock сменя състоянието Shift само на буквените клавиши"
 
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:957
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Caps Lock е допълнителен Num Lock"
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:958
 msgid "Swap ESC and Caps Lock"
 msgstr "Размяна на Esc и Caps Lock"
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:959
 msgid "Make Caps Lock an additional ESC"
 msgstr "Caps Lock е допълнителен Esc"
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:960
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Caps Lock е допълнителен Backspace"
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:961
 msgid "Make Caps Lock an additional Super"
 msgstr "Caps Lock е допълнителен Super"
 
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:962
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Caps Lock е допълнителен Hyper"
 
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:963
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Caps Lock сменя състоянието Shift за всички клавиши"
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:964
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock е изключен"
 
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:965
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Caps Lock е допълнителен Control, запазване на клавишния символ Caps_Lock"
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:966
 msgid "Alt/Win key behavior"
 msgstr "Поведение на Alt/Win"
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:967
 msgid "Add the standard behavior to Menu key"
 msgstr "Добавяне на стандартното поведение на Menu"
 
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:968
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt-овете отговарят на Meta и на Alt"
 
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:969
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "И двата Win-а са Control (както и клавишите Ctrl)"
 
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:970
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "И двата Alt-а са Control, Win е Alt"
 
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:971
 msgid "Meta is mapped to Win keys"
 msgstr "И двата Win-а са Meta"
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:972
 msgid "Meta is mapped to Left Win"
 msgstr "Левият Win е Meta"
 
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:973
 msgid "Hyper is mapped to Win-keys"
 msgstr "И двата Win-а са Hyper"
 
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:974
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Десният Win е Alt, а Menu — Super"
 
-#: ../rules/base.xml.in.h:965
-msgid "Left Alt is swapped with Left Win"
-msgstr "Левият Alt е разменен с левия Win"
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
+msgstr "Alt е разменен с Win"
 
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:976
 msgid "Compose key position"
 msgstr "Положение на Compose"
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:977
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:978
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:979
 msgid "Miscellaneous compatibility options"
 msgstr "Разни настройки за съвместимост"
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:980
 msgid "Default numeric keypad keys"
 msgstr "Стандартни клавиши на цифровата клавиатура"
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:981
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr "Цифровата клавиатура генерира само цифри (като в Mac OS)"
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:982
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shift за цифровата клавиатура както в MS Windows"
 
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:983
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift не отменя Caps Lock, а избира третото ниво"
 
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:984
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Специалните комбинации (Ctrl+Alt+&lt;клавиш&gt;) се обработват от сървъра"
 
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:985
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Apple Aluminium Keyboard — симулиране на клавиши за PC (Print, Scroll Lock, Pause, Num Lock)"
 
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:986
 msgid "Shift cancels Caps Lock"
 msgstr "Shift отменя Caps Lock"
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:987
 msgid "Enable extra typographic characters"
 msgstr "Допълнителни типографски знаци"
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:988
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Двата Shift-а заедно превключват Caps Lock"
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:989
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Двата Shift-а заедно включват Caps Lock, самостоятелен Shift го изключва"
 
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:990
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Двата Shift-а заедно превключват ShiftLock"
 
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:991
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Включване на клавиши за придвижване чрез Shift+Num Lock"
 
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:992
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr "Позволяване на клавиатурно прекъсване на прихващането на устройствата (внимание: позволяването намалява сигурността)"
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:993
 msgid "Adding currency signs to certain keys"
 msgstr "Добавяне на знак за валута към някои клавиши"
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:994
 msgid "Euro on E"
 msgstr "„€“ при „E“"
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:995
 msgid "Euro on 2"
 msgstr "„€“ при „2“"
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:996
 msgid "Euro on 4"
 msgstr "„€“ при „4“"
 
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:997
 msgid "Euro on 5"
 msgstr "„€“ при „5“"
 
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:998
 msgid "Rupee on 4"
 msgstr "„₨“ при „4“"
 
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:999
 msgid "Key to choose 5th level"
 msgstr "Клавиш за избор петото ниво"
 
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1000
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "„&lt;&gt;“ избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
 
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1001
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Десният Alt избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
 
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1002
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Левият Win избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
 
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1003
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Десният Win избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
 
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1004
 msgid "Using space key to input non-breakable space character"
 msgstr "Генериране на интервал без разделяне с клавишa за интервал"
 
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:1005
 msgid "Usual space at any level"
 msgstr "Нормален интервал на всички нива"
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1006
 msgid "Non-breakable space character at second level"
 msgstr "Интервал без разделяне на второ ниво"
 
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1007
 msgid "Non-breakable space character at third level"
 msgstr "Интервал без разделяне на трето ниво"
 
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1008
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Интервал без разделяне на трето ниво и нищо на четвърто ниво"
 
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1009
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Интервал без разделяне на трето ниво и тесен интервал без разделяне на четвърто ниво"
 
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1010
 msgid "Non-breakable space character at fourth level"
 msgstr "Интервал без разделяне на четвърто ниво"
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1011
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на шесто ниво"
 
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1012
 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:1003
+#: ../rules/base.xml.in.h:1013
 msgid "Zero-width non-joiner character at second level"
 msgstr "Разделител с нулева широчина на второ ниво"
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1014
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Разделител с нулева широчина на второ ниво и съединител с нулева широчина на трето ниво"
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1015
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Разделител с нулева широчина на второ ниво, съединител с нулева широчина на трето ниво и интервал без разделяне на четвърто ниво"
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1016
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Разделител с нулева широчина на второ ниво и интервал без разделяне на трето ниво"
 
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1017
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Разделител с нулева широчина на второ ниво, интервал без разделяне на трето ниво и нищо на четвърто ниво"
 
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1018
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Разделител с нулева широчина на второ ниво, интервал без разделяне на трето ниво и съединител с нулева широчина на четвърто ниво"
 
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1019
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Разделител с нулева широчина на второ ниво, интервал без разделяне на трето ниво и тесен интервал без разделяне на четвърто ниво"
 
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1020
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Разделител с нулева широчина на трето ниво и съединител с нулева широчина на четвърто ниво"
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1021
 msgid "Japanese keyboard options"
 msgstr "Настройки за японска клавиатура"
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1022
 msgid "Kana Lock key is locking"
 msgstr "Клавишът Lock на кана заключва"
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1023
 msgid "NICOLA-F style Backspace"
 msgstr "Backspace на мястото определено от подредбата NICOLA-F"
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1024
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr "„全角/半角“ (Zenkaku Hankaku) е допълнителен Esc"
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1025
 msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr "Добавяне на двойните ударения на Esperanto"
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1026
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "към съответния клавиш Qwerty"
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1027
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "към съответния клавиш в Dvorak"
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Съвместимост със старите кодове на клавиши в Solaris"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "Съвместимост с клавишите на Sun"
+
+#: ../rules/base.xml.in.h:1030
 msgid "Key sequence to kill the X server"
 msgstr "Клавишна комбинация за убиването на X сървъра"
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
 msgid "Control + Alt + Backspace"
 msgstr "Control+Alt+Backspace"
 
@@ -3838,7 +3889,7 @@ msgid "apl"
 msgstr "APL"
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "APL Keyboard Symbols"
+msgid "APL keyboard symbols"
 msgstr "знаци на клавишите в APL"
 
 #: ../rules/base.extras.xml.in.h:5
@@ -3857,102 +3908,234 @@ msgstr "Шкп"
 msgid "Secwepemctsin"
 msgstr "шъкуъпмъктчин"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "многоезична — канадска, на Sun вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "немска — американска с немски букви"
 
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "немска — унгарски букви, без „мъртви“ клавиши"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "немска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:17
 msgid "Avestan"
 msgstr "авестийска"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:20
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "литовска — американска, Дворак с литовски букви"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "литовска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "латвийска — американска, Дворак"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "латвийска — американска, Дворак, „Y“ при интервала"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "латвийска — американска, Дворак, „-“ при интервала"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "латвийска — американска, Дворак за програмисти"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "латвийска — американска, Дворак за програмисти, „Y“ при интервала"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "латвийска — американска, Дворак за програмисти, „-“ при интервала"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:30
 msgid "Latvian (US Colemak)"
 msgstr "латвийска — американска, Коулмак"
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:31
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "латвийска — американска, Коулмак, с „'“"
 
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "латвийска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:35
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "английска — международна, с комбинации по Уникод чрез AltGr"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "английска — международна, с комбинации по Уникод чрез AltGr, алтернативна"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "Atsina"
 msgstr " ацинска"
 
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:38
 msgid "Couer D'alene Salish"
 msgstr "селиш на кор дален"
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr "английска — американска, на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr "полска — международна, с „мъртви“ клавиши"
 
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "полска — Коулмак"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "полска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:48
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr "кримски татарски — „Q“ горе-вляво, Добруджа-Q"
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "румънска — ергономична, десетопръстна"
 
-#: ../rules/base.extras.xml.in.h:44
-msgid "Serbian"
-msgstr "сръбска"
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "румънска — на Sun, вид 6/7"
 
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:53
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "сръбска — комбиниращи ударения вместо „мъртви“ клавиши"
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "руска — с украинско-белоруска подредба"
 
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "руска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:60
 msgid "Armenian (OLPC phonetic)"
 msgstr "арменска — фонетична, OLPC"
 
-#: ../rules/base.extras.xml.in.h:53
-msgid "Hebrew (Biblical SIL)"
-msgstr "иврит — библейска, Сил"
-
-#: ../rules/base.extras.xml.in.h:54
-msgid "Biblical SIL phonetic"
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
 msgstr "иврит — библейска, Сил, фонетична"
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "арабска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "белгийска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "португалска — бразилска, на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "чешка — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "датска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "холандска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "естонска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "финландска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "френска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "гръцка — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "италианска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "японска — на Sun, вид 6"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "японска — на Sun, вид 7, съвместима с PC"
+
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "японска — на Sun, вид 7, съвместима със Sun"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "норвежка — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "португалска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "словашка — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "испанска — с „мъртви“ клавиши на Sun"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "шведска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr "немска — швейцарска, на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "немска — швейцарска, на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "френска — швейцарска, на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "турска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "украинска — на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "английска — великобританска, на Sun, вид 6/7"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "корейска — на Sun, вид 6/7"
diff --git a/xorg-server/xkeyboard-config/po/ca.po b/xorg-server/xkeyboard-config/po/ca.po
index 1b338fc72..63d6ceee9 100644
--- a/xorg-server/xkeyboard-config/po/ca.po
+++ b/xorg-server/xkeyboard-config/po/ca.po
@@ -2,13 +2,13 @@
 # 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, 2010, 2011, 2012.
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.6.99\n"
+"Project-Id-Version: xkeyboard-config-2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-09-12 00:25+0100\n"
-"PO-Revision-Date: 2012-09-16 20:55+0200\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-18 20:31+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "Language: ca\n"
@@ -699,3093 +699,3144 @@ msgid "OLPC"
 msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Sun Type 7 USB"
+msgstr "Sun Type 7 USB"
 
 #: ../rules/base.xml.in.h:172
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun Type 7 USB (disposició europea)"
+
+#: ../rules/base.xml.in.h:173
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun Type 7 USB (disposició Unix)"
+
+#: ../rules/base.xml.in.h:174
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun Type 7 USB (disposició japonesa) / 106 tecles japonesa"
+
+#: ../rules/base.xml.in.h:175
+msgid "Sun Type 6/7 USB"
+msgstr "Sun Type 6/7 USB"
+
+#: ../rules/base.xml.in.h:176
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun Type 6/7 USB (disposició europea)"
+
+#: ../rules/base.xml.in.h:177
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun Type 6 USB (disposició Unix)"
+
+#: ../rules/base.xml.in.h:178
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun Type 6 USB (disposició japonesa)"
+
+#: ../rules/base.xml.in.h:179
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun Type 6 (disposició japonesa)"
+
+#: ../rules/base.xml.in.h:180
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:181
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:182
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:183
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:184
 msgid "Htc Dream phone"
 msgstr "Telèfon HTC Dream"
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
 msgid "English (US)"
 msgstr "Anglès (EUA)"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:189
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:190
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:191
 msgid "English (US, with euro on 5)"
 msgstr "Anglès (EUA, amb l'euro en el 5)"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:192
 msgid "English (US, international with dead keys)"
 msgstr "Anglès (EUA, internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:193
 msgid "English (US, alternative international)"
 msgstr "Anglès (EUA, internacional alternatiu)"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:194
 msgid "English (Colemak)"
 msgstr "Anglès (Colemak)"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:195
 msgid "English (Dvorak)"
 msgstr "Anglès (dvorak)"
 
-#: ../rules/base.xml.in.h:188
-msgid "English (Dvorak international with dead keys)"
-msgstr "Anglès (dvorak internacional amb tecles mortes)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
+msgstr "Anglès (dvorak, internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:197
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Anglès (dvorak internacional alternatiu sense tecles mortes)"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:198
 msgid "English (left handed Dvorak)"
 msgstr "Anglès (dvorak esquerrà)"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:199
 msgid "English (right handed Dvorak)"
 msgstr "Anglès (dvorak dretà)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:200
 msgid "English (classic Dvorak)"
 msgstr "Anglès (dvorak clàssic)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:201
 msgid "English (programmer Dvorak)"
 msgstr "Anglès (dvorak de programador)"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:204
 msgid "Russian (US, phonetic)"
 msgstr "Rus (EUA, fonètic)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
 msgstr "Anglès (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:206
 msgid "English (international AltGr dead keys)"
 msgstr "Anglès (internacional tecles mortes AltGr)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:207
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Anglès (commutació de disposició en la tecla de multiplicació/divisió)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:208
 msgid "Serbo-Croatian (US)"
 msgstr "Serbocroat (EUA)"
 
-#. Keyboard indicator for Catalan layouts
-#: ../rules/base.xml.in.h:202
-msgid "ca"
-msgstr "ca"
+#: ../rules/base.xml.in.h:209
+msgid "English (Workman)"
+msgstr "Anglès (Workman)"
 
-#: ../rules/base.xml.in.h:203
-msgid "Catalan"
-msgstr "Català"
+#: ../rules/base.xml.in.h:210
+msgid "English (Workman, international with dead keys)"
+msgstr "Anglès (Workman, internacional amb tecles mortes)"
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:213
 msgid "Afghani"
 msgstr "Afganès"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:215
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:216
 msgid "Pashto"
 msgstr "Paixtu"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:218
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:219
 msgid "Uzbek (Afghanistan)"
 msgstr "Usbec (Afganistan)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:220
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paixtu (Afganistan, OLPC)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:221
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persa (Afganistan, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:222
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Usbec (Afganistan, OLPC)"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
 msgid "Arabic"
 msgstr "Àrab"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:226
 msgid "Arabic (azerty)"
 msgstr "Àrab (azerty)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:227
 msgid "Arabic (azerty/digits)"
 msgstr "Àrab (azerty/dígits)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:228
 msgid "Arabic (digits)"
 msgstr "Àrab (dígits)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:229
 msgid "Arabic (qwerty)"
 msgstr "Àrab (qwerty)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:230
 msgid "Arabic (qwerty/digits)"
 msgstr "Àrab (qwerty/dígits)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:231
 msgid "Arabic (Buckwalter)"
 msgstr "Àrab (Buckwalter)"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:233
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:234
 msgid "Albanian"
 msgstr "Albanès"
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
 msgid "Armenian"
 msgstr "Armeni"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:238
 msgid "Armenian (phonetic)"
 msgstr "Armeni (fonètic)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:239
 msgid "Armenian (alternative phonetic)"
 msgstr "Armeni (fonètic alternatiu)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:240
 msgid "Armenian (eastern)"
 msgstr "Armeni (oriental)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:241
 msgid "Armenian (western)"
 msgstr "Armeni (occidental)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:242
 msgid "Armenian (alternative eastern)"
 msgstr "Armeni (oriental alternatiu)"
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:245
 msgid "German (Austria)"
 msgstr "Alemany (Àustria)"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:246
+msgid "German (legacy)"
+msgstr "Alemany (antic)"
+
+#: ../rules/base.xml.in.h:247
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Alemany (Àustria, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:248
 msgid "German (Austria, Sun dead keys)"
 msgstr "Alemany (Àustria, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:249
 msgid "German (Austria, Macintosh)"
 msgstr "Alemany (Àustria, Macintosh)"
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:251
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:252
 msgid "Azerbaijani"
 msgstr "Àzeri"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:253
 msgid "Azerbaijani (Cyrillic)"
 msgstr "Àzeri (ciríl·lic)"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:255
 msgid "by"
 msgstr "by"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:256
 msgid "Belarusian"
 msgstr "Bielorús"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:257
 msgid "Belarusian (legacy)"
 msgstr "Bielorús (antic)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:258
 msgid "Belarusian (Latin)"
 msgstr "Bielorús (llatí)"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:262
 msgid "Belgian (alternative)"
 msgstr "Belga (alternatiu)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:263
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belga (alternatiu, només latin-9)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:264
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belga (alternatiu, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:265
 msgid "Belgian (ISO alternate)"
 msgstr "Belga (alternatiu ISO)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:266
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belga (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:267
 msgid "Belgian (Sun dead keys)"
 msgstr "Belga (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:268
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belga (Wang model 724 azerty)"
 
 #. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:270
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:271
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:272
 msgid "Bengali (Probhat)"
 msgstr "Bengalí (Probhat)"
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:274
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:275
 msgid "Indian"
 msgstr "Indi"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:276
 msgid "Bengali (India)"
 msgstr "Bengalí (Índia)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:277
 msgid "Bengali (India, Probhat)"
 msgstr "Bengalí (Índia, Probhat)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:278
 msgid "Bengali (India, Baishakhi)"
 msgstr "Bengalí (Índia, Baishakhi)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:279
 msgid "Bengali (India, Bornona)"
 msgstr "Bengalí (Índia, Bornona)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:280
 msgid "Bengali (India, Uni Gitanjali)"
 msgstr "Bengalí (Índia, Uni Gitanjali)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:281
 msgid "Bengali (India, Baishakhi Inscript)"
 msgstr "Bengalí (Índia, Inscript Baishakhi)"
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:283
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:284
 msgid "Gujarati"
 msgstr "Gujarati"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:286
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:287
 msgid "Punjabi (Gurmukhi)"
 msgstr "Panjabi (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:288
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Panjabi (Gurmukhi Jhelum)"
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:290
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:291
 msgid "Kannada"
 msgstr "Kannada"
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:293
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:294
 msgid "Malayalam"
 msgstr "Malaiàlam"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:295
 msgid "Malayalam (Lalitha)"
 msgstr "Malaiàlam (Lalitha)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:296
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malaiàlam (Inscript realçat, amb el signe de rupia)"
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:298
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:299
 msgid "Oriya"
 msgstr "Oriya"
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:301
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:302
 msgid "Tamil (Unicode)"
 msgstr "Tàmil (Unicode)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:303
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tàmil (teclat amb nombres)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:304
 msgid "Tamil (TAB typewriter)"
 msgstr "Tàmil (tipus d'escriptura TAB)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:305
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tàmil (tipus d'escriptura TSCII)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:306
 msgid "Tamil"
 msgstr "Tàmil"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:308
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:309
 msgid "Telugu"
 msgstr "Telugu"
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:311
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:312
 msgid "Urdu (phonetic)"
 msgstr "Urdú (fonètic)"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:313
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdú (fonètic alternatiu)"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:314
 msgid "Urdu (WinKeys)"
 msgstr "Urdú (tecles Win)"
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:316
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:317
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (Bolnagri)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:318
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:319
 msgid "English (India, with RupeeSign)"
 msgstr "Anglès (Índia, amb signe de rupia)"
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:321
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:322
 msgid "Bosnian"
 msgstr "Bosnià"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:323
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnià (usa cometes angulars per les cometes)"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:324
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnià (usa dígrafs bosnians)"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:325
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosnià (teclat EUA amb dígrafs bosnians)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:326
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnià (teclat EUA amb lletres bosnianes)"
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
 msgid "Portuguese (Brazil)"
 msgstr "Portuguès (Brasil)"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:330
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portuguès (Brasil, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:331
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portuguès (Brasil, dvorak)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:332
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portuguès (Brasil, natiu)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:333
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portuguès (Brasil, natiu per als teclats EUA)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:334
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portuguès (Brasil, natiu per a l'esperanto)"
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:336
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:337
 msgid "Bulgarian"
 msgstr "Búlgar"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:338
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Búlgar (fonètic tradicional)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:339
 msgid "Bulgarian (new phonetic)"
 msgstr "Búlgar (fonètic nou)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:340
 msgid "Arabic (Morocco)"
 msgstr "Àrab (Marroc)"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:343
 msgid "French (Morocco)"
 msgstr "Francès (Marroc)"
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:345
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:346
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berber (Marroc, Tifinagh)"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:347
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berber (Marroc, Tifinagh alternatiu)"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:348
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berber (Marroc, Tifinagh fonètic alternatiu)"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:349
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berber (Marroc, Tifinagh ampliat)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:350
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berber (Marroc, Tifinagh fonètic)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:351
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berber (Marroc, Tifinagh fonètic ampliat)"
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
 msgid "English (Cameroon)"
 msgstr "Anglès (Camerun)"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:355
 msgid "French (Cameroon)"
 msgstr "Francès (Camerun)"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:356
 msgid "Cameroon Multilingual (qwerty)"
 msgstr "Camerun multilingüe (qwerty)"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:357
 msgid "Cameroon Multilingual (azerty)"
 msgstr "Camerun multilingüe (azerty)"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:358
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr "Camerun multilingüe (dvorak)"
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:360
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:361
 msgid "Burmese"
 msgstr "Birmà"
 
-#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr "Francès (Canadà)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:363
 msgid "French (Canada, Dvorak)"
 msgstr "Francès (Canadà, dvorak)"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:364
 msgid "French (Canada, legacy)"
 msgstr "Francès (Canadà, antic)"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:365
 msgid "Canadian Multilingual"
 msgstr "Canadenc multilingüe"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:366
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadenc multilingüe (primera part)"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:367
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadenc multilingüe (segona part)"
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:369
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:370
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:371
 msgid "English (Canada)"
 msgstr "Anglès (Canadà)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:372
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Francès (República Democràtica del Congo)"
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:374
 msgid "zh"
 msgstr "zh"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:375
 msgid "Chinese"
 msgstr "Xinès"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:376
 msgid "Tibetan"
 msgstr "Tibetà"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:377
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetà (amb nombres ASCII)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:378
 msgid "Uyghur"
 msgstr "Uigur"
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:380
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:381
 msgid "Croatian"
 msgstr "Croat"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:382
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Croat (usa cometes angulars per les cometes)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:383
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Croat (usa dígrafs croats)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:384
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Croat (teclat EUA amb dígrafs croats)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:385
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Croat (teclat EUA amb lletres croates)"
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
 msgid "Czech"
 msgstr "Txec"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:389
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Txec (amb la tecla &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:390
 msgid "Czech (qwerty)"
 msgstr "Txec (qwerty)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:391
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Txec (qwerty, barra inversa ampliada)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:392
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Txec (disposició UCW, només lletres accentuades)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:393
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Txec (dvorak EUA que permet UCW CZ)"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
 msgid "Danish"
 msgstr "Danès"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:397
 msgid "Danish (eliminate dead keys)"
 msgstr "Danès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:398
 msgid "Danish (Macintosh)"
 msgstr "Danès (Macintosh)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:399
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Danès (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:400
 msgid "Danish (Dvorak)"
 msgstr "Danès (dvorak)"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
 msgid "Dutch"
 msgstr "Holandès"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:404
 msgid "Dutch (Sun dead keys)"
 msgstr "Holandès (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:405
 msgid "Dutch (Macintosh)"
 msgstr "Holandès (Macintosh)"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:406
 msgid "Dutch (standard)"
 msgstr "Holandès (estàndard)"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:408
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:409
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
 msgid "Estonian"
 msgstr "Estonià"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:413
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estonià (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:414
 msgid "Estonian (Dvorak)"
 msgstr "Estonià (dvorak)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estonià (teclat EUA amb lletres estonianes)"
 
-#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
 msgid "Persian"
 msgstr "Persa"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Persian (with Persian Keypad)"
 msgstr "Persa (amb teclat persa)"
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurd (Iran, llatí Q)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 msgid "Kurdish (Iran, F)"
 msgstr "Kurd (Iran, F)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurd (Iran, llatí Alt-Q)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurd (Iran, àrab-llatí)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
 msgid "Iraqi"
 msgstr "Iraquià"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:425
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurd (Iraq, llatí Q)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:426
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurd (Iraq, F)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:427
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurd (Iraq, llatí Alt-Q)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:428
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurd (Iraq, àrab-llatí)"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:430
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:431
 msgid "Faroese"
 msgstr "Feroès"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:432
 msgid "Faroese (eliminate dead keys)"
 msgstr "Feroès (elimina les tecles mortes)"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
 msgid "Finnish"
 msgstr "Finès"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:436
 msgid "Finnish (classic)"
 msgstr "Finès (clàssic)"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finès (clàssic, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Northern Saami (Finland)"
 msgstr "Sami Nord (Finlàndia)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Finnish (Macintosh)"
 msgstr "Finès (Macintosh)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
 msgid "French"
 msgstr "Francès"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:441
 msgid "French (eliminate dead keys)"
 msgstr "Francès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "French (Sun dead keys)"
 msgstr "Francès (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "French (alternative)"
 msgstr "Francès (alternatiu)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "French (alternative, latin-9 only)"
 msgstr "Francès (alternatiu, només latin-9)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Francès (alternatiu, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "French (alternative, Sun dead keys)"
 msgstr "Francès (alternatiu, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "French (legacy, alternative)"
 msgstr "Francès (antic, alternatiu)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Francès (antic, alternatiu, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Francès (antic, alternatiu, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Francès (Bepo, ergonòmic, tipus dvorak)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Francès (Bepo, ergonòmic, tipus dvorak, només latin-9)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:452
 msgid "French (Dvorak)"
 msgstr "Francès (dvorak)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:453
 msgid "French (Macintosh)"
 msgstr "Francès (Macintosh)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:454
 msgid "French (Breton)"
 msgstr "Francès (Bretó)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:455
 msgid "Occitan"
 msgstr "Occità"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:456
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Georgià (França, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:457
 msgid "English (Ghana)"
 msgstr "Anglès (Ghana)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:458
 msgid "English (Ghana, multilingual)"
 msgstr "Anglès (Ghana, multilingüe)"
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:460
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:461
 msgid "Akan"
 msgstr "Akan"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:463
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:464
 msgid "Ewe"
 msgstr "Ewe"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:466
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:467
 msgid "Fula"
 msgstr "Fula"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:469
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:470
 msgid "Ga"
 msgstr "Ga"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:472
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:473
 msgid "Hausa"
 msgstr "Haussa"
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:475
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:476
 msgid "Avatime"
 msgstr "Avatime"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:477
 msgid "English (Ghana, GILLBT)"
 msgstr "Anglès (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:478
 msgid "French (Guinea)"
 msgstr "Francès (Guinea)"
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:480
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:481
 msgid "Georgian"
 msgstr "Georgià"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:482
 msgid "Georgian (ergonomic)"
 msgstr "Georgià (ergonòmic)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:483
 msgid "Georgian (MESS)"
 msgstr "Georgià (MESS)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:484
 msgid "Russian (Georgia)"
 msgstr "Rus (Geòrgia)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:485
 msgid "Ossetian (Georgia)"
 msgstr "Osset (Geòrgia)"
 
-#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
 msgid "German"
 msgstr "Alemany"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:487
 msgid "German (dead acute)"
 msgstr "Alemany (accent mort)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:488
 msgid "German (dead grave acute)"
 msgstr "Alemany (accent greu mort)"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:489
 msgid "German (eliminate dead keys)"
 msgstr "Alemany (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:490
 msgid "Romanian (Germany)"
 msgstr "Romanès (Alemanya)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:491
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Romanès (Alemanya, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:492
 msgid "German (Dvorak)"
 msgstr "Alemany (dvorak)"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:493
 msgid "German (Sun dead keys)"
 msgstr "Alemany (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:494
 msgid "German (Neo 2)"
 msgstr "Alemany (Neo 2)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:495
 msgid "German (Macintosh)"
 msgstr "Alemany (Macintosh)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:496
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Alemany (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:497
 msgid "Lower Sorbian"
 msgstr "Baix sòrab"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:498
 msgid "Lower Sorbian (qwertz)"
 msgstr "Baix sòrab (qwertz)"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:499
 msgid "German (qwerty)"
 msgstr "Alemany (qwerty)"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:500
 msgid "Russian (Germany, phonetic)"
 msgstr "Rus (alemany, fonètic)"
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
 msgid "Greek"
 msgstr "Grec"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:504
 msgid "Greek (simple)"
 msgstr "Grec (senzill)"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:505
 msgid "Greek (extended)"
 msgstr "Grec (ampliat)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:506
 msgid "Greek (eliminate dead keys)"
 msgstr "Grec (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:507
 msgid "Greek (polytonic)"
 msgstr "Grec (politònic)"
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:509
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian"
 msgstr "Hongarès"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (standard)"
 msgstr "Hongarès (estàndard)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Hongarès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (qwerty)"
 msgstr "Hongarès (qwerty)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Hongarès (101/qwertz/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Hongarès (101/qwertz/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Hongarès (101/qwertz/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Hongarès (101/qwertz/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Hongarès (101/qwerty/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Hongarès (101/qwerty/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Hongarès (101/qwerty/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:521
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Hongarès (101/qwerty/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:522
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Hongarès (102/qwertz/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:523
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Hongarès (102/qwertz/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:524
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Hongarès (102/qwertz/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:525
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Hongarès (102/qwertz/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:526
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Hongarès (102/qwerty/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:527
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Hongarès (102/qwerty/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:528
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Hongarès (102/qwerty/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:529
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Hongarès (102/qwerty/punt/elimina les tecles mortes)"
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:531
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:532
 msgid "Icelandic"
 msgstr "Islandès"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:533
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandès (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:534
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:535
 msgid "Icelandic (Macintosh)"
 msgstr "Islandès (Macintosh)"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:536
 msgid "Icelandic (Dvorak)"
 msgstr "Islandès (dvorak)"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:540
 msgid "Hebrew (lyx)"
 msgstr "Hebreu (lyx)"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:541
 msgid "Hebrew (phonetic)"
 msgstr "Hebreu (fonètic)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:542
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hebreu (bíblic, Tiro)"
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
 msgid "Italian"
 msgstr "Italià"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:546
 msgid "Italian (eliminate dead keys)"
 msgstr "Italià (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:547
 msgid "Italian (Macintosh)"
 msgstr "Italià (Macintosh)"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:548
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italià (teclat EUA amb lletres italianes)"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:549
 msgid "Georgian (Italy)"
 msgstr "Georgià (Itàlia)"
 
+#: ../rules/base.xml.in.h:550
+msgid "Italian (IBM 142)"
+msgstr "Italià (IBM 142)"
+
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
 msgid "Japanese"
 msgstr "Japonès"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:554
 msgid "Japanese (Kana)"
 msgstr "Japonès (Kana)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:555
 msgid "Japanese (Kana 86)"
 msgstr "Japonès (Kana 86)"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:556
 msgid "Japanese (OADG 109A)"
 msgstr "Japonès (OADG 109A)"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:557
 msgid "Japanese (Macintosh)"
 msgstr "Japonès (Macintosh)"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:558
 msgid "Japanese (Dvorak)"
 msgstr "Japonès (dvorak)"
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:560
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:561
 msgid "Kyrgyz"
 msgstr "Kirguís"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:562
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirguís (fonètic)"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:564
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:565
 msgid "Khmer (Cambodia)"
 msgstr "Khmer (Cambotja)"
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:567
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:568
 msgid "Kazakh"
 msgstr "Kazakh"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:569
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Rus (Kazakhstan amb Kazakh)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:570
 msgid "Kazakh (with Russian)"
 msgstr "Kazakh (amb rus)"
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:572
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:573
 msgid "Lao"
 msgstr "Laosià"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:574
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Laosià (disposició estàndard proposada per STEA)"
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:577
 msgid "Spanish (Latin American)"
 msgstr "Espanyol (llatinoamericà)"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:578
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Espanyol (llatinoamericà, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:579
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Espanyol (llatinoamericà, inclou la titlla morta)"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:580
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Espanyol (llatinoamericà, tecles mortes de Sun)"
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
 msgid "Lithuanian"
 msgstr "Lituà"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:584
 msgid "Lithuanian (standard)"
 msgstr "Lituà (estàndard)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:585
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Lituà (teclat EUA amb lletres lituanes)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:586
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Lituà (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:587
 msgid "Lithuanian (LEKP)"
 msgstr "Lituà (LEKP)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:588
 msgid "Lithuanian (LEKPa)"
 msgstr "Lituà (LEKPa)"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
 msgid "Latvian"
 msgstr "Letó"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:592
 msgid "Latvian (apostrophe variant)"
 msgstr "Letó (variant amb apòstrof)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:593
 msgid "Latvian (tilde variant)"
 msgstr "Letó (variant titlla)"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:594
 msgid "Latvian (F variant)"
 msgstr "Letó (variant F)"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:595
 msgid "Latvian (modern)"
 msgstr "Letó (modern)"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:596
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Letó (ergonòmic, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:597
 msgid "Latvian (adapted)"
 msgstr "Letó (adaptat)"
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:599
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:600
 msgid "Maori"
 msgstr "Maori"
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:603
 msgid "Montenegrin"
 msgstr "Montenegrí"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:604
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrí (ciríl·lic)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:605
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrí (ciríl·lic, Z i ZHE intercanviades)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:606
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Montenegrí (llatí Unicode)"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:607
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Montenegrí (llatí qwerty)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:608
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Montenegrí (llatí Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:609
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrí (ciríl·lic amb cometes angulars)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:610
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrí (llatí amb cometes angulars)"
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:612
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:613
 msgid "Macedonian"
 msgstr "Macedoni"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:614
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedoni (elimina les tecles mortes)"
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:616
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:617
 msgid "Maltese"
 msgstr "Maltès"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:618
 msgid "Maltese (with US layout)"
 msgstr "Maltès (amb disposició EUA)"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:620
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:621
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
 msgid "Norwegian"
 msgstr "Noruec"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:625
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Noruec (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:626
 msgid "Norwegian (Dvorak)"
 msgstr "Noruec (dvorak)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:627
 msgid "Northern Saami (Norway)"
 msgstr "Sami Nord (Noruega)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:628
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Sami Nord (Noruega, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:629
 msgid "Norwegian (Macintosh)"
 msgstr "Noruec (Macintosh)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:630
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Noruec (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:631
 msgid "Norwegian (Colemak)"
 msgstr "Noruec (Colemak)"
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
 msgid "Polish"
 msgstr "Polonès"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:635
+msgid "Polish (legacy)"
+msgstr "Polonès (antic)"
+
+#: ../rules/base.xml.in.h:636
 msgid "Polish (qwertz)"
 msgstr "Polonès (qwertz)"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:637
 msgid "Polish (Dvorak)"
 msgstr "Polonès (dvorak)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:638
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Polonès (dvorak, cometes poloneses a la tecla cometes)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:639
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Polonès (dvorak, cometes poloneses a la tecla 1)"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:640
 msgid "Kashubian"
 msgstr "Caixubi"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:641
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Rus (Polònia, fonètic dvorak)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:642
 msgid "Polish (programmer Dvorak)"
 msgstr "Polonès (dvorak de programador)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
 msgid "Portuguese"
 msgstr "Portuguès"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:644
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portuguès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:645
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portuguès (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:646
 msgid "Portuguese (Macintosh)"
 msgstr "Portuguès (Macintosh)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:647
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portuguès (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:648
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portuguès (Macintosh, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:649
 msgid "Portuguese (Nativo)"
 msgstr "Portuguès (natiu)"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:650
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portuguès (natiu per als teclats EUA)"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:651
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Esperanto (Portugal, natiu)"
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
 msgid "Romanian"
 msgstr "Romanès"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
 msgstr "Romanès (ce trencada)"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Romanès (estàndard)"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard cedilla)"
 msgstr "Romanès (ce trencada estàndard)"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:658
 msgid "Romanian (WinKeys)"
 msgstr "Romanès (tecles Win)"
 
-#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "Rus"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:660
 msgid "Russian (phonetic)"
 msgstr "Rus (fonètic)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:661
 msgid "Russian (phonetic WinKeys)"
 msgstr "Rus (fonètic tecles Win)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:662
 msgid "Russian (typewriter)"
 msgstr "Rus (màquina d'escriure)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:663
 msgid "Russian (legacy)"
 msgstr "Rus (antic)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:664
 msgid "Russian (typewriter, legacy)"
 msgstr "Rus (màquina d'escriure, antic)"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:665
 msgid "Tatar"
 msgstr "Tàtar"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Ossetian (legacy)"
 msgstr "Osset (antic)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:667
 msgid "Ossetian (WinKeys)"
 msgstr "Osset (tecles Win)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:668
 msgid "Chuvash"
 msgstr "Chuvash"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:669
 msgid "Chuvash (Latin)"
 msgstr "Chuvash (llatí)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:670
 msgid "Udmurt"
 msgstr "Udmurt"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:671
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:672
 msgid "Yakut"
 msgstr "Iacut"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:673
 msgid "Kalmyk"
 msgstr "Calmuc"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:674
 msgid "Russian (DOS)"
 msgstr "Rus (DOS)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:675
 msgid "Serbian (Russia)"
 msgstr "Serbi (Rússia)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:676
 msgid "Bashkirian"
 msgstr "Baixkir"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:677
 msgid "Mari"
 msgstr "Mari"
 
-#: ../rules/base.xml.in.h:668
-msgid "Serbian (Cyrillic)"
-msgstr "Serbi (ciríl·lic)"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "Serbi"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:679
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr "Serbi (ciríl·lic, Z i ZHE intercanviades)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:680
 msgid "Serbian (Latin)"
 msgstr "Serbi (llatí)"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:681
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbi (llatí Unicode)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:682
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbi (llatí qwerty)"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:683
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbi (llatí Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr "Serbi (ciríl·lic amb cometes angulars)"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbi (llatí amb cometes angulars)"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:686
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Rutè Pannònic (homofònic)"
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:688
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:689
 msgid "Slovenian"
 msgstr "Eslovè"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:690
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Eslovè (usa cometes angulars per les cometes)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:691
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Eslovè (teclat EUA amb lletres eslovenes)"
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
 msgid "Slovak"
 msgstr "Eslovac"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:695
 msgid "Slovak (extended Backslash)"
 msgstr "Eslovac (barra inversa ampliada)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:696
 msgid "Slovak (qwerty)"
 msgstr "Eslovac (qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:697
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Eslovac (qwerty, barra inversa ampliada)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
 msgid "Spanish"
 msgstr "Espanyol"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:699
 msgid "Spanish (eliminate dead keys)"
 msgstr "Espanyol (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:700
 msgid "Spanish (include dead tilde)"
 msgstr "Espanyol (inclou la titlla morta)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:701
 msgid "Spanish (Sun dead keys)"
 msgstr "Espanyol (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:702
 msgid "Spanish (Dvorak)"
 msgstr "Espanyol (dvorak)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:703
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr "Asturià (Espanya, amb H punt baix i L amb punt baix)"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:704
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Català (Espanya, L amb punt volat)"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:705
 msgid "Spanish (Macintosh)"
 msgstr "Espanyol (Macintosh)"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
 msgid "Swedish"
 msgstr "Suec"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:709
 msgid "Swedish (eliminate dead keys)"
 msgstr "Suec (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:710
 msgid "Swedish (Dvorak)"
 msgstr "Suec (dvorak)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:711
 msgid "Russian (Sweden, phonetic)"
 msgstr "Rus (Suècia, fonètic)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:712
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Rus (Suècia, fonètic, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:713
 msgid "Northern Saami (Sweden)"
 msgstr "Sami del nord (Suècia)"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:714
 msgid "Swedish (Macintosh)"
 msgstr "Suec (Macintosh)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:715
 msgid "Swedish (Svdvorak)"
 msgstr "Suec (Svdvorak)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:716
 msgid "Swedish Sign Language"
 msgstr "Idioma de signes suec"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:717
 msgid "German (Switzerland)"
 msgstr "Alemany (Suïssa)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:718
 msgid "German (Switzerland, legacy)"
 msgstr "Alemany (Suïssa, antic)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:719
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Alemany (Suïssa, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:720
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Alemany (Suïssa, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:721
 msgid "French (Switzerland)"
 msgstr "Francès (Suïssa)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:722
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Francès (Suïssa, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Francès (Suïssa, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
 msgid "French (Switzerland, Macintosh)"
 msgstr "Francès (Suïssa, Macintosh)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
 msgid "German (Switzerland, Macintosh)"
 msgstr "Alemany (Suïssa, Macintosh)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
 msgid "Arabic (Syria)"
 msgstr "Àrab (Síria)"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:728
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:729
 msgid "Syriac"
 msgstr "Siri"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:730
 msgid "Syriac (phonetic)"
 msgstr "Siríac (fonètic)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurd (Síria, llatí Q)"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
 msgid "Kurdish (Syria, F)"
 msgstr "Kurd (Síria, F)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurd (Síria, llatí Alt-Q)"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
 msgid "Tajik"
 msgstr "Tadjik"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "Tadjik (antic)"
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:739
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
 msgid "Sinhala (phonetic)"
 msgstr "Singalès (fonètic)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tàmil (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tàmil (Sri Lanka, tipus d'escriptura TAB)"
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
 msgid "Thai"
 msgstr "Tai"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
 msgid "Thai (TIS-820.2538)"
 msgstr "Tai (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Tai (Pattachote)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
 msgid "Turkish (F)"
 msgstr "Turc (F)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
 msgid "Turkish (Alt-Q)"
 msgstr "Turc (Alt-Q)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
 msgid "Turkish (Sun dead keys)"
 msgstr "Turc (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurd (Turquia, llatí Q)"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurd (Turquia, F)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:756
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurd (Turquia, llatí Alt-Q)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
 msgid "Turkish (international with dead keys)"
 msgstr "Turc (internacional amb tecles mortes)"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:760
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Tàtar de Crimea (Turc Q)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Tàtar de Crimea (Turc F)"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Tàtar de Crimea (Turc Alt-Q)"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
 msgid "Taiwanese"
 msgstr "Taiwanès"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanès (indígena)"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Taiwan)"
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
 msgid "Ukrainian"
 msgstr "Ucraïnès"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:771
 msgid "Ukrainian (phonetic)"
 msgstr "Ucraïnès (fonètic)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:772
 msgid "Ukrainian (typewriter)"
 msgstr "Ucraïnès (màquina d'escriure)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
 msgid "Ukrainian (WinKeys)"
 msgstr "Ucraïnès (tecles Win)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (legacy)"
 msgstr "Ucraïnès (antic)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ucraïnès (estàndard RSTU)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Rus (Ucraïna, estàndard RSTU)"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ucraïnès (homofònic)"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
 msgid "English (UK)"
 msgstr "Anglès (RU)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
 msgid "English (UK, extended WinKeys)"
 msgstr "Anglès (RU, tecles Win ampliades)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:780
 msgid "English (UK, international with dead keys)"
 msgstr "Anglès (RU, internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:781
 msgid "English (UK, Dvorak)"
 msgstr "Anglès (RU, dvorak)"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Anglès (RU, dvorak amb puntuació RU)"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
 msgid "English (UK, Macintosh)"
 msgstr "Anglès (RU, Macintosh)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
 msgid "English (UK, Macintosh international)"
 msgstr "Anglès (RU, Macintosh internacional)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
 msgid "English (UK, Colemak)"
 msgstr "Anglès (RU, Colemak)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
 msgid "Uzbek"
 msgstr "Usbec"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:787
 msgid "Uzbek (Latin)"
 msgstr "Usbec (llatí)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:790
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
 msgid "Korean"
 msgstr "Coreà"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
 msgid "Korean (101/104 key compatible)"
 msgstr "Coreà (compatible de 101/104 tecles)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japonès (sèries PC-98xx)"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
 msgid "Irish"
 msgstr "Irlandès"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:800
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlandès (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
 msgid "Ogham"
 msgstr "Ogham"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
 msgid "Ogham (IS434)"
 msgstr "Ogham (IS434)"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
 msgid "Urdu (Pakistan)"
 msgstr "Urdú (Pakistan)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdú (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdú (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
 msgid "Arabic (Pakistan)"
 msgstr "Àrab (Pakistan)"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
 msgid "Sindhi"
 msgstr "Sindhi"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
 msgid "Dhivehi"
 msgstr "Diveí"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:813
 msgid "English (South Africa)"
 msgstr "Anglès (Sud-àfrica)"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:815
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (punt i coma i cometa desplaçats, obsolet)"
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
 msgid "Nepali"
 msgstr "Nepalès"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
 msgid "English (Nigeria)"
 msgstr "Anglès (Nigèria)"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
 msgid "Igbo"
 msgstr "Igbo"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
 msgid "Yoruba"
 msgstr "Ioruba"
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:829
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
 msgid "Amharic"
 msgstr "Amhàric"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:832
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
 msgid "Wolof"
 msgstr "Wolof"
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:836
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
 msgid "Braille (left hand)"
 msgstr "Braille (ma esquerra)"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
 msgid "Braille (right hand)"
 msgstr "Braille (ma dretà)"
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:840
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
 msgid "Turkmen"
 msgstr "Turcman"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
 msgid "Turkmen (Alt-Q)"
 msgstr "Turcman (Alt-Q)"
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:844
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
 msgid "Bambara"
 msgstr "Bambara"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
 msgid "French (Mali, alternative)"
 msgstr "Francès (Mali, alternatiu)"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:847
 msgid "English (Mali, US Macintosh)"
 msgstr "Anglès (Mali, Macintosh EUA)"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
 msgid "English (Mali, US international)"
 msgstr "Anglès (Mali, internacional EUA)"
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:850
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
 msgid "Swahili (Tanzania)"
 msgstr "Suahili (Tanzània)"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
 msgid "Swahili (Kenya)"
 msgstr "Suahili (Kenya)"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:853
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:856
 msgid "Tswana"
 msgstr "Tswana"
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
 msgid "Filipino"
 msgstr "Filipí"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipí (QWERTY Baybayin)"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:861
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipí (Capewell-dvorak llatí)"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipí (Capewell-dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipí (Capewell-QWERF 2006 llatí)"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipí (Capewell-QWERF 2006 Baybayin)"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:865
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipí (Colemak llatí)"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipí (Colemak Baybayin)"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipí (dvorak llatí)"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Filipí (dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
 msgid "md"
 msgstr "md"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
 msgid "Moldavian"
 msgstr "Moldau"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:871
 msgid "gag"
 msgstr "gag"
 
-#: ../rules/base.xml.in.h:862
-msgid "Gagauz"
-msgstr "Gagaús"
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "Moldau (Gagauz)"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
 msgid "Key(s) to change layout"
 msgstr "Tecla(es) per a canviar la disposició"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
 msgid "Right Alt (while pressed)"
 msgstr "Alt dreta (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
 msgid "Left Alt (while pressed)"
 msgstr "Alt esquerra (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:876
 msgid "Left Win (while pressed)"
 msgstr "Win esquerra (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
 msgid "Right Win (while pressed)"
 msgstr "Win dreta (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
 msgid "Any Win key (while pressed)"
 msgstr "Qualsevol tecla Win (mentre estan premudes)"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:879
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Bloq Maj (mentre està premuda), Alt+Bloq Maj efectua l'acció de Bloq Maj original"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
 msgid "Right Ctrl (while pressed)"
 msgstr "Ctrl dreta (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
 msgid "Right Alt"
 msgstr "Alt dreta"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
 msgid "Left Alt"
 msgstr "Alt esquerra"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
 msgid "Caps Lock"
 msgstr "Bloq Majús"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
 msgid "Shift+Caps Lock"
 msgstr "Maj+Bloq Maj"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Bloq Maj (a la primera disposició), Maj+Bloq Maj (a la darrera disposició)"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Win esquerra (a la primera disposició), Win/Menú dreta (a la darrera disposició)"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Ctrl esquerra (a la primera disposició), Ctrl dreta (a la darrera disposició)"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
 msgid "Alt+Caps Lock"
 msgstr "Alt+Bloq Maj"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
 msgid "Both Shift keys together"
 msgstr "Les dues tecles Maj juntes"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
 msgid "Both Alt keys together"
 msgstr "Les dues tecles Alt juntes"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
 msgid "Both Ctrl keys together"
 msgstr "Les dues tecles Ctrl juntes"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Maj"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl esquerra+Maj esquerra"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
 msgid "Right Ctrl+Right Shift"
 msgstr "Ctrl dreta+Maj dreta"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
 msgid "Alt+Shift"
 msgstr "Alt+Maj"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
 msgid "Left Alt+Left Shift"
 msgstr "Alt esquerra+Maj esquerra"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
 msgid "Alt+Space"
 msgstr "Alt+Espai"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
 msgid "Menu"
 msgstr "Menú"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
 msgid "Left Win"
 msgstr "Win esquerra"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
 msgid "Right Win"
 msgstr "Win dreta"
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
 msgid "Left Shift"
 msgstr "Maj esquerra"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
 msgid "Right Shift"
 msgstr "Maj dreta"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl"
 msgstr "Ctrl esquerra"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
 msgid "Right Ctrl"
 msgstr "Ctrl dreta"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
 msgid "Scroll Lock"
 msgstr "Bloq Despl"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Ctrl esquerra+Win esquerra (a la primera disposició), Ctrl dreta+Menú (a la segona disposició)"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
 msgid "Key to choose 3rd level"
 msgstr "Tecla per a seleccionar el 3r nivell"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
 msgid "Any Win key"
 msgstr "Qualsevol tecla Win"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
 msgid "Any Alt key"
 msgstr "Qualsevol tecla Alt"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
 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:902
+#: ../rules/base.xml.in.h:912
 msgid "Right Alt key never chooses 3rd level"
 msgstr "La tecla Alt dreta mai selecciona el 3r nivell"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
 msgid "Enter on keypad"
 msgstr "Retorn en el teclat numèric"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
 msgid "Backslash"
 msgstr "Barra inversa"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Més petit/Més gran&gt;"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
 msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Bloq Maj selecciona el nivell 3r, bloqueja un cop en prémer conjuntament amb un altre selector de nivell 3r"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
 msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Barra inversa selecciona el nivell 3r, bloqueja un cop en prémer conjuntament amb un altre selector de 3r nivell"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
 msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "&lt;Més petit/Més gran&gt; selecciona el nivell 3r, bloqueja un cop en prémer conjuntament amb un altre selector de nivell 3r"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
 msgid "Ctrl key position"
 msgstr "Posició de la tecla Ctrl"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
 msgid "Caps Lock as Ctrl"
 msgstr "Bloq Majús com a Ctrl"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
 msgid "Left Ctrl as Meta"
 msgstr "Ctrl esquerra com a Meta"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Intercanvia Ctrl i Bloq Maj"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
 msgid "At left of 'A'"
 msgstr "A l'esquerra d'«A»"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:924
 msgid "At bottom left"
 msgstr "A baix esquerra"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:925
 msgid "Right Ctrl as Right Alt"
 msgstr "Ctrl dreta com a Alt dreta"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:926
 msgid "Menu as Right Ctrl"
 msgstr "Menú com a Ctrl dreta"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:927
 msgid "Right Alt as Right Ctrl"
 msgstr "Alt dreta com a Ctrl dreta"
 
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:928
 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:919
+#: ../rules/base.xml.in.h:929
 msgid "Num Lock"
 msgstr "Bloq Núm"
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:930
 msgid "Numeric keypad layout selection"
 msgstr "Selecció de la disposició del teclat numèric"
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:931
 msgid "Legacy"
 msgstr "Antic"
 
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:932
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Addicions Unicode (fletxes i operadors matemàtics)"
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:933
 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 per defecte"
 
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:934
 msgid "Legacy Wang 724"
 msgstr "Wang 724 antic"
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:935
 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:926
+#: ../rules/base.xml.in.h:936
 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:927
+#: ../rules/base.xml.in.h:937
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:938
 msgid "ATM/phone-style"
 msgstr "Estil ATM/telèfon"
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:939
 msgid "Numeric keypad delete key behaviour"
 msgstr "Comportament de la tecla de supressió del teclat numèric"
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:940
 msgid "Legacy key with dot"
 msgstr "Tecla antiga amb punt"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:942
 msgid "Legacy key with comma"
 msgstr "Tecla antiga amb coma"
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:943
 msgid "Four-level key with dot"
 msgstr "Tecla de quatre nivells amb punt"
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:944
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Tecla de quatre nivells amb punt, restricció de latin-9"
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:945
 msgid "Four-level key with comma"
 msgstr "Tecla de quatre nivells amb coma"
 
 # Què collons és momayyez? jm
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:946
 msgid "Four-level key with momayyez"
 msgstr "Tecla de quatre nivells amb momayyez"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:949
 msgid "Four-level key with abstract separators"
 msgstr "Tecla de quatre nivells amb separadors abstractes"
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:950
 msgid "Semi-colon on third level"
 msgstr "Punt i coma al tercer nivell"
 
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:951
 msgid "Caps Lock key behavior"
 msgstr "Comportament de la tecla Bloq Maj"
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:952
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Bloq Maj usa internament les majúscules. Maj «pausa» Bloq Maj"
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:953
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Bloq Maj usa internament les majúscules. Maj no afecta a Bloq Maj"
 
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:954
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Bloq Maj actua com a Maj amb bloqueig. Maj «pausa» Bloq Maj"
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:955
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Bloq Maj actua com a Maj amb bloqueig. Maj no afecta a Bloq Maj"
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:956
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Bloq Maj commuta les majúscules normals dels caràcters alfabètics"
 
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:957
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Converteix Bloq Maj en un Bloq Núm addicional"
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:958
 msgid "Swap ESC and Caps Lock"
 msgstr "Intercanvia Esc i Bloq Maj"
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:959
 msgid "Make Caps Lock an additional ESC"
 msgstr "Converteix Bloq Maj en un Esc addicional"
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:960
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Converteix Bloq Maj en un Retrocés addicional"
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:961
 msgid "Make Caps Lock an additional Super"
 msgstr "Converteix Bloq Maj en un Super addicional"
 
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:962
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Converteix Bloq Maj en un Hyper addicional"
 
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:963
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Bloq Maj commuta Maj, de manera que afecta a totes les tecles"
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:964
 msgid "Caps Lock is disabled"
 msgstr "Bloq Maj està deshabilitat"
 
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:965
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Converteix Bloq Maj en un Bloq Núm addicional però manté el «keysym» «Caps_Lock»"
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:966
 msgid "Alt/Win key behavior"
 msgstr "Comportament de la tecla Alt/Win"
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:967
 msgid "Add the standard behavior to Menu key"
 msgstr "Afegeix el comportament estàndard a la tecla Menú"
 
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:968
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt i Meta són a les tecles Alt"
 
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:969
 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:960
+#: ../rules/base.xml.in.h:970
 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:961
+#: ../rules/base.xml.in.h:971
 msgid "Meta is mapped to Win keys"
 msgstr "Meta s'assigna a les tecles Win"
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:972
 msgid "Meta is mapped to Left Win"
 msgstr "Meta s'assigna a la tecla Win esquerra"
 
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:973
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper s'assigna a les tecles Win"
 
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:974
 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:965
-msgid "Left Alt is swapped with Left Win"
-msgstr "Alt esquerra està intercanviada amb la tecla Win esquerra"
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
+msgstr "Alt està intercanviada amb la tecla Win"
 
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:976
 msgid "Compose key position"
 msgstr "Posició de la tecla Compose"
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:977
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:978
 msgid "PrtSc"
 msgstr "ImprPant"
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:979
 msgid "Miscellaneous compatibility options"
 msgstr "Opcions de compatibilitat diverses"
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:980
 msgid "Default numeric keypad keys"
 msgstr "Tecles del teclat numèric per defecte"
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:981
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr "Les tecles del teclat numèric sempre introdueixen dígits (com en el Mac OS)"
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:982
 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:973
+#: ../rules/base.xml.in.h:983
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Maj no cancel·la Bloq Núm, en el seu lloc selecciona el 3r nivell"
 
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:984
 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:975
+#: ../rules/base.xml.in.h:985
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Teclat Apple Aluminium: emula les tecles del PC (Impr, Bloq Despl, Pausa, Bloq Núm)"
 
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:986
 msgid "Shift cancels Caps Lock"
 msgstr "Maj cancel·la Bloq Maj"
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:987
 msgid "Enable extra typographic characters"
 msgstr "Habilita els caràcters tipogràfics extres"
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:988
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Les dues tecles Maj juntes commuten Bloq Maj"
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:989
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Les dues tecles Maj juntes commuten Bloq Maj, una tecla Maj ho desactiva"
 
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:990
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Les dues tecles Maj juntes commuten Bloq Maj"
 
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:991
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Commuta les tecles de cursor amb Maj + BloqNum."
 
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:992
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr "Permetre trencar la captura amb accions del teclat (avís: risc de seguretat)"
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:993
 msgid "Adding currency signs to certain keys"
 msgstr "S'afegeix el signe de moneda a certes tecles"
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:994
 msgid "Euro on E"
 msgstr "Euro en la E "
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:995
 msgid "Euro on 2"
 msgstr "Euro en el 2"
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:996
 msgid "Euro on 4"
 msgstr "Euro en el 4"
 
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:997
 msgid "Euro on 5"
 msgstr "Euro en el 5"
 
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:998
 msgid "Rupee on 4"
 msgstr "Rupia en el 4"
 
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:999
 msgid "Key to choose 5th level"
 msgstr "Tecla per a seleccionar el 5è nivell"
 
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1000
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "&lt;Més petit/Més gran&gt; selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è"
 
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1001
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Alt dreta selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è"
 
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1002
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Win esquerra selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è"
 
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1003
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Win dreta selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è"
 
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1004
 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:995
+#: ../rules/base.xml.in.h:1005
 msgid "Usual space at any level"
 msgstr "Espai normal en qualsevol nivell"
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1006
 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:997
+#: ../rules/base.xml.in.h:1007
 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:998
+#: ../rules/base.xml.in.h:1008
 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:999
+#: ../rules/base.xml.in.h:1009
 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:1000
+#: ../rules/base.xml.in.h:1010
 msgid "Non-breakable space character at fourth level"
 msgstr "Caràcter d'espai sense salt al nivell quart"
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1011
 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:1002
+#: ../rules/base.xml.in.h:1012
 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:1003
+#: ../rules/base.xml.in.h:1013
 msgid "Zero-width non-joiner character at second level"
 msgstr "Caràcter separador d'amplada zero al nivell segon"
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1014
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, un caràcter d'enllaç d'amplada zero al nivell tercer"
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1015
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, un caràcter d'enllaç d'amplada zero al nivell tercer, i un caràcter d'espai sense salt al nivell quart"
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1016
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, i un caràcter d'espai sense salt al nivell tercer"
 
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1017
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, un caràcter d'espai sense salt al nivell tercer, i res al nivell quart"
 
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1018
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, un caràcter d'espai sense salt al nivell tercer, i un enllaç d'amplada zero al nivell quart"
 
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1019
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, 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:1010
+#: ../rules/base.xml.in.h:1020
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Caràcter separador d'amplada zero al nivell tercer, un enllaç d'amplada zero al nivell quart"
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1021
 msgid "Japanese keyboard options"
 msgstr "Opcions del teclat japonès"
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1022
 msgid "Kana Lock key is locking"
 msgstr "La tecla de bloqueig Kana està blocant"
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1023
 msgid "NICOLA-F style Backspace"
 msgstr "Retrocés estil NICOLA-F"
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1024
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr "Converteix Zenkaku Hankaku en un Esc addicional"
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1025
 msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr "S'afegeix el circumflex de l'esperanto (supersigno)"
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1026
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "A la tecla corresponent en un teclat qwerty."
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1027
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "A la tecla corresponent en un teclat dvorak."
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Manté la compatibilitat de tecles amb els codis de tecla antics de Solaris"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "Compatibilitat amb les tecles Sun"
+
+#: ../rules/base.xml.in.h:1030
 msgid "Key sequence to kill the X server"
 msgstr "Seqüència de tecles per a matar el servidor X"
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Retrocés"
 
@@ -3794,7 +3845,7 @@ msgid "apl"
 msgstr "apl"
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "APL Keyboard Symbols"
+msgid "APL keyboard symbols"
 msgstr "Símbols de teclat APL"
 
 #: ../rules/base.extras.xml.in.h:5
@@ -3813,105 +3864,252 @@ msgstr "shs"
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Multilingüe (Canadà, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "Alemany (teclat US amb lletres alemanyes)"
 
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "Alemany (amb lletres hongareses i sense tecles mortes)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "Alemany (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:17
 msgid "Avestan"
 msgstr "Avèstic"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:20
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Lituà (dvorak EUA amb lletres lituanes)"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Lituà (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "Letó (dvorak EUA)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Letó (dvorak EUA, variant Y)"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Letó (dvorak EUA, variant menys)"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Letó (dvorak de programador EUA)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Letó (dvorak de programador EUA, variant Y)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Letó (dvorak de programador EUA, variant menys)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:30
 msgid "Latvian (US Colemak)"
 msgstr "Letó (Colemak EUA)"
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:31
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Letó (Colemak EUA, variant amb apòstrof)"
 
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Letó (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:35
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Anglès (EUA, combinació internacional Unicode AltGr)"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Anglès (EUA, combinació internacional Unicode AltGr, alternativa)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "Atsina"
 msgstr "Atsina"
 
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:38
 msgid "Couer D'alene Salish"
 msgstr "Couer D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr "Anglès (EUA, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr "Polonès (internacional amb tecles mortes)"
 
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "Polonès (Colemak)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "Polonès (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:48
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr "Tàtar de Crimea (Dobruja Q)"
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Romanès (ergonòmic Touchtype)"
 
-#: ../rules/base.extras.xml.in.h:44
-msgid "Serbian"
-msgstr "Serbi"
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Romanès (Sun Type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:53
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serbi (combinació d'accents en lloc de tecles mortes)"
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "Rus (amb disposició ucraïnesa-bielorussa)"
 
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "Rus (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:60
 msgid "Armenian (OLPC phonetic)"
 msgstr "Armeni (fonètic OLPC)"
 
-#: ../rules/base.extras.xml.in.h:53
-msgid "Hebrew (Biblical SIL)"
-msgstr "Hebreu (bíblic SIL)"
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "Hebreu (bíblic, SIL fonètic)"
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Àrab (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Belga (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "Portuguès (Brasil, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "Txec (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "Danès (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Holandès (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Estonià (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Finès (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "Francès (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "Grec (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "Italià (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "Japonès (Sun Type 6)"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Japonès (Sun Type 7 - Compatible PC)"
 
-#: ../rules/base.extras.xml.in.h:54
-msgid "Biblical SIL phonetic"
-msgstr "Bíblic SIL fonètic"
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Japonès (Sun Type 7 - Compatible Sun)"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Noruec (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Portuguès (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Eslovac (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "Espanyol (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "Suec (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr ">Alemany (Suïssa)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Alemany (Suïssa, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Francès (Suïssa, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Turc (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Ucraïnès (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "Anglès (RU, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "Coreà (Sun Type 6/7)"
+
+#~ msgid "ca"
+#~ msgstr "ca"
+
+#~ msgid "Catalan"
+#~ msgstr "Català"
+
+#~ msgid "Serbian (Cyrillic)"
+#~ msgstr "Serbi (ciríl·lic)"
+
+#~ msgid "Gagauz"
+#~ msgstr "Gagaús"
+
+#~ msgid "Hebrew (Biblical SIL)"
+#~ msgstr "Hebreu (bíblic SIL)"
 
 #~ msgid "&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 #~ msgstr "&lt;Més petit/Més gran&gt; selecciona el nivell 5è i activa el bloqueig del nivell 5è en prémer conjuntament amb un altre selector de nivell 5è, una pulsació allibera el bloqueig"
@@ -3970,9 +4168,6 @@ msgstr "Bíblic SIL fonètic"
 #~ msgid "Danish (Mac)"
 #~ msgstr "Danès (Mac)"
 
-#~ msgid "English (UK, Mac)"
-#~ msgstr "Anglès (RU, Mac)"
-
 #~ msgid "Finnish (Mac)"
 #~ msgstr "Finès (Mac)"
 
@@ -4054,9 +4249,6 @@ msgstr "Bíblic SIL fonètic"
 #~ msgid "Swiss"
 #~ msgstr "Suís"
 
-#~ msgid "Swiss (legacy)"
-#~ msgstr "Suís (antic)"
-
 #~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
 #~ msgstr "Turc (Tàtar de Crimea Turc Alt-Q)"
 
diff --git a/xorg-server/xkeyboard-config/po/da.po b/xorg-server/xkeyboard-config/po/da.po
index 583f568ba..04c3caf47 100644
--- a/xorg-server/xkeyboard-config/po/da.po
+++ b/xorg-server/xkeyboard-config/po/da.po
@@ -1,8 +1,8 @@
 # Danish translation of xkeyboard-config.
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2012 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, 2009, 2010, 2011, 2012.
+# Joe Hansen <joedalton2@yahoo.dk>, 2008, 2009, 2010, 2011, 2012, 2013.
 # Korrekturlæsning "Lars Christian Jensen" <larschrjensen@gmail.com>, 2010.
 # Korrekturlæsning "Ask Hjorth Larsen" <asklarsen@gmail.com>, 2011.
 #
@@ -31,10 +31,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.5.99\n"
+"Project-Id-Version: xkeyboard-config-2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-05-16 23:56+0100\n"
-"PO-Revision-Date: 2012-06-03 23:06+0100\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-20 23:06+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -43,2636 +43,2419 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../rules/base.xml.in.h:1
-msgid "&lt;Less/Greater&gt;"
-msgstr "&lt;Mindre end/Større end&gt;"
+msgid "Generic 101-key PC"
+msgstr "Generisk 101-taster PC"
 
 #: ../rules/base.xml.in.h:2
-msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
-msgstr "&lt;Mindre end/Større end&gt; (vælger tredje niveau, låser når trykket ned sammen med en anden tredje niveauvælger"
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generisk 102-taster (Intl) PC"
 
 #: ../rules/base.xml.in.h:3
-msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "&lt;Mindre end/Større end&gt; vælger femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
+msgid "Generic 104-key PC"
+msgstr "Generisk 104-taster PC"
 
 #: ../rules/base.xml.in.h:4
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generisk 105-taster (Intl) PC"
 
 #: ../rules/base.xml.in.h:5
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Dell 101-key PC"
+msgstr "Dell 101-taster PC"
 
 #: ../rules/base.xml.in.h:6
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude serie bærbar"
 
-# ATM = hæveautomat, måske skal det oversættes.
 #: ../rules/base.xml.in.h:7
-msgid "ATM/phone-style"
-msgstr "ATM/telefonstil"
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
 
 #: ../rules/base.xml.in.h:8
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
 
 #: ../rules/base.xml.in.h:9
-msgid "Acer C300"
-msgstr "Acer C300"
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
 
 #: ../rules/base.xml.in.h:10
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
 
 #: ../rules/base.xml.in.h:11
-msgid "Acer Laptop"
-msgstr "Acer bærbar"
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
 
 #: ../rules/base.xml.in.h:12
-msgid "Add the standard behavior to Menu key"
-msgstr "Tilføj standardopførslen til menutasten"
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
 
 #: ../rules/base.xml.in.h:13
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr "Tilføjelse af esperanto accent circonflexe (supersigno)"
+msgid "PC-98xx Series"
+msgstr "PC-98xx-serie"
 
 #: ../rules/base.xml.in.h:14
-msgid "Adding currency signs to certain keys"
-msgstr "Tilføjelse af valutategn til bestemte taster"
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
 
 #: ../rules/base.xml.in.h:15
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
 
 #: ../rules/base.xml.in.h:16
-msgid "Afghani"
-msgstr "Afghansk"
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
 
 #: ../rules/base.xml.in.h:17
-msgid "Akan"
-msgstr "Akan"
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
 
 #: ../rules/base.xml.in.h:18
-msgid "Albanian"
-msgstr "Albansk"
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
 
 #: ../rules/base.xml.in.h:19
-msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
-msgstr "Tillader afbrydelsesgreb med tastaturhandlinger (advarsel: sikkerhedsrisiko)"
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:20
-msgid "Alt and Meta are on Alt keys"
-msgstr "Alt og Meta er på Alt-tasterne"
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
 
 #: ../rules/base.xml.in.h:21
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Alt ligger på den højre Win-tast og Super på Menu"
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF-multimedie"
 
 #: ../rules/base.xml.in.h:22
-msgid "Alt+Caps Lock"
-msgstr "Alt+Caps Lock"
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
 
 #: ../rules/base.xml.in.h:23
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
 
 #: ../rules/base.xml.in.h:24
-msgid "Alt+Shift"
-msgstr "Alt+Skift"
+msgid "BTC 9000"
+msgstr "BTC 9000"
 
 #: ../rules/base.xml.in.h:25
-msgid "Alt+Space"
-msgstr "Alt+Mellemrum"
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
 
 #: ../rules/base.xml.in.h:26
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win-tasteopførsel"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
 
-# http://da.wikipedia.org/wiki/Amharisk
 #: ../rules/base.xml.in.h:27
-msgid "Amharic"
-msgstr "Amharisk"
+msgid "BTC 5090"
+msgstr "BTC 5090"
 
 #: ../rules/base.xml.in.h:28
-msgid "Any Alt key"
-msgstr "Enhver Alt-tast"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:29
-msgid "Any Win key"
-msgstr "Enhver Win-tast"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U minitrådløst internet og spil"
 
 #: ../rules/base.xml.in.h:30
-msgid "Any Win key (while pressed)"
-msgstr "Enhver Win-tast (mens trykket ned)"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
 
 #: ../rules/base.xml.in.h:31
-msgid "Apple"
-msgstr "Apple"
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
 
 #: ../rules/base.xml.in.h:32
-msgid "Apple Aluminium Keyboard (ANSI)"
-msgstr "Apples aluminiumstastatur (ANSI)"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternativ)"
 
 #: ../rules/base.xml.in.h:33
-msgid "Apple Aluminium Keyboard (ISO)"
-msgstr "Apples aluminiumstastatur (ISO)"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry  CyBo@rd USB-hub"
 
 #: ../rules/base.xml.in.h:34
-msgid "Apple Aluminium Keyboard (JIS)"
-msgstr "Apples aluminiumstastatur (JIS)"
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
 
 #: ../rules/base.xml.in.h:35
-msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
-msgstr "Apples aluminiumstastatur: Emuler PC-taster (Udskriv, Scroll Lock, Pause, NumLock)"
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UBEGRÆNSET"
 
 #: ../rules/base.xml.in.h:36
-msgid "Apple Laptop"
-msgstr "Apple bærbar"
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
 
 #: ../rules/base.xml.in.h:37
-msgid "Arabic"
-msgstr "Arabisk"
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
 
 #: ../rules/base.xml.in.h:38
-msgid "Arabic (Buckwalter)"
-msgstr "Arabisk (Buckwalter)"
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
 
 #: ../rules/base.xml.in.h:39
-msgid "Arabic (Morocco)"
-msgstr "Arabisk (Marokko)"
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
 
 #: ../rules/base.xml.in.h:40
-msgid "Arabic (Pakistan)"
-msgstr "Arabisk (Pakistan)"
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
 
 #: ../rules/base.xml.in.h:41
-msgid "Arabic (Syria)"
-msgstr "Arabisk (Syrien)"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 taster)"
 
 #: ../rules/base.xml.in.h:42
-msgid "Arabic (azerty)"
-msgstr "Arabisk (azerty)"
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 taster)"
 
 #: ../rules/base.xml.in.h:43
-msgid "Arabic (azerty/digits)"
-msgstr "Arabisk (azerty/cifre)"
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 taster)"
 
 #: ../rules/base.xml.in.h:44
-msgid "Arabic (digits)"
-msgstr "Arabisk (cifre)"
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
 
 #: ../rules/base.xml.in.h:45
-msgid "Arabic (qwerty)"
-msgstr "Arabisk (qwerty)"
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Bærbar Compaq (fx Armada) Laptop Keyboard"
 
 #: ../rules/base.xml.in.h:46
-msgid "Arabic (qwerty/digits)"
-msgstr "Arabisk (qwerty/cifre)"
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Bærbar/notebook Compaq (fx Presario) Internet Keyboard"
 
-#: ../rules/base.xml.in.h:47 ../rules/base.extras.xml.in.h:2
-msgid "Armenian"
-msgstr "Armensk"
+#: ../rules/base.xml.in.h:47
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
 
 #: ../rules/base.xml.in.h:48
-msgid "Armenian (alternative eastern)"
-msgstr "Armensk (alternativ østlig)"
+msgid "Dell"
+msgstr "Dell"
 
 #: ../rules/base.xml.in.h:49
-msgid "Armenian (alternative phonetic)"
-msgstr "Armensk (alternativ fonetisk)"
+msgid "Dell SK-8125"
+msgstr "Dell Sk-8125"
 
 #: ../rules/base.xml.in.h:50
-msgid "Armenian (eastern)"
-msgstr "Armensk (østlig)"
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
 
 #: ../rules/base.xml.in.h:51
-msgid "Armenian (phonetic)"
-msgstr "Armensk (fonetisk)"
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia tastatur"
 
 #: ../rules/base.xml.in.h:52
-msgid "Armenian (western)"
-msgstr "Armensk (vestlig)"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell bærbar/notebook Inspiron 6xxx/8xxx"
 
-# 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:53
-msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
-msgstr "Asturisk (Spanien, med bundpunktum H og bundpunktum L)"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell bærbar/notebook Precision M serie"
 
 #: ../rules/base.xml.in.h:54
-msgid "Asus Laptop"
-msgstr "Asus bærbar"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
 
 #: ../rules/base.xml.in.h:55
-msgid "At bottom left"
-msgstr "Nederst til venstre"
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802-serie"
 
 #: ../rules/base.xml.in.h:56
-msgid "At left of 'A'"
-msgstr "Til venstre for 'A'"
+msgid "DTK2000"
+msgstr "DTK2000"
 
-# The Avatime are an Akan people who live in Volta region of Ghana. History has it 
-# that they are Ahanta people who migrated to the Volta region.
 #: ../rules/base.xml.in.h:57
-msgid "Avatime"
-msgstr "Avatime"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
 
 #: ../rules/base.xml.in.h:58
-msgid "Azerbaijani"
-msgstr "Aserbajdsjansk"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO bærbar"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijani (Cyrillic)"
-msgstr "Aserbajdsjansk (kyrillisk)"
+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:60
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 wireless Internet Keyboard"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
 
 #: ../rules/base.xml.in.h:61
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
 
 #: ../rules/base.xml.in.h:62
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF-multimedie"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
 
 #: ../rules/base.xml.in.h:63
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
 
 #: ../rules/base.xml.in.h:64
-msgid "BTC 6301URF"
-msgstr "BTC 6301URF"
+msgid "Gyration"
+msgstr "Roteren"
 
+# http://en.wikipedia.org/wiki/HTC_Dream
 #: ../rules/base.xml.in.h:65
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "HTC Dream"
+msgstr "HTC-Dream"
 
 #: ../rules/base.xml.in.h:66
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "Kinesis"
+msgstr "Kinesis"
 
 #: ../rules/base.xml.in.h:67
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard"
 
 #: ../rules/base.xml.in.h:68
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 ekstra taster via G15daemon"
 
 #: ../rules/base.xml.in.h:69
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr "BTC 9116U minitrådløst internet og spil"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
 
 #: ../rules/base.xml.in.h:70
-msgid "Backslash"
-msgstr "Omvendt skråstreg"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia tastatur"
 
 #: ../rules/base.xml.in.h:71
-msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
-msgstr "Omvendt skråstreg vælger tredje niveau, låser når trykket ned sammen med en anden tredje niveauvælger"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
 
 #: ../rules/base.xml.in.h:72
-msgid "Bambara"
-msgstr "Bambara"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
 
 #: ../rules/base.xml.in.h:73
-msgid "Bashkirian"
-msgstr "Bashkirisk"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
 
 #: ../rules/base.xml.in.h:74
-msgid "Belarusian"
-msgstr "Hviderussisk"
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
 
 #: ../rules/base.xml.in.h:75
-msgid "Belarusian (Latin)"
-msgstr "Hviderussisk (latin)"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
 
 #: ../rules/base.xml.in.h:76
-msgid "Belarusian (legacy)"
-msgstr "Hviderussisk (forældet)"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
 
 #: ../rules/base.xml.in.h:77
-msgid "Belgian"
-msgstr "Belgisk"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
 
 #: ../rules/base.xml.in.h:78
-msgid "Belgian (ISO alternate)"
-msgstr "Belgisk (ISO-alternativ)"
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
 
 #: ../rules/base.xml.in.h:79
-msgid "Belgian (Sun dead keys)"
-msgstr "Belgisk (Sun døde taster)"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
 
 #: ../rules/base.xml.in.h:80
-msgid "Belgian (Wang model 724 azerty)"
-msgstr "Belgisk (Wang model 724 azerty)"
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
 
 #: ../rules/base.xml.in.h:81
-msgid "Belgian (alternative)"
-msgstr "Belgisk (alternativ)"
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
 
 #: ../rules/base.xml.in.h:82
-msgid "Belgian (alternative, Sun dead keys)"
-msgstr "Belgisk (alternativ, Sun døde taster)"
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
 
 #: ../rules/base.xml.in.h:83
-msgid "Belgian (alternative, latin-9 only)"
-msgstr "Belgisk (alternativ, kun latin-9)"
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
 
 #: ../rules/base.xml.in.h:84
-msgid "Belgian (eliminate dead keys)"
-msgstr "Belgisk (slå døde taster fra)"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:85
-msgid "BenQ X-Touch"
-msgstr "BenQ X-Touch"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
 
 #: ../rules/base.xml.in.h:86
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
 #: ../rules/base.xml.in.h:87
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
 
 #: ../rules/base.xml.in.h:88
-msgid "Bengali"
-msgstr "Bengali"
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
 
 #: ../rules/base.xml.in.h:89
-msgid "Bengali (India)"
-msgstr "Bengali (Indien)"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
 
-# http://en.wikipedia.org/wiki/InScript_keyboard
 #: ../rules/base.xml.in.h:90
-msgid "Bengali (India, Baishakhi Inscript)"
-msgstr "Bengali (Indien, baishakhi inscript)"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
 
 #: ../rules/base.xml.in.h:91
-msgid "Bengali (India, Baishakhi)"
-msgstr "Bengali (Indien, baishakhi)"
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
 
 #: ../rules/base.xml.in.h:92
-msgid "Bengali (India, Bornona)"
-msgstr "Bengali (Indien, bornona)"
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
 
 #: ../rules/base.xml.in.h:93
-msgid "Bengali (India, Probhat)"
-msgstr "Bengali (Indien, probhat)"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
 
 #: ../rules/base.xml.in.h:94
-msgid "Bengali (India, Uni Gitanjali)"
-msgstr "Bengali (Indien, uni gitanjali)"
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
 
 #: ../rules/base.xml.in.h:95
-msgid "Bengali (Probhat)"
-msgstr "Bengali (probhat)"
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
 
-# http://retskrivningsordbogen.dk/ro/ro.htm?q=berb
 #: ../rules/base.xml.in.h:96
-msgid "Berber (Morocco, Tifinagh alternative phonetic)"
-msgstr "Berbisk (Marokko, tifinagh alternativ fonetisk)"
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternativ valg)"
 
 #: ../rules/base.xml.in.h:97
-msgid "Berber (Morocco, Tifinagh alternative)"
-msgstr "Berbisk (Marokko, Tifinagh alternativ)"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (alternativ tilvalg 2)"
 
 #: ../rules/base.xml.in.h:98
-msgid "Berber (Morocco, Tifinagh extended phonetic)"
-msgstr "Berbisk (Marokko, Tifinagh udvidet fonetisk)"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
 #: ../rules/base.xml.in.h:99
-msgid "Berber (Morocco, Tifinagh extended)"
-msgstr "Berbisk (Marokko, Tifinagh udvidet)"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
 #: ../rules/base.xml.in.h:100
-msgid "Berber (Morocco, Tifinagh phonetic)"
-msgstr "Berbisk (Marokko, Tifinagh fonetisk)"
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
 
 #: ../rules/base.xml.in.h:101
-msgid "Berber (Morocco, Tifinagh)"
-msgstr "Berbisk (Marokko, Tifinagh)"
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
 
 #: ../rules/base.xml.in.h:102
-msgid "Bosnian"
-msgstr "Bosnisk"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
 
 #: ../rules/base.xml.in.h:103
-msgid "Bosnian (US keyboard with Bosnian digraphs)"
-msgstr "Bosnisk (US-tastatur med bosniske digrafer)"
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
 
 #: ../rules/base.xml.in.h:104
-msgid "Bosnian (US keyboard with Bosnian letters)"
-msgstr "Bosnisk (US-tastatur med bosniske bogstaver)"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
 #: ../rules/base.xml.in.h:105
-msgid "Bosnian (use Bosnian digraphs)"
-msgstr "Bosnisk (anvend bosniske digrafer)"
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
 #: ../rules/base.xml.in.h:106
-msgid "Bosnian (use guillemets for quotes)"
-msgstr "Bosnisk (anvend »« som anførelsestegn)"
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
 
 #: ../rules/base.xml.in.h:107
-msgid "Both Alt keys together"
-msgstr "Begge Alt-taster sammen"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
 #: ../rules/base.xml.in.h:108
-msgid "Both Ctrl keys together"
-msgstr "Begge Ctrl-taster sammen"
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
 
 #: ../rules/base.xml.in.h:109
-msgid "Both Shift keys together"
-msgstr "Begge skift-taster sammen"
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
 
 #: ../rules/base.xml.in.h:110
-msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
-msgstr "Begge skift-taster sammen aktiverer Caps Lock, en Skift-tast deaktiverer"
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
 
 #: ../rules/base.xml.in.h:111
-msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr "Begge skift-taster sammen skifter Caps Lock"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
 
 #: ../rules/base.xml.in.h:112
-msgid "Both Shift-Keys together toggle ShiftLock"
-msgstr "Begge skift-taster sammen skifter SkiftLock"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:113
-msgid "Braille"
-msgstr "Blindeskrift"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
 #: ../rules/base.xml.in.h:114
-msgid "Braille (left hand)"
-msgstr "Blindeskrift (venstre hånd)"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
 #: ../rules/base.xml.in.h:115
-msgid "Braille (right hand)"
-msgstr "Blindeskrift (højre hånd)"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
 
 #: ../rules/base.xml.in.h:116
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard"
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
 #: ../rules/base.xml.in.h:117
-msgid "Bulgarian"
-msgstr "Bulgarsk"
+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:118
-msgid "Bulgarian (new phonetic)"
-msgstr "Bulgarsk (ny fonetisk)"
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
 
 #: ../rules/base.xml.in.h:119
-msgid "Bulgarian (traditional phonetic)"
-msgstr "Bulgarsk (traditionel fonetisk)"
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
 
 #: ../rules/base.xml.in.h:120
-msgid "Burmese"
-msgstr "Burmesisk"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, svensk"
 
 #: ../rules/base.xml.in.h:121
-msgid "Cameroon Multilingual (Dvorak)"
-msgstr "Camerounsk flersproget (dvorak)"
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
 
 #: ../rules/base.xml.in.h:122
-msgid "Cameroon Multilingual (azerty)"
-msgstr "Camerounsk flersproget (azerty)"
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
 #: ../rules/base.xml.in.h:123
-msgid "Cameroon Multilingual (qwerty)"
-msgstr "Camerounsk flersproget (qwerty)"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
 
 #: ../rules/base.xml.in.h:124
-msgid "Canadian Multilingual"
-msgstr "Canadisk flersproget"
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
 
 #: ../rules/base.xml.in.h:125
-msgid "Canadian Multilingual (first part)"
-msgstr "Canadisk flersproget (første del)"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard"
 
 #: ../rules/base.xml.in.h:126
-msgid "Canadian Multilingual (second part)"
-msgstr "Canadisk flersproget (anden del)"
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
 
 #: ../rules/base.xml.in.h:127
-msgid "Caps Lock"
-msgstr "Caps Lock"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
 #: ../rules/base.xml.in.h:128
-msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
-msgstr "Caps Lock (skifter til første layout), Skift+Caps Lock (skifter til sidste layout)"
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
 
 #: ../rules/base.xml.in.h:129
-msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
-msgstr "Caps Lock (mens presset ned), Alt+Caps Lock udfører den oprindleige capslockhandling"
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
 
 #: ../rules/base.xml.in.h:130
-msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock agerer som skiftetasten med lås. Skift »pauser« Caps Lock"
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
 
 #: ../rules/base.xml.in.h:131
-msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock agerer som skiftetasten med lås. Skift påvirker ikke Caps Lock"
+msgid "SK-1300"
+msgstr "SK-1300"
 
 #: ../rules/base.xml.in.h:132
-msgid "Caps Lock as Ctrl"
-msgstr "Caps Lock som Ctrl"
+msgid "SK-2500"
+msgstr "SK-2500"
 
 #: ../rules/base.xml.in.h:133
-msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
-msgstr "Caps Lock vælger tredje niveau, låser når trykket ned sammen med en anden tredje niveauvælger"
+msgid "SK-6200"
+msgstr "SK-6200"
 
 #: ../rules/base.xml.in.h:134
-msgid "Caps Lock is disabled"
-msgstr "Caps Lock er slået fra"
+msgid "SK-7100"
+msgstr "SK-7100"
 
 #: ../rules/base.xml.in.h:135
-msgid "Caps Lock key behavior"
-msgstr "Opførsel for Caps Lock-tast"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
 
 #: ../rules/base.xml.in.h:136
-msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr "Caps Lock ændrer Skift så alle taster bliver påvirket"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
 
 #: ../rules/base.xml.in.h:137
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr "Caps Lock slår små/store bogstaver til/fra"
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
 
 #: ../rules/base.xml.in.h:138
-msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock bruger intern forstørrelse af bogstaver. Skift sætter Caps Lock »på hold«"
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet-pc)"
 
 #: ../rules/base.xml.in.h:139
-msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock bruger intern forstørrelse af bogstaver. Skift påvirker ikke Caps Lock"
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
 
 #: ../rules/base.xml.in.h:140
-msgid "Catalan"
-msgstr "Katalansk"
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
 
 #: ../rules/base.xml.in.h:141
-msgid "Catalan (Spain, with middle-dot L)"
-msgstr "Catalansk (Spanien, med midterpunktum L)"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
 
 #: ../rules/base.xml.in.h:142
-msgid "Cherokee"
-msgstr "Cherokee"
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
 
 #: ../rules/base.xml.in.h:143
-msgid "Cherry B.UNLIMITED"
-msgstr "Cherry B.UBEGRÆNSET"
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
 
 #: ../rules/base.xml.in.h:144
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
 #: ../rules/base.xml.in.h:145
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (alternativ)"
+msgid "TypeMatrix EZ-Reach 2030 USB"
+msgstr "TypeMatrix EZ-Reach 2030 USB"
 
 #: ../rules/base.xml.in.h:146
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry  CyBo@rd USB-hub"
+msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU-tilstand)"
 
 #: ../rules/base.xml.in.h:147
-msgid "Cherry CyMotion Expert"
-msgstr "Cherry CyMotion Expert"
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP-tilstand)"
 
 #: ../rules/base.xml.in.h:148
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
 
 #: ../rules/base.xml.in.h:149
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
 
 #: ../rules/base.xml.in.h:150
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Keyboard"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
 
 #: ../rules/base.xml.in.h:151
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../rules/base.xml.in.h:152
-msgid "Chicony KU-0108"
-msgstr "Chicony KU-0108"
+msgid "Macintosh Old"
+msgstr "Macintosh gammel"
 
 #: ../rules/base.xml.in.h:153
-msgid "Chicony KU-0420"
-msgstr "Chicony KU-0420"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Glædelig hacking tastatur til Mac"
 
 #: ../rules/base.xml.in.h:154
-msgid "Chinese"
-msgstr "Kinesisk"
+msgid "Acer C300"
+msgstr "Acer C300"
 
 #: ../rules/base.xml.in.h:155
-msgid "Chuvash"
-msgstr "Chuvash"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
 
 #: ../rules/base.xml.in.h:156
-msgid "Chuvash (Latin)"
-msgstr "Chuvash (latin)"
+msgid "Acer Laptop"
+msgstr "Acer bærbar"
 
 #: ../rules/base.xml.in.h:157
-msgid "Classmate PC"
-msgstr "Classmate PC"
+msgid "Asus Laptop"
+msgstr "Asus bærbar"
 
 #: ../rules/base.xml.in.h:158
-msgid "CloGaelach"
-msgstr "CloGaelach"
+msgid "Apple"
+msgstr "Apple"
 
 #: ../rules/base.xml.in.h:159
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard"
+msgid "Apple Laptop"
+msgstr "Apple bærbar"
 
 #: ../rules/base.xml.in.h:160
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Keyboard (13 taster)"
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Apples aluminiumstastatur (ANSI)"
 
 #: ../rules/base.xml.in.h:161
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Keyboard (18 taster)"
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Apples aluminiumstastatur (ISO)"
 
 #: ../rules/base.xml.in.h:162
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Keyboard (7 taster)"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Apples aluminiumstastatur (JIS)"
 
 #: ../rules/base.xml.in.h:163
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
 #: ../rules/base.xml.in.h:164
-msgid "Compose key position"
-msgstr "Placering af Composetast"
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Bærbar/notebook eMachines m68xx"
 
-# Backspace kunne også være Slet tilbage
 #: ../rules/base.xml.in.h:165
-msgid "Control + Alt + Backspace"
-msgstr "Control + Alt + Rettelsestast"
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
 
 #: ../rules/base.xml.in.h:166
-msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr "Kontrol ligger på Alt-tasterne, Alt ligger på Win-tasterne"
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
 
 #: ../rules/base.xml.in.h:167
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr "Kontrol ligger på Win-tasterne (og de normale Ctrl-taster)"
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
 
 #: ../rules/base.xml.in.h:168
-msgid "Creative Desktop Wireless 7000"
-msgstr "Creative Desktop Wireless 7000"
+msgid "Happy Hacking Keyboard"
+msgstr "Glædelig hacking tastatur"
 
 #: ../rules/base.xml.in.h:169
-msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "Krimtatarsk (tyrkisk Alt-Q)"
+msgid "Classmate PC"
+msgstr "Classmate PC"
 
 #: ../rules/base.xml.in.h:170
-msgid "Crimean Tatar (Turkish F)"
-msgstr "Krimtatarsk (tyrkisk F)"
+msgid "OLPC"
+msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Crimean Tatar (Turkish Q)"
-msgstr "Krimtatarsk (tyrkisk Q)"
+msgid "Sun Type 7 USB"
+msgstr "Sun type 7 USB"
 
 #: ../rules/base.xml.in.h:172
-msgid "Croatian"
-msgstr "Kroatisk"
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun type 7 USB (europæisk layout)"
 
 #: ../rules/base.xml.in.h:173
-msgid "Croatian (US keyboard with Croatian digraphs)"
-msgstr "Kroatisk (US-tastatur med kroatiske digrafer)"
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun type 7 USB (Unix-layout)"
 
 #: ../rules/base.xml.in.h:174
-msgid "Croatian (US keyboard with Croatian letters)"
-msgstr "Kroatisk (US-tastatur med kroatiske bogstaver)"
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun type 7 USB (japansk layout) / japansk 106-tast"
 
 #: ../rules/base.xml.in.h:175
-msgid "Croatian (use Croatian digraphs)"
-msgstr "Kroatisk (anvend kroatiske digrafer)"
+msgid "Sun Type 6/7 USB"
+msgstr "Sun type 6/7 USB"
 
 #: ../rules/base.xml.in.h:176
-msgid "Croatian (use guillemets for quotes)"
-msgstr "Kroatisk (anvend »« som anførelsestegn)"
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun type 6/7 USB (europæisk layout)"
 
 #: ../rules/base.xml.in.h:177
-msgid "Ctrl key position"
-msgstr "Ctrl-tast placering"
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun type 6 USB (Unix-layout)"
 
 #: ../rules/base.xml.in.h:178
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Skift"
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun type 6 USB (japansk layout)"
 
 #: ../rules/base.xml.in.h:179
-msgid "Czech"
-msgstr "Tjekkisk"
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun type 6 (japansk layout)"
 
 #: ../rules/base.xml.in.h:180
-msgid "Czech (UCW layout, accented letters only)"
-msgstr "Tjekkisk (UCW-layout, kun bogstaver med accent)"
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
 
 #: ../rules/base.xml.in.h:181
-msgid "Czech (US Dvorak with CZ UCW support)"
-msgstr "Tjekkisk (US Dvorak med CZ UCW-understøttelse)"
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
 
 #: ../rules/base.xml.in.h:182
-msgid "Czech (qwerty)"
-msgstr "Tjekkisk (qwerty)"
+msgid "FL90"
+msgstr "FL90"
 
 #: ../rules/base.xml.in.h:183
-msgid "Czech (qwerty, extended Backslash)"
-msgstr "Tjekkisk (qwerty, udvidet omvendt skråstreg)"
+msgid "Creative Desktop Wireless 7000"
+msgstr "Creative Desktop Wireless 7000"
 
 #: ../rules/base.xml.in.h:184
-msgid "Czech (with &lt;\\|&gt; key)"
-msgstr "Tjekkisk (med &lt;\\|&gt;-tast)"
-
-#: ../rules/base.xml.in.h:185
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:186
-msgid "Danish"
-msgstr "Dansk"
+msgid "Htc Dream phone"
+msgstr "Htc Dream-telefon"
 
-#: ../rules/base.xml.in.h:187
-msgid "Danish (Dvorak)"
-msgstr "Dansk (dvorak)"
+#. Keyboard indicator for English layouts
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
+msgid "en"
+msgstr "en"
 
-#: ../rules/base.xml.in.h:188
-msgid "Danish (Macintosh)"
-msgstr "Dansk (Macintosh)"
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
+msgid "English (US)"
+msgstr "Engelsk (US)"
 
+#. Keyboard indicator for Cherokee layouts
 #: ../rules/base.xml.in.h:189
-msgid "Danish (Macintosh, eliminate dead keys)"
-msgstr "Dansk (Macintosh, slå døde taster fra)"
+msgid "chr"
+msgstr "chr"
 
 #: ../rules/base.xml.in.h:190
-msgid "Danish (eliminate dead keys)"
-msgstr "Dansk (slå døde taster fra)"
+msgid "Cherokee"
+msgstr "Cherokee"
 
 #: ../rules/base.xml.in.h:191
-msgid "Default numeric keypad keys"
-msgstr "Standard numerisk tastatur taster"
+msgid "English (US, with euro on 5)"
+msgstr "Engelsk (US, med euro på 5)"
 
 #: ../rules/base.xml.in.h:192
-msgid "Dell"
-msgstr "Dell"
+msgid "English (US, international with dead keys)"
+msgstr "Engelsk (US, international med døde taster)"
 
 #: ../rules/base.xml.in.h:193
-msgid "Dell 101-key PC"
-msgstr "Dell 101-taster PC"
+msgid "English (US, alternative international)"
+msgstr "Engelsk (US, alternativ international)"
 
 #: ../rules/base.xml.in.h:194
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dell bærbar/notebook Inspiron 6xxx/8xxx"
+msgid "English (Colemak)"
+msgstr "Engelsk (Colemak)"
 
 #: ../rules/base.xml.in.h:195
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell bærbar/notebook Precision M serie"
+msgid "English (Dvorak)"
+msgstr "Engelsk (Dvorak)"
 
 #: ../rules/base.xml.in.h:196
-msgid "Dell Latitude series laptop"
-msgstr "Dell Latitude serie bærbar"
+msgid "English (Dvorak, international with dead keys)"
+msgstr "Engelsk (Dvorak, international med døde taster)"
 
 #: ../rules/base.xml.in.h:197
-msgid "Dell Precision M65"
-msgstr "Dell Precision M65"
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr "Engelsk (Dvorak alternativ international ingen døde taster)"
 
 #: ../rules/base.xml.in.h:198
-msgid "Dell SK-8125"
-msgstr "Dell Sk-8125"
+msgid "English (left handed Dvorak)"
+msgstr "Engelsk (venstrehåndet dvorak)"
 
 #: ../rules/base.xml.in.h:199
-msgid "Dell SK-8135"
-msgstr "Dell SK-8135"
+msgid "English (right handed Dvorak)"
+msgstr "Engelsk (højrehåndet dvorak)"
 
 #: ../rules/base.xml.in.h:200
-msgid "Dell USB Multimedia Keyboard"
-msgstr "Dell USB Multimedia tastatur"
+msgid "English (classic Dvorak)"
+msgstr "Engelsk (klassisk dvorak)"
 
 #: ../rules/base.xml.in.h:201
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard"
-
-#: ../rules/base.xml.in.h:202
-msgid "Dhivehi"
-msgstr "Dhivehi"
+msgid "English (programmer Dvorak)"
+msgstr "Engelsk (programmørdvorak)"
 
-#: ../rules/base.xml.in.h:203
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802-serie"
+#. Keyboard indicator for Russian layouts
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
+msgid "ru"
+msgstr "ru"
 
 #: ../rules/base.xml.in.h:204
-msgid "Dutch"
-msgstr "Hollandsk"
+msgid "Russian (US, phonetic)"
+msgstr "Russisk (US, fonetisk)"
 
 #: ../rules/base.xml.in.h:205
-msgid "Dutch (Macintosh)"
-msgstr "Hollandsk (Macintosh)"
+msgid "English (Macintosh)"
+msgstr "Engelsk (Macintosh)"
 
 #: ../rules/base.xml.in.h:206
-msgid "Dutch (Sun dead keys)"
-msgstr "Hollandsk (Sun døde taster)"
+msgid "English (international AltGr dead keys)"
+msgstr "Engelsk (international AltGr døde taster)"
 
 #: ../rules/base.xml.in.h:207
-msgid "Dutch (standard)"
-msgstr "Hollandsk (standard)"
+msgid "English (layout toggle on multiply/divide key)"
+msgstr "Engelsk (skift layout på gange-/divideretast)"
 
 #: ../rules/base.xml.in.h:208
-msgid "Dzongkha"
-msgstr "Dzongkha"
+msgid "Serbo-Croatian (US)"
+msgstr "Serbisk-kroatisk (US)"
 
 #: ../rules/base.xml.in.h:209
-msgid "Enable extra typographic characters"
-msgstr "Slå ekstra typografiske karakterer til"
+msgid "English (Workman)"
+msgstr "Engelsk (Workman)"
 
 #: ../rules/base.xml.in.h:210
-msgid "English (Cameroon)"
-msgstr "Engelsk (camerounsk)"
-
-#: ../rules/base.xml.in.h:211
-msgid "English (Canada)"
-msgstr "Engelsk (Canada)"
+msgid "English (Workman, international with dead keys)"
+msgstr "Engelsk (Workman, international med døde taster)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (Colemak)"
-msgstr "Engelsk (Colemak)"
+#. Keyboard indicator for Persian layouts
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
+msgid "fa"
+msgstr "fa"
 
 #: ../rules/base.xml.in.h:213
-msgid "English (Dvorak alternative international no dead keys)"
-msgstr "Engelsk (Dvorak alternativ international ingen døde taster)"
-
-#: ../rules/base.xml.in.h:214
-msgid "English (Dvorak international with dead keys)"
-msgstr "Engelsk (Dvorak international med døde taster)"
+msgid "Afghani"
+msgstr "Afghansk"
 
+#. Keyboard indicator for Pashto layouts
 #: ../rules/base.xml.in.h:215
-msgid "English (Dvorak)"
-msgstr "Engelsk (Dvorak)"
+msgid "ps"
+msgstr "ps"
 
 #: ../rules/base.xml.in.h:216
-msgid "English (Ghana)"
-msgstr "Engelsk (Ghana)"
-
-#: ../rules/base.xml.in.h:217
-msgid "English (Ghana, GILLBT)"
-msgstr "Engelsk (Ghana, GILLBT)"
+msgid "Pashto"
+msgstr "Pashto"
 
+#. Keyboard indicator for Uzbek layouts
 #: ../rules/base.xml.in.h:218
-msgid "English (Ghana, multilingual)"
-msgstr "Engelsk (Ghana, flersproget)"
+msgid "uz"
+msgstr "uz"
 
 #: ../rules/base.xml.in.h:219
-msgid "English (India, with RupeeSign)"
-msgstr "Engelsk (Indien, med rupeetegn)"
+msgid "Uzbek (Afghanistan)"
+msgstr "Usbekisk (Afghanistan)"
 
 #: ../rules/base.xml.in.h:220
-msgid "English (Macintosh)"
-msgstr "Engelsk (Macintosh)"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "Pashto (Afghanistan, OLPC)"
 
 #: ../rules/base.xml.in.h:221
-msgid "English (Mali, US Macintosh)"
-msgstr "Engelsk (Mali, US Macintosh)"
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "Persisk (Afghanistan, Dari OLPC)"
 
 #: ../rules/base.xml.in.h:222
-msgid "English (Mali, US international)"
-msgstr "Engelsk (Mali, US international)"
-
-#: ../rules/base.xml.in.h:223
-msgid "English (Nigeria)"
-msgstr "Engelsk (Nigeria)"
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "Usbekisk (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:224
-msgid "English (South Africa)"
-msgstr "Engelsk (Sydafrika)"
+#. Keyboard indicator for Arabic layouts
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
+msgid "ar"
+msgstr "ar"
 
-#: ../rules/base.xml.in.h:225
-msgid "English (UK)"
-msgstr "Engelsk (UK)"
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
+msgid "Arabic"
+msgstr "Arabisk"
 
 #: ../rules/base.xml.in.h:226
-msgid "English (UK, Colemak)"
-msgstr "Engelsk (UK, Colemak)"
+msgid "Arabic (azerty)"
+msgstr "Arabisk (azerty)"
 
 #: ../rules/base.xml.in.h:227
-msgid "English (UK, Dvorak with UK punctuation)"
-msgstr "Engelsk (UK, Dvorak med UK-tegnsætning)"
+msgid "Arabic (azerty/digits)"
+msgstr "Arabisk (azerty/cifre)"
 
 #: ../rules/base.xml.in.h:228
-msgid "English (UK, Dvorak)"
-msgstr "Engelsk (UK, Dvorak)"
+msgid "Arabic (digits)"
+msgstr "Arabisk (cifre)"
 
 #: ../rules/base.xml.in.h:229
-msgid "English (UK, Macintosh international)"
-msgstr "Engelsk (UK, Macintosh international)"
+msgid "Arabic (qwerty)"
+msgstr "Arabisk (qwerty)"
 
 #: ../rules/base.xml.in.h:230
-msgid "English (UK, Macintosh)"
-msgstr "Engelsk (UK, Macintosh)"
+msgid "Arabic (qwerty/digits)"
+msgstr "Arabisk (qwerty/cifre)"
 
 #: ../rules/base.xml.in.h:231
-msgid "English (UK, extended WinKeys)"
-msgstr "Engelsk (UK, udvidede Wintaster)"
-
-#: ../rules/base.xml.in.h:232
-msgid "English (UK, international with dead keys)"
-msgstr "Engelsk (UK, international med døde taster)"
+msgid "Arabic (Buckwalter)"
+msgstr "Arabisk (Buckwalter)"
 
-#: ../rules/base.xml.in.h:233 ../rules/base.extras.xml.in.h:9
-msgid "English (US)"
-msgstr "Engelsk (US)"
+#. Keyboard indicator for Albanian layouts
+#: ../rules/base.xml.in.h:233
+msgid "sq"
+msgstr "sq"
 
 #: ../rules/base.xml.in.h:234
-msgid "English (US, alternative international)"
-msgstr "Engelsk (US, alternativ international)"
-
-#: ../rules/base.xml.in.h:235
-msgid "English (US, international with dead keys)"
-msgstr "Engelsk (US, international med døde taster)"
+msgid "Albanian"
+msgstr "Albansk"
 
-#: ../rules/base.xml.in.h:236
-msgid "English (US, with euro on 5)"
-msgstr "Engelsk (US, med euro på 5)"
+#. Keyboard indicator for Armenian layouts
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
+msgid "hy"
+msgstr "hy"
 
-#: ../rules/base.xml.in.h:237
-msgid "English (classic Dvorak)"
-msgstr "Engelsk (klassisk dvorak)"
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
+msgid "Armenian"
+msgstr "Armensk"
 
 #: ../rules/base.xml.in.h:238
-msgid "English (international AltGr dead keys)"
-msgstr "Engelsk (international AltGr døde taster)"
+msgid "Armenian (phonetic)"
+msgstr "Armensk (fonetisk)"
 
 #: ../rules/base.xml.in.h:239
-msgid "English (layout toggle on multiply/divide key)"
-msgstr "Engelsk (skift layout på gange-/divideretast)"
+msgid "Armenian (alternative phonetic)"
+msgstr "Armensk (alternativ fonetisk)"
 
 #: ../rules/base.xml.in.h:240
-msgid "English (left handed Dvorak)"
-msgstr "Engelsk (venstrehåndet dvorak)"
+msgid "Armenian (eastern)"
+msgstr "Armensk (østlig)"
 
 #: ../rules/base.xml.in.h:241
-msgid "English (programmer Dvorak)"
-msgstr "Engelsk (programmørdvorak)"
+msgid "Armenian (western)"
+msgstr "Armensk (vestlig)"
 
 #: ../rules/base.xml.in.h:242
-msgid "English (right handed Dvorak)"
-msgstr "Engelsk (højrehåndet dvorak)"
-
-#: ../rules/base.xml.in.h:243
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "Armenian (alternative eastern)"
+msgstr "Armensk (alternativ østlig)"
 
-#: ../rules/base.xml.in.h:244
-msgid "Enter on keypad"
-msgstr "Retur på numerisk tastatur"
+#. Keyboard indicator for German layouts
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
+msgid "de"
+msgstr "de"
 
 #: ../rules/base.xml.in.h:245
-msgid "Esperanto"
-msgstr "Esperanto"
+msgid "German (Austria)"
+msgstr "Tysk (Østrig)"
 
 #: ../rules/base.xml.in.h:246
-msgid "Esperanto (Portugal, Nativo)"
-msgstr "Esperanto (Portugal, Nativo)"
+msgid "German (legacy)"
+msgstr "Tysk (forældet)"
 
 #: ../rules/base.xml.in.h:247
-msgid "Esperanto (displaced semicolon and quote, obsolete)"
-msgstr "Esperanto (forkert placeret semikolon og anførelsestegn, forældet)"
+msgid "German (Austria, eliminate dead keys)"
+msgstr "Tysk (Østrig, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:248
-msgid "Estonian"
-msgstr "Estisk"
+msgid "German (Austria, Sun dead keys)"
+msgstr "Tysk (Østrig, Sun døde taster)"
 
 #: ../rules/base.xml.in.h:249
-msgid "Estonian (Dvorak)"
-msgstr "Estisk (dvorak)"
-
-#: ../rules/base.xml.in.h:250
-msgid "Estonian (US keyboard with Estonian letters)"
-msgstr "Estisk (US-tastatur med estiske bogstaver)"
+msgid "German (Austria, Macintosh)"
+msgstr "Tysk (Østrig, Macintosh)"
 
+#. Keyboard indicator for Azerbaijani layouts
 #: ../rules/base.xml.in.h:251
-msgid "Estonian (eliminate dead keys)"
-msgstr "Estisk (slå døde taster fra)"
+msgid "az"
+msgstr "az"
 
-# Euro på 2, 2 euro, Euro på tasten 2
-# Det handler om en tildeling af eurotegnet til tasten 2, og der er "Euro
-# på to" mere beskrivende, selv om strengen isoleret set stadig kan være
-# forvirrende. Når teksten står i en sammenhæng, er det nok ikke så
-# vigtigt om det er det ene eller det andet.
 #: ../rules/base.xml.in.h:252
-msgid "Euro on 2"
-msgstr "Euro på 2"
+msgid "Azerbaijani"
+msgstr "Aserbajdsjansk"
 
 #: ../rules/base.xml.in.h:253
-msgid "Euro on 4"
-msgstr "Euro på 4"
-
-#: ../rules/base.xml.in.h:254
-msgid "Euro on 5"
-msgstr "Euro på 5"
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Aserbajdsjansk (kyrillisk)"
 
+#. Keyboard indicator for Belarusian layouts
 #: ../rules/base.xml.in.h:255
-msgid "Euro on E"
-msgstr "Euro på E"
+msgid "by"
+msgstr "by"
 
 #: ../rules/base.xml.in.h:256
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "Belarusian"
+msgstr "Hviderussisk"
 
 #: ../rules/base.xml.in.h:257
-msgid "Ewe"
-msgstr "Ewe"
+msgid "Belarusian (legacy)"
+msgstr "Hviderussisk (forældet)"
 
 #: ../rules/base.xml.in.h:258
-msgid "FL90"
-msgstr "FL90"
-
-#: ../rules/base.xml.in.h:259
-msgid "Faroese"
-msgstr "Færøsk"
+msgid "Belarusian (Latin)"
+msgstr "Hviderussisk (latin)"
 
-#: ../rules/base.xml.in.h:260
-msgid "Faroese (eliminate dead keys)"
-msgstr "Færøsk (slå døde taster fra)"
+#. Keyboard indicator for Belgian layouts
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
+msgid "be"
+msgstr "be"
 
-#: ../rules/base.xml.in.h:261
-msgid "Filipino"
-msgstr "Filippinsk"
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
+msgid "Belgian"
+msgstr "Belgisk"
 
 #: ../rules/base.xml.in.h:262
-msgid "Filipino (Capewell-Dvorak Baybayin)"
-msgstr "Filippinsk (Capewell-dvorak baybayin)"
+msgid "Belgian (alternative)"
+msgstr "Belgisk (alternativ)"
 
 #: ../rules/base.xml.in.h:263
-msgid "Filipino (Capewell-Dvorak Latin)"
-msgstr "Filippinsk (Capewell-dvorak latin)"
+msgid "Belgian (alternative, latin-9 only)"
+msgstr "Belgisk (alternativ, kun latin-9)"
 
 #: ../rules/base.xml.in.h:264
-msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
-msgstr "Filippinsk (Capewell-QWERF 2006 baybayin)"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "Belgisk (alternativ, Sun døde taster)"
 
 #: ../rules/base.xml.in.h:265
-msgid "Filipino (Capewell-QWERF 2006 Latin)"
-msgstr "Filippinsk (Capewell-QWERF 2006 latin)"
+msgid "Belgian (ISO alternate)"
+msgstr "Belgisk (ISO-alternativ)"
 
-# http://en.wikipedia.org/wiki/Baybayin
 #: ../rules/base.xml.in.h:266
-msgid "Filipino (Colemak Baybayin)"
-msgstr "Filippinsk (Colemak baybayin)"
+msgid "Belgian (eliminate dead keys)"
+msgstr "Belgisk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:267
-msgid "Filipino (Colemak Latin)"
-msgstr "Filippinsk (Colemak latin)"
+msgid "Belgian (Sun dead keys)"
+msgstr "Belgisk (Sun døde taster)"
 
-# http://en.wikipedia.org/wiki/Baybayin
 #: ../rules/base.xml.in.h:268
-msgid "Filipino (Dvorak Baybayin)"
-msgstr "Filippinsk (Dvorak baybayin)"
-
-#: ../rules/base.xml.in.h:269
-msgid "Filipino (Dvorak Latin)"
-msgstr "Filippinsk (Dvorak latin)"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "Belgisk (Wang model 724 azerty)"
 
+#. Keyboard indicator for Bengali layouts
 #: ../rules/base.xml.in.h:270
-msgid "Filipino (QWERTY Baybayin)"
-msgstr "Filippinsk (QWERTY baybayin)"
+msgid "bn"
+msgstr "bn"
 
 #: ../rules/base.xml.in.h:271
-msgid "Finnish"
-msgstr "Finsk"
+msgid "Bengali"
+msgstr "Bengali"
 
 #: ../rules/base.xml.in.h:272
-msgid "Finnish (Macintosh)"
-msgstr "Finsk (Macintosh)"
-
-#: ../rules/base.xml.in.h:273
-msgid "Finnish (classic)"
-msgstr "Finsk (klassisk)"
+msgid "Bengali (Probhat)"
+msgstr "Bengali (probhat)"
 
+#. Keyboard indicator for Indian layouts
 #: ../rules/base.xml.in.h:274
-msgid "Finnish (classic, eliminate dead keys)"
-msgstr "Finsk (klassisk, slå døde taster fra)"
+msgid "in"
+msgstr "in"
+
+#: ../rules/base.xml.in.h:275
+msgid "Indian"
+msgstr "Indisk"
+
+#: ../rules/base.xml.in.h:276
+msgid "Bengali (India)"
+msgstr "Bengali (Indien)"
 
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:277
-msgid "Four-level key with abstract separators"
-msgstr "Niveau fire tast med abstrakt adskillelser"
+msgid "Bengali (India, Probhat)"
+msgstr "Bengali (Indien, probhat)"
 
 #: ../rules/base.xml.in.h:278
-msgid "Four-level key with comma"
-msgstr "Niveau fire tast med komma"
+msgid "Bengali (India, Baishakhi)"
+msgstr "Bengali (Indien, baishakhi)"
 
 #: ../rules/base.xml.in.h:279
-msgid "Four-level key with dot"
-msgstr "Niveau fire tast med punktum"
+msgid "Bengali (India, Bornona)"
+msgstr "Bengali (Indien, bornona)"
 
 #: ../rules/base.xml.in.h:280
-msgid "Four-level key with dot, latin-9 restriction"
-msgstr "Niveau fire tast med punktum, latin-9 begrænsning"
+msgid "Bengali (India, Uni Gitanjali)"
+msgstr "Bengali (Indien, uni gitanjali)"
 
+# http://en.wikipedia.org/wiki/InScript_keyboard
 #: ../rules/base.xml.in.h:281
-msgid "Four-level key with momayyez"
-msgstr "Niveau fire tast med momayyez"
-
-#: ../rules/base.xml.in.h:282
-msgid "French"
-msgstr "Fransk"
+msgid "Bengali (India, Baishakhi Inscript)"
+msgstr "Bengali (Indien, baishakhi inscript)"
 
+#. Keyboard indicator for Gujarati layouts
 #: ../rules/base.xml.in.h:283
-msgid "French (Bepo, ergonomic, Dvorak way)"
-msgstr "Fransk (Bepo, ergonomisk, dvorakmåde)"
+msgid "gu"
+msgstr "gu"
 
 #: ../rules/base.xml.in.h:284
-msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
-msgstr "Fransk (Bepo, ergonomisk, dvorakmåde, kun latin-9)"
-
-#: ../rules/base.xml.in.h:285
-msgid "French (Breton)"
-msgstr "Fransk (bretonsk)"
+msgid "Gujarati"
+msgstr "Gujarati"
 
+#. Keyboard indicator for Punjabi layouts
 #: ../rules/base.xml.in.h:286
-msgid "French (Cameroon)"
-msgstr "Fransk (camerounsk)"
+msgid "pa"
+msgstr "pa"
 
-#: ../rules/base.xml.in.h:287 ../rules/base.extras.xml.in.h:12
-msgid "French (Canada)"
-msgstr "Fransk (Canada)"
+#: ../rules/base.xml.in.h:287
+msgid "Punjabi (Gurmukhi)"
+msgstr "Punjabi (Gurmukhi)"
 
 #: ../rules/base.xml.in.h:288
-msgid "French (Canada, Dvorak)"
-msgstr "Fransk (Canada, dvorak)"
-
-#: ../rules/base.xml.in.h:289
-msgid "French (Canada, legacy)"
-msgstr "Fransk (Canada, forældet)"
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "Punjabi (Gurmukhi Jhelum)"
 
+#. Keyboard indicator for Kannada layouts
 #: ../rules/base.xml.in.h:290
-msgid "French (Democratic Republic of the Congo)"
-msgstr "Fransk (Congo, Den Demokratiske Republik)"
+msgid "kn"
+msgstr "kn"
 
 #: ../rules/base.xml.in.h:291
-msgid "French (Dvorak)"
-msgstr "Fransk (dvorak)"
-
-#: ../rules/base.xml.in.h:292
-msgid "French (Guinea)"
-msgstr "Fransk (Guinea)"
+msgid "Kannada"
+msgstr "Kannada"
 
+#. Keyboard indicator for Malayalam layouts
 #: ../rules/base.xml.in.h:293
-msgid "French (Macintosh)"
-msgstr "Fransk (Macintosh)"
+msgid "ml"
+msgstr "ml"
 
 #: ../rules/base.xml.in.h:294
-msgid "French (Mali, alternative)"
-msgstr "Fransk (Mali, alternativ)"
+msgid "Malayalam"
+msgstr "Malayalam"
 
 #: ../rules/base.xml.in.h:295
-msgid "French (Morocco)"
-msgstr "Fransk (Marokko)"
+msgid "Malayalam (Lalitha)"
+msgstr "Malayalamsk (Lalitha)"
 
 #: ../rules/base.xml.in.h:296
-msgid "French (Sun dead keys)"
-msgstr "Fransk (Sun døde taster)"
-
-#: ../rules/base.xml.in.h:297
-msgid "French (Switzerland)"
-msgstr "Fransk (Schweiz)"
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgstr "Malayalamsk (udvidet inscript med Rupeetegn)"
 
+#. Keyboard indicator for Oriya layouts
 #: ../rules/base.xml.in.h:298
-msgid "French (Switzerland, Macintosh)"
-msgstr "Fransk (Schweiz, Macintosh)"
+msgid "or"
+msgstr "or"
 
 #: ../rules/base.xml.in.h:299
-msgid "French (Switzerland, Sun dead keys)"
-msgstr "Fransk (Schweiz, Sun døde taster)"
-
-#: ../rules/base.xml.in.h:300
-msgid "French (Switzerland, eliminate dead keys)"
-msgstr "Fransk (Schweiz, slå døde taster fra)"
+msgid "Oriya"
+msgstr "Oriya"
 
+#. Keyboard indicator for Tamil layouts
 #: ../rules/base.xml.in.h:301
-msgid "French (alternative)"
-msgstr "Fransk (alternativ)"
+msgid "ta"
+msgstr "ta"
 
 #: ../rules/base.xml.in.h:302
-msgid "French (alternative, Sun dead keys)"
-msgstr "Fransk (alternativ, Sun døde taster)"
+msgid "Tamil (Unicode)"
+msgstr "Tamilsk (unicode)"
 
 #: ../rules/base.xml.in.h:303
-msgid "French (alternative, eliminate dead keys)"
-msgstr "Fransk (alternativ, slå døde taster fra)"
+msgid "Tamil (keyboard with numerals)"
+msgstr "Tamilsk (tastatur med numre)"
 
 #: ../rules/base.xml.in.h:304
-msgid "French (alternative, latin-9 only)"
-msgstr "Fransk (alternativ, kun latin-9)"
+msgid "Tamil (TAB typewriter)"
+msgstr "Tamilsk (TAB-skrivemaskine)"
 
 #: ../rules/base.xml.in.h:305
-msgid "French (eliminate dead keys)"
-msgstr "Fransk (slå døde taster fra)"
+msgid "Tamil (TSCII typewriter)"
+msgstr "Tamilsk (TSCII-skrivemaskine)"
 
 #: ../rules/base.xml.in.h:306
-msgid "French (legacy, alternative)"
-msgstr "Fransk (forældet, alternativ)"
-
-#: ../rules/base.xml.in.h:307
-msgid "French (legacy, alternative, Sun dead keys)"
-msgstr "Fransk (forældet, alternativ, Sun døde taster)"
+msgid "Tamil"
+msgstr "Tamilsk"
 
+#. Keyboard indicator for Telugu layouts
 #: ../rules/base.xml.in.h:308
-msgid "French (legacy, alternative, eliminate dead keys)"
-msgstr "Fransk (forældet, alternativ, slå døde taster fra)"
+msgid "te"
+msgstr "te"
 
 #: ../rules/base.xml.in.h:309
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr "Fujitsu-Siemens Computers AMILO bærbar"
-
-#: ../rules/base.xml.in.h:310
-msgid "Fula"
-msgstr "Fula"
+msgid "Telugu"
+msgstr "Telugu"
 
+#. Keyboard indicator for Urdu layouts
 #: ../rules/base.xml.in.h:311
-msgid "Ga"
-msgstr "Ga"
+msgid "ur"
+msgstr "ur"
 
 #: ../rules/base.xml.in.h:312
-msgid "Generic 101-key PC"
-msgstr "Generisk 101-taster PC"
+msgid "Urdu (phonetic)"
+msgstr "Urdu (fonetisk)"
 
 #: ../rules/base.xml.in.h:313
-msgid "Generic 102-key (Intl) PC"
-msgstr "Generisk 102-taster (Intl) PC"
+msgid "Urdu (alternative phonetic)"
+msgstr "Urdu (alternativ fonetisk)"
 
 #: ../rules/base.xml.in.h:314
-msgid "Generic 104-key PC"
-msgstr "Generisk 104-taster PC"
-
-#: ../rules/base.xml.in.h:315
-msgid "Generic 105-key (Intl) PC"
-msgstr "Generisk 105-taster (Intl) PC"
+msgid "Urdu (WinKeys)"
+msgstr "Urdu (Win-taster)"
 
+#. Keyboard indicator for Hindi layouts
 #: ../rules/base.xml.in.h:316
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+msgid "hi"
+msgstr "hi"
 
 #: ../rules/base.xml.in.h:317
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgid "Hindi (Bolnagri)"
+msgstr "Hindi (bolnagri)"
 
 #: ../rules/base.xml.in.h:318
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "Hindi (Wx)"
+msgstr "Hindi (wx)"
 
 #: ../rules/base.xml.in.h:319
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
-
-#: ../rules/base.xml.in.h:320
-msgid "Genius KKB-2050HS"
-msgstr "Genius KKB-2050HS"
+msgid "English (India, with RupeeSign)"
+msgstr "Engelsk (Indien, med rupeetegn)"
 
+#. Keyboard indicator for Bosnian layouts
 #: ../rules/base.xml.in.h:321
-msgid "Georgian"
-msgstr "Georgisk"
+msgid "bs"
+msgstr "bs"
 
 #: ../rules/base.xml.in.h:322
-msgid "Georgian (France, AZERTY Tskapo)"
-msgstr "Geogrisk (Frankrig, AZERTY Tskapo)"
+msgid "Bosnian"
+msgstr "Bosnisk"
 
 #: ../rules/base.xml.in.h:323
-msgid "Georgian (Italy)"
-msgstr "Georgisk (Italien)"
+msgid "Bosnian (use guillemets for quotes)"
+msgstr "Bosnisk (anvend »« som anførelsestegn)"
 
 #: ../rules/base.xml.in.h:324
-msgid "Georgian (MESS)"
-msgstr "Georgisk (MESS)"
+msgid "Bosnian (use Bosnian digraphs)"
+msgstr "Bosnisk (anvend bosniske digrafer)"
 
 #: ../rules/base.xml.in.h:325
-msgid "Georgian (ergonomic)"
-msgstr "Georgisk (ergonomisk)"
-
-#: ../rules/base.xml.in.h:326 ../rules/base.extras.xml.in.h:13
-msgid "German"
-msgstr "Tysk"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "Bosnisk (US-tastatur med bosniske digrafer)"
 
-#: ../rules/base.xml.in.h:327
-msgid "German (Austria)"
-msgstr "Tysk (Østrig)"
+#: ../rules/base.xml.in.h:326
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "Bosnisk (US-tastatur med bosniske bogstaver)"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (Austria, Macintosh)"
-msgstr "Tysk (Østrig, Macintosh)"
+#. Keyboard indicator for Portuguese layouts
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
+msgid "pt"
+msgstr "pt"
 
-#: ../rules/base.xml.in.h:329
-msgid "German (Austria, Sun dead keys)"
-msgstr "Tysk (Østrig, Sun døde taster)"
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
+msgid "Portuguese (Brazil)"
+msgstr "Portugisisk (brasiliansk)"
 
 #: ../rules/base.xml.in.h:330
-msgid "German (Austria, eliminate dead keys)"
-msgstr "Tysk (Østrig, slå døde taster fra)"
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "Portugisisk (brasiliansk, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:331
-msgid "German (Dvorak)"
-msgstr "Tysk (dvorak)"
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "Portugisisk (brasiliansk, dvorak)"
 
 #: ../rules/base.xml.in.h:332
-msgid "German (Macintosh)"
-msgstr "Tysk (Macintosh)"
+msgid "Portuguese (Brazil, nativo)"
+msgstr "Portugisisk (brasiliansk, nativo)"
 
 #: ../rules/base.xml.in.h:333
-msgid "German (Macintosh, eliminate dead keys)"
-msgstr "Tysk (Macintosh, slå døde taster fra)"
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgstr "Portugisisk (brasiliansk, nativo for USA-tastaturer)"
 
 #: ../rules/base.xml.in.h:334
-msgid "German (Neo 2)"
-msgstr "Tysk (Neo 2)"
-
-#: ../rules/base.xml.in.h:335
-msgid "German (Sun dead keys)"
-msgstr "Tysk (Sun døde taster)"
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "Portugisisk (brasiliansk, nativo for esperanto)"
 
+#. Keyboard indicator for Bulgarian layouts
 #: ../rules/base.xml.in.h:336
-msgid "German (Switzerland)"
-msgstr "Tysk (Schweiz)"
+msgid "bg"
+msgstr "bg"
 
 #: ../rules/base.xml.in.h:337
-msgid "German (Switzerland, Macintosh)"
-msgstr "Tysk (Schweiz, Macintosh)"
+msgid "Bulgarian"
+msgstr "Bulgarsk"
 
 #: ../rules/base.xml.in.h:338
-msgid "German (Switzerland, Sun dead keys)"
-msgstr "Tysk (Schweiz, Sun døde taster)"
+msgid "Bulgarian (traditional phonetic)"
+msgstr "Bulgarsk (traditionel fonetisk)"
 
 #: ../rules/base.xml.in.h:339
-msgid "German (Switzerland, eliminate dead keys)"
-msgstr "Tysk (Schweiz, slå døde taster fra)"
+msgid "Bulgarian (new phonetic)"
+msgstr "Bulgarsk (ny fonetisk)"
 
 #: ../rules/base.xml.in.h:340
-msgid "German (Switzerland, legacy)"
-msgstr "Tysk (Schweiz, forældet)"
-
-#: ../rules/base.xml.in.h:341
-msgid "German (dead acute)"
-msgstr "Tysk (død accent)"
+msgid "Arabic (Morocco)"
+msgstr "Arabisk (Marokko)"
 
-#: ../rules/base.xml.in.h:342
-msgid "German (dead grave acute)"
-msgstr "Tysk (død accent grave)"
+#. Keyboard indicator for French layouts
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
+msgid "fr"
+msgstr "fr"
 
 #: ../rules/base.xml.in.h:343
-msgid "German (eliminate dead keys)"
-msgstr "Tysk (slå døde taster fra)"
-
-#: ../rules/base.xml.in.h:344
-msgid "German (qwerty)"
-msgstr "Tysk (qwerty)"
+msgid "French (Morocco)"
+msgstr "Fransk (Marokko)"
 
+#. Keyboard indicator for Berber layouts
 #: ../rules/base.xml.in.h:345
-msgid "Greek"
-msgstr "Græsk"
+msgid "ber"
+msgstr "ber"
 
 #: ../rules/base.xml.in.h:346
-msgid "Greek (eliminate dead keys)"
-msgstr "Græsk (slå døde taster fra)"
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "Berbisk (Marokko, Tifinagh)"
 
 #: ../rules/base.xml.in.h:347
-msgid "Greek (extended)"
-msgstr "Græsk (udvidet)"
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "Berbisk (Marokko, Tifinagh alternativ)"
 
+# http://retskrivningsordbogen.dk/ro/ro.htm?q=berb
 #: ../rules/base.xml.in.h:348
-msgid "Greek (polytonic)"
-msgstr "Græsk (polytonisk)"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "Berbisk (Marokko, tifinagh alternativ fonetisk)"
 
 #: ../rules/base.xml.in.h:349
-msgid "Greek (simple)"
-msgstr "Græsk (simpel)"
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "Berbisk (Marokko, Tifinagh udvidet)"
 
 #: ../rules/base.xml.in.h:350
-msgid "Gujarati"
-msgstr "Gujarati"
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "Berbisk (Marokko, Tifinagh fonetisk)"
 
 #: ../rules/base.xml.in.h:351
-msgid "Gyration"
-msgstr "Roteren"
-
-# http://en.wikipedia.org/wiki/HTC_Dream
-#: ../rules/base.xml.in.h:352
-msgid "HTC Dream"
-msgstr "HTC-Dream"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "Berbisk (Marokko, Tifinagh udvidet fonetisk)"
 
+#. Keyboard indicator for Cameroon layouts
 #: ../rules/base.xml.in.h:353
-msgid "Happy Hacking Keyboard"
-msgstr "Glædelig hacking tastatur"
+msgid "cm"
+msgstr "cm"
 
 #: ../rules/base.xml.in.h:354
-msgid "Happy Hacking Keyboard for Mac"
-msgstr "Glædelig hacking tastatur til Mac"
+msgid "English (Cameroon)"
+msgstr "Engelsk (camerounsk)"
 
 #: ../rules/base.xml.in.h:355
-msgid "Hausa"
-msgstr "Hausa"
+msgid "French (Cameroon)"
+msgstr "Fransk (camerounsk)"
 
 #: ../rules/base.xml.in.h:356
-msgid "Hebrew"
-msgstr "Hebraisk"
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Camerounsk flersproget (qwerty)"
 
 #: ../rules/base.xml.in.h:357
-msgid "Hebrew (Biblical, Tiro)"
-msgstr "Hebraisk (bibelsk, Tiro)"
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Camerounsk flersproget (azerty)"
 
 #: ../rules/base.xml.in.h:358
-msgid "Hebrew (lyx)"
-msgstr "Hebraisk (lyx)"
-
-#: ../rules/base.xml.in.h:359
-msgid "Hebrew (phonetic)"
-msgstr "Hebraisk (fonetisk)"
+msgid "Cameroon Multilingual (Dvorak)"
+msgstr "Camerounsk flersproget (dvorak)"
 
+#. Keyboard indicator for Burmese layouts
 #: ../rules/base.xml.in.h:360
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard"
+msgid "my"
+msgstr "my"
 
 #: ../rules/base.xml.in.h:361
-msgid "Hewlett-Packard Mini 110 Notebook"
-msgstr "Hewlett-Packard Mini 110 Notebook"
+msgid "Burmese"
+msgstr "Burmesisk"
 
-#: ../rules/base.xml.in.h:362
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
+msgid "French (Canada)"
+msgstr "Fransk (Canada)"
 
 #: ../rules/base.xml.in.h:363
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
+msgid "French (Canada, Dvorak)"
+msgstr "Fransk (Canada, dvorak)"
 
 #: ../rules/base.xml.in.h:364
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "French (Canada, legacy)"
+msgstr "Fransk (Canada, forældet)"
 
 #: ../rules/base.xml.in.h:365
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
+msgid "Canadian Multilingual"
+msgstr "Canadisk flersproget"
 
 #: ../rules/base.xml.in.h:366
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+msgid "Canadian Multilingual (first part)"
+msgstr "Canadisk flersproget (første del)"
 
 #: ../rules/base.xml.in.h:367
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: ../rules/base.xml.in.h:368
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+msgid "Canadian Multilingual (second part)"
+msgstr "Canadisk flersproget (anden del)"
 
+#. Keyboard indicator for Inuktikut layouts
 #: ../rules/base.xml.in.h:369
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr "Hewlett-Packard Pavilion dv5"
+msgid "ike"
+msgstr "ike"
 
 #: ../rules/base.xml.in.h:370
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-250x Multimedia tastatur"
+msgid "Inuktitut"
+msgstr "Inuktitut"
 
 #: ../rules/base.xml.in.h:371
-msgid "Hewlett-Packard nx9020"
-msgstr "Hewlett-Packard nx9020"
+msgid "English (Canada)"
+msgstr "Engelsk (Canada)"
 
 #: ../rules/base.xml.in.h:372
-msgid "Hexadecimal"
-msgstr "Sekstentals"
-
-#: ../rules/base.xml.in.h:373
-msgid "Hindi (Bolnagri)"
-msgstr "Hindi (bolnagri)"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "Fransk (Congo, Den Demokratiske Republik)"
 
+#. Keyboard indicator for Taiwanese layouts
 #: ../rules/base.xml.in.h:374
-msgid "Hindi (Wx)"
-msgstr "Hindi (wx)"
+msgid "zh"
+msgstr "zh"
 
 #: ../rules/base.xml.in.h:375
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "Chinese"
+msgstr "Kinesisk"
 
 #: ../rules/base.xml.in.h:376
-msgid "Htc Dream phone"
-msgstr "Htc Dream-telefon"
+msgid "Tibetan"
+msgstr "Tibetansk"
 
 #: ../rules/base.xml.in.h:377
-msgid "Hungarian"
-msgstr "Ungarsk"
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetansk (med ASCII-numre)"
 
 #: ../rules/base.xml.in.h:378
-msgid "Hungarian (101/qwerty/comma/dead keys)"
-msgstr "Ungarsk (101/qwerty/komma/døde taster)"
-
-#: ../rules/base.xml.in.h:379
-msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
-msgstr "Ungarsk (101/qwerty/komma/slå døde taster fra)"
+msgid "Uyghur"
+msgstr "Uyghur"
 
+#. Keyboard indicator for Croatian layouts
 #: ../rules/base.xml.in.h:380
-msgid "Hungarian (101/qwerty/dot/dead keys)"
-msgstr "Ungarsk (101/qwerty/punktum/døde taster)"
+msgid "hr"
+msgstr "hr"
 
 #: ../rules/base.xml.in.h:381
-msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
-msgstr "Ungarsk (101/qwerty/punktum/slå døde taster fra)"
+msgid "Croatian"
+msgstr "Kroatisk"
 
 #: ../rules/base.xml.in.h:382
-msgid "Hungarian (101/qwertz/comma/dead keys)"
-msgstr "Ungarsk (101/qwertz/komma/døde taster)"
+msgid "Croatian (use guillemets for quotes)"
+msgstr "Kroatisk (anvend »« som anførelsestegn)"
 
 #: ../rules/base.xml.in.h:383
-msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
-msgstr "Ungarsk (101/qwertz/komma/slå døde taster fra)"
+msgid "Croatian (use Croatian digraphs)"
+msgstr "Kroatisk (anvend kroatiske digrafer)"
 
 #: ../rules/base.xml.in.h:384
-msgid "Hungarian (101/qwertz/dot/dead keys)"
-msgstr "Ungarsk (101/qwertz/punktum/døde taster)"
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "Kroatisk (US-tastatur med kroatiske digrafer)"
 
 #: ../rules/base.xml.in.h:385
-msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
-msgstr "Ungarsk (101/qwertz/punktum/slå døde taster fra)"
-
-#: ../rules/base.xml.in.h:386
-msgid "Hungarian (102/qwerty/comma/dead keys)"
-msgstr "Ungarsk (102/qwerty/komma/døde taster)"
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "Kroatisk (US-tastatur med kroatiske bogstaver)"
 
-#: ../rules/base.xml.in.h:387
-msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
-msgstr "Ungarsk (102/qwerty/komma/slå døde taster fra)"
+#. Keyboard indicator for Chech layouts
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
+msgid "cs"
+msgstr "cs"
 
-#: ../rules/base.xml.in.h:388
-msgid "Hungarian (102/qwerty/dot/dead keys)"
-msgstr "Ungarsk (102/qwerty/punktum/døde taster)"
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
+msgid "Czech"
+msgstr "Tjekkisk"
 
 #: ../rules/base.xml.in.h:389
-msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
-msgstr "Ungarsk (102/qwerty/punktum/slå døde taster fra)"
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Tjekkisk (med &lt;\\|&gt;-tast)"
 
 #: ../rules/base.xml.in.h:390
-msgid "Hungarian (102/qwertz/comma/dead keys)"
-msgstr "Ungarsk (102/qwertz/komma/døde taster)"
+msgid "Czech (qwerty)"
+msgstr "Tjekkisk (qwerty)"
 
 #: ../rules/base.xml.in.h:391
-msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
-msgstr "Ungarsk (102/qwertz/komma/slå døde taster fra)"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "Tjekkisk (qwerty, udvidet omvendt skråstreg)"
 
 #: ../rules/base.xml.in.h:392
-msgid "Hungarian (102/qwertz/dot/dead keys)"
-msgstr "Ungarsk (102/qwertz/punktum/døde taster)"
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "Tjekkisk (UCW-layout, kun bogstaver med accent)"
 
 #: ../rules/base.xml.in.h:393
-msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
-msgstr "Ungarsk (102/qwertz/punktum/slå døde taster fra)"
-
-#: ../rules/base.xml.in.h:394
-msgid "Hungarian (eliminate dead keys)"
-msgstr "Ungarsk (slå døde taster fra)"
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "Tjekkisk (US Dvorak med CZ UCW-understøttelse)"
 
-#: ../rules/base.xml.in.h:395
-msgid "Hungarian (qwerty)"
-msgstr "Ungarsk (qwerty)"
+#. Keyboard indicator for Danish layouts
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
+msgid "da"
+msgstr "da"
 
-#: ../rules/base.xml.in.h:396
-msgid "Hungarian (standard)"
-msgstr "Ungarsk (standard)"
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
+msgid "Danish"
+msgstr "Dansk"
 
 #: ../rules/base.xml.in.h:397
-msgid "Hyper is mapped to Win-keys"
-msgstr "Hyper ligger på Win-tasterne"
+msgid "Danish (eliminate dead keys)"
+msgstr "Dansk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:398
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
+msgid "Danish (Macintosh)"
+msgstr "Dansk (Macintosh)"
 
 #: ../rules/base.xml.in.h:399
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Dansk (Macintosh, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:400
-msgid "IBM Space Saver"
-msgstr "IBM Space Saver"
-
-#: ../rules/base.xml.in.h:401
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "Danish (Dvorak)"
+msgstr "Dansk (dvorak)"
 
-#: ../rules/base.xml.in.h:402
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr "IBM ThinkPad R60/T60/R61/T61"
+#. Keyboard indicator for Dutch layouts
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
+msgid "nl"
+msgstr "nl"
 
-#: ../rules/base.xml.in.h:403
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
+msgid "Dutch"
+msgstr "Hollandsk"
 
 #: ../rules/base.xml.in.h:404
-msgid "Icelandic"
-msgstr "Islandsk"
+msgid "Dutch (Sun dead keys)"
+msgstr "Hollandsk (Sun døde taster)"
 
 #: ../rules/base.xml.in.h:405
-msgid "Icelandic (Dvorak)"
-msgstr "Islandsk (Dvorak)"
+msgid "Dutch (Macintosh)"
+msgstr "Hollandsk (Macintosh)"
 
 #: ../rules/base.xml.in.h:406
-msgid "Icelandic (Macintosh)"
-msgstr "Islandsk (Macintosh)"
-
-#: ../rules/base.xml.in.h:407
-msgid "Icelandic (Sun dead keys)"
-msgstr "Islandsk (Sun døde taster)"
+msgid "Dutch (standard)"
+msgstr "Hollandsk (standard)"
 
+#. Keyboard indicator for Dzongkha layouts
 #: ../rules/base.xml.in.h:408
-msgid "Icelandic (eliminate dead keys)"
-msgstr "Islandsk (slå døde taster fra)"
+msgid "dz"
+msgstr "dz"
 
 #: ../rules/base.xml.in.h:409
-msgid "Igbo"
-msgstr "Igbo"
-
-#: ../rules/base.xml.in.h:410
-msgid "Indian"
-msgstr "Indisk"
+msgid "Dzongkha"
+msgstr "Dzongkha"
 
-#: ../rules/base.xml.in.h:411
-msgid "Inuktitut"
-msgstr "Inuktitut"
+#. Keyboard indicator for Estonian layouts
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
+msgid "et"
+msgstr "et"
 
-#: ../rules/base.xml.in.h:412
-msgid "Iraqi"
-msgstr "Irakisk"
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
+msgid "Estonian"
+msgstr "Estisk"
 
 #: ../rules/base.xml.in.h:413
-msgid "Irish"
-msgstr "Irsk"
+msgid "Estonian (eliminate dead keys)"
+msgstr "Estisk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:414
-msgid "Irish (UnicodeExpert)"
-msgstr "Irsk (UnicodeExpert)"
+msgid "Estonian (Dvorak)"
+msgstr "Estisk (dvorak)"
 
 #: ../rules/base.xml.in.h:415
-msgid "Italian"
-msgstr "Italiensk"
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "Estisk (US-tastatur med estiske bogstaver)"
 
-#: ../rules/base.xml.in.h:416
-msgid "Italian (Macintosh)"
-msgstr "Italiensk (Macintosh)"
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
+msgid "Persian"
+msgstr "Persisk"
 
 #: ../rules/base.xml.in.h:417
-msgid "Italian (US keyboard with Italian letters)"
-msgstr "Italiensk (US-tastatur med italienske bogstaver)"
-
-#: ../rules/base.xml.in.h:418
-msgid "Italian (eliminate dead keys)"
-msgstr "Italiensk (slå døde taster fra)"
+msgid "Persian (with Persian Keypad)"
+msgstr "Persisk (med persisk numerisk tastatur)"
 
+#. Keyboard indicator for Kurdish layouts
 #: ../rules/base.xml.in.h:419
-msgid "Japanese"
-msgstr "Japansk"
+msgid "ku"
+msgstr "ku"
 
 #: ../rules/base.xml.in.h:420
-msgid "Japanese (Dvorak)"
-msgstr "Japansk (dvorak)"
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "Kurdisk (Iran, latin Q)"
 
 #: ../rules/base.xml.in.h:421
-msgid "Japanese (Kana 86)"
-msgstr "Japansk (Kana 86)"
+msgid "Kurdish (Iran, F)"
+msgstr "Kurdisk (Iran, F)"
 
 #: ../rules/base.xml.in.h:422
-msgid "Japanese (Kana)"
-msgstr "Japansk (Kana)"
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurdisk (Iran, latin Alt-Q)"
 
 #: ../rules/base.xml.in.h:423
-msgid "Japanese (Macintosh)"
-msgstr "Japansk (Macintosh)"
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "Kurdisk (Iran, arabisk-latin)"
 
 #: ../rules/base.xml.in.h:424
-msgid "Japanese (OADG 109A)"
-msgstr "Japansk (OADG 109A)"
+msgid "Iraqi"
+msgstr "Irakisk"
 
 #: ../rules/base.xml.in.h:425
-msgid "Japanese (PC-98xx Series)"
-msgstr "Japansk (pc-98xx-serie)"
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "Kurdisk (Irak, latin Q)"
 
 #: ../rules/base.xml.in.h:426
-msgid "Japanese keyboard options"
-msgstr "Japanske tastaturvalg"
+msgid "Kurdish (Iraq, F)"
+msgstr "Kurdisk (Irak, F)"
 
 #: ../rules/base.xml.in.h:427
-msgid "Kalmyk"
-msgstr "Kalmyk"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "Kurdisk (Irak, latin Alt-Q)"
 
 #: ../rules/base.xml.in.h:428
-msgid "Kana Lock key is locking"
-msgstr "Kana låsetast låser"
-
-#: ../rules/base.xml.in.h:429
-msgid "Kannada"
-msgstr "Kannada"
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "Kurdisk (Irak, arabisk-latin)"
 
+#. Keyboard indicator for Faroese layouts
 #: ../rules/base.xml.in.h:430
-msgid "Kashubian"
-msgstr "Kashubian"
+msgid "fo"
+msgstr "fo"
 
 #: ../rules/base.xml.in.h:431
-msgid "Kazakh"
-msgstr "Kasakhisk"
+msgid "Faroese"
+msgstr "Færøsk"
 
 #: ../rules/base.xml.in.h:432
-msgid "Kazakh (with Russian)"
-msgstr "Kasakhisk (med russisk)"
-
-#: ../rules/base.xml.in.h:433
-msgid "Key sequence to kill the X server"
-msgstr "Tastsekvens for at slå X-serveren ned"
+msgid "Faroese (eliminate dead keys)"
+msgstr "Færøsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:434
-msgid "Key to choose 3rd level"
-msgstr "Tast for at vælge tredje niveau"
+#. Keyboard indicator for Finnish layouts
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
+msgid "fi"
+msgstr "fi"
 
-#: ../rules/base.xml.in.h:435
-msgid "Key to choose 5th level"
-msgstr "Tast for at vælge femte niveau"
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
+msgid "Finnish"
+msgstr "Finsk"
 
 #: ../rules/base.xml.in.h:436
-msgid "Key(s) to change layout"
-msgstr "Tast(er) for at skifte layout"
+msgid "Finnish (classic)"
+msgstr "Finsk (klassisk)"
 
 #: ../rules/base.xml.in.h:437
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Finnish (classic, eliminate dead keys)"
+msgstr "Finsk (klassisk, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:438
-msgid "Khmer (Cambodia)"
-msgstr "Khmerisk (Cambodja)"
+msgid "Northern Saami (Finland)"
+msgstr "Nordligt samisk (Finland)"
 
 #: ../rules/base.xml.in.h:439
-msgid "Kikuyu"
-msgstr "Kikuyu"
+msgid "Finnish (Macintosh)"
+msgstr "Finsk (Macintosh)"
 
-#: ../rules/base.xml.in.h:440
-msgid "Kinesis"
-msgstr "Kinesis"
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
+msgid "French"
+msgstr "Fransk"
 
 #: ../rules/base.xml.in.h:441
-msgid "Komi"
-msgstr "Komi"
+msgid "French (eliminate dead keys)"
+msgstr "Fransk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:442
-msgid "Korean"
-msgstr "Koreansk"
+msgid "French (Sun dead keys)"
+msgstr "Fransk (Sun døde taster)"
 
 #: ../rules/base.xml.in.h:443
-msgid "Korean (101/104 key compatible)"
-msgstr "Koreansk (101/104 tastkompatibel)"
+msgid "French (alternative)"
+msgstr "Fransk (alternativ)"
 
 #: ../rules/base.xml.in.h:444
-msgid "Kurdish (Iran, Arabic-Latin)"
-msgstr "Kurdisk (Iran, arabisk-latin)"
+msgid "French (alternative, latin-9 only)"
+msgstr "Fransk (alternativ, kun latin-9)"
 
 #: ../rules/base.xml.in.h:445
-msgid "Kurdish (Iran, F)"
-msgstr "Kurdisk (Iran, F)"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "Fransk (alternativ, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:446
-msgid "Kurdish (Iran, Latin Alt-Q)"
-msgstr "Kurdisk (Iran, latin Alt-Q)"
+msgid "French (alternative, Sun dead keys)"
+msgstr "Fransk (alternativ, Sun døde taster)"
 
 #: ../rules/base.xml.in.h:447
-msgid "Kurdish (Iran, Latin Q)"
-msgstr "Kurdisk (Iran, latin Q)"
+msgid "French (legacy, alternative)"
+msgstr "Fransk (forældet, alternativ)"
 
 #: ../rules/base.xml.in.h:448
-msgid "Kurdish (Iraq, Arabic-Latin)"
-msgstr "Kurdisk (Irak, arabisk-latin)"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "Fransk (forældet, alternativ, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:449
-msgid "Kurdish (Iraq, F)"
-msgstr "Kurdisk (Irak, F)"
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "Fransk (forældet, alternativ, Sun døde taster)"
 
 #: ../rules/base.xml.in.h:450
-msgid "Kurdish (Iraq, Latin Alt-Q)"
-msgstr "Kurdisk (Irak, latin Alt-Q)"
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "Fransk (Bepo, ergonomisk, dvorakmåde)"
 
 #: ../rules/base.xml.in.h:451
-msgid "Kurdish (Iraq, Latin Q)"
-msgstr "Kurdisk (Irak, latin Q)"
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
+msgstr "Fransk (Bepo, ergonomisk, dvorakmåde, kun latin-9)"
 
 #: ../rules/base.xml.in.h:452
-msgid "Kurdish (Syria, F)"
-msgstr "Kurdisk (Syrien, F)"
+msgid "French (Dvorak)"
+msgstr "Fransk (dvorak)"
 
 #: ../rules/base.xml.in.h:453
-msgid "Kurdish (Syria, Latin Alt-Q)"
-msgstr "Kurdisk (Syrien, latin Alt-Q)"
+msgid "French (Macintosh)"
+msgstr "Fransk (Macintosh)"
 
 #: ../rules/base.xml.in.h:454
-msgid "Kurdish (Syria, Latin Q)"
-msgstr "Kurdisk (Syrien, latin Q)"
+msgid "French (Breton)"
+msgstr "Fransk (bretonsk)"
 
 #: ../rules/base.xml.in.h:455
-msgid "Kurdish (Turkey, F)"
-msgstr "Kurdisk (Tyrkiet, F)"
+msgid "Occitan"
+msgstr "Occitansk"
 
 #: ../rules/base.xml.in.h:456
-msgid "Kurdish (Turkey, Latin Alt-Q)"
-msgstr "Kurdisk (Tyrkiet, latin Alt-Q)"
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Geogrisk (Frankrig, AZERTY Tskapo)"
 
 #: ../rules/base.xml.in.h:457
-msgid "Kurdish (Turkey, Latin Q)"
-msgstr "Kurdisk (Tyrkiet, latin Q)"
+msgid "English (Ghana)"
+msgstr "Engelsk (Ghana)"
 
 #: ../rules/base.xml.in.h:458
-msgid "Kyrgyz"
-msgstr "Kirgisisk"
-
-#: ../rules/base.xml.in.h:459
-msgid "Kyrgyz (phonetic)"
-msgstr "Kirgisisk (fonetisk)"
+msgid "English (Ghana, multilingual)"
+msgstr "Engelsk (Ghana, flersproget)"
 
+#. Keyboard indicator for Akan layouts
 #: ../rules/base.xml.in.h:460
-msgid "Lao"
-msgstr "Lao"
+msgid "ak"
+msgstr "ak"
 
 #: ../rules/base.xml.in.h:461
-msgid "Lao (STEA proposed standard layout)"
-msgstr "Lao (STEA-foreslået standardlayout)"
-
-#: ../rules/base.xml.in.h:462
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Bærbar Compaq (fx Armada) Laptop Keyboard"
+msgid "Akan"
+msgstr "Akan"
 
+#. Keyboard indicator for Ewe layouts
 #: ../rules/base.xml.in.h:463
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Bærbar/notebook Compaq (fx Presario) Internet Keyboard"
+msgid "ee"
+msgstr "ee"
 
 #: ../rules/base.xml.in.h:464
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Bærbar/notebook eMachines m68xx"
-
-#: ../rules/base.xml.in.h:465 ../rules/base.extras.xml.in.h:18
-msgid "Latvian"
-msgstr "Lettisk"
+msgid "Ewe"
+msgstr "Ewe"
 
+#. Keyboard indicator for Fula layouts
 #: ../rules/base.xml.in.h:466
-msgid "Latvian (F variant)"
-msgstr "Lettisk (F-variant)"
+msgid "ff"
+msgstr "ff"
 
 #: ../rules/base.xml.in.h:467
-msgid "Latvian (adapted)"
-msgstr "Lettisk (adapteret)"
-
-#: ../rules/base.xml.in.h:468
-msgid "Latvian (apostrophe variant)"
-msgstr "Lettisk (apostrofvariant)"
+msgid "Fula"
+msgstr "Fula"
 
+#. Keyboard indicator for Ga layouts
 #: ../rules/base.xml.in.h:469
-msgid "Latvian (ergonomic, ŪGJRMV)"
-msgstr "Lettisk (ergonomisk, ŪGJRMV)"
+msgid "gaa"
+msgstr "gaa"
 
 #: ../rules/base.xml.in.h:470
-msgid "Latvian (modern)"
-msgstr "Lettisk (moderne)"
-
-#: ../rules/base.xml.in.h:471
-msgid "Latvian (tilde variant)"
-msgstr "Lettisk (tildevariant)"
+msgid "Ga"
+msgstr "Ga"
 
+#. Keyboard indicator for Hausa layouts
 #: ../rules/base.xml.in.h:472
-msgid "Left Alt"
-msgstr "Venstre Alt"
+msgid "ha"
+msgstr "ha"
 
 #: ../rules/base.xml.in.h:473
-msgid "Left Alt (while pressed)"
-msgstr "Venstre Alt (mens trykket ned)"
-
-#: ../rules/base.xml.in.h:474
-msgid "Left Alt is swapped with Left Win"
-msgstr "Venstre Alt ombyttes med venstre Win-tast"
+msgid "Hausa"
+msgstr "Hausa"
 
+#. Keyboard indicator for Avatime layouts
 #: ../rules/base.xml.in.h:475
-msgid "Left Alt+Left Shift"
-msgstr "Venstre Alt+Venstre Skift"
+msgid "avn"
+msgstr "avn"
 
+# The Avatime are an Akan people who live in Volta region of Ghana. History has it 
+# that they are Ahanta people who migrated to the Volta region.
 #: ../rules/base.xml.in.h:476
-msgid "Left Ctrl"
-msgstr "Venstre Ctrl"
+msgid "Avatime"
+msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:477
-msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
-msgstr "Venstre Ctrl (skifter til første layout), Højre Ctrl (skifter til sidste layout)"
+msgid "English (Ghana, GILLBT)"
+msgstr "Engelsk (Ghana, GILLBT)"
 
 #: ../rules/base.xml.in.h:478
-msgid "Left Ctrl as Meta"
-msgstr "Venstre Ctrl som Meta"
-
-#: ../rules/base.xml.in.h:479
-msgid "Left Ctrl+Left Shift"
-msgstr "Venstre Ctrl+Venstre Skift"
+msgid "French (Guinea)"
+msgstr "Fransk (Guinea)"
 
+#. Keyboard indicator for Georgian layouts
 #: ../rules/base.xml.in.h:480
-msgid "Left Shift"
-msgstr "Venstre Skift"
+msgid "ka"
+msgstr "ka"
 
 #: ../rules/base.xml.in.h:481
-msgid "Left Win"
-msgstr "Venstre Win"
+msgid "Georgian"
+msgstr "Georgisk"
 
 #: ../rules/base.xml.in.h:482
-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)"
+msgid "Georgian (ergonomic)"
+msgstr "Georgisk (ergonomisk)"
 
 #: ../rules/base.xml.in.h:483
-msgid "Left Win (while pressed)"
-msgstr "Venstre Win-tast (mens trykket ned)"
+msgid "Georgian (MESS)"
+msgstr "Georgisk (MESS)"
 
 #: ../rules/base.xml.in.h:484
-msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Venstre Win-tast vælger femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
+msgid "Russian (Georgia)"
+msgstr "Russisk (georgisk)"
 
 #: ../rules/base.xml.in.h:485
-msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
-msgstr "Venstre Ctrl+Venstre Win (til første layout), Højre Ctrl+Menu (til andet layout)"
+msgid "Ossetian (Georgia)"
+msgstr "Occitansk (Georgien)"
 
-#: ../rules/base.xml.in.h:486
-msgid "Legacy"
-msgstr "Forældet"
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
+msgid "German"
+msgstr "Tysk"
 
 #: ../rules/base.xml.in.h:487
-msgid "Legacy Wang 724"
-msgstr "Forældet Wang 724"
+msgid "German (dead acute)"
+msgstr "Tysk (død accent)"
+
+#: ../rules/base.xml.in.h:488
+msgid "German (dead grave acute)"
+msgstr "Tysk (død accent grave)"
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:489
-msgid "Legacy key with comma"
-msgstr "Forældet tast med komma"
+msgid "German (eliminate dead keys)"
+msgstr "Tysk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:490
-msgid "Legacy key with dot"
-msgstr "Forældet tast med punktum"
+msgid "Romanian (Germany)"
+msgstr "Rumænsk (Tyskland)"
 
-#: ../rules/base.xml.in.h:491 ../rules/base.extras.xml.in.h:27
-msgid "Lithuanian"
-msgstr "Litauisk"
+#: ../rules/base.xml.in.h:491
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Rumænsk (Tyskland, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:492
-msgid "Lithuanian (IBM LST 1205-92)"
-msgstr "Litauisk (IBM LST 1205-92)"
+msgid "German (Dvorak)"
+msgstr "Tysk (dvorak)"
 
 #: ../rules/base.xml.in.h:493
-msgid "Lithuanian (LEKP)"
-msgstr "Litauisk (LEKP)"
+msgid "German (Sun dead keys)"
+msgstr "Tysk (Sun døde taster)"
 
 #: ../rules/base.xml.in.h:494
-msgid "Lithuanian (LEKPa)"
-msgstr "Litauisk (LEKPa)"
+msgid "German (Neo 2)"
+msgstr "Tysk (Neo 2)"
 
 #: ../rules/base.xml.in.h:495
-msgid "Lithuanian (US keyboard with Lithuanian letters)"
-msgstr "Litauisk (US-tastatur med litauiske bogstaver)"
+msgid "German (Macintosh)"
+msgstr "Tysk (Macintosh)"
 
 #: ../rules/base.xml.in.h:496
-msgid "Lithuanian (standard)"
-msgstr "Litauisk (standard)"
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Tysk (Macintosh, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:497
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
+msgid "Lower Sorbian"
+msgstr "Nedersorbisk"
 
+# nedersorbisk, tror jeg
+# (el. nedre Lausitz)
 #: ../rules/base.xml.in.h:498
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
+msgid "Lower Sorbian (qwertz)"
+msgstr "Nedersorbisk (qwertz)"
 
 #: ../rules/base.xml.in.h:499
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop (alternativ valg)"
+msgid "German (qwerty)"
+msgstr "Tysk (qwerty)"
 
 #: ../rules/base.xml.in.h:500
-msgid "Logitech Cordless Desktop EX110"
-msgstr "Logitech Cordless Desktop EX110"
-
-#: ../rules/base.xml.in.h:501
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
+msgid "Russian (Germany, phonetic)"
+msgstr "Russisk (Tyskland, fonetisk)"
 
-#: ../rules/base.xml.in.h:502
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
+#. Keyboard indicator for Greek layouts
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
+msgid "gr"
+msgstr "gr"
 
-#: ../rules/base.xml.in.h:503
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
+msgid "Greek"
+msgstr "Græsk"
 
 #: ../rules/base.xml.in.h:504
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "Logitech Cordless Desktop Pro (alternativ tilvalg 2)"
+msgid "Greek (simple)"
+msgstr "Græsk (simpel)"
 
 #: ../rules/base.xml.in.h:505
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
+msgid "Greek (extended)"
+msgstr "Græsk (udvidet)"
 
 #: ../rules/base.xml.in.h:506
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
+msgid "Greek (eliminate dead keys)"
+msgstr "Græsk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:507
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15 ekstra taster via G15daemon"
-
-#: ../rules/base.xml.in.h:508
-msgid "Logitech Generic Keyboard"
-msgstr "Logitech Generic Keyboard"
+msgid "Greek (polytonic)"
+msgstr "Græsk (polytonisk)"
 
+#. Keyboard indicator for Hungarian layouts
 #: ../rules/base.xml.in.h:509
-msgid "Logitech Internet 350 Keyboard"
-msgstr "Logitech Internet 350 Keyboard"
+msgid "hu"
+msgstr "hu"
 
 #: ../rules/base.xml.in.h:510
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
+msgid "Hungarian"
+msgstr "Ungarsk"
 
 #: ../rules/base.xml.in.h:511
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
+msgid "Hungarian (standard)"
+msgstr "Ungarsk (standard)"
 
 #: ../rules/base.xml.in.h:512
-msgid "Logitech Media Elite Keyboard"
-msgstr "Logitech Media Elite Keyboard"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "Ungarsk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:513
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgid "Hungarian (qwerty)"
+msgstr "Ungarsk (qwerty)"
 
 #: ../rules/base.xml.in.h:514
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "Ungarsk (101/qwertz/komma/døde taster)"
 
 #: ../rules/base.xml.in.h:515
-msgid "Logitech diNovo Edge Keyboard"
-msgstr "Logitech diNovo Edge Keyboard"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "Ungarsk (101/qwertz/komma/slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:516
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo Keyboard"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "Ungarsk (101/qwertz/punktum/døde taster)"
 
 #: ../rules/base.xml.in.h:517
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "Ungarsk (101/qwertz/punktum/slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:518
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "Ungarsk (101/qwerty/komma/døde taster)"
 
 #: ../rules/base.xml.in.h:519
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "Ungarsk (101/qwerty/komma/slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:520
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "Ungarsk (101/qwerty/punktum/døde taster)"
 
 #: ../rules/base.xml.in.h:521
-msgid "Lower Sorbian"
-msgstr "Nedersorbisk"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "Ungarsk (101/qwerty/punktum/slå døde taster fra)"
 
-# nedersorbisk, tror jeg
-# (el. nedre Lausitz)
 #: ../rules/base.xml.in.h:522
-msgid "Lower Sorbian (qwertz)"
-msgstr "Nedersorbisk (qwertz)"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "Ungarsk (102/qwertz/komma/døde taster)"
 
 #: ../rules/base.xml.in.h:523
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "Ungarsk (102/qwertz/komma/slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:524
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (Intl)"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "Ungarsk (102/qwertz/punktum/døde taster)"
 
 #: ../rules/base.xml.in.h:525
-msgid "Macedonian"
-msgstr "Makedonsk"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "Ungarsk (102/qwertz/punktum/slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:526
-msgid "Macedonian (eliminate dead keys)"
-msgstr "Makedonsk (slå døde taster fra)"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "Ungarsk (102/qwerty/komma/døde taster)"
 
 #: ../rules/base.xml.in.h:527
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "Ungarsk (102/qwerty/komma/slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:528
-msgid "Macintosh Old"
-msgstr "Macintosh gammel"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "Ungarsk (102/qwerty/punktum/døde taster)"
 
 #: ../rules/base.xml.in.h:529
-msgid "Make Caps Lock an additional Backspace"
-msgstr "Gør Caps Lock til en ekstra rettelsestast"
-
-#: ../rules/base.xml.in.h:530
-msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
-msgstr "Gør Caps Lock til en ekstra Control men behold Caps_Lock keysym"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "Ungarsk (102/qwerty/punktum/slå døde taster fra)"
 
+#. Keyboard indicator for Icelandic layouts
 #: ../rules/base.xml.in.h:531
-msgid "Make Caps Lock an additional ESC"
-msgstr "Gør Caps Lock til en ekstra Esc"
+msgid "is"
+msgstr "is"
 
 #: ../rules/base.xml.in.h:532
-msgid "Make Caps Lock an additional Hyper"
-msgstr "Gør Caps Lock til en ekstra Hyper"
+msgid "Icelandic"
+msgstr "Islandsk"
 
 #: ../rules/base.xml.in.h:533
-msgid "Make Caps Lock an additional Num Lock"
-msgstr "Gør Caps Lock til en ekstra NumLock"
+msgid "Icelandic (Sun dead keys)"
+msgstr "Islandsk (Sun døde taster)"
 
 #: ../rules/base.xml.in.h:534
-msgid "Make Caps Lock an additional Super"
-msgstr "Gør Caps Lock til en ekstra Super"
+msgid "Icelandic (eliminate dead keys)"
+msgstr "Islandsk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:535
-msgid "Make Zenkaku Hankaku an additional ESC"
-msgstr "Gør Zenkaku Hankaku til en ekstra Esc"
+msgid "Icelandic (Macintosh)"
+msgstr "Islandsk (Macintosh)"
 
 #: ../rules/base.xml.in.h:536
-msgid "Malayalam"
-msgstr "Malayalam"
-
-#: ../rules/base.xml.in.h:537
-msgid "Malayalam (Lalitha)"
-msgstr "Malayalamsk (Lalitha)"
+msgid "Icelandic (Dvorak)"
+msgstr "Islandsk (Dvorak)"
 
-#: ../rules/base.xml.in.h:538
-msgid "Malayalam (enhanced Inscript with Rupee Sign)"
-msgstr "Malayalamsk (udvidet inscript med Rupeetegn)"
+#. Keyboard indicator for Hebrew layouts
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
+msgid "he"
+msgstr "he"
 
-#: ../rules/base.xml.in.h:539
-msgid "Maltese"
-msgstr "Maltesisk"
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
+msgid "Hebrew"
+msgstr "Hebraisk"
 
 #: ../rules/base.xml.in.h:540
-msgid "Maltese (with US layout)"
-msgstr "Maltesisk (med US-layout)"
+msgid "Hebrew (lyx)"
+msgstr "Hebraisk (lyx)"
 
 #: ../rules/base.xml.in.h:541
-msgid "Maori"
-msgstr "Maori"
+msgid "Hebrew (phonetic)"
+msgstr "Hebraisk (fonetisk)"
 
 #: ../rules/base.xml.in.h:542
-msgid "Mari"
-msgstr "Mari"
-
-#: ../rules/base.xml.in.h:543
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hebraisk (bibelsk, Tiro)"
 
-#: ../rules/base.xml.in.h:544
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard"
+#. Keyboard indicator for Italian layouts
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
+msgid "it"
+msgstr "it"
 
-#: ../rules/base.xml.in.h:545
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
+msgid "Italian"
+msgstr "Italiensk"
 
 #: ../rules/base.xml.in.h:546
-msgid "Menu"
-msgstr "Menu"
+msgid "Italian (eliminate dead keys)"
+msgstr "Italiensk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:547
-msgid "Menu as Right Ctrl"
-msgstr "Menu som højre Ctrl"
+msgid "Italian (Macintosh)"
+msgstr "Italiensk (Macintosh)"
 
 #: ../rules/base.xml.in.h:548
-msgid "Meta is mapped to Left Win"
-msgstr "Meta ligger på venstre Win-tast"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "Italiensk (US-tastatur med italienske bogstaver)"
 
 #: ../rules/base.xml.in.h:549
-msgid "Meta is mapped to Win keys"
-msgstr "Meta ligger på Win-tasterne"
+msgid "Georgian (Italy)"
+msgstr "Georgisk (Italien)"
 
 #: ../rules/base.xml.in.h:550
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "Microsoft Comfort Curve Keyboard 2000"
-
-#: ../rules/base.xml.in.h:551
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard"
+msgid "Italian (IBM 142)"
+msgstr "Italiensk (IBM 142)"
 
-#: ../rules/base.xml.in.h:552
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, svensk"
+#. Keyboard indicator for Japanese layouts
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
+msgid "ja"
+msgstr "ja"
 
-#: ../rules/base.xml.in.h:553
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
+msgid "Japanese"
+msgstr "Japansk"
 
 #: ../rules/base.xml.in.h:554
-msgid "Microsoft Natural Keyboard Elite"
-msgstr "Microsoft Natural Keyboard Elite"
+msgid "Japanese (Kana)"
+msgstr "Japansk (Kana)"
 
 #: ../rules/base.xml.in.h:555
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgid "Japanese (Kana 86)"
+msgstr "Japansk (Kana 86)"
 
 #: ../rules/base.xml.in.h:556
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
+msgid "Japanese (OADG 109A)"
+msgstr "Japansk (OADG 109A)"
 
 #: ../rules/base.xml.in.h:557
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgid "Japanese (Macintosh)"
+msgstr "Japansk (Macintosh)"
 
 #: ../rules/base.xml.in.h:558
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-
-#: ../rules/base.xml.in.h:559
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgid "Japanese (Dvorak)"
+msgstr "Japansk (dvorak)"
 
+#. Keyboard indicator for Kikuyu layouts
 #: ../rules/base.xml.in.h:560
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Keyboard"
+msgid "ki"
+msgstr "ki"
 
 #: ../rules/base.xml.in.h:561
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgid "Kyrgyz"
+msgstr "Kirgisisk"
 
 #: ../rules/base.xml.in.h:562
-msgid "Miscellaneous compatibility options"
-msgstr "Diverse kompatibilitetsvalg"
-
-#: ../rules/base.xml.in.h:563
-msgid "Mongolian"
-msgstr "Mongolsk"
+msgid "Kyrgyz (phonetic)"
+msgstr "Kirgisisk (fonetisk)"
 
+#. Keyboard indicator for Khmer layouts
 #: ../rules/base.xml.in.h:564
-msgid "Montenegrin"
-msgstr "Montenegrinsk"
+msgid "km"
+msgstr "km"
 
-# guillemets er dem her: »«
 #: ../rules/base.xml.in.h:565
-msgid "Montenegrin (Cyrillic with guillemets)"
-msgstr "Montenegrinsk (kyrillisk med anførelsestegnene »«)"
-
-#: ../rules/base.xml.in.h:566
-msgid "Montenegrin (Cyrillic)"
-msgstr "Montenegrinsk (kyrillisk)"
+msgid "Khmer (Cambodia)"
+msgstr "Khmerisk (Cambodja)"
 
+#. Keyboard indicator for Kazakh layouts
 #: ../rules/base.xml.in.h:567
-msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
-msgstr "Montenegrinsk (kyrillisk, Z og ZHE ombyttet)"
+msgid "kk"
+msgstr "kk"
 
 #: ../rules/base.xml.in.h:568
-msgid "Montenegrin (Latin Unicode qwerty)"
-msgstr "Montenegrinsk (latin Unicode qwerty)"
+msgid "Kazakh"
+msgstr "Kasakhisk"
 
 #: ../rules/base.xml.in.h:569
-msgid "Montenegrin (Latin Unicode)"
-msgstr "Montenegrinsk (latin Unicode)"
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "Russisk (Kasakhstan, med kazakhisk)"
 
 #: ../rules/base.xml.in.h:570
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Montenegrinsk (latin qwerty)"
-
-# guillemets er dem her: »«
-#: ../rules/base.xml.in.h:571
-msgid "Montenegrin (Latin with guillemets)"
-msgstr "Montenegrinsk (latin med anførelsestegnene »«)"
+msgid "Kazakh (with Russian)"
+msgstr "Kasakhisk (med russisk)"
 
+#. Keyboard indicator for Lao layouts
 #: ../rules/base.xml.in.h:572
-msgid "NICOLA-F style Backspace"
-msgstr "NICOLA-F-stil rettelsestast"
+msgid "lo"
+msgstr "lo"
 
 #: ../rules/base.xml.in.h:573
-msgid "Nepali"
-msgstr "Nepalesisk"
+msgid "Lao"
+msgstr "Lao"
 
 #: ../rules/base.xml.in.h:574
-msgid "Non-breakable space character at fourth level"
-msgstr "Ubrydelig mellemrumskarakter på fjerde niveau"
-
-#: ../rules/base.xml.in.h:575
-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"
+msgid "Lao (STEA proposed standard layout)"
+msgstr "Lao (STEA-foreslået standardlayout)"
 
-#: ../rules/base.xml.in.h:576
-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)"
+#. Keyboard indicator for Spanish layouts
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
+msgid "es"
+msgstr "es"
 
 #: ../rules/base.xml.in.h:577
-msgid "Non-breakable space character at second level"
-msgstr "Ubrydelig mellemrumskarakter på andet niveau"
+msgid "Spanish (Latin American)"
+msgstr "Spansk (latinamerikansk)"
 
 #: ../rules/base.xml.in.h:578
-msgid "Non-breakable space character at third level"
-msgstr "Ubrydelig mellemrumskarakter på tredje niveau"
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "Spansk (latinamerikansk, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:579
-msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr "Ubrydelig mellemrumskarakter på tredje niveau, intet på fjerde niveau"
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "Spansk (latinamerikansk, inkluder død tilde)"
 
 #: ../rules/base.xml.in.h:580
-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:581
-msgid "Northern Saami (Finland)"
-msgstr "Nordligt samisk (Finland)"
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Spansk (latinamerikansk, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:582
-msgid "Northern Saami (Norway)"
-msgstr "Nordligt samisk (Norge)"
+#. Keyboard indicator for Lithuanian layouts
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
+msgid "lt"
+msgstr "lt"
 
-#: ../rules/base.xml.in.h:583
-msgid "Northern Saami (Norway, eliminate dead keys)"
-msgstr "Nordligt samisk (Norge, slå døde taster fra)"
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
+msgid "Lithuanian"
+msgstr "Litauisk"
 
 #: ../rules/base.xml.in.h:584
-msgid "Northern Saami (Sweden)"
-msgstr "Nordligt samisk (Sverige)"
+msgid "Lithuanian (standard)"
+msgstr "Litauisk (standard)"
 
 #: ../rules/base.xml.in.h:585
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "Litauisk (US-tastatur med litauiske bogstaver)"
 
 #: ../rules/base.xml.in.h:586
-msgid "Norwegian"
-msgstr "Norsk"
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "Litauisk (IBM LST 1205-92)"
 
 #: ../rules/base.xml.in.h:587
-msgid "Norwegian (Dvorak)"
-msgstr "Norsk (dvorak)"
+msgid "Lithuanian (LEKP)"
+msgstr "Litauisk (LEKP)"
 
 #: ../rules/base.xml.in.h:588
-msgid "Norwegian (Macintosh)"
-msgstr "Norsk (Macintosh)"
-
-#: ../rules/base.xml.in.h:589
-msgid "Norwegian (Macintosh, eliminate dead keys)"
-msgstr "Norsk (Macintosh, slå døde taster fra)"
+msgid "Lithuanian (LEKPa)"
+msgstr "Litauisk (LEKPa)"
 
-#: ../rules/base.xml.in.h:590
-msgid "Norwegian (eliminate dead keys)"
-msgstr "Norsk (slå døde taster fra)"
+#. Keyboard indicator for Latvian layouts
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
+msgid "lv"
+msgstr "lv"
 
-#: ../rules/base.xml.in.h:591
-msgid "Num Lock"
-msgstr "Num Lock"
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
+msgid "Latvian"
+msgstr "Lettisk"
 
 #: ../rules/base.xml.in.h:592
-msgid "Numeric keypad delete key behaviour"
-msgstr "Numerisk tastatur slettetast opførsel"
+msgid "Latvian (apostrophe variant)"
+msgstr "Lettisk (apostrofvariant)"
 
 #: ../rules/base.xml.in.h:593
-msgid "Numeric keypad keys always enter digits (as in Mac OS)"
-msgstr "Numerisk tastatur indtaster altid tal (som på Mac OS)"
+msgid "Latvian (tilde variant)"
+msgstr "Lettisk (tildevariant)"
 
 #: ../rules/base.xml.in.h:594
-msgid "Numeric keypad layout selection"
-msgstr "Numerisk tastatur layout udvælgelse"
+msgid "Latvian (F variant)"
+msgstr "Lettisk (F-variant)"
 
 #: ../rules/base.xml.in.h:595
-msgid "OLPC"
-msgstr "OLPC"
+msgid "Latvian (modern)"
+msgstr "Lettisk (moderne)"
 
 #: ../rules/base.xml.in.h:596
-msgid "Occitan"
-msgstr "Occitansk"
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Lettisk (ergonomisk, ŪGJRMV)"
 
 #: ../rules/base.xml.in.h:597
-msgid "Ogham"
-msgstr "Ogham"
-
-#: ../rules/base.xml.in.h:598
-msgid "Ogham (IS434)"
-msgstr "Ogham (IS434)"
+msgid "Latvian (adapted)"
+msgstr "Lettisk (adapteret)"
 
+#. Keyboard indicator for Maori layouts
 #: ../rules/base.xml.in.h:599
-msgid "Oriya"
-msgstr "Oriya"
+msgid "mi"
+msgstr "mi"
 
 #: ../rules/base.xml.in.h:600
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM/Internet keyboard"
-
-#: ../rules/base.xml.in.h:601
-msgid "Ossetian (Georgia)"
-msgstr "Occitansk (Georgien)"
+msgid "Maori"
+msgstr "Maori"
 
-#: ../rules/base.xml.in.h:602
-msgid "Ossetian (WinKeys)"
-msgstr "Occitansk (Wintaster)"
+#. Keyboard indicator for Serbian layouts
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
+msgid "sr"
+msgstr "sr"
 
 #: ../rules/base.xml.in.h:603
-msgid "Ossetian (legacy)"
-msgstr "Occitansk (forældet)"
+msgid "Montenegrin"
+msgstr "Montenegrinsk"
 
 #: ../rules/base.xml.in.h:604
-msgid "PC-98xx Series"
-msgstr "PC-98xx-serie"
+msgid "Montenegrin (Cyrillic)"
+msgstr "Montenegrinsk (kyrillisk)"
 
-# Pannonian Rusyn or simply Rusyn (Ruthenian) is a Slavic language or dialect spoken 
-# in north-western Serbia and eastern Croatia 
 #: ../rules/base.xml.in.h:605
-msgid "Pannonian Rusyn (homophonic)"
-msgstr "Pannonisk rusyn (homofonisk)"
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgstr "Montenegrinsk (kyrillisk, Z og ZHE ombyttet)"
 
 #: ../rules/base.xml.in.h:606
-msgid "Pashto"
-msgstr "Pashto"
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Montenegrinsk (latin Unicode)"
 
 #: ../rules/base.xml.in.h:607
-msgid "Pashto (Afghanistan, OLPC)"
-msgstr "Pashto (Afghanistan, OLPC)"
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegrinsk (latin qwerty)"
 
 #: ../rules/base.xml.in.h:608
-msgid "Pause"
-msgstr "Pause"
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Montenegrinsk (latin Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:29
-msgid "Persian"
-msgstr "Persisk"
+# guillemets er dem her: »«
+#: ../rules/base.xml.in.h:609
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "Montenegrinsk (kyrillisk med anførelsestegnene »«)"
 
+# guillemets er dem her: »«
 #: ../rules/base.xml.in.h:610
-msgid "Persian (Afghanistan, Dari OLPC)"
-msgstr "Persisk (Afghanistan, Dari OLPC)"
-
-#: ../rules/base.xml.in.h:611
-msgid "Persian (with Persian Keypad)"
-msgstr "Persisk (med persisk numerisk tastatur)"
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "Montenegrinsk (latin med anførelsestegnene »«)"
 
-#: ../rules/base.xml.in.h:612 ../rules/base.extras.xml.in.h:30
-msgid "Polish"
-msgstr "Polsk"
+#. Keyboard indicator for Macedonian layouts
+#: ../rules/base.xml.in.h:612
+msgid "mk"
+msgstr "mk"
 
 #: ../rules/base.xml.in.h:613
-msgid "Polish (Dvorak)"
-msgstr "Polsk (dvorak)"
+msgid "Macedonian"
+msgstr "Makedonsk"
 
 #: ../rules/base.xml.in.h:614
-msgid "Polish (Dvorak, Polish quotes on key 1)"
-msgstr "Polsk (dvorak, polske anførelsestegn på tast 1)"
-
-#: ../rules/base.xml.in.h:615
-msgid "Polish (Dvorak, Polish quotes on quotemark key)"
-msgstr "Polsk (dvorak, polske anførelsestegn på anførelsestast)"
+msgid "Macedonian (eliminate dead keys)"
+msgstr "Makedonsk (slå døde taster fra)"
 
+#. Keyboard indicator for Maltese layouts
 #: ../rules/base.xml.in.h:616
-msgid "Polish (programmer Dvorak)"
-msgstr "Polsk (programmørdvorak)"
+msgid "mt"
+msgstr "mt"
 
 #: ../rules/base.xml.in.h:617
-msgid "Polish (qwertz)"
-msgstr "Polsk (qwertz)"
+msgid "Maltese"
+msgstr "Maltesisk"
 
 #: ../rules/base.xml.in.h:618
-msgid "Portuguese"
-msgstr "Portugisisk"
-
-#: ../rules/base.xml.in.h:619
-msgid "Portuguese (Brazil)"
-msgstr "Portugisisk (brasiliansk)"
+msgid "Maltese (with US layout)"
+msgstr "Maltesisk (med US-layout)"
 
+#. Keyboard indicator for Mongolian layouts
 #: ../rules/base.xml.in.h:620
-msgid "Portuguese (Brazil, Dvorak)"
-msgstr "Portugisisk (brasiliansk, dvorak)"
+msgid "mn"
+msgstr "mn"
 
 #: ../rules/base.xml.in.h:621
-msgid "Portuguese (Brazil, eliminate dead keys)"
-msgstr "Portugisisk (brasiliansk, slå døde taster fra)"
-
-#: ../rules/base.xml.in.h:622
-msgid "Portuguese (Brazil, nativo for Esperanto)"
-msgstr "Portugisisk (brasiliansk, nativo for esperanto)"
+msgid "Mongolian"
+msgstr "Mongolsk"
 
-#: ../rules/base.xml.in.h:623
-msgid "Portuguese (Brazil, nativo for USA keyboards)"
-msgstr "Portugisisk (brasiliansk, nativo for USA-tastaturer)"
+#. Keyboard indicator for Norwegian layouts
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
+msgid "no"
+msgstr "no"
 
-#: ../rules/base.xml.in.h:624
-msgid "Portuguese (Brazil, nativo)"
-msgstr "Portugisisk (brasiliansk, nativo)"
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
+msgid "Norwegian"
+msgstr "Norsk"
 
 #: ../rules/base.xml.in.h:625
-msgid "Portuguese (Macintosh)"
-msgstr "Portugisisk (Macintosh)"
+msgid "Norwegian (eliminate dead keys)"
+msgstr "Norsk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:626
-msgid "Portuguese (Macintosh, Sun dead keys)"
-msgstr "Portugisisk (Macintosh, Sun døde taster)"
+msgid "Norwegian (Dvorak)"
+msgstr "Norsk (dvorak)"
 
 #: ../rules/base.xml.in.h:627
-msgid "Portuguese (Macintosh, eliminate dead keys)"
-msgstr "Portugisisk (Macintosh, slå døde taster fra)"
+msgid "Northern Saami (Norway)"
+msgstr "Nordligt samisk (Norge)"
 
 #: ../rules/base.xml.in.h:628
-msgid "Portuguese (Nativo for USA keyboards)"
-msgstr "Portugisisk (nativo for USA-tastaturer)"
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Nordligt samisk (Norge, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:629
-msgid "Portuguese (Nativo)"
-msgstr "Portugisisk (nativo)"
+msgid "Norwegian (Macintosh)"
+msgstr "Norsk (Macintosh)"
 
 #: ../rules/base.xml.in.h:630
-msgid "Portuguese (Sun dead keys)"
-msgstr "Portugisisk (Sun døde taster)"
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Norsk (Macintosh, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:631
-msgid "Portuguese (eliminate dead keys)"
-msgstr "Portugisisk (slå døde taster fra)"
-
-#: ../rules/base.xml.in.h:632
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+msgid "Norwegian (Colemak)"
+msgstr "Norsk (Colemak)"
 
-#: ../rules/base.xml.in.h:633
-msgid "PrtSc"
-msgstr "Prtsc"
+#. Keyboard indicator for Polish layouts
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
+msgid "pl"
+msgstr "pl"
 
-#: ../rules/base.xml.in.h:634
-msgid "Punjabi (Gurmukhi Jhelum)"
-msgstr "Punjabi (Gurmukhi Jhelum)"
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
+msgid "Polish"
+msgstr "Polsk"
 
 #: ../rules/base.xml.in.h:635
-msgid "Punjabi (Gurmukhi)"
-msgstr "Punjabi (Gurmukhi)"
+msgid "Polish (legacy)"
+msgstr "Polsk (forældet)"
 
 #: ../rules/base.xml.in.h:636
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Polish (qwertz)"
+msgstr "Polsk (qwertz)"
 
 #: ../rules/base.xml.in.h:637
-msgid "Right Alt"
-msgstr "Højre Alt"
+msgid "Polish (Dvorak)"
+msgstr "Polsk (dvorak)"
 
 #: ../rules/base.xml.in.h:638
-msgid "Right Alt (while pressed)"
-msgstr "Højre Alt (mens trykket ned)"
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "Polsk (dvorak, polske anførelsestegn på anførelsestast)"
 
 #: ../rules/base.xml.in.h:639
-msgid "Right Alt as Right Ctrl"
-msgstr "Højre Alt-tast virker som højre Ctrl"
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "Polsk (dvorak, polske anførelsestegn på tast 1)"
 
 #: ../rules/base.xml.in.h:640
-msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Højre Alt vælge femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
+msgid "Kashubian"
+msgstr "Kashubian"
 
 #: ../rules/base.xml.in.h:641
-msgid "Right Alt key never chooses 3rd level"
-msgstr "Højre Alt-tast vælger aldrig tredje niveau"
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "Russisk (Polen, fonetisk dvorak)"
 
 #: ../rules/base.xml.in.h:642
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Højre Alt-tast, Skift+højre Alt-tast er fler_tast"
+msgid "Polish (programmer Dvorak)"
+msgstr "Polsk (programmørdvorak)"
 
-#: ../rules/base.xml.in.h:643
-msgid "Right Ctrl"
-msgstr "Højre Ctrl"
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
+msgid "Portuguese"
+msgstr "Portugisisk"
 
 #: ../rules/base.xml.in.h:644
-msgid "Right Ctrl (while pressed)"
-msgstr "Højre Ctrl-tast (mens trykket ned)"
+msgid "Portuguese (eliminate dead keys)"
+msgstr "Portugisisk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:645
-msgid "Right Ctrl as Right Alt"
-msgstr "Højre Ctrl-tast virker som højre Alt"
+msgid "Portuguese (Sun dead keys)"
+msgstr "Portugisisk (Sun døde taster)"
 
 #: ../rules/base.xml.in.h:646
-msgid "Right Ctrl+Right Shift"
-msgstr "Højre Ctrl+Højre Skift"
+msgid "Portuguese (Macintosh)"
+msgstr "Portugisisk (Macintosh)"
 
 #: ../rules/base.xml.in.h:647
-msgid "Right Shift"
-msgstr "Højre Skift"
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portugisisk (Macintosh, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:648
-msgid "Right Win"
-msgstr "Højre Win"
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portugisisk (Macintosh, Sun døde taster)"
 
 #: ../rules/base.xml.in.h:649
-msgid "Right Win (while pressed)"
-msgstr "Højre Win-tast (mens trykket ned)"
+msgid "Portuguese (Nativo)"
+msgstr "Portugisisk (nativo)"
 
 #: ../rules/base.xml.in.h:650
-msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Højre Win-tast vælger femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
-
-#: ../rules/base.xml.in.h:651 ../rules/base.extras.xml.in.h:32
-msgid "Romanian"
-msgstr "Rumænsk"
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr "Portugisisk (nativo for USA-tastaturer)"
 
-#: ../rules/base.xml.in.h:652
-msgid "Romanian (Germany)"
-msgstr "Rumænsk (Tyskland)"
+#: ../rules/base.xml.in.h:651
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Esperanto (Portugal, Nativo)"
 
-#: ../rules/base.xml.in.h:653
-msgid "Romanian (Germany, eliminate dead keys)"
-msgstr "Rumænsk (Tyskland, slå døde taster fra)"
+#. Keyboard indicator for Romanian layouts
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
+msgid "ro"
+msgstr "ro"
 
-#: ../rules/base.xml.in.h:654
-msgid "Romanian (WinKeys)"
-msgstr "Rumænsk (Wintaster)"
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
+msgid "Romanian"
+msgstr "Rumænsk"
 
 # http://da.wikipedia.org/wiki/%C3%87
 #: ../rules/base.xml.in.h:655
@@ -2680,1281 +2463,1702 @@ msgid "Romanian (cedilla)"
 msgstr "Rumænsk (cedille)"
 
 #: ../rules/base.xml.in.h:656
-msgid "Romanian (standard cedilla)"
-msgstr "Rumænsk (standardcedille)"
-
-#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard)"
 msgstr "Rumænsk (standard)"
 
+#: ../rules/base.xml.in.h:657
+msgid "Romanian (standard cedilla)"
+msgstr "Rumænsk (standardcedille)"
+
 #: ../rules/base.xml.in.h:658
-msgid "Rupee on 4"
-msgstr "Rupee på 4"
+msgid "Romanian (WinKeys)"
+msgstr "Rumænsk (Wintaster)"
 
-#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "Russisk"
 
 #: ../rules/base.xml.in.h:660
-msgid "Russian (DOS)"
-msgstr "Russisk (DOS)"
+msgid "Russian (phonetic)"
+msgstr "Russisk (fonetisk)"
 
 #: ../rules/base.xml.in.h:661
-msgid "Russian (Georgia)"
-msgstr "Russisk (georgisk)"
+msgid "Russian (phonetic WinKeys)"
+msgstr "Russisk (fonetisk Wintaster)"
 
 #: ../rules/base.xml.in.h:662
-msgid "Russian (Germany, phonetic)"
-msgstr "Russisk (Tyskland, fonetisk)"
+msgid "Russian (typewriter)"
+msgstr "Russisk (skrivemaskine)"
 
 #: ../rules/base.xml.in.h:663
-msgid "Russian (Kazakhstan, with Kazakh)"
-msgstr "Russisk (Kasakhstan, med kazakhisk)"
+msgid "Russian (legacy)"
+msgstr "Russisk (forældet)"
 
 #: ../rules/base.xml.in.h:664
-msgid "Russian (Poland, phonetic Dvorak)"
-msgstr "Russisk (Polen, fonetisk dvorak)"
+msgid "Russian (typewriter, legacy)"
+msgstr "Russisk (skrivemaskine, forældet)"
 
 #: ../rules/base.xml.in.h:665
-msgid "Russian (Sweden, phonetic)"
-msgstr "Russisk (Sverige, fonetisk)"
+msgid "Tatar"
+msgstr "Tatar"
 
 #: ../rules/base.xml.in.h:666
-msgid "Russian (Sweden, phonetic, eliminate dead keys)"
-msgstr "Russisk (Sverige, fonetisk, slå døde taster fra)"
+msgid "Ossetian (legacy)"
+msgstr "Occitansk (forældet)"
 
 #: ../rules/base.xml.in.h:667
-msgid "Russian (US, phonetic)"
-msgstr "Russisk (US, fonetisk)"
+msgid "Ossetian (WinKeys)"
+msgstr "Occitansk (Wintaster)"
 
 #: ../rules/base.xml.in.h:668
-msgid "Russian (Ukraine, standard RSTU)"
-msgstr "Russisk (Ukraine, standard RSTU)"
+msgid "Chuvash"
+msgstr "Chuvash"
 
 #: ../rules/base.xml.in.h:669
-msgid "Russian (legacy)"
-msgstr "Russisk (forældet)"
+msgid "Chuvash (Latin)"
+msgstr "Chuvash (latin)"
 
 #: ../rules/base.xml.in.h:670
-msgid "Russian (phonetic WinKeys)"
-msgstr "Russisk (fonetisk Wintaster)"
+msgid "Udmurt"
+msgstr "Udmurt"
 
 #: ../rules/base.xml.in.h:671
-msgid "Russian (phonetic)"
-msgstr "Russisk (fonetisk)"
+msgid "Komi"
+msgstr "Komi"
 
 #: ../rules/base.xml.in.h:672
-msgid "Russian (typewriter)"
-msgstr "Russisk (skrivemaskine)"
+msgid "Yakut"
+msgstr "Yakut"
 
 #: ../rules/base.xml.in.h:673
-msgid "Russian (typewriter, legacy)"
-msgstr "Russisk (skrivemaskine, forældet)"
+msgid "Kalmyk"
+msgstr "Kalmyk"
 
 #: ../rules/base.xml.in.h:674
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
+msgid "Russian (DOS)"
+msgstr "Russisk (DOS)"
 
 #: ../rules/base.xml.in.h:675
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Serbian (Russia)"
+msgstr "Serbisk (Rusland)"
 
 #: ../rules/base.xml.in.h:676
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "Bashkirian"
+msgstr "Bashkirisk"
 
 #: ../rules/base.xml.in.h:677
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "Mari"
+msgstr "Mari"
 
-#: ../rules/base.xml.in.h:678
-msgid "SK-7100"
-msgstr "SK-7100"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "Serbisk"
 
 #: ../rules/base.xml.in.h:679
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+msgid "Serbian (Cyrillic, Z and ZHE swapped)"
+msgstr "Serbisk (kyrillisk, Z og ZHE ombyttet)"
 
 #: ../rules/base.xml.in.h:680
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
+msgid "Serbian (Latin)"
+msgstr "Serbisk (latin)"
 
 #: ../rules/base.xml.in.h:681
-msgid "Saisiyat (Taiwan)"
-msgstr "Saisiyat (Taiwan)"
+msgid "Serbian (Latin Unicode)"
+msgstr "Serbisk (latin unicode)"
 
 #: ../rules/base.xml.in.h:682
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+msgid "Serbian (Latin qwerty)"
+msgstr "Serbisk (latin qwerty)"
 
 #: ../rules/base.xml.in.h:683
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "Serbisk (latin unicode qwerty)"
 
+# guillemets er dem her: »«
 #: ../rules/base.xml.in.h:684
-msgid "Sanwa Supply SKB-KG3"
-msgstr "Sanwa Supply SKB-KG3"
+msgid "Serbian (Cyrillic with guillemets)"
+msgstr "Serbisk (kyrillisk med anførelsestegnene »«)"
 
+# guillemets er dem her: »«
 #: ../rules/base.xml.in.h:685
-msgid "Scroll Lock"
-msgstr "Scroll Lock"
+msgid "Serbian (Latin with guillemets)"
+msgstr "Serbisk (latin med anførelsestegnene »«)"
 
+# Pannonian Rusyn or simply Rusyn (Ruthenian) is a Slavic language or dialect spoken 
+# in north-western Serbia and eastern Croatia 
 #: ../rules/base.xml.in.h:686
-msgid "Semi-colon on third level"
-msgstr "Semikolon på tredje niveau"
-
-# guillemets er dem her: »«
-#: ../rules/base.xml.in.h:687
-msgid "Serbian (Cyrillic with guillemets)"
-msgstr "Serbisk (kyrillisk med anførelsestegnene »«)"
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Pannonisk rusyn (homofonisk)"
 
+#. Keyboard indicator for Slovenian layouts
 #: ../rules/base.xml.in.h:688
-msgid "Serbian (Cyrillic)"
-msgstr "Serbisk (kyrillisk)"
+msgid "sl"
+msgstr "sl"
 
 #: ../rules/base.xml.in.h:689
-msgid "Serbian (Cyrillic, Z and ZHE swapped)"
-msgstr "Serbisk (kyrillisk, Z og ZHE ombyttet)"
+msgid "Slovenian"
+msgstr "Slovensk"
 
 #: ../rules/base.xml.in.h:690
-msgid "Serbian (Latin Unicode qwerty)"
-msgstr "Serbisk (latin unicode qwerty)"
+msgid "Slovenian (use guillemets for quotes)"
+msgstr "Slovensk (anvend »« som anførelsestegn)"
 
 #: ../rules/base.xml.in.h:691
-msgid "Serbian (Latin Unicode)"
-msgstr "Serbisk (latin unicode)"
-
-#: ../rules/base.xml.in.h:692
-msgid "Serbian (Latin qwerty)"
-msgstr "Serbisk (latin qwerty)"
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "Slovensk (US-tastatur med slovenske bogstaver)"
 
-# guillemets er dem her: »«
-#: ../rules/base.xml.in.h:693
-msgid "Serbian (Latin with guillemets)"
-msgstr "Serbisk (latin med anførelsestegnene »«)"
+#. Keyboard indicator for Slovak layouts
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
+msgid "sk"
+msgstr "sk"
 
-#: ../rules/base.xml.in.h:694
-msgid "Serbian (Latin)"
-msgstr "Serbisk (latin)"
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
+msgid "Slovak"
+msgstr "Slovakisk"
 
 #: ../rules/base.xml.in.h:695
-msgid "Serbian (Russia)"
-msgstr "Serbisk (Rusland)"
+msgid "Slovak (extended Backslash)"
+msgstr "Slovakisk (udvidet omvendt skråstreg)"
 
 #: ../rules/base.xml.in.h:696
-msgid "Serbo-Croatian (US)"
-msgstr "Serbisk-kroatisk (US)"
+msgid "Slovak (qwerty)"
+msgstr "Slovakisk (qwerty)"
 
 #: ../rules/base.xml.in.h:697
-msgid "Shift cancels Caps Lock"
-msgstr "Skift afbryder Caps Lock"
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "Slovakisk (qwerty, udvidet omvendt skråstreg)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
-msgstr "Skift afbryder ikke Num Lock, vælger tredje niveau i steden for"
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
+msgid "Spanish"
+msgstr "Spansk"
 
 #: ../rules/base.xml.in.h:699
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Skift med numeriske taster virker som i MS Windows"
+msgid "Spanish (eliminate dead keys)"
+msgstr "Spansk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:700
-msgid "Shift+Caps Lock"
-msgstr "Skift+Caps Lock"
+msgid "Spanish (include dead tilde)"
+msgstr "Spansk (inkluder død tilde)"
 
 #: ../rules/base.xml.in.h:701
-msgid "Sindhi"
-msgstr "Sindhi"
+msgid "Spanish (Sun dead keys)"
+msgstr "Spansk (Sun døde taster)"
 
 #: ../rules/base.xml.in.h:702
-msgid "Sinhala (phonetic)"
-msgstr "Singalesisk (fonetisk)"
+msgid "Spanish (Dvorak)"
+msgstr "Spansk (dvorak)"
 
+# 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:703
-msgid "Slovak"
-msgstr "Slovakisk"
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturisk (Spanien, med bundpunktum H og bundpunktum L)"
 
 #: ../rules/base.xml.in.h:704
-msgid "Slovak (extended Backslash)"
-msgstr "Slovakisk (udvidet omvendt skråstreg)"
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Catalansk (Spanien, med midterpunktum L)"
 
 #: ../rules/base.xml.in.h:705
-msgid "Slovak (qwerty)"
-msgstr "Slovakisk (qwerty)"
-
-#: ../rules/base.xml.in.h:706
-msgid "Slovak (qwerty, extended Backslash)"
-msgstr "Slovakisk (qwerty, udvidet omvendt skråstreg)"
+msgid "Spanish (Macintosh)"
+msgstr "Spansk (Macintosh)"
 
-#: ../rules/base.xml.in.h:707
-msgid "Slovenian"
-msgstr "Slovensk"
+#. Keyboard indicator for Swedish layouts
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
+msgid "sv"
+msgstr "sv"
 
-#: ../rules/base.xml.in.h:708
-msgid "Slovenian (US keyboard with Slovenian letters)"
-msgstr "Slovensk (US-tastatur med slovenske bogstaver)"
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
+msgid "Swedish"
+msgstr "Svensk"
 
 #: ../rules/base.xml.in.h:709
-msgid "Slovenian (use guillemets for quotes)"
-msgstr "Slovensk (anvend »« som anførelsestegn)"
+msgid "Swedish (eliminate dead keys)"
+msgstr "Svensk (slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:710
-msgid "Spanish"
-msgstr "Spansk"
+msgid "Swedish (Dvorak)"
+msgstr "Svensk (dvorak)"
 
 #: ../rules/base.xml.in.h:711
-msgid "Spanish (Dvorak)"
-msgstr "Spansk (dvorak)"
+msgid "Russian (Sweden, phonetic)"
+msgstr "Russisk (Sverige, fonetisk)"
 
 #: ../rules/base.xml.in.h:712
-msgid "Spanish (Latin American)"
-msgstr "Spansk (latinamerikansk)"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "Russisk (Sverige, fonetisk, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:713
-msgid "Spanish (Latin American, Sun dead keys)"
-msgstr "Spansk (latinamerikansk, Sun døde taster)"
+msgid "Northern Saami (Sweden)"
+msgstr "Nordligt samisk (Sverige)"
 
 #: ../rules/base.xml.in.h:714
-msgid "Spanish (Latin American, eliminate dead keys)"
-msgstr "Spansk (latinamerikansk, slå døde taster fra)"
+msgid "Swedish (Macintosh)"
+msgstr "Svensk (Macintosh)"
 
 #: ../rules/base.xml.in.h:715
-msgid "Spanish (Latin American, include dead tilde)"
-msgstr "Spansk (latinamerikansk, inkluder død tilde)"
+msgid "Swedish (Svdvorak)"
+msgstr "Svensk (svdvorak)"
 
 #: ../rules/base.xml.in.h:716
-msgid "Spanish (Macintosh)"
-msgstr "Spansk (Macintosh)"
+msgid "Swedish Sign Language"
+msgstr "Svensk tegnsprog"
 
 #: ../rules/base.xml.in.h:717
-msgid "Spanish (Sun dead keys)"
-msgstr "Spansk (Sun døde taster)"
+msgid "German (Switzerland)"
+msgstr "Tysk (Schweiz)"
 
 #: ../rules/base.xml.in.h:718
-msgid "Spanish (eliminate dead keys)"
-msgstr "Spansk (slå døde taster fra)"
+msgid "German (Switzerland, legacy)"
+msgstr "Tysk (Schweiz, forældet)"
 
 #: ../rules/base.xml.in.h:719
-msgid "Spanish (include dead tilde)"
-msgstr "Spansk (inkluder død tilde)"
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "Tysk (Schweiz, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:720
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "Specialtaster (Ctrl+Alt+&lt;key&gt;) håndteret i en server"
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "Tysk (Schweiz, Sun døde taster)"
 
 #: ../rules/base.xml.in.h:721
-msgid "Sun Type 5/6"
-msgstr "Sun type 5/6"
+msgid "French (Switzerland)"
+msgstr "Fransk (Schweiz)"
 
 #: ../rules/base.xml.in.h:722
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "Fransk (Schweiz, slå døde taster fra)"
 
 #: ../rules/base.xml.in.h:723
-msgid "Swahili (Kenya)"
-msgstr "Swahili (Kenya)"
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "Fransk (Schweiz, Sun døde taster)"
 
 #: ../rules/base.xml.in.h:724
-msgid "Swahili (Tanzania)"
-msgstr "Swahili (Tanzania)"
+msgid "French (Switzerland, Macintosh)"
+msgstr "Fransk (Schweiz, Macintosh)"
 
 #: ../rules/base.xml.in.h:725
-msgid "Swap Ctrl and Caps Lock"
-msgstr "Ombyt Ctrl og Caps Lock"
+msgid "German (Switzerland, Macintosh)"
+msgstr "Tysk (Schweiz, Macintosh)"
 
 #: ../rules/base.xml.in.h:726
-msgid "Swap ESC and Caps Lock"
-msgstr "Ombyt ESC og Caps Lock"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swedish"
-msgstr "Svensk"
+msgid "Arabic (Syria)"
+msgstr "Arabisk (Syrien)"
 
+#. Keyboard indicator for Syriac layouts
 #: ../rules/base.xml.in.h:728
-msgid "Swedish (Dvorak)"
-msgstr "Svensk (dvorak)"
+msgid "syc"
+msgstr "syc"
 
 #: ../rules/base.xml.in.h:729
-msgid "Swedish (Macintosh)"
-msgstr "Svensk (Macintosh)"
+msgid "Syriac"
+msgstr "Syrisk"
 
 #: ../rules/base.xml.in.h:730
-msgid "Swedish (Svdvorak)"
-msgstr "Svensk (svdvorak)"
+msgid "Syriac (phonetic)"
+msgstr "Syrisk (fonetisk)"
 
 #: ../rules/base.xml.in.h:731
-msgid "Swedish (eliminate dead keys)"
-msgstr "Svensk (slå døde taster fra)"
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "Kurdisk (Syrien, latin Q)"
 
 #: ../rules/base.xml.in.h:732
-msgid "Swedish Sign Language"
-msgstr "Svensk tegnsprog"
+msgid "Kurdish (Syria, F)"
+msgstr "Kurdisk (Syrien, F)"
 
 #: ../rules/base.xml.in.h:733
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet-pc)"
-
-#: ../rules/base.xml.in.h:734
-msgid "Syriac"
-msgstr "Syrisk"
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "Kurdisk (Syrien, latin Alt-Q)"
 
+#. Keyboard indicator for Tajik layouts
 #: ../rules/base.xml.in.h:735
-msgid "Syriac (phonetic)"
-msgstr "Syrisk (fonetisk)"
+msgid "tg"
+msgstr "tg"
 
 #: ../rules/base.xml.in.h:736
-msgid "Taiwanese"
-msgstr "Taiwanesisk"
-
-#: ../rules/base.xml.in.h:737
-msgid "Taiwanese (indigenous)"
-msgstr "Taiwanesisk (indfødte)"
-
-#: ../rules/base.xml.in.h:738
 msgid "Tajik"
 msgstr "Tadsjikisk"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "Tadsjikisk (forældet)"
 
+#. Keyboard indicator for Sinhala layouts
+#: ../rules/base.xml.in.h:739
+msgid "si"
+msgstr "si"
+
 #: ../rules/base.xml.in.h:740
-msgid "Tamil"
-msgstr "Tamilsk"
+msgid "Sinhala (phonetic)"
+msgstr "Singalesisk (fonetisk)"
 
 #: ../rules/base.xml.in.h:741
-msgid "Tamil (Sri Lanka, TAB Typewriter)"
-msgstr "Tamilsk (Sri Lanka, TAB-skrivemaskine)"
-
-#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamilsk (Sri Lanka, unicode)"
 
-#: ../rules/base.xml.in.h:743
-msgid "Tamil (TAB typewriter)"
-msgstr "Tamilsk (TAB-skrivemaskine)"
+#: ../rules/base.xml.in.h:742
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "Tamilsk (Sri Lanka, TAB-skrivemaskine)"
 
+#. Keyboard indicator for Thai layouts
 #: ../rules/base.xml.in.h:744
-msgid "Tamil (TSCII typewriter)"
-msgstr "Tamilsk (TSCII-skrivemaskine)"
+msgid "th"
+msgstr "th"
 
 #: ../rules/base.xml.in.h:745
-msgid "Tamil (Unicode)"
-msgstr "Tamilsk (unicode)"
+msgid "Thai"
+msgstr "Thai"
 
 #: ../rules/base.xml.in.h:746
-msgid "Tamil (keyboard with numerals)"
-msgstr "Tamilsk (tastatur med numre)"
+msgid "Thai (TIS-820.2538)"
+msgstr "Thai (TIS-820.2538)"
 
 #: ../rules/base.xml.in.h:747
-msgid "Targa Visionary 811"
-msgstr "Targa Visionary 811"
-
-#: ../rules/base.xml.in.h:748
-msgid "Tatar"
-msgstr "Tatar"
+msgid "Thai (Pattachote)"
+msgstr "Thai (pattachote)"
 
-#: ../rules/base.xml.in.h:749
-msgid "Telugu"
-msgstr "Telugu"
+#. Keyboard indicator for Turkish layouts
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
+msgid "tr"
+msgstr "tr"
 
-#: ../rules/base.xml.in.h:750
-msgid "Thai"
-msgstr "Thai"
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
+msgid "Turkish"
+msgstr "Tyrkisk"
 
 #: ../rules/base.xml.in.h:751
-msgid "Thai (Pattachote)"
-msgstr "Thai (pattachote)"
+msgid "Turkish (F)"
+msgstr "Tyrkisk (F)"
 
 #: ../rules/base.xml.in.h:752
-msgid "Thai (TIS-820.2538)"
-msgstr "Thai (TIS-820.2538)"
+msgid "Turkish (Alt-Q)"
+msgstr "Tyrkisk (Alt-Q)"
 
 #: ../rules/base.xml.in.h:753
-msgid "Tibetan"
-msgstr "Tibetansk"
+msgid "Turkish (Sun dead keys)"
+msgstr "Tyrkisk (Sun døde taster)"
 
 #: ../rules/base.xml.in.h:754
-msgid "Tibetan (with ASCII numerals)"
-msgstr "Tibetansk (med ASCII-numre)"
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "Kurdisk (Tyrkiet, latin Q)"
 
 #: ../rules/base.xml.in.h:755
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "Til den tilsvarende tast i et Dvoraktastatur."
+msgid "Kurdish (Turkey, F)"
+msgstr "Kurdisk (Tyrkiet, F)"
 
 #: ../rules/base.xml.in.h:756
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "Til den tilsvarende tast på et Qwertytastatur."
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "Kurdisk (Tyrkiet, latin Alt-Q)"
 
 #: ../rules/base.xml.in.h:757
-msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr "Skift pegetaster med Skift + NumLock."
-
-#: ../rules/base.xml.in.h:758
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+msgid "Turkish (international with dead keys)"
+msgstr "Tyrkisk (international med døde taster)"
 
-#: ../rules/base.xml.in.h:759
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
+#. Keyboard indicator for Crimean Tatar layouts
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
+msgid "crh"
+msgstr "crh"
 
 #: ../rules/base.xml.in.h:760
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krimtatarsk (tyrkisk Q)"
 
 #: ../rules/base.xml.in.h:761
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krimtatarsk (tyrkisk F)"
 
 #: ../rules/base.xml.in.h:762
-msgid "Tswana"
-msgstr "Tswana"
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krimtatarsk (tyrkisk Alt-Q)"
 
 #: ../rules/base.xml.in.h:763
-msgid "Turkish"
-msgstr "Tyrkisk"
+msgid "Taiwanese"
+msgstr "Taiwanesisk"
 
 #: ../rules/base.xml.in.h:764
-msgid "Turkish (Alt-Q)"
-msgstr "Tyrkisk (Alt-Q)"
-
-#: ../rules/base.xml.in.h:765
-msgid "Turkish (F)"
-msgstr "Tyrkisk (F)"
+msgid "Taiwanese (indigenous)"
+msgstr "Taiwanesisk (indfødte)"
 
+#. Keyboard indicator for Saisiyat layouts
 #: ../rules/base.xml.in.h:766
-msgid "Turkish (Sun dead keys)"
-msgstr "Tyrkisk (Sun døde taster)"
+msgid "xsy"
+msgstr "xsy"
 
 #: ../rules/base.xml.in.h:767
-msgid "Turkish (international with dead keys)"
-msgstr "Tyrkisk (international med døde taster)"
-
-#: ../rules/base.xml.in.h:768
-msgid "Turkmen"
-msgstr "Turkmensk"
+msgid "Saisiyat (Taiwan)"
+msgstr "Saisiyat (Taiwan)"
 
-#: ../rules/base.xml.in.h:769
-msgid "Turkmen (Alt-Q)"
-msgstr "Turkmensk (Alt-Q)"
+#. Keyboard indicator for Ukranian layouts
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
+msgid "uk"
+msgstr "uk"
 
-#: ../rules/base.xml.in.h:770
-msgid "TypeMatrix EZ-Reach 2020"
-msgstr "TypeMatrix EZ-Reach 2020"
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
+msgid "Ukrainian"
+msgstr "Ukrainsk"
 
 #: ../rules/base.xml.in.h:771
-msgid "TypeMatrix EZ-Reach 2030 PS2"
-msgstr "TypeMatrix EZ-Reach 2030 PS2"
+msgid "Ukrainian (phonetic)"
+msgstr "Ukrainsk (fonetisk)"
 
 #: ../rules/base.xml.in.h:772
-msgid "TypeMatrix EZ-Reach 2030 USB"
-msgstr "TypeMatrix EZ-Reach 2030 USB"
+msgid "Ukrainian (typewriter)"
+msgstr "Ukrainsk (skrivemaskine)"
 
 #: ../rules/base.xml.in.h:773
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU-tilstand)"
+msgid "Ukrainian (WinKeys)"
+msgstr "Ukrainsk (Wintaster)"
 
 #: ../rules/base.xml.in.h:774
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP-tilstand)"
+msgid "Ukrainian (legacy)"
+msgstr "Ukrainsk (forældet)"
 
 #: ../rules/base.xml.in.h:775
-msgid "Udmurt"
-msgstr "Udmurt"
+msgid "Ukrainian (standard RSTU)"
+msgstr "Ukrainsk (standard RSTU)"
 
 #: ../rules/base.xml.in.h:776
-msgid "Ukrainian"
-msgstr "Ukrainsk"
-
-#: ../rules/base.xml.in.h:777
-msgid "Ukrainian (WinKeys)"
-msgstr "Ukrainsk (Wintaster)"
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Russisk (Ukraine, standard RSTU)"
 
 # Pannonian Rusyn or simply Rusyn (Ruthenian) is a Slavic language or dialect spoken 
 # in north-western Serbia and eastern Croatia 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrainsk (homofonisk)"
 
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
+msgid "English (UK)"
+msgstr "Engelsk (UK)"
+
 #: ../rules/base.xml.in.h:779
-msgid "Ukrainian (legacy)"
-msgstr "Ukrainsk (forældet)"
+msgid "English (UK, extended WinKeys)"
+msgstr "Engelsk (UK, udvidede Wintaster)"
 
 #: ../rules/base.xml.in.h:780
-msgid "Ukrainian (phonetic)"
-msgstr "Ukrainsk (fonetisk)"
+msgid "English (UK, international with dead keys)"
+msgstr "Engelsk (UK, international med døde taster)"
 
 #: ../rules/base.xml.in.h:781
-msgid "Ukrainian (standard RSTU)"
-msgstr "Ukrainsk (standard RSTU)"
+msgid "English (UK, Dvorak)"
+msgstr "Engelsk (UK, Dvorak)"
 
 #: ../rules/base.xml.in.h:782
-msgid "Ukrainian (typewriter)"
-msgstr "Ukrainsk (skrivemaskine)"
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Engelsk (UK, Dvorak med UK-tegnsætning)"
 
 #: ../rules/base.xml.in.h:783
-msgid "Unicode additions (arrows and math operators)"
-msgstr "Unicode tilføjelser (pile og matematiske tegn)"
+msgid "English (UK, Macintosh)"
+msgstr "Engelsk (UK, Macintosh)"
 
 #: ../rules/base.xml.in.h:784
-msgid "Unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Unicode tilføjelser (pile og matematiske tegn). Matematiske tegn på standardniveau"
+msgid "English (UK, Macintosh international)"
+msgstr "Engelsk (UK, Macintosh international)"
 
 #: ../rules/base.xml.in.h:785
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
+msgid "English (UK, Colemak)"
+msgstr "Engelsk (UK, Colemak)"
 
 #: ../rules/base.xml.in.h:786
-msgid "Urdu (Pakistan)"
-msgstr "Urdu (Pakistan)"
+msgid "Uzbek"
+msgstr "Usbekisk"
 
 #: ../rules/base.xml.in.h:787
-msgid "Urdu (Pakistan, CRULP)"
-msgstr "Urdu (Pakistan, CRULP)"
-
-#: ../rules/base.xml.in.h:788
-msgid "Urdu (Pakistan, NLA)"
-msgstr "Urdu (Pakistan, NLA)"
+msgid "Uzbek (Latin)"
+msgstr "Usbekisk (latin)"
 
+#. Keyboard indicator for Vietnamese layouts
 #: ../rules/base.xml.in.h:789
-msgid "Urdu (WinKeys)"
-msgstr "Urdu (Win-taster)"
+msgid "vi"
+msgstr "vi"
 
 #: ../rules/base.xml.in.h:790
-msgid "Urdu (alternative phonetic)"
-msgstr "Urdu (alternativ fonetisk)"
-
-#: ../rules/base.xml.in.h:791
-msgid "Urdu (phonetic)"
-msgstr "Urdu (fonetisk)"
+msgid "Vietnamese"
+msgstr "Vietnamesisk"
 
-#: ../rules/base.xml.in.h:792
-msgid "Use keyboard LED to show alternative layout"
-msgstr "Brug tastatur-LED til at vise alternativ layout"
+#. Keyboard indicator for Korean layouts
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
+msgid "ko"
+msgstr "ko"
 
-#: ../rules/base.xml.in.h:793
-msgid "Using space key to input non-breakable space character"
-msgstr "Brug mellemrum for at indtaste ubrydelig mellemrumskarakter"
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
+msgid "Korean"
+msgstr "Koreansk"
 
 #: ../rules/base.xml.in.h:794
-msgid "Usual space at any level"
-msgstr "Normal mellemrum på alle niveauer"
+msgid "Korean (101/104 key compatible)"
+msgstr "Koreansk (101/104 tastkompatibel)"
 
 #: ../rules/base.xml.in.h:795
-msgid "Uyghur"
-msgstr "Uyghur"
-
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek"
-msgstr "Usbekisk"
+msgid "Japanese (PC-98xx Series)"
+msgstr "Japansk (pc-98xx-serie)"
 
+#. Keyboard indicator for Irish layouts
 #: ../rules/base.xml.in.h:797
-msgid "Uzbek (Afghanistan)"
-msgstr "Usbekisk (Afghanistan)"
+msgid "ie"
+msgstr "ie"
 
 #: ../rules/base.xml.in.h:798
-msgid "Uzbek (Afghanistan, OLPC)"
-msgstr "Usbekisk (Afghanistan, OLPC)"
+msgid "Irish"
+msgstr "Irsk"
 
 #: ../rules/base.xml.in.h:799
-msgid "Uzbek (Latin)"
-msgstr "Usbekisk (latin)"
+msgid "CloGaelach"
+msgstr "CloGaelach"
 
 #: ../rules/base.xml.in.h:800
-msgid "Vietnamese"
-msgstr "Vietnamesisk"
+msgid "Irish (UnicodeExpert)"
+msgstr "Irsk (UnicodeExpert)"
 
 #: ../rules/base.xml.in.h:801
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "ViewSonic KU-306 Internet Keyboard"
+msgid "Ogham"
+msgstr "Ogham"
 
 #: ../rules/base.xml.in.h:802
-msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
-msgstr "Wang 724 numerisk tastatur med Unicode-tilføjelser (pile og matematiske tegn)"
+msgid "Ogham (IS434)"
+msgstr "Ogham (IS434)"
 
 #: ../rules/base.xml.in.h:803
-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"
+msgid "Urdu (Pakistan)"
+msgstr "Urdu (Pakistan)"
 
 #: ../rules/base.xml.in.h:804
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "Urdu (Pakistan, CRULP)"
 
 #: ../rules/base.xml.in.h:805
-msgid "Wolof"
-msgstr "Wolof"
+msgid "Urdu (Pakistan, NLA)"
+msgstr "Urdu (Pakistan, NLA)"
 
 #: ../rules/base.xml.in.h:806
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard"
-
-#: ../rules/base.xml.in.h:807
-msgid "Yakut"
-msgstr "Yakut"
+msgid "Arabic (Pakistan)"
+msgstr "Arabisk (Pakistan)"
 
+#. Keyboard indicator for Sindhi layouts
 #: ../rules/base.xml.in.h:808
-msgid "Yoruba"
-msgstr "Yoruba"
+msgid "sd"
+msgstr "sd"
 
-# The zero-width non-joiner (ZWNJ) is a non-printing character used in the computerized
-# typesetting of some cursive scripts, or other scripts which make use of ligatures, 
-# such as Devanagari. When placed between two characters that would otherwise be 
-# connected, a ZWNJ causes them to be printed in their final and initial forms, 
-# respectively. This is also an effect of a space character, but a ZWNJ is used when it 
-# is desirable to keep the words closer together. The ZWNJ is represented in Unicode 
-# is U+200C, and can be represented in HTML as &#x200C;, &#8204; or &zwnj;. Kilde eng.
-# wikipedia 12. maj 2010
 #: ../rules/base.xml.in.h:809
-msgid "Zero-width non-joiner character at second level"
-msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau"
-
-#: ../rules/base.xml.in.h:810
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
-msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau"
+msgid "Sindhi"
+msgstr "Sindhi"
 
+#. Keyboard indicator for Dhivehi layouts
 #: ../rules/base.xml.in.h:811
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
-msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt på mellemrum på tredje niveau"
+msgid "dv"
+msgstr "dv"
 
 #: ../rules/base.xml.in.h:812
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
-msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau"
+msgid "Dhivehi"
+msgstr "Dhivehi"
 
 #: ../rules/base.xml.in.h:813
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
-msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau, ubrydeligt mellemrumstegn (ZWNJ) på fjerde niveau"
-
-#: ../rules/base.xml.in.h:814
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
-msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ombrydeligt mellemrumstegn på tredje niveau"
+msgid "English (South Africa)"
+msgstr "Engelsk (Sydafrika)"
 
+#. Keyboard indicator for Esperanto layouts
 #: ../rules/base.xml.in.h:815
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
-msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ombrydeligt mellemrumstegn på tredje niveau, ubrydeligt mellemrumsteng på fjerde niveau"
+msgid "eo"
+msgstr "eo"
 
 #: ../rules/base.xml.in.h:816
-msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
-msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på tredje niveau, ombrydeligt mellemrumstegn på fjerde niveau"
+msgid "Esperanto"
+msgstr "Esperanto"
 
-#. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:818
-msgid "ak"
-msgstr "ak"
+#: ../rules/base.xml.in.h:817
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "Esperanto (forkert placeret semikolon og anførelsestegn, forældet)"
+
+#. Keyboard indicator for Nepali layouts
+#: ../rules/base.xml.in.h:819
+msgid "ne"
+msgstr "ne"
 
-#. Keyboard indicator for Amharic layouts
 #: ../rules/base.xml.in.h:820
-msgid "am"
-msgstr "am"
+msgid "Nepali"
+msgstr "Nepalesisk"
 
-#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:822
-msgid "ar"
-msgstr "ar"
+#: ../rules/base.xml.in.h:821
+msgid "English (Nigeria)"
+msgstr "Engelsk (Nigeria)"
+
+#. Keyboard indicator for Igbo layouts
+#: ../rules/base.xml.in.h:823
+msgid "ig"
+msgstr "ig"
 
-#. Keyboard indicator for Avatime layouts
 #: ../rules/base.xml.in.h:824
-msgid "avn"
-msgstr "avn"
+msgid "Igbo"
+msgstr "Igbo"
 
-#. Keyboard indicator for Azerbaijani layouts
+#. Keyboard indicator for Yoruba layouts
 #: ../rules/base.xml.in.h:826
-msgid "az"
-msgstr "az"
+msgid "yo"
+msgstr "yo"
 
-#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:828
-msgid "be"
-msgstr "be"
+#: ../rules/base.xml.in.h:827
+msgid "Yoruba"
+msgstr "Yoruba"
 
-#. Keyboard indicator for Berber layouts
+#. Keyboard indicator for Amharic layouts
+#: ../rules/base.xml.in.h:829
+msgid "am"
+msgstr "am"
+
+# http://da.wikipedia.org/wiki/Amharisk
 #: ../rules/base.xml.in.h:830
-msgid "ber"
-msgstr "ber"
+msgid "Amharic"
+msgstr "Amharisk"
 
-#. Keyboard indicator for Bulgarian layouts
+#. Keyboard indicator for Wolof layouts
 #: ../rules/base.xml.in.h:832
-msgid "bg"
-msgstr "bg"
-
-#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
-msgid "bm"
-msgstr "bm"
+msgid "wo"
+msgstr "wo"
 
-#. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:836
-msgid "bn"
-msgstr "bn"
+#: ../rules/base.xml.in.h:833
+msgid "Wolof"
+msgstr "Wolof"
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "brl"
 
-#. Keyboard indicator for Bosnian layouts
+#: ../rules/base.xml.in.h:836
+msgid "Braille"
+msgstr "Blindeskrift"
+
+#: ../rules/base.xml.in.h:837
+msgid "Braille (left hand)"
+msgstr "Blindeskrift (venstre hånd)"
+
+#: ../rules/base.xml.in.h:838
+msgid "Braille (right hand)"
+msgstr "Blindeskrift (højre hånd)"
+
+#. Keyboard indicator for Turkmen layouts
 #: ../rules/base.xml.in.h:840
-msgid "bs"
-msgstr "bs"
+msgid "tk"
+msgstr "tk"
+
+#: ../rules/base.xml.in.h:841
+msgid "Turkmen"
+msgstr "Turkmensk"
 
-#. Keyboard indicator for Belarusian layouts
 #: ../rules/base.xml.in.h:842
-msgid "by"
-msgstr "by"
+msgid "Turkmen (Alt-Q)"
+msgstr "Turkmensk (Alt-Q)"
 
-#. Keyboard indicator for Catalan layouts
+#. Keyboard indicator for Bambara layouts
 #: ../rules/base.xml.in.h:844
-msgid "ca"
-msgstr "ca"
+msgid "bm"
+msgstr "bm"
+
+#: ../rules/base.xml.in.h:845
+msgid "Bambara"
+msgstr "Bambara"
 
-#. Keyboard indicator for Cherokee layouts
 #: ../rules/base.xml.in.h:846
-msgid "chr"
-msgstr "chr"
+msgid "French (Mali, alternative)"
+msgstr "Fransk (Mali, alternativ)"
+
+#: ../rules/base.xml.in.h:847
+msgid "English (Mali, US Macintosh)"
+msgstr "Engelsk (Mali, US Macintosh)"
 
-#. Keyboard indicator for Cameroon layouts
 #: ../rules/base.xml.in.h:848
-msgid "cm"
-msgstr "cm"
+msgid "English (Mali, US international)"
+msgstr "Engelsk (Mali, US international)"
 
-#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:850 ../rules/base.extras.xml.in.h:40
-msgid "crh"
-msgstr "crh"
+#. Keyboard indicator for Swahili layouts
+#: ../rules/base.xml.in.h:850
+msgid "sw"
+msgstr "sw"
+
+#: ../rules/base.xml.in.h:851
+msgid "Swahili (Tanzania)"
+msgstr "Swahili (Tanzania)"
 
-#. Keyboard indicator for Chech layouts
 #: ../rules/base.xml.in.h:852
-msgid "cs"
-msgstr "cs"
+msgid "Swahili (Kenya)"
+msgstr "Swahili (Kenya)"
 
-#. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:854
-msgid "da"
-msgstr "da"
+#: ../rules/base.xml.in.h:853
+msgid "Kikuyu"
+msgstr "Kikuyu"
 
-#. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:856 ../rules/base.extras.xml.in.h:41
-msgid "de"
-msgstr "de"
+#. Keyboard indicator for Tswana layouts
+#: ../rules/base.xml.in.h:855
+msgid "tn"
+msgstr "tn"
 
-#. Keyboard indicator for Dhivehi layouts
+#: ../rules/base.xml.in.h:856
+msgid "Tswana"
+msgstr "Tswana"
+
+#. Keyboard indicator for Filipino layouts
 #: ../rules/base.xml.in.h:858
-msgid "dv"
-msgstr "dv"
+msgid "ph"
+msgstr "ph"
+
+#: ../rules/base.xml.in.h:859
+msgid "Filipino"
+msgstr "Filippinsk"
 
-#. Keyboard indicator for Dzongkha layouts
 #: ../rules/base.xml.in.h:860
-msgid "dz"
-msgstr "dz"
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "Filippinsk (QWERTY baybayin)"
+
+#: ../rules/base.xml.in.h:861
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "Filippinsk (Capewell-dvorak latin)"
 
-#. Keyboard indicator for Ewe layouts
 #: ../rules/base.xml.in.h:862
-msgid "ee"
-msgstr "ee"
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "Filippinsk (Capewell-dvorak baybayin)"
 
-#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:864 ../rules/base.extras.xml.in.h:42
-msgid "en"
-msgstr "en"
+#: ../rules/base.xml.in.h:863
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "Filippinsk (Capewell-QWERF 2006 latin)"
 
-#. Keyboard indicator for Esperanto layouts
+#: ../rules/base.xml.in.h:864
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "Filippinsk (Capewell-QWERF 2006 baybayin)"
+
+#: ../rules/base.xml.in.h:865
+msgid "Filipino (Colemak Latin)"
+msgstr "Filippinsk (Colemak latin)"
+
+# http://en.wikipedia.org/wiki/Baybayin
 #: ../rules/base.xml.in.h:866
-msgid "eo"
-msgstr "eo"
+msgid "Filipino (Colemak Baybayin)"
+msgstr "Filippinsk (Colemak baybayin)"
 
-#. Keyboard indicator for Spanish layouts
+#: ../rules/base.xml.in.h:867
+msgid "Filipino (Dvorak Latin)"
+msgstr "Filippinsk (Dvorak latin)"
+
+# http://en.wikipedia.org/wiki/Baybayin
 #: ../rules/base.xml.in.h:868
-msgid "es"
-msgstr "es"
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filippinsk (Dvorak baybayin)"
+
+#: ../rules/base.xml.in.h:869
+msgid "md"
+msgstr "md"
 
-#. Keyboard indicator for Estonian layouts
 #: ../rules/base.xml.in.h:870
-msgid "et"
-msgstr "et"
+msgid "Moldavian"
+msgstr "Moldavisk"
 
-#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:43
-msgid "fa"
-msgstr "fa"
+#: ../rules/base.xml.in.h:871
+msgid "gag"
+msgstr "gag"
+
+# http://www.denstoredanske.dk/Sprog,_religion_og_filosofi/Sprog/Alle_lande_-_sprogoversigt/Altaiske_sprog/gagausisk
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "Moldavisk (gagausisk)"
+
+#: ../rules/base.xml.in.h:873
+msgid "Key(s) to change layout"
+msgstr "Tast(er) for at skifte layout"
 
-#. Keyboard indicator for Fula layouts
 #: ../rules/base.xml.in.h:874
-msgid "ff"
-msgstr "ff"
+msgid "Right Alt (while pressed)"
+msgstr "Højre Alt (mens trykket ned)"
+
+#: ../rules/base.xml.in.h:875
+msgid "Left Alt (while pressed)"
+msgstr "Venstre Alt (mens trykket ned)"
 
-#. Keyboard indicator for Finnish layouts
 #: ../rules/base.xml.in.h:876
-msgid "fi"
-msgstr "fi"
+msgid "Left Win (while pressed)"
+msgstr "Venstre Win-tast (mens trykket ned)"
+
+#: ../rules/base.xml.in.h:877
+msgid "Right Win (while pressed)"
+msgstr "Højre Win-tast (mens trykket ned)"
 
-#. Keyboard indicator for Faroese layouts
 #: ../rules/base.xml.in.h:878
-msgid "fo"
-msgstr "fo"
+msgid "Any Win key (while pressed)"
+msgstr "Enhver Win-tast (mens trykket ned)"
 
-#. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:880 ../rules/base.extras.xml.in.h:44
-msgid "fr"
-msgstr "fr"
+#: ../rules/base.xml.in.h:879
+msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
+msgstr "Caps Lock (mens presset ned), Alt+Caps Lock udfører den oprindleige capslockhandling"
+
+#: ../rules/base.xml.in.h:880
+msgid "Right Ctrl (while pressed)"
+msgstr "Højre Ctrl-tast (mens trykket ned)"
+
+#: ../rules/base.xml.in.h:881
+msgid "Right Alt"
+msgstr "Højre Alt"
 
-#. Keyboard indicator for Ga layouts
 #: ../rules/base.xml.in.h:882
-msgid "gaa"
-msgstr "gaa"
+msgid "Left Alt"
+msgstr "Venstre Alt"
+
+#: ../rules/base.xml.in.h:883
+msgid "Caps Lock"
+msgstr "Caps Lock"
 
-#. Keyboard indicator for Greek layouts
 #: ../rules/base.xml.in.h:884
-msgid "gr"
-msgstr "gr"
+msgid "Shift+Caps Lock"
+msgstr "Skift+Caps Lock"
+
+#: ../rules/base.xml.in.h:885
+msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
+msgstr "Caps Lock (skifter til første layout), Skift+Caps Lock (skifter til sidste layout)"
 
-#. Keyboard indicator for Gujarati layouts
 #: ../rules/base.xml.in.h:886
-msgid "gu"
-msgstr "gu"
+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:887
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Venstre Ctrl (skifter til første layout), Højre Ctrl (skifter til sidste layout)"
 
-#. Keyboard indicator for Hausa layouts
 #: ../rules/base.xml.in.h:888
-msgid "ha"
-msgstr "ha"
+msgid "Alt+Caps Lock"
+msgstr "Alt+Caps Lock"
 
-#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:890 ../rules/base.extras.xml.in.h:45
-msgid "he"
-msgstr "he"
+#: ../rules/base.xml.in.h:889
+msgid "Both Shift keys together"
+msgstr "Begge skift-taster sammen"
+
+#: ../rules/base.xml.in.h:890
+msgid "Both Alt keys together"
+msgstr "Begge Alt-taster sammen"
+
+#: ../rules/base.xml.in.h:891
+msgid "Both Ctrl keys together"
+msgstr "Begge Ctrl-taster sammen"
 
-#. Keyboard indicator for Hindi layouts
 #: ../rules/base.xml.in.h:892
-msgid "hi"
-msgstr "hi"
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Skift"
+
+#: ../rules/base.xml.in.h:893
+msgid "Left Ctrl+Left Shift"
+msgstr "Venstre Ctrl+Venstre Skift"
 
-#. Keyboard indicator for Croatian layouts
 #: ../rules/base.xml.in.h:894
-msgid "hr"
-msgstr "hr"
+msgid "Right Ctrl+Right Shift"
+msgstr "Højre Ctrl+Højre Skift"
+
+#: ../rules/base.xml.in.h:895
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
 
-#. Keyboard indicator for Hungarian layouts
 #: ../rules/base.xml.in.h:896
-msgid "hu"
-msgstr "hu"
+msgid "Alt+Shift"
+msgstr "Alt+Skift"
 
-#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:898 ../rules/base.extras.xml.in.h:46
-msgid "hy"
-msgstr "hy"
+#: ../rules/base.xml.in.h:897
+msgid "Left Alt+Left Shift"
+msgstr "Venstre Alt+Venstre Skift"
+
+#: ../rules/base.xml.in.h:898
+msgid "Alt+Space"
+msgstr "Alt+Mellemrum"
+
+#: ../rules/base.xml.in.h:899
+msgid "Menu"
+msgstr "Menu"
 
-#. Keyboard indicator for Irish layouts
 #: ../rules/base.xml.in.h:900
-msgid "ie"
-msgstr "ie"
+msgid "Left Win"
+msgstr "Venstre Win"
+
+#: ../rules/base.xml.in.h:901
+msgid "Right Win"
+msgstr "Højre Win"
 
-#. Keyboard indicator for Igbo layouts
 #: ../rules/base.xml.in.h:902
-msgid "ig"
-msgstr "ig"
+msgid "Left Shift"
+msgstr "Venstre Skift"
+
+#: ../rules/base.xml.in.h:903
+msgid "Right Shift"
+msgstr "Højre Skift"
 
-#. Keyboard indicator for Inuktikut layouts
 #: ../rules/base.xml.in.h:904
-msgid "ike"
-msgstr "ike"
+msgid "Left Ctrl"
+msgstr "Venstre Ctrl"
+
+#: ../rules/base.xml.in.h:905
+msgid "Right Ctrl"
+msgstr "Højre Ctrl"
 
-#. Keyboard indicator for Indian layouts
 #: ../rules/base.xml.in.h:906
-msgid "in"
-msgstr "in"
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#: ../rules/base.xml.in.h:907
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgstr "Venstre Ctrl+Venstre Win (til første layout), Højre Ctrl+Menu (til andet layout)"
 
-#. Keyboard indicator for Icelandic layouts
 #: ../rules/base.xml.in.h:908
-msgid "is"
-msgstr "is"
+msgid "Key to choose 3rd level"
+msgstr "Tast for at vælge tredje niveau"
+
+#: ../rules/base.xml.in.h:909
+msgid "Any Win key"
+msgstr "Enhver Win-tast"
 
-#. Keyboard indicator for Italian layouts
 #: ../rules/base.xml.in.h:910
-msgid "it"
-msgstr "it"
+msgid "Any Alt key"
+msgstr "Enhver Alt-tast"
+
+#: ../rules/base.xml.in.h:911
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Højre Alt-tast, Skift+højre Alt-tast er fler_tast"
 
-#. Keyboard indicator for Japanese layouts
 #: ../rules/base.xml.in.h:912
-msgid "ja"
-msgstr "ja"
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Højre Alt-tast vælger aldrig tredje niveau"
+
+#: ../rules/base.xml.in.h:913
+msgid "Enter on keypad"
+msgstr "Retur på numerisk tastatur"
 
-#. Keyboard indicator for Georgian layouts
 #: ../rules/base.xml.in.h:914
-msgid "ka"
-msgstr "ka"
+msgid "Backslash"
+msgstr "Omvendt skråstreg"
+
+#: ../rules/base.xml.in.h:915
+msgid "&lt;Less/Greater&gt;"
+msgstr "&lt;Mindre end/Større end&gt;"
 
-#. Keyboard indicator for Kikuyu layouts
 #: ../rules/base.xml.in.h:916
-msgid "ki"
-msgstr "ki"
+msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "Caps Lock vælger tredje niveau, låser når trykket ned sammen med en anden tredje niveauvælger"
+
+#: ../rules/base.xml.in.h:917
+msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "Omvendt skråstreg vælger tredje niveau, låser når trykket ned sammen med en anden tredje niveauvælger"
 
-#. Keyboard indicator for Kazakh layouts
 #: ../rules/base.xml.in.h:918
-msgid "kk"
-msgstr "kk"
+msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "&lt;Mindre end/Større end&gt; (vælger tredje niveau, låser når trykket ned sammen med en anden tredje niveauvælger"
+
+#: ../rules/base.xml.in.h:919
+msgid "Ctrl key position"
+msgstr "Ctrl-tast placering"
 
-#. Keyboard indicator for Khmer layouts
 #: ../rules/base.xml.in.h:920
-msgid "km"
-msgstr "km"
+msgid "Caps Lock as Ctrl"
+msgstr "Caps Lock som Ctrl"
+
+#: ../rules/base.xml.in.h:921
+msgid "Left Ctrl as Meta"
+msgstr "Venstre Ctrl som Meta"
 
-#. Keyboard indicator for Kannada layouts
 #: ../rules/base.xml.in.h:922
-msgid "kn"
-msgstr "kn"
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Ombyt Ctrl og Caps Lock"
+
+#: ../rules/base.xml.in.h:923
+msgid "At left of 'A'"
+msgstr "Til venstre for 'A'"
 
-#. Keyboard indicator for Korean layouts
 #: ../rules/base.xml.in.h:924
-msgid "ko"
-msgstr "ko"
+msgid "At bottom left"
+msgstr "Nederst til venstre"
+
+#: ../rules/base.xml.in.h:925
+msgid "Right Ctrl as Right Alt"
+msgstr "Højre Ctrl-tast virker som højre Alt"
 
-#. Keyboard indicator for Kurdish layouts
 #: ../rules/base.xml.in.h:926
-msgid "ku"
-msgstr "ku"
+msgid "Menu as Right Ctrl"
+msgstr "Menu som højre Ctrl"
+
+#: ../rules/base.xml.in.h:927
+msgid "Right Alt as Right Ctrl"
+msgstr "Højre Alt-tast virker som højre Ctrl"
 
-#. Keyboard indicator for Lao layouts
 #: ../rules/base.xml.in.h:928
-msgid "lo"
-msgstr "lo"
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Brug tastatur-LED til at vise alternativ layout"
 
-#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:930 ../rules/base.extras.xml.in.h:48
-msgid "lt"
-msgstr "lt"
+#: ../rules/base.xml.in.h:929
+msgid "Num Lock"
+msgstr "Num Lock"
 
-#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:932 ../rules/base.extras.xml.in.h:49
-msgid "lv"
-msgstr "lv"
+#: ../rules/base.xml.in.h:930
+msgid "Numeric keypad layout selection"
+msgstr "Numerisk tastatur layout udvælgelse"
+
+#: ../rules/base.xml.in.h:931
+msgid "Legacy"
+msgstr "Forældet"
+
+#: ../rules/base.xml.in.h:932
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unicode tilføjelser (pile og matematiske tegn)"
+
+#: ../rules/base.xml.in.h:933
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Unicode tilføjelser (pile og matematiske tegn). Matematiske tegn på standardniveau"
 
-#. Keyboard indicator for Maori layouts
 #: ../rules/base.xml.in.h:934
-msgid "mi"
-msgstr "mi"
+msgid "Legacy Wang 724"
+msgstr "Forældet Wang 724"
+
+#: ../rules/base.xml.in.h:935
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr "Wang 724 numerisk tastatur med Unicode-tilføjelser (pile og matematiske tegn)"
 
-#. Keyboard indicator for Macedonian layouts
 #: ../rules/base.xml.in.h:936
-msgid "mk"
-msgstr "mk"
+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"
 
-#. Keyboard indicator for Malayalam layouts
+#: ../rules/base.xml.in.h:937
+msgid "Hexadecimal"
+msgstr "Sekstentals"
+
+# ATM = hæveautomat, måske skal det oversættes.
 #: ../rules/base.xml.in.h:938
-msgid "ml"
-msgstr "ml"
+msgid "ATM/phone-style"
+msgstr "ATM/telefonstil"
+
+#: ../rules/base.xml.in.h:939
+msgid "Numeric keypad delete key behaviour"
+msgstr "Numerisk tastatur slettetast opførsel"
 
-#. Keyboard indicator for Mongolian layouts
 #: ../rules/base.xml.in.h:940
-msgid "mn"
-msgstr "mn"
+msgid "Legacy key with dot"
+msgstr "Forældet tast med punktum"
 
-#. Keyboard indicator for Maltese layouts
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:942
-msgid "mt"
-msgstr "mt"
+msgid "Legacy key with comma"
+msgstr "Forældet tast med komma"
+
+#: ../rules/base.xml.in.h:943
+msgid "Four-level key with dot"
+msgstr "Niveau fire tast med punktum"
 
-#. Keyboard indicator for Burmese layouts
 #: ../rules/base.xml.in.h:944
-msgid "my"
-msgstr "my"
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Niveau fire tast med punktum, latin-9 begrænsning"
+
+#: ../rules/base.xml.in.h:945
+msgid "Four-level key with comma"
+msgstr "Niveau fire tast med komma"
 
-#. Keyboard indicator for Nepali layouts
 #: ../rules/base.xml.in.h:946
-msgid "ne"
-msgstr "ne"
+msgid "Four-level key with momayyez"
+msgstr "Niveau fire tast med momayyez"
 
-#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:948
-msgid "nl"
-msgstr "nl"
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:949
+msgid "Four-level key with abstract separators"
+msgstr "Niveau fire tast med abstrakt adskillelser"
 
-#. Keyboard indicator for Norwegian layouts
 #: ../rules/base.xml.in.h:950
-msgid "no"
-msgstr "no"
+msgid "Semi-colon on third level"
+msgstr "Semikolon på tredje niveau"
+
+#: ../rules/base.xml.in.h:951
+msgid "Caps Lock key behavior"
+msgstr "Opførsel for Caps Lock-tast"
 
-#. Keyboard indicator for Oriya layouts
 #: ../rules/base.xml.in.h:952
-msgid "or"
-msgstr "or"
+msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock bruger intern forstørrelse af bogstaver. Skift sætter Caps Lock »på hold«"
+
+#: ../rules/base.xml.in.h:953
+msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
+msgstr "Caps Lock bruger intern forstørrelse af bogstaver. Skift påvirker ikke Caps Lock"
 
-#. Keyboard indicator for Punjabi layouts
 #: ../rules/base.xml.in.h:954
-msgid "pa"
-msgstr "pa"
+msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock agerer som skiftetasten med lås. Skift »pauser« Caps Lock"
+
+#: ../rules/base.xml.in.h:955
+msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
+msgstr "Caps Lock agerer som skiftetasten med lås. Skift påvirker ikke Caps Lock"
 
-#. Keyboard indicator for Filipino layouts
 #: ../rules/base.xml.in.h:956
-msgid "ph"
-msgstr "ph"
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgstr "Caps Lock slår små/store bogstaver til/fra"
 
-#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:958 ../rules/base.extras.xml.in.h:50
-msgid "pl"
-msgstr "pl"
+#: ../rules/base.xml.in.h:957
+msgid "Make Caps Lock an additional Num Lock"
+msgstr "Gør Caps Lock til en ekstra NumLock"
+
+#: ../rules/base.xml.in.h:958
+msgid "Swap ESC and Caps Lock"
+msgstr "Ombyt ESC og Caps Lock"
+
+#: ../rules/base.xml.in.h:959
+msgid "Make Caps Lock an additional ESC"
+msgstr "Gør Caps Lock til en ekstra Esc"
 
-#. Keyboard indicator for Pashto layouts
 #: ../rules/base.xml.in.h:960
-msgid "ps"
-msgstr "ps"
+msgid "Make Caps Lock an additional Backspace"
+msgstr "Gør Caps Lock til en ekstra rettelsestast"
+
+#: ../rules/base.xml.in.h:961
+msgid "Make Caps Lock an additional Super"
+msgstr "Gør Caps Lock til en ekstra Super"
 
-#. Keyboard indicator for Portuguese layouts
 #: ../rules/base.xml.in.h:962
-msgid "pt"
-msgstr "pt"
+msgid "Make Caps Lock an additional Hyper"
+msgstr "Gør Caps Lock til en ekstra Hyper"
 
-#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:964 ../rules/base.extras.xml.in.h:51
-msgid "ro"
-msgstr "ro"
+#: ../rules/base.xml.in.h:963
+msgid "Caps Lock toggles Shift so all keys are affected"
+msgstr "Caps Lock ændrer Skift så alle taster bliver påvirket"
 
-#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:966 ../rules/base.extras.xml.in.h:52
-msgid "ru"
-msgstr "ru"
+#: ../rules/base.xml.in.h:964
+msgid "Caps Lock is disabled"
+msgstr "Caps Lock er slået fra"
+
+#: ../rules/base.xml.in.h:965
+msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
+msgstr "Gør Caps Lock til en ekstra Control men behold Caps_Lock keysym"
+
+#: ../rules/base.xml.in.h:966
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win-tasteopførsel"
+
+#: ../rules/base.xml.in.h:967
+msgid "Add the standard behavior to Menu key"
+msgstr "Tilføj standardopførslen til menutasten"
 
-#. Keyboard indicator for Sindhi layouts
 #: ../rules/base.xml.in.h:968
-msgid "sd"
-msgstr "sd"
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt og Meta er på Alt-tasterne"
+
+#: ../rules/base.xml.in.h:969
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Kontrol ligger på Win-tasterne (og de normale Ctrl-taster)"
 
-#. Keyboard indicator for Sinhala layouts
 #: ../rules/base.xml.in.h:970
-msgid "si"
-msgstr "si"
+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:971
+msgid "Meta is mapped to Win keys"
+msgstr "Meta ligger på Win-tasterne"
 
-#. Keyboard indicator for Slovak layouts
 #: ../rules/base.xml.in.h:972
-msgid "sk"
-msgstr "sk"
+msgid "Meta is mapped to Left Win"
+msgstr "Meta ligger på venstre Win-tast"
+
+#: ../rules/base.xml.in.h:973
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper ligger på Win-tasterne"
 
-#. Keyboard indicator for Slovenian layouts
 #: ../rules/base.xml.in.h:974
-msgid "sl"
-msgstr "sl"
+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:975
+msgid "Alt is swapped with Win"
+msgstr "Alt ombyttes med Win-tast"
 
-#. Keyboard indicator for Albanian layouts
 #: ../rules/base.xml.in.h:976
-msgid "sq"
-msgstr "sq"
+msgid "Compose key position"
+msgstr "Placering af Composetast"
 
-#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:978 ../rules/base.extras.xml.in.h:54
-msgid "sr"
-msgstr "sr"
+#: ../rules/base.xml.in.h:977
+msgid "Pause"
+msgstr "Pause"
+
+#: ../rules/base.xml.in.h:978
+msgid "PrtSc"
+msgstr "Prtsc"
+
+#: ../rules/base.xml.in.h:979
+msgid "Miscellaneous compatibility options"
+msgstr "Diverse kompatibilitetsvalg"
 
-#. Keyboard indicator for Swedish layouts
 #: ../rules/base.xml.in.h:980
-msgid "sv"
-msgstr "sv"
+msgid "Default numeric keypad keys"
+msgstr "Standard numerisk tastatur taster"
+
+#: ../rules/base.xml.in.h:981
+msgid "Numeric keypad keys always enter digits (as in Mac OS)"
+msgstr "Numerisk tastatur indtaster altid tal (som på Mac OS)"
 
-#. Keyboard indicator for Swahili layouts
 #: ../rules/base.xml.in.h:982
-msgid "sw"
-msgstr "sw"
+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:983
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgstr "Skift afbryder ikke Num Lock, vælger tredje niveau i steden for"
 
-#. Keyboard indicator for Syriac layouts
 #: ../rules/base.xml.in.h:984
-msgid "syc"
-msgstr "syc"
+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:985
+msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
+msgstr "Apples aluminiumstastatur: Emuler PC-taster (Udskriv, Scroll Lock, Pause, NumLock)"
 
-#. Keyboard indicator for Tamil layouts
 #: ../rules/base.xml.in.h:986
-msgid "ta"
-msgstr "ta"
+msgid "Shift cancels Caps Lock"
+msgstr "Skift afbryder Caps Lock"
+
+#: ../rules/base.xml.in.h:987
+msgid "Enable extra typographic characters"
+msgstr "Slå ekstra typografiske karakterer til"
 
-#. Keyboard indicator for Telugu layouts
 #: ../rules/base.xml.in.h:988
-msgid "te"
-msgstr "te"
+msgid "Both Shift-Keys together toggle Caps Lock"
+msgstr "Begge skift-taster sammen skifter Caps Lock"
+
+#: ../rules/base.xml.in.h:989
+msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
+msgstr "Begge skift-taster sammen aktiverer Caps Lock, en Skift-tast deaktiverer"
 
-#. Keyboard indicator for Tajik layouts
 #: ../rules/base.xml.in.h:990
-msgid "tg"
-msgstr "tg"
+msgid "Both Shift-Keys together toggle ShiftLock"
+msgstr "Begge skift-taster sammen skifter SkiftLock"
+
+#: ../rules/base.xml.in.h:991
+msgid "Toggle PointerKeys with Shift + NumLock."
+msgstr "Skift pegetaster med Skift + NumLock."
 
-#. Keyboard indicator for Thai layouts
 #: ../rules/base.xml.in.h:992
-msgid "th"
-msgstr "th"
+msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
+msgstr "Tillader afbrydelsesgreb med tastaturhandlinger (advarsel: sikkerhedsrisiko)"
+
+#: ../rules/base.xml.in.h:993
+msgid "Adding currency signs to certain keys"
+msgstr "Tilføjelse af valutategn til bestemte taster"
 
-#. Keyboard indicator for Turkmen layouts
 #: ../rules/base.xml.in.h:994
-msgid "tk"
-msgstr "tk"
+msgid "Euro on E"
+msgstr "Euro på E"
+
+# Euro på 2, 2 euro, Euro på tasten 2
+# Det handler om en tildeling af eurotegnet til tasten 2, og der er "Euro
+# på to" mere beskrivende, selv om strengen isoleret set stadig kan være
+# forvirrende. Når teksten står i en sammenhæng, er det nok ikke så
+# vigtigt om det er det ene eller det andet.
+#: ../rules/base.xml.in.h:995
+msgid "Euro on 2"
+msgstr "Euro på 2"
 
-#. Keyboard indicator for Tswana layouts
 #: ../rules/base.xml.in.h:996
-msgid "tn"
-msgstr "tn"
+msgid "Euro on 4"
+msgstr "Euro på 4"
+
+#: ../rules/base.xml.in.h:997
+msgid "Euro on 5"
+msgstr "Euro på 5"
 
-#. Keyboard indicator for Turkish layouts
 #: ../rules/base.xml.in.h:998
-msgid "tr"
-msgstr "tr"
+msgid "Rupee on 4"
+msgstr "Rupee på 4"
+
+#: ../rules/base.xml.in.h:999
+msgid "Key to choose 5th level"
+msgstr "Tast for at vælge femte niveau"
 
-#. Keyboard indicator for Ukranian layouts
 #: ../rules/base.xml.in.h:1000
-msgid "uk"
-msgstr "uk"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "&lt;Mindre end/Større end&gt; vælger femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
+
+#: ../rules/base.xml.in.h:1001
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Højre Alt vælge femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
 
-#. Keyboard indicator for Urdu layouts
 #: ../rules/base.xml.in.h:1002
-msgid "ur"
-msgstr "ur"
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Venstre Win-tast vælger femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
+
+#: ../rules/base.xml.in.h:1003
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Højre Win-tast vælger femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
 
-#. Keyboard indicator for Uzbek layouts
 #: ../rules/base.xml.in.h:1004
-msgid "uz"
-msgstr "uz"
+msgid "Using space key to input non-breakable space character"
+msgstr "Brug mellemrum for at indtaste ubrydelig mellemrumskarakter"
+
+#: ../rules/base.xml.in.h:1005
+msgid "Usual space at any level"
+msgstr "Normal mellemrum på alle niveauer"
 
-#. Keyboard indicator for Vietnamese layouts
 #: ../rules/base.xml.in.h:1006
-msgid "vi"
-msgstr "vi"
+msgid "Non-breakable space character at second level"
+msgstr "Ubrydelig mellemrumskarakter på andet niveau"
+
+#: ../rules/base.xml.in.h:1007
+msgid "Non-breakable space character at third level"
+msgstr "Ubrydelig mellemrumskarakter på tredje niveau"
 
-#. Keyboard indicator for Wolof layouts
 #: ../rules/base.xml.in.h:1008
-msgid "wo"
-msgstr "wo"
+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:1009
+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"
 
-#. Keyboard indicator for Saisiyat layouts
 #: ../rules/base.xml.in.h:1010
-msgid "xsy"
-msgstr "xsy"
+msgid "Non-breakable space character at fourth level"
+msgstr "Ubrydelig mellemrumskarakter på fjerde niveau"
+
+#: ../rules/base.xml.in.h:1011
+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"
 
-#. Keyboard indicator for Yoruba layouts
 #: ../rules/base.xml.in.h:1012
-msgid "yo"
-msgstr "yo"
+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)"
+
+# The zero-width non-joiner (ZWNJ) is a non-printing character used in the computerized
+# typesetting of some cursive scripts, or other scripts which make use of ligatures, 
+# such as Devanagari. When placed between two characters that would otherwise be 
+# connected, a ZWNJ causes them to be printed in their final and initial forms, 
+# respectively. This is also an effect of a space character, but a ZWNJ is used when it 
+# is desirable to keep the words closer together. The ZWNJ is represented in Unicode 
+# is U+200C, and can be represented in HTML as &#x200C;, &#8204; or &zwnj;. Kilde eng.
+# wikipedia 12. maj 2010
+#: ../rules/base.xml.in.h:1013
+msgid "Zero-width non-joiner character at second level"
+msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau"
 
-#. Keyboard indicator for Taiwanese layouts
 #: ../rules/base.xml.in.h:1014
-msgid "zh"
-msgstr "zh"
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
+msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ombrydeligt mellemrumstegn på tredje niveau"
 
-#: ../rules/base.extras.xml.in.h:1
-msgid "APL Keyboard Symbols"
-msgstr "APL-tastatursymboler"
+#: ../rules/base.xml.in.h:1015
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
+msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ombrydeligt mellemrumstegn på tredje niveau, ubrydeligt mellemrumsteng på fjerde niveau"
 
-#: ../rules/base.extras.xml.in.h:3
-msgid "Armenian (OLPC phonetic)"
-msgstr "Armensk (OLPC-fonetisk)"
+#: ../rules/base.xml.in.h:1016
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
+msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau"
 
-#: ../rules/base.extras.xml.in.h:4
-msgid "Atsina"
-msgstr "Atsina"
+#: ../rules/base.xml.in.h:1017
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
+msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt på mellemrum på tredje niveau"
+
+#: ../rules/base.xml.in.h:1018
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
+msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau, ubrydeligt mellemrumstegn (ZWNJ) på fjerde niveau"
+
+#: ../rules/base.xml.in.h:1019
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
+msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau"
+
+#: ../rules/base.xml.in.h:1020
+msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
+msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på tredje niveau, ombrydeligt mellemrumstegn på fjerde niveau"
+
+#: ../rules/base.xml.in.h:1021
+msgid "Japanese keyboard options"
+msgstr "Japanske tastaturvalg"
+
+#: ../rules/base.xml.in.h:1022
+msgid "Kana Lock key is locking"
+msgstr "Kana låsetast låser"
+
+#: ../rules/base.xml.in.h:1023
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F-stil rettelsestast"
+
+#: ../rules/base.xml.in.h:1024
+msgid "Make Zenkaku Hankaku an additional ESC"
+msgstr "Gør Zenkaku Hankaku til en ekstra Esc"
+
+#: ../rules/base.xml.in.h:1025
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Tilføjelse af esperanto accent circonflexe (supersigno)"
+
+#: ../rules/base.xml.in.h:1026
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Til den tilsvarende tast på et Qwertytastatur."
+
+#: ../rules/base.xml.in.h:1027
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Til den tilsvarende tast i et Dvoraktastatur."
+
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Vedligehold tastkompatibilitet med gamle tastkoder for Solaris"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "Kompatibilitet med Suntast"
+
+#: ../rules/base.xml.in.h:1030
+msgid "Key sequence to kill the X server"
+msgstr "Tastsekvens for at slå X-serveren ned"
+
+# Backspace kunne også være Slet tilbage
+#: ../rules/base.xml.in.h:1031
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Rettelsestast"
+
+#: ../rules/base.extras.xml.in.h:1
+msgid "apl"
+msgstr "apl"
+
+#: ../rules/base.extras.xml.in.h:2
+msgid "APL keyboard symbols"
+msgstr "APL-tastatursymboler"
 
-# Avestisk er et uddødt iransk sprog
 #: ../rules/base.extras.xml.in.h:5
-msgid "Avestan"
-msgstr "Avestisk"
+msgid "kut"
+msgstr "kut"
 
-# Er lidt usikker på betydningen af SIL, men antager at det drejer sig om:
-# http://www.sil.org/sil/
 #: ../rules/base.extras.xml.in.h:6
-msgid "Biblical SIL phonetic"
-msgstr "Bibelsk SIL-fonetik"
+msgid "Kutenai"
+msgstr "Kutenai"
 
-# http://en.wikipedia.org/wiki/Interior_Salish_languages
 #: ../rules/base.extras.xml.in.h:7
-msgid "Couer D'alene Salish"
-msgstr "Couer D'alene Salish"
+msgid "shs"
+msgstr "shs"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Krimtatarsk (Dobruja Q)"
-
-#: ../rules/base.extras.xml.in.h:10
-msgid "English (US, international AltGr Unicode combining)"
-msgstr "Engelsk (US, international AltGr Unicode-sammensætning)"
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:11
-msgid "English (US, international AltGr Unicode combining, alternative)"
-msgstr "Engelsk (US, international AltGr Unicode-sammensætning, alternativ)"
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Flersproglig (Canada, Sun type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "Tysk (US-tastatur med tyske bogstaver)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "Tysk (med ungarske bogstaver og ingen døde taster)"
 
-#: ../rules/base.extras.xml.in.h:16
-msgid "Hebrew (Biblical SIL)"
-msgstr "Hebraisk (bibelsk SIL)"
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "Tysk (Sun type 6/7)"
 
+# Avestisk er et uddødt iransk sprog
 #: ../rules/base.extras.xml.in.h:17
-msgid "Kutenai"
-msgstr "Kutenai"
-
-#: ../rules/base.extras.xml.in.h:19
-msgid "Latvian (US Colemak)"
-msgstr "Lettisk (US Colemak)"
+msgid "Avestan"
+msgstr "Avestisk"
 
 #: ../rules/base.extras.xml.in.h:20
-msgid "Latvian (US Colemak, apostrophe variant)"
-msgstr "Lettisk (US Colemak, apostrofvariant)"
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Litauisk (US dvorak med litauiske bogstaver)"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Litauisk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "Lettisk (US dvorak)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Lettisk (US dvorak, Y-variant)"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Lettisk (US dvorak, minus variant)"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Lettisk (programmør US dvorak)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Lettisk (programmør US dvorak, Y-variant)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Lettisk (programmør US dvorak, minus variant)"
 
-#: ../rules/base.extras.xml.in.h:28
-msgid "Lithuanian (US Dvorak with Lithuanian letters)"
-msgstr "Litauisk (US dvorak med litauiske bogstaver)"
+#: ../rules/base.extras.xml.in.h:30
+msgid "Latvian (US Colemak)"
+msgstr "Lettisk (US Colemak)"
 
 #: ../rules/base.extras.xml.in.h:31
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Lettisk (US Colemak, apostrofvariant)"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Lettisk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:35
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Engelsk (US, international AltGr Unicode-sammensætning)"
+
+#: ../rules/base.extras.xml.in.h:36
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "Engelsk (US, international AltGr Unicode-sammensætning, alternativ)"
+
+#: ../rules/base.extras.xml.in.h:37
+msgid "Atsina"
+msgstr "Atsina"
+
+# http://en.wikipedia.org/wiki/Interior_Salish_languages
+#: ../rules/base.extras.xml.in.h:38
+msgid "Couer D'alene Salish"
+msgstr "Couer D'alene Salish"
+
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr "Engelsk (US, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr "Polsk (international med døde taster)"
 
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "Polsk (Colemak)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "Polsk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:48
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Krimtatarsk (Dobruja Q)"
+
 # touchtype = blindskrift (altså at skrive uden at kigge)
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Rumænsk (ergonomisk maskinskrivning)"
 
-#: ../rules/base.extras.xml.in.h:35
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Rumænsk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:53
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Serbisk (sammensætte accenter frem for døde taster)"
+
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "Russisk (med ukrainsk-hviderussisk layout)"
 
-#: ../rules/base.extras.xml.in.h:36
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "Russisk (Sun type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:37
-msgid "Serbian"
-msgstr "Serbisk"
+#: ../rules/base.extras.xml.in.h:60
+msgid "Armenian (OLPC phonetic)"
+msgstr "Armensk (OLPC-fonetisk)"
 
-#: ../rules/base.extras.xml.in.h:38
-msgid "Serbian (combining accents instead of dead keys)"
-msgstr "Serbisk (sammensætte accenter frem for døde taster)"
+# Er lidt usikker på betydningen af SIL, men antager at det drejer sig om:
+# http://www.sil.org/sil/
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "Hebraisk (bibelsk, SIL-fonetik)"
 
-#: ../rules/base.extras.xml.in.h:39
-msgid "apl"
-msgstr "apl"
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Arabisk (Sun type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:47
-msgid "kut"
-msgstr "kut"
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Belgisk (Sun type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:53
-msgid "shs"
-msgstr "shs"
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "Portugisisk (brasiliansk, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "Tjekkisk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "Dansk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Hollandsk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Estisk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Finsk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "Fransk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "Græsk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "Italiensk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "Japansk (Sun type 6)"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Japansk (Sun type 7 - pc-kompatibel)"
+
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Japansk (Sun type 7 - sun-kompatibel)"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Norsk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Portugisisk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Slovakisk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "Spansk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "Svensk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr ">Tysk (Schweiz)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Tysk (Schweiz, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Fransk (Schweiz, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Tyrkisk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Ukrainsk (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "Engelsk (UK, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "Koreansk (Sun type 6/7)"
diff --git a/xorg-server/xkeyboard-config/po/de.po b/xorg-server/xkeyboard-config/po/de.po
index ab02dafec..b42910cc1 100644
--- a/xorg-server/xkeyboard-config/po/de.po
+++ b/xorg-server/xkeyboard-config/po/de.po
@@ -1,22 +1,21 @@
 # German translation of xkeyboard-config.
 # This file is distributed under the same license as the xkeyboard-config package.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2010, 2011, 2012.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2010, 2011, 2012, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.6.99\n"
+"Project-Id-Version: xkeyboard-config-2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-09-12 00:25+0100\n"
-"PO-Revision-Date: 2012-09-16 17:55+0100\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-20 20:25+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\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"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../rules/base.xml.in.h:1
 msgid "Generic 101-key PC"
@@ -699,3093 +698,3144 @@ msgid "OLPC"
 msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Sun Type 5/6"
-msgstr "Sun Typ 5/6"
+msgid "Sun Type 7 USB"
+msgstr "Sun Typ 7 USB"
 
 #: ../rules/base.xml.in.h:172
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun Typ 7 USB (Europäische Belegung)"
+
+#: ../rules/base.xml.in.h:173
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun Typ 7 USB (Unix-Belegung)"
+
+#: ../rules/base.xml.in.h:174
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun Typ 7 USB (Japanische Belegung) / Japanisch mit 106 Tasten"
+
+#: ../rules/base.xml.in.h:175
+msgid "Sun Type 6/7 USB"
+msgstr "Sun Typ 6/7 USB"
+
+#: ../rules/base.xml.in.h:176
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun Typ 6/7 USB (Europäische Belegung)"
+
+#: ../rules/base.xml.in.h:177
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun Typ 6 USB (Unix-Belegung)"
+
+#: ../rules/base.xml.in.h:178
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun Typ 6 USB (Japanische Belegung)"
+
+#: ../rules/base.xml.in.h:179
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun Typ 6 (Japanische Belegung)"
+
+#: ../rules/base.xml.in.h:180
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:181
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:182
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:183
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:184
 msgid "Htc Dream phone"
 msgstr "HTC Dream Mobiltelefon"
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
 msgid "English (US)"
 msgstr "English (USA)"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:189
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:190
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:191
 msgid "English (US, with euro on 5)"
 msgstr "Englisch (USA, mit Euro-Symbol auf 5)"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:192
 msgid "English (US, international with dead keys)"
 msgstr "Englisch (USA International, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:193
 msgid "English (US, alternative international)"
 msgstr "Englisch (USA, international alternativ)"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:194
 msgid "English (Colemak)"
 msgstr "Englisch (Colemak)"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:195
 msgid "English (Dvorak)"
 msgstr "Englisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:188
-msgid "English (Dvorak international with dead keys)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
 msgstr "Englisch (Dvorak International, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:197
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Englisch (Dvorak Alternative international, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:198
 msgid "English (left handed Dvorak)"
 msgstr "Englisch (Dvorak, linkshändig)"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:199
 msgid "English (right handed Dvorak)"
 msgstr "Englisch (Dvorak, rechtshändig)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:200
 msgid "English (classic Dvorak)"
 msgstr "Englisch (Dvorak, klassisch)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:201
 msgid "English (programmer Dvorak)"
 msgstr "Englisch (Dvorak für Programmierer)"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:204
 msgid "Russian (US, phonetic)"
 msgstr "Russisch (USA, phonetisch)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
 msgstr "Englisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:206
 msgid "English (international AltGr dead keys)"
 msgstr "Englisch (international, AltGr-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:207
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Englisch (Belegungsumschalter auf der Multiplikations-/Divisionstaste)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:208
 msgid "Serbo-Croatian (US)"
 msgstr "Serbokroatisch (US)"
 
-#. Keyboard indicator for Catalan layouts
-#: ../rules/base.xml.in.h:202
-msgid "ca"
-msgstr "ca"
+#: ../rules/base.xml.in.h:209
+msgid "English (Workman)"
+msgstr "Englisch (Workman)"
 
-#: ../rules/base.xml.in.h:203
-msgid "Catalan"
-msgstr "Katalanisch"
+#: ../rules/base.xml.in.h:210
+msgid "English (Workman, international with dead keys)"
+msgstr "Englisch (Workman International, mit Akzenttasten)"
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:213
 msgid "Afghani"
 msgstr "Afghani"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:215
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:216
 msgid "Pashto"
 msgstr "Paschtunisch"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:218
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:219
 msgid "Uzbek (Afghanistan)"
 msgstr "Usbekisch (Afghanistan)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:220
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paschtunisch (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:221
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persisch (Afghanistan, Dari-OLPC)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:222
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Usbekisch (Afghanistan, OLPC)"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:226
 msgid "Arabic (azerty)"
 msgstr "Arabisch (azerty)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:227
 msgid "Arabic (azerty/digits)"
 msgstr "Arabisch (azerty/Ziffern)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:228
 msgid "Arabic (digits)"
 msgstr "Arabisch (Ziffern)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:229
 msgid "Arabic (qwerty)"
 msgstr "Arabisch (qwerty)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:230
 msgid "Arabic (qwerty/digits)"
 msgstr "Arabisch (qwerty/Ziffern)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:231
 msgid "Arabic (Buckwalter)"
 msgstr "Arabisch (Buckwalter)"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:233
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:234
 msgid "Albanian"
 msgstr "Albanisch"
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
 msgid "Armenian"
 msgstr "Armenisch"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:238
 msgid "Armenian (phonetic)"
 msgstr "Armenisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:239
 msgid "Armenian (alternative phonetic)"
 msgstr "Armenisch (alternativ, phonetisch)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:240
 msgid "Armenian (eastern)"
 msgstr "Armenisch (östlich)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:241
 msgid "Armenian (western)"
 msgstr "Armenisch (westlich)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:242
 msgid "Armenian (alternative eastern)"
 msgstr "Armenisch (alternativ, östlich)"
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:245
 msgid "German (Austria)"
 msgstr "Deutsch (Österreich)"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:246
+msgid "German (legacy)"
+msgstr "Deutsch (veraltet)"
+
+#: ../rules/base.xml.in.h:247
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Deutsch (Österreich, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:248
 msgid "German (Austria, Sun dead keys)"
 msgstr "Deutsch (Österreich, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:249
 msgid "German (Austria, Macintosh)"
 msgstr "Deutsch (Österreich, Macintosh)"
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:251
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:252
 msgid "Azerbaijani"
 msgstr "Aserbaidschanisch"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:253
 msgid "Azerbaijani (Cyrillic)"
 msgstr "Aserbaidschanisch (kyrillisch)"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:255
 msgid "by"
 msgstr "by"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:256
 msgid "Belarusian"
 msgstr "Weißrussisch"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:257
 msgid "Belarusian (legacy)"
 msgstr "Weißrussisch (veraltet)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:258
 msgid "Belarusian (Latin)"
 msgstr "Weißrussisch (Lateinisch)"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
 msgid "Belgian"
 msgstr "Belgisch"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:262
 msgid "Belgian (alternative)"
 msgstr "Belgisch (Alternative)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:263
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belgisch (Alternative, nur latin-9)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:264
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belgisch (Alternative, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:265
 msgid "Belgian (ISO alternate)"
 msgstr "Belgisch (ISO-Alternative)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:266
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belgisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:267
 msgid "Belgian (Sun dead keys)"
 msgstr "Belgisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:268
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belgisch (Wang Modell 724, azerty)"
 
 #. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:270
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:271
 msgid "Bengali"
 msgstr "Bengalisch"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:272
 msgid "Bengali (Probhat)"
 msgstr "Bengalisch (Probhat)"
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:274
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:275
 msgid "Indian"
 msgstr "Indisch"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:276
 msgid "Bengali (India)"
 msgstr "Bengalisch (Indien)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:277
 msgid "Bengali (India, Probhat)"
 msgstr "Bengalisch (Indien, Probhat)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:278
 msgid "Bengali (India, Baishakhi)"
 msgstr "Bengalisch (Indien, Baishakhi)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:279
 msgid "Bengali (India, Bornona)"
 msgstr "Bengalisch (Indien, Bornona)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:280
 msgid "Bengali (India, Uni Gitanjali)"
 msgstr "Bengalisch (Indien, Uni Gitanjali)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:281
 msgid "Bengali (India, Baishakhi Inscript)"
 msgstr "Bengalisch (Indien, Baishakhi Inscript)"
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:283
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:284
 msgid "Gujarati"
 msgstr "Gujarati"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:286
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:287
 msgid "Punjabi (Gurmukhi)"
 msgstr "Punjabi (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:288
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Punjabi (Gurmukhi Jhelum)"
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:290
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:291
 msgid "Kannada"
 msgstr "Kannada"
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:293
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:294
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:295
 msgid "Malayalam (Lalitha)"
 msgstr "Malayalam (Lalitha)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:296
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malayalam (verbessertes Inscript mit Rupie-Symbol)"
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:298
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:299
 msgid "Oriya"
 msgstr "Oriya"
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:301
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:302
 msgid "Tamil (Unicode)"
 msgstr "Tamilisch (Unicode)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:303
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamilisch (Tastatur mit Ziffern)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:304
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamilisch (TAB Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:305
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamilisch (TSCII Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:306
 msgid "Tamil"
 msgstr "Tamilisch"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:308
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:309
 msgid "Telugu"
 msgstr "Telugu"
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:311
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:312
 msgid "Urdu (phonetic)"
 msgstr "Urdu (phonetisch)"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:313
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (Alternative, phonetisch)"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:314
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (Windows-Tasten)"
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:316
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:317
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (Bolnagri)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:318
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:319
 msgid "English (India, with RupeeSign)"
 msgstr "Englisch (Indien, mit Rupie-Symbol)"
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:321
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:322
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:323
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnisch (Anführungszeichen für Zitate verwenden)"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:324
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnisch (Bosnische Digraphen verwenden)"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:325
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosnisch (US-Tastatur mit bosnischen Digraphen)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:326
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnisch (US-Tastatur mit bosnischen Buchstaben)"
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
 msgid "Portuguese (Brazil)"
 msgstr "Portugiesisch (Brasilien)"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:330
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugiesisch (Brasilien, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:331
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugiesisch (Brasilien, Dvorak)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:332
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugiesisch (Brasilien, nativo)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:333
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugiesisch (Brasilien, Nativo für US-Tastaturen)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:334
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugiesisch (Brasilien, Nativo für Esperanto)"
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:336
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:337
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:338
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgarisch (traditionell phonetisch)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:339
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgarisch (neu phonetisch)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:340
 msgid "Arabic (Morocco)"
 msgstr "Arabisch (Marokko)"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:343
 msgid "French (Morocco)"
 msgstr "Französisch (Marokko)"
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:345
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:346
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berber (Marokko, Tifinagh)"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:347
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "TBerber (Marokko, Tifinagh alternativ)"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:348
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berber (Marokko, Tifinagh alternativ, phonetisch)"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:349
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berber (Marokko, Tifinagh erweitert)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:350
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berber (Marokko, Tifinagh phonetisch)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:351
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berber (Marokko, Tifinagh erweitert, phonetisch)"
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
 msgid "English (Cameroon)"
 msgstr "Englisch (Kamerun)"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:355
 msgid "French (Cameroon)"
 msgstr "Französisch (Kamerun)"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:356
 msgid "Cameroon Multilingual (qwerty)"
 msgstr "Kamerunisch, mehrsprachig (qwerty)"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:357
 msgid "Cameroon Multilingual (azerty)"
 msgstr "Kamerunisch, mehrsprachig (azerty)"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:358
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr "Kamerunisch, mehrsprachig (Dvorak)"
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:360
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:361
 msgid "Burmese"
 msgstr "Burmesisch"
 
-#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr "Französisch (Kanada)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:363
 msgid "French (Canada, Dvorak)"
 msgstr "Französisch (Kanada, Dvorak)"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:364
 msgid "French (Canada, legacy)"
 msgstr "Französisch (Kanada, veraltet)"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:365
 msgid "Canadian Multilingual"
 msgstr "Kanadisch, mehrsprachig"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:366
 msgid "Canadian Multilingual (first part)"
 msgstr "Kanadisch, mehrsprachig (erster Teil)"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:367
 msgid "Canadian Multilingual (second part)"
 msgstr "Kanadisch, mehrsprachig (zweiter Teil)"
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:369
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:370
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:371
 msgid "English (Canada)"
 msgstr "Englisch (Kanada)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:372
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Französisch (Demokratische Republik Kongo)"
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:374
 msgid "zh"
 msgstr "zh"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:375
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:376
 msgid "Tibetan"
 msgstr "Tibetanisch"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:377
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetanisch (mit ASCII-Ziffern)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:378
 msgid "Uyghur"
 msgstr "Uigurisch"
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:380
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:381
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:382
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Kroatisch (Anführungszeichen für Zitate verwenden)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:383
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Kroatisch (Kroatische Digraphen verwenden)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:384
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Kroatisch (US-Tastatur mit kroatischen Digraphen)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:385
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Kroatisch (US-Tastatur mit kroatischen Buchstaben)"
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:389
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Tschechisch (mit &lt;\\|&gt;-Taste)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:390
 msgid "Czech (qwerty)"
 msgstr "Tschechisch (qwerty)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:391
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Tschechisch (qwerty, erweiterter Backslash)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:392
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Tschechisch (UCW-Belegung, nur akzentuierte Buchstaben)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:393
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Tschechisch (US Dvorak mit CZ-UCW-Unterstützung)"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
 msgid "Danish"
 msgstr "Dänisch"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:397
 msgid "Danish (eliminate dead keys)"
 msgstr "Dänisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:398
 msgid "Danish (Macintosh)"
 msgstr "Dänisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:399
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Dänisch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:400
 msgid "Danish (Dvorak)"
 msgstr "Dänisch (Dvorak)"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:404
 msgid "Dutch (Sun dead keys)"
 msgstr "Niederländisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:405
 msgid "Dutch (Macintosh)"
 msgstr "Niederländisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:406
 msgid "Dutch (standard)"
 msgstr "Niederländisch (Standard)"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:408
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:409
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
 msgid "Estonian"
 msgstr "Estnisch"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:413
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estnisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:414
 msgid "Estonian (Dvorak)"
 msgstr "Estnisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estnisch (US-Tastatur mit estnischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
 msgid "Persian"
 msgstr "Persisch"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Persian (with Persian Keypad)"
 msgstr "Persisch (mit persischem Nummernblock)"
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurdisch (Iran, Lateinisches Q)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 msgid "Kurdish (Iran, F)"
 msgstr "Kurdisch (Iran, F)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurdisch (Iran, Lateinisches Alt-Q)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurdisch (Iran, Arabisch-Lateinisch)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
 msgid "Iraqi"
 msgstr "Irakisch"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:425
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurdisch (Irak, lateinisches Q)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:426
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurdisch (Irak, F)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:427
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurdisch (Irak, Lateinisches Alt-Q)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:428
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurdisch (Irak, Arabisch-Lateinisch)"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:430
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:431
 msgid "Faroese"
 msgstr "Färöisch"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:432
 msgid "Faroese (eliminate dead keys)"
 msgstr "Färöisch (ohne Akzenttasten)"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:436
 msgid "Finnish (classic)"
 msgstr "Finnisch (klassisch)"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finnisch (klassisch, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Northern Saami (Finland)"
 msgstr "Nördliches Saami (Finnland)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Finnish (Macintosh)"
 msgstr "Finnisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
 msgid "French"
 msgstr "Französisch"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:441
 msgid "French (eliminate dead keys)"
 msgstr "Französisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "French (Sun dead keys)"
 msgstr "Französisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "French (alternative)"
 msgstr "Französisch (alternativ)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "French (alternative, latin-9 only)"
 msgstr "Französisch (Alternative, nur latin-9)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Französisch (Alternative, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "French (alternative, Sun dead keys)"
 msgstr "Französisch (Alternative, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "French (legacy, alternative)"
 msgstr "Französisch (Alternative, veraltet)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Französisch (Alternative, veraltet, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Französisch (Alternative, veraltet, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Französich (Bepo, ergonomisch, Dvorak-ähnlich)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Französisch (Bepo, ergonomisch, Dvorak-ähnlich, nur latin-9)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:452
 msgid "French (Dvorak)"
 msgstr "Französisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:453
 msgid "French (Macintosh)"
 msgstr "Französisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:454
 msgid "French (Breton)"
 msgstr "Französisch (Bretonisch)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:455
 msgid "Occitan"
 msgstr "Okzitanisch"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:456
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Georgisch (Frankreich, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:457
 msgid "English (Ghana)"
 msgstr "Englisch (Ghana)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:458
 msgid "English (Ghana, multilingual)"
 msgstr "Englisch (Ghana, mehrsprachig)"
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:460
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:461
 msgid "Akan"
 msgstr "Akan"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:463
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:464
 msgid "Ewe"
 msgstr "Ewe"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:466
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:467
 msgid "Fula"
 msgstr "Fula"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:469
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:470
 msgid "Ga"
 msgstr "Ga"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:472
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:473
 msgid "Hausa"
 msgstr "Haussa"
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:475
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:476
 msgid "Avatime"
 msgstr "Avatime"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:477
 msgid "English (Ghana, GILLBT)"
 msgstr "Englisch (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:478
 msgid "French (Guinea)"
 msgstr "Französisch (Guinea)"
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:480
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:481
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:482
 msgid "Georgian (ergonomic)"
 msgstr "Georgisch (ergonomisch)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:483
 msgid "Georgian (MESS)"
 msgstr "Georgisch (MESS)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:484
 msgid "Russian (Georgia)"
 msgstr "Russisch (Georgien)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:485
 msgid "Ossetian (Georgia)"
 msgstr "Ossetisch (Georgien)"
 
-#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
 msgid "German"
 msgstr "Deutsch"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:487
 msgid "German (dead acute)"
 msgstr "Deutsch (Nur Acute-(')Akzentzeichen)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:488
 msgid "German (dead grave acute)"
 msgstr "Deutsch (Nur Grave-(`) und Acute-(')Akzentzeichen)"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:489
 msgid "German (eliminate dead keys)"
 msgstr "Deutsch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:490
 msgid "Romanian (Germany)"
 msgstr "Rumänisch (Deutschland)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:491
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Rumänisch (Deutschland, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:492
 msgid "German (Dvorak)"
 msgstr "Deutsch (Dvorak)"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:493
 msgid "German (Sun dead keys)"
 msgstr "Deutsch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:494
 msgid "German (Neo 2)"
 msgstr "Deutsch (Neo 2)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:495
 msgid "German (Macintosh)"
 msgstr "Deutsch (Macintosh)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:496
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Deutsch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:497
 msgid "Lower Sorbian"
 msgstr "Niedersorbisch"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:498
 msgid "Lower Sorbian (qwertz)"
 msgstr "Niedersorbisch (qwertz)"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:499
 msgid "German (qwerty)"
 msgstr "Deutsch (qwerty)"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:500
 msgid "Russian (Germany, phonetic)"
 msgstr "Russisch (Deutschland, phonetisch)"
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:504
 msgid "Greek (simple)"
 msgstr "Griechisch (vereinfacht)"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:505
 msgid "Greek (extended)"
 msgstr "Griechisch (erweitert)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:506
 msgid "Greek (eliminate dead keys)"
 msgstr "Griechisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:507
 msgid "Greek (polytonic)"
 msgstr "Griechisch (polytonisch)"
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:509
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (standard)"
 msgstr "Ungarisch (Standard)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Ungarisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (qwerty)"
 msgstr "Ungarisch (qwerty)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Ungarisch (101/qwertz/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Ungarisch (101/qwertz/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Ungarisch (101/qwertz/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Ungarisch (101/qwertz/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Ungarisch (101/qwerty/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Ungarisch (101/qwerty/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Ungarisch (101/qwerty/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:521
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Ungarisch (101/qwerty/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:522
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Ungarisch (102/qwertz/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:523
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Ungarisch (102/qwertz/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:524
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Ungarisch (102/qwertz/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:525
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Ungarisch (102/qwertz/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:526
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Ungarisch (102/qwerty/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:527
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Ungarisch (102/qwerty/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:528
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Ungarisch (102/qwerty/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:529
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Ungarisch (102/qwerty/Punkt/ohne Akzenttasten)"
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:531
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:532
 msgid "Icelandic"
 msgstr "Isländisch"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:533
 msgid "Icelandic (Sun dead keys)"
 msgstr "Isländisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:534
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Isländisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:535
 msgid "Icelandic (Macintosh)"
 msgstr "Isländisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:536
 msgid "Icelandic (Dvorak)"
 msgstr "Isländisch (Dvorak)"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:540
 msgid "Hebrew (lyx)"
 msgstr "Hebräisch (lyx)"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:541
 msgid "Hebrew (phonetic)"
 msgstr "Hebräisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:542
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hebräisch (Biblisch, Tiro)"
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:546
 msgid "Italian (eliminate dead keys)"
 msgstr "Italienisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:547
 msgid "Italian (Macintosh)"
 msgstr "Italienisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:548
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italienisch (US-Tastatur mit italienischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:549
 msgid "Georgian (Italy)"
 msgstr "Georgisch (Italien)"
 
+#: ../rules/base.xml.in.h:550
+msgid "Italian (IBM 142)"
+msgstr "Italienisch (IBM 142)"
+
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:554
 msgid "Japanese (Kana)"
 msgstr "Japanisch (Kana)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:555
 msgid "Japanese (Kana 86)"
 msgstr "Japanisch (Kana 86)"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:556
 msgid "Japanese (OADG 109A)"
 msgstr "Japanisch (OADG 109A)"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:557
 msgid "Japanese (Macintosh)"
 msgstr "Japanisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:558
 msgid "Japanese (Dvorak)"
 msgstr "Japanisch (Dvorak)"
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:560
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:561
 msgid "Kyrgyz"
 msgstr "Kirgisisch"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:562
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgisisch (phonetisch)"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:564
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:565
 msgid "Khmer (Cambodia)"
 msgstr "Khmer (Kambodscha)"
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:567
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:568
 msgid "Kazakh"
 msgstr "Kasachisch"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:569
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Russisch (Kasachstan, mit Kasachisch)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:570
 msgid "Kazakh (with Russian)"
 msgstr "Kasachisch (mit russischer Belegung)"
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:572
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:573
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:574
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Laotisch (durch STEA vorgeschlagene Standardbelegung)"
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:577
 msgid "Spanish (Latin American)"
 msgstr "Spabisch (Lateinamerikanisch)"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:578
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Spanisch (Lateinamerikanisch, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:579
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Spanisch (Lateinamerikanisch, Akzent-Tilde einschließen)"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:580
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Spanisch (Lateinamerikanisch, Sun-Akzenttasten)"
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:584
 msgid "Lithuanian (standard)"
 msgstr "Litauisch (Standard)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:585
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litauisch (US-Tastatur mit litauischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:586
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litauisch (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:587
 msgid "Lithuanian (LEKP)"
 msgstr "Litauisch (LEKP)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:588
 msgid "Lithuanian (LEKPa)"
 msgstr "Litauisch (LEKPa)"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
 msgid "Latvian"
 msgstr "Lettisch"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:592
 msgid "Latvian (apostrophe variant)"
 msgstr "Lettisch, (Apostroph-Variante)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:593
 msgid "Latvian (tilde variant)"
 msgstr "Lettisch (Tilde-Variante)"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:594
 msgid "Latvian (F variant)"
 msgstr "Lettisch (F-Variante)"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:595
 msgid "Latvian (modern)"
 msgstr "Lettisch (modern)"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:596
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Georgisch (ergonomisch, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:597
 msgid "Latvian (adapted)"
 msgstr "Lettisch (angepasst)"
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:599
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:600
 msgid "Maori"
 msgstr "Maori"
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:603
 msgid "Montenegrin"
 msgstr "Montenegrinisch"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:604
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrinisch (kyrillisch)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:605
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrinisch, (Kyrillisch, »З« und »Ж« vertauscht)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:606
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Montenegrinisch (lateinisch, Unicode)"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:607
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Montenegrinisch (lateinische qwerty-Tastatur)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:608
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Montenegrinisch (lateinische qwerty-Tastatur, Unicode)"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:609
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrinisch (Kyrillisch mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:610
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrinisch (lateinisch mit Anführungszeichen)"
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:612
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:613
 msgid "Macedonian"
 msgstr "Mazedonisch"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:614
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Mazedonisch (ohne Akzenttasten)"
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:616
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:617
 msgid "Maltese"
 msgstr "Maltesisch"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:618
 msgid "Maltese (with US layout)"
 msgstr "Maltesisch (mit US-Belegung)"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:620
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:621
 msgid "Mongolian"
 msgstr "Mongolisch"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:625
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norwegisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:626
 msgid "Norwegian (Dvorak)"
 msgstr "Norwegisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:627
 msgid "Northern Saami (Norway)"
 msgstr "Nördliches Saami (Norwegen)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:628
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Nördliches Saami (Norwegen, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:629
 msgid "Norwegian (Macintosh)"
 msgstr "Norwegisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:630
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Norwegisch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:631
 msgid "Norwegian (Colemak)"
 msgstr "Norwegisch (Colemak)"
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:635
+msgid "Polish (legacy)"
+msgstr "Polnisch (veraltet)"
+
+#: ../rules/base.xml.in.h:636
 msgid "Polish (qwertz)"
 msgstr "Polnisch (qwertz)"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:637
 msgid "Polish (Dvorak)"
 msgstr "Polnisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:638
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Polnisch (Dvorak, polnische Anführungszeichen auf Taste mit Zitatzeichen)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:639
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Polnisch (Dvorak, polnische Anführungszeichen auf Taste 1)"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:640
 msgid "Kashubian"
 msgstr "Kaschubisch"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:641
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Russisch (Polen, phonetisch, Dvorak)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:642
 msgid "Polish (programmer Dvorak)"
 msgstr "Polnisch (Dvorak für Programmierer)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:644
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugiesisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:645
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugiesisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:646
 msgid "Portuguese (Macintosh)"
 msgstr "Portugiesisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:647
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugiesisch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:648
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugiesisch (Macintosh, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:649
 msgid "Portuguese (Nativo)"
 msgstr "Portugiesisch (Nativo)"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:650
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugiesisch (Nativo für US-Tastaturen)"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:651
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Esperanto (Portugal, Nativo)"
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
 msgstr "Rumänisch (Cedilla)"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Rumänisch (Standard)"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard cedilla)"
 msgstr "Rumänisch (Standard Cedilla)"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:658
 msgid "Romanian (WinKeys)"
 msgstr "Rumänisch (Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:660
 msgid "Russian (phonetic)"
 msgstr "Russisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:661
 msgid "Russian (phonetic WinKeys)"
 msgstr "Russisch (phonetisch mit Win-Tasten)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:662
 msgid "Russian (typewriter)"
 msgstr "Russisch (Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:663
 msgid "Russian (legacy)"
 msgstr "Russisch (veraltet)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:664
 msgid "Russian (typewriter, legacy)"
 msgstr "Russisch (Schreibmaschine, veraltet)"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:665
 msgid "Tatar"
 msgstr "Tatarisch"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Ossetian (legacy)"
 msgstr "Ossetisch (veraltet)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:667
 msgid "Ossetian (WinKeys)"
 msgstr "Ossetisch (Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:668
 msgid "Chuvash"
 msgstr "Tschuwaschisch"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:669
 msgid "Chuvash (Latin)"
 msgstr "Tschuwaschisch (lateinische Schrift)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:670
 msgid "Udmurt"
 msgstr "Udmurtisch"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:671
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:672
 msgid "Yakut"
 msgstr "Jakutisch"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:673
 msgid "Kalmyk"
 msgstr "Kalmykisch"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:674
 msgid "Russian (DOS)"
 msgstr "Russisch (DOS)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:675
 msgid "Serbian (Russia)"
 msgstr "Serbisch (Russland)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:676
 msgid "Bashkirian"
 msgstr "Baschkirisch"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:677
 msgid "Mari"
 msgstr "Mari"
 
-#: ../rules/base.xml.in.h:668
-msgid "Serbian (Cyrillic)"
-msgstr "Serbisch (Kyrillisch)"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "Serbisch"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:679
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr "Serbisch, (Kyrillisch, »З« und »Ж« vertauscht)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:680
 msgid "Serbian (Latin)"
 msgstr "Serbisch (Lateinisch)"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:681
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbisch (Lateinisch Unicode)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:682
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbisch (Lateinische qwerty-Tastatur)"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:683
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbisch (lateinische qwerty-Tastatur, Unicode)"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr "Serbisch (Kyrillisch mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbisch (Lateinisch mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:686
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Pannonisches Russinisch (homophon)"
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:688
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:689
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:690
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Slowenisch (Anführungszeichen für Zitate verwenden)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:691
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Slowenisch (US-Tastatur mit slowenischen Buchstaben)"
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:695
 msgid "Slovak (extended Backslash)"
 msgstr "Slowakisch (erweiterter Backslash)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:696
 msgid "Slovak (qwerty)"
 msgstr "Slowakisch (qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:697
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slowakisch (qwerty, erweiterter Backslash)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:699
 msgid "Spanish (eliminate dead keys)"
 msgstr "Spanisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:700
 msgid "Spanish (include dead tilde)"
 msgstr "Spanisch (Akzent-Tilde einschließen)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:701
 msgid "Spanish (Sun dead keys)"
 msgstr "Spanisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:702
 msgid "Spanish (Dvorak)"
 msgstr "Spanisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:703
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr "Asturisch (Spanien, mit unterpunktetem L und H)"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:704
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Katalanisch (Spanische Variante mit mittelpunktiertem L)"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:705
 msgid "Spanish (Macintosh)"
 msgstr "Spanisch (Macintosh)"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:709
 msgid "Swedish (eliminate dead keys)"
 msgstr "Schwedisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:710
 msgid "Swedish (Dvorak)"
 msgstr "Schwedisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:711
 msgid "Russian (Sweden, phonetic)"
 msgstr "Russisch (Schweden, phonetisch)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:712
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Russisch (Schweden, phonetisch, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:713
 msgid "Northern Saami (Sweden)"
 msgstr "Nördliches Saami (Schweden)"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:714
 msgid "Swedish (Macintosh)"
 msgstr "Schwedisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:715
 msgid "Swedish (Svdvorak)"
 msgstr "Schwedisch (Svdvorak)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:716
 msgid "Swedish Sign Language"
 msgstr "Schwedische Gebärdensprache"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:717
 msgid "German (Switzerland)"
 msgstr "Deutsch (Schweiz)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:718
 msgid "German (Switzerland, legacy)"
 msgstr "Deutsch (Schweiz, veraltet)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:719
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Deutsch (Schweiz, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:720
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Deutsch (Schweiz, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:721
 msgid "French (Switzerland)"
 msgstr "Französisch (Schweiz)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:722
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Französisch (Schweiz, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Französisch (Schweiz, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
 msgid "French (Switzerland, Macintosh)"
 msgstr "Französisch (Schweiz, Macintosh)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
 msgid "German (Switzerland, Macintosh)"
 msgstr "Deutsch (Schweiz, Macintosh)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
 msgid "Arabic (Syria)"
 msgstr "Arabisch (Syrien)"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:728
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:729
 msgid "Syriac"
 msgstr "Syrisch"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:730
 msgid "Syriac (phonetic)"
 msgstr "Syrisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurdisch (Syrien, lateinisches Q)"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
 msgid "Kurdish (Syria, F)"
 msgstr "Kurdisch (Syrien, F)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurdisch (Syrien, lateinisches Alt-Q)"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
 msgid "Tajik"
 msgstr "Tadschikisch"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "Tadschikisch (veraltet)"
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:739
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
 msgid "Sinhala (phonetic)"
 msgstr "Sinhala (phonetisch)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamilisch (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamilisch (Sri Lanka, TAB Schreibmaschine)"
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
 msgid "Thai (TIS-820.2538)"
 msgstr "Thailändisch (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Thailändisch (Pattachote)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
 msgid "Turkish (F)"
 msgstr "Türkisch, (F)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
 msgid "Turkish (Alt-Q)"
 msgstr "Türkisch (Alt-Q)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
 msgid "Turkish (Sun dead keys)"
 msgstr "Türkisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurdisch (Türkei, lateinisches Q)"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurdisch (Türkei, F)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:756
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurdisch (Türkei, lateinisches Alt-Q)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
 msgid "Turkish (international with dead keys)"
 msgstr "Türkisch (International, mit Akzenttasten)"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:760
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krimtatarisch (Türkisch Q)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krimtatarisch (Türkisch F)"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krimtatarisch (Türkisch Alt-Q)"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
 msgid "Taiwanese"
 msgstr "Taiwanesisch"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanesisch (indigen)"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Taiwan)"
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:771
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrainisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:772
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrainisch (Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukrainisch (Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (legacy)"
 msgstr "Ukrainisch (veraltet)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrainisch (Standard-RSTU)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Russisch (Ukraine, Standard-RSTU)"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrainisch (homophon)"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
 msgid "English (UK)"
 msgstr "Englisch (Britisch)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
 msgid "English (UK, extended WinKeys)"
 msgstr "Englisch (Britisch erweitert, Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:780
 msgid "English (UK, international with dead keys)"
 msgstr "Englisch (Britisch international, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:781
 msgid "English (UK, Dvorak)"
 msgstr "Englisch (Britisch, Dvorak)"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Englisch (Dvorak mit britischer Punktierung)"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
 msgid "English (UK, Macintosh)"
 msgstr "Englisch (Britisch, Macintosh)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
 msgid "English (UK, Macintosh international)"
 msgstr "Englisch (Britisch, Macintosh international)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
 msgid "English (UK, Colemak)"
 msgstr "English (Britisch, Colemak)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
 msgid "Uzbek"
 msgstr "Usbekisch"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:787
 msgid "Uzbek (Latin)"
 msgstr "Usbekisch (lateinische Schrift)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:790
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreanisch (101/104-Tasten kompatibel)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japanisch (PC-98xx-Serie)"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
 msgid "Irish"
 msgstr "Irisch"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:800
 msgid "Irish (UnicodeExpert)"
 msgstr "Irisch (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
 msgid "Ogham"
 msgstr "Ogham"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
 msgid "Ogham (IS434)"
 msgstr "Ogham (IS434)"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakistan)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
 msgid "Arabic (Pakistan)"
 msgstr "Arabisch (Pakistan)"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
 msgid "Sindhi"
 msgstr "Sindhi"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
 msgid "Dhivehi"
 msgstr "Dhivehi"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:813
 msgid "English (South Africa)"
 msgstr "Englisch (Südafrika)"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:815
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (falsch platziertes Semikolon und Anführungszeichen, veraltet)"
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
 msgid "Nepali"
 msgstr "Nepalesisch"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
 msgid "English (Nigeria)"
 msgstr "Englisch (Nigeria)"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
 msgid "Igbo"
 msgstr "Igbo"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
 msgid "Yoruba"
 msgstr "Joruba"
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:829
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
 msgid "Amharic"
 msgstr "Amharisch"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:832
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
 msgid "Wolof"
 msgstr "Wolof"
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:836
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
 msgid "Braille (left hand)"
 msgstr "Braille (linkshändig)"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
 msgid "Braille (right hand)"
 msgstr "Braille (rechtshändig)"
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:840
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
 msgid "Turkmen"
 msgstr "Turkmenisch"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmenisch (Alt-Q)"
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:844
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
 msgid "Bambara"
 msgstr "Bambara"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
 msgid "French (Mali, alternative)"
 msgstr "Französisch (Mali, Alternative)"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:847
 msgid "English (Mali, US Macintosh)"
 msgstr "Englisch (Mali, USA Macintosh)"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
 msgid "English (Mali, US international)"
 msgstr "Englisch (Mali, USA International)"
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:850
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
 msgid "Swahili (Tanzania)"
 msgstr "Swahili (Tansania)"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
 msgid "Swahili (Kenya)"
 msgstr "Swahili (Kenia)"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:853
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:856
 msgid "Tswana"
 msgstr "Tswana"
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
 msgid "Filipino"
 msgstr "Philippinisch"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Philippinisch (QWERTY, Baybayin)"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:861
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Philippinisch (Capewell-Dvorak, Lateinisch)"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Philippinisch (Capewell-Dvorak, Baybayin)"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Philippinisch (Capewell-QWERF 2006, lateinisch)"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Philippinisch (Capewell-QWERF 2006, Baybayin)"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:865
 msgid "Filipino (Colemak Latin)"
 msgstr "Philippinisch (Colemak, lateinisch)"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Philippinisch (Colemak, Baybayin)"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
 msgid "Filipino (Dvorak Latin)"
 msgstr "Philippinisch (Dvorak, lateinisch)"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Philippinisch (Dvorak, Baybayin)"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
 msgid "md"
 msgstr "md"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
 msgid "Moldavian"
 msgstr "Moldawisch"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:871
 msgid "gag"
 msgstr "gag"
 
-#: ../rules/base.xml.in.h:862
-msgid "Gagauz"
-msgstr "Gagauz"
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "Moldauisch (Gagauz)"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
 msgid "Key(s) to change layout"
 msgstr "Taste(n) zum Wechseln der Belegung"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
 msgid "Right Alt (while pressed)"
 msgstr "Rechte Alt-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
 msgid "Left Alt (while pressed)"
 msgstr "Linke Alt-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:876
 msgid "Left Win (while pressed)"
 msgstr "Linke Windows-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
 msgid "Right Win (while pressed)"
 msgstr "Rechte Windows-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
 msgid "Any Win key (while pressed)"
 msgstr "Beliebige Windows-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:879
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Feststelltaste (gedrückt halten), Alt+Feststelltaste führen die normale Feststelltasten-Aktion aus"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
 msgid "Right Ctrl (while pressed)"
 msgstr "Rechte Strg-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
 msgid "Right Alt"
 msgstr "Rechte Alt-Taste"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
 msgid "Left Alt"
 msgstr "Linke Alt-Taste"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
 msgid "Caps Lock"
 msgstr "Feststelltaste"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
 msgid "Shift+Caps Lock"
 msgstr "Umschalt-+Feststelltaste"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Feststelltaste (zur ersten Belegung), Umschalttaste+Feststelltaste (zur letzten Belegung)"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
 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:877
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Linke Strg-Taste (zur ersten Belegung), rechte Strg-Taste (zur letzten Belegung)"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
 msgid "Alt+Caps Lock"
 msgstr "Alt+Feststelltaste"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
 msgid "Both Shift keys together"
 msgstr "Beide Umschalttasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
 msgid "Both Alt keys together"
 msgstr "Beide Alt-Tasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
 msgid "Both Ctrl keys together"
 msgstr "Beide Steuerungstasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
 msgid "Ctrl+Shift"
 msgstr "Strg+Umschalttaste"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
 msgid "Left Ctrl+Left Shift"
 msgstr "Linke Strg-Taste+Linke Umschalttaste"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
 msgid "Right Ctrl+Right Shift"
 msgstr "Rechte Strg-Taste und rechte Umschalttaste"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
 msgid "Alt+Ctrl"
 msgstr "Alt+Strg"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
 msgid "Alt+Shift"
 msgstr "Alt+Umschalttaste"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
 msgid "Left Alt+Left Shift"
 msgstr "Linke Alt-Taste+Linke Umschalttaste"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
 msgid "Alt+Space"
 msgstr "Alt+Leertaste"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
 msgid "Menu"
 msgstr "Menü"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
 msgid "Left Win"
 msgstr "Linke Windows-Taste"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
 msgid "Right Win"
 msgstr "Rechte Windows-Taste"
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
 msgid "Left Shift"
 msgstr "Linke Umschalttaste"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
 msgid "Right Shift"
 msgstr "Rechte Umschalttaste"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl"
 msgstr "Linke Strg-Taste"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
 msgid "Right Ctrl"
 msgstr "Rechte Strg-Taste"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
 msgid "Scroll Lock"
 msgstr "Rollen"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Linke Strg-Taste und linke Win-Taste (zur ersten Belegung), rechte Strg-Taste und Menütaste (zur zweiten Belegung)"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
 msgid "Key to choose 3rd level"
 msgstr "Taste zum Wechsel in die dritte Tastaturebene"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
 msgid "Any Win key"
 msgstr "Beliebige Windows-Taste"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
 msgid "Any Alt key"
 msgstr "Beliebige Alt-Taste"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
 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:902
+#: ../rules/base.xml.in.h:912
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Rechte Alt-Taste wählt niemals die dritte Tastaturebene."
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
 msgid "Enter on keypad"
 msgstr "Eingabetaste im Nummernblock"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
 msgid "Backslash"
 msgstr "Backslash"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Kleiner als/größer als&gt;"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
 msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Feststelltaste wählt die dritte Ebene, sperrt einmalig wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der dritten Ebene"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
 msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Backslash wählt die dritte Ebene, sperrt einmalig wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der dritten Ebene"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
 msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "&lt;Kleiner als/Größer als&gt; wählt die dritte Ebene, sperrt einmalig wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der dritten Ebene"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
 msgid "Ctrl key position"
 msgstr "Position der Strg-Taste"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
 msgid "Caps Lock as Ctrl"
 msgstr "Feststelltaste als Strg-Taste"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
 msgid "Left Ctrl as Meta"
 msgstr "Linke Strg-Taste als Meta"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Strg-Taste und Feststelltaste vertauschen"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
 msgid "At left of 'A'"
 msgstr "Links von »A«"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:924
 msgid "At bottom left"
 msgstr "Unten links"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:925
 msgid "Right Ctrl as Right Alt"
 msgstr "Rechte Strg-Taste wie rechte Alt-Taste"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:926
 msgid "Menu as Right Ctrl"
 msgstr "Menü als rechte Strg-Taste"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:927
 msgid "Right Alt as Right Ctrl"
 msgstr "Rechte Alt-Taste als rechte Strg-Taste"
 
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:928
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Tastatur-LED zur Anzeige der alternativen Belegung verwenden"
 
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:929
 msgid "Num Lock"
 msgstr "NumLock"
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:930
 msgid "Numeric keypad layout selection"
 msgstr "Belegungsauswahl des Nummernblocks"
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:931
 msgid "Legacy"
 msgstr "Veraltet"
 
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:932
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode-Ergänzungen (Pfeile und mathematische Operatoren)"
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:933
 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:924
+#: ../rules/base.xml.in.h:934
 msgid "Legacy Wang 724"
 msgstr "Wang 724 (veraltet)"
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:935
 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:926
+#: ../rules/base.xml.in.h:936
 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:927
+#: ../rules/base.xml.in.h:937
 msgid "Hexadecimal"
 msgstr "Hexadezimal"
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:938
 msgid "ATM/phone-style"
 msgstr "ATM/Telefonstil"
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:939
 msgid "Numeric keypad delete key behaviour"
 msgstr "Verhalten der Löschtaste des Nummernblocks"
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:940
 msgid "Legacy key with dot"
 msgstr "Veraltete Taste mit Punkt"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:942
 msgid "Legacy key with comma"
 msgstr "Veraltete Taste mit Komma"
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:943
 msgid "Four-level key with dot"
 msgstr "Taste der vierten Ebene mit Punkt"
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:944
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Taste der vierten Ebene mit Punkt, latin-9-Einschränkung"
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:945
 msgid "Four-level key with comma"
 msgstr "Taste der vierten Ebene mit Komma"
 
 # momayyez? Was ist das?
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:946
 msgid "Four-level key with momayyez"
 msgstr "Taste der vierten Ebene mit »momayyez«"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:949
 msgid "Four-level key with abstract separators"
 msgstr "Taste der vierten Ebene mit abstrakten Trennern"
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:950
 msgid "Semi-colon on third level"
 msgstr "Semikolon in der dritten Tastaturebene"
 
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:951
 msgid "Caps Lock key behavior"
 msgstr "Verhalten der Feststelltaste"
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:952
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Feststelltaste verwendet interne Großschreibung. Umschalttaste »unterbricht« Feststelltaste"
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:953
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Feststelltaste verwendet interne Großschreibung. Umschalttaste beeinflusst Feststelltaste nicht"
 
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:954
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Feststelltaste arbeitet als Umschalttaste mit Sperrung. Umschalttaste »unterbricht« Feststelltaste"
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:955
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Feststelltaste arbeitet als Umschalttaste mit Sperrung. Umschalttaste beeinflusst Feststelltaste nicht"
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:956
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Feststelltaste kehrt die normale Großschreibung alphabetischer Zeichen um"
 
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:957
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Feststelltaste als zusätzliche NumLock-Taste verwenden"
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:958
 msgid "Swap ESC and Caps Lock"
 msgstr "Esc und Feststelltaste vertauschen"
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:959
 msgid "Make Caps Lock an additional ESC"
 msgstr "Feststelltaste als zusätzliche Esc-Taste verwenden"
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:960
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Feststelltaste als zusätzliche Löschtaste verwenden"
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:961
 msgid "Make Caps Lock an additional Super"
 msgstr "Feststelltaste als zusätzliche Super-Taste verwenden"
 
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:962
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Feststelltaste als zusätzliche Hyper-Taste verwenden"
 
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:963
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Feststelltaste kehrt Umschalttaste um, so dass alle Tasten beeinflusst werden"
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:964
 msgid "Caps Lock is disabled"
 msgstr "Feststelltaste ist deaktiviert"
 
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:965
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Feststelltaste als zusätzliche Strg-Taste verwenden, aber Caps_Lock als Schnellzugriff erhalten"
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:966
 msgid "Alt/Win key behavior"
 msgstr "Verhalten der Alt/Windows-Tasten"
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:967
 msgid "Add the standard behavior to Menu key"
 msgstr "Standardverhalten zur Menütaste hinzufügen"
 
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:968
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt und Meta befinden sich auf den Alt-Tasten."
 
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:969
 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:960
+#: ../rules/base.xml.in.h:970
 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:961
+#: ../rules/base.xml.in.h:971
 msgid "Meta is mapped to Win keys"
 msgstr "Meta ist den Windows-Tasten zugeordnet"
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:972
 msgid "Meta is mapped to Left Win"
 msgstr "Meta ist der linken Windows-Taste zugeordnet"
 
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:973
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper ist den Win-Tasten zugeordnet"
 
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:974
 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:965
-msgid "Left Alt is swapped with Left Win"
-msgstr "Linke Alt-Taste ist gegen linke Windows-Taste vertauscht"
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
+msgstr "Alt-Taste ist gegen Windows-Taste vertauscht"
 
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:976
 msgid "Compose key position"
 msgstr "Position der Compose-Taste"
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:977
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:978
 msgid "PrtSc"
 msgstr "Druck"
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:979
 msgid "Miscellaneous compatibility options"
 msgstr "Verschiedene Optionen zur Kompatibilität"
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:980
 msgid "Default numeric keypad keys"
 msgstr "Vorgegebene Nummernblocktasten"
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:981
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr "Tasten des Nummernblocks geben immer Ziffern ein (wie bei Mac)"
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:982
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Umschalttaste funktioniert mit den Tasten des Nummernblocks wie in MS Windows"
 
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:983
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Umschalttaste deaktiviert NumLock nicht, wechselt stattdessen in die dritte Tastaturebene"
 
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:984
 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:975
+#: ../rules/base.xml.in.h:985
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Apple Aluminium Keyboard: PC-Tasten emulieren (Druck, Scroll_Lock, Pause, NumLock)"
 
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:986
 msgid "Shift cancels Caps Lock"
 msgstr "Umschalttaste deaktiviert Feststelltaste"
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:987
 msgid "Enable extra typographic characters"
 msgstr "Typographische Sonderzeichen aktivieren"
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:988
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Beide Umschalttasten gleichzeitig schalten CapsLock ein und aus"
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:989
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Beide Umschalttasten gleichzeitig schalten CapsLock ein und aus, eine Umschalttaste deaktiviert"
 
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:990
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Beide Umschalttasten gleichzeitig schalten ShiftLock ein und aus"
 
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:991
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Zeigertasten mit Umschalttaste + NumLock umschalten"
 
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:992
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr "Erlauben, Grabs mit Tastaturaktionen abzubrechen (Achtung: Sicherheitsrisiko)"
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:993
 msgid "Adding currency signs to certain keys"
 msgstr "Währungssymbole zu verschiedenen Tasten hinzufügen"
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:994
 msgid "Euro on E"
 msgstr "Euro auf E"
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:995
 msgid "Euro on 2"
 msgstr "Euro auf 2"
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:996
 msgid "Euro on 4"
 msgstr "Euro auf 4"
 
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:997
 msgid "Euro on 5"
 msgstr "Euro auf 5"
 
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:998
 msgid "Rupee on 4"
 msgstr "Rupie-Symbol auf 4"
 
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:999
 msgid "Key to choose 5th level"
 msgstr "Taste zum Wechsel in die fünfte Tastaturebene"
 
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1000
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "&lt;Kleiner als/Größer als&gt; wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene"
 
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1001
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Rechte Alt-Taste wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene"
 
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1002
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Linke Win-Taste wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene"
 
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1003
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Rechte Win-Taste wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene"
 
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1004
 msgid "Using space key to input non-breakable space character"
 msgstr "Leertaste zur Eingabe nicht umbrechbarer Zeichen verwenden"
 
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:1005
 msgid "Usual space at any level"
 msgstr "Leertaste gibt in jeder Ebene stets Leerzeichen aus"
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1006
 msgid "Non-breakable space character at second level"
 msgstr "Nicht umbrechbares Leerzeichen in der zweiten Tastaturebene"
 
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1007
 msgid "Non-breakable space character at third level"
 msgstr "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene"
 
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1008
 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:999
+#: ../rules/base.xml.in.h:1009
 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:1000
+#: ../rules/base.xml.in.h:1010
 msgid "Non-breakable space character at fourth level"
 msgstr "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene"
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1011
 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:1002
+#: ../rules/base.xml.in.h:1012
 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:1003
+#: ../rules/base.xml.in.h:1013
 msgid "Zero-width non-joiner character at second level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene"
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1014
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, verbindendes Zeichen der Breite Null in der dritten Ebene"
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1015
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, verbindendes Zeichen der Breite Null in der dritten Ebene, nicht umbrechbares Leerzeichen in der vierten Tastaturebene"
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1016
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, nicht umbrechbares Leerzeichen in der dritten Ebene"
 
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1017
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, nicht umbrechbares Leerzeichen in der dritten Tastaturebene, nichts in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1018
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, nicht umbrechbares Leerzeichen in der dritten Tastaturebene, verbindendes Zeichen der Breite Null in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1019
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, nicht umbrechbares Leerzeichen in der dritten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1020
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der dritten Ebene, verbindendes Zeichen der Breite Null in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1021
 msgid "Japanese keyboard options"
 msgstr "Japanische Tastaturoptionen"
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1022
 msgid "Kana Lock key is locking"
 msgstr "Kana-Sperrtaste ist gesperrt"
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1023
 msgid "NICOLA-F style Backspace"
 msgstr "Löschtaste wie NICOLA-F"
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1024
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr "Zenkaku Hankaku als zusätzliche Esc-Taste verwenden"
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1025
 msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr "Esperanto-Circumflex (^) hinzufügen (supersigno)"
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1026
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Zur entsprechenden Taste einer Qwerty-Tastatur."
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1027
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Zur entsprechenden Taste einer Dvorak-Tastatur."
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Tastenkompatibilität mit veralteten Solaris-Tastencodes sicher stellen"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "Sun-Tastenkompatibilität"
+
+#: ../rules/base.xml.in.h:1030
 msgid "Key sequence to kill the X server"
 msgstr "Tastenkombination zum erzwungenen Beenden des X-Servers"
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
 msgid "Control + Alt + Backspace"
 msgstr "Strg + Alt + Löschtaste"
 
@@ -3794,7 +3844,7 @@ msgid "apl"
 msgstr "apl"
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "APL Keyboard Symbols"
+msgid "APL keyboard symbols"
 msgstr "APL-Tastatursymbole"
 
 #: ../rules/base.extras.xml.in.h:5
@@ -3813,102 +3863,249 @@ msgstr "shs"
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Mehrsprachig (Kanada, Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "Deutsch (US-Tastatur mit deutschen Buchstaben)"
 
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "Deutsch (mit ungarischen Buchstaben, ohne Akzenttasten)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "Deutsch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:17
 msgid "Avestan"
 msgstr "Avestisch"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:20
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Litauisch (US-Tastatur mit litauischen Buchstaben)"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Litauisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "LLettisch (US-Dvorak)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Lettisch (US-Dvorak, Y-Variante)"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Lettisch (US-Dvorak, Minus-Variante)"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Lettisch (Dvorak für Programmierer)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Lettisch (US-Dvorak für Programmierer, Y-Variante)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Lettisch (US-Dvorak für Programmierer, Minus-Variante)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:30
 msgid "Latvian (US Colemak)"
 msgstr "Lettisch (US-Colemak)"
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:31
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Lettisch (US-Colemak, Apostroph-Variante)"
 
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Lettisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:35
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Englisch (USA international, AltGr-Unicode-Kombination)"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Englisch (USA international, AltGr-Unicode-Kombination, alternativ)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "Atsina"
 msgstr "Atsina"
 
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:38
 msgid "Couer D'alene Salish"
 msgstr "Couer D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr "Englisch (USA, Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr "Polnisch (International, mit Akzenttasten)"
 
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "Polnisch (Colemak)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "Polnisch (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:48
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr "Krimtatarisch (Dobruja Q)"
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Rumänisch (ergonomische Bedienung)"
 
-#: ../rules/base.extras.xml.in.h:44
-msgid "Serbian"
-msgstr "Serbisch"
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Rumänisch (Sun Typ 6/7)"
 
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:53
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serbisch (Akzente kombinieren anstelle von Akzenttasten)"
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "Russisch (mit ukrainisch-weißrussischer Belegung)"
 
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "Russische (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:60
 msgid "Armenian (OLPC phonetic)"
 msgstr "Armenisch (OLPC-phonetisch)"
 
-#: ../rules/base.extras.xml.in.h:53
-msgid "Hebrew (Biblical SIL)"
-msgstr "Hebräisch (Biblisch, SIL)"
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "Hebräisch (Biblisch, SIL phonetisch)"
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Arabisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Belgisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "Portugiesisch (Brasilien, Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "Tschechisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "Dänisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Niederländisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Estnisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Finnisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "Französisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "Griechisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "Italienisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "Japanisch (Sun Typ 6)"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Japanisch (Sun Typ 7 - PC-kompatibel)"
+
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Japanisch (Sun Typ 7 - Sun-kompatibel)"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Norwegisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Portugiesisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Slowakisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "Spanisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "Schwedisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr ">Deutsch (Schweiz)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Deutsch (Schweiz, Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Französisch (Schweiz, Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Türkisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Ukrainisch (Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "Englisch (Großbritannien, Sun Typ 6/7)"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "Koreanisch (Sun Typ 6/7)"
+
+#~ msgid "ca"
+#~ msgstr "ca"
+
+#~ msgid "Catalan"
+#~ msgstr "Katalanisch"
+
+#~ msgid "Serbian (Cyrillic)"
+#~ msgstr "Serbisch (Kyrillisch)"
+
+#~ msgid "Gagauz"
+#~ msgstr "Gagauz"
 
-#: ../rules/base.extras.xml.in.h:54
-msgid "Biblical SIL phonetic"
-msgstr "Biblisches SIL (phonetisch)"
+#~ msgid "Hebrew (Biblical SIL)"
+#~ msgstr "Hebräisch (Biblisch, SIL)"
diff --git a/xorg-server/xkeyboard-config/po/eo.po b/xorg-server/xkeyboard-config/po/eo.po
index ef2b65abc..ebe235819 100644
--- a/xorg-server/xkeyboard-config/po/eo.po
+++ b/xorg-server/xkeyboard-config/po/eo.po
@@ -1,14 +1,14 @@
 # Esperanta traduko por 'xkeyboard-config'
-# Copyright (C) 2008, 2009, 2010, 2011, 2012 The Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 The Free Software Foundation, Inc.
 # This file is distributed under the same license as the xkeyboard-config package.
-# Felipe Castro <fefcas@gmail.com>, 2008, 2009, 2010, 2011, 2012.
+# Felipe Castro <fefcas@gmail.com>, 2008, 2009, 2010, 2011, 2012, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.6.99\n"
+"Project-Id-Version: xkeyboard-config 2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-09-12 00:25+0100\n"
-"PO-Revision-Date: 2012-09-17 09:00-0300\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-24 09:00-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -282,11 +282,11 @@ msgstr "Kinesis"
 
 #: ../rules/base.xml.in.h:67
 msgid "Logitech Generic Keyboard"
-msgstr "Logitech - Ĝenerala Klavaro"
+msgstr "Logitech - Ĝenerala klavaro"
 
 #: ../rules/base.xml.in.h:68
 msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15, aldonaj klavoj per G15daemon"
 
 #: ../rules/base.xml.in.h:69
 msgid "Hewlett-Packard Internet Keyboard"
@@ -466,11 +466,11 @@ msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:113
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "Microsoft Natura Sendrata Komforteca Klavaro 4000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
 #: ../rules/base.xml.in.h:114
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "Microsoft Natura Sendrata Komforteca Klavaro 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
 #: ../rules/base.xml.in.h:115
 msgid "Microsoft Internet Keyboard"
@@ -494,7 +494,7 @@ msgstr "ViewSonic KU-306 Internet Keyboard"
 
 #: ../rules/base.xml.in.h:120
 msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, Sveda"
+msgstr "Microsoft Internet Keyboard Pro, sveda"
 
 #: ../rules/base.xml.in.h:121
 msgid "Microsoft Office Keyboard"
@@ -697,3092 +697,3143 @@ msgid "OLPC"
 msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Sun Type 7 USB"
+msgstr "Sun Tipo 7 USB"
 
 #: ../rules/base.xml.in.h:172
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun Tipo 7 USB (Eŭropa aranĝo)"
+
+#: ../rules/base.xml.in.h:173
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun Tipo 7 USB (Unix-aranĝo)"
+
+#: ../rules/base.xml.in.h:174
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun Tipo 7 USB (Japana aranĝo) / Japana 106-klavoj"
+
+#: ../rules/base.xml.in.h:175
+msgid "Sun Type 6/7 USB"
+msgstr "Sun Type 6/7 USB"
+
+#: ../rules/base.xml.in.h:176
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun Tipo 6/7 USB (Eŭropa aranĝo)"
+
+#: ../rules/base.xml.in.h:177
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun Tipo 6 USB (Unix-aranĝo)"
+
+#: ../rules/base.xml.in.h:178
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun Tipo 6 USB (Japana aranĝo)"
+
+#: ../rules/base.xml.in.h:179
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun Tipo 6 (Japana aranĝo)"
+
+#: ../rules/base.xml.in.h:180
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:181
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:182
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:183
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:184
 msgid "Htc Dream phone"
 msgstr "Htc Dream - telefono"
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
 msgid "English (US)"
 msgstr "Angla (US)"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:189
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:190
 msgid "Cherokee"
 msgstr "Ĉeroka"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:191
 msgid "English (US, with euro on 5)"
 msgstr "Angla (US, kun eŭro ĉe 5)"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:192
 msgid "English (US, international with dead keys)"
 msgstr "Angla (US, internacia kun senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:193
 msgid "English (US, alternative international)"
 msgstr "Angla (US, alternativa internacia)"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:194
 msgid "English (Colemak)"
 msgstr "Angla (Colemak)"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:195
 msgid "English (Dvorak)"
 msgstr "Angla (Dvorako)"
 
-#: ../rules/base.xml.in.h:188
-msgid "English (Dvorak international with dead keys)"
-msgstr "Angla (dvoraka internacia kun senpaŝaj klavoj)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
+msgstr "Angla (Dvorako, internacia kun senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:197
 msgid "English (Dvorak alternative international no dead keys)"
-msgstr "Angla (dvoraka alternativa internacia, neniu senpaŝa klavo)"
+msgstr "Angla (Dvorako alternativa internacia, neniu senpaŝa klavo)"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:198
 msgid "English (left handed Dvorak)"
 msgstr "Angla (maldekstreca Dvorako)"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:199
 msgid "English (right handed Dvorak)"
 msgstr "Angla (dekstreca Dvorako)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:200
 msgid "English (classic Dvorak)"
 msgstr "Angla (klasika Dvorako)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:201
 msgid "English (programmer Dvorak)"
 msgstr "Angla (Dvorako por programistoj)"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:204
 msgid "Russian (US, phonetic)"
 msgstr "Rusa (Usono, fonetika)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
 msgstr "Angla (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:206
 msgid "English (international AltGr dead keys)"
 msgstr "Angla (internacia kun senpaŝaj klavoj per AltGr)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:207
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Angla (alternigi aranĝon per la klavo multipliko/divido)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:208
 msgid "Serbo-Croatian (US)"
 msgstr "Serb-Kroata (Usona)"
 
-#. Keyboard indicator for Catalan layouts
-#: ../rules/base.xml.in.h:202
-msgid "ca"
-msgstr "ca"
+#: ../rules/base.xml.in.h:209
+msgid "English (Workman)"
+msgstr "Angla (Workman)"
 
-#: ../rules/base.xml.in.h:203
-msgid "Catalan"
-msgstr "Kataluna"
+#: ../rules/base.xml.in.h:210
+msgid "English (Workman, international with dead keys)"
+msgstr "Angla (Workman, internacia kun senpaŝaj klavoj)"
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:213
 msgid "Afghani"
 msgstr "Paŝtoa"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:215
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:216
 msgid "Pashto"
 msgstr "Paŝtoa"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:218
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:219
 msgid "Uzbek (Afghanistan)"
 msgstr "Uzbeka (Afganujo)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:220
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paŝtoa (Afganujo, OLPC)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:221
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persa (Afganujo, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:222
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Uzbeka (Afganujo, OLPC)"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
 msgid "Arabic"
 msgstr "Araba"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:226
 msgid "Arabic (azerty)"
 msgstr "Araba (azerty)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:227
 msgid "Arabic (azerty/digits)"
 msgstr "Araba (azerty/ciferoj)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:228
 msgid "Arabic (digits)"
 msgstr "Araba (ciferoj)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:229
 msgid "Arabic (qwerty)"
 msgstr "Araba (qwerty)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:230
 msgid "Arabic (qwerty/digits)"
 msgstr "Araba (qwerty/ciferoj)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:231
 msgid "Arabic (Buckwalter)"
 msgstr "Araba (Buckwalter)"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:233
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:234
 msgid "Albanian"
 msgstr "Albana"
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
 msgid "Armenian"
 msgstr "Armena"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:238
 msgid "Armenian (phonetic)"
 msgstr "Armena (fonetika)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:239
 msgid "Armenian (alternative phonetic)"
 msgstr "Armena (alternativa fonetika)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:240
 msgid "Armenian (eastern)"
 msgstr "Armena (oriento)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:241
 msgid "Armenian (western)"
 msgstr "Armena (okcidenta)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:242
 msgid "Armenian (alternative eastern)"
 msgstr "Armena (alternativa orienta)"
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:245
 msgid "German (Austria)"
 msgstr "Germana (Aŭstrujo)"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:246
+msgid "German (legacy)"
+msgstr "Germana (malmoderna)"
+
+#: ../rules/base.xml.in.h:247
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Germana (Aŭstrujo, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:248
 msgid "German (Austria, Sun dead keys)"
 msgstr "Germana (Aŭstrujo, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:249
 msgid "German (Austria, Macintosh)"
 msgstr "Germana (Aŭstrujo, Macintosh)"
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:251
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:252
 msgid "Azerbaijani"
 msgstr "Azerbajĝana"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:253
 msgid "Azerbaijani (Cyrillic)"
 msgstr "Azerbajĝana (Cirila)"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:255
 msgid "by"
-msgstr "de"
+msgstr "by"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:256
 msgid "Belarusian"
 msgstr "Belorusa"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:257
 msgid "Belarusian (legacy)"
 msgstr "Belorusa (malmoderna)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:258
 msgid "Belarusian (Latin)"
 msgstr "Belorusa (Latina)"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:262
 msgid "Belgian (alternative)"
 msgstr "Belga (alternativa)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:263
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belga (alternativa, nur latin-9)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:264
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belga (alternativa, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:265
 msgid "Belgian (ISO alternate)"
 msgstr "Belga (alternativa ISO)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:266
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belga (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:267
 msgid "Belgian (Sun dead keys)"
 msgstr "Belga (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:268
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belga (Wang modelo 724 azerty)"
 
 #. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:270
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:271
 msgid "Bengali"
 msgstr "Bengala"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:272
 msgid "Bengali (Probhat)"
 msgstr "Bengala (Probhat)"
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:274
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:275
 msgid "Indian"
 msgstr "Hinda"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:276
 msgid "Bengali (India)"
 msgstr "Bengala (Hindujo)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:277
 msgid "Bengali (India, Probhat)"
 msgstr "Bengala (Hindujo, Probhat)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:278
 msgid "Bengali (India, Baishakhi)"
 msgstr "Bengala (Hindujo, Baishakhi)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:279
 msgid "Bengali (India, Bornona)"
 msgstr "Bengala (Hindujo, Bornona)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:280
 msgid "Bengali (India, Uni Gitanjali)"
 msgstr "Bengala (Hindujo, Uni Gitanjali)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:281
 msgid "Bengali (India, Baishakhi Inscript)"
 msgstr "Bengala (Hindujo, Baishakhi InScript)"
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:283
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:284
 msgid "Gujarati"
 msgstr "Guĝarata"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:286
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:287
 msgid "Punjabi (Gurmukhi)"
 msgstr "Panĝaba (Gurmukia)"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:288
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Panĝaba (Gurmukia de Jhelum)"
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:290
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:291
 msgid "Kannada"
 msgstr "Kanara"
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:293
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:294
 msgid "Malayalam"
 msgstr "Malajala"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:295
 msgid "Malayalam (Lalitha)"
 msgstr "Malajala (Lalitha)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:296
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malajala (plibonigita Inscript kun Rupi-Signo)"
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:298
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:299
 msgid "Oriya"
 msgstr "Orija"
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:301
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:302
 msgid "Tamil (Unicode)"
 msgstr "Tamila (Unikodo)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:303
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamila (klavaro kun ciferoj)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:304
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamila (Skribmaŝino TAB)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:305
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamila (Skribmaŝino TSCII)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:306
 msgid "Tamil"
 msgstr "Tamila"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:308
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:309
 msgid "Telugu"
 msgstr "Telugua"
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:311
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:312
 msgid "Urdu (phonetic)"
 msgstr "Urdua (fonetika)"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:313
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdua (alternativa fonetika)"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:314
 msgid "Urdu (WinKeys)"
 msgstr "Urdua (WinKeys)"
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:316
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:317
 msgid "Hindi (Bolnagri)"
 msgstr "Hinda (Bolnagri)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:318
 msgid "Hindi (Wx)"
 msgstr "Hinda (Wx)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:319
 msgid "English (India, with RupeeSign)"
 msgstr "Angla (Hindujo, kun RupiSigno)"
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:321
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:322
 msgid "Bosnian"
 msgstr "Bosna"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:323
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosna (uzi angul-citilojn por citiloj)"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:324
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosna (uzi bosnajn duliteraĵojn)"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:325
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosna (usona klavaro kun bosnaj duliteraĵoj)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:326
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosna (usona klavaro kun bosnaj literoj)"
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
 msgid "Portuguese (Brazil)"
 msgstr "Portugala (Brazilo)"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:330
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugala (Brazilo, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:331
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugala (Brazilo, Dvorako)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:332
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugala (Brazilo, Nativo)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:333
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugala (Brazilo, Nativo por usonaj klavaroj)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:334
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugala (Brazilo, Nativo por Esperanto)"
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:336
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:337
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:338
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgara (tradicia fonetika)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:339
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgara (nova fonetika)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:340
 msgid "Arabic (Morocco)"
 msgstr "Araba (Maroko)"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:343
 msgid "French (Morocco)"
 msgstr "Franca (Maroko)"
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:345
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:346
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berbera (Maroko, Tifinagh)"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:347
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berbera (Maroko, Tifinagh alternativa)"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:348
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berbera (Maroko, Tifinagh alternativa fonetika)"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:349
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berbera (Maroko, Tifinagh etendita)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:350
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berbera (Maroko, Tifinagh fonetika)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:351
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berbera (Maroko, Tifinagh etendita fonetika)"
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
 msgid "English (Cameroon)"
 msgstr "Angla (Kameruno)"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:355
 msgid "French (Cameroon)"
 msgstr "Franca (Kameruno)"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:356
 msgid "Cameroon Multilingual (qwerty)"
-msgstr "Kameruna Plurlingva (qwerty)"
+msgstr "Kameruna plurlingva (qwerty)"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:357
 msgid "Cameroon Multilingual (azerty)"
-msgstr "Kameruna Plurlingva (azerty)"
+msgstr "Kameruna plurlingva (azerty)"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:358
 msgid "Cameroon Multilingual (Dvorak)"
-msgstr "Kameruna Plurlingva (Dvorako)"
+msgstr "Kameruna plurlingva (Dvorako)"
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:360
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:361
 msgid "Burmese"
 msgstr "Birma"
 
-#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr "Franca (Kanado)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:363
 msgid "French (Canada, Dvorak)"
 msgstr "Franca (Kanado, Dvorako)"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:364
 msgid "French (Canada, legacy)"
 msgstr "Franca (Kanado, malmoderna)"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:365
 msgid "Canadian Multilingual"
-msgstr "Kanada Plurlingva"
+msgstr "Kanada plurlingva"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:366
 msgid "Canadian Multilingual (first part)"
-msgstr "Kanada Plurlingva (unua parto)"
+msgstr "Kanada plurlingva (unua parto)"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:367
 msgid "Canadian Multilingual (second part)"
-msgstr "Kanada Plurlingva (dua parto)"
+msgstr "Kanada plurlingva (dua parto)"
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:369
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:370
 msgid "Inuktitut"
 msgstr "Inuita"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:371
 msgid "English (Canada)"
 msgstr "Angla (Kanado)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:372
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Franca (Demokratia Respubliko de Kongo)"
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:374
 msgid "zh"
 msgstr "zh"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:375
 msgid "Chinese"
 msgstr "Ĉina"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:376
 msgid "Tibetan"
 msgstr "Tibeta"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:377
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibeta (kun ciferoj ASCII)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:378
 msgid "Uyghur"
 msgstr "Ujgura"
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:380
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:381
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:382
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Kroata (uzi angul-citilojn por citiloj)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:383
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Kroata (uzi kroatajn duliteraĵojn)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:384
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Kroata (Usona klavaro kun kroataj duliteraĵoj)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:385
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Kroata (Usona klavaro kun kroataj literoj)"
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
 msgid "Czech"
 msgstr "Ĉeĥa"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:389
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Ĉeĥa (kun klavo &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:390
 msgid "Czech (qwerty)"
 msgstr "Ĉeĥa (qwerty)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:391
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Ĉeĥa (qwerty, etendita Retroklino)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:392
 msgid "Czech (UCW layout, accented letters only)"
-msgstr "Ĉeĥa (Aranĝo UCW, nur diakritaĵoj)"
+msgstr "Ĉeĥa (aranĝo UCW, nur diakritaĵoj)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:393
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Ĉeĥa (usona Dvorako kun subteno al CZ UCW)"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
 msgid "Danish"
 msgstr "Dana"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:397
 msgid "Danish (eliminate dead keys)"
 msgstr "Dana (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:398
 msgid "Danish (Macintosh)"
 msgstr "Dana (Macintosh)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:399
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Dana (Macintosh, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:400
 msgid "Danish (Dvorak)"
 msgstr "Dana (Dvorako)"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
 msgid "Dutch"
 msgstr "Nederlanda"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:404
 msgid "Dutch (Sun dead keys)"
 msgstr "Nederlanda (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:405
 msgid "Dutch (Macintosh)"
 msgstr "Nederlanda (Macintosh)"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:406
 msgid "Dutch (standard)"
 msgstr "Nederlanda (norma)"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:408
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:409
 msgid "Dzongkha"
 msgstr "Dzonka"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
 msgid "Estonian"
 msgstr "Estona"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:413
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estona (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:414
 msgid "Estonian (Dvorak)"
 msgstr "Estona (Dvorako)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estona (Usona klavaro kun estonaj literoj)"
 
-#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
 msgid "Persian"
 msgstr "Persa"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Persian (with Persian Keypad)"
-msgstr "Persa (kun Persa Ciferklavaro)"
+msgstr "Persa (kun persa ciferklavaro)"
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iran, Latin Q)"
-msgstr "Kurda, (Irano, Latina Q)"
+msgstr "Kurda (Irano, Latina Q)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 msgid "Kurdish (Iran, F)"
-msgstr "Kurda, (Irano, F)"
+msgstr "Kurda (Irano, F)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurda (Irano, Latina Alt-Q)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurda (Irano, Araba-Latina)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
 msgid "Iraqi"
 msgstr "Iraka"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:425
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurda (Irako, Latina Q)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:426
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurda, (Irako, F)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:427
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurda (Irako, Latina Alt-Q)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:428
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurda (Irako, Araba-Latina)"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:430
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:431
 msgid "Faroese"
 msgstr "Feroa"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:432
 msgid "Faroese (eliminate dead keys)"
 msgstr "Feroa (forigi senpaŝajn klavojn)"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
 msgid "Finnish"
 msgstr "Finna"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:436
 msgid "Finnish (classic)"
 msgstr "Finna (klasika)"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finna (klasika, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Northern Saami (Finland)"
 msgstr "Norda Samea (Finlando)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Finnish (Macintosh)"
 msgstr "Finna (Macintosh)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
 msgid "French"
 msgstr "Franca"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:441
 msgid "French (eliminate dead keys)"
 msgstr "Franca (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "French (Sun dead keys)"
 msgstr "Franca (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "French (alternative)"
 msgstr "Franca (alternativa)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "French (alternative, latin-9 only)"
 msgstr "Franca (alternativa, nur latin-9)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Franca (alternativa, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "French (alternative, Sun dead keys)"
 msgstr "Franca (alternava, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "French (legacy, alternative)"
 msgstr "Franca (malmoderna, alternativa)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Franca (malmoderna, alternativa, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Franca (malmoderna, alternativa, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Franca (Bepo, komforteca, dvorake)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Franca (Bepo, komforteca, dvorake, nur latin-9)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:452
 msgid "French (Dvorak)"
 msgstr "Franca (Dvorako)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:453
 msgid "French (Macintosh)"
 msgstr "Franca (Macintosh)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:454
 msgid "French (Breton)"
 msgstr "Franca (Bretona)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:455
 msgid "Occitan"
 msgstr "Okcitana"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:456
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Kartvela (Franca, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:457
 msgid "English (Ghana)"
 msgstr "Angla (Ganao)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:458
 msgid "English (Ghana, multilingual)"
 msgstr "Angla (Ganao, plurlingva)"
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:460
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:461
 msgid "Akan"
 msgstr "Akan"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:463
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:464
 msgid "Ewe"
 msgstr "Ewe"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:466
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:467
 msgid "Fula"
 msgstr "Fula"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:469
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:470
 msgid "Ga"
 msgstr "Ga"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:472
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:473
 msgid "Hausa"
 msgstr "Haŭsa"
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:475
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:476
 msgid "Avatime"
 msgstr "Avatime"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:477
 msgid "English (Ghana, GILLBT)"
 msgstr "Angla (Ganao, GILLBT)"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:478
 msgid "French (Guinea)"
 msgstr "Franca (Gvineo)"
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:480
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:481
 msgid "Georgian"
 msgstr "Kartvela"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:482
 msgid "Georgian (ergonomic)"
 msgstr "Kartvela (komforteca)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:483
 msgid "Georgian (MESS)"
 msgstr "Kartvela (MESS)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:484
 msgid "Russian (Georgia)"
 msgstr "Rusa (Kartvela)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:485
 msgid "Ossetian (Georgia)"
 msgstr "Oseta (Kartvelujo)"
 
-#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
 msgid "German"
 msgstr "Germana"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:487
 msgid "German (dead acute)"
 msgstr "Germana (senpaŝa dekstra korno)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:488
 msgid "German (dead grave acute)"
 msgstr "Germana (senpaŝa maldekstra/dekstra korno)"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:489
 msgid "German (eliminate dead keys)"
 msgstr "Germana (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:490
 msgid "Romanian (Germany)"
 msgstr "Rumana (Germanujo)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:491
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Rumana (Germanujo, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:492
 msgid "German (Dvorak)"
 msgstr "Germana (Dvorako)"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:493
 msgid "German (Sun dead keys)"
 msgstr "Germana (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:494
 msgid "German (Neo 2)"
 msgstr "Germana (Neo 2)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:495
 msgid "German (Macintosh)"
 msgstr "Germana (Macintosh)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:496
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Germana (Macintosh, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:497
 msgid "Lower Sorbian"
 msgstr "Malsupra Soraba"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:498
 msgid "Lower Sorbian (qwertz)"
 msgstr "Malsupra Soraba (qwertz)"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:499
 msgid "German (qwerty)"
 msgstr "Germana (qwerty)"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:500
 msgid "Russian (Germany, phonetic)"
 msgstr "Rusa (Germana, fonetika)"
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
 msgid "Greek"
 msgstr "Greka"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:504
 msgid "Greek (simple)"
 msgstr "Greka (simpla)"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:505
 msgid "Greek (extended)"
-msgstr "Greka (etendite)"
+msgstr "Greka (etendita)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:506
 msgid "Greek (eliminate dead keys)"
 msgstr "Greka (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:507
 msgid "Greek (polytonic)"
 msgstr "Greka (plurtona)"
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:509
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian"
 msgstr "Hungara"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (standard)"
 msgstr "Hungara (norma)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Hungara (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (qwerty)"
 msgstr "Hungara (qwerty)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Hungara (101/qwertz/komo/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Hungara (101/qwertz/komo/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Hungara (101/qwertz/punkto/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Hungara (101/qwertz/punkto/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Hungara (101/qwerty/komo/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Hungara (101/qwerty/komo/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Hungara (101/qwerty/punkto/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:521
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Hungara (101/qwerty/punkto/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:522
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Hungara (102/qwertz/komo/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:523
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Hungara (102/qwertz/komo/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:524
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Hungara (102/qwertz/punkto/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:525
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Hungara (102/qwertz/punkto/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:526
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Hungara (102/qwerty/komo/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:527
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Hungara (102/qwerty/komo/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:528
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Hungara (102/qwerty/punkto/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:529
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Hungara (102/qwerty/punkto/forigi senpaŝajn klavojn)"
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:531
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:532
 msgid "Icelandic"
 msgstr "Islanda"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:533
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islanda (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:534
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islanda (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:535
 msgid "Icelandic (Macintosh)"
 msgstr "Islanda (Macintosh)"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:536
 msgid "Icelandic (Dvorak)"
 msgstr "Islanda (Dvorako)"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
 msgid "Hebrew"
 msgstr "Hebrea"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:540
 msgid "Hebrew (lyx)"
 msgstr "Hebrea (lyx)"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:541
 msgid "Hebrew (phonetic)"
 msgstr "Hebrea (fonetika)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:542
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hebrea (Biblia, Tiro)"
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
 msgid "Italian"
 msgstr "Itala"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:546
 msgid "Italian (eliminate dead keys)"
 msgstr "Itala (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:547
 msgid "Italian (Macintosh)"
 msgstr "Itala (Macintosh)"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:548
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Itala (usona klavaro kun italaj literoj)"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:549
 msgid "Georgian (Italy)"
 msgstr "Kartvela (Italujo)"
 
+#: ../rules/base.xml.in.h:550
+msgid "Italian (IBM 142)"
+msgstr "Itala (IBM 142)"
+
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
 msgid "Japanese"
 msgstr "Japana"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:554
 msgid "Japanese (Kana)"
 msgstr "Japana (Kanao)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:555
 msgid "Japanese (Kana 86)"
 msgstr "Japana (Kanao 86)"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:556
 msgid "Japanese (OADG 109A)"
 msgstr "Japana (OADG 109A)"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:557
 msgid "Japanese (Macintosh)"
 msgstr "Japana (Macintosh)"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:558
 msgid "Japanese (Dvorak)"
 msgstr "Japana (Dvorako)"
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:560
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:561
 msgid "Kyrgyz"
 msgstr "Kirgiza"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:562
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgiza (fonetika)"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:564
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:565
 msgid "Khmer (Cambodia)"
 msgstr "Kmera (Kamboĝo)"
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:567
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:568
 msgid "Kazakh"
 msgstr "Kazaĥa"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:569
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Rusa (Kazaĥujo, kun Kazaĥa)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:570
 msgid "Kazakh (with Russian)"
 msgstr "Kazaĥa (kun Rusa)"
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:572
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:573
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:574
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Lao (norma aranĝo proponita de STEA)"
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:577
 msgid "Spanish (Latin American)"
 msgstr "Hispana (Latin-amerika)"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:578
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Hispana (Latin-amerika, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:579
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Hispana (Latin-amerika, inkluzive senpaŝa tildo)"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:580
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Hispana (Latin-amerika, senpaŝaj klavoj de Sun)"
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
 msgid "Lithuanian"
 msgstr "Litova"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:584
 msgid "Lithuanian (standard)"
 msgstr "Litova (norma)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:585
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litova (Usona klavaro kun litovaj literoj)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:586
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litova (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:587
 msgid "Lithuanian (LEKP)"
 msgstr "Litova (LEKP)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:588
 msgid "Lithuanian (LEKPa)"
 msgstr "Litova (LEKPa)"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
 msgid "Latvian"
 msgstr "Latva"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:592
 msgid "Latvian (apostrophe variant)"
 msgstr "Latva (citila variaĵo)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:593
 msgid "Latvian (tilde variant)"
 msgstr "Latva (tilda variaĵo)"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:594
 msgid "Latvian (F variant)"
 msgstr "Latva (variaĵo F)"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:595
 msgid "Latvian (modern)"
 msgstr "Latva (moderna)"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:596
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Latva (komforteca, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:597
 msgid "Latvian (adapted)"
 msgstr "Latva (adaptita)"
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:599
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:600
 msgid "Maori"
 msgstr "Maoria"
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:603
 msgid "Montenegrin"
 msgstr "Montenegra"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:604
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegra (Cirila)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:605
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegra (Cirila, Z kaj ZHE interŝanĝita)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:606
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Montenegra (Latina Unikodo)"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:607
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Montenegra (Latina qwerty)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:608
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Montenegra (Latina Unikodo qwerty)"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:609
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegra (Cirila kun angul-citiloj)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:610
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegra (Latina kun angul-citiloj)"
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:612
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:613
 msgid "Macedonian"
 msgstr "Makedona"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:614
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Makedona (forigi senpaŝajn klavojn)"
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:616
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:617
 msgid "Maltese"
 msgstr "Malta"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:618
 msgid "Maltese (with US layout)"
 msgstr "Malta (kun usona aranĝo)"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:620
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:621
 msgid "Mongolian"
 msgstr "Mongola"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:625
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norvega (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:626
 msgid "Norwegian (Dvorak)"
 msgstr "Norvega (Dvorako)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:627
 msgid "Northern Saami (Norway)"
 msgstr "Norda Samea (Norvegujo)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:628
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Norda Samea (Norvegujo, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:629
 msgid "Norwegian (Macintosh)"
 msgstr "Norvega (Macintosh)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:630
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Norvega (Macintosh, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:631
 msgid "Norwegian (Colemak)"
 msgstr "Norvega (Colemak)"
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
 msgid "Polish"
 msgstr "Pola"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:635
+msgid "Polish (legacy)"
+msgstr "Pola (malmoderna)"
+
+#: ../rules/base.xml.in.h:636
 msgid "Polish (qwertz)"
 msgstr "Pola (qwertz)"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:637
 msgid "Polish (Dvorak)"
 msgstr "Pola (Dvorako)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:638
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Pola (Dvorako, polaj citiloj ĉe citila klavo)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:639
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Pola (Dvorako, polaj citiloj ĉe klavo 1)"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:640
 msgid "Kashubian"
 msgstr "Kaŝuba"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:641
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Rusa (Polujo, fonetika Dvorako)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:642
 msgid "Polish (programmer Dvorak)"
 msgstr "Pola (Dvorako por programistoj)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:644
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugala (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:645
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugala (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:646
 msgid "Portuguese (Macintosh)"
 msgstr "Portugala (Macintosh)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:647
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugala (Macintosh, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:648
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugala (Macintosh, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:649
 msgid "Portuguese (Nativo)"
 msgstr "Portugala (Nativo)"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:650
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugala (Nativo por usonaj klavaroj)"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:651
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Esperanto (Portugalujo, Nativo)"
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
 msgid "Romanian"
 msgstr "Rumana"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
-msgstr "Rumana (Subhoko)"
+msgstr "Rumana (subhoko)"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Rumana (norma)"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard cedilla)"
 msgstr "Rumana (norma subhoko)"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:658
 msgid "Romanian (WinKeys)"
 msgstr "Rumana (WinKeys)"
 
-#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:660
 msgid "Russian (phonetic)"
 msgstr "Rusa (fonetika)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:661
 msgid "Russian (phonetic WinKeys)"
 msgstr "Rusa (fonetika WinKeys)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:662
 msgid "Russian (typewriter)"
 msgstr "Rusa (skribmaŝina)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:663
 msgid "Russian (legacy)"
 msgstr "Rusa (malmoderna)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:664
 msgid "Russian (typewriter, legacy)"
 msgstr "Rusa (skribmaŝina, malmoderna)"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:665
 msgid "Tatar"
 msgstr "Tatara"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Ossetian (legacy)"
 msgstr "Oseta (malmoderna)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:667
 msgid "Ossetian (WinKeys)"
-msgstr "Oseta (Win-Klavoj)"
+msgstr "Oseta (WinKeys)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:668
 msgid "Chuvash"
 msgstr "Ĉuvaŝa"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:669
 msgid "Chuvash (Latin)"
 msgstr "Ĉuvaŝa (Latina)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:670
 msgid "Udmurt"
 msgstr "Udmurta"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:671
 msgid "Komi"
 msgstr "Komia"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:672
 msgid "Yakut"
 msgstr "Jakuta"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:673
 msgid "Kalmyk"
 msgstr "Kalmyk"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:674
 msgid "Russian (DOS)"
 msgstr "Rusa (DOS)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:675
 msgid "Serbian (Russia)"
 msgstr "Serba (Rusujo)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:676
 msgid "Bashkirian"
 msgstr "Baŝkira"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:677
 msgid "Mari"
 msgstr "Maria"
 
-#: ../rules/base.xml.in.h:668
-msgid "Serbian (Cyrillic)"
-msgstr "Serba (Cirila)"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "Serba"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:679
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr "Serba (Cirila, Z kaj ZHE interŝanĝita)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:680
 msgid "Serbian (Latin)"
 msgstr "Serba (Latina)"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:681
 msgid "Serbian (Latin Unicode)"
 msgstr "Serba (Latina Unikoda)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:682
 msgid "Serbian (Latin qwerty)"
 msgstr "Serba (Latina qwerty)"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:683
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serba (Latina Unikoda qwerty)"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr "Serba (Cirila kun angul-citiloj)"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serba (Latina kun angul-citiloj)"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:686
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Panona Rusina (homofonia)"
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:688
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:689
 msgid "Slovenian"
 msgstr "Slovena"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:690
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Slovena (uzi angul-citilojn por citiloj)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:691
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Slovena (Usona klavaro kun slovenaj literoj)"
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:695
 msgid "Slovak (extended Backslash)"
 msgstr "Slovaka (etendita Retroklino)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:696
 msgid "Slovak (qwerty)"
 msgstr "Slovaka (qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:697
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slovaka (qwerty, etendita Retroklino)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:699
 msgid "Spanish (eliminate dead keys)"
 msgstr "Hispana (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:700
 msgid "Spanish (include dead tilde)"
 msgstr "Hispana (inkluzive senpaŝa tildo)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:701
 msgid "Spanish (Sun dead keys)"
 msgstr "Hispana (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:702
 msgid "Spanish (Dvorak)"
 msgstr "Hispana (Dvorako)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:703
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr "Asturia (Hispanujo, kun subpunktita H kaj subpunktita L)"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:704
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Kataluna (Hispanujo, kun centro-punktita L)"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:705
 msgid "Spanish (Macintosh)"
 msgstr "Hispana (Macintosh)"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
 msgid "Swedish"
 msgstr "Sveda"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:709
 msgid "Swedish (eliminate dead keys)"
 msgstr "Sveda (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:710
 msgid "Swedish (Dvorak)"
 msgstr "Sveda (Dvorako)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:711
 msgid "Russian (Sweden, phonetic)"
 msgstr "Rusa (Svedujo, fonetika)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:712
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Rusa (Svedujo, fonetika, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:713
 msgid "Northern Saami (Sweden)"
 msgstr "Norda Samea (Svedujo)"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:714
 msgid "Swedish (Macintosh)"
 msgstr "Sveda (Macintosh)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:715
 msgid "Swedish (Svdvorak)"
 msgstr "Sveda (Svdvorak)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:716
 msgid "Swedish Sign Language"
 msgstr "Sveda gestlingvo"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:717
 msgid "German (Switzerland)"
 msgstr "Germana (Svislando)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:718
 msgid "German (Switzerland, legacy)"
 msgstr "Germana (Svislando, malmoderna)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:719
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Germana (Svislando, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:720
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Germana (Svislando, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:721
 msgid "French (Switzerland)"
 msgstr "Franca (Svislando)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:722
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Franca (Svislando, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Franca (Svislando, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
 msgid "French (Switzerland, Macintosh)"
 msgstr "Franca (Svislando, Macintosh)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
 msgid "German (Switzerland, Macintosh)"
 msgstr "Germana (Svislando, Macintosh)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
 msgid "Arabic (Syria)"
 msgstr "Araba (Sirio)"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:728
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:729
 msgid "Syriac"
 msgstr "Siria"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:730
 msgid "Syriac (phonetic)"
 msgstr "Siria (fonetika)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurda, (Sirio, Latina Q)"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
 msgid "Kurdish (Syria, F)"
 msgstr "Kurda (Sirio, F)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurda (Sirio, Latina Alt-Q)"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
 msgid "Tajik"
 msgstr "Taĝika"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "Taĝika (malmoderna)"
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:739
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
 msgid "Sinhala (phonetic)"
 msgstr "Sinhala (fonetika)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamila (Sri-lanko, Unikodo)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamila (Sri-lanko, Skribmaŝino TAB)"
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
 msgid "Thai"
 msgstr "Taja"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
 msgid "Thai (TIS-820.2538)"
 msgstr "Taja (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Taja (Pattachote)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
 msgid "Turkish"
 msgstr "Turka"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
 msgid "Turkish (F)"
 msgstr "Turka (F)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
 msgid "Turkish (Alt-Q)"
 msgstr "Turka (Alt-Q)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
 msgid "Turkish (Sun dead keys)"
 msgstr "Turka (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurda (Turkujo, Latina Q)"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurda, (Turkujo, F)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:756
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurda (Turkujo, Latina Alt-Q)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
 msgid "Turkish (international with dead keys)"
 msgstr "Turka (internacia kun senpaŝaj klavoj)"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:760
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krime-tatara (Turka Q)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krime-tatara (Turka F)"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krime-tatara (Turka Alt-Q)"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
 msgid "Taiwanese"
 msgstr "Tajvana"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
 msgid "Taiwanese (indigenous)"
 msgstr "Tajvana (indiĝena)"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Tajvano)"
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
 msgid "Ukrainian"
 msgstr "Ukrajna"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:771
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrajna (fonetika)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:772
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrajna (skribmaŝino)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukrajna (WinKeys)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (legacy)"
 msgstr "Ukrajna (malmoderna)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrajna (norma RSTU)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Rusa (Ukrajnujo, norma RSTU)"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrajna (homofonia)"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
 msgid "English (UK)"
 msgstr "Angla (UK)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
 msgid "English (UK, extended WinKeys)"
-msgstr "Angla (UK, etenditaj Win-klavoj)"
+msgstr "Angla (UK, etenditaj WinKeys)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:780
 msgid "English (UK, international with dead keys)"
 msgstr "Angla (UK, internacia kun senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:781
 msgid "English (UK, Dvorak)"
 msgstr "Angla (UK, Dvorako)"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Angla (UK, Dvorako kun interpunkcio de UK)"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
 msgid "English (UK, Macintosh)"
 msgstr "Angla (UK, Macintosh)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
 msgid "English (UK, Macintosh international)"
 msgstr "Angla (UK, internacia Macintosh)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
 msgid "English (UK, Colemak)"
 msgstr "Angla (UK, Colemak)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
 msgid "Uzbek"
 msgstr "Uzbeka"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:787
 msgid "Uzbek (Latin)"
 msgstr "Uzbeka (Latina)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:790
 msgid "Vietnamese"
 msgstr "Vjetnama"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
 msgid "Korean"
 msgstr "Korea"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
 msgid "Korean (101/104 key compatible)"
 msgstr "Korea (kongrua al 101/104 klavoj)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japana (Serio PC-98xx)"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
 msgid "Irish"
 msgstr "Irlanda"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:800
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlanda (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
 msgid "Ogham"
 msgstr "Ogamo"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
 msgid "Ogham (IS434)"
 msgstr "Ogamo (IS434)"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
 msgid "Urdu (Pakistan)"
 msgstr "Urdua (Pakistano)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdua (Pakistano, CRULP)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdua (Pakistano, NLA)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
 msgid "Arabic (Pakistan)"
 msgstr "Araba (Pakistano)"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
 msgid "Sindhi"
 msgstr "Sinda"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
 msgid "Dhivehi"
 msgstr "Mahla"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:813
 msgid "English (South Africa)"
 msgstr "Angla (Sud-Afriko)"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:815
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (translokitaj punktokomo kaj citilo, malaktuale)"
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
 msgid "Nepali"
 msgstr "Nepala"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
 msgid "English (Nigeria)"
 msgstr "Angla (Niĝerio)"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
 msgid "Igbo"
 msgstr "Igbo"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
 msgid "Yoruba"
 msgstr "Joruba"
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:829
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
 msgid "Amharic"
 msgstr "Amhara"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:832
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
 msgid "Wolof"
 msgstr "Volofa"
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:836
 msgid "Braille"
 msgstr "Brajla"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
 msgid "Braille (left hand)"
 msgstr "Brajla (maldekstra mano)"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
 msgid "Braille (right hand)"
 msgstr "Brajla (dekstra mano)"
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:840
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
 msgid "Turkmen"
 msgstr "Turkmena"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmena (Alt-Q)"
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:844
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
 msgid "Bambara"
 msgstr "Bambara"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
 msgid "French (Mali, alternative)"
 msgstr "Franca (Malio, alternativa)"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:847
 msgid "English (Mali, US Macintosh)"
 msgstr "Angla (Malio , usona Macintosh)"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
 msgid "English (Mali, US international)"
 msgstr "Angla (Malio, usona internacia)"
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:850
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
 msgid "Swahili (Tanzania)"
 msgstr "Svahila (Tanzanio)"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
 msgid "Swahili (Kenya)"
 msgstr "Svahila (Kenjo)"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:853
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:856
 msgid "Tswana"
 msgstr "Cvana"
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
 msgid "Filipino"
 msgstr "Filipina"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipina (QWERTY, Baybayin)"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:861
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipina (Capewell-Dvorako, Latina)"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipina (Capewell-Dvorako, Baybayin)"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipina (Capewell-QWERF 2006, Latina)"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipina (Capewell-QWERF 2006, Baybayin)"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:865
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipina (Colemak, latina)"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipina (Colemak, Baybayin)"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipina (Dvorako, latina)"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Filipina (Dvorako Baybayin)"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
 msgid "md"
 msgstr "md"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
 msgid "Moldavian"
 msgstr "Moldava"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:871
 msgid "gag"
 msgstr "gag"
 
-#: ../rules/base.xml.in.h:862
-msgid "Gagauz"
-msgstr "Gagauza"
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "Moldava (Gagauz)"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
 msgid "Key(s) to change layout"
 msgstr "Klavo(j) por ŝanĝi la aranĝon"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
 msgid "Right Alt (while pressed)"
 msgstr "Dekstra Alt (dum premata)"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
 msgid "Left Alt (while pressed)"
 msgstr "Maldekstra Alt (dum premata)"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:876
 msgid "Left Win (while pressed)"
 msgstr "Maldekstra Win (dum premata)"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
 msgid "Right Win (while pressed)"
 msgstr "Dekstra Win (dum premata)"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
 msgid "Any Win key (while pressed)"
-msgstr "Iu ajn klavo Win (dum premata)"
+msgstr "Iu ajn Win-klavo (dum premata)"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:879
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (dum premata), Alt+Caps Lock restarigas la originalan uskligon"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
 msgid "Right Ctrl (while pressed)"
 msgstr "Dekstra Ctrl (dum premata)"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
 msgid "Right Alt"
 msgstr "Dekstra Alt"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
 msgid "Left Alt"
 msgstr "Maldekstra Alt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (al la unua aranĝo), Shift+Caps Lock (al la lasta aranĝo)"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
 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:877
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Maldekstra Ctrl (por la unua aranĝo), dekstra Ctrl (por la lasta aranĝo)"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
 msgid "Both Shift keys together"
 msgstr "Ambaŭ klavoj Shift kune"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
 msgid "Both Alt keys together"
 msgstr "Ambaŭ klavoj Alt kune"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
 msgid "Both Ctrl keys together"
 msgstr "Ambaŭ klavoj Ctrl kune"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
 msgid "Left Ctrl+Left Shift"
 msgstr "Maldekstra Ctrl+maldekstra Shift"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
 msgid "Right Ctrl+Right Shift"
 msgstr "Dekstra Ctrl+dekstra Shift"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
 msgid "Left Alt+Left Shift"
 msgstr "Maldekstra Alt+maldekstra Shift"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
 msgid "Alt+Space"
 msgstr "Alt+Space"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
 msgid "Left Win"
 msgstr "Maldekstra Win"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
 msgid "Right Win"
 msgstr "Dekstra Win"
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
 msgid "Left Shift"
 msgstr "Maldekstra Shift"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
 msgid "Right Shift"
 msgstr "Dekstra Shift"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl"
 msgstr "Maldekstra Ctrl"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
 msgid "Right Ctrl"
 msgstr "Dekstra Ctrl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
 msgid "Scroll Lock"
 msgstr "Ruluma Baskulo"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Maldekstra Ctrl + dekstra Win (por la unua aranĝo), dekstra Ctrl + Menu (por la dua aranĝo)"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
 msgid "Key to choose 3rd level"
 msgstr "Klavo por elekti 3-an nivelon"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
 msgid "Any Win key"
-msgstr "Iu ajn klavo Win"
+msgstr "Iu ajn Win-klavo"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
 msgid "Any Alt key"
 msgstr "Iu ajn klavo Alt"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Dekstra Alt, Shift+dekstra Alt estas Multi_Key"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:912
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Dekstra Alt neniam elektas la 3-an nivelon"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
 msgid "Enter on keypad"
 msgstr "Enen-klavo en ciferklavaro"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
 msgid "Backslash"
 msgstr "Retroklino"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Malpli-signo/Pli-signo&gt;"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
 msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Caps Lock elektas 3-an nivelon, funkcias kiel unufoja ŝloso kiam premita kun alia 3-nivela elektilo"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
 msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Retroklino elektas 3-an nivelon, funkcias kiel unufoja ŝloso kiam premita kun alia 3-nivela elektilo"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
 msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "&lt;Malpli-signo/Pli-signo&gt; elektas 3-an nivelon, funkcias kiel unufoja ŝloso kiam premita kun alia 3-nivela elektilo"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
 msgid "Ctrl key position"
 msgstr "Pozicio de la klavo Ctrl"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
 msgid "Caps Lock as Ctrl"
 msgstr "Caps Lock kiel Ctrl"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
 msgid "Left Ctrl as Meta"
 msgstr "Maldekstra Ctrl kiel Meta"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Permuti Ctrl kaj Caps Lock"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
 msgid "At left of 'A'"
 msgstr "Maldekstre de 'A'"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:924
 msgid "At bottom left"
 msgstr "Malsupre maldekstre"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:925
 msgid "Right Ctrl as Right Alt"
 msgstr "Dekstra Ctrl kiel dekstran Alt"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:926
 msgid "Menu as Right Ctrl"
 msgstr "Menu kiel dekstran Ctrl"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:927
 msgid "Right Alt as Right Ctrl"
 msgstr "Dekstra Alt kiel dekstran Ctrl"
 
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:928
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Uzi la LED de klavaro por indiki alternativan aranĝon"
 
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:929
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:930
 msgid "Numeric keypad layout selection"
 msgstr "Elektado de aranĝo por la ciferklavaro"
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:931
 msgid "Legacy"
 msgstr "Malmoderna"
 
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:932
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unikodaj aldonoj (sagoj kaj operaci-simboloj)"
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:933
 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:924
+#: ../rules/base.xml.in.h:934
 msgid "Legacy Wang 724"
 msgstr "Malmoderna Wang 724"
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:935
 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:926
+#: ../rules/base.xml.in.h:936
 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 apriora nivelo"
 
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:937
 msgid "Hexadecimal"
 msgstr "Deksesume"
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:938
 msgid "ATM/phone-style"
 msgstr "ATM/telefon-stilo"
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:939
 msgid "Numeric keypad delete key behaviour"
 msgstr "Funkciado de la forig-klavo de la ciferklavaro"
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:940
 msgid "Legacy key with dot"
 msgstr "Malmoderna klavo kun punkto"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:942
 msgid "Legacy key with comma"
 msgstr "Malmoderna klavo kun komo"
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:943
 msgid "Four-level key with dot"
 msgstr "Kvar-nivela klavo kun punkto"
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:944
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Kvar-nivela klavo kun punkto, limigite al latin-9"
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:945
 msgid "Four-level key with comma"
 msgstr "Kvar-nivela klavo kun komo"
 
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:946
 msgid "Four-level key with momayyez"
 msgstr "Kvar-nivela klavo kun 'momayyez'"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:949
 msgid "Four-level key with abstract separators"
 msgstr "Kvar-nivela klavo kun abstraktaj apartigiloj"
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:950
 msgid "Semi-colon on third level"
 msgstr "Punkto-komo ĉe la 3-a nivelo"
 
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:951
 msgid "Caps Lock key behavior"
 msgstr "Funkciado de la klavo Caps Lock"
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:952
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock uzas internan uskligon. Shift \"paŭzigas\" Caps Lock"
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:953
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock uzas internan uskligon. Shift ne influas Cap sLock"
 
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:954
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock funkcias kiel Shift kun ŝlosado. Shift \"paŭzigas\" Caps Lock"
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:955
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock funkcias kiel Shift kun ŝlosado. Shift ne influas Caps Lock"
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:956
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock alternigas la ordinaran uskligon de alfabetaj signoj"
 
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:957
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Igi Caps Lock kroman Num Lock"
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:958
 msgid "Swap ESC and Caps Lock"
 msgstr "Permuti ESC kaj Caps Lock"
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:959
 msgid "Make Caps Lock an additional ESC"
 msgstr "Igi Caps Lock kroman ESC"
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:960
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Igi Caps Lock kroman Retroklavon"
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:961
 msgid "Make Caps Lock an additional Super"
 msgstr "Igi Caps Lock kroman Super"
 
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:962
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Igi Caps Lock kroman Hyper"
 
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:963
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Caps Lock alternigas Shift, influante ĉiujn klavojn"
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:964
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock estas malebligita"
 
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:965
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Igi Caps Lock kroman Control sed teni la simbolklavon Caps_Lock (keysym)"
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:966
 msgid "Alt/Win key behavior"
 msgstr "Alt/Win, klava funkciado"
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:967
 msgid "Add the standard behavior to Menu key"
 msgstr "Aldoni laŭnorman funkciadon al la klavo Menu"
 
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:968
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt kaj Meta estas ĉe la klavoj Alt"
 
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:969
 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)"
+msgstr "Control estas mapita al Win-klavoj (kaj al la kutimaj klavoj Ctrl)"
 
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:970
 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"
+msgstr "Control estas mapita al klavoj Alt, Alt estas mapita al Win-klavoj"
 
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:971
 msgid "Meta is mapped to Win keys"
-msgstr "Meta estas mapita al la klavoj Win"
+msgstr "Meta estas mapita al la Win-klavoj"
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:972
 msgid "Meta is mapped to Left Win"
 msgstr "Meta estas mapita al la maldekstra Win"
 
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:973
 msgid "Hyper is mapped to Win-keys"
-msgstr "Hyper estas mapita al la klavoj Win"
+msgstr "Hyper estas mapita al la Win-klavoj"
 
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:974
 msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Alt estas mapita al la dekstra klavo Win kaj Super al Menu"
+msgstr "Alt estas mapita al la dekstra Win-klavo kaj Super al Menu"
 
-#: ../rules/base.xml.in.h:965
-msgid "Left Alt is swapped with Left Win"
-msgstr "La maldekstra Alt estas permutita kun la maldekstra klavo Win"
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
+msgstr "Alt estas permutita kun Win"
 
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:976
 msgid "Compose key position"
 msgstr "Pozicio de la klavo Compose"
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:977
 msgid "Pause"
 msgstr "Paŭzo"
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:978
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:979
 msgid "Miscellaneous compatibility options"
 msgstr "Ceteraj kongruaj opcioj"
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:980
 msgid "Default numeric keypad keys"
 msgstr "Implicitaj ciferoj en cifer-klavaro"
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:981
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr "La klavoj de la ciferklavaro ĉiam enigas ciferojn (kiel en Macintosh)"
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:982
 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:973
+#: ../rules/base.xml.in.h:983
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift ne nuligas Num Lock, elektas 3-an nivelon anstataŭe"
 
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:984
 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:975
+#: ../rules/base.xml.in.h:985
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Apple Aluminium Keyboard: ŝajnigi klavojn de PC (Print, Scroll Lock, Pause, Num Lock)"
 
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:986
 msgid "Shift cancels Caps Lock"
 msgstr "Shift nuligas Caps Lock"
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:987
 msgid "Enable extra typographic characters"
 msgstr "Ebligi kromajn tipografiajn signojn"
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:988
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Ambaŭ klavoj Shift kune alternigas Caps Lock"
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:989
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Ambaŭ klavoj Shift kune aktivigas Caps Lock, unu klavo Shift malaktivigas"
 
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:990
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Ambaŭ klavoj Shift kune alternigas ShiftLock"
 
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:991
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Alternigi Mus-Klavojn per Shift + NumLock."
 
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:992
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr "Permesi rompi ŝlosojn per klavaraj agoj (averto: sekureca risko)"
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:993
 msgid "Adding currency signs to certain keys"
 msgstr "Aldonado de valut-signoj al iuj klavoj"
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:994
 msgid "Euro on E"
 msgstr "EŭroSigno ĉe E"
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:995
 msgid "Euro on 2"
 msgstr "EŭroSigno ĉe 2"
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:996
 msgid "Euro on 4"
 msgstr "EŭroSigno ĉe 4"
 
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:997
 msgid "Euro on 5"
 msgstr "EŭroSigno ĉe 5"
 
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:998
 msgid "Rupee on 4"
 msgstr "Rupio ĉe 4"
 
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:999
 msgid "Key to choose 5th level"
 msgstr "Klavo por elekti 5-an nivelon"
 
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1000
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "&lt;Malpli-signo/Pli-signo&gt; elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo"
 
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1001
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Dekstra Alt elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo"
 
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1002
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Maldekstra Win elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo"
 
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1003
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Dekstra Win elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo"
 
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1004
 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:995
+#: ../rules/base.xml.in.h:1005
 msgid "Usual space at any level"
 msgstr "Kutima spaco-signo ĉe iu ajn nivelo"
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1006
 msgid "Non-breakable space character at second level"
 msgstr "Ne-rompebla spaco-signo ĉe la 2-a nivelo"
 
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1007
 msgid "Non-breakable space character at third level"
 msgstr "Ne-rompebla spaco-signo ĉe la 3-a nivelo"
 
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1008
 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:999
+#: ../rules/base.xml.in.h:1009
 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:1000
+#: ../rules/base.xml.in.h:1010
 msgid "Non-breakable space character at fourth level"
 msgstr "Ne-rompebla spaco-signo ĉe la 4-a nivelo"
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1011
 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:1002
+#: ../rules/base.xml.in.h:1012
 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:1003
+#: ../rules/base.xml.in.h:1013
 msgid "Zero-width non-joiner character at second level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe dua nivelo"
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1014
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, nul-larĝa kuniga signo ĉe la tria nivelo"
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1015
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, nul-larĝa kuniga signo ĉe la tria nivelo, ne-rompebla spaco-signo ĉe la kvara nivelo"
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1016
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, ne-rompebla spaco-signo ĉe la tria nivelo"
 
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1017
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, ne-rompebla spaco-signo ĉe la tria nivelo, nenio ĉe la kvara nivelo"
 
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1018
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, ne-rompebla spaco-signo ĉe la tria nivelo, nul-larĝa kuniga signo ĉe la kvara nivelo"
 
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1019
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, ne-rompebla spaco-signo ĉe la tria nivelo, maldika ne-rompebla spaco-signo ĉe la kvara nivelo"
 
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1020
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la tria nivelo, nul-larĝa kuniga signo ĉe la kvara nivelo"
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1021
 msgid "Japanese keyboard options"
 msgstr "Elektebloj de japana klavaro"
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1022
 msgid "Kana Lock key is locking"
 msgstr "Kanaa klavo Lock ŝlosigas"
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1023
 msgid "NICOLA-F style Backspace"
 msgstr "Retropaŝo laŭ estilo NICOLA-F"
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1024
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr "Igi Zenkaku Hankaku kroman ESC"
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1025
 msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr "Aldonado de Esperantaj supersignoj"
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1026
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Al la ekvivalenta klavo en klavaro Qwerty."
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1027
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Al la ekvivalenta klavo en dvoraka klavaro."
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Teni klav-kongrueco kun malnovaj klavkodoj de Solaris"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "Kongrueco kun klavoj de Sun"
+
+#: ../rules/base.xml.in.h:1030
 msgid "Key sequence to kill the X server"
 msgstr "Klav-sekvo por formortigi la X-servilon"
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
@@ -3791,7 +3842,7 @@ msgid "apl"
 msgstr "apl"
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "APL Keyboard Symbols"
+msgid "APL keyboard symbols"
 msgstr "Klavar-simboloj APL"
 
 #: ../rules/base.extras.xml.in.h:5
@@ -3810,105 +3861,252 @@ msgstr "shs"
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Plurlingva (Kanado, Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "Germana (Usona klavaro kun germanaj literoj)"
 
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "Germana (kun hungaraj literoj kaj neniu senpaŝa klavo)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "Germana (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:17
 msgid "Avestan"
 msgstr "Avesta"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:20
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Litova (usona Dvorako kun litovaj literoj)"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Litova (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "Latva (usona Dvorako)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Latva (usona Dvorako, variaĵo Y)"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Latva (usona Dvorako, variaĵo minusa)"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Latva (usona Dvorako por programistoj)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Latva (usona Dvorako por programistoj, variaĵo Y)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Latva (usona Dvorako por programistoj, variaĵo minusa)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:30
 msgid "Latvian (US Colemak)"
 msgstr "Latva (usona Colemak)"
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:31
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Latva (usona Colemak, citila variaĵo)"
 
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Latva (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:35
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Angla (Usono, internacia AltGr-Unikoda kunmiksado)"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Angla (Usono, internacia AltGr-Unikoda kunmiksado, alternativa)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "Atsina"
 msgstr "Atsina"
 
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:38
 msgid "Couer D'alene Salish"
 msgstr "Couer D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr "Angla (US, Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr "Pola (internacia kun senpaŝaj klavoj)"
 
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "Pola (Colemak)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "Pola (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:48
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr "Krime-tatara (Dobruja Q)"
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Rumana (komforteca Touchtype)"
 
-#: ../rules/base.extras.xml.in.h:44
-msgid "Serbian"
-msgstr "Serba"
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Rumana (Sun Tipo 6/7)"
 
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:53
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serba (kunmiksado de diakritaĵoj anstataŭ senpaŝaj klavoj)"
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "Rusa (kun aranĝo ukrainia-belorusa)"
 
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "Rusa (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:60
 msgid "Armenian (OLPC phonetic)"
 msgstr "Armena (fonetika OLPC)"
 
-#: ../rules/base.extras.xml.in.h:53
-msgid "Hebrew (Biblical SIL)"
-msgstr "Hebrea (Biblia, SIL)"
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "Hebrea (Biblia, fonetika SIL)"
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Araba (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Belga (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "Portugala (Brazilo, Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "Ĉeĥa (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "Dana (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Nederlanda (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Estona (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Fina (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "Franca (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "Greka (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "Itala (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "Japana (Sun Tipo 6)"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Japana (Sun Tipo 7 - kongrua kun pc)"
 
-#: ../rules/base.extras.xml.in.h:54
-msgid "Biblical SIL phonetic"
-msgstr "Biblia fonetika SIL"
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Japana (Sun Tipo 7 - kongrua kun Sun)"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Norvega (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Portugala (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Slovaka (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "Hispana (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "Sveda (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr ">Germana (Svislando)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Germana (Svislando, Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Franca (Svislando, Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Turka (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Ukrajna (Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "Angla (UK, Sun Tipo 6/7)"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "Kore (Sun Tipo 6/7)"
+
+#~ msgid "ca"
+#~ msgstr "ca"
+
+#~ msgid "Catalan"
+#~ msgstr "Kataluna"
+
+#~ msgid "Serbian (Cyrillic)"
+#~ msgstr "Serba (Cirila)"
+
+#~ msgid "Gagauz"
+#~ msgstr "Gagauza"
+
+#~ msgid "Hebrew (Biblical SIL)"
+#~ msgstr "Hebrea (Biblia, SIL)"
 
 #~ msgid "&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 #~ msgstr "&lt;Malpli-signo/Pli-signo&gt; elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo, unu premo malfaras la ŝloson"
@@ -3967,9 +4165,6 @@ msgstr "Biblia fonetika SIL"
 #~ msgid "Danish (Mac)"
 #~ msgstr "Dana (Mac)"
 
-#~ msgid "English (UK, Mac)"
-#~ msgstr "Angla (UK, Macintosh)"
-
 #~ msgid "Finnish (Mac)"
 #~ msgstr "Finna (Mac)"
 
@@ -4051,9 +4246,6 @@ msgstr "Biblia fonetika SIL"
 #~ msgid "Swiss"
 #~ msgstr "Svisa"
 
-#~ msgid "Swiss (legacy)"
-#~ msgstr "Svisa (malmoderna)"
-
 #~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
 #~ msgstr "Turka (Krime-tatara Turka Alt-Q)"
 
diff --git a/xorg-server/xkeyboard-config/po/fr.po b/xorg-server/xkeyboard-config/po/fr.po
index d8f797660..d551584f7 100644
--- a/xorg-server/xkeyboard-config/po/fr.po
+++ b/xorg-server/xkeyboard-config/po/fr.po
@@ -5,14 +5,14 @@
 # 2005, 2006 Denis Barbier <barbier@linuxfr.org>
 # 2008 Marc Veillet <scouigne@gmail.com>
 # Marc Veillet <scouigne@gmail.com>, 2011.
-# Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2011-2012, 2012.
+# Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2011-2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.6.99\n"
+"Project-Id-Version: xkeyboard-config 2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-09-12 00:25+0100\n"
-"PO-Revision-Date: 2012-09-16 11:49+0200\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-22 00:43+0100\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -704,3196 +704,3250 @@ msgid "OLPC"
 msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Sun Type 5/6"
-msgstr "Sun type 5/6"
+msgid "Sun Type 7 USB"
+msgstr "Sun type 7 USB"
 
 #: ../rules/base.xml.in.h:172
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun type 7 USB (Europe)"
+
+#: ../rules/base.xml.in.h:173
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun type 7 USB (Unix)"
+
+#: ../rules/base.xml.in.h:174
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun type 7 USB (Japon) / Japonais 106 touches"
+
+#: ../rules/base.xml.in.h:175
+msgid "Sun Type 6/7 USB"
+msgstr "Sun type 6/7 USB"
+
+#: ../rules/base.xml.in.h:176
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun type 6/7 USB (Europe)"
+
+#: ../rules/base.xml.in.h:177
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun type 6 USB (Unix)"
+
+#: ../rules/base.xml.in.h:178
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun type 6 USB (Japon)"
+
+#: ../rules/base.xml.in.h:179
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun type 6 (Japon)"
+
+#: ../rules/base.xml.in.h:180
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:181
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:182
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:183
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:184
 msgid "Htc Dream phone"
 msgstr "Htc Dream"
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
 msgid "English (US)"
 msgstr "Anglais (USA)"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:189
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:190
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:191
 msgid "English (US, with euro on 5)"
 msgstr "Anglais (USA, avec l'Euro sur le 5)"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:192
 msgid "English (US, international with dead keys)"
 msgstr "Anglais (USA, variante internationale, avec touches mortes)"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:193
 msgid "English (US, alternative international)"
 msgstr "Anglais (USA, variante internationale)"
 
 # http://colemak.com/
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:194
 msgid "English (Colemak)"
 msgstr "Anglais (Colemak)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:195
 msgid "English (Dvorak)"
 msgstr "Anglais (Dvorak)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
-#: ../rules/base.xml.in.h:188
-msgid "English (Dvorak international with dead keys)"
-msgstr "Anglais (Dvorak, international avec touche morte)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
+msgstr "Anglais (Dvorak, international avec touches mortes)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:197
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Anglais (Dvorak, variante internationale, sans touche morte)"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:198
 msgid "English (left handed Dvorak)"
 msgstr "Anglais (Dvorak pour gaucher)"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:199
 msgid "English (right handed Dvorak)"
 msgstr "Anglais (Dvorak pour droitier)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:200
 msgid "English (classic Dvorak)"
 msgstr "Anglais (Dvorak classique)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:201
 msgid "English (programmer Dvorak)"
 msgstr "Anglais (Dvorak pour programmeur)"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:204
 msgid "Russian (US, phonetic)"
 msgstr "Russe (US, phonétique)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
 msgstr "Anglais (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:206
 msgid "English (international AltGr dead keys)"
 msgstr "Anglais (international, AltGr, touches mortes)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:207
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Anglais (la touche multiplier/diviser modifie la disposition clavier)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Serbo-croate
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:208
 msgid "Serbo-Croatian (US)"
 msgstr "Serbo-Croate (US)"
 
-#. Keyboard indicator for Catalan layouts
-#: ../rules/base.xml.in.h:202
-msgid "ca"
-msgstr "ca"
+# https://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/
+#: ../rules/base.xml.in.h:209
+msgid "English (Workman)"
+msgstr "Anglais (Workman)"
 
-#: ../rules/base.xml.in.h:203
-msgid "Catalan"
-msgstr "Catalan"
+# https://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/
+#: ../rules/base.xml.in.h:210
+msgid "English (Workman, international with dead keys)"
+msgstr "Anglais (Workman, international avec touches mortes)"
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:213
 msgid "Afghani"
 msgstr "Afghan"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:215
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:216
 msgid "Pashto"
 msgstr "Pachto"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:218
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:219
 msgid "Uzbek (Afghanistan)"
 msgstr "Ouzbek (Afghanistan)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:220
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Pachto (Afghanistan, OLPC)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Dari
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:221
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persan (Afghanistan, Dari, OLPC)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:222
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Ouzbek (Afghanistan, OLPC)"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
 msgid "Arabic"
 msgstr "Arabe"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:226
 msgid "Arabic (azerty)"
 msgstr "Arabe (azerty)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:227
 msgid "Arabic (azerty/digits)"
 msgstr "Arabe (azerty/chiffres)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:228
 msgid "Arabic (digits)"
 msgstr "Arabe (chiffres)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:229
 msgid "Arabic (qwerty)"
 msgstr "Arabe (qwerty)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:230
 msgid "Arabic (qwerty/digits)"
 msgstr "Arabe (qwerty/chiffres)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:231
 msgid "Arabic (Buckwalter)"
 msgstr "Arabe (Buckwalter)"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:233
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:234
 msgid "Albanian"
 msgstr "Albanais"
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
 msgid "Armenian"
 msgstr "Arménien"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:238
 msgid "Armenian (phonetic)"
 msgstr "Arménien (phonétique)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:239
 msgid "Armenian (alternative phonetic)"
 msgstr "Arménien (variante, phonétique)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:240
 msgid "Armenian (eastern)"
 msgstr "Arménien (orientale)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:241
 msgid "Armenian (western)"
 msgstr "Arménien (occidentale)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:242
 msgid "Armenian (alternative eastern)"
 msgstr "Arménien (variante, orientale)"
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:245
 msgid "German (Austria)"
 msgstr "Allemand (Autriche)"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:246
+msgid "German (legacy)"
+msgstr "Allemand (obsolète)"
+
+#: ../rules/base.xml.in.h:247
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Allemand (Autriche, sans touche morte)"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:248
 msgid "German (Austria, Sun dead keys)"
 msgstr "Allemand (Autriche, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:249
 msgid "German (Austria, Macintosh)"
 msgstr "Allemand (Autriche, Macintosh)"
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:251
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:252
 msgid "Azerbaijani"
 msgstr "Azéri"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:253
 msgid "Azerbaijani (Cyrillic)"
 msgstr "Azéri (cyrillique)"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:255
 msgid "by"
 msgstr "by"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:256
 msgid "Belarusian"
 msgstr "Biélorusse"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:257
 msgid "Belarusian (legacy)"
 msgstr "Biélorusse (obsolète)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:258
 msgid "Belarusian (Latin)"
 msgstr "Biélorusse (latin)"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
 msgid "Belgian"
 msgstr "Belge"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:262
 msgid "Belgian (alternative)"
 msgstr "Belge (variante)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:263
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belge (variante, latin-9 uniquement)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:264
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belge (variante, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:265
 msgid "Belgian (ISO alternate)"
 msgstr "Belge (variante ISO)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:266
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belge (sans touche morte)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:267
 msgid "Belgian (Sun dead keys)"
 msgstr "Belge (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:268
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belge (Wang modèle 724 azerty)"
 
 #. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:270
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:271
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:272
 msgid "Bengali (Probhat)"
 msgstr "Bengali (Probhat)"
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:274
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:275
 msgid "Indian"
 msgstr "Indien"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:276
 msgid "Bengali (India)"
 msgstr "Bengali (Inde)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:277
 msgid "Bengali (India, Probhat)"
 msgstr "Bengali (Inde, Probhat)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:278
 msgid "Bengali (India, Baishakhi)"
 msgstr "Bengali (Inde, Baishakhi)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:279
 msgid "Bengali (India, Bornona)"
 msgstr "Bengali (Inde, Bornona)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:280
 msgid "Bengali (India, Uni Gitanjali)"
 msgstr "Bengali (Inde, Uni Gitanjali)"
 
 # InScript = Indian Script
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:281
 msgid "Bengali (India, Baishakhi Inscript)"
 msgstr "Bengali (Inde, Inscript Baishakhi)"
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:283
 msgid "gu"
 msgstr "gu"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Gujar%C3%A2t%C3%AE
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:284
 msgid "Gujarati"
 msgstr "Gujarâtî"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:286
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:287
 msgid "Punjabi (Gurmukhi)"
 msgstr "Penjabi (Gurmukhî)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Penjabi
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:288
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Penjabi (Gurmukhî, Jhelum)"
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:290
 msgid "kn"
 msgstr "kn"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kannada
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:291
 msgid "Kannada"
 msgstr "Kannada"
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:293
 msgid "ml"
 msgstr "ml"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Malay%C3%A2lam
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:294
 msgid "Malayalam"
 msgstr "Malayâlam"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:295
 msgid "Malayalam (Lalitha)"
 msgstr "Malayâlam (lalitha)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/InScript_keyboard
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:296
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malayâlam (Inscript amélioré avec le symbole monétaire Roupie)"
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:298
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:299
 msgid "Oriya"
 msgstr "Oriya"
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:301
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:302
 msgid "Tamil (Unicode)"
 msgstr "Tamoul (Unicode)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:303
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamoul (clavier avec chiffres)"
 
 # TAB et TSCII sont des codages tamouls.
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:304
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamoul (machine à écrire, TAB)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:305
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamoul (machine à écrire, TSCII)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Tamoul
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:306
 msgid "Tamil"
 msgstr "Tamoul"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:308
 msgid "te"
 msgstr "te"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/T%C3%A9lougou
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:309
 msgid "Telugu"
 msgstr "Télougou"
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:311
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:312
 msgid "Urdu (phonetic)"
 msgstr "Ourdou (phonétique)"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:313
 msgid "Urdu (alternative phonetic)"
 msgstr "Ourdou (variante, phonétique)"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:314
 msgid "Urdu (WinKeys)"
 msgstr "Ourdou (touches Windows)"
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:316
 msgid "hi"
 msgstr "hi"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Hindi
 # http://indlinux.org/wiki/index.php/BolNagri
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:317
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (bolnagri)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:318
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:319
 msgid "English (India, with RupeeSign)"
 msgstr "Anglais (Inde, avec le symbole Roupie)"
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:321
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:322
 msgid "Bosnian"
 msgstr "Bosniaque"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:323
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosniaque (utilise des guillemets typographiques à la place des guillemets simples)"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:324
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosniaque (utilise les digraphes bosniaques)"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:325
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosniaque (clavier US avec digraphes bosniaques)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:326
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosniaque (clavier US avec lettres bosniaques)"
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
 msgid "Portuguese (Brazil)"
 msgstr "Portugais (Brésil)"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:330
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugais (Brésil, sans touche morte)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:331
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugais (Brésil, Dvorak)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard#Other_languages
 # http://tecladobrasileiro.com.br/images/stories/br-nativo/br-nativo-simples.svg
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:332
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugais (Brésil, BR-Nativo)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:333
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugais (Brésil, BR-Nativo pour claviers US)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:334
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugais (Brésil, BR-Nativo pour l'Espéranto)"
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:336
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:337
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:338
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgare (phonétique, traditionnel)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:339
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgare (phonétique, nouveau)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:340
 msgid "Arabic (Morocco)"
 msgstr "Arabe (Maroc)"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:343
 msgid "French (Morocco)"
 msgstr "Français (Maroc)"
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:345
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:346
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berbère (Maroc, Tifinagh)"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:347
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berbère (Maroc, variante Tifinagh)"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:348
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berbère (Maroc, variante Tifinagh phonétique)"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:349
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berbère (Maroc, Tifinagh étendu)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:350
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berbère (Maroc, Tifinagh phonétique)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:351
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berbère (Maroc, Tifinagh étendu phonétique)"
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "cm"
 msgstr "cm"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
 msgid "English (Cameroon)"
 msgstr "Anglais (Cameroun)"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:355
 msgid "French (Cameroon)"
 msgstr "Français (Cameroun)"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:356
 msgid "Cameroon Multilingual (qwerty)"
 msgstr "Cameroun multilingue (qwerty)"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:357
 msgid "Cameroon Multilingual (azerty)"
 msgstr "Cameroun multilingue (azerty)"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:358
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr "Cameroun multilingue (Dvorak)"
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:360
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:361
 msgid "Burmese"
 msgstr "Birman"
 
-#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr "Français (Canada)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:363
 msgid "French (Canada, Dvorak)"
 msgstr "Français (Canada, Dvorak)"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:364
 msgid "French (Canada, legacy)"
 msgstr "Français (Canada, obsolète)"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:365
 msgid "Canadian Multilingual"
 msgstr "Canadien multilingue"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:366
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadien multilingue (première partie)"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:367
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadien multilingue (seconde partie)"
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:369
 msgid "ike"
 msgstr "ike"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Inuktitut
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:370
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:371
 msgid "English (Canada)"
 msgstr "Anglais (Canada)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:372
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Français (République démocratique du Congo)"
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:374
 msgid "zh"
 msgstr "zh"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:375
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:376
 msgid "Tibetan"
 msgstr "Tibétain"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:377
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibétain (avec chiffres ASCII)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Ou%C3%AFghour
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:378
 msgid "Uyghur"
 msgstr "Ouïghour"
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:380
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:381
 msgid "Croatian"
 msgstr "Croate"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:382
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Croate (utilise des guillemets typo. au lieu des guillemets simples)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:383
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Croate (utilise les digraphes croates)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:384
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Croate (clavier US avec digraphes croates)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:385
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Croate (clavier US avec lettres croates)"
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:389
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Tchèque (avec la touche &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:390
 msgid "Czech (qwerty)"
 msgstr "Tchèque (qwerty)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:391
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Tchèque (qwerty, barre oblique inverse étendue)"
 
 # http://repo.or.cz/w/ucwcs-xkb.git/blob_plain/HEAD:/README
 # http://www.ucw.cz/
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:392
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Tchèque (disposition UCW, lettres accentuées seulement)"
 
 # http://repo.or.cz/w/ucwcs-xkb.git/blob_plain/HEAD:/README
 # http://www.ucw.cz/
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:393
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Tchèque (Dvorak US avec support UCW CZ)"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
 msgid "Danish"
 msgstr "Danois"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:397
 msgid "Danish (eliminate dead keys)"
 msgstr "Danois (sans touche morte)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:398
 msgid "Danish (Macintosh)"
 msgstr "Danois (Macintosh)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:399
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Danois (Macintosh, sans touche morte)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:400
 msgid "Danish (Dvorak)"
 msgstr "Danois (Dvorak)"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
 msgid "Dutch"
 msgstr "Néerlandais"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:404
 msgid "Dutch (Sun dead keys)"
 msgstr "Néerlandais (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:405
 msgid "Dutch (Macintosh)"
 msgstr "Néerlandais (Macintosh)"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:406
 msgid "Dutch (standard)"
 msgstr "Néerlandais (standard)"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:408
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:409
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
 msgid "Estonian"
 msgstr "Estonien"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:413
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estonien (sans touche morte)"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:414
 msgid "Estonian (Dvorak)"
 msgstr "Estonien (Dvorak)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estonien (clavier US avec lettres estoniennes)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Persan
-#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
 msgid "Persian"
 msgstr "Persan"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Persian (with Persian Keypad)"
 msgstr "Persan (avec pavé numérique persan)"
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurde (Iran, Q latin)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 msgid "Kurdish (Iran, F)"
 msgstr "Kurde (Iran, F)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurde (Iran, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurde (Iran, arabe-latin)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
 msgid "Iraqi"
 msgstr "Irakien"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:425
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurde (Irak, Q latin)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:426
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurde (Irak, F)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:427
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurde (Irak, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:428
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurde (Irak, arabe-latin)"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:430
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:431
 msgid "Faroese"
 msgstr "Féroïen"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:432
 msgid "Faroese (eliminate dead keys)"
 msgstr "Féroïen (sans touche morte)"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
 msgid "Finnish"
 msgstr "Finnois"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:436
 msgid "Finnish (classic)"
 msgstr "Finnois (classique)"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finnois (classique, sans touche morte)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Northern Saami (Finland)"
 msgstr "Sami du Nord (Finlande)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Finnish (Macintosh)"
 msgstr "Finnois (Macintosh)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
 msgid "French"
 msgstr "Français"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:441
 msgid "French (eliminate dead keys)"
 msgstr "Français (sans touche morte)"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "French (Sun dead keys)"
 msgstr "Français (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "French (alternative)"
 msgstr "Français (variante)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "French (alternative, latin-9 only)"
 msgstr "Français (variante, latin-9 uniquement)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Français (variante, sans touche morte)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "French (alternative, Sun dead keys)"
 msgstr "Français (variante, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "French (legacy, alternative)"
 msgstr "Français (variante obsolète)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Français (variante obsolète, sans touche morte)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Français (variante obsolète, touches mortes Sun)"
 
 # http://bepo.fr
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Français (Bépo, ergonomique, façon Dvorak)"
 
 # http://bepo.fr
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Français (Bépo, ergonomique, façon Dvorak, latin-9 uniquement)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:452
 msgid "French (Dvorak)"
 msgstr "Français (Dvorak)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:453
 msgid "French (Macintosh)"
 msgstr "Français (Macintosh)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:454
 msgid "French (Breton)"
 msgstr "Français (breton)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:455
 msgid "Occitan"
 msgstr "Occitan"
 
 # As the name suggests, this layout is based on French AZERTY keyboard. The layout is based on the Georgian AZERTY layout model by Georgian language and localizaton expert Vasil "Tskapo" Kekelia.
 #
 # http://www.gakartuleba.org/layouts/index.php
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:456
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Géorgien (France, azerty Tskapo)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:457
 msgid "English (Ghana)"
 msgstr "Anglais (Ghana)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:458
 msgid "English (Ghana, multilingual)"
 msgstr "Anglais (Ghana, multilingue)"
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:460
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:461
 msgid "Akan"
 msgstr "Akan"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:463
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:464
 msgid "Ewe"
 msgstr "Éwé"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:466
 msgid "ff"
 msgstr "ff"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Fula_language
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:467
 msgid "Fula"
 msgstr "Peul"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:469
 msgid "gaa"
 msgstr "gaa"
 
 # Langue du Ghana.
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:470
 msgid "Ga"
 msgstr "Ga"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:472
 msgid "ha"
 msgstr "ha"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Haoussa
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:473
 msgid "Hausa"
 msgstr "Haoussa"
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:475
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:476
 msgid "Avatime"
 msgstr "Avatime"
 
 # http://www.gillbt.org/
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:477
 msgid "English (Ghana, GILLBT)"
 msgstr "Anglais (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:478
 msgid "French (Guinea)"
 msgstr "Français (Guinée)"
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:480
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:481
 msgid "Georgian"
 msgstr "Géorgien"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:482
 msgid "Georgian (ergonomic)"
 msgstr "Géorgien (ergonomique)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:483
 msgid "Georgian (MESS)"
 msgstr "Géorgien (MESS)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:484
 msgid "Russian (Georgia)"
 msgstr "Russe (Géorgie)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:485
 msgid "Ossetian (Georgia)"
 msgstr "Ossète (Géorgie)"
 
-#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
 msgid "German"
 msgstr "Allemand"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:487
 msgid "German (dead acute)"
 msgstr "Allemand (accent aigu en touche morte)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:488
 msgid "German (dead grave acute)"
 msgstr "Allemand (accents aigu et grave en touches mortes)"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:489
 msgid "German (eliminate dead keys)"
 msgstr "Allemand (sans touche morte)"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:490
 msgid "Romanian (Germany)"
 msgstr "Roumain (Allemagne)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:491
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Roumain (Allemagne, sans touche morte)"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:492
 msgid "German (Dvorak)"
 msgstr "Allemand (Dvorak)"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:493
 msgid "German (Sun dead keys)"
 msgstr "Allemand (touches mortes Sun)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Keyboard_layout#Neo
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:494
 msgid "German (Neo 2)"
 msgstr "Allemand (Neo 2)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:495
 msgid "German (Macintosh)"
 msgstr "Allemand (Macintosh)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:496
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Allemand (Macintosh, sans touche morte)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:497
 msgid "Lower Sorbian"
 msgstr "Bas-sorabe"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Bas-sorabe
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:498
 msgid "Lower Sorbian (qwertz)"
 msgstr "Bas-sorabe (qwertz)"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:499
 msgid "German (qwerty)"
 msgstr "Allemand (qwerty)"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:500
 msgid "Russian (Germany, phonetic)"
 msgstr "Russe (Allemagne, phonétique)"
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
 msgid "Greek"
 msgstr "Grec"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:504
 msgid "Greek (simple)"
 msgstr "Grec (simple)"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:505
 msgid "Greek (extended)"
 msgstr "Grec (étendu)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:506
 msgid "Greek (eliminate dead keys)"
 msgstr "Grec (sans touche morte)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Diacritiques_de_l%27alphabet_grec
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:507
 msgid "Greek (polytonic)"
 msgstr "Grec (polytonique)"
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:509
 msgid "hu"
 msgstr "hu"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Hongrois
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (standard)"
 msgstr "Hongrois (standard)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Hongrois (sans touche morte)"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (qwerty)"
 msgstr "Hongrois (qwerty)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Hongrois (101, qwertz, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Hongrois (101, qwertz, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Hongrois (101, qwertz, point,  touches mortes)"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Hongrois (101, qwertz, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Hongrois (101, qwerty, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Hongrois (101, qwerty, virgule, sans touche morte)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Hongrois (101, qwerty, point, touches mortes)"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:521
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Hongrois (101, qwerty, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:522
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Hongrois (102, qwertz, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:523
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Hongrois (102, qwertz, virgule, sans touche morte)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:524
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Hongrois (102, qwertz, point, touches mortes)"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:525
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Hongrois (102, qwertz, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:526
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Hongrois (102, qwerty, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:527
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Hongrois (102, qwerty, virgule, sans touche morte)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:528
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Hongrois (102, qwerty, point, touches mortes)"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:529
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Hongrois (102, qwerty, point, sans touche morte)"
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:531
 msgid "is"
 msgstr "is"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Islandais
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:532
 msgid "Icelandic"
 msgstr "Islandais"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:533
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandais (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:534
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandais (sans touche morte)"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:535
 msgid "Icelandic (Macintosh)"
 msgstr "Islandais (Macintosh)"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:536
 msgid "Icelandic (Dvorak)"
 msgstr "Islandais (Dvorak)"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:540
 msgid "Hebrew (lyx)"
 msgstr "Hébreu (lyx)"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:541
 msgid "Hebrew (phonetic)"
 msgstr "Hébreu (phonétique)"
 
 # http://wiki.jewishliturgy.org/Hebrew_Font_and_Keyboard_Layout_Setup
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:542
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hébreu (biblique, Tiro)"
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
 msgid "Italian"
 msgstr "Italien"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:546
 msgid "Italian (eliminate dead keys)"
 msgstr "Italien (sans touche morte)"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:547
 msgid "Italian (Macintosh)"
 msgstr "Italien (Macintosh)"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:548
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italien (clavier US avec lettres italiennes)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Oss%C3%A8te
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:549
 msgid "Georgian (Italy)"
 msgstr "Géorgien (Italie)"
 
+#: ../rules/base.xml.in.h:550
+msgid "Italian (IBM 142)"
+msgstr "Italien (IBM 142)"
+
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
 msgid "Japanese"
 msgstr "Japonais"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:554
 msgid "Japanese (Kana)"
 msgstr "Japonais (Kana)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:555
 msgid "Japanese (Kana 86)"
 msgstr "Japonais (Kana 86)"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:556
 msgid "Japanese (OADG 109A)"
 msgstr "Japonais (OADG 109A)"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:557
 msgid "Japanese (Macintosh)"
 msgstr "Japonais (Macintosh)"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:558
 msgid "Japanese (Dvorak)"
 msgstr "Japonais (Dvorak)"
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:560
 msgid "ki"
 msgstr "ki"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kirghize_%28langue%29
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:561
 msgid "Kyrgyz"
 msgstr "Kirghize"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:562
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirghize (phonétique)"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:564
 msgid "km"
 msgstr "km"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Khmer
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:565
 msgid "Khmer (Cambodia)"
 msgstr "Khmer (Cambodge)"
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:567
 msgid "kk"
 msgstr "kk"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakh
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:568
 msgid "Kazakh"
 msgstr "Kazakh"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakhstan
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakh
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:569
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Russe (Kazakhstan, avec kazakh)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:570
 msgid "Kazakh (with Russian)"
 msgstr "Kazakh (avec russe)"
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:572
 msgid "lo"
 msgstr "lo"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Lao_%28langue%29
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:573
 msgid "Lao"
 msgstr "Lao"
 
 # STEA = Agence pour la science, la technologie et l'environnement.
 # http://www.clear-vu.com.hk/resources/lao_keyboard.asp
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:574
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Lao (disposition proposée par la STEA)"
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:577
 msgid "Spanish (Latin American)"
 msgstr "Espagnol (Amérique latine)"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:578
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Espagnol (Amérique latine, sans touche morte)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:579
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Espagnol (Amérique latine, y compris la touche morte tilde)"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:580
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Espagnol (Amérique latine, touches mortes Sun)"
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
 msgid "lt"
 msgstr "lt"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Lituanien
-#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
 msgid "Lithuanian"
 msgstr "Lituanien"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:584
 msgid "Lithuanian (standard)"
 msgstr "Lituanien (standard)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:585
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Lituanien (clavier US avec lettres lituaniennes)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:586
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Lituanien (IBM LST 1205-92)"
 
 # http://lekp.info/LithuanianErgonomic
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:587
 msgid "Lithuanian (LEKP)"
 msgstr "Lituanien (LEKP)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:588
 msgid "Lithuanian (LEKPa)"
 msgstr "Lituanien (LEKPa)"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
 msgid "Latvian"
 msgstr "Letton"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:592
 msgid "Latvian (apostrophe variant)"
 msgstr "Letton (variante apostrophe)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:593
 msgid "Latvian (tilde variant)"
 msgstr "Letton (variante tilde)"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:594
 msgid "Latvian (F variant)"
 msgstr "Letton (variante F)"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:595
 msgid "Latvian (modern)"
 msgstr "Letton (moderne)"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:596
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Letton (ergonomique, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:597
 msgid "Latvian (adapted)"
 msgstr "Letton (adapté)"
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:599
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:600
 msgid "Maori"
 msgstr "Maori"
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Mont%C3%A9n%C3%A9grin
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:603
 msgid "Montenegrin"
 msgstr "Monténégrin"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:604
 msgid "Montenegrin (Cyrillic)"
 msgstr "Monténégrin (cyrillique)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:605
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Monténégrin (cyrillique, Z et ZHE intervertis)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:606
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Monténégrin (Unicode latin)"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:607
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Monténégrin (qwerty latin)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:608
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Monténégrin (qwerty Unicode latin)"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:609
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Monténégrin (cyrillique avec guillemets)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:610
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Monténégrin (latin avec guillemets)"
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:612
 msgid "mk"
 msgstr "mk"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Mac%C3%A9donien
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:613
 msgid "Macedonian"
 msgstr "Macédonien"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:614
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macédonien (sans touche morte)"
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:616
 msgid "mt"
 msgstr "mt"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Maltais
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:617
 msgid "Maltese"
 msgstr "Maltais"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:618
 msgid "Maltese (with US layout)"
 msgstr "Maltais (avec disposition US)"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:620
 msgid "mn"
 msgstr "mn"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Mongol
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:621
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
 msgid "no"
 msgstr "no"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Norv%C3%A9gien
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:625
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norvégien (sans touche morte)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:626
 msgid "Norwegian (Dvorak)"
 msgstr "Norvégien (Dvorak)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:627
 msgid "Northern Saami (Norway)"
 msgstr "Sami du Nord (Norvège)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:628
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Sami du Nord (Norvège, sans touche morte)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:629
 msgid "Norwegian (Macintosh)"
 msgstr "Norvégien (Macintosh)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:630
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Norvégien (Macintosh, sans touche morte)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:631
 msgid "Norwegian (Colemak)"
 msgstr "Norvégien (Colemak)"
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
 msgid "pl"
 msgstr "pl"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Polonais
-#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:635
+msgid "Polish (legacy)"
+msgstr "Polonais (obsolète)"
+
+#: ../rules/base.xml.in.h:636
 msgid "Polish (qwertz)"
 msgstr "Polonais (qwertz)"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:637
 msgid "Polish (Dvorak)"
 msgstr "Polonais (Dvorak)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Disposition_Dvorak
 #
 # Sur le clavier Dvorak, les guillemets sont sur une seule et même touche.
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:638
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Polonais (Dvorak, guillemets polonais sur la touche guillemets)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:639
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Polonais (Dvorak, guillemets polonais sur le « 1 »)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Cachoube
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:640
 msgid "Kashubian"
 msgstr "Cachoube"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:641
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Russe (Pologne, Dvorak phonétique)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:642
 msgid "Polish (programmer Dvorak)"
 msgstr "Polonais (Dvorak pour le programmeur)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:644
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugais (sans touche morte)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:645
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugais (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:646
 msgid "Portuguese (Macintosh)"
 msgstr "Portugais (Macintosh)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:647
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugais (Macintosh, sans touche morte)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:648
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugais (Macintosh, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:649
 msgid "Portuguese (Nativo)"
 msgstr "Portugais (PT-Nativo)"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:650
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugais (PT-Nativo pour claviers US)"
 
 # http://tecladobrasileiro.com.br/index.php?option=com_content&task=view&id=20&Itemid=62
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:651
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Espéranto (Portugal, PT-Nativo)"
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
 msgid "ro"
 msgstr "ro"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Roumain
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
 msgid "Romanian"
 msgstr "Roumain"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
 msgstr "Roumain (cédille)"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Roumain (standard)"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard cedilla)"
 msgstr "Roumain (standard, cédille)"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:658
 msgid "Romanian (WinKeys)"
 msgstr "Roumain (touche Windows)"
 
-#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "Russe"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:660
 msgid "Russian (phonetic)"
 msgstr "Russe (phonétique)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:661
 msgid "Russian (phonetic WinKeys)"
 msgstr "Russe (phonétique, touches Windows)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:662
 msgid "Russian (typewriter)"
 msgstr "Russe (machine à écrire)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:663
 msgid "Russian (legacy)"
 msgstr "Russe (obsolète)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:664
 msgid "Russian (typewriter, legacy)"
 msgstr "Russe (machine à écrire, obsolète)"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:665
 msgid "Tatar"
 msgstr "Tatar"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Ossetian (legacy)"
 msgstr "Ossète (obsolète)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Oss%C3%A8te
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:667
 msgid "Ossetian (WinKeys)"
 msgstr "Ossète (touches Windows)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:668
 msgid "Chuvash"
 msgstr "Chuvash"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Tchouvache
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:669
 msgid "Chuvash (Latin)"
 msgstr "Tchouvache (latin)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:670
 msgid "Udmurt"
 msgstr "Oudmourte"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Komi_%28langue%29
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:671
 msgid "Komi"
 msgstr "Komi"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Iakoute
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:672
 msgid "Yakut"
 msgstr "Iakute"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:673
 msgid "Kalmyk"
 msgstr "Kalmyk"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:674
 msgid "Russian (DOS)"
 msgstr "Russe (DOS)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:675
 msgid "Serbian (Russia)"
 msgstr "Serbe (Russe)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Bachkir
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:676
 msgid "Bashkirian"
 msgstr "Bachkir"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Mari_%28langue%29
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:677
 msgid "Mari"
 msgstr "Mari"
 
-#: ../rules/base.xml.in.h:668
-msgid "Serbian (Cyrillic)"
-msgstr "Serbe (cyrillique)"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "Serbe"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:679
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr "Serbe (cyrillique, Z et ZHE intervertis)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:680
 msgid "Serbian (Latin)"
 msgstr "Serbe (Latin)"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:681
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbe (latin, Unicode)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:682
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbe (latin, qwerty)"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:683
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbe (latin, Unicode, qwerty)"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr "Serbe (cyrillique avec guillemets)"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbe (Latin avec guillemets)"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:686
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Ruthène pannonien (homophonique)"
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:688
 msgid "sl"
 msgstr "sl"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Slov%C3%A8ne
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:689
 msgid "Slovenian"
 msgstr "Slovène"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:690
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Slovène (utilise des guillemets typographiques au lieu des guillemets simples)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:691
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Slovène (clavier US avec lettres slovènes)"
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
 msgid "sk"
 msgstr "sk"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Slovaque
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:695
 msgid "Slovak (extended Backslash)"
 msgstr "Slovaque (barre oblique inverse étendue)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:696
 msgid "Slovak (qwerty)"
 msgstr "Slovaque (qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:697
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slovaque (qwerty, barre oblique inverse étendue)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:699
 msgid "Spanish (eliminate dead keys)"
 msgstr "Espagnol (sans touche morte)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:700
 msgid "Spanish (include dead tilde)"
 msgstr "Espagnol (y compris la touche morte tilde)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:701
 msgid "Spanish (Sun dead keys)"
 msgstr "Espagnol (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:702
 msgid "Spanish (Dvorak)"
 msgstr "Espagnol (Dvorak)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:703
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr "Asturien (Espagne, avec H point bas et L point bas)"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:704
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Catalan (Espagne, avec L point médian)"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:705
 msgid "Spanish (Macintosh)"
 msgstr "Espagnol (Macintosh)"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
 msgid "sv"
 msgstr "sv"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Su%C3%A9dois
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:709
 msgid "Swedish (eliminate dead keys)"
 msgstr "Suédois (sans touche morte)"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:710
 msgid "Swedish (Dvorak)"
 msgstr "Suédois (Dvorak)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:711
 msgid "Russian (Sweden, phonetic)"
 msgstr "Russe (Suède, phonétique)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:712
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Russe (Suède, phonétique, sans touche morte)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:713
 msgid "Northern Saami (Sweden)"
 msgstr "Sami du Nord (Suède)"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:714
 msgid "Swedish (Macintosh)"
 msgstr "Suédois (Macintosh)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:715
 msgid "Swedish (Svdvorak)"
 msgstr "Suédois (Svdvorak)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:716
 msgid "Swedish Sign Language"
 msgstr "Langue des signes suédoise"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:717
 msgid "German (Switzerland)"
 msgstr "Allemand (Suisse)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:718
 msgid "German (Switzerland, legacy)"
 msgstr "Allemand (Suisse, obsolète)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:719
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Allemand (Suisse, sans touche morte)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:720
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Allemand (Suisse, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:721
 msgid "French (Switzerland)"
 msgstr "Français (Suisse)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:722
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Français (Suisse, sans touche morte)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Français (Suisse, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
 msgid "French (Switzerland, Macintosh)"
 msgstr "Français (Suisse, Macintosh)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
 msgid "German (Switzerland, Macintosh)"
 msgstr "Allemand (Suisse, Macintosh)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
 msgid "Arabic (Syria)"
 msgstr "Arabe (Syrie)"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:728
 msgid "syc"
 msgstr "syc"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Syriaque
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:729
 msgid "Syriac"
 msgstr "Syriaque"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:730
 msgid "Syriac (phonetic)"
 msgstr "Syriaque (phonétique)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurde (Syrie, Q latin)"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
 msgid "Kurdish (Syria, F)"
 msgstr "Kurde (Syrie, F)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurde (Syrie, Alt-Q latin)"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
 msgid "tg"
 msgstr "tg"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Tadjik
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
 msgid "Tajik"
 msgstr "Tadjik"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "Tadjik (obsolète)"
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:739
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
 msgid "Sinhala (phonetic)"
 msgstr "Cingalais (phonétique)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamoul (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamoul (Sri Lanka, machine à écrire, TAB)"
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
 msgid "th"
 msgstr "th"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Tha%C3%AF_%28langue%29
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
 msgid "Thai"
 msgstr "Thaï"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
 msgid "Thai (TIS-820.2538)"
 msgstr "Thaï (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Thaï (Pattachote)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
 msgid "tr"
 msgstr "tr"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Turc
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
 msgid "Turkish (F)"
 msgstr "Turc (F)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
 msgid "Turkish (Alt-Q)"
 msgstr "Turc (Alt-Q)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
 msgid "Turkish (Sun dead keys)"
 msgstr "Turc (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurde (Turquie, Q latin)"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurde (Turquie, F)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:756
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurde (Turquie, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
 msgid "Turkish (international with dead keys)"
 msgstr "Turc (international avec touches mortes)"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:760
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Tatar de Crimée (Q turc)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Tatar de Crimée (F turc)"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
 msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "Tatar de Crimée (Alt.-Q turc)"
+msgstr "Tatar de Crimée (Alt-Q turc)"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
 msgid "Taiwanese"
 msgstr "Taïwanais"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
 msgid "Taiwanese (indigenous)"
 msgstr "Taïwanais (indigène)"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Taïwan)"
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
 msgid "uk"
 msgstr "uk"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Ukrainien
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:771
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrainien (phonétique)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:772
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrainien (machine à écrire)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukrainien (touches Windows)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (legacy)"
 msgstr "Ukrainien (obsolète)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrainien (RSTU standard)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Russe (Ukraine, RSTU standard)"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrainien (homophonique)"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
 msgid "English (UK)"
 msgstr "Anglais (Royaume-Uni)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
 msgid "English (UK, extended WinKeys)"
 msgstr "Anglais (Royaume-Uni, touche Windows étendue)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:780
 msgid "English (UK, international with dead keys)"
 msgstr "Anglais (Royaume-Uni, international, avec touches mortes)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:781
 msgid "English (UK, Dvorak)"
 msgstr "Anglais (Royaume-Uni, Dvorak)"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Anglais (Royaume-Uni, Dvorak, ponctuation britannique)"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
 msgid "English (UK, Macintosh)"
 msgstr "Anglais (Royaume-Uni, Macintosh)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
 msgid "English (UK, Macintosh international)"
 msgstr "Anglais (Royaume-Uni, Macintosh international)"
 
 # http://colemak.com/
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
 msgid "English (UK, Colemak)"
 msgstr "Anglais (Royaume-Uni, Colemak)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Ouzbek
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
 msgid "Uzbek"
 msgstr "Ouzbek"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:787
 msgid "Uzbek (Latin)"
 msgstr "Ouzbek (latin)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:790
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
 msgid "Korean"
 msgstr "Coréen"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
 msgid "Korean (101/104 key compatible)"
 msgstr "Coréen (compatible 101/104 touches)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japonais (PC-98xx)"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
 msgid "Irish"
 msgstr "Irlandais"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
 msgid "CloGaelach"
 msgstr "Cló Gaelach"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:800
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlandais (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
 msgid "Ogham"
 msgstr "Ogham"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
 msgid "Ogham (IS434)"
 msgstr "Ogham (IS434)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Ourdou
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
 msgid "Urdu (Pakistan)"
 msgstr "Ourdou (Pakistan)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Ourdou (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Ourdou (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
 msgid "Arabic (Pakistan)"
 msgstr "Arabe (Pakistan)"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
 msgid "sd"
 msgstr "sd"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Sindhi
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
 msgid "Sindhi"
 msgstr "Sindhî"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
 msgid "Dhivehi"
 msgstr "Divehi"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:813
 msgid "English (South Africa)"
 msgstr "Anglais (Afrique du Sud)"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:815
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
 msgid "Esperanto"
 msgstr "Espéranto"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Espéranto (point-virgule et guillemets simples déplacés, obsolète)"
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
 msgid "ne"
 msgstr "ne"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/N%C3%A9palais
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
 msgid "Nepali"
 msgstr "Népalais"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
 msgid "English (Nigeria)"
 msgstr "Anglais (Nigeria)"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
 msgid "ig"
 msgstr "ig"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Igbo
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
 msgid "Igbo"
 msgstr "Igbo"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
 msgid "yo"
 msgstr "yo"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Yoruba
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
 msgid "Yoruba"
 msgstr "Yoruba"
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:829
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
 msgid "Amharic"
 msgstr "Amharique"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:832
 msgid "wo"
 msgstr "wo"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Wolof_%28langue%29
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
 msgid "Wolof"
 msgstr "Wolof"
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:836
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
 msgid "Braille (left hand)"
 msgstr "Braille (main gauche)"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
 msgid "Braille (right hand)"
 msgstr "Braille (main droite)"
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:840
 msgid "tk"
 msgstr "tk"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Turkm%C3%A8ne
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
 msgid "Turkmen"
 msgstr "Turkmène"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmène (Alt-Q)"
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:844
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
 msgid "Bambara"
 msgstr "Bambara"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
 msgid "French (Mali, alternative)"
 msgstr "Français (Mali, variante)"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:847
 msgid "English (Mali, US Macintosh)"
 msgstr "Anglais (Mali, Macintosh USA)"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
 msgid "English (Mali, US international)"
 msgstr "Anglais (Mali, USA international)"
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:850
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
 msgid "Swahili (Tanzania)"
 msgstr "Swahili (Tanzanie)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Swahili
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
 msgid "Swahili (Kenya)"
 msgstr "Swahili (Kenya)"
 
 # Langue bantoue.
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kikuyu_%28langue%29
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:853
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
 msgid "tn"
 msgstr "tn"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Tswana
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:856
 msgid "Tswana"
 msgstr "Tswana"
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
 msgid "Filipino"
 msgstr "Filipino"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipino (baybayin, qwerty)"
 
 # http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:861
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipino (Capewell-Dvorak, latin)"
 
 # http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipino (Capewell-Dvorak, baybayin)"
 
 # http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipino (Capewell-QWERF 2006, latin)"
 
 # http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipino (Capewell-QWERF 2006, baybayin)"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:865
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipino (Colemak, latin)"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipino (Colemak, baybayin)"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipino (Dvorak, latin)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Baybayin
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Filipino (Dvorak, baybayin)"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
 msgid "md"
 msgstr "md"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
 msgid "Moldavian"
 msgstr "Moldave"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:871
 msgid "gag"
 msgstr "gag"
 
-#: ../rules/base.xml.in.h:862
-msgid "Gagauz"
-msgstr "Gagaouze"
+# https://fr.wikipedia.org/wiki/Gagaouze 
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "Moldave (Gagaouze)"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
 msgid "Key(s) to change layout"
 msgstr "Touches modifiant la disposition du clavier"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
 msgid "Right Alt (while pressed)"
-msgstr "Alt. droite (si enfoncé)"
+msgstr "Alt droite (si enfoncé)"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
 msgid "Left Alt (while pressed)"
 msgstr "Alt gauche (si enfoncé)"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:876
 msgid "Left Win (while pressed)"
 msgstr "Windows gauche (si enfoncé)"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
 msgid "Right Win (while pressed)"
 msgstr "Windows droite (si enfoncé)"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
 msgid "Any Win key (while pressed)"
 msgstr "N'importe quelle touche Windows (enfoncée)"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:879
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Verr. maj. (si enfoncé), Alt+Verr. maj. joue le rôle original de Verr. maj."
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
 msgid "Right Ctrl (while pressed)"
 msgstr "Ctrl droite (si enfoncé)"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
 msgid "Right Alt"
-msgstr "Alt. droite"
+msgstr "Alt droite"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
 msgid "Left Alt"
 msgstr "Alt gauche"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
 msgid "Caps Lock"
 msgstr "Verr. maj."
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
 msgid "Shift+Caps Lock"
 msgstr "Maj.+ Verr. maj."
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Verr. maj. (première disposition), Maj.+Verr. maj. (dernière disposition)"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Touche Windows gauche (première disposition), touche Windows droite (dernière disposition)"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Ctrl gauche (première disposition), Ctrl droit (dernière disposition)"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
 msgid "Alt+Caps Lock"
 msgstr "Alt+Verr. maj."
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
 msgid "Both Shift keys together"
 msgstr "Les deux Maj. ensemble"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
 msgid "Both Alt keys together"
 msgstr "Les deux Alt ensemble"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
 msgid "Both Ctrl keys together"
 msgstr "Les deux Ctrl ensemble"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Maj."
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl gauche+Maj. gauche"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
 msgid "Right Ctrl+Right Shift"
 msgstr "Ctrl  droite + Maj. droite"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
 msgid "Alt+Ctrl"
-msgstr "Alt.+Ctrl"
+msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
 msgid "Alt+Shift"
 msgstr "Alt+Maj."
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
 msgid "Left Alt+Left Shift"
-msgstr "Alt. gauche+Maj. gauche"
+msgstr "Alt gauche+Maj. gauche"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
 msgid "Alt+Space"
 msgstr "Alt+Espace"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
 msgid "Left Win"
 msgstr "Touche Windows gauche"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
 msgid "Right Win"
 msgstr "Windows droite"
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
 msgid "Left Shift"
 msgstr "Maj. gauche"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
 msgid "Right Shift"
 msgstr "Maj. droite"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl"
 msgstr "Ctrl gauche"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
 msgid "Right Ctrl"
 msgstr "Crtl droite"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
 msgid "Scroll Lock"
 msgstr "Arrêt défilement"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Ctrl gauche + Windows gauche (première disposition), Ctrl droit + Menu (seconde disposition)"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
 msgid "Key to choose 3rd level"
 msgstr "Touche sélectionnant le niveau 3"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
 msgid "Any Win key"
 msgstr "N'importe quelle touche Windows"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
 msgid "Any Alt key"
 msgstr "N'importe quelle touche Alt"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Touche_compose
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Alt. droite, Maj.+Alt. droite est une touche compose (Multi_Key)"
+msgstr "Alt droite, Maj.+Alt droite est une touche compose (Multi_Key)"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:912
 msgid "Right Alt key never chooses 3rd level"
-msgstr "Alt. droite ne sélectionne jamais le niveau 3"
+msgstr "Alt droite ne sélectionne jamais le niveau 3"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
 msgid "Enter on keypad"
 msgstr "Entrée sur le pavé numérique"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
 msgid "Backslash"
 msgstr "Barre oblique inverse"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Plus petit/Plus grand&gt;"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
 msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Verr. maj. sélectionne le niveau 3 ; avec un autre sélecteur de niveau 3, enclenche une fois ce niveau"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
 msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "La barre oblique inverse sélectionne le niveau 3 ; avec un autre sélecteur de niveau 3, enclenche une fois ce niveau"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
 msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "&lt;Plus petit/Plus grand&gt; sélectionne le niveau 3 ; avec un autre sélecteur de niveau 3, enclenche une fois ce niveau"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
 msgid "Ctrl key position"
 msgstr "Position de la touche Ctrl"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
 msgid "Caps Lock as Ctrl"
 msgstr "Verr. maj. comme Ctrl"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
 msgid "Left Ctrl as Meta"
 msgstr "Ctrl gauche comme Méta"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Intervertir Ctrl et Verr. maj."
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
 msgid "At left of 'A'"
 msgstr "À gauche du « A »"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:924
 msgid "At bottom left"
 msgstr "En bas à gauche"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:925
 msgid "Right Ctrl as Right Alt"
-msgstr "Ctrl droite comme Alt. droite"
+msgstr "Ctrl droite comme Alt droite"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:926
 msgid "Menu as Right Ctrl"
 msgstr "Menu comme Crtl droite"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:927
 msgid "Right Alt as Right Ctrl"
-msgstr "Alt. droite comme Ctrl droite"
+msgstr "Alt droite comme Ctrl droite"
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=518156
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:928
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Utiliser les voyants du clavier pour indiquer une disposition alternative"
 
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:929
 msgid "Num Lock"
 msgstr "Verr. Num."
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:930
 msgid "Numeric keypad layout selection"
 msgstr "Disposition du pavé numérique"
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:931
 msgid "Legacy"
 msgstr "Obsolète"
 
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:932
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Ajouts Unicode (opérateurs mathématiques et flèches)"
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:933
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Ajouts Unicode (opérateurs mathématiques et flèches). Les opérateurs mathématiques se trouvent au niveau par défaut"
 
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:934
 msgid "Legacy Wang 724"
 msgstr "Wang 724 (clavier obsolète)"
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:935
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Wang 724 avec ajouts Unicode (opérateurs mathématiques et flèches)"
 
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:936
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Wang 724 avec ajouts Unicode (opérateurs mathématiques et flèches). Les opérateurs mathématiques se trouvent au niveau par défaut"
 
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:937
 msgid "Hexadecimal"
 msgstr "Hexadécimal"
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:938
 msgid "ATM/phone-style"
 msgstr "Clavier de type téléphonique"
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:939
 msgid "Numeric keypad delete key behaviour"
 msgstr "Comportement de la touche de Suppr. du pavé numérique"
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:940
 msgid "Legacy key with dot"
 msgstr "Touche obsolète avec point"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:942
 msgid "Legacy key with comma"
 msgstr "Touche obsolète avec virgule"
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:943
 msgid "Four-level key with dot"
 msgstr "Touche à quatre niveaux avec point"
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:944
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Touche à quatre niveaux avec point, latin-9 uniquement"
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:945
 msgid "Four-level key with comma"
 msgstr "Touche à quatre niveaux avec virgule"
 
 # Le momayyez est le séparateur décimal perse.
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:946
 msgid "Four-level key with momayyez"
 msgstr "Touche à quatre niveaux avec le séparateur décimal momayyez"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:949
 msgid "Four-level key with abstract separators"
 msgstr "Touche à quatre niveaux avec le séparateur décimal abstrait"
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:950
 msgid "Semi-colon on third level"
 msgstr "Point-virgule au niveau 3"
 
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:951
 msgid "Caps Lock key behavior"
 msgstr "Comportement de la touche Verr. maj."
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:952
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Verr. maj. utilise la mise en majuscule interne. Maj. annule temporairement Verr. maj."
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:953
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Verr. maj. utilise la mise en majuscule interne. Maj. n'a pas d'effet sur Verr. maj."
 
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:954
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Verr. maj. agit comme un verrouillage de maj. Maj. l'annule temporairement"
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:955
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Verr. maj. agit comme maj. quand il est verrouillé. Maj. n'a pas d'effet sur verr. Maj."
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:956
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Verr. maj. active ou désactive la mise en majuscule usuelle des caractères alphabétiques"
 
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:957
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Faire de Verr. maj. un Verr. Num. supplémentaire"
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:958
 msgid "Swap ESC and Caps Lock"
 msgstr "Intervertir Échap. et Verr. maj."
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:959
 msgid "Make Caps Lock an additional ESC"
 msgstr "Faire de Verr. maj. un Échap. supplémentaire."
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:960
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Faire de Verr. maj. un Effacement. arriière supplémentaire."
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:961
 msgid "Make Caps Lock an additional Super"
 msgstr "Faire de Verr. maj. un Super supplémentaire."
 
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:962
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Faire de Verr. maj. un Hyper supplémentaire"
 
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:963
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Verr. maj. active ou désactive maj., ce qui affecte toutes les touches"
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:964
 msgid "Caps Lock is disabled"
 msgstr "Verr. maj. est désactivé"
 
 # http://www.x.org/wiki/KeySyms
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:965
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Faire de Verr. maj. un Contrôle supplémentaire, mais garder le même nom symbolique (Caps_Lock)"
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:966
 msgid "Alt/Win key behavior"
 msgstr "Comportement des touches Alt et Windows"
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:967
 msgid "Add the standard behavior to Menu key"
 msgstr "Ajouter du comportement standard à la touche Menu"
 
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:968
 msgid "Alt and Meta are on Alt keys"
-msgstr "Alt et Meta sont sur les touches Alt."
+msgstr "Alt et Meta sont sur les touches Alt"
 
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:969
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Ctrl est placé sur les touches Windows (et les touches Ctrl habituelles)"
 
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:970
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr "Ctrl est placé sur les touches Alt., Alt. sur les touches Windows"
+msgstr "Ctrl est placé sur les touches Alt, Alt sur les touches Windows"
 
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:971
 msgid "Meta is mapped to Win keys"
 msgstr "Méta est placé sur les touches Windows"
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:972
 msgid "Meta is mapped to Left Win"
 msgstr "Méta est placé sur Windows gauche"
 
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:973
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper est placé sur les touches Windows"
 
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:974
 msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Alt. est placé sur Windows droite, Super sur Menu"
+msgstr "Alt est placé sur Windows droite, Super sur Menu"
 
-#: ../rules/base.xml.in.h:965
-msgid "Left Alt is swapped with Left Win"
-msgstr "Alt. gauche échangé avec Windows droit"
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
+msgstr "Alt échangé avec Windows"
 
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:976
 msgid "Compose key position"
 msgstr "Position de la touche Compose"
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:977
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:978
 msgid "PrtSc"
 msgstr "Impr. Écr."
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:979
 msgid "Miscellaneous compatibility options"
 msgstr "Diverses options de compatibilité"
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:980
 msgid "Default numeric keypad keys"
 msgstr "Touches du pavé numérique par défaut"
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:981
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr "Les touches du pavé numérique sont toujours numériques (comme sur Mac OS)"
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:982
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Maj. avec le pavé numérique se comporte comme dans Windows"
 
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:983
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Maj. n'annule pas Verr. maj., mais sélectionne le niveau 3"
 
 # https://help.ubuntu.com/7.04/user-guide/C/prefs-hardware.html
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:984
 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 le serveur X"
 
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:985
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Clavier aluminium Apple : émulation des touches PC (Impr. écr. ; défil. ; pause ; Verr. Num.)"
 
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:986
 msgid "Shift cancels Caps Lock"
 msgstr "Maj. annule Verr. maj."
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:987
 msgid "Enable extra typographic characters"
 msgstr "Active des caractères typographiques supplémentaires"
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:988
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Les deux touches Maj. activent ou désactivent Verr. maj."
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:989
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Les deux touches majuscule activent le verrouillage majuscule, une le désactive"
 
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:990
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Les deux touches Maj. activent ou désactivent le blocage majuscule"
 
 # http://who-t.blogspot.com/2010/11/xkb-mouse-emulation-removed-from.html
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:991
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Active ou désactive le contrôle de la souris (PointerKeys) avec Maj. + Verr. num."
 
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:992
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr "Autoriser des actions clavier à casser les captures (attention : faille de sécurité)"
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:993
 msgid "Adding currency signs to certain keys"
 msgstr "Ajout des signes monétaires sur certaines touches"
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:994
 msgid "Euro on E"
 msgstr "Euro sur le E"
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:995
 msgid "Euro on 2"
 msgstr "Euro sur le 2"
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:996
 msgid "Euro on 4"
 msgstr "Euro sur le 4"
 
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:997
 msgid "Euro on 5"
 msgstr "Euro sur le 5"
 
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:998
 msgid "Rupee on 4"
 msgstr "Roupie sur le 4"
 
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:999
 msgid "Key to choose 5th level"
 msgstr "Touche sélectionnant le niveau 5"
 
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1000
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "&lt;Plus petit/Plus grand&gt; sélectionne le niveau 5 ; se verrouille par un appui simultané avec un autre sélecteur de niveau 5"
 
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1001
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Alt. droite sélectionne le niveau 5 ; se verrouille par un appui simultané avec un autre sélecteur de niveau 5"
+msgstr "Alt droite sélectionne le niveau 5 ; se verrouille par un appui simultané avec un autre sélecteur de niveau 5"
 
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1002
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Windows gauche sélectionne le niveau 5 ; se verrouille par un appui simultané avec un autre sélecteur de niveau 5"
 
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1003
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Windows droite sélectionne le niveau 5 ; se verrouille par un appui simultané avec un autre sélecteur du niveau 5"
 
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1004
 msgid "Using space key to input non-breakable space character"
 msgstr "Utiliser la barre d'espacement pour insérer une espace insécable"
 
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:1005
 msgid "Usual space at any level"
 msgstr "L'espace habituelle quelque-soit le niveau"
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1006
 msgid "Non-breakable space character at second level"
 msgstr "Espace insécable au niveau 2"
 
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1007
 msgid "Non-breakable space character at third level"
 msgstr "Espace insécable au niveau 3"
 
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1008
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Espace insécable au niveau 3, rien au niveau 4"
 
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1009
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Espace insécable au niveau 3, espace fine insécable au niveau 4"
 
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1010
 msgid "Non-breakable space character at fourth level"
 msgstr "Espace insécable au niveau 4"
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1011
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Espace insécable au niveau 4, espace fine insécable au niveau 6"
 
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1012
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Espace insécable au niveau 4, espace fine insécable au niveau 6 (via Ctrl+Maj.)"
 
 # http://hapax.qc.ca/glossaire.htm
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1013
 msgid "Zero-width non-joiner character at second level"
 msgstr "Antiliant à chasse nulle au niveau 2"
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1014
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Antiliant à chasse nulle au niveau 2, liant à chasse nulle au niveau 3"
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1015
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Antiliant à chasse nulle au niveau 2, liant à chasse nulle au niveau 3, espace insécable au niveau 4"
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1016
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Antiliant à chasse nulle au niveau 2. espace insécable au niveau 3"
 
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1017
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Antiliant à chasse nulle au niveau 2. espace insécable au niveau 3, rien au niveau 4"
 
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1018
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Antiliant à chasse nulle au niveau 2. espace insécable au niveau 3, liant à chasse nulle au niveau 4"
 
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1019
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Antiliant à chasse nulle au niveau 2. espace insécable au niveau 3, espace fine insécable au niveau 4"
 
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1020
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Antiliant à chasse nulle au niveau 3, liant à chasse nulle au niveau 4"
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1021
 msgid "Japanese keyboard options"
 msgstr "Options des claviers japonais"
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1022
 msgid "Kana Lock key is locking"
 msgstr "La touche « verrouillage Kana » verrouille"
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1023
 msgid "NICOLA-F style Backspace"
 msgstr "Eff. Arr. du type NICOLA-F"
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1024
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr "Faire du Zenkaku Hankaku un Échap. supplémentaire."
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1025
 msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr "Ajout de l'accent circonflexe espéranto (supersigno)"
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1026
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Vers la touche correspondante sur un clavier qwerty."
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1027
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Vers la touche correspondante sur un clavier Dvorak."
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Rester compatible avec les anciens code clavier Solaris"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "Compatibilité avec les touches Sun"
+
+#: ../rules/base.xml.in.h:1030
 msgid "Key sequence to kill the X server"
 msgstr "Séquence de touches pour tuer le serveur X"
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Eff. arrière"
 
@@ -3903,7 +3957,7 @@ msgstr "apl"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/APL_%28programming_language%29
 #: ../rules/base.extras.xml.in.h:2
-msgid "APL Keyboard Symbols"
+msgid "APL keyboard symbols"
 msgstr "Symboles APL"
 
 #: ../rules/base.extras.xml.in.h:5
@@ -3923,105 +3977,238 @@ msgstr "shs"
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Multilingue (Canada, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "Allemand (clavier US avec lettres allemandes)"
 
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "Allemand (avec les lettres hongroises, sans touche mortes)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "Allemand (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:17
 msgid "Avestan"
 msgstr "Avestique"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:20
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Lituanien (Dvorak USA avec lettres lituaniennes)"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Lituanien (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "Letton (Dvorak USA)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Letton (Dvorak USA, variante Y)"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Letton (Dvorak USA, variante moins)"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Letton (Dvorak pour le programmeur USA)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Letton (Dvorak pour le programmeur USA, variante Y)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Letton (Dvorak pour le programmeur USA, variante moins)"
 
 # http://colemak.com/
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:30
 msgid "Latvian (US Colemak)"
 msgstr "Letton (Colemak USA)"
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:31
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Letton (Colemak USA, variante apostrophe)"
 
-#: ../rules/base.extras.xml.in.h:31
+# http://colemak.com/
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Letton (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:35
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Anglais (USA, international, AltGr combinatoire Unicode)"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Anglais (USA, international, AltGr combinatoire Unicode, variante)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "Atsina"
 msgstr "Atsina"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/C%C5%93ur_d%27Al%C3%A8ne_%28langue%29
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:38
 msgid "Couer D'alene Salish"
 msgstr "Salish Cœur d'Alène"
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr "Anglais (USA, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr "Polonais (international avec touches mortes)"
 
-#: ../rules/base.extras.xml.in.h:41
+# http://colemak.com/
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "Polonais (Colemak)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "Polonais (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:48
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr "Tatar de Crimée (Q dobroudja)"
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Roumain (ergonomique dactylographique)"
 
-#: ../rules/base.extras.xml.in.h:44
-msgid "Serbian"
-msgstr "Serbe"
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Roumain (Sun type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:53
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serbe (accents combinatoires à la place des touches mortes)"
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "Russe (Ukrainien-Biélorusse)"
 
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "Russe (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:60
 msgid "Armenian (OLPC phonetic)"
 msgstr "Arménien (phonétique OLPC)"
 
-# http://wiki.jewishliturgy.org/Hebrew_Font_and_Keyboard_Layout_Setup
-#: ../rules/base.extras.xml.in.h:53
-msgid "Hebrew (Biblical SIL)"
-msgstr "Hébreu (biblique, SIL)"
-
-#: ../rules/base.extras.xml.in.h:54
-msgid "Biblical SIL phonetic"
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
 msgstr "Hébreu (biblique, SIL, phonétique)"
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Arabe (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Belge (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "Portugais (Brésil, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "Tchèque (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "Danois (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Danois (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Estonien (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Finnois (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "Français (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "Grec (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "Italien (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "Japonais (Sun type 6)"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Japonais (Sun type 7 - compatible PC)"
+
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Japonais (Sun type 7 - compatible Sun)"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Norvégien (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Portugais (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Slovaque (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "Espagnol (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "Suédois (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr "Allemand (Suisse)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Allemand (Suisse, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Français (Suisse, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Turc (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Ukrainien (Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "Anglais (Royaume-Uni, Sun type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "Coréen (Sun type 6/7)"
diff --git a/xorg-server/xkeyboard-config/po/hr.po b/xorg-server/xkeyboard-config/po/hr.po
new file mode 100644
index 000000000..50fa459a9
--- /dev/null
+++ b/xorg-server/xkeyboard-config/po/hr.po
@@ -0,0 +1,3913 @@
+# Translation of xkeyboard-config to Croatian.
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+#
+# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 2.6.99\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2012-09-12 00:25+0100\n"
+"PO-Revision-Date: 2012-10-05 18:28+0200\n"
+"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"Language-Team: Croatian <lokalizacija@linux.hr>\n"
+"Language: hr\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "Generic 101-key PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:2
+msgid "Generic 102-key (Intl) PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:3
+msgid "Generic 104-key PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:4
+msgid "Generic 105-key (Intl) PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:5
+msgid "Dell 101-key PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:6
+msgid "Dell Latitude series laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:7
+msgid "Dell Precision M65"
+msgstr ""
+
+#: ../rules/base.xml.in.h:8
+msgid "Everex STEPnote"
+msgstr ""
+
+#: ../rules/base.xml.in.h:9
+msgid "Keytronic FlexPro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:10
+msgid "Microsoft Natural"
+msgstr ""
+
+#: ../rules/base.xml.in.h:11
+msgid "Northgate OmniKey 101"
+msgstr ""
+
+#: ../rules/base.xml.in.h:12
+msgid "Winbook Model XP5"
+msgstr ""
+
+#: ../rules/base.xml.in.h:13
+msgid "PC-98xx Series"
+msgstr ""
+
+#: ../rules/base.xml.in.h:14
+msgid "A4Tech KB-21"
+msgstr ""
+
+#: ../rules/base.xml.in.h:15
+msgid "A4Tech KBS-8"
+msgstr ""
+
+#: ../rules/base.xml.in.h:16
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr ""
+
+#: ../rules/base.xml.in.h:17
+msgid "Acer AirKey V"
+msgstr ""
+
+#: ../rules/base.xml.in.h:18
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:19
+msgid "Advance Scorpius KI"
+msgstr ""
+
+#: ../rules/base.xml.in.h:20
+msgid "Brother Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:21
+msgid "BTC 5113RF Multimedia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:22
+msgid "BTC 5126T"
+msgstr ""
+
+#: ../rules/base.xml.in.h:23
+msgid "BTC 6301URF"
+msgstr ""
+
+#: ../rules/base.xml.in.h:24
+msgid "BTC 9000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:25
+msgid "BTC 9000A"
+msgstr ""
+
+#: ../rules/base.xml.in.h:26
+msgid "BTC 9001AH"
+msgstr ""
+
+#: ../rules/base.xml.in.h:27
+msgid "BTC 5090"
+msgstr ""
+
+#: ../rules/base.xml.in.h:28
+msgid "BTC 9019U"
+msgstr ""
+
+#: ../rules/base.xml.in.h:29
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr ""
+
+#: ../rules/base.xml.in.h:30
+msgid "Cherry Blue Line CyBo@rd"
+msgstr ""
+
+#: ../rules/base.xml.in.h:31
+msgid "Cherry CyMotion Master XPress"
+msgstr ""
+
+#: ../rules/base.xml.in.h:32
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:33
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr ""
+
+#: ../rules/base.xml.in.h:34
+msgid "Cherry CyMotion Expert"
+msgstr ""
+
+#: ../rules/base.xml.in.h:35
+msgid "Cherry B.UNLIMITED"
+msgstr ""
+
+#: ../rules/base.xml.in.h:36
+msgid "Chicony Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:37
+msgid "Chicony KU-0108"
+msgstr ""
+
+#: ../rules/base.xml.in.h:38
+msgid "Chicony KU-0420"
+msgstr ""
+
+#: ../rules/base.xml.in.h:39
+msgid "Chicony KB-9885"
+msgstr ""
+
+#: ../rules/base.xml.in.h:40
+msgid "Compaq Easy Access Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:41
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:42
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:43
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:44
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:45
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:46
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:47
+msgid "Compaq iPaq Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:48
+msgid "Dell"
+msgstr ""
+
+#: ../rules/base.xml.in.h:49
+msgid "Dell SK-8125"
+msgstr ""
+
+#: ../rules/base.xml.in.h:50
+msgid "Dell SK-8135"
+msgstr ""
+
+#: ../rules/base.xml.in.h:51
+msgid "Dell USB Multimedia Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:52
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:53
+msgid "Dell Laptop/notebook Precision M series"
+msgstr ""
+
+#: ../rules/base.xml.in.h:54
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:55
+msgid "Diamond 9801 / 9802 series"
+msgstr ""
+
+#: ../rules/base.xml.in.h:56
+msgid "DTK2000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:57
+msgid "Ennyah DKB-1008"
+msgstr ""
+
+#: ../rules/base.xml.in.h:58
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:59
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr ""
+
+#: ../rules/base.xml.in.h:60
+msgid "Genius Comfy KB-12e"
+msgstr ""
+
+#: ../rules/base.xml.in.h:61
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: ../rules/base.xml.in.h:62
+msgid "Genius KB-19e NB"
+msgstr ""
+
+#: ../rules/base.xml.in.h:63
+msgid "Genius KKB-2050HS"
+msgstr ""
+
+#: ../rules/base.xml.in.h:64
+msgid "Gyration"
+msgstr ""
+
+#: ../rules/base.xml.in.h:65
+msgid "HTC Dream"
+msgstr ""
+
+#: ../rules/base.xml.in.h:66
+msgid "Kinesis"
+msgstr ""
+
+#: ../rules/base.xml.in.h:67
+msgid "Logitech Generic Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:68
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr ""
+
+#: ../rules/base.xml.in.h:69
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:70
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:71
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:72
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr ""
+
+#: ../rules/base.xml.in.h:73
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:74
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr ""
+
+#: ../rules/base.xml.in.h:75
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:76
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr ""
+
+#: ../rules/base.xml.in.h:77
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:78
+msgid "Hewlett-Packard nx9020"
+msgstr ""
+
+#: ../rules/base.xml.in.h:79
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr ""
+
+#: ../rules/base.xml.in.h:80
+msgid "Honeywell Euroboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:81
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr ""
+
+#: ../rules/base.xml.in.h:82
+msgid "IBM Rapid Access"
+msgstr ""
+
+#: ../rules/base.xml.in.h:83
+msgid "IBM Rapid Access II"
+msgstr ""
+
+#: ../rules/base.xml.in.h:84
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr ""
+
+#: ../rules/base.xml.in.h:85
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr ""
+
+#: ../rules/base.xml.in.h:86
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr ""
+
+#: ../rules/base.xml.in.h:87
+msgid "IBM Space Saver"
+msgstr ""
+
+#: ../rules/base.xml.in.h:88
+msgid "Logitech Access Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:89
+msgid "Logitech Cordless Desktop LX-300"
+msgstr ""
+
+#: ../rules/base.xml.in.h:90
+msgid "Logitech Internet 350 Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:91
+msgid "Logitech Media Elite Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:92
+msgid "Logitech Cordless Desktop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:93
+msgid "Logitech Cordless Desktop iTouch"
+msgstr ""
+
+#: ../rules/base.xml.in.h:94
+msgid "Logitech Cordless Desktop Navigator"
+msgstr ""
+
+#: ../rules/base.xml.in.h:95
+msgid "Logitech Cordless Desktop Optical"
+msgstr ""
+
+#: ../rules/base.xml.in.h:96
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:97
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:98
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr ""
+
+#: ../rules/base.xml.in.h:99
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:100
+msgid "Logitech Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:101
+msgid "Logitech iTouch"
+msgstr ""
+
+#: ../rules/base.xml.in.h:102
+msgid "Logitech Internet Navigator Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:103
+msgid "Logitech Cordless Desktop EX110"
+msgstr ""
+
+#: ../rules/base.xml.in.h:104
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr ""
+
+#: ../rules/base.xml.in.h:105
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:106
+msgid "Logitech Ultra-X Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:107
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:108
+msgid "Logitech diNovo Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:109
+msgid "Logitech diNovo Edge Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:110
+msgid "Memorex MX1998"
+msgstr ""
+
+#: ../rules/base.xml.in.h:111
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:112
+msgid "Memorex MX2750"
+msgstr ""
+
+#: ../rules/base.xml.in.h:113
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:114
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:115
+msgid "Microsoft Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:116
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:117
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:118
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr ""
+
+#: ../rules/base.xml.in.h:119
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:120
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr ""
+
+#: ../rules/base.xml.in.h:121
+msgid "Microsoft Office Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:122
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr ""
+
+#: ../rules/base.xml.in.h:123
+msgid "Microsoft Natural Keyboard Elite"
+msgstr ""
+
+#: ../rules/base.xml.in.h:124
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:125
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:126
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127
+msgid "QTronix Scorpius 98N+"
+msgstr ""
+
+#: ../rules/base.xml.in.h:128
+msgid "Samsung SDM 4500P"
+msgstr ""
+
+#: ../rules/base.xml.in.h:129
+msgid "Samsung SDM 4510P"
+msgstr ""
+
+#: ../rules/base.xml.in.h:130
+msgid "Sanwa Supply SKB-KG3"
+msgstr ""
+
+#: ../rules/base.xml.in.h:131
+msgid "SK-1300"
+msgstr ""
+
+#: ../rules/base.xml.in.h:132
+msgid "SK-2500"
+msgstr ""
+
+#: ../rules/base.xml.in.h:133
+msgid "SK-6200"
+msgstr ""
+
+#: ../rules/base.xml.in.h:134
+msgid "SK-7100"
+msgstr ""
+
+#: ../rules/base.xml.in.h:135
+msgid "Super Power Multimedia Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:136
+msgid "SVEN Ergonomic 2500"
+msgstr ""
+
+#: ../rules/base.xml.in.h:137
+msgid "SVEN Slim 303"
+msgstr ""
+
+#: ../rules/base.xml.in.h:138
+msgid "Symplon PaceBook (tablet PC)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:139
+msgid "Toshiba Satellite S3000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:140
+msgid "Trust Wireless Keyboard Classic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:141
+msgid "Trust Direct Access Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:142
+msgid "Trust Slimline"
+msgstr ""
+
+#: ../rules/base.xml.in.h:143
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr ""
+
+#: ../rules/base.xml.in.h:144
+msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgstr ""
+
+#: ../rules/base.xml.in.h:145
+msgid "TypeMatrix EZ-Reach 2030 USB"
+msgstr ""
+
+#: ../rules/base.xml.in.h:146
+msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:147
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:148
+msgid "Yahoo! Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:149
+msgid "MacBook/MacBook Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:150
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:151
+msgid "Macintosh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:152
+msgid "Macintosh Old"
+msgstr ""
+
+#: ../rules/base.xml.in.h:153
+msgid "Happy Hacking Keyboard for Mac"
+msgstr ""
+
+#: ../rules/base.xml.in.h:154
+msgid "Acer C300"
+msgstr ""
+
+#: ../rules/base.xml.in.h:155
+msgid "Acer Ferrari 4000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:156
+msgid "Acer Laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:157
+msgid "Asus Laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:158
+msgid "Apple"
+msgstr ""
+
+#: ../rules/base.xml.in.h:159
+msgid "Apple Laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:160
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:161
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:162
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:163
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:164
+msgid "Laptop/notebook eMachines m68xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:165
+msgid "BenQ X-Touch"
+msgstr ""
+
+#: ../rules/base.xml.in.h:166
+msgid "BenQ X-Touch 730"
+msgstr ""
+
+#: ../rules/base.xml.in.h:167
+msgid "BenQ X-Touch 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:168
+msgid "Happy Hacking Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:169
+msgid "Classmate PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:170
+msgid "OLPC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:171
+msgid "Sun Type 5/6"
+msgstr ""
+
+#: ../rules/base.xml.in.h:172
+msgid "Targa Visionary 811"
+msgstr ""
+
+#: ../rules/base.xml.in.h:173
+msgid "Unitek KB-1925"
+msgstr ""
+
+#: ../rules/base.xml.in.h:174
+msgid "FL90"
+msgstr ""
+
+#: ../rules/base.xml.in.h:175
+msgid "Creative Desktop Wireless 7000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:176
+msgid "Htc Dream phone"
+msgstr ""
+
+#. Keyboard indicator for English layouts
+#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+msgid "en"
+msgstr "en"
+
+#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+msgid "English (US)"
+msgstr "engleski (SAD)"
+
+#. Keyboard indicator for Cherokee layouts
+#: ../rules/base.xml.in.h:181
+msgid "chr"
+msgstr "chr"
+
+#: ../rules/base.xml.in.h:182
+msgid "Cherokee"
+msgstr ""
+
+#: ../rules/base.xml.in.h:183
+msgid "English (US, with euro on 5)"
+msgstr "engleski (SAD, s eurom na 5)"
+
+#: ../rules/base.xml.in.h:184
+msgid "English (US, international with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:185
+msgid "English (US, alternative international)"
+msgstr "engleski (SAD, alternativni međunarodni)"
+
+#: ../rules/base.xml.in.h:186
+msgid "English (Colemak)"
+msgstr "engleski (Colemak)"
+
+#: ../rules/base.xml.in.h:187
+msgid "English (Dvorak)"
+msgstr "engleski (Dvorak)"
+
+#: ../rules/base.xml.in.h:188
+msgid "English (Dvorak international with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:189
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:190
+msgid "English (left handed Dvorak)"
+msgstr "engleski (Dvorak za ljevake)"
+
+#: ../rules/base.xml.in.h:191
+msgid "English (right handed Dvorak)"
+msgstr "engleski (Dvorak za dešnjake)"
+
+#: ../rules/base.xml.in.h:192
+msgid "English (classic Dvorak)"
+msgstr "engleski (klasični Dvorak)"
+
+#: ../rules/base.xml.in.h:193
+msgid "English (programmer Dvorak)"
+msgstr "engleski (Dvorak za programere)"
+
+#. Keyboard indicator for Russian layouts
+#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+msgid "ru"
+msgstr "ru"
+
+#: ../rules/base.xml.in.h:196
+msgid "Russian (US, phonetic)"
+msgstr "ruski (SAD, fonetski)"
+
+#: ../rules/base.xml.in.h:197
+msgid "English (Macintosh)"
+msgstr "engleski (Macintosh)"
+
+#: ../rules/base.xml.in.h:198
+msgid "English (international AltGr dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:199
+msgid "English (layout toggle on multiply/divide key)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:200
+msgid "Serbo-Croatian (US)"
+msgstr "srpskohrvatski (SAD)"
+
+#. Keyboard indicator for Catalan layouts
+#: ../rules/base.xml.in.h:202
+msgid "ca"
+msgstr "ca"
+
+#: ../rules/base.xml.in.h:203
+msgid "Catalan"
+msgstr "katalonski"
+
+#. Keyboard indicator for Persian layouts
+#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+msgid "fa"
+msgstr "fa"
+
+#: ../rules/base.xml.in.h:206
+msgid "Afghani"
+msgstr "afganistanski"
+
+#. Keyboard indicator for Pashto layouts
+#: ../rules/base.xml.in.h:208
+msgid "ps"
+msgstr "ps"
+
+#: ../rules/base.xml.in.h:209
+msgid "Pashto"
+msgstr "paštunski"
+
+#. Keyboard indicator for Uzbek layouts
+#: ../rules/base.xml.in.h:211
+msgid "uz"
+msgstr "uz"
+
+#: ../rules/base.xml.in.h:212
+msgid "Uzbek (Afghanistan)"
+msgstr "uzbečki (Afganistan)"
+
+#: ../rules/base.xml.in.h:213
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "paštunski (Afganistan, OLPC)"
+
+#: ../rules/base.xml.in.h:214
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:215
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "uzbečki (Afganistan, OLPC)"
+
+#. Keyboard indicator for Arabic layouts
+#: ../rules/base.xml.in.h:217
+msgid "ar"
+msgstr "ar"
+
+#: ../rules/base.xml.in.h:218
+msgid "Arabic"
+msgstr "arapski"
+
+#: ../rules/base.xml.in.h:219
+msgid "Arabic (azerty)"
+msgstr "arapski (azerty)"
+
+#: ../rules/base.xml.in.h:220
+msgid "Arabic (azerty/digits)"
+msgstr "arapski (azerty/znamenke)"
+
+#: ../rules/base.xml.in.h:221
+msgid "Arabic (digits)"
+msgstr "arapski (znamenke)"
+
+#: ../rules/base.xml.in.h:222
+msgid "Arabic (qwerty)"
+msgstr "arapski (qwerty)"
+
+#: ../rules/base.xml.in.h:223
+msgid "Arabic (qwerty/digits)"
+msgstr "arapski (qwerty/znamenke)"
+
+#: ../rules/base.xml.in.h:224
+msgid "Arabic (Buckwalter)"
+msgstr "arapski (Buckwalter)"
+
+#. Keyboard indicator for Albanian layouts
+#: ../rules/base.xml.in.h:226
+msgid "sq"
+msgstr "sq"
+
+#: ../rules/base.xml.in.h:227
+msgid "Albanian"
+msgstr "albanski"
+
+#. Keyboard indicator for Armenian layouts
+#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+msgid "hy"
+msgstr "hy"
+
+#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+msgid "Armenian"
+msgstr "armenski"
+
+#: ../rules/base.xml.in.h:231
+msgid "Armenian (phonetic)"
+msgstr "armenski (fonetski)"
+
+#: ../rules/base.xml.in.h:232
+msgid "Armenian (alternative phonetic)"
+msgstr "armenski (alternativni fonetski)"
+
+#: ../rules/base.xml.in.h:233
+msgid "Armenian (eastern)"
+msgstr "armenski (istočni)"
+
+#: ../rules/base.xml.in.h:234
+msgid "Armenian (western)"
+msgstr "armenski (zapadni)"
+
+#: ../rules/base.xml.in.h:235
+msgid "Armenian (alternative eastern)"
+msgstr "armenski (alternativni istočni)"
+
+#. Keyboard indicator for German layouts
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+msgid "de"
+msgstr "de"
+
+#: ../rules/base.xml.in.h:238
+msgid "German (Austria)"
+msgstr "njemački (Austrija)"
+
+#: ../rules/base.xml.in.h:239
+msgid "German (Austria, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:240
+msgid "German (Austria, Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:241
+msgid "German (Austria, Macintosh)"
+msgstr "njemački (Austrija, Macintosh)"
+
+#. Keyboard indicator for Azerbaijani layouts
+#: ../rules/base.xml.in.h:243
+msgid "az"
+msgstr "az"
+
+#: ../rules/base.xml.in.h:244
+msgid "Azerbaijani"
+msgstr "azerbejdžanski"
+
+#: ../rules/base.xml.in.h:245
+msgid "Azerbaijani (Cyrillic)"
+msgstr "azerbejdžanski (ćirilični)"
+
+#. Keyboard indicator for Belarusian layouts
+#: ../rules/base.xml.in.h:247
+msgid "by"
+msgstr "by"
+
+#: ../rules/base.xml.in.h:248
+msgid "Belarusian"
+msgstr "bjeloruski"
+
+#: ../rules/base.xml.in.h:249
+msgid "Belarusian (legacy)"
+msgstr "bjeloruski (stari)"
+
+#: ../rules/base.xml.in.h:250
+msgid "Belarusian (Latin)"
+msgstr "bjeloruski (latinični)"
+
+#. Keyboard indicator for Belgian layouts
+#: ../rules/base.xml.in.h:252
+msgid "be"
+msgstr "be"
+
+#: ../rules/base.xml.in.h:253
+msgid "Belgian"
+msgstr "belgijski"
+
+#: ../rules/base.xml.in.h:254
+msgid "Belgian (alternative)"
+msgstr "belgijski (alternativni)"
+
+#: ../rules/base.xml.in.h:255
+msgid "Belgian (alternative, latin-9 only)"
+msgstr "belgijski (alternativni, samo latin-9)"
+
+#: ../rules/base.xml.in.h:256
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:257
+msgid "Belgian (ISO alternate)"
+msgstr "belgijski (ISO alternativni)"
+
+#: ../rules/base.xml.in.h:258
+msgid "Belgian (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:259
+msgid "Belgian (Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:260
+msgid "Belgian (Wang model 724 azerty)"
+msgstr ""
+
+#. Keyboard indicator for Bengali layouts
+#: ../rules/base.xml.in.h:262
+msgid "bn"
+msgstr "bn"
+
+#: ../rules/base.xml.in.h:263
+msgid "Bengali"
+msgstr "bengalski"
+
+#: ../rules/base.xml.in.h:264
+msgid "Bengali (Probhat)"
+msgstr "bengalski (Probhat)"
+
+#. Keyboard indicator for Indian layouts
+#: ../rules/base.xml.in.h:266
+msgid "in"
+msgstr "in"
+
+#: ../rules/base.xml.in.h:267
+msgid "Indian"
+msgstr "indijski"
+
+#: ../rules/base.xml.in.h:268
+msgid "Bengali (India)"
+msgstr "bengalski (Indija)"
+
+#: ../rules/base.xml.in.h:269
+msgid "Bengali (India, Probhat)"
+msgstr "bengalski (Indija, Probhat)"
+
+#: ../rules/base.xml.in.h:270
+msgid "Bengali (India, Baishakhi)"
+msgstr "bengalski (Indija, Baishakhi)"
+
+#: ../rules/base.xml.in.h:271
+msgid "Bengali (India, Bornona)"
+msgstr "bengalski (Indija, Bornona)"
+
+#: ../rules/base.xml.in.h:272
+msgid "Bengali (India, Uni Gitanjali)"
+msgstr "bengalski (Indija, Uni Gitanjali)"
+
+#: ../rules/base.xml.in.h:273
+msgid "Bengali (India, Baishakhi Inscript)"
+msgstr ""
+
+#. Keyboard indicator for Gujarati layouts
+#: ../rules/base.xml.in.h:275
+msgid "gu"
+msgstr "gu"
+
+#: ../rules/base.xml.in.h:276
+msgid "Gujarati"
+msgstr "gudžaratski"
+
+#. Keyboard indicator for Punjabi layouts
+#: ../rules/base.xml.in.h:278
+msgid "pa"
+msgstr "pa"
+
+#: ../rules/base.xml.in.h:279
+msgid "Punjabi (Gurmukhi)"
+msgstr "pandžapski (Gurmukhi)"
+
+#: ../rules/base.xml.in.h:280
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "pandžapski (Gurmukhi Jhelum)"
+
+#. Keyboard indicator for Kannada layouts
+#: ../rules/base.xml.in.h:282
+msgid "kn"
+msgstr "kn"
+
+#: ../rules/base.xml.in.h:283
+msgid "Kannada"
+msgstr ""
+
+#. Keyboard indicator for Malayalam layouts
+#: ../rules/base.xml.in.h:285
+msgid "ml"
+msgstr "ml"
+
+#: ../rules/base.xml.in.h:286
+msgid "Malayalam"
+msgstr "malajalamski"
+
+#: ../rules/base.xml.in.h:287
+msgid "Malayalam (Lalitha)"
+msgstr "malajalamski (Lalitha)"
+
+#: ../rules/base.xml.in.h:288
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgstr ""
+
+#. Keyboard indicator for Oriya layouts
+#: ../rules/base.xml.in.h:290
+msgid "or"
+msgstr "or"
+
+#: ../rules/base.xml.in.h:291
+msgid "Oriya"
+msgstr ""
+
+#. Keyboard indicator for Tamil layouts
+#: ../rules/base.xml.in.h:293
+msgid "ta"
+msgstr "ta"
+
+#: ../rules/base.xml.in.h:294
+msgid "Tamil (Unicode)"
+msgstr "tamilski (unikod)"
+
+#: ../rules/base.xml.in.h:295
+msgid "Tamil (keyboard with numerals)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:296
+msgid "Tamil (TAB typewriter)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:297
+msgid "Tamil (TSCII typewriter)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:298
+msgid "Tamil"
+msgstr "tamilski"
+
+#. Keyboard indicator for Telugu layouts
+#: ../rules/base.xml.in.h:300
+msgid "te"
+msgstr "te"
+
+#: ../rules/base.xml.in.h:301
+msgid "Telugu"
+msgstr "teluški"
+
+#. Keyboard indicator for Urdu layouts
+#: ../rules/base.xml.in.h:303
+msgid "ur"
+msgstr "ur"
+
+#: ../rules/base.xml.in.h:304
+msgid "Urdu (phonetic)"
+msgstr "urdski (fonetski)"
+
+#: ../rules/base.xml.in.h:305
+msgid "Urdu (alternative phonetic)"
+msgstr "urdski (alternativni fonetski)"
+
+#: ../rules/base.xml.in.h:306
+msgid "Urdu (WinKeys)"
+msgstr ""
+
+#. Keyboard indicator for Hindi layouts
+#: ../rules/base.xml.in.h:308
+msgid "hi"
+msgstr "hi"
+
+#: ../rules/base.xml.in.h:309
+msgid "Hindi (Bolnagri)"
+msgstr "hindski (Bolnagri)"
+
+#: ../rules/base.xml.in.h:310
+msgid "Hindi (Wx)"
+msgstr "hindski (Wx)"
+
+#: ../rules/base.xml.in.h:311
+msgid "English (India, with RupeeSign)"
+msgstr "engleski (Indija, sa znakom rupije)"
+
+#. Keyboard indicator for Bosnian layouts
+#: ../rules/base.xml.in.h:313
+msgid "bs"
+msgstr "bs"
+
+#: ../rules/base.xml.in.h:314
+msgid "Bosnian"
+msgstr "bosanski"
+
+#: ../rules/base.xml.in.h:315
+msgid "Bosnian (use guillemets for quotes)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:316
+msgid "Bosnian (use Bosnian digraphs)"
+msgstr "bosanski (koristi bosanske dvoznake)"
+
+#: ../rules/base.xml.in.h:317
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "bosanski (SAD tipkovnica s bosanskim dvoznacima)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "bosanski (SAD tipkovnica s bosanskim slovima)"
+
+#. Keyboard indicator for Portuguese layouts
+#: ../rules/base.xml.in.h:320
+msgid "pt"
+msgstr "pt"
+
+#: ../rules/base.xml.in.h:321
+msgid "Portuguese (Brazil)"
+msgstr "portugalski (Brazil)"
+
+#: ../rules/base.xml.in.h:322
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:323
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "portugalski (Brazil, Dvorak)"
+
+#: ../rules/base.xml.in.h:324
+msgid "Portuguese (Brazil, nativo)"
+msgstr "portugalski (Brazil, nativo)"
+
+#: ../rules/base.xml.in.h:325
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgstr "portugalski (Brazil, nativo za SAD tipkovnice)"
+
+#: ../rules/base.xml.in.h:326
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "portugalski (Brazil, nativo za esperanto)"
+
+#. Keyboard indicator for Bulgarian layouts
+#: ../rules/base.xml.in.h:328
+msgid "bg"
+msgstr "bg"
+
+#: ../rules/base.xml.in.h:329
+msgid "Bulgarian"
+msgstr "bugarski"
+
+#: ../rules/base.xml.in.h:330
+msgid "Bulgarian (traditional phonetic)"
+msgstr "bugarski (tradicionalni fonetski)"
+
+#: ../rules/base.xml.in.h:331
+msgid "Bulgarian (new phonetic)"
+msgstr "bugarski (novi fonetski)"
+
+#: ../rules/base.xml.in.h:332
+msgid "Arabic (Morocco)"
+msgstr "arapski (Maroko)"
+
+#. Keyboard indicator for French layouts
+#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+msgid "fr"
+msgstr "fr"
+
+#: ../rules/base.xml.in.h:335
+msgid "French (Morocco)"
+msgstr "francuski (Maroko)"
+
+#. Keyboard indicator for Berber layouts
+#: ../rules/base.xml.in.h:337
+msgid "ber"
+msgstr "ber"
+
+#: ../rules/base.xml.in.h:338
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "berberski (Maroko, Tifinagh)"
+
+#: ../rules/base.xml.in.h:339
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "berberski (Maroko, Tifinagh alternativni)"
+
+#: ../rules/base.xml.in.h:340
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "berberski (Maroko, Tifinagh alternativni fonetski)"
+
+#: ../rules/base.xml.in.h:341
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "berberski (Maroko, Tifinagh prošireni)"
+
+#: ../rules/base.xml.in.h:342
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "berberski (Maroko, Tifinagh fonetski)"
+
+#: ../rules/base.xml.in.h:343
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "berberski (Maroko, Tifinagh prošireni fonetski)"
+
+#. Keyboard indicator for Cameroon layouts
+#: ../rules/base.xml.in.h:345
+msgid "cm"
+msgstr "cm"
+
+#: ../rules/base.xml.in.h:346
+msgid "English (Cameroon)"
+msgstr "engleski (Kamerun)"
+
+#: ../rules/base.xml.in.h:347
+msgid "French (Cameroon)"
+msgstr "francuski (Kamerun)"
+
+#: ../rules/base.xml.in.h:348
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "kamerunski višejezični (qwerty)"
+
+#: ../rules/base.xml.in.h:349
+msgid "Cameroon Multilingual (azerty)"
+msgstr "kamerunski višejezični (azerty)"
+
+#: ../rules/base.xml.in.h:350
+msgid "Cameroon Multilingual (Dvorak)"
+msgstr "kamerunski višejezični (Dvorak)"
+
+#. Keyboard indicator for Burmese layouts
+#: ../rules/base.xml.in.h:352
+msgid "my"
+msgstr "my"
+
+#: ../rules/base.xml.in.h:353
+msgid "Burmese"
+msgstr "burmanski"
+
+#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+msgid "French (Canada)"
+msgstr "francuski (Kanada)"
+
+#: ../rules/base.xml.in.h:355
+msgid "French (Canada, Dvorak)"
+msgstr "francuski (Kanada, Dvorak)"
+
+#: ../rules/base.xml.in.h:356
+msgid "French (Canada, legacy)"
+msgstr "francuski (Kanada, stari)"
+
+#: ../rules/base.xml.in.h:357
+msgid "Canadian Multilingual"
+msgstr "kanadski višejezični"
+
+#: ../rules/base.xml.in.h:358
+msgid "Canadian Multilingual (first part)"
+msgstr "kanadski višejezični (prvi dio)"
+
+#: ../rules/base.xml.in.h:359
+msgid "Canadian Multilingual (second part)"
+msgstr "kanadski višejezični (drugi dio)"
+
+#. Keyboard indicator for Inuktikut layouts
+#: ../rules/base.xml.in.h:361
+msgid "ike"
+msgstr "ike"
+
+#: ../rules/base.xml.in.h:362
+msgid "Inuktitut"
+msgstr ""
+
+#: ../rules/base.xml.in.h:363
+msgid "English (Canada)"
+msgstr "engleski (Kanada)"
+
+#: ../rules/base.xml.in.h:364
+msgid "French (Democratic Republic of the Congo)"
+msgstr "francuski (Demokratska Republika Kongo)"
+
+#. Keyboard indicator for Taiwanese layouts
+#: ../rules/base.xml.in.h:366
+msgid "zh"
+msgstr "zh"
+
+#: ../rules/base.xml.in.h:367
+msgid "Chinese"
+msgstr "kineski"
+
+#: ../rules/base.xml.in.h:368
+msgid "Tibetan"
+msgstr "tibetski"
+
+#: ../rules/base.xml.in.h:369
+msgid "Tibetan (with ASCII numerals)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:370
+msgid "Uyghur"
+msgstr "ujgurski"
+
+#. Keyboard indicator for Croatian layouts
+#: ../rules/base.xml.in.h:372
+msgid "hr"
+msgstr "hr"
+
+#: ../rules/base.xml.in.h:373
+msgid "Croatian"
+msgstr "hrvatski"
+
+#: ../rules/base.xml.in.h:374
+msgid "Croatian (use guillemets for quotes)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:375
+msgid "Croatian (use Croatian digraphs)"
+msgstr "hrvatski (koristi hrvatske dvoznake)"
+
+#: ../rules/base.xml.in.h:376
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "hrvatski (SAD tipkovnica s hrvatskim dvoznacima)"
+
+#: ../rules/base.xml.in.h:377
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "hrvatski (SAD tipkovnica s hrvatskim slovima)"
+
+#. Keyboard indicator for Chech layouts
+#: ../rules/base.xml.in.h:379
+msgid "cs"
+msgstr "cs"
+
+#: ../rules/base.xml.in.h:380
+msgid "Czech"
+msgstr "češki"
+
+#: ../rules/base.xml.in.h:381
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "češki (s tipkom &lt;\\|&gt;)"
+
+#: ../rules/base.xml.in.h:382
+msgid "Czech (qwerty)"
+msgstr "češki (qwerty)"
+
+#: ../rules/base.xml.in.h:383
+msgid "Czech (qwerty, extended Backslash)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:384
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "češki (UCW raspored, samo slova s dijakriticima)"
+
+#: ../rules/base.xml.in.h:385
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "češki (SAD Dvorak s podrškom za CZ UCW)"
+
+#. Keyboard indicator for Danish layouts
+#: ../rules/base.xml.in.h:387
+msgid "da"
+msgstr "da"
+
+#: ../rules/base.xml.in.h:388
+msgid "Danish"
+msgstr "danski"
+
+#: ../rules/base.xml.in.h:389
+msgid "Danish (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:390
+msgid "Danish (Macintosh)"
+msgstr "danski (Macintosh)"
+
+#: ../rules/base.xml.in.h:391
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:392
+msgid "Danish (Dvorak)"
+msgstr "danski (Dvorak)"
+
+#. Keyboard indicator for Dutch layouts
+#: ../rules/base.xml.in.h:394
+msgid "nl"
+msgstr "nl"
+
+#: ../rules/base.xml.in.h:395
+msgid "Dutch"
+msgstr "nizozemski"
+
+#: ../rules/base.xml.in.h:396
+msgid "Dutch (Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:397
+msgid "Dutch (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:398
+msgid "Dutch (standard)"
+msgstr ""
+
+#. Keyboard indicator for Dzongkha layouts
+#: ../rules/base.xml.in.h:400
+msgid "dz"
+msgstr "dz"
+
+#: ../rules/base.xml.in.h:401
+msgid "Dzongkha"
+msgstr ""
+
+#. Keyboard indicator for Estonian layouts
+#: ../rules/base.xml.in.h:403
+msgid "et"
+msgstr "et"
+
+#: ../rules/base.xml.in.h:404
+msgid "Estonian"
+msgstr "estonski"
+
+#: ../rules/base.xml.in.h:405
+msgid "Estonian (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+msgid "Estonian (Dvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:407
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+msgid "Persian"
+msgstr "perzijski"
+
+#: ../rules/base.xml.in.h:409
+msgid "Persian (with Persian Keypad)"
+msgstr ""
+
+#. Keyboard indicator for Kurdish layouts
+#: ../rules/base.xml.in.h:411
+msgid "ku"
+msgstr "ku"
+
+#: ../rules/base.xml.in.h:412
+msgid "Kurdish (Iran, Latin Q)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:413
+msgid "Kurdish (Iran, F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:414
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:415
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:416
+msgid "Iraqi"
+msgstr "irački"
+
+#: ../rules/base.xml.in.h:417
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:418
+msgid "Kurdish (Iraq, F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:419
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:420
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr ""
+
+#. Keyboard indicator for Faroese layouts
+#: ../rules/base.xml.in.h:422
+msgid "fo"
+msgstr "fo"
+
+#: ../rules/base.xml.in.h:423
+msgid "Faroese"
+msgstr "ferojski"
+
+#: ../rules/base.xml.in.h:424
+msgid "Faroese (eliminate dead keys)"
+msgstr ""
+
+#. Keyboard indicator for Finnish layouts
+#: ../rules/base.xml.in.h:426
+msgid "fi"
+msgstr "fi"
+
+#: ../rules/base.xml.in.h:427
+msgid "Finnish"
+msgstr "finski"
+
+#: ../rules/base.xml.in.h:428
+msgid "Finnish (classic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:429
+msgid "Finnish (classic, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:430
+msgid "Northern Saami (Finland)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:431
+msgid "Finnish (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:432
+msgid "French"
+msgstr "francuski"
+
+#: ../rules/base.xml.in.h:433
+msgid "French (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:434
+msgid "French (Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:435
+msgid "French (alternative)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:436
+msgid "French (alternative, latin-9 only)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:437
+msgid "French (alternative, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:438
+msgid "French (alternative, Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:439
+msgid "French (legacy, alternative)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:440
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:441
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:442
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:443
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:444
+msgid "French (Dvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:445
+msgid "French (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:446
+msgid "French (Breton)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:447
+msgid "Occitan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:448
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:449
+msgid "English (Ghana)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:450
+msgid "English (Ghana, multilingual)"
+msgstr ""
+
+#. Keyboard indicator for Akan layouts
+#: ../rules/base.xml.in.h:452
+msgid "ak"
+msgstr "ak"
+
+#: ../rules/base.xml.in.h:453
+msgid "Akan"
+msgstr "akanski"
+
+#. Keyboard indicator for Ewe layouts
+#: ../rules/base.xml.in.h:455
+msgid "ee"
+msgstr "ee"
+
+#: ../rules/base.xml.in.h:456
+msgid "Ewe"
+msgstr ""
+
+#. Keyboard indicator for Fula layouts
+#: ../rules/base.xml.in.h:458
+msgid "ff"
+msgstr "ff"
+
+#: ../rules/base.xml.in.h:459
+msgid "Fula"
+msgstr ""
+
+#. Keyboard indicator for Ga layouts
+#: ../rules/base.xml.in.h:461
+msgid "gaa"
+msgstr "gaa"
+
+#: ../rules/base.xml.in.h:462
+msgid "Ga"
+msgstr ""
+
+#. Keyboard indicator for Hausa layouts
+#: ../rules/base.xml.in.h:464
+msgid "ha"
+msgstr "ha"
+
+#: ../rules/base.xml.in.h:465
+msgid "Hausa"
+msgstr "hauski"
+
+#. Keyboard indicator for Avatime layouts
+#: ../rules/base.xml.in.h:467
+msgid "avn"
+msgstr "avn"
+
+#: ../rules/base.xml.in.h:468
+msgid "Avatime"
+msgstr ""
+
+#: ../rules/base.xml.in.h:469
+msgid "English (Ghana, GILLBT)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:470
+msgid "French (Guinea)"
+msgstr ""
+
+#. Keyboard indicator for Georgian layouts
+#: ../rules/base.xml.in.h:472
+msgid "ka"
+msgstr "ka"
+
+#: ../rules/base.xml.in.h:473
+msgid "Georgian"
+msgstr "gruzijski"
+
+#: ../rules/base.xml.in.h:474
+msgid "Georgian (ergonomic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:475
+msgid "Georgian (MESS)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:476
+msgid "Russian (Georgia)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:477
+msgid "Ossetian (Georgia)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+msgid "German"
+msgstr "njemački"
+
+#: ../rules/base.xml.in.h:479
+msgid "German (dead acute)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:480
+msgid "German (dead grave acute)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:481
+msgid "German (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:482
+msgid "Romanian (Germany)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:483
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:484
+msgid "German (Dvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:485
+msgid "German (Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:486
+msgid "German (Neo 2)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:487
+msgid "German (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:488
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:489
+msgid "Lower Sorbian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:490
+msgid "Lower Sorbian (qwertz)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:491
+msgid "German (qwerty)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:492
+msgid "Russian (Germany, phonetic)"
+msgstr ""
+
+#. Keyboard indicator for Greek layouts
+#: ../rules/base.xml.in.h:494
+msgid "gr"
+msgstr "gr"
+
+#: ../rules/base.xml.in.h:495
+msgid "Greek"
+msgstr "grčki"
+
+#: ../rules/base.xml.in.h:496
+msgid "Greek (simple)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:497
+msgid "Greek (extended)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:498
+msgid "Greek (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:499
+msgid "Greek (polytonic)"
+msgstr ""
+
+#. Keyboard indicator for Hungarian layouts
+#: ../rules/base.xml.in.h:501
+msgid "hu"
+msgstr "hu"
+
+#: ../rules/base.xml.in.h:502
+msgid "Hungarian"
+msgstr "mađarski"
+
+#: ../rules/base.xml.in.h:503
+msgid "Hungarian (standard)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:504
+msgid "Hungarian (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:505
+msgid "Hungarian (qwerty)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:506
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:507
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:508
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:509
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:510
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:511
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:512
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:513
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:514
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:515
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:516
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:517
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:518
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:519
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:520
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:521
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr ""
+
+#. Keyboard indicator for Icelandic layouts
+#: ../rules/base.xml.in.h:523
+msgid "is"
+msgstr "is"
+
+#: ../rules/base.xml.in.h:524
+msgid "Icelandic"
+msgstr "islandski"
+
+#: ../rules/base.xml.in.h:525
+msgid "Icelandic (Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:526
+msgid "Icelandic (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:527
+msgid "Icelandic (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:528
+msgid "Icelandic (Dvorak)"
+msgstr ""
+
+#. Keyboard indicator for Hebrew layouts
+#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+msgid "he"
+msgstr "he"
+
+#: ../rules/base.xml.in.h:531
+msgid "Hebrew"
+msgstr "hebrejski"
+
+#: ../rules/base.xml.in.h:532
+msgid "Hebrew (lyx)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:533
+msgid "Hebrew (phonetic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:534
+msgid "Hebrew (Biblical, Tiro)"
+msgstr ""
+
+#. Keyboard indicator for Italian layouts
+#: ../rules/base.xml.in.h:536
+msgid "it"
+msgstr "it"
+
+#: ../rules/base.xml.in.h:537
+msgid "Italian"
+msgstr "talijanski"
+
+#: ../rules/base.xml.in.h:538
+msgid "Italian (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:539
+msgid "Italian (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:540
+msgid "Italian (US keyboard with Italian letters)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:541
+msgid "Georgian (Italy)"
+msgstr ""
+
+#. Keyboard indicator for Japanese layouts
+#: ../rules/base.xml.in.h:543
+msgid "ja"
+msgstr "ja"
+
+#: ../rules/base.xml.in.h:544
+msgid "Japanese"
+msgstr "japanski"
+
+#: ../rules/base.xml.in.h:545
+msgid "Japanese (Kana)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:546
+msgid "Japanese (Kana 86)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:547
+msgid "Japanese (OADG 109A)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:548
+msgid "Japanese (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:549
+msgid "Japanese (Dvorak)"
+msgstr ""
+
+#. Keyboard indicator for Kikuyu layouts
+#: ../rules/base.xml.in.h:551
+msgid "ki"
+msgstr "ki"
+
+#: ../rules/base.xml.in.h:552
+msgid "Kyrgyz"
+msgstr "kirgiški"
+
+#: ../rules/base.xml.in.h:553
+msgid "Kyrgyz (phonetic)"
+msgstr ""
+
+#. Keyboard indicator for Khmer layouts
+#: ../rules/base.xml.in.h:555
+msgid "km"
+msgstr "km"
+
+#: ../rules/base.xml.in.h:556
+msgid "Khmer (Cambodia)"
+msgstr ""
+
+#. Keyboard indicator for Kazakh layouts
+#: ../rules/base.xml.in.h:558
+msgid "kk"
+msgstr "kk"
+
+#: ../rules/base.xml.in.h:559
+msgid "Kazakh"
+msgstr "kazaški"
+
+#: ../rules/base.xml.in.h:560
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:561
+msgid "Kazakh (with Russian)"
+msgstr ""
+
+#. Keyboard indicator for Lao layouts
+#: ../rules/base.xml.in.h:563
+msgid "lo"
+msgstr "lo"
+
+#: ../rules/base.xml.in.h:564
+msgid "Lao"
+msgstr ""
+
+#: ../rules/base.xml.in.h:565
+msgid "Lao (STEA proposed standard layout)"
+msgstr ""
+
+#. Keyboard indicator for Spanish layouts
+#: ../rules/base.xml.in.h:567
+msgid "es"
+msgstr "es"
+
+#: ../rules/base.xml.in.h:568
+msgid "Spanish (Latin American)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:569
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:570
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:571
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr ""
+
+#. Keyboard indicator for Lithuanian layouts
+#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+msgid "lt"
+msgstr "lt"
+
+#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+msgid "Lithuanian"
+msgstr "litavski"
+
+#: ../rules/base.xml.in.h:575
+msgid "Lithuanian (standard)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:576
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:577
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:578
+msgid "Lithuanian (LEKP)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:579
+msgid "Lithuanian (LEKPa)"
+msgstr ""
+
+#. Keyboard indicator for Latvian layouts
+#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+msgid "lv"
+msgstr "lv"
+
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+msgid "Latvian"
+msgstr "latvijski"
+
+#: ../rules/base.xml.in.h:583
+msgid "Latvian (apostrophe variant)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:584
+msgid "Latvian (tilde variant)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:585
+msgid "Latvian (F variant)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:586
+msgid "Latvian (modern)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:587
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:588
+msgid "Latvian (adapted)"
+msgstr ""
+
+#. Keyboard indicator for Maori layouts
+#: ../rules/base.xml.in.h:590
+msgid "mi"
+msgstr "mi"
+
+#: ../rules/base.xml.in.h:591
+msgid "Maori"
+msgstr "maorski"
+
+#. Keyboard indicator for Serbian layouts
+#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+msgid "sr"
+msgstr "sr"
+
+#: ../rules/base.xml.in.h:594
+msgid "Montenegrin"
+msgstr "crnogorski"
+
+#: ../rules/base.xml.in.h:595
+msgid "Montenegrin (Cyrillic)"
+msgstr "crnogorski (ćirilični)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:597
+msgid "Montenegrin (Latin Unicode)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:598
+msgid "Montenegrin (Latin qwerty)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:599
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:600
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:601
+msgid "Montenegrin (Latin with guillemets)"
+msgstr ""
+
+#. Keyboard indicator for Macedonian layouts
+#: ../rules/base.xml.in.h:603
+msgid "mk"
+msgstr "mk"
+
+#: ../rules/base.xml.in.h:604
+msgid "Macedonian"
+msgstr "makedonski"
+
+#: ../rules/base.xml.in.h:605
+msgid "Macedonian (eliminate dead keys)"
+msgstr ""
+
+#. Keyboard indicator for Maltese layouts
+#: ../rules/base.xml.in.h:607
+msgid "mt"
+msgstr "mt"
+
+#: ../rules/base.xml.in.h:608
+msgid "Maltese"
+msgstr "malteški"
+
+#: ../rules/base.xml.in.h:609
+msgid "Maltese (with US layout)"
+msgstr ""
+
+#. Keyboard indicator for Mongolian layouts
+#: ../rules/base.xml.in.h:611
+msgid "mn"
+msgstr "mn"
+
+#: ../rules/base.xml.in.h:612
+msgid "Mongolian"
+msgstr "mongolski"
+
+#. Keyboard indicator for Norwegian layouts
+#: ../rules/base.xml.in.h:614
+msgid "no"
+msgstr "no"
+
+#: ../rules/base.xml.in.h:615
+msgid "Norwegian"
+msgstr "norveški"
+
+#: ../rules/base.xml.in.h:616
+msgid "Norwegian (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:617
+msgid "Norwegian (Dvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:618
+msgid "Northern Saami (Norway)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:619
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:620
+msgid "Norwegian (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:621
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:622
+msgid "Norwegian (Colemak)"
+msgstr ""
+
+#. Keyboard indicator for Polish layouts
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+msgid "pl"
+msgstr "pl"
+
+#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+msgid "Polish"
+msgstr "poljski"
+
+#: ../rules/base.xml.in.h:626
+msgid "Polish (qwertz)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:627
+msgid "Polish (Dvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:628
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:629
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:630
+msgid "Kashubian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:631
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:632
+msgid "Polish (programmer Dvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:633
+msgid "Portuguese"
+msgstr "portugalski"
+
+#: ../rules/base.xml.in.h:634
+msgid "Portuguese (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:635
+msgid "Portuguese (Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:636
+msgid "Portuguese (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:637
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:638
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:639
+msgid "Portuguese (Nativo)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:640
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:641
+msgid "Esperanto (Portugal, Nativo)"
+msgstr ""
+
+#. Keyboard indicator for Romanian layouts
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+msgid "ro"
+msgstr "ro"
+
+#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+msgid "Romanian"
+msgstr "rumunjski"
+
+#: ../rules/base.xml.in.h:645
+msgid "Romanian (cedilla)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:646
+msgid "Romanian (standard)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:647
+msgid "Romanian (standard cedilla)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (WinKeys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+msgid "Russian"
+msgstr "ruski"
+
+#: ../rules/base.xml.in.h:650
+msgid "Russian (phonetic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:651
+msgid "Russian (phonetic WinKeys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:652
+msgid "Russian (typewriter)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:653
+msgid "Russian (legacy)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:654
+msgid "Russian (typewriter, legacy)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:655
+msgid "Tatar"
+msgstr "tatarski"
+
+#: ../rules/base.xml.in.h:656
+msgid "Ossetian (legacy)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:657
+msgid "Ossetian (WinKeys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:658
+msgid "Chuvash"
+msgstr "čuvaški"
+
+#: ../rules/base.xml.in.h:659
+msgid "Chuvash (Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:660
+msgid "Udmurt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:661
+msgid "Komi"
+msgstr ""
+
+#: ../rules/base.xml.in.h:662
+msgid "Yakut"
+msgstr ""
+
+#: ../rules/base.xml.in.h:663
+msgid "Kalmyk"
+msgstr ""
+
+#: ../rules/base.xml.in.h:664
+msgid "Russian (DOS)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:665
+msgid "Serbian (Russia)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:666
+msgid "Bashkirian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:667
+msgid "Mari"
+msgstr ""
+
+#: ../rules/base.xml.in.h:668
+msgid "Serbian (Cyrillic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:669
+msgid "Serbian (Cyrillic, Z and ZHE swapped)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:670
+msgid "Serbian (Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:671
+msgid "Serbian (Latin Unicode)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:672
+msgid "Serbian (Latin qwerty)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:673
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:674
+msgid "Serbian (Cyrillic with guillemets)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:675
+msgid "Serbian (Latin with guillemets)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:676
+msgid "Pannonian Rusyn (homophonic)"
+msgstr ""
+
+#. Keyboard indicator for Slovenian layouts
+#: ../rules/base.xml.in.h:678
+msgid "sl"
+msgstr "sl"
+
+#: ../rules/base.xml.in.h:679
+msgid "Slovenian"
+msgstr "slovenski"
+
+#: ../rules/base.xml.in.h:680
+msgid "Slovenian (use guillemets for quotes)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:681
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr ""
+
+#. Keyboard indicator for Slovak layouts
+#: ../rules/base.xml.in.h:683
+msgid "sk"
+msgstr "sk"
+
+#: ../rules/base.xml.in.h:684
+msgid "Slovak"
+msgstr "slovački"
+
+#: ../rules/base.xml.in.h:685
+msgid "Slovak (extended Backslash)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:686
+msgid "Slovak (qwerty)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:687
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:688
+msgid "Spanish"
+msgstr "španjolski"
+
+#: ../rules/base.xml.in.h:689
+msgid "Spanish (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:690
+msgid "Spanish (include dead tilde)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:691
+msgid "Spanish (Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:692
+msgid "Spanish (Dvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:693
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:694
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:695
+msgid "Spanish (Macintosh)"
+msgstr ""
+
+#. Keyboard indicator for Swedish layouts
+#: ../rules/base.xml.in.h:697
+msgid "sv"
+msgstr "sv"
+
+#: ../rules/base.xml.in.h:698
+msgid "Swedish"
+msgstr "švedski"
+
+#: ../rules/base.xml.in.h:699
+msgid "Swedish (eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:700
+msgid "Swedish (Dvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:701
+msgid "Russian (Sweden, phonetic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:702
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:703
+msgid "Northern Saami (Sweden)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:704
+msgid "Swedish (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:705
+msgid "Swedish (Svdvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:706
+msgid "Swedish Sign Language"
+msgstr "švedski znakovni jezik"
+
+#: ../rules/base.xml.in.h:707
+msgid "German (Switzerland)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:708
+msgid "German (Switzerland, legacy)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:709
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:710
+msgid "German (Switzerland, Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:711
+msgid "French (Switzerland)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:712
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:713
+msgid "French (Switzerland, Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:714
+msgid "French (Switzerland, Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:715
+msgid "German (Switzerland, Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:716
+msgid "Arabic (Syria)"
+msgstr "arapski (Sirija)"
+
+#. Keyboard indicator for Syriac layouts
+#: ../rules/base.xml.in.h:718
+msgid "syc"
+msgstr "syc"
+
+#: ../rules/base.xml.in.h:719
+msgid "Syriac"
+msgstr ""
+
+#: ../rules/base.xml.in.h:720
+msgid "Syriac (phonetic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:721
+msgid "Kurdish (Syria, Latin Q)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:722
+msgid "Kurdish (Syria, F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:723
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr ""
+
+#. Keyboard indicator for Tajik layouts
+#: ../rules/base.xml.in.h:725
+msgid "tg"
+msgstr "tg"
+
+#: ../rules/base.xml.in.h:726
+msgid "Tajik"
+msgstr "tadžikistanski"
+
+#: ../rules/base.xml.in.h:727
+msgid "Tajik (legacy)"
+msgstr ""
+
+#. Keyboard indicator for Sinhala layouts
+#: ../rules/base.xml.in.h:729
+msgid "si"
+msgstr "si"
+
+#: ../rules/base.xml.in.h:730
+msgid "Sinhala (phonetic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:731
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:732
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr ""
+
+#. Keyboard indicator for Thai layouts
+#: ../rules/base.xml.in.h:734
+msgid "th"
+msgstr "th"
+
+#: ../rules/base.xml.in.h:735
+msgid "Thai"
+msgstr "tajlandski"
+
+#: ../rules/base.xml.in.h:736
+msgid "Thai (TIS-820.2538)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:737
+msgid "Thai (Pattachote)"
+msgstr ""
+
+#. Keyboard indicator for Turkish layouts
+#: ../rules/base.xml.in.h:739
+msgid "tr"
+msgstr "tr"
+
+#: ../rules/base.xml.in.h:740
+msgid "Turkish"
+msgstr "turski"
+
+#: ../rules/base.xml.in.h:741
+msgid "Turkish (F)"
+msgstr "turski (F)"
+
+#: ../rules/base.xml.in.h:742
+msgid "Turkish (Alt-Q)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:743
+msgid "Turkish (Sun dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:744
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:745
+msgid "Kurdish (Turkey, F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:746
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:747
+msgid "Turkish (international with dead keys)"
+msgstr ""
+
+#. Keyboard indicator for Crimean Tatar layouts
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+msgid "crh"
+msgstr "crh"
+
+#: ../rules/base.xml.in.h:750
+msgid "Crimean Tatar (Turkish Q)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:751
+msgid "Crimean Tatar (Turkish F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:752
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:753
+msgid "Taiwanese"
+msgstr "tajvanski"
+
+#: ../rules/base.xml.in.h:754
+msgid "Taiwanese (indigenous)"
+msgstr ""
+
+#. Keyboard indicator for Saisiyat layouts
+#: ../rules/base.xml.in.h:756
+msgid "xsy"
+msgstr "xsy"
+
+#: ../rules/base.xml.in.h:757
+msgid "Saisiyat (Taiwan)"
+msgstr ""
+
+#. Keyboard indicator for Ukranian layouts
+#: ../rules/base.xml.in.h:759
+msgid "uk"
+msgstr "uk"
+
+#: ../rules/base.xml.in.h:760
+msgid "Ukrainian"
+msgstr "ukrajinski"
+
+#: ../rules/base.xml.in.h:761
+msgid "Ukrainian (phonetic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:762
+msgid "Ukrainian (typewriter)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:763
+msgid "Ukrainian (WinKeys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:764
+msgid "Ukrainian (legacy)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:765
+msgid "Ukrainian (standard RSTU)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:766
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:767
+msgid "Ukrainian (homophonic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:768
+msgid "English (UK)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:769
+msgid "English (UK, extended WinKeys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:770
+msgid "English (UK, international with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:771
+msgid "English (UK, Dvorak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:772
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:773
+msgid "English (UK, Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:774
+msgid "English (UK, Macintosh international)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:775
+msgid "English (UK, Colemak)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:776
+msgid "Uzbek"
+msgstr "uzbečki"
+
+#: ../rules/base.xml.in.h:777
+msgid "Uzbek (Latin)"
+msgstr ""
+
+#. Keyboard indicator for Vietnamese layouts
+#: ../rules/base.xml.in.h:779
+msgid "vi"
+msgstr "vi"
+
+#: ../rules/base.xml.in.h:780
+msgid "Vietnamese"
+msgstr "vijetnamski"
+
+#. Keyboard indicator for Korean layouts
+#: ../rules/base.xml.in.h:782
+msgid "ko"
+msgstr "ko"
+
+#: ../rules/base.xml.in.h:783
+msgid "Korean"
+msgstr "korejski"
+
+#: ../rules/base.xml.in.h:784
+msgid "Korean (101/104 key compatible)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:785
+msgid "Japanese (PC-98xx Series)"
+msgstr ""
+
+#. Keyboard indicator for Irish layouts
+#: ../rules/base.xml.in.h:787
+msgid "ie"
+msgstr "ie"
+
+#: ../rules/base.xml.in.h:788
+msgid "Irish"
+msgstr "irski"
+
+#: ../rules/base.xml.in.h:789
+msgid "CloGaelach"
+msgstr ""
+
+#: ../rules/base.xml.in.h:790
+msgid "Irish (UnicodeExpert)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:791
+msgid "Ogham"
+msgstr ""
+
+#: ../rules/base.xml.in.h:792
+msgid "Ogham (IS434)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:793
+msgid "Urdu (Pakistan)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:794
+msgid "Urdu (Pakistan, CRULP)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:795
+msgid "Urdu (Pakistan, NLA)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:796
+msgid "Arabic (Pakistan)"
+msgstr ""
+
+#. Keyboard indicator for Sindhi layouts
+#: ../rules/base.xml.in.h:798
+msgid "sd"
+msgstr "sd"
+
+#: ../rules/base.xml.in.h:799
+msgid "Sindhi"
+msgstr ""
+
+#. Keyboard indicator for Dhivehi layouts
+#: ../rules/base.xml.in.h:801
+msgid "dv"
+msgstr "dv"
+
+#: ../rules/base.xml.in.h:802
+msgid "Dhivehi"
+msgstr "divehi"
+
+#: ../rules/base.xml.in.h:803
+msgid "English (South Africa)"
+msgstr ""
+
+#. Keyboard indicator for Esperanto layouts
+#: ../rules/base.xml.in.h:805
+msgid "eo"
+msgstr "eo"
+
+#: ../rules/base.xml.in.h:806
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: ../rules/base.xml.in.h:807
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr ""
+
+#. Keyboard indicator for Nepali layouts
+#: ../rules/base.xml.in.h:809
+msgid "ne"
+msgstr "ne"
+
+#: ../rules/base.xml.in.h:810
+msgid "Nepali"
+msgstr "nepalski"
+
+#: ../rules/base.xml.in.h:811
+msgid "English (Nigeria)"
+msgstr ""
+
+#. Keyboard indicator for Igbo layouts
+#: ../rules/base.xml.in.h:813
+msgid "ig"
+msgstr "ig"
+
+#: ../rules/base.xml.in.h:814
+msgid "Igbo"
+msgstr ""
+
+#. Keyboard indicator for Yoruba layouts
+#: ../rules/base.xml.in.h:816
+msgid "yo"
+msgstr "yo"
+
+#: ../rules/base.xml.in.h:817
+msgid "Yoruba"
+msgstr ""
+
+#. Keyboard indicator for Amharic layouts
+#: ../rules/base.xml.in.h:819
+msgid "am"
+msgstr "am"
+
+#: ../rules/base.xml.in.h:820
+msgid "Amharic"
+msgstr "amharski"
+
+#. Keyboard indicator for Wolof layouts
+#: ../rules/base.xml.in.h:822
+msgid "wo"
+msgstr "wo"
+
+#: ../rules/base.xml.in.h:823
+msgid "Wolof"
+msgstr ""
+
+#. Keyboard indicator for Braille layouts
+#: ../rules/base.xml.in.h:825
+msgid "brl"
+msgstr "brl"
+
+#: ../rules/base.xml.in.h:826
+msgid "Braille"
+msgstr ""
+
+#: ../rules/base.xml.in.h:827
+msgid "Braille (left hand)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:828
+msgid "Braille (right hand)"
+msgstr ""
+
+#. Keyboard indicator for Turkmen layouts
+#: ../rules/base.xml.in.h:830
+msgid "tk"
+msgstr "tk"
+
+#: ../rules/base.xml.in.h:831
+msgid "Turkmen"
+msgstr "turkmenski"
+
+#: ../rules/base.xml.in.h:832
+msgid "Turkmen (Alt-Q)"
+msgstr ""
+
+#. Keyboard indicator for Bambara layouts
+#: ../rules/base.xml.in.h:834
+msgid "bm"
+msgstr "bm"
+
+#: ../rules/base.xml.in.h:835
+msgid "Bambara"
+msgstr "bambarski"
+
+#: ../rules/base.xml.in.h:836
+msgid "French (Mali, alternative)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:837
+msgid "English (Mali, US Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:838
+msgid "English (Mali, US international)"
+msgstr ""
+
+#. Keyboard indicator for Swahili layouts
+#: ../rules/base.xml.in.h:840
+msgid "sw"
+msgstr "sw"
+
+#: ../rules/base.xml.in.h:841
+msgid "Swahili (Tanzania)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:842
+msgid "Swahili (Kenya)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:843
+msgid "Kikuyu"
+msgstr ""
+
+#. Keyboard indicator for Tswana layouts
+#: ../rules/base.xml.in.h:845
+msgid "tn"
+msgstr "tn"
+
+#: ../rules/base.xml.in.h:846
+msgid "Tswana"
+msgstr ""
+
+#. Keyboard indicator for Filipino layouts
+#: ../rules/base.xml.in.h:848
+msgid "ph"
+msgstr "ph"
+
+#: ../rules/base.xml.in.h:849
+msgid "Filipino"
+msgstr ""
+
+#: ../rules/base.xml.in.h:850
+msgid "Filipino (QWERTY Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:851
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:852
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:853
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:854
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:855
+msgid "Filipino (Colemak Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:856
+msgid "Filipino (Colemak Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:857
+msgid "Filipino (Dvorak Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:858
+msgid "Filipino (Dvorak Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:859
+msgid "md"
+msgstr "md"
+
+#: ../rules/base.xml.in.h:860
+msgid "Moldavian"
+msgstr "moldavski"
+
+#: ../rules/base.xml.in.h:861
+msgid "gag"
+msgstr ""
+
+#: ../rules/base.xml.in.h:862
+msgid "Gagauz"
+msgstr ""
+
+#: ../rules/base.xml.in.h:863
+msgid "Key(s) to change layout"
+msgstr "Tipke za promjenu rasporeda"
+
+#: ../rules/base.xml.in.h:864
+msgid "Right Alt (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:865
+msgid "Left Alt (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:866
+msgid "Left Win (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:867
+msgid "Right Win (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:868
+msgid "Any Win key (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:869
+msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
+msgstr ""
+
+#: ../rules/base.xml.in.h:870
+msgid "Right Ctrl (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:871
+msgid "Right Alt"
+msgstr "Desni Alt"
+
+#: ../rules/base.xml.in.h:872
+msgid "Left Alt"
+msgstr "Lijevi Alt"
+
+#: ../rules/base.xml.in.h:873
+msgid "Caps Lock"
+msgstr "Caps Lock"
+
+#: ../rules/base.xml.in.h:874
+msgid "Shift+Caps Lock"
+msgstr "Shift+Caps Lock"
+
+#: ../rules/base.xml.in.h:875
+msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:876
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:877
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:878
+msgid "Alt+Caps Lock"
+msgstr "Alt+Caps Lock"
+
+#: ../rules/base.xml.in.h:879
+msgid "Both Shift keys together"
+msgstr "Obje tipke Shift zajedno"
+
+#: ../rules/base.xml.in.h:880
+msgid "Both Alt keys together"
+msgstr "Obje tipke Alt zajedno"
+
+#: ../rules/base.xml.in.h:881
+msgid "Both Ctrl keys together"
+msgstr "Obje tipke Ctrl zajedno"
+
+#: ../rules/base.xml.in.h:882
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../rules/base.xml.in.h:883
+msgid "Left Ctrl+Left Shift"
+msgstr "Lijevi Ctrl+Lijevi Shift"
+
+#: ../rules/base.xml.in.h:884
+msgid "Right Ctrl+Right Shift"
+msgstr "Desni Ctrl+Desni Shift"
+
+#: ../rules/base.xml.in.h:885
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../rules/base.xml.in.h:886
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../rules/base.xml.in.h:887
+msgid "Left Alt+Left Shift"
+msgstr "Lijevi Alt+Lijevi Shift"
+
+#: ../rules/base.xml.in.h:888
+msgid "Alt+Space"
+msgstr "Alt+Razmaknica"
+
+#: ../rules/base.xml.in.h:889
+msgid "Menu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:890
+msgid "Left Win"
+msgstr "Lijeva Win tipka"
+
+#: ../rules/base.xml.in.h:891
+msgid "Right Win"
+msgstr "Desna Win tipka"
+
+#: ../rules/base.xml.in.h:892
+msgid "Left Shift"
+msgstr "Lijevi Shift"
+
+#: ../rules/base.xml.in.h:893
+msgid "Right Shift"
+msgstr "Desni Shift"
+
+#: ../rules/base.xml.in.h:894
+msgid "Left Ctrl"
+msgstr "Lijevi Ctrl"
+
+#: ../rules/base.xml.in.h:895
+msgid "Right Ctrl"
+msgstr "Desni Ctrl"
+
+#: ../rules/base.xml.in.h:896
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#: ../rules/base.xml.in.h:897
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:898
+msgid "Key to choose 3rd level"
+msgstr "Tipka za odabir 3. razine"
+
+#: ../rules/base.xml.in.h:899
+msgid "Any Win key"
+msgstr "Bilo koja Win tipka"
+
+#: ../rules/base.xml.in.h:900
+msgid "Any Alt key"
+msgstr "Bilo koja Alt tipka"
+
+#: ../rules/base.xml.in.h:901
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:902
+msgid "Right Alt key never chooses 3rd level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:903
+msgid "Enter on keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:904
+msgid "Backslash"
+msgstr "Obrnuta kosa crta"
+
+#: ../rules/base.xml.in.h:905
+msgid "&lt;Less/Greater&gt;"
+msgstr "&lt;Manje/Veće&gt;"
+
+#: ../rules/base.xml.in.h:906
+msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr ""
+
+#: ../rules/base.xml.in.h:907
+msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr ""
+
+#: ../rules/base.xml.in.h:908
+msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr ""
+
+#: ../rules/base.xml.in.h:909
+msgid "Ctrl key position"
+msgstr ""
+
+#: ../rules/base.xml.in.h:910
+msgid "Caps Lock as Ctrl"
+msgstr "Caps Lock kao Ctrl"
+
+#: ../rules/base.xml.in.h:911
+msgid "Left Ctrl as Meta"
+msgstr ""
+
+#: ../rules/base.xml.in.h:912
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Zamijeni Ctrl i Caps Lock"
+
+#: ../rules/base.xml.in.h:913
+msgid "At left of 'A'"
+msgstr "Lijevo od „A”"
+
+#: ../rules/base.xml.in.h:914
+msgid "At bottom left"
+msgstr ""
+
+#: ../rules/base.xml.in.h:915
+msgid "Right Ctrl as Right Alt"
+msgstr "Desni Ctrl kao Desni Alt"
+
+#: ../rules/base.xml.in.h:916
+msgid "Menu as Right Ctrl"
+msgstr ""
+
+#: ../rules/base.xml.in.h:917
+msgid "Right Alt as Right Ctrl"
+msgstr "Desni Alt kao Desni Ctrl"
+
+#: ../rules/base.xml.in.h:918
+msgid "Use keyboard LED to show alternative layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:919
+msgid "Num Lock"
+msgstr "Num Lock"
+
+#: ../rules/base.xml.in.h:920
+msgid "Numeric keypad layout selection"
+msgstr ""
+
+#: ../rules/base.xml.in.h:921
+msgid "Legacy"
+msgstr "Stari"
+
+#: ../rules/base.xml.in.h:922
+msgid "Unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:923
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:924
+msgid "Legacy Wang 724"
+msgstr ""
+
+#: ../rules/base.xml.in.h:925
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:926
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:927
+msgid "Hexadecimal"
+msgstr "Heksadekadski"
+
+#: ../rules/base.xml.in.h:928
+msgid "ATM/phone-style"
+msgstr ""
+
+#: ../rules/base.xml.in.h:929
+msgid "Numeric keypad delete key behaviour"
+msgstr ""
+
+#: ../rules/base.xml.in.h:930
+msgid "Legacy key with dot"
+msgstr ""
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:932
+msgid "Legacy key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:933
+msgid "Four-level key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:934
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr ""
+
+#: ../rules/base.xml.in.h:935
+msgid "Four-level key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:936
+msgid "Four-level key with momayyez"
+msgstr ""
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:939
+msgid "Four-level key with abstract separators"
+msgstr ""
+
+#: ../rules/base.xml.in.h:940
+msgid "Semi-colon on third level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:941
+msgid "Caps Lock key behavior"
+msgstr "Ponašanje tipke Caps Lock"
+
+#: ../rules/base.xml.in.h:942
+msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:943
+msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:944
+msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:945
+msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:946
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:947
+msgid "Make Caps Lock an additional Num Lock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:948
+msgid "Swap ESC and Caps Lock"
+msgstr "Zamijeni ESC i Caps Lock"
+
+#: ../rules/base.xml.in.h:949
+msgid "Make Caps Lock an additional ESC"
+msgstr "Pretvori Caps Lock u dodatni ESC"
+
+#: ../rules/base.xml.in.h:950
+msgid "Make Caps Lock an additional Backspace"
+msgstr "Pretvori Caps Lock u dodatni Backspace"
+
+#: ../rules/base.xml.in.h:951
+msgid "Make Caps Lock an additional Super"
+msgstr ""
+
+#: ../rules/base.xml.in.h:952
+msgid "Make Caps Lock an additional Hyper"
+msgstr ""
+
+#: ../rules/base.xml.in.h:953
+msgid "Caps Lock toggles Shift so all keys are affected"
+msgstr ""
+
+#: ../rules/base.xml.in.h:954
+msgid "Caps Lock is disabled"
+msgstr "Caps Lock je isključen"
+
+#: ../rules/base.xml.in.h:955
+msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
+msgstr ""
+
+#: ../rules/base.xml.in.h:956
+msgid "Alt/Win key behavior"
+msgstr "Ponašanje tipki Alt/Win"
+
+#: ../rules/base.xml.in.h:957
+msgid "Add the standard behavior to Menu key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:958
+msgid "Alt and Meta are on Alt keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:959
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:960
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:961
+msgid "Meta is mapped to Win keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:962
+msgid "Meta is mapped to Left Win"
+msgstr ""
+
+#: ../rules/base.xml.in.h:963
+msgid "Hyper is mapped to Win-keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:964
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:965
+msgid "Left Alt is swapped with Left Win"
+msgstr ""
+
+#: ../rules/base.xml.in.h:966
+msgid "Compose key position"
+msgstr ""
+
+#: ../rules/base.xml.in.h:967
+msgid "Pause"
+msgstr "Pause"
+
+#: ../rules/base.xml.in.h:968
+msgid "PrtSc"
+msgstr "PrtSc"
+
+#: ../rules/base.xml.in.h:969
+msgid "Miscellaneous compatibility options"
+msgstr "Razne opcije usklađenosti"
+
+#: ../rules/base.xml.in.h:970
+msgid "Default numeric keypad keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:971
+msgid "Numeric keypad keys always enter digits (as in Mac OS)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:972
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr ""
+
+#: ../rules/base.xml.in.h:973
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgstr ""
+
+#: ../rules/base.xml.in.h:974
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr ""
+
+#: ../rules/base.xml.in.h:975
+msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:976
+msgid "Shift cancels Caps Lock"
+msgstr "Shift poništava utjecaj tipke Caps Lock"
+
+#: ../rules/base.xml.in.h:977
+msgid "Enable extra typographic characters"
+msgstr "Omogući dodatne tipografske znakove"
+
+#: ../rules/base.xml.in.h:978
+msgid "Both Shift-Keys together toggle Caps Lock"
+msgstr "Obje tipke Shift zajedno uključuju Caps Lock"
+
+#: ../rules/base.xml.in.h:979
+msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
+msgstr ""
+
+#: ../rules/base.xml.in.h:980
+msgid "Both Shift-Keys together toggle ShiftLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:981
+msgid "Toggle PointerKeys with Shift + NumLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:982
+msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:983
+msgid "Adding currency signs to certain keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:984
+msgid "Euro on E"
+msgstr "Euro na E"
+
+#: ../rules/base.xml.in.h:985
+msgid "Euro on 2"
+msgstr "Euro na 2"
+
+#: ../rules/base.xml.in.h:986
+msgid "Euro on 4"
+msgstr "Euro na 4"
+
+#: ../rules/base.xml.in.h:987
+msgid "Euro on 5"
+msgstr "Euro na 5"
+
+#: ../rules/base.xml.in.h:988
+msgid "Rupee on 4"
+msgstr "Rupija na 4"
+
+#: ../rules/base.xml.in.h:989
+msgid "Key to choose 5th level"
+msgstr "Tipka za odabir 5. razine"
+
+#: ../rules/base.xml.in.h:990
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr ""
+
+#: ../rules/base.xml.in.h:991
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr ""
+
+#: ../rules/base.xml.in.h:992
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr ""
+
+#: ../rules/base.xml.in.h:993
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr ""
+
+#: ../rules/base.xml.in.h:994
+msgid "Using space key to input non-breakable space character"
+msgstr ""
+
+#: ../rules/base.xml.in.h:995
+msgid "Usual space at any level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:996
+msgid "Non-breakable space character at second level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:997
+msgid "Non-breakable space character at third level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:998
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:999
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1000
+msgid "Non-breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1001
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1002
+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:1003
+msgid "Zero-width non-joiner character at second level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1004
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1005
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1006
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1007
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1008
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1009
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1010
+msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1011
+msgid "Japanese keyboard options"
+msgstr "Opcije japanske tipkovnice"
+
+#: ../rules/base.xml.in.h:1012
+msgid "Kana Lock key is locking"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1013
+msgid "NICOLA-F style Backspace"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1014
+msgid "Make Zenkaku Hankaku an additional ESC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1015
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1016
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr ""
+
+#: ../rules/base.xml.in.h:1017
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr ""
+
+#: ../rules/base.xml.in.h:1018
+msgid "Key sequence to kill the X server"
+msgstr "Kombinacija tipki za zaustavljanje X poslužitelja"
+
+#: ../rules/base.xml.in.h:1019
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Backspace"
+
+#: ../rules/base.extras.xml.in.h:1
+msgid "apl"
+msgstr "apl"
+
+#: ../rules/base.extras.xml.in.h:2
+msgid "APL Keyboard Symbols"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:5
+msgid "kut"
+msgstr "kut"
+
+#: ../rules/base.extras.xml.in.h:6
+msgid "Kutenai"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:7
+msgid "shs"
+msgstr "shs"
+
+#: ../rules/base.extras.xml.in.h:8
+msgid "Secwepemctsin"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:11
+msgid "German (US keyboard with German letters)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:12
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:15
+msgid "Avestan"
+msgstr "avestički"
+
+#: ../rules/base.extras.xml.in.h:18
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:21
+msgid "Latvian (US Dvorak)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:23
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:24
+msgid "Latvian (programmer US Dvorak)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:26
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:27
+msgid "Latvian (US Colemak)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:28
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:31
+msgid "English (US, international AltGr Unicode combining)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:33
+msgid "Atsina"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:34
+msgid "Couer D'alene Salish"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:37
+msgid "Polish (international with dead keys)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:41
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:42
+msgid "Romanian (ergonomic Touchtype)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Serbian"
+msgstr "srpski"
+
+#: ../rules/base.extras.xml.in.h:45
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:48
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:51
+msgid "Armenian (OLPC phonetic)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:53
+msgid "Hebrew (Biblical SIL)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:54
+msgid "Biblical SIL phonetic"
+msgstr ""
diff --git a/xorg-server/xkeyboard-config/po/hu.po b/xorg-server/xkeyboard-config/po/hu.po
index fd669bbc5..843be3c77 100644
--- a/xorg-server/xkeyboard-config/po/hu.po
+++ b/xorg-server/xkeyboard-config/po/hu.po
@@ -4,13 +4,13 @@
 #
 # Andras Timar <timar@fsf.hu>, 2004.
 # Szilveszter Farkas <Szilveszter.Farkas@gmail.com>, 2006.
-# Gabor Kelemen <kelemeng@gnome.hu>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.6.99\n"
+"Project-Id-Version: xkeyboard-config 2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-09-12 00:25+0100\n"
-"PO-Revision-Date: 2012-09-16 13:12+0200\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-22 13:39+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.4\n"
 
 #: ../rules/base.xml.in.h:1
 msgid "Generic 101-key PC"
@@ -701,3092 +701,3143 @@ msgid "OLPC"
 msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Sun Type 7 USB"
+msgstr "Sun Type 7 USB"
 
 #: ../rules/base.xml.in.h:172
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun Type 7 USB (európai kiosztás)"
+
+#: ../rules/base.xml.in.h:173
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun Type 7 USB (Unix kiosztás)"
+
+#: ../rules/base.xml.in.h:174
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun Type 7 USB (japán kiosztás) / japán 106 gombos"
+
+#: ../rules/base.xml.in.h:175
+msgid "Sun Type 6/7 USB"
+msgstr "Sun Type 6/7 USB"
+
+#: ../rules/base.xml.in.h:176
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun Type 6/7 USB (európai kiosztás)"
+
+#: ../rules/base.xml.in.h:177
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun Type 6 USB (Unix kiosztás)"
+
+#: ../rules/base.xml.in.h:178
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun Type 6 USB (japán kiosztás)"
+
+#: ../rules/base.xml.in.h:179
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun Type 6 (japán kiosztás)"
+
+#: ../rules/base.xml.in.h:180
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:181
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:182
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:183
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:184
 msgid "Htc Dream phone"
 msgstr "Htc Dream telefon"
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
 msgid "English (US)"
 msgstr "Angol (US)"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:189
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:190
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:191
 msgid "English (US, with euro on 5)"
 msgstr "Angol (US, Euró jel az 5-ön)"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:192
 msgid "English (US, international with dead keys)"
 msgstr "Angol (US, nemzetközi, halott billentyűkkel)"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:193
 msgid "English (US, alternative international)"
 msgstr "Angol (USA, alternatív nemzetközi)"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:194
 msgid "English (Colemak)"
 msgstr "Angol (Colemak)"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:195
 msgid "English (Dvorak)"
 msgstr "Angol (Dvorak)"
 
-#: ../rules/base.xml.in.h:188
-msgid "English (Dvorak international with dead keys)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
 msgstr "Angol (Dvorak nemzetközi, halott billentyűkkel)"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:197
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Angol (Dvorak alternatív nemzetközi, halott billentyűk nélkül)"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:198
 msgid "English (left handed Dvorak)"
 msgstr "Angol (balkezes Dvorak)"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:199
 msgid "English (right handed Dvorak)"
 msgstr "Angol (jobbkezes Dvorak)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:200
 msgid "English (classic Dvorak)"
 msgstr "Angol (klasszikus Dvorak)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:201
 msgid "English (programmer Dvorak)"
 msgstr "Angol (programozói Dvorak)"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:204
 msgid "Russian (US, phonetic)"
 msgstr "Orosz (US, fonetikus)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
 msgstr "Angol (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:206
 msgid "English (international AltGr dead keys)"
 msgstr "Angol (Nemzetközi, AltGr halott billentyűkkel)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:207
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Angol (kiosztás átváltása a szorzás/osztás billentyűn)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:208
 msgid "Serbo-Croatian (US)"
 msgstr "Szerbhorvát (US)"
 
-#. Keyboard indicator for Catalan layouts
-#: ../rules/base.xml.in.h:202
-msgid "ca"
-msgstr "ca"
+#: ../rules/base.xml.in.h:209
+msgid "English (Workman)"
+msgstr "Angol (Workman)"
 
-#: ../rules/base.xml.in.h:203
-msgid "Catalan"
-msgstr "Katalán"
+#: ../rules/base.xml.in.h:210
+msgid "English (Workman, international with dead keys)"
+msgstr "Angol (Workman nemzetközi, halott billentyűkkel)"
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:213
 msgid "Afghani"
 msgstr "Afgáni"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:215
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:216
 msgid "Pashto"
 msgstr "Pastu"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:218
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:219
 msgid "Uzbek (Afghanistan)"
 msgstr "Üzbég (Afganisztán)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:220
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Pastu (Afganisztán, OLPC)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:221
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Perzsa (Afganisztán, dari OLPC)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:222
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Üzbég (Afganisztán, OLPC)"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
 msgid "Arabic"
 msgstr "Arab"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:226
 msgid "Arabic (azerty)"
 msgstr "Arab (azerty)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:227
 msgid "Arabic (azerty/digits)"
 msgstr "Arab (azerty/számjegyek)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:228
 msgid "Arabic (digits)"
 msgstr "Arab (számjegyek)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:229
 msgid "Arabic (qwerty)"
 msgstr "Arab (qwerty)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:230
 msgid "Arabic (qwerty/digits)"
 msgstr "Arab (qwerty/számjegyek)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:231
 msgid "Arabic (Buckwalter)"
 msgstr "Arab (Buckwalter)"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:233
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:234
 msgid "Albanian"
 msgstr "Albán"
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
 msgid "Armenian"
 msgstr "Örmény"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:238
 msgid "Armenian (phonetic)"
 msgstr "Örmény (fonetikus)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:239
 msgid "Armenian (alternative phonetic)"
 msgstr "Örmény (Alternatív fonetikus)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:240
 msgid "Armenian (eastern)"
 msgstr "Örmény (keleti)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:241
 msgid "Armenian (western)"
 msgstr "Örmény (nyugati)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:242
 msgid "Armenian (alternative eastern)"
 msgstr "Örmény (Alternatív keleti)"
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:245
 msgid "German (Austria)"
 msgstr "Német (Ausztria)"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:246
+msgid "German (legacy)"
+msgstr "Német (hagyományos)"
+
+#: ../rules/base.xml.in.h:247
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Német (Ausztria, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:248
 msgid "German (Austria, Sun dead keys)"
 msgstr "Német (Ausztria, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:249
 msgid "German (Austria, Macintosh)"
 msgstr "Német (Ausztria, Macintosh)"
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:251
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:252
 msgid "Azerbaijani"
 msgstr "Azeri"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:253
 msgid "Azerbaijani (Cyrillic)"
 msgstr "Azeri (cirill)"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:255
 msgid "by"
 msgstr "by"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:256
 msgid "Belarusian"
 msgstr "Belorusz"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:257
 msgid "Belarusian (legacy)"
 msgstr "Belorusz (hagyományos)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:258
 msgid "Belarusian (Latin)"
 msgstr "Belorusz (Latin)"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:262
 msgid "Belgian (alternative)"
 msgstr "Belga (Alternatív)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:263
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belga (Alternatív, csak latin-9)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:264
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belga (Alternatív, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:265
 msgid "Belgian (ISO alternate)"
 msgstr "Belga (ISO alternatív)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:266
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belga (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:267
 msgid "Belgian (Sun dead keys)"
 msgstr "Belga (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:268
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belga (Wang 724-es modell, azerty)"
 
 #. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:270
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:271
 msgid "Bengali"
 msgstr "Bengáli"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:272
 msgid "Bengali (Probhat)"
 msgstr "Bengáli (Probhat)"
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:274
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:275
 msgid "Indian"
 msgstr "Indiai"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:276
 msgid "Bengali (India)"
 msgstr "Bengáli (India)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:277
 msgid "Bengali (India, Probhat)"
 msgstr "Bengáli (India, Probhat)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:278
 msgid "Bengali (India, Baishakhi)"
 msgstr "Bengáli (India, Baishakhi)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:279
 msgid "Bengali (India, Bornona)"
 msgstr "Bengáli (India, Bornona)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:280
 msgid "Bengali (India, Uni Gitanjali)"
 msgstr "Bengáli (India, Uni Gitanjali)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:281
 msgid "Bengali (India, Baishakhi Inscript)"
 msgstr "Bengáli (India, Baishakhi Inscript)"
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:283
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:284
 msgid "Gujarati"
 msgstr "Gudzsarati"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:286
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:287
 msgid "Punjabi (Gurmukhi)"
 msgstr "Pandzsábi (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:288
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Pandzsábi (Gurmukhi Jhelum)"
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:290
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:291
 msgid "Kannada"
 msgstr "Kannada"
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:293
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:294
 msgid "Malayalam"
 msgstr "Malajalam"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:295
 msgid "Malayalam (Lalitha)"
 msgstr "Malajalam (lalitha)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:296
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malajalam (bővített Inscript rúpiajellel)"
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:298
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:299
 msgid "Oriya"
 msgstr "Orija"
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:301
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:302
 msgid "Tamil (Unicode)"
 msgstr "Tamil (Unicode)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:303
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamil (billentyűzet számjegyekkel)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:304
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamil (TAB írógép)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:305
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamil (TSCII írógép)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:306
 msgid "Tamil"
 msgstr "Tamil"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:308
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:309
 msgid "Telugu"
 msgstr "Telugu"
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:311
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:312
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonetikus)"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:313
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (alternatív fonetikus)"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:314
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (Pakisztán, Win billentyűk)"
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:316
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:317
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (Bolnagri)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:318
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:319
 msgid "English (India, with RupeeSign)"
 msgstr "Angol (India, rúpiajellel)"
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:321
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:322
 msgid "Bosnian"
 msgstr "Bosnyák"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:323
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnyák (»Csúcsos« idézőjelek használata idézetekhez)"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:324
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnyák (Bosnyák billentyűkombinációk használata)"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:325
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosnyák (US billentyűzet bosnyák billentyűkombinációkkal)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:326
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnyák (US billentyűzet bosnyák betűkkel)"
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
 msgid "Portuguese (Brazil)"
 msgstr "Portugál (brazil)"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:330
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugál (brazil, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:331
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugál (brazil, Dvorak)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:332
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugál (brazil, natív)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:333
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugál (brazil, natív a US billentyűzetekhez)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:334
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugál (brazil, natív az eszperantóhoz)"
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:336
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:337
 msgid "Bulgarian"
 msgstr "Bolgár"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:338
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bolgár (hagyományos fonetikus)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:339
 msgid "Bulgarian (new phonetic)"
 msgstr "Bolgár (új fonetikus)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:340
 msgid "Arabic (Morocco)"
 msgstr "Arab (Marokkó)"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:343
 msgid "French (Morocco)"
 msgstr "Francia (Marokkó)"
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:345
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:346
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berber (Marokkó, Tifinagh)"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:347
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berber (Marokkó, alternatív Tifinagh)"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:348
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berber (Marokkó, alternatív fonetikus Tifinagh)"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:349
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berber (Marokkó, kibővített Tifinagh)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:350
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berber (Marokkó, fonetikus Tifinagh)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:351
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berber (Marokkó, kibővített fonetikus Tifinagh)"
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
 msgid "English (Cameroon)"
 msgstr "Angol (Kamerun)"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:355
 msgid "French (Cameroon)"
 msgstr "Francia (Kamerun)"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:356
 msgid "Cameroon Multilingual (qwerty)"
 msgstr "Kameruni többnyelvű (qwerty)"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:357
 msgid "Cameroon Multilingual (azerty)"
 msgstr "Kameruni többnyelvű (azerty)"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:358
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr "Kameruni többnyelvű (Dvorak)"
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:360
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:361
 msgid "Burmese"
 msgstr "Burmai"
 
-#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr "Francia (Kanada)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:363
 msgid "French (Canada, Dvorak)"
 msgstr "Francia (Kanada, Dvorak)"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:364
 msgid "French (Canada, legacy)"
 msgstr "Francia (Kanada, hagyományos)"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:365
 msgid "Canadian Multilingual"
 msgstr "Kanadai többnyelvű"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:366
 msgid "Canadian Multilingual (first part)"
 msgstr "Kanadai többnyelvű (első rész)"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:367
 msgid "Canadian Multilingual (second part)"
 msgstr "Kanadai többnyelvű (második rész)"
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:369
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:370
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:371
 msgid "English (Canada)"
 msgstr "Angol (Kanada)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:372
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Francia (Kongói Demokratikus Köztársaság)"
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:374
 msgid "zh"
 msgstr "zh"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:375
 msgid "Chinese"
 msgstr "Kínai"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:376
 msgid "Tibetan"
 msgstr "Tibeti"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:377
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibeti (ASCII számjegyekkel)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:378
 msgid "Uyghur"
 msgstr "Ujgur"
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:380
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:381
 msgid "Croatian"
 msgstr "Horvát"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:382
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Horvát (»Csúcsos« idézőjelek használata idézetekhez)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:383
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Horvát (Horvát billentyűkombinációk használata)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:384
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Horvát (US billentyűzet horvát billentyűkombinációkkal)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:385
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Horvát (US billentyűzet horvát betűkkel)"
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
 msgid "Czech"
 msgstr "Cseh"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:389
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Cseh (az &lt;\\|&gt; billentyűvel)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:390
 msgid "Czech (qwerty)"
 msgstr "Cseh (qwerty)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:391
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Cseh (qwerty, kibővített fordított törtvonal)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:392
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Cseh (UCW kiosztás, csak ékezetes betűk)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:393
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Cseh (US Dvorak CZ UCW támogatással)"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
 msgid "Danish"
 msgstr "Dán"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:397
 msgid "Danish (eliminate dead keys)"
 msgstr "Dán (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:398
 msgid "Danish (Macintosh)"
 msgstr "Dán (Macintosh)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:399
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Dán (Macintosh, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:400
 msgid "Danish (Dvorak)"
 msgstr "Dán (Dvorak)"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
 msgid "Dutch"
 msgstr "Holland"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:404
 msgid "Dutch (Sun dead keys)"
 msgstr "Holland (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:405
 msgid "Dutch (Macintosh)"
 msgstr "Holland (Macintosh)"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:406
 msgid "Dutch (standard)"
 msgstr "Holland (szabványos)"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:408
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:409
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
 msgid "Estonian"
 msgstr "Észt"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:413
 msgid "Estonian (eliminate dead keys)"
 msgstr "Észt (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:414
 msgid "Estonian (Dvorak)"
 msgstr "Észt (Dvorak)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Észt (US billentyűzet észt betűkkel)"
 
-#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
 msgid "Persian"
 msgstr "Perzsa"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Persian (with Persian Keypad)"
 msgstr "Perzsa (perzsa számbillentyűzettel)"
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurd (Irán, latin Q)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 msgid "Kurdish (Iran, F)"
 msgstr "Kurd (Irán, F)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurd (Irán, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurd (Irán, arab-latin)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
 msgid "Iraqi"
 msgstr "Iraki"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:425
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurd (Irak, latin Q)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:426
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurd (Irak, F)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:427
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurd (Irak, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:428
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurd (Irak, arab-latin)"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:430
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:431
 msgid "Faroese"
 msgstr "Feröeri"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:432
 msgid "Faroese (eliminate dead keys)"
 msgstr "Feröeri (halott billentyűk tiltása)"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
 msgid "Finnish"
 msgstr "Finn"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:436
 msgid "Finnish (classic)"
 msgstr "Finn (klasszikus)"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finn (klasszikus, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Northern Saami (Finland)"
 msgstr "Északi szami (Finnország)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Finnish (Macintosh)"
 msgstr "Finn (Macintosh)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
 msgid "French"
 msgstr "Francia"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:441
 msgid "French (eliminate dead keys)"
 msgstr "Francia (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "French (Sun dead keys)"
 msgstr "Francia (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "French (alternative)"
 msgstr "Francia (alternatív)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "French (alternative, latin-9 only)"
 msgstr "Francia (alternatív, csak latin-9)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Francia (alternatív, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "French (alternative, Sun dead keys)"
 msgstr "Francia (alternatív, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "French (legacy, alternative)"
 msgstr "Francia (hagyományos, alternatív)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Francia (hagyományos, alternatív, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Francia (hagyományos, alternatív, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Finn (Bepo, ergonomikus, Dvorak kiosztás)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Finn (Bepo, ergonomikus, Dvorak kiosztás, csak latin-9)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:452
 msgid "French (Dvorak)"
 msgstr "Francia (Dvorak)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:453
 msgid "French (Macintosh)"
 msgstr "Francia (Macintosh)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:454
 msgid "French (Breton)"
 msgstr "Francia (breton)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:455
 msgid "Occitan"
 msgstr "Okcitán"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:456
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Grúz (Franciaország, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:457
 msgid "English (Ghana)"
 msgstr "Angol (Ghána)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:458
 msgid "English (Ghana, multilingual)"
 msgstr "Angol (Ghána, többnyelvű)"
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:460
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:461
 msgid "Akan"
 msgstr "akan"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:463
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:464
 msgid "Ewe"
 msgstr "ewe"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:466
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:467
 msgid "Fula"
 msgstr "Fula"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:469
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:470
 msgid "Ga"
 msgstr "ga"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:472
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:473
 msgid "Hausa"
 msgstr "hausza"
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:475
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:476
 msgid "Avatime"
 msgstr "Avatime"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:477
 msgid "English (Ghana, GILLBT)"
 msgstr "Angol (Ghána, GILLBT)"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:478
 msgid "French (Guinea)"
 msgstr "Francia (Guinea)"
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:480
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:481
 msgid "Georgian"
 msgstr "Grúz"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:482
 msgid "Georgian (ergonomic)"
 msgstr "Grúz (ergonomikus)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:483
 msgid "Georgian (MESS)"
 msgstr "Grúz (MESS)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:484
 msgid "Russian (Georgia)"
 msgstr "Orosz (Grúzia)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:485
 msgid "Ossetian (Georgia)"
 msgstr "Oszét (Grúzia)"
 
-#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
 msgid "German"
 msgstr "Német"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:487
 msgid "German (dead acute)"
 msgstr "Német (halott ékezet)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:488
 msgid "German (dead grave acute)"
 msgstr "Német (Halott grave ékezet)"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:489
 msgid "German (eliminate dead keys)"
 msgstr "Német (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:490
 msgid "Romanian (Germany)"
 msgstr "Román (Németország)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:491
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Román (Németország, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:492
 msgid "German (Dvorak)"
 msgstr "Német (Dvorak)"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:493
 msgid "German (Sun dead keys)"
 msgstr "Német (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:494
 msgid "German (Neo 2)"
 msgstr "Német (Neo 2)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:495
 msgid "German (Macintosh)"
 msgstr "Német (Macintosh)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:496
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Német (Macintosh, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:497
 msgid "Lower Sorbian"
 msgstr "Alsó szorb"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:498
 msgid "Lower Sorbian (qwertz)"
 msgstr "Alsó szorb (qwertz)"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:499
 msgid "German (qwerty)"
 msgstr "Német (qwerty)"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:500
 msgid "Russian (Germany, phonetic)"
 msgstr "Orosz (Németország, fonetikus)"
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
 msgid "Greek"
 msgstr "Görög"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:504
 msgid "Greek (simple)"
 msgstr "Görög (egyszerű)"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:505
 msgid "Greek (extended)"
 msgstr "Görög (kibővített)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:506
 msgid "Greek (eliminate dead keys)"
 msgstr "Görög (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:507
 msgid "Greek (polytonic)"
 msgstr "Görög (politonikus)"
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:509
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (standard)"
 msgstr "Magyar (szabványos)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Magyar (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (qwerty)"
 msgstr "Magyar (qwerty)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Magyar (101/qwertz/vessző/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Magyar (101/qwertz/vessző/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Magyar (101/qwertz/pont/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Magyar (101/qwertz/pont/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Magyar (101/qwerty/vessző/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Magyar (101/qwerty/vessző/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Magyar (101/qwerty/pont/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:521
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Magyar (101/qwerty/pont/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:522
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Magyar (102/qwertz/vessző/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:523
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Magyar (102/qwertz/vessző/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:524
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Magyar (102/qwertz/pont/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:525
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Magyar (102/qwertz/pont/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:526
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Magyar (102/qwerty/vessző/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:527
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Magyar (102/qwerty/vessző/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:528
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Magyar (102/qwerty/pont/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:529
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Magyar (102/qwerty/pont/halott billentyűk tiltása)"
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:531
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:532
 msgid "Icelandic"
 msgstr "Izlandi"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:533
 msgid "Icelandic (Sun dead keys)"
 msgstr "Izlandi (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:534
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Izlandi (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:535
 msgid "Icelandic (Macintosh)"
 msgstr "Izlandi (Macintosh)"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:536
 msgid "Icelandic (Dvorak)"
 msgstr "Izlandi (Dvorak)"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
 msgid "Hebrew"
 msgstr "Héber"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:540
 msgid "Hebrew (lyx)"
 msgstr "Héber (lyx)"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:541
 msgid "Hebrew (phonetic)"
 msgstr "Héber (fonetikus)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:542
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Héber (Bibliai, Tiro)"
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
 msgid "Italian"
 msgstr "Olasz"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:546
 msgid "Italian (eliminate dead keys)"
 msgstr "Olasz (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:547
 msgid "Italian (Macintosh)"
 msgstr "Olasz (Macintosh)"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:548
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Olasz (US billentyűzet olasz betűkkel)"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:549
 msgid "Georgian (Italy)"
 msgstr "Grúz (Olaszország)"
 
+#: ../rules/base.xml.in.h:550
+msgid "Italian (IBM 142)"
+msgstr "Olasz (IBM 142)"
+
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
 msgid "Japanese"
 msgstr "Japán"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:554
 msgid "Japanese (Kana)"
 msgstr "Japán (Kana)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:555
 msgid "Japanese (Kana 86)"
 msgstr "Japán (Kana 86)"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:556
 msgid "Japanese (OADG 109A)"
 msgstr "Japán (OADG 109A)"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:557
 msgid "Japanese (Macintosh)"
 msgstr "Japán (Macintosh)"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:558
 msgid "Japanese (Dvorak)"
 msgstr "Japán (Dvorak)"
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:560
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:561
 msgid "Kyrgyz"
 msgstr "Kirgiz"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:562
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgiz (fonetikus)"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:564
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:565
 msgid "Khmer (Cambodia)"
 msgstr "Khmer (Kambodzsa)"
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:567
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:568
 msgid "Kazakh"
 msgstr "Kazah"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:569
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Orosz (Kazahsztán, kazahhal)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:570
 msgid "Kazakh (with Russian)"
 msgstr "Kazah (orosszal)"
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:572
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:573
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:574
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Lao (STEA által javasolt szabványos)"
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:577
 msgid "Spanish (Latin American)"
 msgstr "Spanyol (latin-amerikai)"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:578
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Spanyol (latin-amerikai, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:579
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Spanyol (latin-amerikai, halott tildevel)"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:580
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Spanyol (latin-amerikai, Sun halott billentyűk)"
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
 msgid "Lithuanian"
 msgstr "Litván"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:584
 msgid "Lithuanian (standard)"
 msgstr "Litván (szabványos)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:585
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litván (US billentyűzet litván betűkkel)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:586
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litván (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:587
 msgid "Lithuanian (LEKP)"
 msgstr "Litván (LEKP)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:588
 msgid "Lithuanian (LEKPa)"
 msgstr "Litván (LEKPa)"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
 msgid "Latvian"
 msgstr "Lett"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:592
 msgid "Latvian (apostrophe variant)"
 msgstr "Lett (aposztróf változat)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:593
 msgid "Latvian (tilde variant)"
 msgstr "Lett (tilde változat)"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:594
 msgid "Latvian (F variant)"
 msgstr "Lett (F-változat)"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:595
 msgid "Latvian (modern)"
 msgstr "Lett (modern)"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:596
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Lett (ergonomikus, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:597
 msgid "Latvian (adapted)"
 msgstr "Lett (adaptált)"
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:599
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:600
 msgid "Maori"
 msgstr "Maori"
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:603
 msgid "Montenegrin"
 msgstr "Montenegrói"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:604
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrói (Cirill)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:605
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrói (Cirill, a Z és a ZHE felcserélve)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:606
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Montenegrói (Latin Unicode)"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:607
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Montenegrói (Latin qwerty)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:608
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Montenegrói (Latin Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:609
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrói (Cirill, »csúcsos« idézőjelekkel)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:610
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrói (Latin, »csúcsos« idézőjelekkel)"
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:612
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:613
 msgid "Macedonian"
 msgstr "Macedón"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:614
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedón (halott billentyűk tiltása)"
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:616
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:617
 msgid "Maltese"
 msgstr "Máltai"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:618
 msgid "Maltese (with US layout)"
 msgstr "Máltai (US kiosztással)"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:620
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:621
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
 msgid "Norwegian"
 msgstr "Norvég"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:625
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norvég (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:626
 msgid "Norwegian (Dvorak)"
 msgstr "Norvég (Dvorak)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:627
 msgid "Northern Saami (Norway)"
 msgstr "Északi szami (Norvégia)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:628
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Északi szami (Norvégia, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:629
 msgid "Norwegian (Macintosh)"
 msgstr "Norvég (Macintosh)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:630
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Norvég (Macintosh, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:631
 msgid "Norwegian (Colemak)"
 msgstr "Norvég (Colemak)"
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
 msgid "Polish"
 msgstr "Lengyel"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:635
+msgid "Polish (legacy)"
+msgstr "Lengyel (hagyományos)"
+
+#: ../rules/base.xml.in.h:636
 msgid "Polish (qwertz)"
 msgstr "Lengyel (qwertz)"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:637
 msgid "Polish (Dvorak)"
 msgstr "Lengyel (Dvorak)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:638
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Lengyel (Dvorak, lengyel idézőjelek az idézőjel billentyűn)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:639
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Lengyel (Dvorak, lengyel idézőjelek az 1 billentyűn)"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:640
 msgid "Kashubian"
 msgstr "Kasub"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:641
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Orosz (Lengyelország, fonetikus Dvorak)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:642
 msgid "Polish (programmer Dvorak)"
 msgstr "Lengyel (programozói Dvorak)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
 msgid "Portuguese"
 msgstr "Portugál"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:644
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugál (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:645
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugál (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:646
 msgid "Portuguese (Macintosh)"
 msgstr "Portugál (Macintosh)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:647
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugál (Macintosh, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:648
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugál (Macintosh, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:649
 msgid "Portuguese (Nativo)"
 msgstr "Portugál (natív)"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:650
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugál (natív az USA billentyűzetekhez)"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:651
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Eszperantó (Portugália, Nativo)"
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
 msgid "Romanian"
 msgstr "Román"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
 msgstr "Román (cédille)"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Román (szabványos)"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard cedilla)"
 msgstr "Román (szabványos cédille)"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:658
 msgid "Romanian (WinKeys)"
 msgstr "Román (Win billentyűk)"
 
-#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "Orosz"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:660
 msgid "Russian (phonetic)"
 msgstr "Orosz (fonetikus)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:661
 msgid "Russian (phonetic WinKeys)"
 msgstr "Orosz (fonetikus, Win billentyűk)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:662
 msgid "Russian (typewriter)"
 msgstr "Orosz (írógép)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:663
 msgid "Russian (legacy)"
 msgstr "Orosz (hagyományos)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:664
 msgid "Russian (typewriter, legacy)"
 msgstr "Orosz (írógép, hagyományos)"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:665
 msgid "Tatar"
 msgstr "Tatár"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Ossetian (legacy)"
 msgstr "Oszét (hagyományos)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:667
 msgid "Ossetian (WinKeys)"
 msgstr "Oszét (Win billentyűk)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:668
 msgid "Chuvash"
 msgstr "Csuvas"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:669
 msgid "Chuvash (Latin)"
 msgstr "Csuvas (latin)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:670
 msgid "Udmurt"
 msgstr "Udmurt"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:671
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:672
 msgid "Yakut"
 msgstr "Jakut"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:673
 msgid "Kalmyk"
 msgstr "Kalmük"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:674
 msgid "Russian (DOS)"
 msgstr "Orosz (DOS)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:675
 msgid "Serbian (Russia)"
 msgstr "Szerb (Oroszország)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:676
 msgid "Bashkirian"
 msgstr "Baskír"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:677
 msgid "Mari"
 msgstr "Mari"
 
-#: ../rules/base.xml.in.h:668
-msgid "Serbian (Cyrillic)"
-msgstr "Szerb (cirill)"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "Szerb"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:679
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr "Szerb (cirill, a Z és a ZHE felcserélve)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:680
 msgid "Serbian (Latin)"
 msgstr "Szerb (latin)"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:681
 msgid "Serbian (Latin Unicode)"
 msgstr "Szerb (latin Unicode)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:682
 msgid "Serbian (Latin qwerty)"
 msgstr "Szerb (latin qwerty)"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:683
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Szerb (latin Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr "Szerb (cirill, »csúcsos« idézőjelekkel)"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin with guillemets)"
 msgstr "Szerb (latin, »csúcsos« idézőjelekkel)"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:686
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Pannon ruszin (homofon)"
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:688
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:689
 msgid "Slovenian"
 msgstr "Szlovén"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:690
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Szlovén (»Csúcsos« idézőjelek használata idézetekhez)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:691
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Szlovén (US billentyűzet szlovén betűkkel)"
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
 msgid "Slovak"
 msgstr "Szlovák"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:695
 msgid "Slovak (extended Backslash)"
 msgstr "Szlovák (kibővített fordított törtvonal)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:696
 msgid "Slovak (qwerty)"
 msgstr "Szlovák (qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:697
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Szlovák (qwerty, kibővített fordított törtvonal)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:699
 msgid "Spanish (eliminate dead keys)"
 msgstr "Spanyol (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:700
 msgid "Spanish (include dead tilde)"
 msgstr "Spanyol (halott tilde felvétele)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:701
 msgid "Spanish (Sun dead keys)"
 msgstr "Spanyol (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:702
 msgid "Spanish (Dvorak)"
 msgstr "Spanyol (Dvorak)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:703
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr "Asztúri (Spanyolország, középső pontos H és alsó pontos L karakterrel)"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:704
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Katalán (Spanyolország, középső pontos L karakterrel)"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:705
 msgid "Spanish (Macintosh)"
 msgstr "Spanyol (Macintosh)"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
 msgid "Swedish"
 msgstr "Svéd"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:709
 msgid "Swedish (eliminate dead keys)"
 msgstr "Svéd (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:710
 msgid "Swedish (Dvorak)"
 msgstr "Svéd (Dvorak)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:711
 msgid "Russian (Sweden, phonetic)"
 msgstr "Orosz (Svédország, fonetikus)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:712
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Orosz (Svédország, fonetikus, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:713
 msgid "Northern Saami (Sweden)"
 msgstr "Északi szami (Svédország)"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:714
 msgid "Swedish (Macintosh)"
 msgstr "Svéd (Macintosh)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:715
 msgid "Swedish (Svdvorak)"
 msgstr "Svéd (Svdvorak)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:716
 msgid "Swedish Sign Language"
 msgstr "Svéd jelnyelv"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:717
 msgid "German (Switzerland)"
 msgstr "Német (Svájc)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:718
 msgid "German (Switzerland, legacy)"
 msgstr "Német (Svájc, hagyományos)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:719
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Német (Svájc, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:720
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Német (Svájc, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:721
 msgid "French (Switzerland)"
 msgstr "Francia (Svájc)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:722
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Francia (Svájc, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Francia (Svájc, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
 msgid "French (Switzerland, Macintosh)"
 msgstr "Francia (Svájc, Macintosh)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
 msgid "German (Switzerland, Macintosh)"
 msgstr "Német (Svájc, Macintosh)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
 msgid "Arabic (Syria)"
 msgstr "Arab (Szíria)"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:728
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:729
 msgid "Syriac"
 msgstr "Szír"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:730
 msgid "Syriac (phonetic)"
 msgstr "Szír (fonetikus)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurd (Szíria, latin Q)"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
 msgid "Kurdish (Syria, F)"
 msgstr "Kurd (Szíria, F)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurd (Szíria, latin Alt-Q)"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
 msgid "Tajik"
 msgstr "Tádzsik"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "Tádzsik (hagyományos)"
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:739
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
 msgid "Sinhala (phonetic)"
 msgstr "Szingaléz (fonetikus)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamil (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamil (Sri Lanka, TAB írógép)"
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
 msgid "Thai"
 msgstr "Thai"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
 msgid "Thai (TIS-820.2538)"
 msgstr "Thai (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
 msgid "Turkish"
 msgstr "Török"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
 msgid "Turkish (F)"
 msgstr "Török (F)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
 msgid "Turkish (Alt-Q)"
 msgstr "Török (Alt-Q)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
 msgid "Turkish (Sun dead keys)"
 msgstr "Török (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurd (Törökország, latin Q)"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurd (Törökország, F)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:756
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurd (Törökország, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
 msgid "Turkish (international with dead keys)"
 msgstr "Török (nemzetközi, halott billentyűkkel)"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:760
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krími tatár (török Q)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krími tatár (török F)"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krími tatár (török Alt-Q)"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
 msgid "Taiwanese"
 msgstr "Tajvani"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
 msgid "Taiwanese (indigenous)"
 msgstr "Tajvani (őslakos)"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Tajvan)"
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
 msgid "Ukrainian"
 msgstr "Ukrán"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:771
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrán (fonetikus)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:772
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrán (írógép)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukrán (Win billentyűk)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (legacy)"
 msgstr "Ukrán (hagyományos)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrán (szabványos RSTU)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Orosz (Ukrajna, szabványos RSTU)"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrán (homofon)"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
 msgid "English (UK)"
 msgstr "Angol (UK)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
 msgid "English (UK, extended WinKeys)"
 msgstr "Angol (UK, kibővített Win billentyűk)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:780
 msgid "English (UK, international with dead keys)"
 msgstr "Angol (UK, nemzetközi, halott billentyűkkel)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:781
 msgid "English (UK, Dvorak)"
 msgstr "Angol (USA, Dvorak)"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Angol (UK, Dvorak UK központozással)"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
 msgid "English (UK, Macintosh)"
 msgstr "Angol (UK, Macintosh)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
 msgid "English (UK, Macintosh international)"
 msgstr "Angol (UK, Macintosh nemzetközi)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
 msgid "English (UK, Colemak)"
 msgstr "Angol (UK, Colemak)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
 msgid "Uzbek"
 msgstr "Üzbég"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:787
 msgid "Uzbek (Latin)"
 msgstr "Üzbég (latin)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:790
 msgid "Vietnamese"
 msgstr "Vietnami"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
 msgid "Korean"
 msgstr "Koreai"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreai (101/104 gomb kompatibilis)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japán (PC-98xx sorozat)"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
 msgid "Irish"
 msgstr "Ír"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:800
 msgid "Irish (UnicodeExpert)"
 msgstr "Ír (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
 msgid "Ogham"
 msgstr "Ogham"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
 msgid "Ogham (IS434)"
 msgstr "Ogham (IS434)"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakisztán)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakisztán, CRULP)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakisztán, NLA)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
 msgid "Arabic (Pakistan)"
 msgstr "Arab (Pakisztán)"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
 msgid "Sindhi"
 msgstr "Szindhi"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
 msgid "Dhivehi"
 msgstr "Dhivehi"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:813
 msgid "English (South Africa)"
 msgstr "Angol (Dél-Afrika)"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:815
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
 msgid "Esperanto"
 msgstr "Eszperantó"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Eszperantó (elcsúszott pontosvessző és idézőjel, elavult)"
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
 msgid "Nepali"
 msgstr "Nepáli"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
 msgid "English (Nigeria)"
 msgstr "Angol (Nigéria)"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
 msgid "Igbo"
 msgstr "Igbo"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
 msgid "Yoruba"
 msgstr "Joruba"
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:829
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
 msgid "Amharic"
 msgstr "Amhara"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:832
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
 msgid "Wolof"
 msgstr "Wolof"
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:836
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
 msgid "Braille (left hand)"
 msgstr "Braille (balkezes)"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
 msgid "Braille (right hand)"
 msgstr "Braille (jobbkezes)"
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:840
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
 msgid "Turkmen"
 msgstr "Türkmén"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
 msgid "Turkmen (Alt-Q)"
 msgstr "Türkmén (Alt-Q)"
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:844
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
 msgid "Bambara"
 msgstr "Bambara"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
 msgid "French (Mali, alternative)"
 msgstr "Francia (Mali, alternatív)"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:847
 msgid "English (Mali, US Macintosh)"
 msgstr "Angol (Mali, USA Macintosh)"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
 msgid "English (Mali, US international)"
 msgstr "Angol (Mali, USA nemzetközi)"
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:850
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
 msgid "Swahili (Tanzania)"
 msgstr "Szuahéli (Tanzánia)"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
 msgid "Swahili (Kenya)"
 msgstr "Szuahéli (Kenya)"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:853
 msgid "Kikuyu"
 msgstr "Kikuju"
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:856
 msgid "Tswana"
 msgstr "Csvana"
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
 msgid "Filipino"
 msgstr "Filippínó"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filippínó (QWERTY Baybayin)"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:861
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filippínó (Capewell-Dvorak Latin)"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filippínó (Capewell-Dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filippínó (Capewell-QWERF 2006 Latin)"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filippínó (Capewell-QWERF 2006 Baybayin)"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:865
 msgid "Filipino (Colemak Latin)"
 msgstr "Filippínó (Colemak Latin)"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filippínó (Colemak Baybayin)"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filippínó (Dvorak Latin)"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Filippínó (Dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
 msgid "md"
 msgstr "md"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
 msgid "Moldavian"
 msgstr "Moldáv"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:871
 msgid "gag"
 msgstr "gag"
 
-#: ../rules/base.xml.in.h:862
-msgid "Gagauz"
-msgstr "Gagauz"
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "Moldáv (Gagauz)"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
 msgid "Key(s) to change layout"
 msgstr "A kiosztást megváltoztató billentyűk"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
 msgid "Right Alt (while pressed)"
 msgstr "Jobb Alt (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
 msgid "Left Alt (while pressed)"
 msgstr "Bal Alt (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:876
 msgid "Left Win (while pressed)"
 msgstr "Bal Win (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
 msgid "Right Win (while pressed)"
 msgstr "Jobb Win (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
 msgid "Any Win key (while pressed)"
 msgstr "Bármely Win billentyű (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:879
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (lenyomva tartva), Alt+Caps Lock végzi az eredeti nagybetűsítési műveletet"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
 msgid "Right Ctrl (while pressed)"
 msgstr "Jobb Ctrl (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
 msgid "Right Alt"
 msgstr "Jobb Alt"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
 msgid "Left Alt"
 msgstr "Bal Alt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (az első kiosztásra), Shift+Caps Lock (az utolsó kiosztásra)"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Bal Win (az első kiosztásra), jobb Win/Menü (az utolsó kiosztásra)"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Bal Ctrl (az első kiosztásra), jobb Ctrl (az utolsó kiosztásra)"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
 msgid "Both Shift keys together"
 msgstr "A két Shift billentyű együtt"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
 msgid "Both Alt keys together"
 msgstr "A két Alt billentyű együtt"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
 msgid "Both Ctrl keys together"
 msgstr "A két Ctrl billentyű együtt"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
 msgid "Left Ctrl+Left Shift"
 msgstr "Bal Ctrl+Bal Shift"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
 msgid "Right Ctrl+Right Shift"
 msgstr "Jobb Ctrl + jobb Shift"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
 msgid "Left Alt+Left Shift"
 msgstr "Bal Alt+Bal Shift"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
 msgid "Alt+Space"
 msgstr "Alt+Szóköz"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
 msgid "Menu"
 msgstr "Menü"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
 msgid "Left Win"
 msgstr "Bal Win"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
 msgid "Right Win"
 msgstr "Jobb Win"
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
 msgid "Left Shift"
 msgstr "Bal Shift"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
 msgid "Right Shift"
 msgstr "Jobb Shift"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl"
 msgstr "Bal Ctrl"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
 msgid "Right Ctrl"
 msgstr "Jobb Ctrl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Bal Ctrl + Bal Win (az első kiosztásra), jobb Ctrl + Menü (a második kiosztásra)"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
 msgid "Key to choose 3rd level"
 msgstr "Billentyű a harmadik szint választásához"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
 msgid "Any Win key"
 msgstr "Bármely Win billentyű"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
 msgid "Any Alt key"
 msgstr "Bármely Alt billentyű"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Jobb Alt, a Shift+jobb Alt kombináció a Multi_Key"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:912
 msgid "Right Alt key never chooses 3rd level"
 msgstr "A jobb Alt billentyű sohasem választ harmadik szintet"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
 msgid "Enter on keypad"
 msgstr "Enter a számbillentyűzeten"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
 msgid "Backslash"
 msgstr "Fordított törtvonal"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Kisebb/nagyobb&gt;"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
 msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Caps Lock választja a 3. szintet, egyszeri zárként viselkedik másik 3. szintet választóval együtt lenyomva"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
 msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Fordított törtvonal választja a 3. szintet, egyszeri zárként viselkedik másik 3. szintet választóval együtt lenyomva"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
 msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "&lt;Kisebb/nagyobb&gt; választja a 3. szintet, egyszeri zárként viselkedik másik 3. szintet választóval együtt lenyomva"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
 msgid "Ctrl key position"
 msgstr "Ctrl billentyű helyzete"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
 msgid "Caps Lock as Ctrl"
 msgstr "Caps Lock mint Ctrl"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
 msgid "Left Ctrl as Meta"
 msgstr "Bal Ctrl mint Meta"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Ctrl és Caps Lock felcserélése"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
 msgid "At left of 'A'"
 msgstr "Az „A”-tól balra"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:924
 msgid "At bottom left"
 msgstr "Bal oldalt, alul"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:925
 msgid "Right Ctrl as Right Alt"
 msgstr "Jobb Ctrl használata jobb Alt-ként"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:926
 msgid "Menu as Right Ctrl"
 msgstr "Menü mint jobb Ctrl"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:927
 msgid "Right Alt as Right Ctrl"
 msgstr "Jobb Alt jobb Ctrl-ként"
 
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:928
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Az alternatív kiosztás megjelenítése a billentyűzet LED-ek használatával"
 
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:929
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:930
 msgid "Numeric keypad layout selection"
 msgstr "Számbillentyűzet kiosztásválasztása"
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:931
 msgid "Legacy"
 msgstr "Örökölt"
 
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:932
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode kiegészítések (nyilak és műveleti jelek)"
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:933
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Unicode kiegészítések (nyilak és műveleti jelek). A műveleti jelek az alapértelmezett szinten"
 
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:934
 msgid "Legacy Wang 724"
 msgstr "Hagyományos Wang 724"
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:935
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Wang 724 numerikus billentyűzet Unicode bővítésekkel (nyilak és műveleti jelek)"
 
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:936
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Wang 724 numerikus billentyűzet Unicode bővítésekkel (nyilak és műveleti jelek). A műveleti jelek az alapértelmezett szinten"
 
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:937
 msgid "Hexadecimal"
 msgstr "Hexadecimális"
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:938
 msgid "ATM/phone-style"
 msgstr "ATM/telefon stílusú"
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:939
 msgid "Numeric keypad delete key behaviour"
 msgstr "Számbillentyűzet Delete billentyűjének viselkedése"
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:940
 msgid "Legacy key with dot"
 msgstr "Hagyományos számbillentyűzet ponttal"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:942
 msgid "Legacy key with comma"
 msgstr "Hagyományos számbillentyűzet vesszővel"
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:943
 msgid "Four-level key with dot"
 msgstr "Negyedik szintű billentyű ponttal"
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:944
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Negyedik szintű billentyű ponttal, latin-9 korlátozás"
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:945
 msgid "Four-level key with comma"
 msgstr "Negyedik szintű billentyű vesszővel"
 
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:946
 msgid "Four-level key with momayyez"
 msgstr "Negyedik szintű billentyű momayyez-val"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:949
 msgid "Four-level key with abstract separators"
 msgstr "Negyedik szintű billentyű absztrakt elválasztókkal"
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:950
 msgid "Semi-colon on third level"
 msgstr "Pontosvessző a harmadik szinten"
 
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:951
 msgid "Caps Lock key behavior"
 msgstr "A Caps Lock billentyű viselkedése"
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:952
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "A Caps Lock belső nagybetűkre váltást használ. A Shift „szünetelteti” a nagybetűsítést"
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:953
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "A Caps Lock belső nagybetűkre váltást használ. A Shift nem befolyásolja a nagybetűsítést"
 
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:954
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "A Caps Lock Shiftként működik zárolással. A Shift „szünetelteti” a nagybetűsítést"
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:955
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "A Caps Lock Shiftként működik zárolással. A Shift nem befolyásolja a nagybetűsítést"
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:956
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "A Caps Lock átváltja a betűkarakterek normál kis- és nagybetűit"
 
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:957
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "A Caps Lock használata másik Num Lock-ként"
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:958
 msgid "Swap ESC and Caps Lock"
-msgstr "ESC és Caps Lock felcserélése"
+msgstr "Esc és Caps Lock felcserélése"
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:959
 msgid "Make Caps Lock an additional ESC"
 msgstr "A Caps Lock használata másik Esc-ként"
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:960
 msgid "Make Caps Lock an additional Backspace"
 msgstr "A Caps Lock használata másik Backspace-ként"
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:961
 msgid "Make Caps Lock an additional Super"
 msgstr "A Caps Lock használata másik Super-ként"
 
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:962
 msgid "Make Caps Lock an additional Hyper"
 msgstr "A Caps Lock használata másik Hyper-ként"
 
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:963
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "A Caps Lock átváltja a Shiftet, így minden billentyű érintett"
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:964
 msgid "Caps Lock is disabled"
 msgstr "A Caps Lock letiltva"
 
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:965
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "A Caps Lock használata másik Controlként, de a Caps_Lock szimbólum megtartása"
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:966
 msgid "Alt/Win key behavior"
 msgstr "Az Alt/Win billentyűk viselkedése"
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:967
 msgid "Add the standard behavior to Menu key"
 msgstr "A szabványos funkcionalitás hozzáadása a Menü billentyűhöz"
 
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:968
 msgid "Alt and Meta are on Alt keys"
 msgstr "Az Alt és Meta az Alt billentyűkön"
 
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:969
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "A Control a Win billentyűkhöz van rendelve (és a szokásos Ctrl billentyűkhöz)"
 
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:970
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "A Control az Alt billentyűkhöz, az Alt a Win billentyűkhöz van rendelve"
 
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:971
 msgid "Meta is mapped to Win keys"
 msgstr "A Meta a Win billentyűkhöz van rendelve"
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:972
 msgid "Meta is mapped to Left Win"
 msgstr "A Meta a bal Win billentyűhöz van rendelve"
 
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:973
 msgid "Hyper is mapped to Win-keys"
 msgstr "A Hyper a Win billentyűkhöz van rendelve"
 
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:974
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Az Alt a jobb Win billentyűhöz van rendelve, a Super a Menühöz"
 
-#: ../rules/base.xml.in.h:965
-msgid "Left Alt is swapped with Left Win"
-msgstr "A bal Alt fel van cserélve a bal Win billentyűvel"
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
+msgstr "Az Alt fel van cserélve a Win billentyűvel"
 
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:976
 msgid "Compose key position"
 msgstr "A kombináló (Compose) billentyű helye"
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:977
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:978
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:979
 msgid "Miscellaneous compatibility options"
 msgstr "Egyéb kompatibilitási beállítások"
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:980
 msgid "Default numeric keypad keys"
 msgstr "Alapértelmezett számbillentyűk"
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:981
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr "A számbillentyűk mindig számokat visznek be (mint Mac OS-en)"
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:982
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "A Shift+számbillentyűk úgy működjenek, mint az MS Windowsban"
 
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:983
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "A Shift nem szakítja meg a Num Lockot, hanem a harmadik szintet választja"
 
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:984
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "A speciális billentyűket (Ctrl+Alt+&lt;billentyű&gt;) a kiszolgáló kezeli"
 
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:985
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Apple alumínium billentyűzet PC-billentyűk emulálása (Print, Scroll Lock, Pause, Num Lock)"
 
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:986
 msgid "Shift cancels Caps Lock"
 msgstr "A Shift megszakítja a Caps Lockot"
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:987
 msgid "Enable extra typographic characters"
 msgstr "Extra tipográfiai karakterek engedélyezése"
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:988
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "A két Shift billentyű együtt váltja a Caps Lockot"
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:989
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "A két Shift billentyű együtt aktiválja a Caps Lockot, egy Shift deaktiválja"
 
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:990
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "A két Shift billentyű együtt váltja a ShiftLockot"
 
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:991
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Mutatóbillentyűk átváltása a Shift + NumLock használatával."
 
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:992
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr "Megragadás billentyűzettel való feltörésének engedélyezése (biztonsági kockázat!)"
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:993
 msgid "Adding currency signs to certain keys"
 msgstr "Pénznem jelek hozzáadása bizonyos billentyűkhöz"
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:994
 msgid "Euro on E"
 msgstr "Euro jel az E billentyűn"
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:995
 msgid "Euro on 2"
 msgstr "Euro jel a 2-es billentyűn"
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:996
 msgid "Euro on 4"
 msgstr "Euro jel a 4-es billentyűn"
 
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:997
 msgid "Euro on 5"
 msgstr "Euro jel az 5-ös billentyűn"
 
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:998
 msgid "Rupee on 4"
 msgstr "Rúpia jel a 4-es billentyűn"
 
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:999
 msgid "Key to choose 5th level"
 msgstr "Billentyű az ötödik szint választásához"
 
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1000
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "&lt;Kisebb/nagyobb&gt; választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol"
 
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1001
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Jobb Alt választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol"
 
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1002
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Bal Win választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol"
 
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1003
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Jobb Win választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol"
 
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1004
 msgid "Using space key to input non-breakable space character"
 msgstr "A szóköz billentyű használata nem törhető szóköz bevitelére"
 
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:1005
 msgid "Usual space at any level"
 msgstr "Hagyományos szóköz bármely szinten"
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1006
 msgid "Non-breakable space character at second level"
 msgstr "Nem törhető szóköz karakter a második szinten"
 
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1007
 msgid "Non-breakable space character at third level"
 msgstr "Nem törhető szóköz karakter a harmadik szinten"
 
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1008
 msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr "Mem törhető szóköz karakter a harmadik szinten és semmi a negyediken"
+msgstr "Nem törhető szóköz karakter a harmadik szinten és semmi a negyediken"
 
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1009
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Nem törhető szóköz karakter a harmadik szinten, keskeny nem törhető szóköz karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1010
 msgid "Non-breakable space character at fourth level"
 msgstr "Nem törhető szóköz karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1011
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Nem törhető szóköz karakter a negyedik szinten, keskeny nem törhető szóköz karakter a hatodik szinten"
 
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1012
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Nem törhető szóköz karakter a negyedik szinten, keskeny nem törhető szóköz karakter a hatodik szinten (a Ctrl+Shift segítségével)"
 
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1013
 msgid "Zero-width non-joiner character at second level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten"
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1014
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nulla szélességű egyesítő karakter a harmadik szinten"
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1015
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nulla szélességű egyesítő karakter a harmadik szinten, nem törhető szóköz karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1016
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nem törhető szóköz karakter a harmadik szinten"
 
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1017
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nem törhető szóköz karakter a harmadik szinten, semmi a negyedik szinten"
 
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1018
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nem törhető szóköz karakter a harmadik szinten, nulla szélességű egyesítő karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1019
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nem törhető szóköz karakter a harmadik szinten, keskeny nem törhető szóköz karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1020
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Nulla szélességű nem egyesítő karakter a harmadik szinten, nulla szélességű egyesítő karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1021
 msgid "Japanese keyboard options"
 msgstr "Japán billentyűzet-beállítások"
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1022
 msgid "Kana Lock key is locking"
 msgstr "A Kana zárolásbillentyű zárol"
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1023
 msgid "NICOLA-F style Backspace"
 msgstr "NICOLA-F stílusú backspace"
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1024
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr "A Zenkaku Hankaku használata másik Esc-ként"
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1025
 msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr "Eszperantó circumflexek hozzáadása"
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1026
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "A Qwerty billentyűzeten megfelelő billentyűre."
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1027
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "A Dvorak billentyűzeten megfelelő billentyűre."
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Billentyűkompatibilitás fenntartása a régi Solaris kódokkal"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "Sun billentyűzetkompatibilitás"
+
+#: ../rules/base.xml.in.h:1030
 msgid "Key sequence to kill the X server"
 msgstr "Billentyűsorozat az X kiszolgáló kilövéséhez"
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
@@ -3795,7 +3846,7 @@ msgid "apl"
 msgstr "apl"
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "APL Keyboard Symbols"
+msgid "APL keyboard symbols"
 msgstr "APL billentyűzetszimbólumok"
 
 #: ../rules/base.extras.xml.in.h:5
@@ -3814,102 +3865,249 @@ msgstr "shs"
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Többnyelvű (Kanada, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "Német (US billentyűzet német betűkkel)"
 
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "Német (Magyar betűkkel, halott billentyűk nélkül)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "Német (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:17
 msgid "Avestan"
 msgstr "Avesztán"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:20
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Litván (US Dvorak litván betűkkel)"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Litván (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "Lett (US Dvorak)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Lett (US Dvorak, Y-változat)"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Lett (US Dvorak, mínusz változat)"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Lett (programozói US Dvorak)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Lett (programozói US Dvorak, Y-változat)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Lett (programozói US Dvorak, mínusz változat)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:30
 msgid "Latvian (US Colemak)"
 msgstr "Lett (US Colemak)"
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:31
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Lett (US Colemak, aposztróf változat)"
 
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Lett (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:35
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Angol (USA, nemzetközi AltGr Unicode kombinálással)"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Angol (USA, Nemzetközi AltGr Unicode kombinálással, alternatív)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "Atsina"
 msgstr "Atsina"
 
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:38
 msgid "Couer D'alene Salish"
 msgstr "Couer D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr "Angol (US, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr "Lengyel (nemzetközi, halott billentyűkkel)"
 
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "Lengyel (Colemak)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "Lengyel (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:48
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr "Krími tatár (Dobrudzsa Q)"
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Román (ergonomikus Touchtype)"
 
-#: ../rules/base.extras.xml.in.h:44
-msgid "Serbian"
-msgstr "Szerb"
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Román (Sun Type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:53
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Szerb (ékezetek kombinálása a halott billentyűk helyett)"
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "Orosz (Ukrán-fehérorosz kiosztással)"
 
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "Orosz (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:60
 msgid "Armenian (OLPC phonetic)"
 msgstr "Örmény (OLPC fonetikus)"
 
-#: ../rules/base.extras.xml.in.h:53
-msgid "Hebrew (Biblical SIL)"
-msgstr "Héber (Bibliai SIL)"
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "Héber (bibliai, SIL fonetikus)"
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Arab (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Belga (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "Portugál (brazil, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "Cseh (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "Dán (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Holland (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Észt (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Finn (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "Francia (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "Görög (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "Olasz (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "Japán (Sun Type 6)"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Japán (Sun Type 7 - PC kompatibilis)"
+
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Japán (Sun Type 7 - sun kompatibilis)"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Norvég (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Portugál (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Szlovák (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "Spanyol (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "Svéd (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr ">Német (Svájc)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Német (Svájc, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Francia (Svájc, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Török (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Ukrán (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "Angol (UK, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "Koreai (Sun Type 6/7)"
+
+#~ msgid "ca"
+#~ msgstr "ca"
+
+#~ msgid "Catalan"
+#~ msgstr "Katalán"
+
+#~ msgid "Serbian (Cyrillic)"
+#~ msgstr "Szerb (cirill)"
+
+#~ msgid "Gagauz"
+#~ msgstr "Gagauz"
 
-#: ../rules/base.extras.xml.in.h:54
-msgid "Biblical SIL phonetic"
-msgstr "Bibliai SIL fonetikus"
+#~ msgid "Hebrew (Biblical SIL)"
+#~ msgstr "Héber (Bibliai SIL)"
diff --git a/xorg-server/xkeyboard-config/po/ko.po b/xorg-server/xkeyboard-config/po/ko.po
index a9f375fe4..4bd778e35 100644
--- a/xorg-server/xkeyboard-config/po/ko.po
+++ b/xorg-server/xkeyboard-config/po/ko.po
@@ -1,16 +1,19 @@
 # xkeyboard-config Korean translation
 # This file is distributed under the same license as the xkeyboard-config package.
-# Changwoo Ryu <cwryu@debian.org>, 2007, 2008, 2009, 2010, 2011, 2012.
+# Changwoo Ryu <cwryu@debian.org>, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
 #
 # - 주의
 #   - 한국에 수입해 판매되는 제품은 광고할 때 사용하는 표기를 그대로 사용
-# #
+#
+#   - Colemak은 "콜맥"으로 음역
+#   - Dvorak은 "브보락"으로 음역
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.5.99\n"
+"Project-Id-Version: xkeyboard-config 2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-05-16 23:56+0100\n"
-"PO-Revision-Date: 2012-05-19 02:31+0900\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-22 19:06+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
 "Language: ko\n"
@@ -19,3956 +22,4157 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../rules/base.xml.in.h:1
-msgid "&lt;Less/Greater&gt;"
-msgstr "&lt; 및 &gt;"
+msgid "Generic 101-key PC"
+msgstr "일반 101키 PC"
 
 #: ../rules/base.xml.in.h:2
-msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
-msgstr "&lt; 및 &gt; 키로 3번째 단계 선택, 다른 3번째 단계 선택 키와 같이 누르면 고정"
+msgid "Generic 102-key (Intl) PC"
+msgstr "일반 102키(국제 버전) PC"
 
 #: ../rules/base.xml.in.h:3
-msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "&lt; 및 &gt; 키로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
+msgid "Generic 104-key PC"
+msgstr "일반 104키 PC"
 
 #: ../rules/base.xml.in.h:4
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Generic 105-key (Intl) PC"
+msgstr "일반 105키(국제 버전) PC"
 
 #: ../rules/base.xml.in.h:5
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Dell 101-key PC"
+msgstr "델 101키 PC"
 
 #: ../rules/base.xml.in.h:6
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
+msgid "Dell Latitude series laptop"
+msgstr "델 Latitude 시리즈 노트북"
 
 #: ../rules/base.xml.in.h:7
-msgid "ATM/phone-style"
-msgstr "ATM/전화기형태"
+msgid "Dell Precision M65"
+msgstr "델 Precision M65"
 
 #: ../rules/base.xml.in.h:8
-msgid "Acer AirKey V"
-msgstr "에이서 AirKey V"
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
 
 #: ../rules/base.xml.in.h:9
-msgid "Acer C300"
-msgstr "에이서 C300"
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
 
 #: ../rules/base.xml.in.h:10
-msgid "Acer Ferrari 4000"
-msgstr "에이서 Ferrari 4000"
+msgid "Microsoft Natural"
+msgstr "마이크로소프트 내츄럴"
 
 #: ../rules/base.xml.in.h:11
-msgid "Acer Laptop"
-msgstr "에이서 노트북"
+msgid "Northgate OmniKey 101"
+msgstr "노스게이트 OmniKey 101"
 
 #: ../rules/base.xml.in.h:12
-msgid "Add the standard behavior to Menu key"
-msgstr "메뉴 키에 기본 동작 추가"
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
 
 #: ../rules/base.xml.in.h:13
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr "에스페란토 곡절 액센트(curcimflex) 추가"
+msgid "PC-98xx Series"
+msgstr "PC-98xx 시리즈"
 
 #: ../rules/base.xml.in.h:14
-msgid "Adding currency signs to certain keys"
-msgstr "화폐 기호를 특정 키에 추가"
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
 
 #: ../rules/base.xml.in.h:15
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
 
 #: ../rules/base.xml.in.h:16
-msgid "Afghani"
-msgstr "아프가니스탄"
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
 
 #: ../rules/base.xml.in.h:17
-msgid "Akan"
-msgstr "아칸"
+msgid "Acer AirKey V"
+msgstr "에이서 AirKey V"
 
 #: ../rules/base.xml.in.h:18
-msgid "Albanian"
-msgstr "알바니아"
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 무선 인터넷 키보드"
 
 #: ../rules/base.xml.in.h:19
-msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
-msgstr "키보드 동작으로 키 잡기 해제 허용(경고: 보안 위험)"
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:20
-msgid "Alt and Meta are on Alt keys"
-msgstr "Alt와 Meta를 Alt 키에"
+msgid "Brother Internet Keyboard"
+msgstr "브라더 인터넷 키보드"
 
 #: ../rules/base.xml.in.h:21
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Alt 키를 오른쪽 윈도우 키로 매핑, Super 키를 메뉴 키로 매핑"
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF 멀티미디어"
 
 #: ../rules/base.xml.in.h:22
-msgid "Alt+Caps Lock"
-msgstr "Alt+Caps Lock"
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
 
 #: ../rules/base.xml.in.h:23
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
 
 #: ../rules/base.xml.in.h:24
-msgid "Alt+Shift"
-msgstr "Alt+Shift"
+msgid "BTC 9000"
+msgstr "BTC 9000"
 
 #: ../rules/base.xml.in.h:25
-msgid "Alt+Space"
-msgstr "Alt+스페이스"
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
 
 #: ../rules/base.xml.in.h:26
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win 키 동작"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
 
 #: ../rules/base.xml.in.h:27
-msgid "Amharic"
-msgstr "암하라어"
+msgid "BTC 5090"
+msgstr "BTC 5090"
 
 #: ../rules/base.xml.in.h:28
-msgid "Any Alt key"
-msgstr "모든 Alt 키"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:29
-msgid "Any Win key"
-msgstr "모든 윈도우 키"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U 미니 무선 인터넷/게임 키보드"
 
 #: ../rules/base.xml.in.h:30
-msgid "Any Win key (while pressed)"
-msgstr "모든 윈도우 키(누르고 있는 동안)"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "체리 Blue Line CyBo@rd"
 
 #: ../rules/base.xml.in.h:31
-msgid "Apple"
-msgstr "애플"
+msgid "Cherry CyMotion Master XPress"
+msgstr "체리 CyMotion Master XPress"
 
 #: ../rules/base.xml.in.h:32
-msgid "Apple Aluminium Keyboard (ANSI)"
-msgstr "Apple Aluminium Keyboard (ANSI)"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "체리 Blue Line CyBo@rd(다른 옵션)"
 
 #: ../rules/base.xml.in.h:33
-msgid "Apple Aluminium Keyboard (ISO)"
-msgstr "Apple Aluminium Keyboard (ISO)"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "체리 CyBo@rd USB-Hub"
 
 #: ../rules/base.xml.in.h:34
-msgid "Apple Aluminium Keyboard (JIS)"
-msgstr "Apple Aluminium Keyboard (JIS)"
+msgid "Cherry CyMotion Expert"
+msgstr "체리 CyMotion Expert"
 
 #: ../rules/base.xml.in.h:35
-msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
-msgstr "Apple Aluminium Keyboard: PC 키 에뮬레이션(Print, Scroll_Lock, Pause, Num Lock)"
+msgid "Cherry B.UNLIMITED"
+msgstr "체리 B.UNLIMITED"
 
 #: ../rules/base.xml.in.h:36
-msgid "Apple Laptop"
-msgstr "애플 노트북"
+msgid "Chicony Internet Keyboard"
+msgstr "치코니 인터넷 키보드"
 
 #: ../rules/base.xml.in.h:37
-msgid "Arabic"
-msgstr "아랍어"
+msgid "Chicony KU-0108"
+msgstr "치코니 KU-0108"
 
-# 버크월터 - 아랍어 음역 방법
-#     http://en.wikipedia.org/wiki/Buckwalter_transliteration
 #: ../rules/base.xml.in.h:38
-msgid "Arabic (Buckwalter)"
-msgstr "아랍어(버크월터)"
+msgid "Chicony KU-0420"
+msgstr "치코니 KU-0420"
 
 #: ../rules/base.xml.in.h:39
-msgid "Arabic (Morocco)"
-msgstr "아랍어(모로코)"
+msgid "Chicony KB-9885"
+msgstr "치코니 KB-9885"
 
 #: ../rules/base.xml.in.h:40
-msgid "Arabic (Pakistan)"
-msgstr "아랍어(파키스탄)"
+msgid "Compaq Easy Access Keyboard"
+msgstr "컴팩 Easy Access 키보드"
 
 #: ../rules/base.xml.in.h:41
-msgid "Arabic (Syria)"
-msgstr "아랍어(시리아)"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "컴팩 인터넷 키보드(7키)"
 
 #: ../rules/base.xml.in.h:42
-msgid "Arabic (azerty)"
-msgstr "아랍어(AZERTY)"
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "컴팩 인터넷 키보드(13키)"
 
 #: ../rules/base.xml.in.h:43
-msgid "Arabic (azerty/digits)"
-msgstr "아랍어(AZERTY/숫자)"
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "컴팩 인터넷 키보드(18키)"
 
 #: ../rules/base.xml.in.h:44
-msgid "Arabic (digits)"
-msgstr "아랍어(숫자)"
+msgid "Cherry CyMotion Master Linux"
+msgstr "체리 CyMotion Master Linux"
 
 #: ../rules/base.xml.in.h:45
-msgid "Arabic (qwerty)"
-msgstr "아랍어(QWERTY)"
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "노트북 컴팩(Armada 등) 노트북 키보드"
 
 #: ../rules/base.xml.in.h:46
-msgid "Arabic (qwerty/digits)"
-msgstr "아랍어(QWERTY/숫자)"
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "노트북 컴팩(Presario 등) 노트북 키보드"
 
-#: ../rules/base.xml.in.h:47 ../rules/base.extras.xml.in.h:2
-msgid "Armenian"
-msgstr "아르메니아"
+#: ../rules/base.xml.in.h:47
+msgid "Compaq iPaq Keyboard"
+msgstr "컴팩 iPaq 키보드"
 
 #: ../rules/base.xml.in.h:48
-msgid "Armenian (alternative eastern)"
-msgstr "아르메니아(다른 동부)"
+msgid "Dell"
+msgstr "델"
 
 #: ../rules/base.xml.in.h:49
-msgid "Armenian (alternative phonetic)"
-msgstr "아르메니아(다른 음성 기호)"
+msgid "Dell SK-8125"
+msgstr "델 SK-8125"
 
 #: ../rules/base.xml.in.h:50
-msgid "Armenian (eastern)"
-msgstr "아르메니아(동부)"
+msgid "Dell SK-8135"
+msgstr "델 SK-8135"
 
 #: ../rules/base.xml.in.h:51
-msgid "Armenian (phonetic)"
-msgstr "아르메니아(음성 기호)"
+msgid "Dell USB Multimedia Keyboard"
+msgstr "델 USB 멀티미디어 키보드"
 
 #: ../rules/base.xml.in.h:52
-msgid "Armenian (western)"
-msgstr "아르메니아(서부)"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "델 노트북 Inspiron 6xxx/8xxx"
 
-# 아스투리아스 - 스페인 지역
 #: ../rules/base.xml.in.h:53
-msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
-msgstr "아스투리아스어(스페인, 가운데점 H 및 가운데점 L 포함)"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "델 노트북 Precision M series"
 
 #: ../rules/base.xml.in.h:54
-msgid "Asus Laptop"
-msgstr "에이서스 노트북"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop 키보드"
 
 #: ../rules/base.xml.in.h:55
-msgid "At bottom left"
-msgstr "맨 아래 왼쪽에"
+msgid "Diamond 9801 / 9802 series"
+msgstr "다이아몬드 9801 / 9802 시리즈"
 
 #: ../rules/base.xml.in.h:56
-msgid "At left of 'A'"
-msgstr "'A' 왼쪽에"
+msgid "DTK2000"
+msgstr "DTK2000"
 
-# 아프리카 지역 언어
 #: ../rules/base.xml.in.h:57
-msgid "Avatime"
-msgstr "애버타임어"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
 
 #: ../rules/base.xml.in.h:58
-msgid "Azerbaijani"
-msgstr "아제르바이잔어"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "후지스-지멘스 컴퓨터 AMILO 노트북"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijani (Cyrillic)"
-msgstr "아제르바이잔어(키릴 문자)"
+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:60
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 무선 인터넷 키보드"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
 
 #: ../rules/base.xml.in.h:61
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
 
 #: ../rules/base.xml.in.h:62
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF 멀티미디어"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
 
 #: ../rules/base.xml.in.h:63
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
 
+# 제조사 이름
 #: ../rules/base.xml.in.h:64
-msgid "BTC 6301URF"
-msgstr "BTC 6301URF"
+msgid "Gyration"
+msgstr "Gyration"
 
 #: ../rules/base.xml.in.h:65
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "HTC Dream"
+msgstr "HTC 드림"
 
 #: ../rules/base.xml.in.h:66
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "Kinesis"
+msgstr "키네시스"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:67
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Logitech Generic Keyboard"
+msgstr "로지텍 일반 키보드"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:68
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "로지텍 G15 추가 키, G15daemon 사용"
 
 #: ../rules/base.xml.in.h:69
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr "BTC 9116U 미니 무선 인터넷/게임 키보드"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "휴렛팩커드 인터넷 키보드"
 
 #: ../rules/base.xml.in.h:70
-msgid "Backslash"
-msgstr "백슬래시"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "휴렛팩커드 SK-250x 멀티미디어 키보드"
 
 #: ../rules/base.xml.in.h:71
-msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
-msgstr "백슬래시로 3번째 단계 선택, 다른 3번째 단계 선택 키와 같이 누르면 고정"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "휴렛팩커드 Omnibook XE3 GC"
 
 #: ../rules/base.xml.in.h:72
-msgid "Bambara"
-msgstr "밤바라어"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "휴렛팩커드 Omnibook XE3 GF"
 
 #: ../rules/base.xml.in.h:73
-msgid "Bashkirian"
-msgstr "바시키르어"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "휴렛팩커드 Omnibook XT1000"
 
 #: ../rules/base.xml.in.h:74
-msgid "Belarusian"
-msgstr "벨라루스어"
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "휴렛팩커드 Pavilion dv5"
 
 #: ../rules/base.xml.in.h:75
-msgid "Belarusian (Latin)"
-msgstr "벨라루스어(라틴)"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "휴렛팩커드 Pavilion ZT11xx"
 
 #: ../rules/base.xml.in.h:76
-msgid "Belarusian (legacy)"
-msgstr "벨라루시아어(구형)"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "휴렛팩커드 Omnibook 500 FA"
 
 #: ../rules/base.xml.in.h:77
-msgid "Belgian"
-msgstr "벨기에어"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "휴렛팩커드 Omnibook 5xx"
 
 #: ../rules/base.xml.in.h:78
-msgid "Belgian (ISO alternate)"
-msgstr "벨기에어(ISO 다른 버전)"
+msgid "Hewlett-Packard nx9020"
+msgstr "휴렛팩커드 nx9020"
 
 #: ../rules/base.xml.in.h:79
-msgid "Belgian (Sun dead keys)"
-msgstr "벨기에어(썬 데드키)"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "휴렛팩커드 Omnibook 6000/6100"
 
 #: ../rules/base.xml.in.h:80
-msgid "Belgian (Wang model 724 azerty)"
-msgstr "벨기에어(Wang model 724 AZERTY)"
+msgid "Honeywell Euroboard"
+msgstr "하니웰 Euroboard"
 
 #: ../rules/base.xml.in.h:81
-msgid "Belgian (alternative)"
-msgstr "벨기에어(다른 버전)"
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "휴렛팩커드 Mini 110 Notebook"
 
 #: ../rules/base.xml.in.h:82
-msgid "Belgian (alternative, Sun dead keys)"
-msgstr "벨기에어(다른 버전, 썬 데드키)"
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
 
 #: ../rules/base.xml.in.h:83
-msgid "Belgian (alternative, latin-9 only)"
-msgstr "벨기에어(다른 버전, latin-9 전용)"
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
 
 #: ../rules/base.xml.in.h:84
-msgid "Belgian (eliminate dead keys)"
-msgstr "벨기에어(데드키 없음)"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:85
-msgid "BenQ X-Touch"
-msgstr "벤큐 X-Touch"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
 
 #: ../rules/base.xml.in.h:86
-msgid "BenQ X-Touch 730"
-msgstr "벤큐 X-Touch 730"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
 #: ../rules/base.xml.in.h:87
-msgid "BenQ X-Touch 800"
-msgstr "벤큐 X-Touch 800"
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:88
-msgid "Bengali"
-msgstr "벵골어"
+msgid "Logitech Access Keyboard"
+msgstr "로지텍 액세스 키보드"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:89
-msgid "Bengali (India)"
-msgstr "벵골어(인도)"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "로지텍 무선 데스크탑 LX-300"
 
-# inscript - 인도 키보드 표준
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:90
-msgid "Bengali (India, Baishakhi Inscript)"
-msgstr "벵골어(인도, 바이샤키 인스크립트)"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "로지텍 인터넷 350 키보드"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:91
-msgid "Bengali (India, Baishakhi)"
-msgstr "벵골어(인도, 바이샤키)"
+msgid "Logitech Media Elite Keyboard"
+msgstr "로지텍 미디어 엘리트 키보드"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:92
-msgid "Bengali (India, Bornona)"
-msgstr "벵골어(인도, 보르노나)"
+msgid "Logitech Cordless Desktop"
+msgstr "로지텍 무선 데스크탑"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:93
-msgid "Bengali (India, Probhat)"
-msgstr "벵골어(인도, 프롭해트)"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "로지텍 무선 데스크탑 아이터치"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:94
-msgid "Bengali (India, Uni Gitanjali)"
-msgstr "벵골어(인도, 유니 기탄잘리)"
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "로지텍 무선 데스크탑 내비게이터"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:95
-msgid "Bengali (Probhat)"
-msgstr "벵골어(프롭해트)"
+msgid "Logitech Cordless Desktop Optical"
+msgstr "로지텍 무선 데스크탑 옵티컬"
 
-# 베르베르어파
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:96
-msgid "Berber (Morocco, Tifinagh alternative phonetic)"
-msgstr "베르베르어(모로코, 티피나그 다른 음성 기호 버전)"
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "로지텍 무선 데스크탑(다른 옵션)"
 
-# 베르베르어파
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:97
-msgid "Berber (Morocco, Tifinagh alternative)"
-msgstr "베르베르어(모로코, 티피나그 다른 버전)"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "로지텍 무선 데스크탑 프로(다른 옵션 2)"
 
-# 베르베르어파
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:98
-msgid "Berber (Morocco, Tifinagh extended phonetic)"
-msgstr "베르베르어(모로코, 티피나그 확장 음성 기호)"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "로지텍 무선 프리덤/데스크탑 내비게이터"
 
-# 베르베르어파
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:99
-msgid "Berber (Morocco, Tifinagh extended)"
-msgstr "베르베르어(모로코, 티피나그 확장)"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "로지텍 아이터치 무선 키보드(모델 Y-RB6)"
 
-# 베르베르어파
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:100
-msgid "Berber (Morocco, Tifinagh phonetic)"
-msgstr "베르베르어(모로코, 티피나그 음성 기호)"
+msgid "Logitech Internet Keyboard"
+msgstr "로지텍 인터넷 키보드"
 
-# 베르베르어파
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:101
-msgid "Berber (Morocco, Tifinagh)"
-msgstr "베르베르어(모로코, 티피나그)"
+msgid "Logitech iTouch"
+msgstr "로지텍 아이터치"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:102
-msgid "Bosnian"
-msgstr "보스니아어"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "로지텍 인터넷 내비게이터 키보드"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:103
-msgid "Bosnian (US keyboard with Bosnian digraphs)"
-msgstr "보스니아어(미국식 키보드, 보스니아 이중 문자 포함)"
+msgid "Logitech Cordless Desktop EX110"
+msgstr "로지텍 무선 데스크탑 EX110"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:104
-msgid "Bosnian (US keyboard with Bosnian letters)"
-msgstr "보스니아어(미국식 키보드, 보스니아 문자 포함)"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "로지텍 아이터치 인터넷 내비게이터 키보드 SE"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:105
-msgid "Bosnian (use Bosnian digraphs)"
-msgstr "보스니아어(보스니아 이중 문자 사용)"
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "로지텍 아이터치 인터넷 내비게이터 키보드 SE(USB)"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:106
-msgid "Bosnian (use guillemets for quotes)"
-msgstr "보스니아어(따옴표에 각괄호 사용)"
+msgid "Logitech Ultra-X Keyboard"
+msgstr "로지텍 울트라 키보드"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:107
-msgid "Both Alt keys together"
-msgstr "Alt 키 2개 동시 누름"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "로지텍 울트라 무선 미디어 데스크탑 키보드"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:108
-msgid "Both Ctrl keys together"
-msgstr "Ctrl 키 2개 동시 누름"
+msgid "Logitech diNovo Keyboard"
+msgstr "로지텍 디노보 키보드"
 
+# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:109
-msgid "Both Shift keys together"
-msgstr "Shift 키 2개 동시 누름"
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "로지텍 디노보 엣지 키보드"
 
 #: ../rules/base.xml.in.h:110
-msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
-msgstr "Shift 키 두 개로 Caps Lock 켜기, Shift 키 한 개로 해제"
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
 
 #: ../rules/base.xml.in.h:111
-msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr "Shift 키 두 개로 Caps Lock 토글"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access 키보드"
 
 #: ../rules/base.xml.in.h:112
-msgid "Both Shift-Keys together toggle ShiftLock"
-msgstr "Shift 키 두 개로 ShiftLock 토글"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:113
-msgid "Braille"
-msgstr "점자"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgstr "마이크로소프트 내츄럴 무선 어고노믹 키보드 4000"
 
 #: ../rules/base.xml.in.h:114
-msgid "Braille (left hand)"
-msgstr "점자(왼손잡이)"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "마이크로소프트 내츄럴 무선 어고노믹 키보드 7000"
 
 #: ../rules/base.xml.in.h:115
-msgid "Braille (right hand)"
-msgstr "점자(오른손잡이)"
+msgid "Microsoft Internet Keyboard"
+msgstr "마이크로소프트 인터넷 키보드"
 
 #: ../rules/base.xml.in.h:116
-msgid "Brother Internet Keyboard"
-msgstr "브라더 인터넷 키보드"
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "마이크로소프트 내츄럴 키보드 / 마이크로소프트 인터넷 키보드 프로"
 
 #: ../rules/base.xml.in.h:117
-msgid "Bulgarian"
-msgstr "불가리아어"
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "마이크로소프트 내츄럴 키보드 프로 USB / 마이크로소프트 인터넷 키보드 프로"
 
 #: ../rules/base.xml.in.h:118
-msgid "Bulgarian (new phonetic)"
-msgstr "불가리아어(새 음성 기호)"
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "마이크로소프트 내츄럴 키보드 프로 OEM"
 
 #: ../rules/base.xml.in.h:119
-msgid "Bulgarian (traditional phonetic)"
-msgstr "불가리아어(구식 음성 기호)"
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "뷰소닉 KU-306 인터넷 키보드"
 
 #: ../rules/base.xml.in.h:120
-msgid "Burmese"
-msgstr "미얀마어"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "마이크로소프트 인터넷 키보드 프로, 스웨덴"
 
 #: ../rules/base.xml.in.h:121
-msgid "Cameroon Multilingual (Dvorak)"
-msgstr "카메룬 여러 언어 지원(드보락)"
+msgid "Microsoft Office Keyboard"
+msgstr "마이크로소프트 오피스 키보드"
 
 #: ../rules/base.xml.in.h:122
-msgid "Cameroon Multilingual (azerty)"
-msgstr "카메룬 여러 언어 지원(AZERTY)"
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "마이크로소프트 무선 멀티미디어 키보드 1.0A"
 
 #: ../rules/base.xml.in.h:123
-msgid "Cameroon Multilingual (qwerty)"
-msgstr "카메룬 여러 언어 지원(QWERTY)"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "마이크로소프트 내츄럴 키보드 엘리트"
 
 #: ../rules/base.xml.in.h:124
-msgid "Canadian Multilingual"
-msgstr "캐나다 여러 언어 지원"
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "마이크로소프트 컴포트 커브 키보드 2000"
 
 #: ../rules/base.xml.in.h:125
-msgid "Canadian Multilingual (first part)"
-msgstr "캐나다 여러 언어 지원(첫번째)"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet 키보드"
 
 #: ../rules/base.xml.in.h:126
-msgid "Canadian Multilingual (second part)"
-msgstr "캐나다 여러 언어 지원(두번째)"
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager(KTEZ-1000)"
 
 #: ../rules/base.xml.in.h:127
-msgid "Caps Lock"
-msgstr "Caps Lock"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
 #: ../rules/base.xml.in.h:128
-msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
-msgstr "Caps Lock(1번으로), Shift+Caps Lock(마지막으로)"
+msgid "Samsung SDM 4500P"
+msgstr "삼성 SDM 4500P"
 
 #: ../rules/base.xml.in.h:129
-msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
-msgstr "Caps Lock(누르고 있는 동안), Alt+Caps Lock을 누르면 원래 Caps Lock 기능"
+msgid "Samsung SDM 4510P"
+msgstr "삼성 SDM 4510P"
 
+# Sanwa Supply - 일본 제조사
 #: ../rules/base.xml.in.h:130
-msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock이 Shift처럼 동작하고 상태 고정, Shift가 Caps Lock을 \"일시 중지\""
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
 
 #: ../rules/base.xml.in.h:131
-msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock이 Shift처럼 동작하고 상태 고정, Shift가 Caps Lock 상태에 영향 없음"
+msgid "SK-1300"
+msgstr "SK-1300"
 
 #: ../rules/base.xml.in.h:132
-msgid "Caps Lock as Ctrl"
-msgstr "Caps Lock 키를 Ctrl 키로"
+msgid "SK-2500"
+msgstr "SK-2500"
 
 #: ../rules/base.xml.in.h:133
-msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
-msgstr "Caps Lock으로 3번째 단계 선택, 다른 3번째 단계 선택 키와 같이 누르면 고정"
+msgid "SK-6200"
+msgstr "SK-6200"
 
 #: ../rules/base.xml.in.h:134
-msgid "Caps Lock is disabled"
-msgstr "Caps Lock 사용 안 함"
+msgid "SK-7100"
+msgstr "SK-7100"
 
 #: ../rules/base.xml.in.h:135
-msgid "Caps Lock key behavior"
-msgstr "Caps Lock 키 동작"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power 멀티미디어 키보드"
 
 #: ../rules/base.xml.in.h:136
-msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr "Caps Lock이 Shift 상태를 토글, 즉 모든 키가 영향을 받음"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
 
 #: ../rules/base.xml.in.h:137
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr "Caps Lock이 일반적인 알파벳 대문자 상태를 토글"
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
 
 #: ../rules/base.xml.in.h:138
-msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock이 내부 대문자 기능 사용. Shift가 Caps Lock을 \"일시 중지\""
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook(타블렛 PC)"
 
 #: ../rules/base.xml.in.h:139
-msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock이 내부 대문자 기능 사용. Shift가 Caps Lock 상태에 영향 없음"
+msgid "Toshiba Satellite S3000"
+msgstr "도시바 Satellite S3000"
 
 #: ../rules/base.xml.in.h:140
-msgid "Catalan"
-msgstr "카탈루냐어"
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
 
 #: ../rules/base.xml.in.h:141
-msgid "Catalan (Spain, with middle-dot L)"
-msgstr "카탈로니아어(스페인, 가운데점 L 포함)"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access 키보드"
 
-# 체로키어 - 아메리카 원주민 부족
 #: ../rules/base.xml.in.h:142
-msgid "Cherokee"
-msgstr "체로키어"
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
 
 #: ../rules/base.xml.in.h:143
-msgid "Cherry B.UNLIMITED"
-msgstr "체리 B.UNLIMITED"
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
 
 #: ../rules/base.xml.in.h:144
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "체리 Blue Line CyBo@rd"
+msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
 #: ../rules/base.xml.in.h:145
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "체리 Blue Line CyBo@rd(다른 옵션)"
+msgid "TypeMatrix EZ-Reach 2030 USB"
+msgstr "TypeMatrix EZ-Reach 2030 USB"
 
 #: ../rules/base.xml.in.h:146
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "체리 CyBo@rd USB-Hub"
+msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB(102/105:유럽 모드)"
 
 #: ../rules/base.xml.in.h:147
-msgid "Cherry CyMotion Expert"
-msgstr "체리 CyMotion Expert"
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB(106:일본 모드)"
 
 #: ../rules/base.xml.in.h:148
-msgid "Cherry CyMotion Master Linux"
-msgstr "체리 CyMotion Master Linux"
+msgid "Yahoo! Internet Keyboard"
+msgstr "야후! 인터넷 키보드"
 
 #: ../rules/base.xml.in.h:149
-msgid "Cherry CyMotion Master XPress"
-msgstr "체리 CyMotion Master XPress"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
 
 #: ../rules/base.xml.in.h:150
-msgid "Chicony Internet Keyboard"
-msgstr "치코니 인터넷 키보드"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro(국제 버전)"
 
 #: ../rules/base.xml.in.h:151
-msgid "Chicony KB-9885"
-msgstr "치코니 KB-9885"
+msgid "Macintosh"
+msgstr "매킨토시"
 
 #: ../rules/base.xml.in.h:152
-msgid "Chicony KU-0108"
-msgstr "치코니 KU-0108"
+msgid "Macintosh Old"
+msgstr "매킨토시 구형"
 
 #: ../rules/base.xml.in.h:153
-msgid "Chicony KU-0420"
-msgstr "치코니 KU-0420"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "해피해킹 키보드, 맥용"
 
 #: ../rules/base.xml.in.h:154
-msgid "Chinese"
-msgstr "중국어"
+msgid "Acer C300"
+msgstr "에이서 C300"
 
 #: ../rules/base.xml.in.h:155
-msgid "Chuvash"
-msgstr "추바시어"
+msgid "Acer Ferrari 4000"
+msgstr "에이서 Ferrari 4000"
 
-# http://ko.wikipedia.org/wiki/%EC%B6%94%EB%B0%94%EC%8B%9C%EC%96%B4
 #: ../rules/base.xml.in.h:156
-msgid "Chuvash (Latin)"
-msgstr "추바시어(라틴)"
+msgid "Acer Laptop"
+msgstr "에이서 노트북"
 
 #: ../rules/base.xml.in.h:157
-msgid "Classmate PC"
-msgstr "클래스메이트 PC"
+msgid "Asus Laptop"
+msgstr "에이서스 노트북"
 
-# 아일랜드 변종
 #: ../rules/base.xml.in.h:158
-msgid "CloGaelach"
-msgstr "클로개라치어"
+msgid "Apple"
+msgstr "애플"
 
 #: ../rules/base.xml.in.h:159
-msgid "Compaq Easy Access Keyboard"
-msgstr "컴팩 Easy Access 키보드"
+msgid "Apple Laptop"
+msgstr "애플 노트북"
 
 #: ../rules/base.xml.in.h:160
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "컴팩 인터넷 키보드(13키)"
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Apple Aluminium Keyboard (ANSI)"
 
 #: ../rules/base.xml.in.h:161
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "컴팩 인터넷 키보드(18키)"
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Apple Aluminium Keyboard (ISO)"
 
 #: ../rules/base.xml.in.h:162
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "컴팩 인터넷 키보드(7키)"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Apple Aluminium Keyboard (JIS)"
 
 #: ../rules/base.xml.in.h:163
-msgid "Compaq iPaq Keyboard"
-msgstr "컴팩 iPaq 키보드"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless 키보드"
 
 #: ../rules/base.xml.in.h:164
-msgid "Compose key position"
-msgstr "조합 키 위치"
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "노트북 컴팩 eMachines m68xx"
 
 #: ../rules/base.xml.in.h:165
-msgid "Control + Alt + Backspace"
-msgstr "Ctrl + Alt + 백스페이스"
+msgid "BenQ X-Touch"
+msgstr "벤큐 X-Touch"
 
 #: ../rules/base.xml.in.h:166
-msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr "Ctrl 키를 윈도우 키로 매핑, Alt 키를 윈도우 키로 매핑"
+msgid "BenQ X-Touch 730"
+msgstr "벤큐 X-Touch 730"
 
 #: ../rules/base.xml.in.h:167
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr "Ctrl 키를 윈도우 키로 매핑(그리고 일반 Ctrl 키로도 동작)"
+msgid "BenQ X-Touch 800"
+msgstr "벤큐 X-Touch 800"
 
 #: ../rules/base.xml.in.h:168
-msgid "Creative Desktop Wireless 7000"
-msgstr "Creative Desktop Wireless 7000"
+msgid "Happy Hacking Keyboard"
+msgstr "해피해킹 키보드"
 
 #: ../rules/base.xml.in.h:169
-msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "크림타타르(터키어 Alt-Q)"
+msgid "Classmate PC"
+msgstr "클래스메이트 PC"
 
 #: ../rules/base.xml.in.h:170
-msgid "Crimean Tatar (Turkish F)"
-msgstr "크림타타르(터키어 F)"
+msgid "OLPC"
+msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Crimean Tatar (Turkish Q)"
-msgstr "크림타타르(터키어 Q)"
+msgid "Sun Type 7 USB"
+msgstr "썬 타입 7 USB"
 
 #: ../rules/base.xml.in.h:172
-msgid "Croatian"
-msgstr "크로아티아어"
+msgid "Sun Type 7 USB (European layout)"
+msgstr "썬 타입 7 USB(유럽 배치)"
 
 #: ../rules/base.xml.in.h:173
-msgid "Croatian (US keyboard with Croatian digraphs)"
-msgstr "크로아티아어(미국식 키보드, 크로아티아 이중 문자 포함)"
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "썬 타입 7 USB(유닉스 배치)"
 
 #: ../rules/base.xml.in.h:174
-msgid "Croatian (US keyboard with Croatian letters)"
-msgstr "크로아티아어(미국식 키보드, 크로아티아 문자 포함)"
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "썬 타입 7 USB(일본어 배치) / 일본어 106키"
 
 #: ../rules/base.xml.in.h:175
-msgid "Croatian (use Croatian digraphs)"
-msgstr "크로아티아어(크로아티아 이중 문자 사용)"
+msgid "Sun Type 6/7 USB"
+msgstr "썬 타입 6/7 USB"
 
 #: ../rules/base.xml.in.h:176
-msgid "Croatian (use guillemets for quotes)"
-msgstr "크로아티아어(따옴표에 각괄호 사용)"
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "썬 타입 6/7 USB(유럽 배치)"
 
 #: ../rules/base.xml.in.h:177
-msgid "Ctrl key position"
-msgstr "Ctrl 키 위치"
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "썬 타입 6 USB(유닉스 배치)"
 
 #: ../rules/base.xml.in.h:178
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Shift"
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "썬 타입 6 USB(일본어 배치)"
 
 #: ../rules/base.xml.in.h:179
-msgid "Czech"
-msgstr "체코어"
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "썬 타입 6(일본어 배치)"
 
 #: ../rules/base.xml.in.h:180
-msgid "Czech (UCW layout, accented letters only)"
-msgstr "체코어(UCW 배치, 액센트 문자만)"
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
 
+# Unitek - 유니텍(unitech)이 아님
 #: ../rules/base.xml.in.h:181
-msgid "Czech (US Dvorak with CZ UCW support)"
-msgstr "체코어(US 드보락, CZ UCW 지원)"
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
 
 #: ../rules/base.xml.in.h:182
-msgid "Czech (qwerty)"
-msgstr "체코어(QWERTY)"
+msgid "FL90"
+msgstr "FL90"
 
 #: ../rules/base.xml.in.h:183
-msgid "Czech (qwerty, extended Backslash)"
-msgstr "체코어(QWERTY, 백슬래시 확장)"
+msgid "Creative Desktop Wireless 7000"
+msgstr "Creative Desktop Wireless 7000"
 
 #: ../rules/base.xml.in.h:184
-msgid "Czech (with &lt;\\|&gt; key)"
-msgstr "체코어(&lt;\\|&gt; 키 포함)"
-
-#: ../rules/base.xml.in.h:185
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:186
-msgid "Danish"
-msgstr "덴마크어"
+msgid "Htc Dream phone"
+msgstr "HTC 드림 휴대전화"
 
-#: ../rules/base.xml.in.h:187
-msgid "Danish (Dvorak)"
-msgstr "덴마크어(드보락)"
+#. Keyboard indicator for English layouts
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
+msgid "en"
+msgstr "en"
 
-#: ../rules/base.xml.in.h:188
-msgid "Danish (Macintosh)"
-msgstr "덴마크어(매킨토시)"
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
+msgid "English (US)"
+msgstr "영어(미국)"
 
+#. Keyboard indicator for Cherokee layouts
 #: ../rules/base.xml.in.h:189
-msgid "Danish (Macintosh, eliminate dead keys)"
-msgstr "덴마크어(매킨토시, 데드키 없음)"
+msgid "chr"
+msgstr "chr"
 
+# 체로키어 - 아메리카 원주민 부족
 #: ../rules/base.xml.in.h:190
-msgid "Danish (eliminate dead keys)"
-msgstr "덴마크어(데드키 없음)"
+msgid "Cherokee"
+msgstr "체로키어"
 
 #: ../rules/base.xml.in.h:191
-msgid "Default numeric keypad keys"
-msgstr "기본 숫자 키패드 키"
+msgid "English (US, with euro on 5)"
+msgstr "영어(미국, 5 키에 유로 기호)"
 
 #: ../rules/base.xml.in.h:192
-msgid "Dell"
-msgstr "델"
+msgid "English (US, international with dead keys)"
+msgstr "영어(미국, 국제 버전, 데드키 포함)"
 
 #: ../rules/base.xml.in.h:193
-msgid "Dell 101-key PC"
-msgstr "델 101키 PC"
+msgid "English (US, alternative international)"
+msgstr "영어(미국, 다른 국제 버전)"
 
 #: ../rules/base.xml.in.h:194
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "델 노트북 Inspiron 6xxx/8xxx"
+msgid "English (Colemak)"
+msgstr "영어(콜맥)"
 
 #: ../rules/base.xml.in.h:195
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "델 노트북 Precision M series"
+msgid "English (Dvorak)"
+msgstr "영어(드보락)"
 
 #: ../rules/base.xml.in.h:196
-msgid "Dell Latitude series laptop"
-msgstr "델 Latitude 시리즈 노트북"
+msgid "English (Dvorak, international with dead keys)"
+msgstr "영어(드보락 국제 버전, 데드키 포함)"
 
 #: ../rules/base.xml.in.h:197
-msgid "Dell Precision M65"
-msgstr "델 Precision M65"
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr "영어(드보락 다른 국제 버전, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:198
-msgid "Dell SK-8125"
-msgstr "델 SK-8125"
+msgid "English (left handed Dvorak)"
+msgstr "영어(왼손잡이 드보락)"
 
 #: ../rules/base.xml.in.h:199
-msgid "Dell SK-8135"
-msgstr "델 SK-8135"
+msgid "English (right handed Dvorak)"
+msgstr "영어(오른손잡이 드보락)"
 
 #: ../rules/base.xml.in.h:200
-msgid "Dell USB Multimedia Keyboard"
-msgstr "델 USB 멀티미디어 키보드"
+msgid "English (classic Dvorak)"
+msgstr "영어(클래식 드보락)"
 
 #: ../rules/base.xml.in.h:201
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop 키보드"
-
-# 몰디브 공용어
-#: ../rules/base.xml.in.h:202
-msgid "Dhivehi"
-msgstr "디베히어"
+msgid "English (programmer Dvorak)"
+msgstr "영어(프로그래머 드보락)"
 
-#: ../rules/base.xml.in.h:203
-msgid "Diamond 9801 / 9802 series"
-msgstr "다이아몬드 9801 / 9802 시리즈"
+#. Keyboard indicator for Russian layouts
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
+msgid "ru"
+msgstr "ru"
 
 #: ../rules/base.xml.in.h:204
-msgid "Dutch"
-msgstr "네덜란드어"
+msgid "Russian (US, phonetic)"
+msgstr "러시아어(미국, 음성 표기)"
 
 #: ../rules/base.xml.in.h:205
-msgid "Dutch (Macintosh)"
-msgstr "네덜란드어(매킨토시)"
+msgid "English (Macintosh)"
+msgstr "영어(매킨토시)"
 
 #: ../rules/base.xml.in.h:206
-msgid "Dutch (Sun dead keys)"
-msgstr "네덜란드어(썬 데드키)"
+msgid "English (international AltGr dead keys)"
+msgstr "영어(국제 버전, AltGr 데드키)"
 
 #: ../rules/base.xml.in.h:207
-msgid "Dutch (standard)"
-msgstr "네덜란드어(표준)"
+msgid "English (layout toggle on multiply/divide key)"
+msgstr "영어(곱하기/나누기 키에 키보드 배치 토글)"
 
 #: ../rules/base.xml.in.h:208
-msgid "Dzongkha"
-msgstr "종카어"
+msgid "Serbo-Croatian (US)"
+msgstr "세르보크로아트어(미국)"
 
 #: ../rules/base.xml.in.h:209
-msgid "Enable extra typographic characters"
-msgstr "추가 타이포그라피 문자 사용"
+msgid "English (Workman)"
+msgstr "영어(워크맨)"
 
 #: ../rules/base.xml.in.h:210
-msgid "English (Cameroon)"
-msgstr "영어(카메룬)"
-
-#: ../rules/base.xml.in.h:211
-msgid "English (Canada)"
-msgstr "영어(캐나다)"
+msgid "English (Workman, international with dead keys)"
+msgstr "영어(워크맨, 드보락 국제 버전, 데드키 포함)"
 
-# Colemak: 상표명
-#: ../rules/base.xml.in.h:212
-msgid "English (Colemak)"
-msgstr "영어(Colemak)"
+#. Keyboard indicator for Persian layouts
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
+msgid "fa"
+msgstr "fa"
 
 #: ../rules/base.xml.in.h:213
-msgid "English (Dvorak alternative international no dead keys)"
-msgstr "영어(드보락 다른 국제 버전, 데드키 없음)"
-
-#: ../rules/base.xml.in.h:214
-msgid "English (Dvorak international with dead keys)"
-msgstr "영어(드보락 국제 버전, 데드키 포함)"
+msgid "Afghani"
+msgstr "아프가니스탄"
 
+#. Keyboard indicator for Pashto layouts
 #: ../rules/base.xml.in.h:215
-msgid "English (Dvorak)"
-msgstr "영어(드보락)"
+msgid "ps"
+msgstr "ps"
 
+# 아프가니스탄
 #: ../rules/base.xml.in.h:216
-msgid "English (Ghana)"
-msgstr "영어(가나)"
-
-#: ../rules/base.xml.in.h:217
-msgid "English (Ghana, GILLBT)"
-msgstr "영어(가나, GILLBT)"
+msgid "Pashto"
+msgstr "파슈토어"
 
+#. Keyboard indicator for Uzbek layouts
 #: ../rules/base.xml.in.h:218
-msgid "English (Ghana, multilingual)"
-msgstr "영어(가나, 다국어)"
+msgid "uz"
+msgstr "uz"
 
 #: ../rules/base.xml.in.h:219
-msgid "English (India, with RupeeSign)"
-msgstr "영어(인도, 루피 기호 포함)"
+msgid "Uzbek (Afghanistan)"
+msgstr "우즈베크어(아프가니스탄)"
 
 #: ../rules/base.xml.in.h:220
-msgid "English (Macintosh)"
-msgstr "영어(매킨토시)"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "파슈토어(아프가니스탄, OLPC)"
 
 #: ../rules/base.xml.in.h:221
-msgid "English (Mali, US Macintosh)"
-msgstr "영어(말리, 미국 매킨토시)"
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "페르시아어(아프가니스탄, Dari OLPC)"
 
 #: ../rules/base.xml.in.h:222
-msgid "English (Mali, US international)"
-msgstr "영어(말리, 미국 국제 버전)"
-
-#: ../rules/base.xml.in.h:223
-msgid "English (Nigeria)"
-msgstr "영어(나이지리아)"
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "우즈베크어(아프가니스탄, OLPC)"
 
-#: ../rules/base.xml.in.h:224
-msgid "English (South Africa)"
-msgstr "영어(남아공)"
+#. Keyboard indicator for Arabic layouts
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
+msgid "ar"
+msgstr "ar"
 
-#: ../rules/base.xml.in.h:225
-msgid "English (UK)"
-msgstr "영어(영국)"
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
+msgid "Arabic"
+msgstr "아랍어"
 
 #: ../rules/base.xml.in.h:226
-msgid "English (UK, Colemak)"
-msgstr "영어(영국, Colemak)"
+msgid "Arabic (azerty)"
+msgstr "아랍어(AZERTY)"
 
 #: ../rules/base.xml.in.h:227
-msgid "English (UK, Dvorak with UK punctuation)"
-msgstr "영어(영국, 영국 문장 부호 포함 드보락)"
+msgid "Arabic (azerty/digits)"
+msgstr "아랍어(AZERTY/숫자)"
 
 #: ../rules/base.xml.in.h:228
-msgid "English (UK, Dvorak)"
-msgstr "영어(영국, 드보락)"
+msgid "Arabic (digits)"
+msgstr "아랍어(숫자)"
 
 #: ../rules/base.xml.in.h:229
-msgid "English (UK, Macintosh international)"
-msgstr "영어(영국, 매킨토시 국제 버전)"
+msgid "Arabic (qwerty)"
+msgstr "아랍어(QWERTY)"
 
 #: ../rules/base.xml.in.h:230
-msgid "English (UK, Macintosh)"
-msgstr "영어(영국, 매킨토시)"
+msgid "Arabic (qwerty/digits)"
+msgstr "아랍어(QWERTY/숫자)"
 
+# 버크월터 - 아랍어 음역 방법
+#     http://en.wikipedia.org/wiki/Buckwalter_transliteration
 #: ../rules/base.xml.in.h:231
-msgid "English (UK, extended WinKeys)"
-msgstr "영어(영국, 확장 윈도우 키)"
-
-#: ../rules/base.xml.in.h:232
-msgid "English (UK, international with dead keys)"
-msgstr "영어(영국, 국제 버전, 데드키 포함)"
+msgid "Arabic (Buckwalter)"
+msgstr "아랍어(버크월터)"
 
-#: ../rules/base.xml.in.h:233 ../rules/base.extras.xml.in.h:9
-msgid "English (US)"
-msgstr "영어(미국)"
+#. Keyboard indicator for Albanian layouts
+#: ../rules/base.xml.in.h:233
+msgid "sq"
+msgstr "sq"
 
 #: ../rules/base.xml.in.h:234
-msgid "English (US, alternative international)"
-msgstr "영어(미국, 다른 국제 버전)"
-
-#: ../rules/base.xml.in.h:235
-msgid "English (US, international with dead keys)"
-msgstr "영어(미국, 국제 버전, 데드키 포함)"
+msgid "Albanian"
+msgstr "알바니아"
 
-#: ../rules/base.xml.in.h:236
-msgid "English (US, with euro on 5)"
-msgstr "영어(미국, 5 키에 유로 기호)"
+#. Keyboard indicator for Armenian layouts
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
+msgid "hy"
+msgstr "hy"
 
-#: ../rules/base.xml.in.h:237
-msgid "English (classic Dvorak)"
-msgstr "영어(클래식 드보락)"
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
+msgid "Armenian"
+msgstr "아르메니아"
 
 #: ../rules/base.xml.in.h:238
-msgid "English (international AltGr dead keys)"
-msgstr "영어(국제 버전, AltGr 데드키)"
+msgid "Armenian (phonetic)"
+msgstr "아르메니아(음성 기호)"
 
 #: ../rules/base.xml.in.h:239
-msgid "English (layout toggle on multiply/divide key)"
-msgstr "영어(곱하기/나누기 키에 키보드 배치 토글)"
+msgid "Armenian (alternative phonetic)"
+msgstr "아르메니아(다른 음성 기호)"
 
 #: ../rules/base.xml.in.h:240
-msgid "English (left handed Dvorak)"
-msgstr "영어(왼손잡이 드보락)"
+msgid "Armenian (eastern)"
+msgstr "아르메니아(동부)"
 
 #: ../rules/base.xml.in.h:241
-msgid "English (programmer Dvorak)"
-msgstr "영어(프로그래머 드보락)"
+msgid "Armenian (western)"
+msgstr "아르메니아(서부)"
 
 #: ../rules/base.xml.in.h:242
-msgid "English (right handed Dvorak)"
-msgstr "영어(오른손잡이 드보락)"
-
-#: ../rules/base.xml.in.h:243
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "Armenian (alternative eastern)"
+msgstr "아르메니아(다른 동부)"
 
-#: ../rules/base.xml.in.h:244
-msgid "Enter on keypad"
-msgstr "키패드에 Enter"
+#. Keyboard indicator for German layouts
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
+msgid "de"
+msgstr "de"
 
 #: ../rules/base.xml.in.h:245
-msgid "Esperanto"
-msgstr "에스페란토"
+msgid "German (Austria)"
+msgstr "독일어(오스트리아)"
 
 #: ../rules/base.xml.in.h:246
-msgid "Esperanto (Portugal, Nativo)"
-msgstr "에스페란토(포르투갈, 네이티브)"
+msgid "German (legacy)"
+msgstr "독일어(구형)"
 
 #: ../rules/base.xml.in.h:247
-msgid "Esperanto (displaced semicolon and quote, obsolete)"
-msgstr "에스페란토(세미콜론과 따옴표 없애기, 없어진 기능)"
+msgid "German (Austria, eliminate dead keys)"
+msgstr "독일어(오스트리아, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:248
-msgid "Estonian"
-msgstr "에스토니아어"
+msgid "German (Austria, Sun dead keys)"
+msgstr "독일어(오스트리아, 썬 데드키)"
 
 #: ../rules/base.xml.in.h:249
-msgid "Estonian (Dvorak)"
-msgstr "에스토니아어(드보락)"
-
-#: ../rules/base.xml.in.h:250
-msgid "Estonian (US keyboard with Estonian letters)"
-msgstr "에스토니아어(미국식 키보드, 에스토니아 문자 포함)"
+msgid "German (Austria, Macintosh)"
+msgstr "독일어(오스트리아, 매킨토시)"
 
+#. Keyboard indicator for Azerbaijani layouts
 #: ../rules/base.xml.in.h:251
-msgid "Estonian (eliminate dead keys)"
-msgstr "에스토니아어(데드키 없음)"
+msgid "az"
+msgstr "az"
 
 #: ../rules/base.xml.in.h:252
-msgid "Euro on 2"
-msgstr "유로를 2 키에"
+msgid "Azerbaijani"
+msgstr "아제르바이잔어"
 
 #: ../rules/base.xml.in.h:253
-msgid "Euro on 4"
-msgstr "유로를 4 키에"
-
-#: ../rules/base.xml.in.h:254
-msgid "Euro on 5"
-msgstr "유로를 5 키에"
+msgid "Azerbaijani (Cyrillic)"
+msgstr "아제르바이잔어(키릴 문자)"
 
+#. Keyboard indicator for Belarusian layouts
 #: ../rules/base.xml.in.h:255
-msgid "Euro on E"
-msgstr "유로를 E 키에"
+msgid "by"
+msgstr "by"
 
 #: ../rules/base.xml.in.h:256
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "Belarusian"
+msgstr "벨라루스어"
 
-# 가나 부족어
 #: ../rules/base.xml.in.h:257
-msgid "Ewe"
-msgstr "에베어"
+msgid "Belarusian (legacy)"
+msgstr "벨라루시아어(구형)"
 
 #: ../rules/base.xml.in.h:258
-msgid "FL90"
-msgstr "FL90"
-
-#: ../rules/base.xml.in.h:259
-msgid "Faroese"
-msgstr "페로어"
+msgid "Belarusian (Latin)"
+msgstr "벨라루스어(라틴)"
 
-#: ../rules/base.xml.in.h:260
-msgid "Faroese (eliminate dead keys)"
-msgstr "페로어(데드키 없음)"
+#. Keyboard indicator for Belgian layouts
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
+msgid "be"
+msgstr "be"
 
-#: ../rules/base.xml.in.h:261
-msgid "Filipino"
-msgstr "필리핀어"
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
+msgid "Belgian"
+msgstr "벨기에어"
 
 #: ../rules/base.xml.in.h:262
-msgid "Filipino (Capewell-Dvorak Baybayin)"
-msgstr "필리핀어(케이프웰 드보락 베이베이인)"
+msgid "Belgian (alternative)"
+msgstr "벨기에어(다른 버전)"
 
 #: ../rules/base.xml.in.h:263
-msgid "Filipino (Capewell-Dvorak Latin)"
-msgstr "필리핀어(케이프웰 드보락 라틴)"
+msgid "Belgian (alternative, latin-9 only)"
+msgstr "벨기에어(다른 버전, latin-9 전용)"
 
 #: ../rules/base.xml.in.h:264
-msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
-msgstr "필리핀어(케이프웰 QWERF 2006 베이베이인)"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "벨기에어(다른 버전, 썬 데드키)"
 
 #: ../rules/base.xml.in.h:265
-msgid "Filipino (Capewell-QWERF 2006 Latin)"
-msgstr "필리핀어(케이프웰 QWERF 2006 라틴)"
+msgid "Belgian (ISO alternate)"
+msgstr "벨기에어(ISO 다른 버전)"
 
-# Colemak: 상표명
 #: ../rules/base.xml.in.h:266
-msgid "Filipino (Colemak Baybayin)"
-msgstr "필리핀어(Colemak 베이베이인)"
+msgid "Belgian (eliminate dead keys)"
+msgstr "벨기에어(데드키 없음)"
 
-# Colemak: 상표명
 #: ../rules/base.xml.in.h:267
-msgid "Filipino (Colemak Latin)"
-msgstr "필리핀어(Colemak 라틴)"
+msgid "Belgian (Sun dead keys)"
+msgstr "벨기에어(썬 데드키)"
 
-# Colemak: 상표명
 #: ../rules/base.xml.in.h:268
-msgid "Filipino (Dvorak Baybayin)"
-msgstr "필리핀어(드보락 베이베이인)"
-
-#: ../rules/base.xml.in.h:269
-msgid "Filipino (Dvorak Latin)"
-msgstr "필리핀어(드보락 라틴)"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "벨기에어(Wang model 724 AZERTY)"
 
+#. Keyboard indicator for Bengali layouts
 #: ../rules/base.xml.in.h:270
-msgid "Filipino (QWERTY Baybayin)"
-msgstr "필리핀어(QWERTY 베이베이인)"
+msgid "bn"
+msgstr "bn"
 
 #: ../rules/base.xml.in.h:271
-msgid "Finnish"
-msgstr "핀란드어"
+msgid "Bengali"
+msgstr "벵골어"
 
 #: ../rules/base.xml.in.h:272
-msgid "Finnish (Macintosh)"
-msgstr "핀란드어(매킨토시)"
-
-#: ../rules/base.xml.in.h:273
-msgid "Finnish (classic)"
-msgstr "핀란드어(클래식)"
+msgid "Bengali (Probhat)"
+msgstr "벵골어(프롭해트)"
 
+#. Keyboard indicator for Indian layouts
 #: ../rules/base.xml.in.h:274
-msgid "Finnish (classic, eliminate dead keys)"
-msgstr "핀란드어(클래식, 데드키 없음)"
+msgid "in"
+msgstr "in"
+
+#: ../rules/base.xml.in.h:275
+msgid "Indian"
+msgstr "인도"
+
+#: ../rules/base.xml.in.h:276
+msgid "Bengali (India)"
+msgstr "벵골어(인도)"
 
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:277
-msgid "Four-level key with abstract separators"
-msgstr "네번째 단계, 가상 구분 문자 사용"
+msgid "Bengali (India, Probhat)"
+msgstr "벵골어(인도, 프롭해트)"
 
 #: ../rules/base.xml.in.h:278
-msgid "Four-level key with comma"
-msgstr "네번째 단계, 쉼표 사용"
+msgid "Bengali (India, Baishakhi)"
+msgstr "벵골어(인도, 바이샤키)"
 
 #: ../rules/base.xml.in.h:279
-msgid "Four-level key with dot"
-msgstr "네번째 단계, 점 사용"
+msgid "Bengali (India, Bornona)"
+msgstr "벵골어(인도, 보르노나)"
 
 #: ../rules/base.xml.in.h:280
-msgid "Four-level key with dot, latin-9 restriction"
-msgstr "네번째 단계, 점 사용, latin-9 제한 사항"
+msgid "Bengali (India, Uni Gitanjali)"
+msgstr "벵골어(인도, 유니 기탄잘리)"
 
-# momayyez: http://en.wikipedia.org/wiki/Momayyez
+# inscript - 인도 키보드 표준
 #: ../rules/base.xml.in.h:281
-msgid "Four-level key with momayyez"
-msgstr "네번째 단계, 아랍식 쉼표 (momayyez) 사용"
-
-#: ../rules/base.xml.in.h:282
-msgid "French"
-msgstr "프랑스어"
+msgid "Bengali (India, Baishakhi Inscript)"
+msgstr "벵골어(인도, 바이샤키 인스크립트)"
 
+#. Keyboard indicator for Gujarati layouts
 #: ../rules/base.xml.in.h:283
-msgid "French (Bepo, ergonomic, Dvorak way)"
-msgstr "프랑스어(Bepo, ergonomic, 드보락 방식)"
+msgid "gu"
+msgstr "gu"
 
 #: ../rules/base.xml.in.h:284
-msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
-msgstr "프랑스어(Bepo, ergonomic, 드보락 방식, latin-9 전용)"
-
-# 브르타뉴어 - 프랑스 지방 언어
-#: ../rules/base.xml.in.h:285
-msgid "French (Breton)"
-msgstr "프랑스어(브르타뉴어)"
+msgid "Gujarati"
+msgstr "구자라트어"
 
+#. Keyboard indicator for Punjabi layouts
 #: ../rules/base.xml.in.h:286
-msgid "French (Cameroon)"
-msgstr "프랑스어(카메룬)"
+msgid "pa"
+msgstr "pa"
 
-#: ../rules/base.xml.in.h:287 ../rules/base.extras.xml.in.h:12
-msgid "French (Canada)"
-msgstr "프랑스어(캐나다)"
+#: ../rules/base.xml.in.h:287
+msgid "Punjabi (Gurmukhi)"
+msgstr "펀자브어(구르무키 문자)"
 
+# 젤룸 - 파키스탄 지역
 #: ../rules/base.xml.in.h:288
-msgid "French (Canada, Dvorak)"
-msgstr "프랑스어(캐나다, 드보락)"
-
-#: ../rules/base.xml.in.h:289
-msgid "French (Canada, legacy)"
-msgstr "프랑스어(캐나다, 구형)"
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "펀자브어(구르무키 문자, 젤룸)"
 
+#. Keyboard indicator for Kannada layouts
 #: ../rules/base.xml.in.h:290
-msgid "French (Democratic Republic of the Congo)"
-msgstr "프랑스어(콩고 민주 공화국)"
+msgid "kn"
+msgstr "kn"
 
 #: ../rules/base.xml.in.h:291
-msgid "French (Dvorak)"
-msgstr "프랑스어(드보락)"
-
-#: ../rules/base.xml.in.h:292
-msgid "French (Guinea)"
-msgstr "프랑스어(기니)"
+msgid "Kannada"
+msgstr "칸나다어"
 
+#. Keyboard indicator for Malayalam layouts
 #: ../rules/base.xml.in.h:293
-msgid "French (Macintosh)"
-msgstr "프랑스어(매킨토시)"
+msgid "ml"
+msgstr "ml"
 
 #: ../rules/base.xml.in.h:294
-msgid "French (Mali, alternative)"
-msgstr "프랑스어(말리, 다른 버전)"
+msgid "Malayalam"
+msgstr "말라얄람어"
 
 #: ../rules/base.xml.in.h:295
-msgid "French (Morocco)"
-msgstr "프랑스어(모로코)"
+msgid "Malayalam (Lalitha)"
+msgstr "말라얄람어(라리타)"
 
 #: ../rules/base.xml.in.h:296
-msgid "French (Sun dead keys)"
-msgstr "프랑스어(썬 데드키)"
-
-#: ../rules/base.xml.in.h:297
-msgid "French (Switzerland)"
-msgstr "프랑스어(스위스)"
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgstr "말라얄람어(발전된 Inscript, 루피 기호 포함)"
 
+#. Keyboard indicator for Oriya layouts
 #: ../rules/base.xml.in.h:298
-msgid "French (Switzerland, Macintosh)"
-msgstr "프랑스어(스위스, 매킨토시)"
+msgid "or"
+msgstr "or"
 
+# Oriya - 인도 방언
 #: ../rules/base.xml.in.h:299
-msgid "French (Switzerland, Sun dead keys)"
-msgstr "프랑스어(스위스, 썬 데드키)"
-
-#: ../rules/base.xml.in.h:300
-msgid "French (Switzerland, eliminate dead keys)"
-msgstr "프랑스어(스위스, 데드키 없음)"
+msgid "Oriya"
+msgstr "오리야어"
 
+#. Keyboard indicator for Tamil layouts
 #: ../rules/base.xml.in.h:301
-msgid "French (alternative)"
-msgstr "프랑스어(다른 버전)"
+msgid "ta"
+msgstr "ta"
 
 #: ../rules/base.xml.in.h:302
-msgid "French (alternative, Sun dead keys)"
-msgstr "프랑스어(다른 버전, 썬 데드키)"
+msgid "Tamil (Unicode)"
+msgstr "타밀어(유니코드)"
 
 #: ../rules/base.xml.in.h:303
-msgid "French (alternative, eliminate dead keys)"
-msgstr "프랑스어(다른 버전, 데드키 없음)"
+msgid "Tamil (keyboard with numerals)"
+msgstr "타밀어(숫자 포함 키보드)"
 
 #: ../rules/base.xml.in.h:304
-msgid "French (alternative, latin-9 only)"
-msgstr "프랑스어(다른 버전, latin-9 전용)"
+msgid "Tamil (TAB typewriter)"
+msgstr "타밀어(TAB 타자기)"
 
 #: ../rules/base.xml.in.h:305
-msgid "French (eliminate dead keys)"
-msgstr "프랑스어(데드키 없음)"
+msgid "Tamil (TSCII typewriter)"
+msgstr "타밀어(TSCII 타자기)"
 
 #: ../rules/base.xml.in.h:306
-msgid "French (legacy, alternative)"
-msgstr "프랑스어(구형, 다른 버전)"
-
-#: ../rules/base.xml.in.h:307
-msgid "French (legacy, alternative, Sun dead keys)"
-msgstr "프랑스어(구형, 다른 버전, 썬 데드키)"
+msgid "Tamil"
+msgstr "타밀어"
 
+#. Keyboard indicator for Telugu layouts
 #: ../rules/base.xml.in.h:308
-msgid "French (legacy, alternative, eliminate dead keys)"
-msgstr "프랑스어(구형, 다른 버전, 데드키 없음)"
+msgid "te"
+msgstr "te"
 
 #: ../rules/base.xml.in.h:309
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr "후지스-지멘스 컴퓨터 AMILO 노트북"
-
-#: ../rules/base.xml.in.h:310
-msgid "Fula"
-msgstr "풀라"
+msgid "Telugu"
+msgstr "텔루구어"
 
-# 가나의 언어
+#. Keyboard indicator for Urdu layouts
 #: ../rules/base.xml.in.h:311
-msgid "Ga"
-msgstr "가어"
+msgid "ur"
+msgstr "ur"
 
+# Urdu - 인도 방언
 #: ../rules/base.xml.in.h:312
-msgid "Generic 101-key PC"
-msgstr "일반 101키 PC"
+msgid "Urdu (phonetic)"
+msgstr "우르두어(음성 표기)"
 
+# Urdu, 인도 방언
 #: ../rules/base.xml.in.h:313
-msgid "Generic 102-key (Intl) PC"
-msgstr "일반 102키(국제 버전) PC"
+msgid "Urdu (alternative phonetic)"
+msgstr "우르두어(다른 음성 기호 버전)"
 
+# Urdu - 인도 방언
 #: ../rules/base.xml.in.h:314
-msgid "Generic 104-key PC"
-msgstr "일반 104키 PC"
-
-#: ../rules/base.xml.in.h:315
-msgid "Generic 105-key (Intl) PC"
-msgstr "일반 105키(국제 버전) PC"
+msgid "Urdu (WinKeys)"
+msgstr "우르두어(윈도우 키)"
 
+#. Keyboard indicator for Hindi layouts
 #: ../rules/base.xml.in.h:316
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+msgid "hi"
+msgstr "hi"
 
+# Bolnagri: x input method 이름, http://indlinux.org/wiki/index.php/BolNagri
 #: ../rules/base.xml.in.h:317
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgid "Hindi (Bolnagri)"
+msgstr "힌두어(Bolnagri)"
 
 #: ../rules/base.xml.in.h:318
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "Hindi (Wx)"
+msgstr "힌두어(Wx)"
 
 #: ../rules/base.xml.in.h:319
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
-
-#: ../rules/base.xml.in.h:320
-msgid "Genius KKB-2050HS"
-msgstr "Genius KKB-2050HS"
+msgid "English (India, with RupeeSign)"
+msgstr "영어(인도, 루피 기호 포함)"
 
+#. Keyboard indicator for Bosnian layouts
 #: ../rules/base.xml.in.h:321
-msgid "Georgian"
-msgstr "조지아어"
+msgid "bs"
+msgstr "bs"
 
 #: ../rules/base.xml.in.h:322
-msgid "Georgian (France, AZERTY Tskapo)"
-msgstr "조지아어(프랑스, AZERTY Tskapo)"
+msgid "Bosnian"
+msgstr "보스니아어"
 
-# 오세트 - 러시아 및 조지아 지역 오세트족
 #: ../rules/base.xml.in.h:323
-msgid "Georgian (Italy)"
-msgstr "조지아어(이탈리아)"
+msgid "Bosnian (use guillemets for quotes)"
+msgstr "보스니아어(따옴표에 각괄호 사용)"
 
 #: ../rules/base.xml.in.h:324
-msgid "Georgian (MESS)"
-msgstr "조지아어(MESS)"
+msgid "Bosnian (use Bosnian digraphs)"
+msgstr "보스니아어(보스니아 이중 문자 사용)"
 
 #: ../rules/base.xml.in.h:325
-msgid "Georgian (ergonomic)"
-msgstr "조지아어(어고노믹)"
-
-#: ../rules/base.xml.in.h:326 ../rules/base.extras.xml.in.h:13
-msgid "German"
-msgstr "독일어"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "보스니아어(미국식 키보드, 보스니아 이중 문자 포함)"
 
-#: ../rules/base.xml.in.h:327
-msgid "German (Austria)"
-msgstr "독일어(오스트리아)"
+#: ../rules/base.xml.in.h:326
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "보스니아어(미국식 키보드, 보스니아 문자 포함)"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (Austria, Macintosh)"
-msgstr "독일어(오스트리아, 매킨토시)"
+#. Keyboard indicator for Portuguese layouts
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
+msgid "pt"
+msgstr "pt"
 
-#: ../rules/base.xml.in.h:329
-msgid "German (Austria, Sun dead keys)"
-msgstr "독일어(오스트리아, 썬 데드키)"
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
+msgid "Portuguese (Brazil)"
+msgstr "포르투갈어(브라질)"
 
 #: ../rules/base.xml.in.h:330
-msgid "German (Austria, eliminate dead keys)"
-msgstr "독일어(오스트리아, 데드키 없음)"
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "포르투갈어(브라질, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:331
-msgid "German (Dvorak)"
-msgstr "독일어(드보락)"
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "포르투갈어(브라질, 드보락)"
 
+# 나티보 - 아메리카 소수 언어
 #: ../rules/base.xml.in.h:332
-msgid "German (Macintosh)"
-msgstr "독일어(매킨토시)"
+msgid "Portuguese (Brazil, nativo)"
+msgstr "포르투갈어(브라질, 나티보)"
 
+# 나티보 - 아메리카 소수 언어
 #: ../rules/base.xml.in.h:333
-msgid "German (Macintosh, eliminate dead keys)"
-msgstr "독일어(매킨토시, 데드키 없음)"
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgstr "포르투갈어(브라질, 미국 키보드 나티보)"
 
+# 나티보 - 아메리카 소수 언어
 #: ../rules/base.xml.in.h:334
-msgid "German (Neo 2)"
-msgstr "독일어(Neo 2)"
-
-#: ../rules/base.xml.in.h:335
-msgid "German (Sun dead keys)"
-msgstr "독일어(썬 데드키)"
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "포르투갈어(브라질, 에스페란토 나티보)"
 
+#. Keyboard indicator for Bulgarian layouts
 #: ../rules/base.xml.in.h:336
-msgid "German (Switzerland)"
-msgstr "독일어(스위스)"
+msgid "bg"
+msgstr "bg"
 
 #: ../rules/base.xml.in.h:337
-msgid "German (Switzerland, Macintosh)"
-msgstr "독일어(스위스, 매킨토시)"
+msgid "Bulgarian"
+msgstr "불가리아어"
 
 #: ../rules/base.xml.in.h:338
-msgid "German (Switzerland, Sun dead keys)"
-msgstr "독일어(스위스, 썬 데드키)"
+msgid "Bulgarian (traditional phonetic)"
+msgstr "불가리아어(구식 음성 기호)"
 
 #: ../rules/base.xml.in.h:339
-msgid "German (Switzerland, eliminate dead keys)"
-msgstr "독일어(스위스, 데드키 없음)"
+msgid "Bulgarian (new phonetic)"
+msgstr "불가리아어(새 음성 기호)"
 
 #: ../rules/base.xml.in.h:340
-msgid "German (Switzerland, legacy)"
-msgstr "독일어(스위스, 구형)"
-
-#: ../rules/base.xml.in.h:341
-msgid "German (dead acute)"
-msgstr "독일어(어큐트 데드키)"
+msgid "Arabic (Morocco)"
+msgstr "아랍어(모로코)"
 
-#: ../rules/base.xml.in.h:342
-msgid "German (dead grave acute)"
-msgstr "독일어(그레이브 어큐트 데드키)"
+#. Keyboard indicator for French layouts
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
+msgid "fr"
+msgstr "fr"
 
 #: ../rules/base.xml.in.h:343
-msgid "German (eliminate dead keys)"
-msgstr "독일어(데드키 없음)"
-
-#: ../rules/base.xml.in.h:344
-msgid "German (qwerty)"
-msgstr "독일어(QWERTY)"
+msgid "French (Morocco)"
+msgstr "프랑스어(모로코)"
 
+#. Keyboard indicator for Berber layouts
 #: ../rules/base.xml.in.h:345
-msgid "Greek"
-msgstr "그리스어"
+msgid "ber"
+msgstr "ber"
 
+# 베르베르어파
 #: ../rules/base.xml.in.h:346
-msgid "Greek (eliminate dead keys)"
-msgstr "그리스어(데드키 없음)"
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "베르베르어(모로코, 티피나그)"
 
+# 베르베르어파
 #: ../rules/base.xml.in.h:347
-msgid "Greek (extended)"
-msgstr "그리스어(확장)"
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "베르베르어(모로코, 티피나그 다른 버전)"
 
-# 그리스어 발음 표기 http://en.wikipedia.org/wiki/Polytonic_orthography
+# 베르베르어파
 #: ../rules/base.xml.in.h:348
-msgid "Greek (polytonic)"
-msgstr "그리스어(폴리토닉)"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "베르베르어(모로코, 티피나그 다른 음성 기호 버전)"
 
+# 베르베르어파
 #: ../rules/base.xml.in.h:349
-msgid "Greek (simple)"
-msgstr "그리스어(간단)"
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "베르베르어(모로코, 티피나그 확장)"
 
+# 베르베르어파
 #: ../rules/base.xml.in.h:350
-msgid "Gujarati"
-msgstr "구자라트어"
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "베르베르어(모로코, 티피나그 음성 기호)"
 
-# 제조사 이름
+# 베르베르어파
 #: ../rules/base.xml.in.h:351
-msgid "Gyration"
-msgstr "Gyration"
-
-#: ../rules/base.xml.in.h:352
-msgid "HTC Dream"
-msgstr "HTC 드림"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "베르베르어(모로코, 티피나그 확장 음성 기호)"
 
+#. Keyboard indicator for Cameroon layouts
 #: ../rules/base.xml.in.h:353
-msgid "Happy Hacking Keyboard"
-msgstr "해피해킹 키보드"
+msgid "cm"
+msgstr "cm"
 
 #: ../rules/base.xml.in.h:354
-msgid "Happy Hacking Keyboard for Mac"
-msgstr "해피해킹 키보드, 맥용"
+msgid "English (Cameroon)"
+msgstr "영어(카메룬)"
 
-# 나이지리아 변종
 #: ../rules/base.xml.in.h:355
-msgid "Hausa"
-msgstr "하우사어"
+msgid "French (Cameroon)"
+msgstr "프랑스어(카메룬)"
 
 #: ../rules/base.xml.in.h:356
-msgid "Hebrew"
-msgstr "히브리어"
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "카메룬 여러 언어 지원(QWERTY)"
 
 #: ../rules/base.xml.in.h:357
-msgid "Hebrew (Biblical, Tiro)"
-msgstr "히브리어(성서 방식, Tiro)"
+msgid "Cameroon Multilingual (azerty)"
+msgstr "카메룬 여러 언어 지원(AZERTY)"
 
 #: ../rules/base.xml.in.h:358
-msgid "Hebrew (lyx)"
-msgstr "히브리어(lyx)"
-
-#: ../rules/base.xml.in.h:359
-msgid "Hebrew (phonetic)"
-msgstr "히브리어(음성 표기)"
+msgid "Cameroon Multilingual (Dvorak)"
+msgstr "카메룬 여러 언어 지원(드보락)"
 
+#. Keyboard indicator for Burmese layouts
 #: ../rules/base.xml.in.h:360
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "휴렛팩커드 인터넷 키보드"
+msgid "my"
+msgstr "my"
 
 #: ../rules/base.xml.in.h:361
-msgid "Hewlett-Packard Mini 110 Notebook"
-msgstr "휴렛팩커드 Mini 110 Notebook"
+msgid "Burmese"
+msgstr "미얀마어"
 
-#: ../rules/base.xml.in.h:362
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "휴렛팩커드 Omnibook 500 FA"
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
+msgid "French (Canada)"
+msgstr "프랑스어(캐나다)"
 
 #: ../rules/base.xml.in.h:363
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "휴렛팩커드 Omnibook 5xx"
+msgid "French (Canada, Dvorak)"
+msgstr "프랑스어(캐나다, 드보락)"
 
 #: ../rules/base.xml.in.h:364
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "휴렛팩커드 Omnibook 6000/6100"
+msgid "French (Canada, legacy)"
+msgstr "프랑스어(캐나다, 구형)"
 
 #: ../rules/base.xml.in.h:365
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "휴렛팩커드 Omnibook XE3 GC"
+msgid "Canadian Multilingual"
+msgstr "캐나다 여러 언어 지원"
 
 #: ../rules/base.xml.in.h:366
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "휴렛팩커드 Omnibook XE3 GF"
+msgid "Canadian Multilingual (first part)"
+msgstr "캐나다 여러 언어 지원(첫번째)"
 
 #: ../rules/base.xml.in.h:367
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "휴렛팩커드 Omnibook XT1000"
-
-#: ../rules/base.xml.in.h:368
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "휴렛팩커드 Pavilion ZT11xx"
+msgid "Canadian Multilingual (second part)"
+msgstr "캐나다 여러 언어 지원(두번째)"
 
+#. Keyboard indicator for Inuktikut layouts
 #: ../rules/base.xml.in.h:369
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr "휴렛팩커드 Pavilion dv5"
+msgid "ike"
+msgstr "ike"
 
 #: ../rules/base.xml.in.h:370
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr "휴렛팩커드 SK-250x 멀티미디어 키보드"
+msgid "Inuktitut"
+msgstr "이누이트어"
 
 #: ../rules/base.xml.in.h:371
-msgid "Hewlett-Packard nx9020"
-msgstr "휴렛팩커드 nx9020"
+msgid "English (Canada)"
+msgstr "영어(캐나다)"
 
 #: ../rules/base.xml.in.h:372
-msgid "Hexadecimal"
-msgstr "십육진법"
-
-# Bolnagri: x input method 이름, http://indlinux.org/wiki/index.php/BolNagri
-#: ../rules/base.xml.in.h:373
-msgid "Hindi (Bolnagri)"
-msgstr "힌두어(Bolnagri)"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "프랑스어(콩고 민주 공화국)"
 
+#. Keyboard indicator for Taiwanese layouts
 #: ../rules/base.xml.in.h:374
-msgid "Hindi (Wx)"
-msgstr "힌두어(Wx)"
+msgid "zh"
+msgstr "zh"
 
 #: ../rules/base.xml.in.h:375
-msgid "Honeywell Euroboard"
-msgstr "하니웰 Euroboard"
+msgid "Chinese"
+msgstr "중국어"
 
 #: ../rules/base.xml.in.h:376
-msgid "Htc Dream phone"
-msgstr "HTC 드림 휴대전화"
+msgid "Tibetan"
+msgstr "티베트어"
 
 #: ../rules/base.xml.in.h:377
-msgid "Hungarian"
-msgstr "헝가리어"
+msgid "Tibetan (with ASCII numerals)"
+msgstr "티베트어(ASCII 숫자 포함)"
 
 #: ../rules/base.xml.in.h:378
-msgid "Hungarian (101/qwerty/comma/dead keys)"
-msgstr "헝가리어(101/QWERTY/쉼표/데드키)"
-
-#: ../rules/base.xml.in.h:379
-msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
-msgstr "헝가리어(101/QWERTY/쉼표/데드키 없음)"
+msgid "Uyghur"
+msgstr "위구르어"
 
+#. Keyboard indicator for Croatian layouts
 #: ../rules/base.xml.in.h:380
-msgid "Hungarian (101/qwerty/dot/dead keys)"
-msgstr "헝가리어(101/QWERTY/점/데드키)"
+msgid "hr"
+msgstr "hr"
 
 #: ../rules/base.xml.in.h:381
-msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
-msgstr "헝가리어(101/QWERTY/점/데드키 없음)"
+msgid "Croatian"
+msgstr "크로아티아어"
 
 #: ../rules/base.xml.in.h:382
-msgid "Hungarian (101/qwertz/comma/dead keys)"
-msgstr "헝가리어(101/QWERTZ/쉼표/데드키)"
+msgid "Croatian (use guillemets for quotes)"
+msgstr "크로아티아어(따옴표에 각괄호 사용)"
 
 #: ../rules/base.xml.in.h:383
-msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
-msgstr "헝가리어(101/QWERTZ/쉼표/데드키 없음0"
+msgid "Croatian (use Croatian digraphs)"
+msgstr "크로아티아어(크로아티아 이중 문자 사용)"
 
 #: ../rules/base.xml.in.h:384
-msgid "Hungarian (101/qwertz/dot/dead keys)"
-msgstr "헝가리어(101/QWERTZ/점/데드키)"
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "크로아티아어(미국식 키보드, 크로아티아 이중 문자 포함)"
 
 #: ../rules/base.xml.in.h:385
-msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
-msgstr "헝가리어(101/QWERTZ/점/데드키 없음)"
-
-#: ../rules/base.xml.in.h:386
-msgid "Hungarian (102/qwerty/comma/dead keys)"
-msgstr "헝가리어(102/QWERTY/쉼표/데드키)"
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "크로아티아어(미국식 키보드, 크로아티아 문자 포함)"
 
-#: ../rules/base.xml.in.h:387
-msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
-msgstr "헝가리어(102/QWERTY/쉼표/데드키 없음)"
+#. Keyboard indicator for Chech layouts
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
+msgid "cs"
+msgstr "cs"
 
-#: ../rules/base.xml.in.h:388
-msgid "Hungarian (102/qwerty/dot/dead keys)"
-msgstr "헝가리어(102/QWERTY/점/데드키)"
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
+msgid "Czech"
+msgstr "체코어"
 
 #: ../rules/base.xml.in.h:389
-msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
-msgstr "헝가리어(102/QWERTY/점/데드키 없음)"
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "체코어(&lt;\\|&gt; 키 포함)"
 
 #: ../rules/base.xml.in.h:390
-msgid "Hungarian (102/qwertz/comma/dead keys)"
-msgstr "헝가리어(102/QWERTZ/쉼표/데드키)"
+msgid "Czech (qwerty)"
+msgstr "체코어(QWERTY)"
 
 #: ../rules/base.xml.in.h:391
-msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
-msgstr "헝가리어(102/QWERTZ/쉼표/데드키 없음)"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "체코어(QWERTY, 백슬래시 확장)"
 
 #: ../rules/base.xml.in.h:392
-msgid "Hungarian (102/qwertz/dot/dead keys)"
-msgstr "헝가리어(102/QWERTZ/점/데드키)"
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "체코어(UCW 배치, 액센트 문자만)"
 
 #: ../rules/base.xml.in.h:393
-msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
-msgstr "헝가리어(102/QWERTZ/점/데드키 없음)"
-
-#: ../rules/base.xml.in.h:394
-msgid "Hungarian (eliminate dead keys)"
-msgstr "헝가리어(데드키 없음)"
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "체코어(US 드보락, CZ UCW 지원)"
 
-#: ../rules/base.xml.in.h:395
-msgid "Hungarian (qwerty)"
-msgstr "헝가리어(QWERTY)"
+#. Keyboard indicator for Danish layouts
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
+msgid "da"
+msgstr "da"
 
-#: ../rules/base.xml.in.h:396
-msgid "Hungarian (standard)"
-msgstr "헝가리어(표준)"
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
+msgid "Danish"
+msgstr "덴마크어"
 
 #: ../rules/base.xml.in.h:397
-msgid "Hyper is mapped to Win-keys"
-msgstr "Hyper 키를 윈도우 키로 매핑"
+msgid "Danish (eliminate dead keys)"
+msgstr "덴마크어(데드키 없음)"
 
 #: ../rules/base.xml.in.h:398
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
+msgid "Danish (Macintosh)"
+msgstr "덴마크어(매킨토시)"
 
 #: ../rules/base.xml.in.h:399
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "덴마크어(매킨토시, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:400
-msgid "IBM Space Saver"
-msgstr "IBM Space Saver"
-
-#: ../rules/base.xml.in.h:401
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "Danish (Dvorak)"
+msgstr "덴마크어(드보락)"
 
-#: ../rules/base.xml.in.h:402
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr "IBM ThinkPad R60/T60/R61/T61"
+#. Keyboard indicator for Dutch layouts
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
+msgid "nl"
+msgstr "nl"
 
-#: ../rules/base.xml.in.h:403
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
+msgid "Dutch"
+msgstr "네덜란드어"
 
 #: ../rules/base.xml.in.h:404
-msgid "Icelandic"
-msgstr "아이슬란드어"
+msgid "Dutch (Sun dead keys)"
+msgstr "네덜란드어(썬 데드키)"
 
 #: ../rules/base.xml.in.h:405
-msgid "Icelandic (Dvorak)"
-msgstr "아이슬란드어(드보락)"
+msgid "Dutch (Macintosh)"
+msgstr "네덜란드어(매킨토시)"
 
 #: ../rules/base.xml.in.h:406
-msgid "Icelandic (Macintosh)"
-msgstr "아이슬란드어(매킨토시)"
-
-#: ../rules/base.xml.in.h:407
-msgid "Icelandic (Sun dead keys)"
-msgstr "아이슬란드어(썬 데드키)"
+msgid "Dutch (standard)"
+msgstr "네덜란드어(표준)"
 
+#. Keyboard indicator for Dzongkha layouts
 #: ../rules/base.xml.in.h:408
-msgid "Icelandic (eliminate dead keys)"
-msgstr "아이슬란드어(데드키 없음)"
+msgid "dz"
+msgstr "dz"
 
-# 나이지리아 변종
 #: ../rules/base.xml.in.h:409
-msgid "Igbo"
-msgstr "이그보어"
-
-#: ../rules/base.xml.in.h:410
-msgid "Indian"
-msgstr "인도"
+msgid "Dzongkha"
+msgstr "종카어"
 
-#: ../rules/base.xml.in.h:411
-msgid "Inuktitut"
-msgstr "이누이트어"
+#. Keyboard indicator for Estonian layouts
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
+msgid "et"
+msgstr "et"
 
-#: ../rules/base.xml.in.h:412
-msgid "Iraqi"
-msgstr "이라크"
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
+msgid "Estonian"
+msgstr "에스토니아어"
 
 #: ../rules/base.xml.in.h:413
-msgid "Irish"
-msgstr "아일랜드"
+msgid "Estonian (eliminate dead keys)"
+msgstr "에스토니아어(데드키 없음)"
 
 #: ../rules/base.xml.in.h:414
-msgid "Irish (UnicodeExpert)"
-msgstr "아일랜드(UnicodeExpert)"
+msgid "Estonian (Dvorak)"
+msgstr "에스토니아어(드보락)"
 
 #: ../rules/base.xml.in.h:415
-msgid "Italian"
-msgstr "이탈리아어"
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "에스토니아어(미국식 키보드, 에스토니아 문자 포함)"
 
-#: ../rules/base.xml.in.h:416
-msgid "Italian (Macintosh)"
-msgstr "이탈리아어(매킨토시)"
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
+msgid "Persian"
+msgstr "페르시아어"
 
 #: ../rules/base.xml.in.h:417
-msgid "Italian (US keyboard with Italian letters)"
-msgstr "이탈리아어(미국식 키보드, 이탈리아어 문자 포함)"
-
-#: ../rules/base.xml.in.h:418
-msgid "Italian (eliminate dead keys)"
-msgstr "이탈리아어(데드키 없음)"
+msgid "Persian (with Persian Keypad)"
+msgstr "페르시아어(페르시아어 키패드 포함)"
 
+#. Keyboard indicator for Kurdish layouts
 #: ../rules/base.xml.in.h:419
-msgid "Japanese"
-msgstr "일본어"
+msgid "ku"
+msgstr "ku"
 
 #: ../rules/base.xml.in.h:420
-msgid "Japanese (Dvorak)"
-msgstr "일본어(드보락)"
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "쿠르드어(이란, 라틴 Q)"
 
 #: ../rules/base.xml.in.h:421
-msgid "Japanese (Kana 86)"
-msgstr "일본어(가나 86)"
+msgid "Kurdish (Iran, F)"
+msgstr "쿠르드어(이란, F)"
 
 #: ../rules/base.xml.in.h:422
-msgid "Japanese (Kana)"
-msgstr "일본어(가나)"
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "쿠르드어(이란, 라틴 Alt-Q)"
 
 #: ../rules/base.xml.in.h:423
-msgid "Japanese (Macintosh)"
-msgstr "일본어(매킨토시)"
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "쿠르드어(이란, 아랍어 라틴)"
 
 #: ../rules/base.xml.in.h:424
-msgid "Japanese (OADG 109A)"
-msgstr "일본어(OADG 109A)"
+msgid "Iraqi"
+msgstr "이라크"
 
 #: ../rules/base.xml.in.h:425
-msgid "Japanese (PC-98xx Series)"
-msgstr "일본어(PC-98xx 시리즈)"
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "쿠르드어(이라크, 라틴 Q)"
 
 #: ../rules/base.xml.in.h:426
-msgid "Japanese keyboard options"
-msgstr "일본어 키보드 옵션"
+msgid "Kurdish (Iraq, F)"
+msgstr "쿠르드어(이라크, F)"
 
 #: ../rules/base.xml.in.h:427
-msgid "Kalmyk"
-msgstr "칼미크어"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "쿠르드어(이라크, 라틴 Alt-Q)"
 
 #: ../rules/base.xml.in.h:428
-msgid "Kana Lock key is locking"
-msgstr "Kana Lock 키 상태 고정"
-
-#: ../rules/base.xml.in.h:429
-msgid "Kannada"
-msgstr "칸나다어"
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "쿠르드어(이라크, 아랍어 라틴)"
 
+#. Keyboard indicator for Faroese layouts
 #: ../rules/base.xml.in.h:430
-msgid "Kashubian"
-msgstr "카슈브어"
+msgid "fo"
+msgstr "fo"
 
 #: ../rules/base.xml.in.h:431
-msgid "Kazakh"
-msgstr "카자흐어"
+msgid "Faroese"
+msgstr "페로어"
 
 #: ../rules/base.xml.in.h:432
-msgid "Kazakh (with Russian)"
-msgstr "카자흐어(러시아어 포함)"
-
-#: ../rules/base.xml.in.h:433
-msgid "Key sequence to kill the X server"
-msgstr "X 서버를 멈추는 키 조합"
+msgid "Faroese (eliminate dead keys)"
+msgstr "페로어(데드키 없음)"
 
-#: ../rules/base.xml.in.h:434
-msgid "Key to choose 3rd level"
-msgstr "3번째 단계를 선택하는 키"
+#. Keyboard indicator for Finnish layouts
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
+msgid "fi"
+msgstr "fi"
 
-#: ../rules/base.xml.in.h:435
-msgid "Key to choose 5th level"
-msgstr "5번째 단계를 선택하는 키"
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
+msgid "Finnish"
+msgstr "핀란드어"
 
 #: ../rules/base.xml.in.h:436
-msgid "Key(s) to change layout"
-msgstr "배치를 전환하는 키"
+msgid "Finnish (classic)"
+msgstr "핀란드어(클래식)"
 
 #: ../rules/base.xml.in.h:437
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Finnish (classic, eliminate dead keys)"
+msgstr "핀란드어(클래식, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:438
-msgid "Khmer (Cambodia)"
-msgstr "크메르어(캄보디아)"
+msgid "Northern Saami (Finland)"
+msgstr "북 사오미(핀란드)"
 
-# http://en.wikipedia.org/wiki/Kikuyu#Language
 #: ../rules/base.xml.in.h:439
-msgid "Kikuyu"
-msgstr "키쿠유어"
+msgid "Finnish (Macintosh)"
+msgstr "핀란드어(매킨토시)"
 
-#: ../rules/base.xml.in.h:440
-msgid "Kinesis"
-msgstr "키네시스"
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
+msgid "French"
+msgstr "프랑스어"
 
 #: ../rules/base.xml.in.h:441
-msgid "Komi"
-msgstr "코미어"
+msgid "French (eliminate dead keys)"
+msgstr "프랑스어(데드키 없음)"
 
 #: ../rules/base.xml.in.h:442
-msgid "Korean"
-msgstr "한국어"
+msgid "French (Sun dead keys)"
+msgstr "프랑스어(썬 데드키)"
 
 #: ../rules/base.xml.in.h:443
-msgid "Korean (101/104 key compatible)"
-msgstr "한국어(101/104키 호환)"
+msgid "French (alternative)"
+msgstr "프랑스어(다른 버전)"
 
 #: ../rules/base.xml.in.h:444
-msgid "Kurdish (Iran, Arabic-Latin)"
-msgstr "쿠르드어(이란, 아랍어 라틴)"
+msgid "French (alternative, latin-9 only)"
+msgstr "프랑스어(다른 버전, latin-9 전용)"
 
 #: ../rules/base.xml.in.h:445
-msgid "Kurdish (Iran, F)"
-msgstr "쿠르드어(이란, F)"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "프랑스어(다른 버전, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:446
-msgid "Kurdish (Iran, Latin Alt-Q)"
-msgstr "쿠르드어(이란, 라틴 Alt-Q)"
+msgid "French (alternative, Sun dead keys)"
+msgstr "프랑스어(다른 버전, 썬 데드키)"
 
 #: ../rules/base.xml.in.h:447
-msgid "Kurdish (Iran, Latin Q)"
-msgstr "쿠르드어(이란, 라틴 Q)"
+msgid "French (legacy, alternative)"
+msgstr "프랑스어(구형, 다른 버전)"
 
 #: ../rules/base.xml.in.h:448
-msgid "Kurdish (Iraq, Arabic-Latin)"
-msgstr "쿠르드어(이라크, 아랍어 라틴)"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "프랑스어(구형, 다른 버전, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:449
-msgid "Kurdish (Iraq, F)"
-msgstr "쿠르드어(이라크, F)"
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "프랑스어(구형, 다른 버전, 썬 데드키)"
 
 #: ../rules/base.xml.in.h:450
-msgid "Kurdish (Iraq, Latin Alt-Q)"
-msgstr "쿠르드어(이라크, 라틴 Alt-Q)"
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "프랑스어(Bepo, ergonomic, 드보락 방식)"
 
 #: ../rules/base.xml.in.h:451
-msgid "Kurdish (Iraq, Latin Q)"
-msgstr "쿠르드어(이라크, 라틴 Q)"
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
+msgstr "프랑스어(Bepo, ergonomic, 드보락 방식, latin-9 전용)"
 
 #: ../rules/base.xml.in.h:452
-msgid "Kurdish (Syria, F)"
-msgstr "쿠르드어(시리아, F)"
+msgid "French (Dvorak)"
+msgstr "프랑스어(드보락)"
 
 #: ../rules/base.xml.in.h:453
-msgid "Kurdish (Syria, Latin Alt-Q)"
-msgstr "쿠르드어(시리아, 라틴 Alt-Q)"
+msgid "French (Macintosh)"
+msgstr "프랑스어(매킨토시)"
 
+# 브르타뉴어 - 프랑스 지방 언어
 #: ../rules/base.xml.in.h:454
-msgid "Kurdish (Syria, Latin Q)"
-msgstr "쿠르드어(시리아, 라틴 Q)"
+msgid "French (Breton)"
+msgstr "프랑스어(브르타뉴어)"
 
 #: ../rules/base.xml.in.h:455
-msgid "Kurdish (Turkey, F)"
-msgstr "쿠르드어(터키, F)"
+msgid "Occitan"
+msgstr "오크어"
 
 #: ../rules/base.xml.in.h:456
-msgid "Kurdish (Turkey, Latin Alt-Q)"
-msgstr "쿠르드어(터키, 라틴 Alt-Q)"
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "조지아어(프랑스, AZERTY Tskapo)"
 
 #: ../rules/base.xml.in.h:457
-msgid "Kurdish (Turkey, Latin Q)"
-msgstr "쿠르드어(터키, 라틴 Q)"
+msgid "English (Ghana)"
+msgstr "영어(가나)"
 
 #: ../rules/base.xml.in.h:458
-msgid "Kyrgyz"
-msgstr "키르기스어"
-
-#: ../rules/base.xml.in.h:459
-msgid "Kyrgyz (phonetic)"
-msgstr "키르기스어(음성 기호)"
+msgid "English (Ghana, multilingual)"
+msgstr "영어(가나, 다국어)"
 
+#. Keyboard indicator for Akan layouts
 #: ../rules/base.xml.in.h:460
-msgid "Lao"
-msgstr "라오어"
+msgid "ak"
+msgstr "ak"
 
 #: ../rules/base.xml.in.h:461
-msgid "Lao (STEA proposed standard layout)"
-msgstr "라오어(STEA 제안 표준 키 배치)"
-
-#: ../rules/base.xml.in.h:462
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "노트북 컴팩(Armada 등) 노트북 키보드"
+msgid "Akan"
+msgstr "아칸"
 
+#. Keyboard indicator for Ewe layouts
 #: ../rules/base.xml.in.h:463
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "노트북 컴팩(Presario 등) 노트북 키보드"
+msgid "ee"
+msgstr "ee"
 
+# 가나 부족어
 #: ../rules/base.xml.in.h:464
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "노트북 컴팩 eMachines m68xx"
-
-#: ../rules/base.xml.in.h:465 ../rules/base.extras.xml.in.h:18
-msgid "Latvian"
-msgstr "라트비아어"
+msgid "Ewe"
+msgstr "에베어"
 
+#. Keyboard indicator for Fula layouts
 #: ../rules/base.xml.in.h:466
-msgid "Latvian (F variant)"
-msgstr "라트비아어(F 변종)"
+msgid "ff"
+msgstr "ff"
 
 #: ../rules/base.xml.in.h:467
-msgid "Latvian (adapted)"
-msgstr "라트비아어(개조 버전)"
-
-#: ../rules/base.xml.in.h:468
-msgid "Latvian (apostrophe variant)"
-msgstr "라트비아어(아포스트로피 변종)"
+msgid "Fula"
+msgstr "풀라"
 
+#. Keyboard indicator for Ga layouts
 #: ../rules/base.xml.in.h:469
-msgid "Latvian (ergonomic, ŪGJRMV)"
-msgstr "라트비아어(어고노믹, ŪGJRMV)"
+msgid "gaa"
+msgstr "gaa"
 
+# 가나의 언어
 #: ../rules/base.xml.in.h:470
-msgid "Latvian (modern)"
-msgstr "라트비아어(현대 버전)"
-
-#: ../rules/base.xml.in.h:471
-msgid "Latvian (tilde variant)"
-msgstr "라트비아어(물결 변종)"
+msgid "Ga"
+msgstr "가어"
 
+#. Keyboard indicator for Hausa layouts
 #: ../rules/base.xml.in.h:472
-msgid "Left Alt"
-msgstr "왼쪽 Alt"
+msgid "ha"
+msgstr "ha"
 
+# 나이지리아 변종
 #: ../rules/base.xml.in.h:473
-msgid "Left Alt (while pressed)"
-msgstr "왼쪽 Alt(누르고 있는 동안)"
-
-#: ../rules/base.xml.in.h:474
-msgid "Left Alt is swapped with Left Win"
-msgstr "왼쪽 Alt와 왼쪽 윈도우 키 뒤바꾸기"
+msgid "Hausa"
+msgstr "하우사어"
 
+#. Keyboard indicator for Avatime layouts
 #: ../rules/base.xml.in.h:475
-msgid "Left Alt+Left Shift"
-msgstr "왼쪽 Alt+왼쪽 Shift"
+msgid "avn"
+msgstr "avn"
 
+# 아프리카 지역 언어
 #: ../rules/base.xml.in.h:476
-msgid "Left Ctrl"
-msgstr "왼쪽 Ctrl"
+msgid "Avatime"
+msgstr "애버타임어"
 
 #: ../rules/base.xml.in.h:477
-msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
-msgstr "왼쪽 Ctrl(1번 키보드 배치로), 오른쪽 Ctrl (마지막 키보드 배치로)"
+msgid "English (Ghana, GILLBT)"
+msgstr "영어(가나, GILLBT)"
 
 #: ../rules/base.xml.in.h:478
-msgid "Left Ctrl as Meta"
-msgstr "왼쪽 Ctrl 키를 Meta 키로"
-
-#: ../rules/base.xml.in.h:479
-msgid "Left Ctrl+Left Shift"
-msgstr "왼쪽 Ctrl+왼쪽 Shift"
+msgid "French (Guinea)"
+msgstr "프랑스어(기니)"
 
+#. Keyboard indicator for Georgian layouts
 #: ../rules/base.xml.in.h:480
-msgid "Left Shift"
-msgstr "왼쪽 Shift"
+msgid "ka"
+msgstr "ka"
 
 #: ../rules/base.xml.in.h:481
-msgid "Left Win"
-msgstr "왼쪽 윈도우"
+msgid "Georgian"
+msgstr "조지아어"
 
 #: ../rules/base.xml.in.h:482
-msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
-msgstr "왼쪽 윈도우(1번으로), 오른쪽 윈도우/메뉴(마지막으로)"
+msgid "Georgian (ergonomic)"
+msgstr "조지아어(어고노믹)"
 
 #: ../rules/base.xml.in.h:483
-msgid "Left Win (while pressed)"
-msgstr "왼쪽 윈도우(누르고 있는 동안)"
+msgid "Georgian (MESS)"
+msgstr "조지아어(MESS)"
 
 #: ../rules/base.xml.in.h:484
-msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "왼쪽 윈도우로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
+msgid "Russian (Georgia)"
+msgstr "러시아어(그루지아)"
 
 #: ../rules/base.xml.in.h:485
-msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
-msgstr "왼쪽 Ctrl+왼쪽 윈도우(1번 키보드 배치로), 오른쪽 Ctrl+Menu (2번째 키보드 배치로)"
+msgid "Ossetian (Georgia)"
+msgstr "오세트어(그루지아)"
 
-#: ../rules/base.xml.in.h:486
-msgid "Legacy"
-msgstr "구형 방식"
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
+msgid "German"
+msgstr "독일어"
 
 #: ../rules/base.xml.in.h:487
-msgid "Legacy Wang 724"
-msgstr "구형 방식 Wang 724 키패드"
+msgid "German (dead acute)"
+msgstr "독일어(어큐트 데드키)"
+
+#: ../rules/base.xml.in.h:488
+msgid "German (dead grave acute)"
+msgstr "독일어(그레이브 어큐트 데드키)"
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:489
-msgid "Legacy key with comma"
-msgstr "구형 방식 키, 쉼표 포함"
+msgid "German (eliminate dead keys)"
+msgstr "독일어(데드키 없음)"
 
 #: ../rules/base.xml.in.h:490
-msgid "Legacy key with dot"
-msgstr "구형 방식 키, 점 포함"
+msgid "Romanian (Germany)"
+msgstr "루마니아어(독일)"
 
-#: ../rules/base.xml.in.h:491 ../rules/base.extras.xml.in.h:27
-msgid "Lithuanian"
-msgstr "리투아니아어"
+#: ../rules/base.xml.in.h:491
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "루마니아어(독일, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:492
-msgid "Lithuanian (IBM LST 1205-92)"
-msgstr "리투아니아어(IBM LST 1205-92)"
+msgid "German (Dvorak)"
+msgstr "독일어(드보락)"
 
 #: ../rules/base.xml.in.h:493
-msgid "Lithuanian (LEKP)"
-msgstr "리투아니아어(LEKP)"
+msgid "German (Sun dead keys)"
+msgstr "독일어(썬 데드키)"
 
 #: ../rules/base.xml.in.h:494
-msgid "Lithuanian (LEKPa)"
-msgstr "리투아니아어(LEKPa)"
+msgid "German (Neo 2)"
+msgstr "독일어(Neo 2)"
 
 #: ../rules/base.xml.in.h:495
-msgid "Lithuanian (US keyboard with Lithuanian letters)"
-msgstr "리투아니아어(미국식 키보드, 리투아니아 문자 포함)"
+msgid "German (Macintosh)"
+msgstr "독일어(매킨토시)"
 
 #: ../rules/base.xml.in.h:496
-msgid "Lithuanian (standard)"
-msgstr "리투아니아어(표준)"
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "독일어(매킨토시, 데드키 없음)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
+# http://ko.wikipedia.org/wiki/저지_소르브어
 #: ../rules/base.xml.in.h:497
-msgid "Logitech Access Keyboard"
-msgstr "로지텍 액세스 키보드"
+msgid "Lower Sorbian"
+msgstr "저지 소르브어"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
+# http://ko.wikipedia.org/wiki/저지_소르브어
 #: ../rules/base.xml.in.h:498
-msgid "Logitech Cordless Desktop"
-msgstr "로지텍 무선 데스크탑"
+msgid "Lower Sorbian (qwertz)"
+msgstr "저지 소르브어(QWERTZ)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:499
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "로지텍 무선 데스크탑(다른 옵션)"
+msgid "German (qwerty)"
+msgstr "독일어(QWERTY)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:500
-msgid "Logitech Cordless Desktop EX110"
-msgstr "로지텍 무선 데스크탑 EX110"
-
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:501
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "로지텍 무선 데스크탑 LX-300"
+msgid "Russian (Germany, phonetic)"
+msgstr "러시아어(독일, 음성 표기)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:502
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "로지텍 무선 데스크탑 내비게이터"
+#. Keyboard indicator for Greek layouts
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
+msgid "gr"
+msgstr "gr"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:503
-msgid "Logitech Cordless Desktop Optical"
-msgstr "로지텍 무선 데스크탑 옵티컬"
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
+msgid "Greek"
+msgstr "그리스어"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:504
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "로지텍 무선 데스크탑 프로(다른 옵션 2)"
+msgid "Greek (simple)"
+msgstr "그리스어(간단)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:505
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "로지텍 무선 데스크탑 아이터치"
+msgid "Greek (extended)"
+msgstr "그리스어(확장)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:506
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "로지텍 무선 프리덤/데스크탑 내비게이터"
+msgid "Greek (eliminate dead keys)"
+msgstr "그리스어(데드키 없음)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
+# 그리스어 발음 표기 http://en.wikipedia.org/wiki/Polytonic_orthography
 #: ../rules/base.xml.in.h:507
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "로지텍 G15 추가 키, G15daemon 사용"
-
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:508
-msgid "Logitech Generic Keyboard"
-msgstr "로지텍 일반 키보드"
+msgid "Greek (polytonic)"
+msgstr "그리스어(폴리토닉)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
+#. Keyboard indicator for Hungarian layouts
 #: ../rules/base.xml.in.h:509
-msgid "Logitech Internet 350 Keyboard"
-msgstr "로지텍 인터넷 350 키보드"
+msgid "hu"
+msgstr "hu"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:510
-msgid "Logitech Internet Keyboard"
-msgstr "로지텍 인터넷 키보드"
+msgid "Hungarian"
+msgstr "헝가리어"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:511
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "로지텍 인터넷 내비게이터 키보드"
+msgid "Hungarian (standard)"
+msgstr "헝가리어(표준)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:512
-msgid "Logitech Media Elite Keyboard"
-msgstr "로지텍 미디어 엘리트 키보드"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "헝가리어(데드키 없음)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:513
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr "로지텍 울트라 무선 미디어 데스크탑 키보드"
+msgid "Hungarian (qwerty)"
+msgstr "헝가리어(QWERTY)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:514
-msgid "Logitech Ultra-X Keyboard"
-msgstr "로지텍 울트라 키보드"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "헝가리어(101/QWERTZ/쉼표/데드키)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:515
-msgid "Logitech diNovo Edge Keyboard"
-msgstr "로지텍 디노보 엣지 키보드"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "헝가리어(101/QWERTZ/쉼표/데드키 없음0"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:516
-msgid "Logitech diNovo Keyboard"
-msgstr "로지텍 디노보 키보드"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "헝가리어(101/QWERTZ/점/데드키)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:517
-msgid "Logitech iTouch"
-msgstr "로지텍 아이터치"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "헝가리어(101/QWERTZ/점/데드키 없음)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:518
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "로지텍 아이터치 무선 키보드(모델 Y-RB6)"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "헝가리어(101/QWERTY/쉼표/데드키)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:519
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "로지텍 아이터치 인터넷 내비게이터 키보드 SE"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "헝가리어(101/QWERTY/쉼표/데드키 없음)"
 
-# "데스크톱"이 올바른 표기지만 한국에서 광고하는 대로 음역
 #: ../rules/base.xml.in.h:520
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "로지텍 아이터치 인터넷 내비게이터 키보드 SE(USB)"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "헝가리어(101/QWERTY/점/데드키)"
 
-# http://ko.wikipedia.org/wiki/저지_소르브어
 #: ../rules/base.xml.in.h:521
-msgid "Lower Sorbian"
-msgstr "저지 소르브어"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "헝가리어(101/QWERTY/점/데드키 없음)"
 
-# http://ko.wikipedia.org/wiki/저지_소르브어
 #: ../rules/base.xml.in.h:522
-msgid "Lower Sorbian (qwertz)"
-msgstr "저지 소르브어(QWERTZ)"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "헝가리어(102/QWERTZ/쉼표/데드키)"
 
 #: ../rules/base.xml.in.h:523
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "헝가리어(102/QWERTZ/쉼표/데드키 없음)"
 
 #: ../rules/base.xml.in.h:524
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro(국제 버전)"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "헝가리어(102/QWERTZ/점/데드키)"
 
 #: ../rules/base.xml.in.h:525
-msgid "Macedonian"
-msgstr "마케도니아어"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "헝가리어(102/QWERTZ/점/데드키 없음)"
 
 #: ../rules/base.xml.in.h:526
-msgid "Macedonian (eliminate dead keys)"
-msgstr "마케도니아어(데드키 없음)"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "헝가리어(102/QWERTY/쉼표/데드키)"
 
 #: ../rules/base.xml.in.h:527
-msgid "Macintosh"
-msgstr "매킨토시"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "헝가리어(102/QWERTY/쉼표/데드키 없음)"
 
 #: ../rules/base.xml.in.h:528
-msgid "Macintosh Old"
-msgstr "매킨토시 구형"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "헝가리어(102/QWERTY/점/데드키)"
 
 #: ../rules/base.xml.in.h:529
-msgid "Make Caps Lock an additional Backspace"
-msgstr "Caps Lock을 추가 백스페이스로 사용"
-
-#: ../rules/base.xml.in.h:530
-msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
-msgstr "Caps Lock을 추가 Ctrl로 사용, 하지만 Caps_Lock 키심볼 유지"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "헝가리어(102/QWERTY/점/데드키 없음)"
 
+#. Keyboard indicator for Icelandic layouts
 #: ../rules/base.xml.in.h:531
-msgid "Make Caps Lock an additional ESC"
-msgstr "Caps Lock을 추가 ESC로 사용"
+msgid "is"
+msgstr "is"
 
 #: ../rules/base.xml.in.h:532
-msgid "Make Caps Lock an additional Hyper"
-msgstr "Caps Lock을 추가 Hyper로 사용"
+msgid "Icelandic"
+msgstr "아이슬란드어"
 
 #: ../rules/base.xml.in.h:533
-msgid "Make Caps Lock an additional Num Lock"
-msgstr "Caps Lock을 추가 Num Lock으로 사용"
+msgid "Icelandic (Sun dead keys)"
+msgstr "아이슬란드어(썬 데드키)"
 
 #: ../rules/base.xml.in.h:534
-msgid "Make Caps Lock an additional Super"
-msgstr "Caps Lock을 추가 Super로 사용"
+msgid "Icelandic (eliminate dead keys)"
+msgstr "아이슬란드어(데드키 없음)"
 
 #: ../rules/base.xml.in.h:535
-msgid "Make Zenkaku Hankaku an additional ESC"
-msgstr "Zenkaku Hankaku를 추가 ESC로 사용"
+msgid "Icelandic (Macintosh)"
+msgstr "아이슬란드어(매킨토시)"
 
 #: ../rules/base.xml.in.h:536
-msgid "Malayalam"
-msgstr "말라얄람어"
-
-#: ../rules/base.xml.in.h:537
-msgid "Malayalam (Lalitha)"
-msgstr "말라얄람어(라리타)"
+msgid "Icelandic (Dvorak)"
+msgstr "아이슬란드어(드보락)"
 
-#: ../rules/base.xml.in.h:538
-msgid "Malayalam (enhanced Inscript with Rupee Sign)"
-msgstr "말라얄람어(발전된 Inscript, 루피 기호 포함)"
+#. Keyboard indicator for Hebrew layouts
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
+msgid "he"
+msgstr "he"
 
-#: ../rules/base.xml.in.h:539
-msgid "Maltese"
-msgstr "몰타어"
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
+msgid "Hebrew"
+msgstr "히브리어"
 
 #: ../rules/base.xml.in.h:540
-msgid "Maltese (with US layout)"
-msgstr "몰타어(미국식 키 배치)"
+msgid "Hebrew (lyx)"
+msgstr "히브리어(lyx)"
 
 #: ../rules/base.xml.in.h:541
-msgid "Maori"
-msgstr "마오리어"
+msgid "Hebrew (phonetic)"
+msgstr "히브리어(음성 표기)"
 
 #: ../rules/base.xml.in.h:542
-msgid "Mari"
-msgstr "마리어"
-
-#: ../rules/base.xml.in.h:543
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "히브리어(성서 방식, Tiro)"
 
-#: ../rules/base.xml.in.h:544
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access 키보드"
+#. Keyboard indicator for Italian layouts
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
+msgid "it"
+msgstr "it"
 
-#: ../rules/base.xml.in.h:545
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
+msgid "Italian"
+msgstr "이탈리아어"
 
 #: ../rules/base.xml.in.h:546
-msgid "Menu"
-msgstr "메뉴"
+msgid "Italian (eliminate dead keys)"
+msgstr "이탈리아어(데드키 없음)"
 
 #: ../rules/base.xml.in.h:547
-msgid "Menu as Right Ctrl"
-msgstr "Menu 키를 오른쪽 Ctrl 키로"
+msgid "Italian (Macintosh)"
+msgstr "이탈리아어(매킨토시)"
 
 #: ../rules/base.xml.in.h:548
-msgid "Meta is mapped to Left Win"
-msgstr "메타 키를 왼쪽 윈도우 키로 매핑"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "이탈리아어(미국식 키보드, 이탈리아어 문자 포함)"
 
+# 오세트 - 러시아 및 조지아 지역 오세트족
 #: ../rules/base.xml.in.h:549
-msgid "Meta is mapped to Win keys"
-msgstr "메타 키를 윈도우 키로 매핑"
+msgid "Georgian (Italy)"
+msgstr "조지아어(이탈리아)"
 
 #: ../rules/base.xml.in.h:550
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "마이크로소프트 컴포트 커브 키보드 2000"
+msgid "Italian (IBM 142)"
+msgstr "이탈리아어(IBM 142)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Microsoft Internet Keyboard"
-msgstr "마이크로소프트 인터넷 키보드"
-
-#: ../rules/base.xml.in.h:552
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "마이크로소프트 인터넷 키보드 프로, 스웨덴"
+#. Keyboard indicator for Japanese layouts
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
+msgid "ja"
+msgstr "ja"
 
-#: ../rules/base.xml.in.h:553
-msgid "Microsoft Natural"
-msgstr "마이크로소프트 내츄럴"
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
+msgid "Japanese"
+msgstr "일본어"
 
 #: ../rules/base.xml.in.h:554
-msgid "Microsoft Natural Keyboard Elite"
-msgstr "마이크로소프트 내츄럴 키보드 엘리트"
+msgid "Japanese (Kana)"
+msgstr "일본어(가나)"
 
 #: ../rules/base.xml.in.h:555
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "마이크로소프트 내츄럴 키보드 / 마이크로소프트 인터넷 키보드 프로"
+msgid "Japanese (Kana 86)"
+msgstr "일본어(가나 86)"
 
 #: ../rules/base.xml.in.h:556
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "마이크로소프트 내츄럴 키보드 프로 OEM"
+msgid "Japanese (OADG 109A)"
+msgstr "일본어(OADG 109A)"
 
 #: ../rules/base.xml.in.h:557
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "마이크로소프트 내츄럴 키보드 프로 USB / 마이크로소프트 인터넷 키보드 프로"
+msgid "Japanese (Macintosh)"
+msgstr "일본어(매킨토시)"
 
 #: ../rules/base.xml.in.h:558
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "마이크로소프트 내츄럴 무선 어고노믹 키보드 4000"
-
-#: ../rules/base.xml.in.h:559
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "마이크로소프트 내츄럴 무선 어고노믹 키보드 7000"
+msgid "Japanese (Dvorak)"
+msgstr "일본어(드보락)"
 
+#. Keyboard indicator for Kikuyu layouts
 #: ../rules/base.xml.in.h:560
-msgid "Microsoft Office Keyboard"
-msgstr "마이크로소프트 오피스 키보드"
+msgid "ki"
+msgstr "ki"
 
 #: ../rules/base.xml.in.h:561
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "마이크로소프트 무선 멀티미디어 키보드 1.0A"
+msgid "Kyrgyz"
+msgstr "키르기스어"
 
 #: ../rules/base.xml.in.h:562
-msgid "Miscellaneous compatibility options"
-msgstr "기타 호환성 옵션"
-
-#: ../rules/base.xml.in.h:563
-msgid "Mongolian"
-msgstr "몽골어"
+msgid "Kyrgyz (phonetic)"
+msgstr "키르기스어(음성 기호)"
 
+#. Keyboard indicator for Khmer layouts
 #: ../rules/base.xml.in.h:564
-msgid "Montenegrin"
-msgstr "몬테네그로어"
+msgid "km"
+msgstr "km"
 
 #: ../rules/base.xml.in.h:565
-msgid "Montenegrin (Cyrillic with guillemets)"
-msgstr "몬테네그로어(키릴 문자, 각괄호 포함)"
-
-#: ../rules/base.xml.in.h:566
-msgid "Montenegrin (Cyrillic)"
-msgstr "몬테네그로어(키릴 문자)"
+msgid "Khmer (Cambodia)"
+msgstr "크메르어(캄보디아)"
 
+#. Keyboard indicator for Kazakh layouts
 #: ../rules/base.xml.in.h:567
-msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
-msgstr "몬테네그로어(키릴 문자, Z와 ZHE 뒤바꾸기)"
+msgid "kk"
+msgstr "kk"
 
 #: ../rules/base.xml.in.h:568
-msgid "Montenegrin (Latin Unicode qwerty)"
-msgstr "몬테네그로어(라틴 유니코드 QWERTY)"
+msgid "Kazakh"
+msgstr "카자흐어"
 
 #: ../rules/base.xml.in.h:569
-msgid "Montenegrin (Latin Unicode)"
-msgstr "몬테네그로어(라틴 유니코드)"
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "러시아어(카자흐스탄, 카자흐어 포함)"
 
 #: ../rules/base.xml.in.h:570
-msgid "Montenegrin (Latin qwerty)"
-msgstr "몬테네그로어(라틴 QWERTY)"
-
-#: ../rules/base.xml.in.h:571
-msgid "Montenegrin (Latin with guillemets)"
-msgstr "몬테네그로어(라틴, 각괄호 포함)"
+msgid "Kazakh (with Russian)"
+msgstr "카자흐어(러시아어 포함)"
 
+#. Keyboard indicator for Lao layouts
 #: ../rules/base.xml.in.h:572
-msgid "NICOLA-F style Backspace"
-msgstr "NICOLA-F 방식 백스페이스"
+msgid "lo"
+msgstr "lo"
 
 #: ../rules/base.xml.in.h:573
-msgid "Nepali"
-msgstr "네팔어"
+msgid "Lao"
+msgstr "라오어"
 
 #: ../rules/base.xml.in.h:574
-msgid "Non-breakable space character at fourth level"
-msgstr "4번째 단계에서 강제 공백 문자"
-
-#: ../rules/base.xml.in.h:575
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "4번째 단계에서 강제 공백 문자, 6번째 단계에서 얇은 강제 공백 문자"
+msgid "Lao (STEA proposed standard layout)"
+msgstr "라오어(STEA 제안 표준 키 배치)"
 
-#: ../rules/base.xml.in.h:576
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
-msgstr "4번째 단계에서 강제 공백 문자, 6번째 단계에서 얇은 강제 공백 문자(Ctrl+Shift 사용)"
+#. Keyboard indicator for Spanish layouts
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
+msgid "es"
+msgstr "es"
 
 #: ../rules/base.xml.in.h:577
-msgid "Non-breakable space character at second level"
-msgstr "2번째 단계에서 강제 공백 문자"
+msgid "Spanish (Latin American)"
+msgstr "스페인어(라틴 아메리카)"
 
 #: ../rules/base.xml.in.h:578
-msgid "Non-breakable space character at third level"
-msgstr "3번째 단계에서 강제 공백 문자"
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "스페인어(라틴 아메리카, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:579
-msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr "3번째 단계에서 강제 공백 문자, 4번째에서는 출력 없음."
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "스페인어(라틴 아메리카, 물결 데드키 포함)"
 
 #: ../rules/base.xml.in.h:580
-msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "3번째 단계에서 강제 공백 문자, 4번째에서는 얇은 강제 공백 문자."
-
-#: ../rules/base.xml.in.h:581
-msgid "Northern Saami (Finland)"
-msgstr "북 사오미(핀란드)"
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "스페인어(라틴 아메리카, 썬 데드키)"
 
-#: ../rules/base.xml.in.h:582
-msgid "Northern Saami (Norway)"
-msgstr "북 사오미(노르웨이)"
+#. Keyboard indicator for Lithuanian layouts
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
+msgid "lt"
+msgstr "lt"
 
-#: ../rules/base.xml.in.h:583
-msgid "Northern Saami (Norway, eliminate dead keys)"
-msgstr "북 사오미(노르웨이, 데드키 없음)"
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
+msgid "Lithuanian"
+msgstr "리투아니아어"
 
 #: ../rules/base.xml.in.h:584
-msgid "Northern Saami (Sweden)"
-msgstr "북 사오미(스웨덴)"
+msgid "Lithuanian (standard)"
+msgstr "리투아니아어(표준)"
 
 #: ../rules/base.xml.in.h:585
-msgid "Northgate OmniKey 101"
-msgstr "노스게이트 OmniKey 101"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "리투아니아어(미국식 키보드, 리투아니아 문자 포함)"
 
 #: ../rules/base.xml.in.h:586
-msgid "Norwegian"
-msgstr "노르웨이어"
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "리투아니아어(IBM LST 1205-92)"
 
 #: ../rules/base.xml.in.h:587
-msgid "Norwegian (Dvorak)"
-msgstr "노르웨이어(드보락)"
+msgid "Lithuanian (LEKP)"
+msgstr "리투아니아어(LEKP)"
 
 #: ../rules/base.xml.in.h:588
-msgid "Norwegian (Macintosh)"
-msgstr "노르웨이어(매킨토시)"
-
-#: ../rules/base.xml.in.h:589
-msgid "Norwegian (Macintosh, eliminate dead keys)"
-msgstr "노르웨이어(매킨토시, 데드키 없음)"
+msgid "Lithuanian (LEKPa)"
+msgstr "리투아니아어(LEKPa)"
 
-#: ../rules/base.xml.in.h:590
-msgid "Norwegian (eliminate dead keys)"
-msgstr "노르웨이어(데드키 없음)"
+#. Keyboard indicator for Latvian layouts
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
+msgid "lv"
+msgstr "lv"
 
-#: ../rules/base.xml.in.h:591
-msgid "Num Lock"
-msgstr "Num Lock"
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
+msgid "Latvian"
+msgstr "라트비아어"
 
 #: ../rules/base.xml.in.h:592
-msgid "Numeric keypad delete key behaviour"
-msgstr "숫자 키패드의 Delete 키 동작"
+msgid "Latvian (apostrophe variant)"
+msgstr "라트비아어(아포스트로피 변종)"
 
 #: ../rules/base.xml.in.h:593
-msgid "Numeric keypad keys always enter digits (as in Mac OS)"
-msgstr "숫자 키패드 키가 항상 숫자를 입력(맥 OS처럼 동작)"
+msgid "Latvian (tilde variant)"
+msgstr "라트비아어(물결 변종)"
 
 #: ../rules/base.xml.in.h:594
-msgid "Numeric keypad layout selection"
-msgstr "숫자 키패드 배치 선택"
+msgid "Latvian (F variant)"
+msgstr "라트비아어(F 변종)"
 
 #: ../rules/base.xml.in.h:595
-msgid "OLPC"
-msgstr "OLPC"
+msgid "Latvian (modern)"
+msgstr "라트비아어(현대 버전)"
 
 #: ../rules/base.xml.in.h:596
-msgid "Occitan"
-msgstr "오크어"
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "라트비아어(어고노믹, ŪGJRMV)"
 
 #: ../rules/base.xml.in.h:597
-msgid "Ogham"
-msgstr "오검 문자"
-
-# 아일랜드 변종
-#: ../rules/base.xml.in.h:598
-msgid "Ogham (IS434)"
-msgstr "오검 문자(IS434)"
+msgid "Latvian (adapted)"
+msgstr "라트비아어(개조 버전)"
 
-# Oriya - 인도 방언
+#. Keyboard indicator for Maori layouts
 #: ../rules/base.xml.in.h:599
-msgid "Oriya"
-msgstr "오리야어"
+msgid "mi"
+msgstr "mi"
 
 #: ../rules/base.xml.in.h:600
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM/Internet 키보드"
-
-#: ../rules/base.xml.in.h:601
-msgid "Ossetian (Georgia)"
-msgstr "오세트어(그루지아)"
+msgid "Maori"
+msgstr "마오리어"
 
-#: ../rules/base.xml.in.h:602
-msgid "Ossetian (WinKeys)"
-msgstr "오세트어(윈도우 키)"
+#. Keyboard indicator for Serbian layouts
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
+msgid "sr"
+msgstr "sr"
 
 #: ../rules/base.xml.in.h:603
-msgid "Ossetian (legacy)"
-msgstr "오세트어(구형)"
+msgid "Montenegrin"
+msgstr "몬테네그로어"
 
 #: ../rules/base.xml.in.h:604
-msgid "PC-98xx Series"
-msgstr "PC-98xx 시리즈"
+msgid "Montenegrin (Cyrillic)"
+msgstr "몬테네그로어(키릴 문자)"
 
 #: ../rules/base.xml.in.h:605
-msgid "Pannonian Rusyn (homophonic)"
-msgstr "판노니아 루테니아(음성 기호)"
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgstr "몬테네그로어(키릴 문자, Z와 ZHE 뒤바꾸기)"
 
-# 아프가니스탄
 #: ../rules/base.xml.in.h:606
-msgid "Pashto"
-msgstr "파슈토어"
+msgid "Montenegrin (Latin Unicode)"
+msgstr "몬테네그로어(라틴 유니코드)"
 
 #: ../rules/base.xml.in.h:607
-msgid "Pashto (Afghanistan, OLPC)"
-msgstr "파슈토어(아프가니스탄, OLPC)"
+msgid "Montenegrin (Latin qwerty)"
+msgstr "몬테네그로어(라틴 QWERTY)"
 
 #: ../rules/base.xml.in.h:608
-msgid "Pause"
-msgstr "Pause"
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "몬테네그로어(라틴 유니코드 QWERTY)"
 
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:29
-msgid "Persian"
-msgstr "페르시아어"
+#: ../rules/base.xml.in.h:609
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "몬테네그로어(키릴 문자, 각괄호 포함)"
 
 #: ../rules/base.xml.in.h:610
-msgid "Persian (Afghanistan, Dari OLPC)"
-msgstr "페르시아어(아프가니스탄, Dari OLPC)"
-
-#: ../rules/base.xml.in.h:611
-msgid "Persian (with Persian Keypad)"
-msgstr "페르시아어(페르시아어 키패드 포함)"
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "몬테네그로어(라틴, 각괄호 포함)"
 
-#: ../rules/base.xml.in.h:612 ../rules/base.extras.xml.in.h:30
-msgid "Polish"
-msgstr "폴란드어"
+#. Keyboard indicator for Macedonian layouts
+#: ../rules/base.xml.in.h:612
+msgid "mk"
+msgstr "mk"
 
 #: ../rules/base.xml.in.h:613
-msgid "Polish (Dvorak)"
-msgstr "폴란드어(드보락)"
+msgid "Macedonian"
+msgstr "마케도니아어"
 
 #: ../rules/base.xml.in.h:614
-msgid "Polish (Dvorak, Polish quotes on key 1)"
-msgstr "폴란드어(드보락, 1 키에 폴란드어 따옴표)"
-
-#: ../rules/base.xml.in.h:615
-msgid "Polish (Dvorak, Polish quotes on quotemark key)"
-msgstr "폴란드어(드보락, 따옴표 키에 폴란드어 따옴표)"
+msgid "Macedonian (eliminate dead keys)"
+msgstr "마케도니아어(데드키 없음)"
 
+#. Keyboard indicator for Maltese layouts
 #: ../rules/base.xml.in.h:616
-msgid "Polish (programmer Dvorak)"
-msgstr "폴란드어(프로그래머 드보락)"
+msgid "mt"
+msgstr "mt"
 
 #: ../rules/base.xml.in.h:617
-msgid "Polish (qwertz)"
-msgstr "폴란드어(QWERTZ)"
+msgid "Maltese"
+msgstr "몰타어"
 
 #: ../rules/base.xml.in.h:618
-msgid "Portuguese"
-msgstr "포르투갈어"
-
-#: ../rules/base.xml.in.h:619
-msgid "Portuguese (Brazil)"
-msgstr "포르투갈어(브라질)"
+msgid "Maltese (with US layout)"
+msgstr "몰타어(미국식 키 배치)"
 
+#. Keyboard indicator for Mongolian layouts
 #: ../rules/base.xml.in.h:620
-msgid "Portuguese (Brazil, Dvorak)"
-msgstr "포르투갈어(브라질, 드보락)"
+msgid "mn"
+msgstr "mn"
 
 #: ../rules/base.xml.in.h:621
-msgid "Portuguese (Brazil, eliminate dead keys)"
-msgstr "포르투갈어(브라질, 데드키 없음)"
-
-# 나티보 - 아메리카 소수 언어
-#: ../rules/base.xml.in.h:622
-msgid "Portuguese (Brazil, nativo for Esperanto)"
-msgstr "포르투갈어(브라질, 에스페란토 나티보)"
+msgid "Mongolian"
+msgstr "몽골어"
 
-# 나티보 - 아메리카 소수 언어
-#: ../rules/base.xml.in.h:623
-msgid "Portuguese (Brazil, nativo for USA keyboards)"
-msgstr "포르투갈어(브라질, 미국 키보드 나티보)"
+#. Keyboard indicator for Norwegian layouts
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
+msgid "no"
+msgstr "no"
 
-# 나티보 - 아메리카 소수 언어
-#: ../rules/base.xml.in.h:624
-msgid "Portuguese (Brazil, nativo)"
-msgstr "포르투갈어(브라질, 나티보)"
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
+msgid "Norwegian"
+msgstr "노르웨이어"
 
 #: ../rules/base.xml.in.h:625
-msgid "Portuguese (Macintosh)"
-msgstr "포르투갈어(매킨토시)"
+msgid "Norwegian (eliminate dead keys)"
+msgstr "노르웨이어(데드키 없음)"
 
 #: ../rules/base.xml.in.h:626
-msgid "Portuguese (Macintosh, Sun dead keys)"
-msgstr "포르투갈어(매킨토시, 썬 데드키)"
+msgid "Norwegian (Dvorak)"
+msgstr "노르웨이어(드보락)"
 
 #: ../rules/base.xml.in.h:627
-msgid "Portuguese (Macintosh, eliminate dead keys)"
-msgstr "포르투갈어(매킨토시, 데드키 없음)"
+msgid "Northern Saami (Norway)"
+msgstr "북 사오미(노르웨이)"
 
-# 나티보 - 아메리카 소수 언어
 #: ../rules/base.xml.in.h:628
-msgid "Portuguese (Nativo for USA keyboards)"
-msgstr "포르투갈어(나티보, 미국 키보드)"
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "북 사오미(노르웨이, 데드키 없음)"
 
-# 나티보 - 아메리카 소수 언어
 #: ../rules/base.xml.in.h:629
-msgid "Portuguese (Nativo)"
-msgstr "포르투갈어(나티보)"
+msgid "Norwegian (Macintosh)"
+msgstr "노르웨이어(매킨토시)"
 
 #: ../rules/base.xml.in.h:630
-msgid "Portuguese (Sun dead keys)"
-msgstr "포르투갈어(썬 데드키)"
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "노르웨이어(매킨토시, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:631
-msgid "Portuguese (eliminate dead keys)"
-msgstr "포르투갈어(데드키 없음)"
+msgid "Norwegian (Colemak)"
+msgstr "노르웨이어(콜맥)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager(KTEZ-1000)"
-
-#: ../rules/base.xml.in.h:633
-msgid "PrtSc"
-msgstr "PrtSc"
+#. Keyboard indicator for Polish layouts
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
+msgid "pl"
+msgstr "pl"
 
-# 젤룸 - 파키스탄 지역
-#: ../rules/base.xml.in.h:634
-msgid "Punjabi (Gurmukhi Jhelum)"
-msgstr "펀자브어(구르무키 문자, 젤룸)"
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
+msgid "Polish"
+msgstr "폴란드어"
 
 #: ../rules/base.xml.in.h:635
-msgid "Punjabi (Gurmukhi)"
-msgstr "펀자브어(구르무키 문자)"
+msgid "Polish (legacy)"
+msgstr "폴란드어(구형)"
 
 #: ../rules/base.xml.in.h:636
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Polish (qwertz)"
+msgstr "폴란드어(QWERTZ)"
 
 #: ../rules/base.xml.in.h:637
-msgid "Right Alt"
-msgstr "오른쪽 Alt"
+msgid "Polish (Dvorak)"
+msgstr "폴란드어(드보락)"
 
 #: ../rules/base.xml.in.h:638
-msgid "Right Alt (while pressed)"
-msgstr "오른쪽 Alt(누르고 있는 동안)"
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "폴란드어(드보락, 따옴표 키에 폴란드어 따옴표)"
 
 #: ../rules/base.xml.in.h:639
-msgid "Right Alt as Right Ctrl"
-msgstr "오른쪽 Alt 키를 오른쪽 Ctrl 키로"
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "폴란드어(드보락, 1 키에 폴란드어 따옴표)"
 
 #: ../rules/base.xml.in.h:640
-msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "오른쪽 Alt로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
+msgid "Kashubian"
+msgstr "카슈브어"
 
 #: ../rules/base.xml.in.h:641
-msgid "Right Alt key never chooses 3rd level"
-msgstr "오른쪽 Alt는 3번째 단계를 선택하지 않음"
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "러시아어(폴란드, 음성 표기 드보락)"
 
 #: ../rules/base.xml.in.h:642
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "오른쪽 Alt, Shift+오른쪽 Alt가 Multi_Key"
+msgid "Polish (programmer Dvorak)"
+msgstr "폴란드어(프로그래머 드보락)"
 
-#: ../rules/base.xml.in.h:643
-msgid "Right Ctrl"
-msgstr "오른쪽 Ctrl"
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
+msgid "Portuguese"
+msgstr "포르투갈어"
 
 #: ../rules/base.xml.in.h:644
-msgid "Right Ctrl (while pressed)"
-msgstr "오른쪽 Ctrl(누르고 있는 동안)"
+msgid "Portuguese (eliminate dead keys)"
+msgstr "포르투갈어(데드키 없음)"
 
 #: ../rules/base.xml.in.h:645
-msgid "Right Ctrl as Right Alt"
-msgstr "오른쪽 Ctrl 키를 오른쪽 Alt 키로"
+msgid "Portuguese (Sun dead keys)"
+msgstr "포르투갈어(썬 데드키)"
 
 #: ../rules/base.xml.in.h:646
-msgid "Right Ctrl+Right Shift"
-msgstr "오른쪽 Ctrl+오른쪽 Alt"
+msgid "Portuguese (Macintosh)"
+msgstr "포르투갈어(매킨토시)"
 
 #: ../rules/base.xml.in.h:647
-msgid "Right Shift"
-msgstr "오른쪽 Shift"
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "포르투갈어(매킨토시, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:648
-msgid "Right Win"
-msgstr "오른쪽 윈도우"
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "포르투갈어(매킨토시, 썬 데드키)"
 
+# 나티보 - 아메리카 소수 언어
 #: ../rules/base.xml.in.h:649
-msgid "Right Win (while pressed)"
-msgstr "오른쪽 윈도우(누르고 있는 동안)"
+msgid "Portuguese (Nativo)"
+msgstr "포르투갈어(나티보)"
 
+# 나티보 - 아메리카 소수 언어
 #: ../rules/base.xml.in.h:650
-msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "오른쪽 윈도우로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
-
-#: ../rules/base.xml.in.h:651 ../rules/base.extras.xml.in.h:32
-msgid "Romanian"
-msgstr "루마니아어"
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr "포르투갈어(나티보, 미국 키보드)"
 
-#: ../rules/base.xml.in.h:652
-msgid "Romanian (Germany)"
-msgstr "루마니아어(독일)"
+#: ../rules/base.xml.in.h:651
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "에스페란토(포르투갈, 네이티브)"
 
-#: ../rules/base.xml.in.h:653
-msgid "Romanian (Germany, eliminate dead keys)"
-msgstr "루마니아어(독일, 데드키 없음)"
+#. Keyboard indicator for Romanian layouts
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
+msgid "ro"
+msgstr "ro"
 
-#: ../rules/base.xml.in.h:654
-msgid "Romanian (WinKeys)"
-msgstr "루마니아어(윈도우 키)"
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
+msgid "Romanian"
+msgstr "루마니아어"
 
 #: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
 msgstr "루미니아어(세디유)"
 
 #: ../rules/base.xml.in.h:656
-msgid "Romanian (standard cedilla)"
-msgstr "루마니아어(표준 세디유)"
-
-#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard)"
 msgstr "루마니아어(표준)"
 
+#: ../rules/base.xml.in.h:657
+msgid "Romanian (standard cedilla)"
+msgstr "루마니아어(표준 세디유)"
+
 #: ../rules/base.xml.in.h:658
-msgid "Rupee on 4"
-msgstr "루피를 4 키에"
+msgid "Romanian (WinKeys)"
+msgstr "루마니아어(윈도우 키)"
 
-#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "러시아어"
 
 #: ../rules/base.xml.in.h:660
-msgid "Russian (DOS)"
-msgstr "러시아어(DOS)"
+msgid "Russian (phonetic)"
+msgstr "러시아어(음성 표기)"
 
 #: ../rules/base.xml.in.h:661
-msgid "Russian (Georgia)"
-msgstr "러시아어(그루지아)"
+msgid "Russian (phonetic WinKeys)"
+msgstr "러시아어(음성 표기, 윈도우 키)"
 
 #: ../rules/base.xml.in.h:662
-msgid "Russian (Germany, phonetic)"
-msgstr "러시아어(독일, 음성 표기)"
+msgid "Russian (typewriter)"
+msgstr "러시아어(타자기)"
 
 #: ../rules/base.xml.in.h:663
-msgid "Russian (Kazakhstan, with Kazakh)"
-msgstr "러시아어(카자흐스탄, 카자흐어 포함)"
+msgid "Russian (legacy)"
+msgstr "러시아어(구형)"
 
 #: ../rules/base.xml.in.h:664
-msgid "Russian (Poland, phonetic Dvorak)"
-msgstr "러시아어(폴란드, 음성 표기 드보락)"
+msgid "Russian (typewriter, legacy)"
+msgstr "러시아어(타자기, 구형)"
 
 #: ../rules/base.xml.in.h:665
-msgid "Russian (Sweden, phonetic)"
-msgstr "러시아어(스웨덴, 음성 표기)"
+msgid "Tatar"
+msgstr "타타르어"
 
 #: ../rules/base.xml.in.h:666
-msgid "Russian (Sweden, phonetic, eliminate dead keys)"
-msgstr "러시아어(스웨덴, 음성 표기, 데드키 없음)"
+msgid "Ossetian (legacy)"
+msgstr "오세트어(구형)"
 
 #: ../rules/base.xml.in.h:667
-msgid "Russian (US, phonetic)"
-msgstr "러시아어(미국, 음성 표기)"
+msgid "Ossetian (WinKeys)"
+msgstr "오세트어(윈도우 키)"
 
 #: ../rules/base.xml.in.h:668
-msgid "Russian (Ukraine, standard RSTU)"
-msgstr "러시아어(우크라이나, 표준 RSTU)"
+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:669
-msgid "Russian (legacy)"
-msgstr "러시아어(구형)"
+msgid "Chuvash (Latin)"
+msgstr "추바시어(라틴)"
 
 #: ../rules/base.xml.in.h:670
-msgid "Russian (phonetic WinKeys)"
-msgstr "러시아어(음성 표기, 윈도우 키)"
+msgid "Udmurt"
+msgstr "우드무르트어"
 
 #: ../rules/base.xml.in.h:671
-msgid "Russian (phonetic)"
-msgstr "러시아어(음성 표기)"
+msgid "Komi"
+msgstr "코미어"
 
 #: ../rules/base.xml.in.h:672
-msgid "Russian (typewriter)"
-msgstr "러시아어(타자기)"
+msgid "Yakut"
+msgstr "야큐트어"
 
 #: ../rules/base.xml.in.h:673
-msgid "Russian (typewriter, legacy)"
-msgstr "러시아어(타자기, 구형)"
+msgid "Kalmyk"
+msgstr "칼미크어"
 
 #: ../rules/base.xml.in.h:674
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless 키보드"
+msgid "Russian (DOS)"
+msgstr "러시아어(DOS)"
 
 #: ../rules/base.xml.in.h:675
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Serbian (Russia)"
+msgstr "세르비아어(러시아)"
 
 #: ../rules/base.xml.in.h:676
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "Bashkirian"
+msgstr "바시키르어"
 
 #: ../rules/base.xml.in.h:677
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "Mari"
+msgstr "마리어"
 
-#: ../rules/base.xml.in.h:678
-msgid "SK-7100"
-msgstr "SK-7100"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "세르비아어"
 
 #: ../rules/base.xml.in.h:679
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+msgid "Serbian (Cyrillic, Z and ZHE swapped)"
+msgstr "세르비아어(키릴 문자, Z와 ZHE 뒤바꾸기)"
 
 #: ../rules/base.xml.in.h:680
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
+msgid "Serbian (Latin)"
+msgstr "세르비아어(라틴)"
 
-# 사이시얏트(賽夏族) - 타이완 원주민
 #: ../rules/base.xml.in.h:681
-msgid "Saisiyat (Taiwan)"
-msgstr "사이시얏트(타이완)"
+msgid "Serbian (Latin Unicode)"
+msgstr "세르비아어(라틴 유니코드)"
 
 #: ../rules/base.xml.in.h:682
-msgid "Samsung SDM 4500P"
-msgstr "삼성 SDM 4500P"
+msgid "Serbian (Latin qwerty)"
+msgstr "세르비아어(라틴 QWERTY)"
 
 #: ../rules/base.xml.in.h:683
-msgid "Samsung SDM 4510P"
-msgstr "삼성 SDM 4510P"
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "세르비아어(라틴 유니코드 QWERTY)"
 
-# Sanwa Supply - 일본 제조사
 #: ../rules/base.xml.in.h:684
-msgid "Sanwa Supply SKB-KG3"
-msgstr "Sanwa Supply SKB-KG3"
+msgid "Serbian (Cyrillic with guillemets)"
+msgstr "세르비아어(키릴 문자, 각괄호 포함)"
 
 #: ../rules/base.xml.in.h:685
-msgid "Scroll Lock"
-msgstr "Scroll Lock"
+msgid "Serbian (Latin with guillemets)"
+msgstr "세르비아어(라틴, 각괄호 포함)"
 
 #: ../rules/base.xml.in.h:686
-msgid "Semi-colon on third level"
-msgstr "3번째 단계에서 세미콜론"
-
-#: ../rules/base.xml.in.h:687
-msgid "Serbian (Cyrillic with guillemets)"
-msgstr "세르비아어(키릴 문자, 각괄호 포함)"
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "판노니아 루테니아(음성 기호)"
 
+#. Keyboard indicator for Slovenian layouts
 #: ../rules/base.xml.in.h:688
-msgid "Serbian (Cyrillic)"
-msgstr "세르비아어(키릴 문자)"
+msgid "sl"
+msgstr "sl"
 
 #: ../rules/base.xml.in.h:689
-msgid "Serbian (Cyrillic, Z and ZHE swapped)"
-msgstr "세르비아어(키릴 문자, Z와 ZHE 뒤바꾸기)"
+msgid "Slovenian"
+msgstr "슬로베니아어"
 
 #: ../rules/base.xml.in.h:690
-msgid "Serbian (Latin Unicode qwerty)"
-msgstr "세르비아어(라틴 유니코드 QWERTY)"
+msgid "Slovenian (use guillemets for quotes)"
+msgstr "슬로베니아어(따옴표에 각괄호 사용)"
 
 #: ../rules/base.xml.in.h:691
-msgid "Serbian (Latin Unicode)"
-msgstr "세르비아어(라틴 유니코드)"
-
-#: ../rules/base.xml.in.h:692
-msgid "Serbian (Latin qwerty)"
-msgstr "세르비아어(라틴 QWERTY)"
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "슬로베니아어(미국식 키보드, 슬로베니아 문자 포함)"
 
-#: ../rules/base.xml.in.h:693
-msgid "Serbian (Latin with guillemets)"
-msgstr "세르비아어(라틴, 각괄호 포함)"
+#. Keyboard indicator for Slovak layouts
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
+msgid "sk"
+msgstr "sk"
 
-#: ../rules/base.xml.in.h:694
-msgid "Serbian (Latin)"
-msgstr "세르비아어(라틴)"
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
+msgid "Slovak"
+msgstr "슬로바키아어"
 
 #: ../rules/base.xml.in.h:695
-msgid "Serbian (Russia)"
-msgstr "세르비아어(러시아)"
+msgid "Slovak (extended Backslash)"
+msgstr "슬로바키아어(확장 백슬래시)"
 
 #: ../rules/base.xml.in.h:696
-msgid "Serbo-Croatian (US)"
-msgstr "세르보크로아트어(미국)"
+msgid "Slovak (qwerty)"
+msgstr "슬로바키아어(QWERTY)"
 
 #: ../rules/base.xml.in.h:697
-msgid "Shift cancels Caps Lock"
-msgstr "Shift를 누르면 Caps Lock 끄기"
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "슬로바키아어(QWERTY, 백슬래시 확장)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
-msgstr "Shift를 누르면 Num Lock을 끄지 않고, 3번째 단계를 선택"
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
+msgid "Spanish"
+msgstr "스페인어"
 
 #: ../rules/base.xml.in.h:699
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift와 동시에 숫자 키패드 키를 누르면 MS 윈도우즈와 동일하게 동작"
+msgid "Spanish (eliminate dead keys)"
+msgstr "스페인어(데드키 없음)"
 
 #: ../rules/base.xml.in.h:700
-msgid "Shift+Caps Lock"
-msgstr "Shift+Caps Lock"
+msgid "Spanish (include dead tilde)"
+msgstr "스페인어(물결 데드키 포함)"
 
-# 인도
 #: ../rules/base.xml.in.h:701
-msgid "Sindhi"
-msgstr "신디어"
+msgid "Spanish (Sun dead keys)"
+msgstr "스페인어(썬 데드키)"
 
 #: ../rules/base.xml.in.h:702
-msgid "Sinhala (phonetic)"
-msgstr "싱할라어(음성 기호)"
+msgid "Spanish (Dvorak)"
+msgstr "스페인어(드보락)"
 
+# 아스투리아스 - 스페인 지역
 #: ../rules/base.xml.in.h:703
-msgid "Slovak"
-msgstr "슬로바키아어"
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "아스투리아스어(스페인, 가운데점 H 및 가운데점 L 포함)"
 
 #: ../rules/base.xml.in.h:704
-msgid "Slovak (extended Backslash)"
-msgstr "슬로바키아어(확장 백슬래시)"
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "카탈로니아어(스페인, 가운데점 L 포함)"
 
 #: ../rules/base.xml.in.h:705
-msgid "Slovak (qwerty)"
-msgstr "슬로바키아어(QWERTY)"
-
-#: ../rules/base.xml.in.h:706
-msgid "Slovak (qwerty, extended Backslash)"
-msgstr "슬로바키아어(QWERTY, 백슬래시 확장)"
+msgid "Spanish (Macintosh)"
+msgstr "스페인어(매킨토시)"
 
-#: ../rules/base.xml.in.h:707
-msgid "Slovenian"
-msgstr "슬로베니아어"
+#. Keyboard indicator for Swedish layouts
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
+msgid "sv"
+msgstr "sv"
 
-#: ../rules/base.xml.in.h:708
-msgid "Slovenian (US keyboard with Slovenian letters)"
-msgstr "슬로베니아어(미국식 키보드, 슬로베니아 문자 포함)"
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
+msgid "Swedish"
+msgstr "스웨덴어"
 
 #: ../rules/base.xml.in.h:709
-msgid "Slovenian (use guillemets for quotes)"
-msgstr "슬로베니아어(따옴표에 각괄호 사용)"
+msgid "Swedish (eliminate dead keys)"
+msgstr "스웨덴어(데드키 없음)"
 
 #: ../rules/base.xml.in.h:710
-msgid "Spanish"
-msgstr "스페인어"
+msgid "Swedish (Dvorak)"
+msgstr "스웨덴어(드보락)"
 
 #: ../rules/base.xml.in.h:711
-msgid "Spanish (Dvorak)"
-msgstr "스페인어(드보락)"
+msgid "Russian (Sweden, phonetic)"
+msgstr "러시아어(스웨덴, 음성 표기)"
 
 #: ../rules/base.xml.in.h:712
-msgid "Spanish (Latin American)"
-msgstr "스페인어(라틴 아메리카)"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "러시아어(스웨덴, 음성 표기, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:713
-msgid "Spanish (Latin American, Sun dead keys)"
-msgstr "스페인어(라틴 아메리카, 썬 데드키)"
+msgid "Northern Saami (Sweden)"
+msgstr "북 사오미(스웨덴)"
 
 #: ../rules/base.xml.in.h:714
-msgid "Spanish (Latin American, eliminate dead keys)"
-msgstr "스페인어(라틴 아메리카, 데드키 없음)"
+msgid "Swedish (Macintosh)"
+msgstr "스웨덴어(매킨토시)"
 
 #: ../rules/base.xml.in.h:715
-msgid "Spanish (Latin American, include dead tilde)"
-msgstr "스페인어(라틴 아메리카, 물결 데드키 포함)"
+msgid "Swedish (Svdvorak)"
+msgstr "스웨덴어(SV 드보락)"
 
 #: ../rules/base.xml.in.h:716
-msgid "Spanish (Macintosh)"
-msgstr "스페인어(매킨토시)"
+msgid "Swedish Sign Language"
+msgstr "스웨덴 기호 언어"
 
 #: ../rules/base.xml.in.h:717
-msgid "Spanish (Sun dead keys)"
-msgstr "스페인어(썬 데드키)"
+msgid "German (Switzerland)"
+msgstr "독일어(스위스)"
 
 #: ../rules/base.xml.in.h:718
-msgid "Spanish (eliminate dead keys)"
-msgstr "스페인어(데드키 없음)"
+msgid "German (Switzerland, legacy)"
+msgstr "독일어(스위스, 구형)"
 
 #: ../rules/base.xml.in.h:719
-msgid "Spanish (include dead tilde)"
-msgstr "스페인어(물결 데드키 포함)"
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "독일어(스위스, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:720
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "특수 키는(Ctrl+Alt+&lt;키&gt;) 서버에서 처리"
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "독일어(스위스, 썬 데드키)"
 
 #: ../rules/base.xml.in.h:721
-msgid "Sun Type 5/6"
-msgstr "썬 타입 5/6"
+msgid "French (Switzerland)"
+msgstr "프랑스어(스위스)"
 
 #: ../rules/base.xml.in.h:722
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power 멀티미디어 키보드"
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "프랑스어(스위스, 데드키 없음)"
 
 #: ../rules/base.xml.in.h:723
-msgid "Swahili (Kenya)"
-msgstr "스와힐리어(케냐)"
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "프랑스어(스위스, 썬 데드키)"
 
 #: ../rules/base.xml.in.h:724
-msgid "Swahili (Tanzania)"
-msgstr "스와힐리어(탄자니아)"
+msgid "French (Switzerland, Macintosh)"
+msgstr "프랑스어(스위스, 매킨토시)"
 
 #: ../rules/base.xml.in.h:725
-msgid "Swap Ctrl and Caps Lock"
-msgstr "Ctrl과 Caps Lock 뒤바꾸기"
+msgid "German (Switzerland, Macintosh)"
+msgstr "독일어(스위스, 매킨토시)"
 
 #: ../rules/base.xml.in.h:726
-msgid "Swap ESC and Caps Lock"
-msgstr "ESC와 Caps Lock 뒤바꾸기"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swedish"
-msgstr "스웨덴어"
+msgid "Arabic (Syria)"
+msgstr "아랍어(시리아)"
 
+#. Keyboard indicator for Syriac layouts
 #: ../rules/base.xml.in.h:728
-msgid "Swedish (Dvorak)"
-msgstr "스웨덴어(드보락)"
+msgid "syc"
+msgstr "syc"
 
 #: ../rules/base.xml.in.h:729
-msgid "Swedish (Macintosh)"
-msgstr "스웨덴어(매킨토시)"
+msgid "Syriac"
+msgstr "시리아어"
 
 #: ../rules/base.xml.in.h:730
-msgid "Swedish (Svdvorak)"
-msgstr "스웨덴어(SV 드보락)"
+msgid "Syriac (phonetic)"
+msgstr "시리아어(음성 기호)"
 
 #: ../rules/base.xml.in.h:731
-msgid "Swedish (eliminate dead keys)"
-msgstr "스웨덴어(데드키 없음)"
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "쿠르드어(시리아, 라틴 Q)"
 
 #: ../rules/base.xml.in.h:732
-msgid "Swedish Sign Language"
-msgstr "스웨덴 기호 언어"
+msgid "Kurdish (Syria, F)"
+msgstr "쿠르드어(시리아, F)"
 
 #: ../rules/base.xml.in.h:733
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook(타블렛 PC)"
-
-#: ../rules/base.xml.in.h:734
-msgid "Syriac"
-msgstr "시리아어"
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "쿠르드어(시리아, 라틴 Alt-Q)"
 
+#. Keyboard indicator for Tajik layouts
 #: ../rules/base.xml.in.h:735
-msgid "Syriac (phonetic)"
-msgstr "시리아어(음성 기호)"
+msgid "tg"
+msgstr "tg"
 
 #: ../rules/base.xml.in.h:736
-msgid "Taiwanese"
-msgstr "타이완"
-
-#: ../rules/base.xml.in.h:737
-msgid "Taiwanese (indigenous)"
-msgstr "타이완(원주민)"
-
-#: ../rules/base.xml.in.h:738
 msgid "Tajik"
 msgstr "타지키스탄"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "타지키스탄(구형)"
 
+#. Keyboard indicator for Sinhala layouts
+#: ../rules/base.xml.in.h:739
+msgid "si"
+msgstr "si"
+
 #: ../rules/base.xml.in.h:740
-msgid "Tamil"
-msgstr "타밀어"
+msgid "Sinhala (phonetic)"
+msgstr "싱할라어(음성 기호)"
 
 #: ../rules/base.xml.in.h:741
-msgid "Tamil (Sri Lanka, TAB Typewriter)"
-msgstr "타밀어(스리랑카, TAB 타자기)"
-
-#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "타밀어(스리랑카, 유니코드)"
 
-#: ../rules/base.xml.in.h:743
-msgid "Tamil (TAB typewriter)"
-msgstr "타밀어(TAB 타자기)"
+#: ../rules/base.xml.in.h:742
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "타밀어(스리랑카, TAB 타자기)"
 
+#. Keyboard indicator for Thai layouts
 #: ../rules/base.xml.in.h:744
-msgid "Tamil (TSCII typewriter)"
-msgstr "타밀어(TSCII 타자기)"
+msgid "th"
+msgstr "th"
 
 #: ../rules/base.xml.in.h:745
-msgid "Tamil (Unicode)"
-msgstr "타밀어(유니코드)"
+msgid "Thai"
+msgstr "타이어"
 
 #: ../rules/base.xml.in.h:746
-msgid "Tamil (keyboard with numerals)"
-msgstr "타밀어(숫자 포함 키보드)"
+msgid "Thai (TIS-820.2538)"
+msgstr "타이어(TIS-820.2538)"
 
 #: ../rules/base.xml.in.h:747
-msgid "Targa Visionary 811"
-msgstr "Targa Visionary 811"
-
-#: ../rules/base.xml.in.h:748
-msgid "Tatar"
-msgstr "타타르어"
+msgid "Thai (Pattachote)"
+msgstr "타이어(Pattachote)"
 
-#: ../rules/base.xml.in.h:749
-msgid "Telugu"
-msgstr "텔루구어"
+#. Keyboard indicator for Turkish layouts
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
+msgid "tr"
+msgstr "tr"
 
-#: ../rules/base.xml.in.h:750
-msgid "Thai"
-msgstr "타이어"
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
+msgid "Turkish"
+msgstr "터키어"
 
 #: ../rules/base.xml.in.h:751
-msgid "Thai (Pattachote)"
-msgstr "타이어(Pattachote)"
+msgid "Turkish (F)"
+msgstr "터키어(F)"
 
 #: ../rules/base.xml.in.h:752
-msgid "Thai (TIS-820.2538)"
-msgstr "타이어(TIS-820.2538)"
+msgid "Turkish (Alt-Q)"
+msgstr "터키어(Alt-Q)"
 
 #: ../rules/base.xml.in.h:753
-msgid "Tibetan"
-msgstr "티베트어"
+msgid "Turkish (Sun dead keys)"
+msgstr "터키어(썬 데드키)"
 
 #: ../rules/base.xml.in.h:754
-msgid "Tibetan (with ASCII numerals)"
-msgstr "티베트어(ASCII 숫자 포함)"
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "쿠르드어(터키, 라틴 Q)"
 
 #: ../rules/base.xml.in.h:755
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "드보락 키보드에서 해당하는 키로."
+msgid "Kurdish (Turkey, F)"
+msgstr "쿠르드어(터키, F)"
 
 #: ../rules/base.xml.in.h:756
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "QWERTY 키보드에서 해당하는 키로."
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "쿠르드어(터키, 라틴 Alt-Q)"
 
 #: ../rules/base.xml.in.h:757
-msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr "포인터키를 Shift + NumLock 키로 토글."
-
-#: ../rules/base.xml.in.h:758
-msgid "Toshiba Satellite S3000"
-msgstr "도시바 Satellite S3000"
+msgid "Turkish (international with dead keys)"
+msgstr "터키어(국제 버전, 데드키 포함)"
 
-#: ../rules/base.xml.in.h:759
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access 키보드"
+#. Keyboard indicator for Crimean Tatar layouts
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
+msgid "crh"
+msgstr "crh"
 
 #: ../rules/base.xml.in.h:760
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "크림타타르(터키어 Q)"
 
 #: ../rules/base.xml.in.h:761
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
+msgid "Crimean Tatar (Turkish F)"
+msgstr "크림타타르(터키어 F)"
 
 #: ../rules/base.xml.in.h:762
-msgid "Tswana"
-msgstr "츠와나어"
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "크림타타르(터키어 Alt-Q)"
 
 #: ../rules/base.xml.in.h:763
-msgid "Turkish"
-msgstr "터키어"
+msgid "Taiwanese"
+msgstr "타이완"
 
 #: ../rules/base.xml.in.h:764
-msgid "Turkish (Alt-Q)"
-msgstr "터키어(Alt-Q)"
-
-#: ../rules/base.xml.in.h:765
-msgid "Turkish (F)"
-msgstr "터키어(F)"
+msgid "Taiwanese (indigenous)"
+msgstr "타이완(원주민)"
 
+#. Keyboard indicator for Saisiyat layouts
 #: ../rules/base.xml.in.h:766
-msgid "Turkish (Sun dead keys)"
-msgstr "터키어(썬 데드키)"
+msgid "xsy"
+msgstr "xsy"
 
+# 사이시얏트(賽夏族) - 타이완 원주민
 #: ../rules/base.xml.in.h:767
-msgid "Turkish (international with dead keys)"
-msgstr "터키어(국제 버전, 데드키 포함)"
-
-#: ../rules/base.xml.in.h:768
-msgid "Turkmen"
-msgstr "투르크멘어"
+msgid "Saisiyat (Taiwan)"
+msgstr "사이시얏트(타이완)"
 
-#: ../rules/base.xml.in.h:769
-msgid "Turkmen (Alt-Q)"
-msgstr "투르크멘어(Alt-Q)"
+#. Keyboard indicator for Ukranian layouts
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
+msgid "uk"
+msgstr "uk"
 
-#: ../rules/base.xml.in.h:770
-msgid "TypeMatrix EZ-Reach 2020"
-msgstr "TypeMatrix EZ-Reach 2020"
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
+msgid "Ukrainian"
+msgstr "우크라이나어"
 
 #: ../rules/base.xml.in.h:771
-msgid "TypeMatrix EZ-Reach 2030 PS2"
-msgstr "TypeMatrix EZ-Reach 2030 PS2"
+msgid "Ukrainian (phonetic)"
+msgstr "우크라이나어(음성 기호)"
 
 #: ../rules/base.xml.in.h:772
-msgid "TypeMatrix EZ-Reach 2030 USB"
-msgstr "TypeMatrix EZ-Reach 2030 USB"
+msgid "Ukrainian (typewriter)"
+msgstr "우크라이나어(타자기)"
 
 #: ../rules/base.xml.in.h:773
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB(102/105:유럽 모드)"
+msgid "Ukrainian (WinKeys)"
+msgstr "우크라이나어(윈도우 키)"
 
 #: ../rules/base.xml.in.h:774
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB(106:일본 모드)"
+msgid "Ukrainian (legacy)"
+msgstr "우크라이나어(구형)"
 
 #: ../rules/base.xml.in.h:775
-msgid "Udmurt"
-msgstr "우드무르트어"
+msgid "Ukrainian (standard RSTU)"
+msgstr "우크라이나어(표준 RSTU)"
 
 #: ../rules/base.xml.in.h:776
-msgid "Ukrainian"
-msgstr "우크라이나어"
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "러시아어(우크라이나, 표준 RSTU)"
 
 #: ../rules/base.xml.in.h:777
-msgid "Ukrainian (WinKeys)"
-msgstr "우크라이나어(윈도우 키)"
-
-#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (homophonic)"
 msgstr "우크라이나어(homophonic)"
 
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
+msgid "English (UK)"
+msgstr "영어(영국)"
+
 #: ../rules/base.xml.in.h:779
-msgid "Ukrainian (legacy)"
-msgstr "우크라이나어(구형)"
+msgid "English (UK, extended WinKeys)"
+msgstr "영어(영국, 확장 윈도우 키)"
 
 #: ../rules/base.xml.in.h:780
-msgid "Ukrainian (phonetic)"
-msgstr "우크라이나어(음성 기호)"
+msgid "English (UK, international with dead keys)"
+msgstr "영어(영국, 국제 버전, 데드키 포함)"
 
 #: ../rules/base.xml.in.h:781
-msgid "Ukrainian (standard RSTU)"
-msgstr "우크라이나어(표준 RSTU)"
+msgid "English (UK, Dvorak)"
+msgstr "영어(영국, 드보락)"
 
 #: ../rules/base.xml.in.h:782
-msgid "Ukrainian (typewriter)"
-msgstr "우크라이나어(타자기)"
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "영어(영국, 영국 문장 부호 포함 드보락)"
 
 #: ../rules/base.xml.in.h:783
-msgid "Unicode additions (arrows and math operators)"
-msgstr "유니코드 추가(화살표 및 수학 기호)"
+msgid "English (UK, Macintosh)"
+msgstr "영어(영국, 매킨토시)"
 
 #: ../rules/base.xml.in.h:784
-msgid "Unicode additions (arrows and math operators). Math operators on default level"
-msgstr "유니코드 추가(화살표 및 수학 기호). 수학 기호를 기본 단계에"
+msgid "English (UK, Macintosh international)"
+msgstr "영어(영국, 매킨토시 국제 버전)"
 
-# Unitek - 유니텍(unitech)이 아님
 #: ../rules/base.xml.in.h:785
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
+msgid "English (UK, Colemak)"
+msgstr "영어(영국, 콜맥)"
 
-# Urdu - 인도 방언
 #: ../rules/base.xml.in.h:786
-msgid "Urdu (Pakistan)"
-msgstr "우르두어(파키스탄)"
+msgid "Uzbek"
+msgstr "우즈베크어"
 
-# Urdu - 인도 방언
 #: ../rules/base.xml.in.h:787
-msgid "Urdu (Pakistan, CRULP)"
-msgstr "우르두어(파키스탄, CRULP)"
-
-# Urdu - 인도 방언
-#: ../rules/base.xml.in.h:788
-msgid "Urdu (Pakistan, NLA)"
-msgstr "우르두어(파키스탄, NLA)"
+msgid "Uzbek (Latin)"
+msgstr "우즈베크어(라틴)"
 
-# Urdu - 인도 방언
+#. Keyboard indicator for Vietnamese layouts
 #: ../rules/base.xml.in.h:789
-msgid "Urdu (WinKeys)"
-msgstr "우르두어(윈도우 키)"
+msgid "vi"
+msgstr "vi"
 
-# Urdu, 인도 방언
 #: ../rules/base.xml.in.h:790
-msgid "Urdu (alternative phonetic)"
-msgstr "우르두어(다른 음성 기호 버전)"
-
-# Urdu - 인도 방언
-#: ../rules/base.xml.in.h:791
-msgid "Urdu (phonetic)"
-msgstr "우르두어(음성 표기)"
+msgid "Vietnamese"
+msgstr "베트남어"
 
-#: ../rules/base.xml.in.h:792
-msgid "Use keyboard LED to show alternative layout"
-msgstr "키보드 LED에서 다른 키보드 배치 사용 표시"
+#. Keyboard indicator for Korean layouts
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
+msgid "ko"
+msgstr "ko"
 
-#: ../rules/base.xml.in.h:793
-msgid "Using space key to input non-breakable space character"
-msgstr "스페이스 키가 강제 공백 출력."
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
+msgid "Korean"
+msgstr "한국어"
 
 #: ../rules/base.xml.in.h:794
-msgid "Usual space at any level"
-msgstr "모든 단계에서 일반 공백 문자"
+msgid "Korean (101/104 key compatible)"
+msgstr "한국어(101/104키 호환)"
 
 #: ../rules/base.xml.in.h:795
-msgid "Uyghur"
-msgstr "위구르어"
-
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek"
-msgstr "우즈베크어"
+msgid "Japanese (PC-98xx Series)"
+msgstr "일본어(PC-98xx 시리즈)"
 
+#. Keyboard indicator for Irish layouts
 #: ../rules/base.xml.in.h:797
-msgid "Uzbek (Afghanistan)"
-msgstr "우즈베크어(아프가니스탄)"
+msgid "ie"
+msgstr "ie"
 
 #: ../rules/base.xml.in.h:798
-msgid "Uzbek (Afghanistan, OLPC)"
-msgstr "우즈베크어(아프가니스탄, OLPC)"
+msgid "Irish"
+msgstr "아일랜드"
 
+# 아일랜드 변종
 #: ../rules/base.xml.in.h:799
-msgid "Uzbek (Latin)"
-msgstr "우즈베크어(라틴)"
+msgid "CloGaelach"
+msgstr "클로개라치어"
 
 #: ../rules/base.xml.in.h:800
-msgid "Vietnamese"
-msgstr "베트남어"
+msgid "Irish (UnicodeExpert)"
+msgstr "아일랜드(UnicodeExpert)"
 
 #: ../rules/base.xml.in.h:801
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "뷰소닉 KU-306 인터넷 키보드"
+msgid "Ogham"
+msgstr "오검 문자"
 
+# 아일랜드 변종
 #: ../rules/base.xml.in.h:802
-msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
-msgstr "Wang 724 키패드, 유니코드 추가(화살표 및 수학 기호)"
+msgid "Ogham (IS434)"
+msgstr "오검 문자(IS434)"
 
+# Urdu - 인도 방언
 #: ../rules/base.xml.in.h:803
-msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Wang 724 키패드, 유니코드 추가(화살표 및 수학 기호), 수학 기호를 기본 단계에"
+msgid "Urdu (Pakistan)"
+msgstr "우르두어(파키스탄)"
 
+# Urdu - 인도 방언
 #: ../rules/base.xml.in.h:804
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "우르두어(파키스탄, CRULP)"
 
-# 월로프어 - 세네갈, 감비아, 모리타니에서 쓰이는 아프리카 언어
+# Urdu - 인도 방언
 #: ../rules/base.xml.in.h:805
-msgid "Wolof"
-msgstr "월로프어"
+msgid "Urdu (Pakistan, NLA)"
+msgstr "우르두어(파키스탄, NLA)"
 
 #: ../rules/base.xml.in.h:806
-msgid "Yahoo! Internet Keyboard"
-msgstr "야후! 인터넷 키보드"
-
-#: ../rules/base.xml.in.h:807
-msgid "Yakut"
-msgstr "야큐트어"
+msgid "Arabic (Pakistan)"
+msgstr "아랍어(파키스탄)"
 
-# 나이지리아 변종
+#. Keyboard indicator for Sindhi layouts
 #: ../rules/base.xml.in.h:808
-msgid "Yoruba"
-msgstr "요루바어"
+msgid "sd"
+msgstr "sd"
 
+# 인도
 #: ../rules/base.xml.in.h:809
-msgid "Zero-width non-joiner character at second level"
-msgstr "2번째 단계에서 폭 없는 연결 금지 문자"
-
-#: ../rules/base.xml.in.h:810
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
-msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자"
+msgid "Sindhi"
+msgstr "신디어"
 
+#. Keyboard indicator for Dhivehi layouts
 #: ../rules/base.xml.in.h:811
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
-msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자, 4번째에서는 없음"
+msgid "dv"
+msgstr "dv"
 
+# 몰디브 공용어
 #: ../rules/base.xml.in.h:812
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
-msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자, 4번째에서는 얇은 강제 공백 문자"
+msgid "Dhivehi"
+msgstr "디베히어"
 
 #: ../rules/base.xml.in.h:813
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
-msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자, 4번째에서는 폭 없는 연결 문자"
-
-#: ../rules/base.xml.in.h:814
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
-msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 폭 없는 연결 문자"
+msgid "English (South Africa)"
+msgstr "영어(남아공)"
 
+#. Keyboard indicator for Esperanto layouts
 #: ../rules/base.xml.in.h:815
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
-msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 폭 없는 연결 문자, 4번째에서는 강제 공백 문자"
+msgid "eo"
+msgstr "eo"
 
 #: ../rules/base.xml.in.h:816
-msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
-msgstr "3번째 단계에서 폭 없는 연결 금지 문자, 4번째에서는 폭 없는 연결 문자"
+msgid "Esperanto"
+msgstr "에스페란토"
 
-#. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:818
-msgid "ak"
-msgstr "ak"
+#: ../rules/base.xml.in.h:817
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "에스페란토(세미콜론과 따옴표 없애기, 없어진 기능)"
+
+#. Keyboard indicator for Nepali layouts
+#: ../rules/base.xml.in.h:819
+msgid "ne"
+msgstr "ne"
 
-#. Keyboard indicator for Amharic layouts
 #: ../rules/base.xml.in.h:820
-msgid "am"
-msgstr "am"
+msgid "Nepali"
+msgstr "네팔어"
 
-#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:822
-msgid "ar"
-msgstr "ar"
+#: ../rules/base.xml.in.h:821
+msgid "English (Nigeria)"
+msgstr "영어(나이지리아)"
 
-#. Keyboard indicator for Avatime layouts
+#. Keyboard indicator for Igbo layouts
+#: ../rules/base.xml.in.h:823
+msgid "ig"
+msgstr "ig"
+
+# 나이지리아 변종
 #: ../rules/base.xml.in.h:824
-msgid "avn"
-msgstr "avn"
+msgid "Igbo"
+msgstr "이그보어"
 
-#. Keyboard indicator for Azerbaijani layouts
+#. Keyboard indicator for Yoruba layouts
 #: ../rules/base.xml.in.h:826
-msgid "az"
-msgstr "az"
+msgid "yo"
+msgstr "yo"
 
-#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:828
-msgid "be"
-msgstr "be"
+# 나이지리아 변종
+#: ../rules/base.xml.in.h:827
+msgid "Yoruba"
+msgstr "요루바어"
+
+#. Keyboard indicator for Amharic layouts
+#: ../rules/base.xml.in.h:829
+msgid "am"
+msgstr "am"
 
-#. Keyboard indicator for Berber layouts
 #: ../rules/base.xml.in.h:830
-msgid "ber"
-msgstr "ber"
+msgid "Amharic"
+msgstr "암하라어"
 
-#. Keyboard indicator for Bulgarian layouts
+#. Keyboard indicator for Wolof layouts
 #: ../rules/base.xml.in.h:832
-msgid "bg"
-msgstr "bg"
-
-#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
-msgid "bm"
-msgstr "bm"
+msgid "wo"
+msgstr "wo"
 
-#. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:836
-msgid "bn"
-msgstr "bn"
+# 월로프어 - 세네갈, 감비아, 모리타니에서 쓰이는 아프리카 언어
+#: ../rules/base.xml.in.h:833
+msgid "Wolof"
+msgstr "월로프어"
 
 # Braille
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "brl"
 
-#. Keyboard indicator for Bosnian layouts
+#: ../rules/base.xml.in.h:836
+msgid "Braille"
+msgstr "점자"
+
+#: ../rules/base.xml.in.h:837
+msgid "Braille (left hand)"
+msgstr "점자(왼손잡이)"
+
+#: ../rules/base.xml.in.h:838
+msgid "Braille (right hand)"
+msgstr "점자(오른손잡이)"
+
+#. Keyboard indicator for Turkmen layouts
 #: ../rules/base.xml.in.h:840
-msgid "bs"
-msgstr "bs"
+msgid "tk"
+msgstr "tk"
+
+#: ../rules/base.xml.in.h:841
+msgid "Turkmen"
+msgstr "투르크멘어"
 
-#. Keyboard indicator for Belarusian layouts
 #: ../rules/base.xml.in.h:842
-msgid "by"
-msgstr "by"
+msgid "Turkmen (Alt-Q)"
+msgstr "투르크멘어(Alt-Q)"
 
-#. Keyboard indicator for Catalan layouts
+#. Keyboard indicator for Bambara layouts
 #: ../rules/base.xml.in.h:844
-msgid "ca"
-msgstr "ca"
+msgid "bm"
+msgstr "bm"
+
+#: ../rules/base.xml.in.h:845
+msgid "Bambara"
+msgstr "밤바라어"
 
-#. Keyboard indicator for Cherokee layouts
 #: ../rules/base.xml.in.h:846
-msgid "chr"
-msgstr "chr"
+msgid "French (Mali, alternative)"
+msgstr "프랑스어(말리, 다른 버전)"
+
+#: ../rules/base.xml.in.h:847
+msgid "English (Mali, US Macintosh)"
+msgstr "영어(말리, 미국 매킨토시)"
 
-#. Keyboard indicator for Cameroon layouts
 #: ../rules/base.xml.in.h:848
-msgid "cm"
-msgstr "cm"
+msgid "English (Mali, US international)"
+msgstr "영어(말리, 미국 국제 버전)"
 
-#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:850 ../rules/base.extras.xml.in.h:40
-msgid "crh"
-msgstr "crh"
+#. Keyboard indicator for Swahili layouts
+#: ../rules/base.xml.in.h:850
+msgid "sw"
+msgstr "sw"
+
+#: ../rules/base.xml.in.h:851
+msgid "Swahili (Tanzania)"
+msgstr "스와힐리어(탄자니아)"
 
-#. Keyboard indicator for Chech layouts
 #: ../rules/base.xml.in.h:852
-msgid "cs"
-msgstr "cs"
+msgid "Swahili (Kenya)"
+msgstr "스와힐리어(케냐)"
 
-#. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:854
-msgid "da"
-msgstr "da"
+# http://en.wikipedia.org/wiki/Kikuyu#Language
+#: ../rules/base.xml.in.h:853
+msgid "Kikuyu"
+msgstr "키쿠유어"
 
-#. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:856 ../rules/base.extras.xml.in.h:41
-msgid "de"
-msgstr "de"
+#. Keyboard indicator for Tswana layouts
+#: ../rules/base.xml.in.h:855
+msgid "tn"
+msgstr "tn"
 
-#. Keyboard indicator for Dhivehi layouts
+#: ../rules/base.xml.in.h:856
+msgid "Tswana"
+msgstr "츠와나어"
+
+#. Keyboard indicator for Filipino layouts
 #: ../rules/base.xml.in.h:858
-msgid "dv"
-msgstr "dv"
+msgid "ph"
+msgstr "ph"
+
+#: ../rules/base.xml.in.h:859
+msgid "Filipino"
+msgstr "필리핀어"
 
-#. Keyboard indicator for Dzongkha layouts
 #: ../rules/base.xml.in.h:860
-msgid "dz"
-msgstr "dz"
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "필리핀어(QWERTY 베이베이인)"
+
+#: ../rules/base.xml.in.h:861
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "필리핀어(케이프웰 드보락 라틴)"
 
-#. Keyboard indicator for Ewe layouts
 #: ../rules/base.xml.in.h:862
-msgid "ee"
-msgstr "ee"
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "필리핀어(케이프웰 드보락 베이베이인)"
 
-#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:864 ../rules/base.extras.xml.in.h:42
-msgid "en"
-msgstr "en"
+#: ../rules/base.xml.in.h:863
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "필리핀어(케이프웰 QWERF 2006 라틴)"
+
+#: ../rules/base.xml.in.h:864
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "필리핀어(케이프웰 QWERF 2006 베이베이인)"
+
+#: ../rules/base.xml.in.h:865
+msgid "Filipino (Colemak Latin)"
+msgstr "필리핀어(콜맥 라틴)"
 
-#. Keyboard indicator for Esperanto layouts
 #: ../rules/base.xml.in.h:866
-msgid "eo"
-msgstr "eo"
+msgid "Filipino (Colemak Baybayin)"
+msgstr "필리핀어(콜맥 베이베이인)"
+
+#: ../rules/base.xml.in.h:867
+msgid "Filipino (Dvorak Latin)"
+msgstr "필리핀어(드보락 라틴)"
 
-#. Keyboard indicator for Spanish layouts
 #: ../rules/base.xml.in.h:868
-msgid "es"
-msgstr "es"
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "필리핀어(드보락 베이베이인)"
+
+#: ../rules/base.xml.in.h:869
+msgid "md"
+msgstr "md"
 
-#. Keyboard indicator for Estonian layouts
 #: ../rules/base.xml.in.h:870
-msgid "et"
-msgstr "et"
+msgid "Moldavian"
+msgstr "몰디브어"
 
-#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:43
-msgid "fa"
-msgstr "fa"
+#: ../rules/base.xml.in.h:871
+msgid "gag"
+msgstr "gag"
+
+# 가가우지아 지역의 몰디브어
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "몰티브어(가가우지아)"
+
+#: ../rules/base.xml.in.h:873
+msgid "Key(s) to change layout"
+msgstr "배치를 전환하는 키"
 
-#. Keyboard indicator for Fula layouts
 #: ../rules/base.xml.in.h:874
-msgid "ff"
-msgstr "ff"
+msgid "Right Alt (while pressed)"
+msgstr "오른쪽 Alt(누르고 있는 동안)"
+
+#: ../rules/base.xml.in.h:875
+msgid "Left Alt (while pressed)"
+msgstr "왼쪽 Alt(누르고 있는 동안)"
 
-#. Keyboard indicator for Finnish layouts
 #: ../rules/base.xml.in.h:876
-msgid "fi"
-msgstr "fi"
+msgid "Left Win (while pressed)"
+msgstr "왼쪽 윈도우(누르고 있는 동안)"
+
+#: ../rules/base.xml.in.h:877
+msgid "Right Win (while pressed)"
+msgstr "오른쪽 윈도우(누르고 있는 동안)"
 
-#. Keyboard indicator for Faroese layouts
 #: ../rules/base.xml.in.h:878
-msgid "fo"
-msgstr "fo"
+msgid "Any Win key (while pressed)"
+msgstr "모든 윈도우 키(누르고 있는 동안)"
 
-#. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:880 ../rules/base.extras.xml.in.h:44
-msgid "fr"
-msgstr "fr"
+#: ../rules/base.xml.in.h:879
+msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
+msgstr "Caps Lock(누르고 있는 동안), Alt+Caps Lock을 누르면 원래 Caps Lock 기능"
+
+#: ../rules/base.xml.in.h:880
+msgid "Right Ctrl (while pressed)"
+msgstr "오른쪽 Ctrl(누르고 있는 동안)"
+
+#: ../rules/base.xml.in.h:881
+msgid "Right Alt"
+msgstr "오른쪽 Alt"
 
-#. Keyboard indicator for Ga layouts
 #: ../rules/base.xml.in.h:882
-msgid "gaa"
-msgstr "gaa"
+msgid "Left Alt"
+msgstr "왼쪽 Alt"
+
+#: ../rules/base.xml.in.h:883
+msgid "Caps Lock"
+msgstr "Caps Lock"
 
-#. Keyboard indicator for Greek layouts
 #: ../rules/base.xml.in.h:884
-msgid "gr"
-msgstr "gr"
+msgid "Shift+Caps Lock"
+msgstr "Shift+Caps Lock"
+
+#: ../rules/base.xml.in.h:885
+msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
+msgstr "Caps Lock(1번으로), Shift+Caps Lock(마지막으로)"
 
-#. Keyboard indicator for Gujarati layouts
 #: ../rules/base.xml.in.h:886
-msgid "gu"
-msgstr "gu"
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "왼쪽 윈도우(1번으로), 오른쪽 윈도우/메뉴(마지막으로)"
+
+#: ../rules/base.xml.in.h:887
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "왼쪽 Ctrl(1번 키보드 배치로), 오른쪽 Ctrl (마지막 키보드 배치로)"
 
-#. Keyboard indicator for Hausa layouts
 #: ../rules/base.xml.in.h:888
-msgid "ha"
-msgstr "ha"
+msgid "Alt+Caps Lock"
+msgstr "Alt+Caps Lock"
 
-#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:890 ../rules/base.extras.xml.in.h:45
-msgid "he"
-msgstr "he"
+#: ../rules/base.xml.in.h:889
+msgid "Both Shift keys together"
+msgstr "Shift 키 2개 동시 누름"
+
+#: ../rules/base.xml.in.h:890
+msgid "Both Alt keys together"
+msgstr "Alt 키 2개 동시 누름"
+
+#: ../rules/base.xml.in.h:891
+msgid "Both Ctrl keys together"
+msgstr "Ctrl 키 2개 동시 누름"
 
-#. Keyboard indicator for Hindi layouts
 #: ../rules/base.xml.in.h:892
-msgid "hi"
-msgstr "hi"
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../rules/base.xml.in.h:893
+msgid "Left Ctrl+Left Shift"
+msgstr "왼쪽 Ctrl+왼쪽 Shift"
 
-#. Keyboard indicator for Croatian layouts
 #: ../rules/base.xml.in.h:894
-msgid "hr"
-msgstr "hr"
+msgid "Right Ctrl+Right Shift"
+msgstr "오른쪽 Ctrl+오른쪽 Alt"
+
+#: ../rules/base.xml.in.h:895
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
 
-#. Keyboard indicator for Hungarian layouts
 #: ../rules/base.xml.in.h:896
-msgid "hu"
-msgstr "hu"
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
 
-#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:898 ../rules/base.extras.xml.in.h:46
-msgid "hy"
-msgstr "hy"
+#: ../rules/base.xml.in.h:897
+msgid "Left Alt+Left Shift"
+msgstr "왼쪽 Alt+왼쪽 Shift"
+
+#: ../rules/base.xml.in.h:898
+msgid "Alt+Space"
+msgstr "Alt+스페이스"
+
+#: ../rules/base.xml.in.h:899
+msgid "Menu"
+msgstr "메뉴"
 
-#. Keyboard indicator for Irish layouts
 #: ../rules/base.xml.in.h:900
-msgid "ie"
-msgstr "ie"
+msgid "Left Win"
+msgstr "왼쪽 윈도우"
+
+#: ../rules/base.xml.in.h:901
+msgid "Right Win"
+msgstr "오른쪽 윈도우"
 
-#. Keyboard indicator for Igbo layouts
 #: ../rules/base.xml.in.h:902
-msgid "ig"
-msgstr "ig"
+msgid "Left Shift"
+msgstr "왼쪽 Shift"
+
+#: ../rules/base.xml.in.h:903
+msgid "Right Shift"
+msgstr "오른쪽 Shift"
 
-#. Keyboard indicator for Inuktikut layouts
 #: ../rules/base.xml.in.h:904
-msgid "ike"
-msgstr "ike"
+msgid "Left Ctrl"
+msgstr "왼쪽 Ctrl"
+
+#: ../rules/base.xml.in.h:905
+msgid "Right Ctrl"
+msgstr "오른쪽 Ctrl"
 
-#. Keyboard indicator for Indian layouts
 #: ../rules/base.xml.in.h:906
-msgid "in"
-msgstr "in"
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#: ../rules/base.xml.in.h:907
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgstr "왼쪽 Ctrl+왼쪽 윈도우(1번 키보드 배치로), 오른쪽 Ctrl+Menu (2번째 키보드 배치로)"
 
-#. Keyboard indicator for Icelandic layouts
 #: ../rules/base.xml.in.h:908
-msgid "is"
-msgstr "is"
+msgid "Key to choose 3rd level"
+msgstr "3번째 단계를 선택하는 키"
+
+#: ../rules/base.xml.in.h:909
+msgid "Any Win key"
+msgstr "모든 윈도우 키"
 
-#. Keyboard indicator for Italian layouts
 #: ../rules/base.xml.in.h:910
-msgid "it"
-msgstr "it"
+msgid "Any Alt key"
+msgstr "모든 Alt 키"
+
+#: ../rules/base.xml.in.h:911
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "오른쪽 Alt, Shift+오른쪽 Alt가 Multi_Key"
 
-#. Keyboard indicator for Japanese layouts
 #: ../rules/base.xml.in.h:912
-msgid "ja"
-msgstr "ja"
+msgid "Right Alt key never chooses 3rd level"
+msgstr "오른쪽 Alt는 3번째 단계를 선택하지 않음"
+
+#: ../rules/base.xml.in.h:913
+msgid "Enter on keypad"
+msgstr "키패드에 Enter"
 
-#. Keyboard indicator for Georgian layouts
 #: ../rules/base.xml.in.h:914
-msgid "ka"
-msgstr "ka"
+msgid "Backslash"
+msgstr "백슬래시"
+
+#: ../rules/base.xml.in.h:915
+msgid "&lt;Less/Greater&gt;"
+msgstr "&lt; 및 &gt;"
 
-#. Keyboard indicator for Kikuyu layouts
 #: ../rules/base.xml.in.h:916
-msgid "ki"
-msgstr "ki"
+msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "Caps Lock으로 3번째 단계 선택, 다른 3번째 단계 선택 키와 같이 누르면 고정"
+
+#: ../rules/base.xml.in.h:917
+msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "백슬래시로 3번째 단계 선택, 다른 3번째 단계 선택 키와 같이 누르면 고정"
 
-#. Keyboard indicator for Kazakh layouts
 #: ../rules/base.xml.in.h:918
-msgid "kk"
-msgstr "kk"
+msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "&lt; 및 &gt; 키로 3번째 단계 선택, 다른 3번째 단계 선택 키와 같이 누르면 고정"
+
+#: ../rules/base.xml.in.h:919
+msgid "Ctrl key position"
+msgstr "Ctrl 키 위치"
 
-#. Keyboard indicator for Khmer layouts
 #: ../rules/base.xml.in.h:920
-msgid "km"
-msgstr "km"
+msgid "Caps Lock as Ctrl"
+msgstr "Caps Lock 키를 Ctrl 키로"
+
+#: ../rules/base.xml.in.h:921
+msgid "Left Ctrl as Meta"
+msgstr "왼쪽 Ctrl 키를 Meta 키로"
 
-#. Keyboard indicator for Kannada layouts
 #: ../rules/base.xml.in.h:922
-msgid "kn"
-msgstr "kn"
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Ctrl과 Caps Lock 뒤바꾸기"
+
+#: ../rules/base.xml.in.h:923
+msgid "At left of 'A'"
+msgstr "'A' 왼쪽에"
 
-#. Keyboard indicator for Korean layouts
 #: ../rules/base.xml.in.h:924
-msgid "ko"
-msgstr "ko"
+msgid "At bottom left"
+msgstr "맨 아래 왼쪽에"
+
+#: ../rules/base.xml.in.h:925
+msgid "Right Ctrl as Right Alt"
+msgstr "오른쪽 Ctrl 키를 오른쪽 Alt 키로"
 
-#. Keyboard indicator for Kurdish layouts
 #: ../rules/base.xml.in.h:926
-msgid "ku"
-msgstr "ku"
+msgid "Menu as Right Ctrl"
+msgstr "Menu 키를 오른쪽 Ctrl 키로"
+
+#: ../rules/base.xml.in.h:927
+msgid "Right Alt as Right Ctrl"
+msgstr "오른쪽 Alt 키를 오른쪽 Ctrl 키로"
 
-#. Keyboard indicator for Lao layouts
 #: ../rules/base.xml.in.h:928
-msgid "lo"
-msgstr "lo"
+msgid "Use keyboard LED to show alternative layout"
+msgstr "키보드 LED에서 다른 키보드 배치 사용 표시"
 
-#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:930 ../rules/base.extras.xml.in.h:48
-msgid "lt"
-msgstr "lt"
+#: ../rules/base.xml.in.h:929
+msgid "Num Lock"
+msgstr "Num Lock"
 
-#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:932 ../rules/base.extras.xml.in.h:49
-msgid "lv"
-msgstr "lv"
+#: ../rules/base.xml.in.h:930
+msgid "Numeric keypad layout selection"
+msgstr "숫자 키패드 배치 선택"
+
+#: ../rules/base.xml.in.h:931
+msgid "Legacy"
+msgstr "구형 방식"
+
+#: ../rules/base.xml.in.h:932
+msgid "Unicode additions (arrows and math operators)"
+msgstr "유니코드 추가(화살표 및 수학 기호)"
+
+#: ../rules/base.xml.in.h:933
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "유니코드 추가(화살표 및 수학 기호). 수학 기호를 기본 단계에"
 
-#. Keyboard indicator for Maori layouts
 #: ../rules/base.xml.in.h:934
-msgid "mi"
-msgstr "mi"
+msgid "Legacy Wang 724"
+msgstr "구형 방식 Wang 724 키패드"
+
+#: ../rules/base.xml.in.h:935
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr "Wang 724 키패드, 유니코드 추가(화살표 및 수학 기호)"
 
-#. Keyboard indicator for Macedonian layouts
 #: ../rules/base.xml.in.h:936
-msgid "mk"
-msgstr "mk"
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Wang 724 키패드, 유니코드 추가(화살표 및 수학 기호), 수학 기호를 기본 단계에"
+
+#: ../rules/base.xml.in.h:937
+msgid "Hexadecimal"
+msgstr "십육진법"
 
-#. Keyboard indicator for Malayalam layouts
 #: ../rules/base.xml.in.h:938
-msgid "ml"
-msgstr "ml"
+msgid "ATM/phone-style"
+msgstr "ATM/전화기형태"
+
+#: ../rules/base.xml.in.h:939
+msgid "Numeric keypad delete key behaviour"
+msgstr "숫자 키패드의 Delete 키 동작"
 
-#. Keyboard indicator for Mongolian layouts
 #: ../rules/base.xml.in.h:940
-msgid "mn"
-msgstr "mn"
+msgid "Legacy key with dot"
+msgstr "구형 방식 키, 점 포함"
 
-#. Keyboard indicator for Maltese layouts
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:942
-msgid "mt"
-msgstr "mt"
+msgid "Legacy key with comma"
+msgstr "구형 방식 키, 쉼표 포함"
+
+#: ../rules/base.xml.in.h:943
+msgid "Four-level key with dot"
+msgstr "네번째 단계, 점 사용"
 
-#. Keyboard indicator for Burmese layouts
 #: ../rules/base.xml.in.h:944
-msgid "my"
-msgstr "my"
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "네번째 단계, 점 사용, latin-9 제한 사항"
 
-#. Keyboard indicator for Nepali layouts
+#: ../rules/base.xml.in.h:945
+msgid "Four-level key with comma"
+msgstr "네번째 단계, 쉼표 사용"
+
+# momayyez: http://en.wikipedia.org/wiki/Momayyez
 #: ../rules/base.xml.in.h:946
-msgid "ne"
-msgstr "ne"
+msgid "Four-level key with momayyez"
+msgstr "네번째 단계, 아랍식 쉼표 (momayyez) 사용"
 
-#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:948
-msgid "nl"
-msgstr "nl"
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:949
+msgid "Four-level key with abstract separators"
+msgstr "네번째 단계, 가상 구분 문자 사용"
 
-#. Keyboard indicator for Norwegian layouts
 #: ../rules/base.xml.in.h:950
-msgid "no"
-msgstr "no"
+msgid "Semi-colon on third level"
+msgstr "3번째 단계에서 세미콜론"
+
+#: ../rules/base.xml.in.h:951
+msgid "Caps Lock key behavior"
+msgstr "Caps Lock 키 동작"
 
-#. Keyboard indicator for Oriya layouts
 #: ../rules/base.xml.in.h:952
-msgid "or"
-msgstr "or"
+msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock이 내부 대문자 기능 사용. Shift가 Caps Lock을 \"일시 중지\""
+
+#: ../rules/base.xml.in.h:953
+msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
+msgstr "Caps Lock이 내부 대문자 기능 사용. Shift가 Caps Lock 상태에 영향 없음"
 
-#. Keyboard indicator for Punjabi layouts
 #: ../rules/base.xml.in.h:954
-msgid "pa"
-msgstr "pa"
+msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock이 Shift처럼 동작하고 상태 고정, Shift가 Caps Lock을 \"일시 중지\""
+
+#: ../rules/base.xml.in.h:955
+msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
+msgstr "Caps Lock이 Shift처럼 동작하고 상태 고정, Shift가 Caps Lock 상태에 영향 없음"
 
-#. Keyboard indicator for Filipino layouts
 #: ../rules/base.xml.in.h:956
-msgid "ph"
-msgstr "ph"
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgstr "Caps Lock이 일반적인 알파벳 대문자 상태를 토글"
 
-#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:958 ../rules/base.extras.xml.in.h:50
-msgid "pl"
-msgstr "pl"
+#: ../rules/base.xml.in.h:957
+msgid "Make Caps Lock an additional Num Lock"
+msgstr "Caps Lock을 추가 Num Lock으로 사용"
+
+#: ../rules/base.xml.in.h:958
+msgid "Swap ESC and Caps Lock"
+msgstr "ESC와 Caps Lock 뒤바꾸기"
+
+#: ../rules/base.xml.in.h:959
+msgid "Make Caps Lock an additional ESC"
+msgstr "Caps Lock을 추가 ESC로 사용"
 
-#. Keyboard indicator for Pashto layouts
 #: ../rules/base.xml.in.h:960
-msgid "ps"
-msgstr "ps"
+msgid "Make Caps Lock an additional Backspace"
+msgstr "Caps Lock을 추가 백스페이스로 사용"
+
+#: ../rules/base.xml.in.h:961
+msgid "Make Caps Lock an additional Super"
+msgstr "Caps Lock을 추가 Super로 사용"
 
-#. Keyboard indicator for Portuguese layouts
 #: ../rules/base.xml.in.h:962
-msgid "pt"
-msgstr "pt"
+msgid "Make Caps Lock an additional Hyper"
+msgstr "Caps Lock을 추가 Hyper로 사용"
 
-#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:964 ../rules/base.extras.xml.in.h:51
-msgid "ro"
-msgstr "ro"
+#: ../rules/base.xml.in.h:963
+msgid "Caps Lock toggles Shift so all keys are affected"
+msgstr "Caps Lock이 Shift 상태를 토글, 즉 모든 키가 영향을 받음"
 
-#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:966 ../rules/base.extras.xml.in.h:52
-msgid "ru"
-msgstr "ru"
+#: ../rules/base.xml.in.h:964
+msgid "Caps Lock is disabled"
+msgstr "Caps Lock 사용 안 함"
+
+#: ../rules/base.xml.in.h:965
+msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
+msgstr "Caps Lock을 추가 Ctrl로 사용, 하지만 Caps_Lock 키심볼 유지"
+
+#: ../rules/base.xml.in.h:966
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win 키 동작"
+
+#: ../rules/base.xml.in.h:967
+msgid "Add the standard behavior to Menu key"
+msgstr "메뉴 키에 기본 동작 추가"
 
-#. Keyboard indicator for Sindhi layouts
 #: ../rules/base.xml.in.h:968
-msgid "sd"
-msgstr "sd"
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt와 Meta를 Alt 키에"
+
+#: ../rules/base.xml.in.h:969
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Ctrl 키를 윈도우 키로 매핑(그리고 일반 Ctrl 키로도 동작)"
 
-#. Keyboard indicator for Sinhala layouts
 #: ../rules/base.xml.in.h:970
-msgid "si"
-msgstr "si"
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Ctrl 키를 윈도우 키로 매핑, Alt 키를 윈도우 키로 매핑"
+
+#: ../rules/base.xml.in.h:971
+msgid "Meta is mapped to Win keys"
+msgstr "메타 키를 윈도우 키로 매핑"
 
-#. Keyboard indicator for Slovak layouts
 #: ../rules/base.xml.in.h:972
-msgid "sk"
-msgstr "sk"
+msgid "Meta is mapped to Left Win"
+msgstr "메타 키를 왼쪽 윈도우 키로 매핑"
+
+#: ../rules/base.xml.in.h:973
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper 키를 윈도우 키로 매핑"
 
-#. Keyboard indicator for Slovenian layouts
 #: ../rules/base.xml.in.h:974
-msgid "sl"
-msgstr "sl"
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt 키를 오른쪽 윈도우 키로 매핑, Super 키를 메뉴 키로 매핑"
+
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
+msgstr "Alt와 윈도우 키 뒤바꾸기"
 
-#. Keyboard indicator for Albanian layouts
 #: ../rules/base.xml.in.h:976
-msgid "sq"
-msgstr "sq"
+msgid "Compose key position"
+msgstr "조합 키 위치"
 
-#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:978 ../rules/base.extras.xml.in.h:54
-msgid "sr"
-msgstr "sr"
+#: ../rules/base.xml.in.h:977
+msgid "Pause"
+msgstr "Pause"
+
+#: ../rules/base.xml.in.h:978
+msgid "PrtSc"
+msgstr "PrtSc"
+
+#: ../rules/base.xml.in.h:979
+msgid "Miscellaneous compatibility options"
+msgstr "기타 호환성 옵션"
 
-#. Keyboard indicator for Swedish layouts
 #: ../rules/base.xml.in.h:980
-msgid "sv"
-msgstr "sv"
+msgid "Default numeric keypad keys"
+msgstr "기본 숫자 키패드 키"
+
+#: ../rules/base.xml.in.h:981
+msgid "Numeric keypad keys always enter digits (as in Mac OS)"
+msgstr "숫자 키패드 키가 항상 숫자를 입력(맥 OS처럼 동작)"
 
-#. Keyboard indicator for Swahili layouts
 #: ../rules/base.xml.in.h:982
-msgid "sw"
-msgstr "sw"
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift와 동시에 숫자 키패드 키를 누르면 MS 윈도우즈와 동일하게 동작"
+
+#: ../rules/base.xml.in.h:983
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgstr "Shift를 누르면 Num Lock을 끄지 않고, 3번째 단계를 선택"
 
-#. Keyboard indicator for Syriac layouts
 #: ../rules/base.xml.in.h:984
-msgid "syc"
-msgstr "syc"
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "특수 키는(Ctrl+Alt+&lt;키&gt;) 서버에서 처리"
+
+#: ../rules/base.xml.in.h:985
+msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
+msgstr "Apple Aluminium Keyboard: PC 키 에뮬레이션(Print, Scroll_Lock, Pause, Num Lock)"
 
-#. Keyboard indicator for Tamil layouts
 #: ../rules/base.xml.in.h:986
-msgid "ta"
-msgstr "ta"
+msgid "Shift cancels Caps Lock"
+msgstr "Shift를 누르면 Caps Lock 끄기"
+
+#: ../rules/base.xml.in.h:987
+msgid "Enable extra typographic characters"
+msgstr "추가 타이포그라피 문자 사용"
 
-#. Keyboard indicator for Telugu layouts
 #: ../rules/base.xml.in.h:988
-msgid "te"
-msgstr "te"
+msgid "Both Shift-Keys together toggle Caps Lock"
+msgstr "Shift 키 두 개로 Caps Lock 토글"
+
+#: ../rules/base.xml.in.h:989
+msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
+msgstr "Shift 키 두 개로 Caps Lock 켜기, Shift 키 한 개로 해제"
 
-#. Keyboard indicator for Tajik layouts
 #: ../rules/base.xml.in.h:990
-msgid "tg"
-msgstr "tg"
+msgid "Both Shift-Keys together toggle ShiftLock"
+msgstr "Shift 키 두 개로 ShiftLock 토글"
+
+#: ../rules/base.xml.in.h:991
+msgid "Toggle PointerKeys with Shift + NumLock."
+msgstr "포인터키를 Shift + NumLock 키로 토글."
 
-#. Keyboard indicator for Thai layouts
 #: ../rules/base.xml.in.h:992
-msgid "th"
-msgstr "th"
+msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
+msgstr "키보드 동작으로 키 잡기 해제 허용(경고: 보안 위험)"
+
+#: ../rules/base.xml.in.h:993
+msgid "Adding currency signs to certain keys"
+msgstr "화폐 기호를 특정 키에 추가"
 
-#. Keyboard indicator for Turkmen layouts
 #: ../rules/base.xml.in.h:994
-msgid "tk"
-msgstr "tk"
+msgid "Euro on E"
+msgstr "유로를 E 키에"
+
+#: ../rules/base.xml.in.h:995
+msgid "Euro on 2"
+msgstr "유로를 2 키에"
 
-#. Keyboard indicator for Tswana layouts
 #: ../rules/base.xml.in.h:996
-msgid "tn"
-msgstr "tn"
+msgid "Euro on 4"
+msgstr "유로를 4 키에"
+
+#: ../rules/base.xml.in.h:997
+msgid "Euro on 5"
+msgstr "유로를 5 키에"
 
-#. Keyboard indicator for Turkish layouts
 #: ../rules/base.xml.in.h:998
-msgid "tr"
-msgstr "tr"
+msgid "Rupee on 4"
+msgstr "루피를 4 키에"
+
+#: ../rules/base.xml.in.h:999
+msgid "Key to choose 5th level"
+msgstr "5번째 단계를 선택하는 키"
 
-#. Keyboard indicator for Ukranian layouts
 #: ../rules/base.xml.in.h:1000
-msgid "uk"
-msgstr "uk"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "&lt; 및 &gt; 키로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
+
+#: ../rules/base.xml.in.h:1001
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "오른쪽 Alt로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
 
-#. Keyboard indicator for Urdu layouts
 #: ../rules/base.xml.in.h:1002
-msgid "ur"
-msgstr "ur"
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "왼쪽 윈도우로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
+
+#: ../rules/base.xml.in.h:1003
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "오른쪽 윈도우로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
 
-#. Keyboard indicator for Uzbek layouts
 #: ../rules/base.xml.in.h:1004
-msgid "uz"
-msgstr "uz"
+msgid "Using space key to input non-breakable space character"
+msgstr "스페이스 키가 강제 공백 출력."
+
+#: ../rules/base.xml.in.h:1005
+msgid "Usual space at any level"
+msgstr "모든 단계에서 일반 공백 문자"
 
-#. Keyboard indicator for Vietnamese layouts
 #: ../rules/base.xml.in.h:1006
-msgid "vi"
-msgstr "vi"
+msgid "Non-breakable space character at second level"
+msgstr "2번째 단계에서 강제 공백 문자"
+
+#: ../rules/base.xml.in.h:1007
+msgid "Non-breakable space character at third level"
+msgstr "3번째 단계에서 강제 공백 문자"
 
-#. Keyboard indicator for Wolof layouts
 #: ../rules/base.xml.in.h:1008
-msgid "wo"
-msgstr "wo"
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "3번째 단계에서 강제 공백 문자, 4번째에서는 출력 없음."
+
+#: ../rules/base.xml.in.h:1009
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "3번째 단계에서 강제 공백 문자, 4번째에서는 얇은 강제 공백 문자."
 
-#. Keyboard indicator for Saisiyat layouts
 #: ../rules/base.xml.in.h:1010
-msgid "xsy"
-msgstr "xsy"
+msgid "Non-breakable space character at fourth level"
+msgstr "4번째 단계에서 강제 공백 문자"
+
+#: ../rules/base.xml.in.h:1011
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "4번째 단계에서 강제 공백 문자, 6번째 단계에서 얇은 강제 공백 문자"
 
-#. Keyboard indicator for Yoruba layouts
 #: ../rules/base.xml.in.h:1012
-msgid "yo"
-msgstr "yo"
+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:1013
+msgid "Zero-width non-joiner character at second level"
+msgstr "2번째 단계에서 폭 없는 연결 금지 문자"
 
-#. Keyboard indicator for Taiwanese layouts
 #: ../rules/base.xml.in.h:1014
-msgid "zh"
-msgstr "zh"
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
+msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 폭 없는 연결 문자"
 
-#: ../rules/base.extras.xml.in.h:1
-msgid "APL Keyboard Symbols"
-msgstr "APL 키보드 기호"
+#: ../rules/base.xml.in.h:1015
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
+msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 폭 없는 연결 문자, 4번째에서는 강제 공백 문자"
 
-#: ../rules/base.extras.xml.in.h:3
-msgid "Armenian (OLPC phonetic)"
-msgstr "아르메니아(OLPC 음성 기호)"
+#: ../rules/base.xml.in.h:1016
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
+msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자"
 
-# 아스시나 - 미국 원주민 부족
-#: ../rules/base.extras.xml.in.h:4
-msgid "Atsina"
-msgstr "아트시나"
+#: ../rules/base.xml.in.h:1017
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
+msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자, 4번째에서는 없음"
+
+#: ../rules/base.xml.in.h:1018
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
+msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자, 4번째에서는 폭 없는 연결 문자"
+
+#: ../rules/base.xml.in.h:1019
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
+msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자, 4번째에서는 얇은 강제 공백 문자"
+
+#: ../rules/base.xml.in.h:1020
+msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
+msgstr "3번째 단계에서 폭 없는 연결 금지 문자, 4번째에서는 폭 없는 연결 문자"
+
+#: ../rules/base.xml.in.h:1021
+msgid "Japanese keyboard options"
+msgstr "일본어 키보드 옵션"
+
+#: ../rules/base.xml.in.h:1022
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock 키 상태 고정"
+
+#: ../rules/base.xml.in.h:1023
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F 방식 백스페이스"
+
+#: ../rules/base.xml.in.h:1024
+msgid "Make Zenkaku Hankaku an additional ESC"
+msgstr "Zenkaku Hankaku를 추가 ESC로 사용"
+
+#: ../rules/base.xml.in.h:1025
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "에스페란토 곡절 액센트(curcimflex) 추가"
+
+#: ../rules/base.xml.in.h:1026
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "QWERTY 키보드에서 해당하는 키로."
+
+#: ../rules/base.xml.in.h:1027
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "드보락 키보드에서 해당하는 키로."
+
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "과거 솔라리스 키코드와 키 호환성 유지"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "썬 키 호환성"
+
+#: ../rules/base.xml.in.h:1030
+msgid "Key sequence to kill the X server"
+msgstr "X 서버를 멈추는 키 조합"
+
+#: ../rules/base.xml.in.h:1031
+msgid "Control + Alt + Backspace"
+msgstr "Ctrl + Alt + 백스페이스"
+
+#: ../rules/base.extras.xml.in.h:1
+msgid "apl"
+msgstr "apl"
+
+#: ../rules/base.extras.xml.in.h:2
+msgid "APL keyboard symbols"
+msgstr "APL 키보드 기호"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Avestan"
-msgstr "아베스탄"
+msgid "kut"
+msgstr "kut"
 
+# 쿠테나이 - 아메리카 원주민 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Biblical SIL phonetic"
-msgstr "성서 SIL 음성 기호"
+msgid "Kutenai"
+msgstr "쿠테나이어"
 
 #: ../rules/base.extras.xml.in.h:7
-msgid "Couer D'alene Salish"
-msgstr "Couer D'alene Salish"
+msgid "shs"
+msgstr "shs"
 
+# 캐나다 소스 언어
 #: ../rules/base.extras.xml.in.h:8
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "크림타타르(Dobruca-1 Q)"
+msgid "Secwepemctsin"
+msgstr "슈스와프어"
 
-#: ../rules/base.extras.xml.in.h:10
-msgid "English (US, international AltGr Unicode combining)"
-msgstr "영어(미국, 국제 버전 AltGr 유니코드 조합)"
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "다국어(캐나다, 썬 타입 6/7)"
 
-#: ../rules/base.extras.xml.in.h:11
-msgid "English (US, international AltGr Unicode combining, alternative)"
-msgstr "영어(미국, 국제 버전 AltGr 유니코드 조합, 다른 버전)"
-
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "독일어(미국식 키보드, 독일어 문자 포함)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "독일어(헝가리어 문자 포함, 데드키 없음)"
 
-#: ../rules/base.extras.xml.in.h:16
-msgid "Hebrew (Biblical SIL)"
-msgstr "히브리어(성서 방식, SIL)"
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "독일어(썬 타입 6/7)"
 
-# 쿠테나이 - 아메리카 원주민 
 #: ../rules/base.extras.xml.in.h:17
-msgid "Kutenai"
-msgstr "쿠테나이어"
-
-#: ../rules/base.extras.xml.in.h:19
-msgid "Latvian (US Colemak)"
-msgstr "라트비아어(미국 Colemak)"
+msgid "Avestan"
+msgstr "아베스탄"
 
 #: ../rules/base.extras.xml.in.h:20
-msgid "Latvian (US Colemak, apostrophe variant)"
-msgstr "라트비아어(미국 Colemak, 아포스트로피 변종)"
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "리투아니아어(미국식 드보락, 리투아니아 문자 포함)"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "리투아니아어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "라트비아어(미국 드보락)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "라트비아어(미국 드보락, Y 변종)"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "라트비아어(미국 드보락, 빼기 기호 변종)"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "라트비아어(프로그래머 미국식 드보락)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "라트비아어(프로그래머 미국식 드보락, Y 변종)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "라트비아어(프로그래머 미국식 드보락, 빼기 기호 변종)"
 
-#: ../rules/base.extras.xml.in.h:28
-msgid "Lithuanian (US Dvorak with Lithuanian letters)"
-msgstr "리투아니아어(미국식 드보락, 리투아니아 문자 포함)"
+#: ../rules/base.extras.xml.in.h:30
+msgid "Latvian (US Colemak)"
+msgstr "라트비아어(미국 콜맥)"
 
 #: ../rules/base.extras.xml.in.h:31
-msgid "Polish (international with dead keys)"
-msgstr "폴란드어(국제 버전, 데드키 포함)"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "라트비아어(미국 콜맥, 아포스트로피 변종)"
 
-#: ../rules/base.extras.xml.in.h:33
-msgid "Romanian (ergonomic Touchtype)"
-msgstr "루마니아(어고노믹 터치 방식)"
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "라트비아어(썬 타입 6/7)"
 
 #: ../rules/base.extras.xml.in.h:35
-msgid "Russian (with Ukrainian-Belorussian layout)"
-msgstr "러시아어(우크라니아어 벨라루스어 키보드 배치)"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "영어(미국, 국제 버전 AltGr 유니코드 조합)"
 
-# 캐나다 소스 언어
 #: ../rules/base.extras.xml.in.h:36
-msgid "Secwepemctsin"
-msgstr "슈스와프어"
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "영어(미국, 국제 버전 AltGr 유니코드 조합, 다른 버전)"
 
+# 아스시나 - 미국 원주민 부족
 #: ../rules/base.extras.xml.in.h:37
-msgid "Serbian"
-msgstr "세르비아어"
+msgid "Atsina"
+msgstr "아트시나"
 
+# 쾨르디알렌 - 미국 원주민 부족
 #: ../rules/base.extras.xml.in.h:38
-msgid "Serbian (combining accents instead of dead keys)"
-msgstr "세르비아어(데드키 대신 조합으로 액센트 입력)"
+msgid "Couer D'alene Salish"
+msgstr "쾨르디알렌 살리시어"
 
 #: ../rules/base.extras.xml.in.h:39
-msgid "apl"
-msgstr "apl"
+msgid "English (US, Sun Type 6/7)"
+msgstr "영어(미국, 썬 타입 6/7)"
 
-#: ../rules/base.extras.xml.in.h:47
-msgid "kut"
-msgstr "kut"
+#: ../rules/base.extras.xml.in.h:42
+msgid "Polish (international with dead keys)"
+msgstr "폴란드어(국제 버전, 데드키 포함)"
+
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "폴란드어(콜맥)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "폴란드어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:48
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "크림타타르(Dobruca-1 Q)"
+
+#: ../rules/base.extras.xml.in.h:49
+msgid "Romanian (ergonomic Touchtype)"
+msgstr "루마니아어(어고노믹 터치 방식)"
+
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "루마니아어(썬 타입 6/7)"
 
 #: ../rules/base.extras.xml.in.h:53
-msgid "shs"
-msgstr "shs"
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "세르비아어(데드키 대신 조합으로 액센트 입력)"
+
+#: ../rules/base.extras.xml.in.h:56
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "러시아어(우크라니아어 벨라루스어 키보드 배치)"
+
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "러시아어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:60
+msgid "Armenian (OLPC phonetic)"
+msgstr "아르메니아(OLPC 음성 기호)"
+
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "히브리어(성서, SIL 음성 기호)"
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "아랍어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "벨기에어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "포르투갈어(브라질, 썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "체코어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "덴마크어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "네덜란드어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "에스토니아어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "핀란드어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "프랑스어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "그리스어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "이탈리아어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "일본어(썬 타입 6)"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "일본어(썬 타입 7 - PC 호환)"
+
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "일본어(썬 타입 7 - 썬 호환)"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "노르웨이어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "포르투갈어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "슬로바키아어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "스페인어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "스웨덴어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr "독일어(스위스)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "독일어(스위스, 썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "프랑스어(스위스, 썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "터키어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "우크라이나어(썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "영어(영국, 썬 타입 6/7)"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "한국어(썬 타입 6/7)"
diff --git a/xorg-server/xkeyboard-config/po/pl.po b/xorg-server/xkeyboard-config/po/pl.po
index a23b53661..37b1cf783 100644
--- a/xorg-server/xkeyboard-config/po/pl.po
+++ b/xorg-server/xkeyboard-config/po/pl.po
@@ -1,13 +1,13 @@
 # Polish translation for xkeyboard-config.
 # This file is distributed under the same license as the xkeyboard-config package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2009-2012.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2009-2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.6.99\n"
+"Project-Id-Version: xkeyboard-config 2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-09-12 00:25+0100\n"
-"PO-Revision-Date: 2012-09-16 10:08+0200\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-18 15:02+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -696,3092 +696,3143 @@ msgid "OLPC"
 msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Sun Type 7 USB"
+msgstr "Sun Type 7 USB"
 
 #: ../rules/base.xml.in.h:172
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun Type 7 USB (układ europejski)"
+
+#: ../rules/base.xml.in.h:173
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun Type 7 USB (układ uniksowy)"
+
+#: ../rules/base.xml.in.h:174
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun Type 7 USB (układ japoński) / japońska 106-klawiszowa"
+
+#: ../rules/base.xml.in.h:175
+msgid "Sun Type 6/7 USB"
+msgstr "Sun Type 6/7 USB"
+
+#: ../rules/base.xml.in.h:176
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun Type 6/7 USB (układ europejski)"
+
+#: ../rules/base.xml.in.h:177
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun Type 6 USB (układ uniksowy)"
+
+#: ../rules/base.xml.in.h:178
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun Type 6 USB (układ japoński)"
+
+#: ../rules/base.xml.in.h:179
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun Type 6 (układ japoński)"
+
+#: ../rules/base.xml.in.h:180
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:181
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:182
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:183
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:184
 msgid "Htc Dream phone"
 msgstr "Telefon HTC Dream"
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
 msgid "English (US)"
 msgstr "Angielski (USA)"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:189
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:190
 msgid "Cherokee"
 msgstr "Czerokeski"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:191
 msgid "English (US, with euro on 5)"
 msgstr "Angielski (USA, ze znakiem euro pod 5)"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:192
 msgid "English (US, international with dead keys)"
 msgstr "Międzynarodowy (USA, międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:193
 msgid "English (US, alternative international)"
 msgstr "Angielski (USA, alternatywny międzynarodowy)"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:194
 msgid "English (Colemak)"
 msgstr "Angielski (Colemak)"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:195
 msgid "English (Dvorak)"
 msgstr "Angielski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:188
-msgid "English (Dvorak international with dead keys)"
-msgstr "Angielski (międzynarodowy Dvoraka z klawiszami akcentów)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
+msgstr "Angielski (Dvoraka, międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:197
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Angielski (alternatywny międzynarodowy Dvoraka bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:198
 msgid "English (left handed Dvorak)"
 msgstr "Angielski (leworęczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:199
 msgid "English (right handed Dvorak)"
 msgstr "Angielski (praworęczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:200
 msgid "English (classic Dvorak)"
 msgstr "Angielski (klasyczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:201
 msgid "English (programmer Dvorak)"
 msgstr "Angielski (Dvoraka programisty)"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:204
 msgid "Russian (US, phonetic)"
 msgstr "Rosyjski (USA, fonetyczny)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
 msgstr "Angielski (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:206
 msgid "English (international AltGr dead keys)"
 msgstr "Angielski (międzynarodowy, klawisze akcentów pod AltGr)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:207
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Angielski (przełączanie układu klawiszem mnożenia/dzielenia)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:208
 msgid "Serbo-Croatian (US)"
 msgstr "Serbsko-chorwacki (USA)"
 
-#. Keyboard indicator for Catalan layouts
-#: ../rules/base.xml.in.h:202
-msgid "ca"
-msgstr "ca"
+#: ../rules/base.xml.in.h:209
+msgid "English (Workman)"
+msgstr "Angielski (Workman)"
 
-#: ../rules/base.xml.in.h:203
-msgid "Catalan"
-msgstr "Kataloński"
+#: ../rules/base.xml.in.h:210
+msgid "English (Workman, international with dead keys)"
+msgstr "Angielski (Workman, międzynarodowy z klawiszami akcentów)"
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:213
 msgid "Afghani"
 msgstr "Afgański"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:215
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:216
 msgid "Pashto"
 msgstr "Pasztuński"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:218
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:219
 msgid "Uzbek (Afghanistan)"
 msgstr "Uzbecki (Afganistan)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:220
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paszto (Afganistan, OLPC)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:221
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Perski (Afganistan, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:222
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Uzbecki (Afganistan, OLPC)"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
 msgid "Arabic"
 msgstr "Arabski"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:226
 msgid "Arabic (azerty)"
 msgstr "Arabski (AZERTY)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:227
 msgid "Arabic (azerty/digits)"
 msgstr "Arabski (AZERTY/cyfry)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:228
 msgid "Arabic (digits)"
 msgstr "Arabski (cyfry)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:229
 msgid "Arabic (qwerty)"
 msgstr "Arabski (QWERTY)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:230
 msgid "Arabic (qwerty/digits)"
 msgstr "Arabski (QWERTY/cyfry)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:231
 msgid "Arabic (Buckwalter)"
 msgstr "Arabski (Buckwalter)"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:233
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:234
 msgid "Albanian"
 msgstr "Albański"
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
 msgid "Armenian"
 msgstr "Armeński"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:238
 msgid "Armenian (phonetic)"
 msgstr "Armeński (fonetyczny)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:239
 msgid "Armenian (alternative phonetic)"
 msgstr "Armeński (alternatywny fonetyczny)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:240
 msgid "Armenian (eastern)"
 msgstr "Armeński (wschodni)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:241
 msgid "Armenian (western)"
 msgstr "Armeński (zachodni)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:242
 msgid "Armenian (alternative eastern)"
 msgstr "Armeński (anternatywny wschodni)"
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:245
 msgid "German (Austria)"
 msgstr "Niemiecki (Austria)"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:246
+msgid "German (legacy)"
+msgstr "Niemiecki (stary)"
+
+#: ../rules/base.xml.in.h:247
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Niemiecki (Austria, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:248
 msgid "German (Austria, Sun dead keys)"
 msgstr "Niemiecki (Austria, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:249
 msgid "German (Austria, Macintosh)"
 msgstr "Niemiecki (Austria, Macintosh)"
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:251
 msgid "az"
 msgstr "AZ"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:252
 msgid "Azerbaijani"
 msgstr "Azerbejdżański"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:253
 msgid "Azerbaijani (Cyrillic)"
 msgstr "Azerbejdżański (cyrylica)"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:255
 msgid "by"
 msgstr "by"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:256
 msgid "Belarusian"
 msgstr "Białoruski"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:257
 msgid "Belarusian (legacy)"
 msgstr "Białoruski (stary)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:258
 msgid "Belarusian (Latin)"
 msgstr "Białoruski (łaciński)"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
 msgid "Belgian"
 msgstr "Belgijski"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:262
 msgid "Belgian (alternative)"
 msgstr "Belgijski (alternatywny)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:263
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belgijski (alternatywny, tylko latin-9)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:264
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belgijski (alternatywny, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:265
 msgid "Belgian (ISO alternate)"
 msgstr "Belgijski (alternatywny ISO)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:266
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belgijski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:267
 msgid "Belgian (Sun dead keys)"
 msgstr "Belgijski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:268
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belgijski (Wang model 724 AZERTY)"
 
 #. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:270
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:271
 msgid "Bengali"
 msgstr "Bengalski"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:272
 msgid "Bengali (Probhat)"
 msgstr "Bengalski (Probhat)"
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:274
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:275
 msgid "Indian"
 msgstr "Indyjski"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:276
 msgid "Bengali (India)"
 msgstr "Bengalski (Indie)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:277
 msgid "Bengali (India, Probhat)"
 msgstr "Bengalski (Indie, Probhat)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:278
 msgid "Bengali (India, Baishakhi)"
 msgstr "Bengalski (Indie, Baishakhi)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:279
 msgid "Bengali (India, Bornona)"
 msgstr "Bengalski (Indie, Bornona)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:280
 msgid "Bengali (India, Uni Gitanjali)"
 msgstr "Bengalski (Indie, Uni Gitanjali)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:281
 msgid "Bengali (India, Baishakhi Inscript)"
 msgstr "Bengalski (Indie, Baishakhi Inscript)"
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:283
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:284
 msgid "Gujarati"
 msgstr "Gudźarati"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:286
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:287
 msgid "Punjabi (Gurmukhi)"
 msgstr "Pendżabski (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:288
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Pendżabski (Gurmukhi Jhelum)"
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:290
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:291
 msgid "Kannada"
 msgstr "Kannada"
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:293
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:294
 msgid "Malayalam"
 msgstr "Malajalam"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:295
 msgid "Malayalam (Lalitha)"
 msgstr "Malajalam (Lalitha)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:296
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malajalam (rozszerzony Inscript ze znakiem rupii)"
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:298
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:299
 msgid "Oriya"
 msgstr "Orija"
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:301
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:302
 msgid "Tamil (Unicode)"
 msgstr "Tamilski (unikodowy)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:303
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamilski (klawiatura z cyframi)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:304
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamilski (maszynistki TAB)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:305
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamilski (maszynistki TSCII)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:306
 msgid "Tamil"
 msgstr "Tamilski"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:308
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:309
 msgid "Telugu"
 msgstr "Telugu"
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:311
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:312
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonetyczny)"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:313
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (alternatywny fonetyczny)"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:314
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (klawisze Win)"
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:316
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:317
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (Bolnagri)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:318
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:319
 msgid "English (India, with RupeeSign)"
 msgstr "Angielski (Indie, ze znakiem rupii)"
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:321
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:322
 msgid "Bosnian"
 msgstr "Bośniacki"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:323
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bośniacki (z użyciem cudzysłowów do cytowania)"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:324
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bośniacki (z użyciem dwuznaków bośniackich)"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:325
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bośniacki (klawiatura US z dwuznakami bośniackimi)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:326
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bośniacki (klawiatura US z literami bośniackimi)"
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
 msgid "Portuguese (Brazil)"
 msgstr "Portugalski (Brazylia)"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:330
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugalski (Brazylia, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:331
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugalski (Brazylia, Dvoraka)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:332
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugalski (Brazylia, nativo)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:333
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugalski (Brazylia, nativo dla klawiatur USA)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:334
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugalski (Brazylia, nativo dla esperanto)"
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:336
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:337
 msgid "Bulgarian"
 msgstr "Bułgarski"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:338
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bułgarski (tradycyjny fonetyczny)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:339
 msgid "Bulgarian (new phonetic)"
 msgstr "Bułgarski (nowy fonetyczny)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:340
 msgid "Arabic (Morocco)"
 msgstr "Arabski (marokański)"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:343
 msgid "French (Morocco)"
 msgstr "Francuski (Maroko)"
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:345
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:346
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berberyjski (Maroko, tifinagh)"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:347
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berberyjski (Maroko, alternatywny tifinagh)"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:348
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berberyjski (Maroko, alternatywny fonetyczny tifinagh)"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:349
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berberyjski (Maroko, rozszerzony tifinagh)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:350
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berberyjski (Maroko, tifinagh fonetyczny"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:351
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berberyjski (Maroko, rozszerzony fonetyczny tifinagh)"
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
 msgid "English (Cameroon)"
 msgstr "Angielski (Kamerun)"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:355
 msgid "French (Cameroon)"
 msgstr "Francuski (Kamerun)"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:356
 msgid "Cameroon Multilingual (qwerty)"
 msgstr "Kameruński wielojęzyczny (QWERTY)"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:357
 msgid "Cameroon Multilingual (azerty)"
 msgstr "Kameruński wielojęzyczny (AZERTY)"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:358
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr "Kameruński wielojęzyczny (Dvoraka)"
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:360
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:361
 msgid "Burmese"
 msgstr "Birmański"
 
-#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr "Francuski (Kanada)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:363
 msgid "French (Canada, Dvorak)"
 msgstr "Francuski (kanadyjski, Dvoraka)"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:364
 msgid "French (Canada, legacy)"
 msgstr "Francuski (kanadyjski, stary)"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:365
 msgid "Canadian Multilingual"
 msgstr "Kanadyjski wielojęzyczny"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:366
 msgid "Canadian Multilingual (first part)"
 msgstr "Kanadyjski wielojęzyczny (część pierwsza)"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:367
 msgid "Canadian Multilingual (second part)"
 msgstr "Kanadyjski wielojęzyczny (część druga)"
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:369
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:370
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:371
 msgid "English (Canada)"
 msgstr "Angielski (Kanada)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:372
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Francuski (Demokratyczna Republika Konga)"
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:374
 msgid "zh"
 msgstr "zh"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:375
 msgid "Chinese"
 msgstr "Chiński"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:376
 msgid "Tibetan"
 msgstr "Tybetański"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:377
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tybetański (z liczbami ASCII)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:378
 msgid "Uyghur"
 msgstr "Ujgurski"
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:380
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:381
 msgid "Croatian"
 msgstr "Chorwacki"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:382
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Chorwacki (z użyciem cudzysłowów do cytowania)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:383
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Chorwacki (z użyciem dwuznaków chorwackich)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:384
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Chorwacki (klawiatura US z dwuznakami chorwackimi)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:385
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Chorwacki (klawiatura US z literami chorwackimi)"
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
 msgid "Czech"
 msgstr "Czeski"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:389
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Czeski (z klawiszem &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:390
 msgid "Czech (qwerty)"
 msgstr "Czeski (QWERTY)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:391
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Czeski (QWERTY, rozszerzony Backslash)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:392
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Czeski (układ UCW - tylko litery akcentowane)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:393
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Czeski (US Dvoraka z obsługą CZ UCW)"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
 msgid "Danish"
 msgstr "Duński"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:397
 msgid "Danish (eliminate dead keys)"
 msgstr "Duński (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:398
 msgid "Danish (Macintosh)"
 msgstr "Duński (Macintosh)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:399
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Duński (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:400
 msgid "Danish (Dvorak)"
 msgstr "Duński (Dvoraka)"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:404
 msgid "Dutch (Sun dead keys)"
 msgstr "Holenderski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:405
 msgid "Dutch (Macintosh)"
 msgstr "Holenderski (Macintosh)"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:406
 msgid "Dutch (standard)"
 msgstr "Holenderski (standardowy)"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:408
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:409
 msgid "Dzongkha"
 msgstr "Dzongka"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
 msgid "Estonian"
 msgstr "Estoński"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:413
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estoński (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:414
 msgid "Estonian (Dvorak)"
 msgstr "Estoński (Dvoraka)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estoński (klawiatura US z literami estońskimi)"
 
-#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
 msgid "Persian"
 msgstr "Perski"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Persian (with Persian Keypad)"
 msgstr "Perski (z perską klawiaturą numeryczną)"
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurdyjski (Iran, łaciński Q)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 msgid "Kurdish (Iran, F)"
 msgstr "Kurdyjski (Iran, F)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurdyjski (Iran, łaciński Alt-Q)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurdyjski (Iran, arabsko-łaciński)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
 msgid "Iraqi"
 msgstr "Iracki"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:425
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurdyjski (Irak, łaciński Q)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:426
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurdyjski (Irak, F)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:427
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurdyjski (Irak, łaciński Alt-Q)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:428
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurdyjski (Irak, arabsko-łaciński)"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:430
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:431
 msgid "Faroese"
 msgstr "Farerski"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:432
 msgid "Faroese (eliminate dead keys)"
 msgstr "Farerski (bez klawiszy akcentów)"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
 msgid "Finnish"
 msgstr "Fiński"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:436
 msgid "Finnish (classic)"
 msgstr "Fiński (klasyczny)"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Fiński (klasyczny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Northern Saami (Finland)"
 msgstr "Północnolapoński (Finlandia)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Finnish (Macintosh)"
 msgstr "Fiński (Macintosh)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
 msgid "French"
 msgstr "Francuski"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:441
 msgid "French (eliminate dead keys)"
 msgstr "Francuski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "French (Sun dead keys)"
 msgstr "Francuski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "French (alternative)"
 msgstr "Francuski (alternatywny)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "French (alternative, latin-9 only)"
 msgstr "Francuski (alternatywny, tylko latin-9)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Francuski (alternatywny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "French (alternative, Sun dead keys)"
 msgstr "Francuski (alternatywny, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "French (legacy, alternative)"
 msgstr "Francuski (stary, alternatywny)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Francuski (stary alternatywny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Francuski (stary alternatywny, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Francuski (Bepo, ergonomiczny, w stylu Dvoraka)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Francuski (Bepo, ergonomiczny, w stylu Dvoraka, tylko latin-9)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:452
 msgid "French (Dvorak)"
 msgstr "Francuski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:453
 msgid "French (Macintosh)"
 msgstr "Francuski (Macintosh)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:454
 msgid "French (Breton)"
 msgstr "Francuski (bretoński)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:455
 msgid "Occitan"
 msgstr "Okcytański"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:456
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Gruziński (Francja, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:457
 msgid "English (Ghana)"
 msgstr "Angielski (Ghana)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:458
 msgid "English (Ghana, multilingual)"
 msgstr "Angielski (Ghana, wielojęzyczny)"
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:460
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:461
 msgid "Akan"
 msgstr "Akan"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:463
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:464
 msgid "Ewe"
 msgstr "Ewe"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:466
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:467
 msgid "Fula"
 msgstr "Fulani"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:469
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:470
 msgid "Ga"
 msgstr "Ga"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:472
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:473
 msgid "Hausa"
 msgstr "Hausa"
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:475
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:476
 msgid "Avatime"
 msgstr "Avatime"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:477
 msgid "English (Ghana, GILLBT)"
 msgstr "Angielski (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:478
 msgid "French (Guinea)"
 msgstr "Francuski (Gwinea)"
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:480
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:481
 msgid "Georgian"
 msgstr "Gruziński"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:482
 msgid "Georgian (ergonomic)"
 msgstr "Gruziński (ergonomiczny)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:483
 msgid "Georgian (MESS)"
 msgstr "Gruziński (MESS)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:484
 msgid "Russian (Georgia)"
 msgstr "Rosyjski (gruziński)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:485
 msgid "Ossetian (Georgia)"
 msgstr "Osetyjski (Gruzja)"
 
-#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
 msgid "German"
 msgstr "Niemiecki"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:487
 msgid "German (dead acute)"
 msgstr "Niemiecki (akcent ostry)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:488
 msgid "German (dead grave acute)"
 msgstr "Niemiecki (akcent gravis)"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:489
 msgid "German (eliminate dead keys)"
 msgstr "Niemiecki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:490
 msgid "Romanian (Germany)"
 msgstr "Rumuński (Niemcy)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:491
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Rumuński (Niemcy, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:492
 msgid "German (Dvorak)"
 msgstr "Niemiecki (Dvoraka)"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:493
 msgid "German (Sun dead keys)"
 msgstr "Niemiecki (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:494
 msgid "German (Neo 2)"
 msgstr "Niemiecki (Neo 2)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:495
 msgid "German (Macintosh)"
 msgstr "Niemiecki (Macintosh)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:496
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Niemiecki (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:497
 msgid "Lower Sorbian"
 msgstr "Dolnołużycki"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:498
 msgid "Lower Sorbian (qwertz)"
 msgstr "Dolnołużycki (QWERTZ)"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:499
 msgid "German (qwerty)"
 msgstr "Niemiecki (QWERTY)"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:500
 msgid "Russian (Germany, phonetic)"
 msgstr "Rosyjski (Niemcy, fonetyczny)"
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
 msgid "Greek"
 msgstr "Grecki"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:504
 msgid "Greek (simple)"
 msgstr "Grecki (prosty)"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:505
 msgid "Greek (extended)"
 msgstr "Grecki (rozszerzony)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:506
 msgid "Greek (eliminate dead keys)"
 msgstr "Grecki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:507
 msgid "Greek (polytonic)"
 msgstr "Grecki (politoniczny)"
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:509
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian"
 msgstr "Węgierski"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (standard)"
 msgstr "Węgierski (standardowy)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Węgierski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (qwerty)"
 msgstr "Węgierski (QWERTY)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Węgierski (101/QWERTZ/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTZ/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Węgierski (101/QWERTZ/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTZ/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Węgierski (101/QWERTY/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTY/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Węgierski (101/QWERTY/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:521
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTY/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:522
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Węgierski (102/QWERTZ/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:523
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTZ/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:524
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Węgierski (102/QWERTZ/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:525
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTZ/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:526
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Węgierski (102/QWERTY/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:527
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTY/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:528
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Węgierski (102/QWERTY/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:529
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTY/kropka/bez klawiszy akcentów)"
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:531
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:532
 msgid "Icelandic"
 msgstr "Islandzki"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:533
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandzki (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:534
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandzki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:535
 msgid "Icelandic (Macintosh)"
 msgstr "Islandzki (Macintosh)"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:536
 msgid "Icelandic (Dvorak)"
 msgstr "Islandzki (Dvoraka)"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
 msgid "Hebrew"
 msgstr "Hebrajski"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:540
 msgid "Hebrew (lyx)"
 msgstr "Hebrajski (lyx)"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:541
 msgid "Hebrew (phonetic)"
 msgstr "Hebrajski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:542
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hebrajski (biblijny, Tiro)"
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
 msgid "Italian"
 msgstr "Włoski"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:546
 msgid "Italian (eliminate dead keys)"
 msgstr "Włoski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:547
 msgid "Italian (Macintosh)"
 msgstr "Włoski (Macintosh)"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:548
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Włoski (klawiatura US z literami włoskimi)"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:549
 msgid "Georgian (Italy)"
 msgstr "Gruziński (Włochy)"
 
+#: ../rules/base.xml.in.h:550
+msgid "Italian (IBM 142)"
+msgstr "Włoski (IBM 142)"
+
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
 msgid "Japanese"
 msgstr "Japoński"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:554
 msgid "Japanese (Kana)"
 msgstr "Japoński (Kana)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:555
 msgid "Japanese (Kana 86)"
 msgstr "Japoński (Kana 86)"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:556
 msgid "Japanese (OADG 109A)"
 msgstr "Japoński (OADG 109A)"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:557
 msgid "Japanese (Macintosh)"
 msgstr "Japoński (Macintosh)"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:558
 msgid "Japanese (Dvorak)"
 msgstr "Japoński (Dvoraka)"
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:560
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:561
 msgid "Kyrgyz"
 msgstr "Kirgiski"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:562
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgiski (fonetyczny)"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:564
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:565
 msgid "Khmer (Cambodia)"
 msgstr "Khmerski (Kambodża)"
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:567
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:568
 msgid "Kazakh"
 msgstr "Kazaski"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:569
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Rosyjski (Kazahstan, z kazaskim)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:570
 msgid "Kazakh (with Russian)"
 msgstr "Kazaski (z rosyjskim)"
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:572
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:573
 msgid "Lao"
 msgstr "Laotański"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:574
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Laotański (proponowany układ standardowy STEA)"
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:577
 msgid "Spanish (Latin American)"
 msgstr "Hiszpański (Ameryka Łacińska)"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:578
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Hiszpański (Ameryka Łacińska, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:579
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Hiszpański (Ameryka Łacińska, ze znakiem tyldy)"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:580
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Hiszpański (Ameryka Łacińska, klawisze akcentów Suna)"
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
 msgid "Lithuanian"
 msgstr "Litewski"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:584
 msgid "Lithuanian (standard)"
 msgstr "Litewski (standardowy)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:585
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litewski (klawiatura US z literami litewskimi)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:586
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litewski (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:587
 msgid "Lithuanian (LEKP)"
 msgstr "Litewski (LEKP)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:588
 msgid "Lithuanian (LEKPa)"
 msgstr "Litewski (LEKPa)"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
 msgid "Latvian"
 msgstr "Łotewski"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:592
 msgid "Latvian (apostrophe variant)"
 msgstr "Łotewski (wariant z apostrofem)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:593
 msgid "Latvian (tilde variant)"
 msgstr "Łotewski (wariant z tyldą)"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:594
 msgid "Latvian (F variant)"
 msgstr "Łotewski (wariant F)"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:595
 msgid "Latvian (modern)"
 msgstr "Łotewski (współczesny)"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:596
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Łotewski (ergonomiczny ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:597
 msgid "Latvian (adapted)"
 msgstr "Łotewski (zaadaptowany)"
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:599
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:600
 msgid "Maori"
 msgstr "Maoryski"
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:603
 msgid "Montenegrin"
 msgstr "Czarnogórski"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:604
 msgid "Montenegrin (Cyrillic)"
 msgstr "Czarnogórski (cyrylicki)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:605
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Czarnogórski (cyrylicki, zamienione Z i Ż)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:606
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Czarnogórski (łaciński unikodowy)"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:607
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Czarnogórski (łaciński QWERTY)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:608
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Czarnogórski (łaciński unikodowy QWERTY)"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:609
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Czarnogórski (cyrylicki z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:610
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Czarnogórski (łaciński z cudzysłowami)"
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:612
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:613
 msgid "Macedonian"
 msgstr "Macedoński"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:614
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedoński (bez klawiszy akcentów)"
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:616
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:617
 msgid "Maltese"
 msgstr "Maltański"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:618
 msgid "Maltese (with US layout)"
 msgstr "Maltański (z układem US)"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:620
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:621
 msgid "Mongolian"
 msgstr "Mongolski"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
 msgid "Norwegian"
 msgstr "Norweski"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:625
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norweski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:626
 msgid "Norwegian (Dvorak)"
 msgstr "Norweski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:627
 msgid "Northern Saami (Norway)"
 msgstr "Północnolapoński (Norwegia)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:628
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Północnolapoński (Norwegia, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:629
 msgid "Norwegian (Macintosh)"
 msgstr "Norweski (Macintosh)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:630
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Norweski (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:631
 msgid "Norwegian (Colemak)"
 msgstr "Norweski (Colemak)"
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
 msgid "Polish"
 msgstr "Polski"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:635
+msgid "Polish (legacy)"
+msgstr "Polski (stary)"
+
+#: ../rules/base.xml.in.h:636
 msgid "Polish (qwertz)"
 msgstr "Polski (QWERTZ)"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:637
 msgid "Polish (Dvorak)"
 msgstr "Polski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:638
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Polski (Dvoraka, polskie cudzysłowy pod klawiszem cudzysłowu)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:639
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Polski (Dvoraka, polskie cudzysłowy pod klawiszem 1)"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:640
 msgid "Kashubian"
 msgstr "Kaszubski"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:641
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Rosyjski (Polska, fonetyczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:642
 msgid "Polish (programmer Dvorak)"
 msgstr "Polski (Dvoraka programisty)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:644
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugalski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:645
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugalski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:646
 msgid "Portuguese (Macintosh)"
 msgstr "Portugalski (Macintosh)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:647
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugalski (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:648
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugalski (Macintosh, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:649
 msgid "Portuguese (Nativo)"
 msgstr "Portugalski (nativo)"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:650
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugalski (nativo dla klawiatur USA)"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:651
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Esperanto (Portugalia, Nativo)"
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
 msgid "Romanian"
 msgstr "Rumuński"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
 msgstr "Rumuński (cedilla)"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Rumuński (standardowy)"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard cedilla)"
 msgstr "Rumuński (standardowy cedilla)"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:658
 msgid "Romanian (WinKeys)"
 msgstr "Rumuński (klawisze Win)"
 
-#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:660
 msgid "Russian (phonetic)"
 msgstr "Rosyjski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:661
 msgid "Russian (phonetic WinKeys)"
 msgstr "Rosyjski (fonetyczny, klawisze Win)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:662
 msgid "Russian (typewriter)"
 msgstr "Rosyjski (maszynistki)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:663
 msgid "Russian (legacy)"
 msgstr "Rosyjski (stary)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:664
 msgid "Russian (typewriter, legacy)"
 msgstr "Rosyjski (maszynistki, stary)"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:665
 msgid "Tatar"
 msgstr "Tatarski"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Ossetian (legacy)"
 msgstr "Osetyjski (stary)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:667
 msgid "Ossetian (WinKeys)"
 msgstr "Osetyjski (klawisze Win)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:668
 msgid "Chuvash"
 msgstr "Czuwaski"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:669
 msgid "Chuvash (Latin)"
 msgstr "Czuwaski (łaciński)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:670
 msgid "Udmurt"
 msgstr "Udmurcki"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:671
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:672
 msgid "Yakut"
 msgstr "Jakucki"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:673
 msgid "Kalmyk"
 msgstr "Kałmucki"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:674
 msgid "Russian (DOS)"
 msgstr "Rosyjski (DOS)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:675
 msgid "Serbian (Russia)"
 msgstr "Serbski (Rosja)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:676
 msgid "Bashkirian"
 msgstr "Baszkirski"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:677
 msgid "Mari"
 msgstr "Maryjski"
 
-#: ../rules/base.xml.in.h:668
-msgid "Serbian (Cyrillic)"
-msgstr "Serbski (cyrylica)"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "Serbski"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:679
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr "Serbski (cyrylicki, zamienione Z i Ż)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:680
 msgid "Serbian (Latin)"
 msgstr "Serbski (łaciński)"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:681
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbski (łaciński unikodowy)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:682
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbski (łaciński QWERTY)"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:683
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbski (łaciński unikodowy QWERTY)"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr "Serbski (cyrylicki z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbski (łaciński z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:686
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Pannońskorusiński (homofoniczny)"
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:688
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:689
 msgid "Slovenian"
 msgstr "Słoweński"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:690
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Słoweński (używanie cudzysłowów do cytowania)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:691
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Słoweński (klawiatura US z literami słoweńskimi)"
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
 msgid "Slovak"
 msgstr "Słowacki"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:695
 msgid "Slovak (extended Backslash)"
 msgstr "Słowacki (rozszerzony backslash)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:696
 msgid "Slovak (qwerty)"
 msgstr "Słowacki (QWERTY)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:697
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Słowacki (QWERTY, rozszerzony Backslash)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:699
 msgid "Spanish (eliminate dead keys)"
 msgstr "Hiszpański (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:700
 msgid "Spanish (include dead tilde)"
 msgstr "Hiszpański (ze znakiem tyldy)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:701
 msgid "Spanish (Sun dead keys)"
 msgstr "Hiszpański (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:702
 msgid "Spanish (Dvorak)"
 msgstr "Hiszpański (Dvoraka)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:703
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr "Asturski (hiszpański, z H i L z dolną kropką)"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:704
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Kataloński (hiszpański, z L ze środkową kropką)"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:705
 msgid "Spanish (Macintosh)"
 msgstr "Hiszpański (Macintosh)"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
 msgid "Swedish"
 msgstr "Szwedzki"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:709
 msgid "Swedish (eliminate dead keys)"
 msgstr "Szwedzki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:710
 msgid "Swedish (Dvorak)"
 msgstr "Szwedzki (Dvoraka)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:711
 msgid "Russian (Sweden, phonetic)"
 msgstr "Rosyjski (Szwecja, fonetyczny)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:712
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Rosyjski (Szwecja, fonetyczny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:713
 msgid "Northern Saami (Sweden)"
 msgstr "Północnolapoński (Szwecja)"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:714
 msgid "Swedish (Macintosh)"
 msgstr "Szwedzki (Macintosh)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:715
 msgid "Swedish (Svdvorak)"
 msgstr "Szwedzki (Svdvorak)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:716
 msgid "Swedish Sign Language"
 msgstr "Szwedzki migowy"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:717
 msgid "German (Switzerland)"
 msgstr "Niemiecki (Szwajcaria)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:718
 msgid "German (Switzerland, legacy)"
 msgstr "Niemiecki (Szwajcaria, stary)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:719
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Niemiecki (Szwajcaria, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:720
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Niemiecki (Szwajcaria, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:721
 msgid "French (Switzerland)"
 msgstr "Francuski (Szwajcaria)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:722
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Francuski (Szwajcaria, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Francuski (Szwajcaria, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
 msgid "French (Switzerland, Macintosh)"
 msgstr "Francuski (Szwajcaria, Macintosh)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
 msgid "German (Switzerland, Macintosh)"
 msgstr "Niemiecki (Szwajcaria, Macintosh)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
 msgid "Arabic (Syria)"
 msgstr "Arabski (syryjski)"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:728
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:729
 msgid "Syriac"
 msgstr "Syryjski"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:730
 msgid "Syriac (phonetic)"
 msgstr "Syryjski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurdyjski (Syria, łaciński Q)"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
 msgid "Kurdish (Syria, F)"
 msgstr "Kurdyjski (Syria, F)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurdyjski (Syria, łaciński Alt-Q)"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
 msgid "Tajik"
 msgstr "Tadżycki"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "Tadżycki (stary)"
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:739
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
 msgid "Sinhala (phonetic)"
 msgstr "Syngaleski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamilski (Sri Lanka, unikodowy)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamilski (Sri Lanka, maszynistki TAB)"
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
 msgid "Thai"
 msgstr "Tajski"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
 msgid "Thai (TIS-820.2538)"
 msgstr "Tajski (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Tajski (Pattachote)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
 msgid "Turkish"
 msgstr "Turecki"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
 msgid "Turkish (F)"
 msgstr "Turecki (F)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
 msgid "Turkish (Alt-Q)"
 msgstr "Turecki (Alt-Q)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
 msgid "Turkish (Sun dead keys)"
 msgstr "Turecki (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurdyjski (Turcja, łaciński Q)"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurdyjski (Turcja, F)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:756
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurdyjski (Turcja, łaciński Alt-Q)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
 msgid "Turkish (international with dead keys)"
 msgstr "Turecki (międzynarodowy z klawiszami akcentów)"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:760
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krymskotatarski (turecki Q)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krymskotatarski (turecki F)"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krymskotatarski (turecki Alt-Q)"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
 msgid "Taiwanese"
 msgstr "Tajwański"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
 msgid "Taiwanese (indigenous)"
 msgstr "Tajwański (autochtoniczny)"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Tajwan)"
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
 msgid "Ukrainian"
 msgstr "Ukraiński"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:771
 msgid "Ukrainian (phonetic)"
 msgstr "Ukraiński (fonetyczny)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:772
 msgid "Ukrainian (typewriter)"
 msgstr "Ukraiński (maszynistki)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukraiński (klawisze Win)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (legacy)"
 msgstr "Ukraiński (stary)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukraiński (standardowy RSTU)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Rosyjski (Ukraina, standardowy RSTU)"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ukraiński (homofoniczny)"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
 msgid "English (UK)"
 msgstr "Angielski (Wielka Brytania)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
 msgid "English (UK, extended WinKeys)"
 msgstr "Angielski (Wielka Brytania, rozszerzone klawisze Win)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:780
 msgid "English (UK, international with dead keys)"
 msgstr "Angielski (Wielka Brytania, międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:781
 msgid "English (UK, Dvorak)"
 msgstr "Angielski (Wielka Brytania, Dvoraka)"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Angielski (Wielka Brytania, Dvoraka z brytyjskimi znakami przestankowymi)"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
 msgid "English (UK, Macintosh)"
 msgstr "Angielski (Wielka Brytania, Macintosh)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
 msgid "English (UK, Macintosh international)"
 msgstr "Angielski (Wielka Brytania, międzynarodowy Macintosh)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
 msgid "English (UK, Colemak)"
 msgstr "Angielski (Wielka Brytania, Colemak)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
 msgid "Uzbek"
 msgstr "Uzbecki"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:787
 msgid "Uzbek (Latin)"
 msgstr "Uzbecki (łaciński)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:790
 msgid "Vietnamese"
 msgstr "Wietnamski"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
 msgid "Korean"
 msgstr "Koreański"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreański (kompatybilny ze 101/104 klawiszami)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japoński (serie PC-98xx)"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
 msgid "Irish"
 msgstr "Irlandzki"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
 msgid "CloGaelach"
 msgstr "Irlandzki gaelicki"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:800
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlandzki (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
 msgid "Ogham"
 msgstr "Ogamiczny"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
 msgid "Ogham (IS434)"
 msgstr "Ogamiczny (IS434)"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakistan)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
 msgid "Arabic (Pakistan)"
 msgstr "Arabski (pakistański)"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
 msgid "Sindhi"
 msgstr "Sindhi"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
 msgid "Dhivehi"
 msgstr "Malediwski"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:813
 msgid "English (South Africa)"
 msgstr "Angielski (Afryka Południowa)"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:815
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
 msgid "Esperanto"
 msgstr "Esperancki"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (zamieniony średnik i apostrof, przestarzałe)"
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
 msgid "Nepali"
 msgstr "Nepalski"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
 msgid "English (Nigeria)"
 msgstr "Angielski (Nigeria)"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
 msgid "Igbo"
 msgstr "Ibo"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
 msgid "Yoruba"
 msgstr "Joruba"
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:829
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
 msgid "Amharic"
 msgstr "Amharski"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:832
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
 msgid "Wolof"
 msgstr "Wolof"
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:836
 msgid "Braille"
 msgstr "Braille'a"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
 msgid "Braille (left hand)"
 msgstr "Braille (leworęczny)"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
 msgid "Braille (right hand)"
 msgstr "Braille (praworęczny)"
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:840
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
 msgid "Turkmen"
 msgstr "Turkmeński"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmeński (Alt-Q)"
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:844
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
 msgid "Bambara"
 msgstr "Bambara"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
 msgid "French (Mali, alternative)"
 msgstr "Francuski (Mali, alternatywny)"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:847
 msgid "English (Mali, US Macintosh)"
 msgstr "Angielski (Mali, USA - Macintosh)"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
 msgid "English (Mali, US international)"
 msgstr "Angielski (Mali, międzynarodowy USA)"
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:850
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
 msgid "Swahili (Tanzania)"
 msgstr "Suahili (Tanzania)"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
 msgid "Swahili (Kenya)"
 msgstr "Suahili (Kenia)"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:853
 msgid "Kikuyu"
 msgstr "Kikiju"
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:856
 msgid "Tswana"
 msgstr "Tswana"
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
 msgid "Filipino"
 msgstr "Filipiński"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipino (baybain QWERTY)"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:861
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipiński (łaciński Capewella-Dvoraka)"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipiński (baybayin Capewella-Dvoraka)"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipiński (łaciński Capewella-QWERF 2006)"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipiński (baybayin Capewella-QWERF 2006)"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:865
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipiński (łaciński Colemak)"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipiński (baybain Colemak)"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipiński (łaciński Dvoraka)"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Filipiński (baybain Dvoraka)"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
 msgid "md"
 msgstr "md"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
 msgid "Moldavian"
 msgstr "Mołdawski"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:871
 msgid "gag"
 msgstr "gag"
 
-#: ../rules/base.xml.in.h:862
-msgid "Gagauz"
-msgstr "Gagauski"
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "Mołdawski (gagauski)"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
 msgid "Key(s) to change layout"
 msgstr "Klawisze zmieniające układ"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
 msgid "Right Alt (while pressed)"
 msgstr "Prawy Alt (wciśnięty)"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
 msgid "Left Alt (while pressed)"
 msgstr "Lewy Alt (wciśnięty)"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:876
 msgid "Left Win (while pressed)"
 msgstr "Lewy Win (wciśnięty)"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
 msgid "Right Win (while pressed)"
 msgstr "Prawy Win (wciśnięty)"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
 msgid "Any Win key (while pressed)"
 msgstr "Dowolny klawisz Win (wciśnięty)"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:879
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "CapsLock (wciśnięty), Alt+CapsLock działa jak zwykły CapsLock"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
 msgid "Right Ctrl (while pressed)"
 msgstr "Prawy Ctrl (wciśnięty)"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
 msgid "Right Alt"
 msgstr "Prawy Alt"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
 msgid "Left Alt"
 msgstr "Lewy Alt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
 msgid "Caps Lock"
 msgstr "CapsLock"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
 msgid "Shift+Caps Lock"
 msgstr "Shift+CapsLock"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "CapsLock (do pierwszego układu), Shift+CapsLock (do ostatniego układu)"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Lewy Win (do pierwszego układu), prawy Win/Menu (do ostatniego układu)"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Lewy Ctrl (do pierwszego układu), prawy Ctrl (do ostatniego układu)"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
 msgid "Alt+Caps Lock"
 msgstr "Alt+CapsLock"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
 msgid "Both Shift keys together"
 msgstr "Oba klawisze Shift naraz"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
 msgid "Both Alt keys together"
 msgstr "Oba klawisze Alt naraz"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
 msgid "Both Ctrl keys together"
 msgstr "Oba klawisze Ctrl naraz"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
 msgid "Left Ctrl+Left Shift"
 msgstr "Lewy Ctrl+lewy Shift"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
 msgid "Right Ctrl+Right Shift"
 msgstr "Prawy Ctrl+prawy Shift"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
 msgid "Left Alt+Left Shift"
 msgstr "Lewy Alt+lewy Shift"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
 msgid "Alt+Space"
 msgstr "Alt+Spacja"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
 msgid "Left Win"
 msgstr "Lewy Win"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
 msgid "Right Win"
 msgstr "Prawy Win"
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
 msgid "Left Shift"
 msgstr "Lewy Shift"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
 msgid "Right Shift"
 msgstr "Prawy Shift"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl"
 msgstr "Lewy Ctrl"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
 msgid "Right Ctrl"
 msgstr "Prawy Ctrl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
 msgid "Scroll Lock"
 msgstr "ScrollLock"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Lewy Ctrl+lewy Win (do pierwszego układu), prawy Ctrl+Menu (do drugiego układu)"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
 msgid "Key to choose 3rd level"
 msgstr "Klawisz wybierający poziom 3."
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
 msgid "Any Win key"
 msgstr "Dowolny klawisz Win"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
 msgid "Any Alt key"
 msgstr "Dowolny klawisz Alt"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Prawy Alt, Shift+prawy Alt jako Multi_Key"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:912
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Prawy Alt nigdy nie wybierający poziomu 3."
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
 msgid "Enter on keypad"
 msgstr "Enter na klawiaturze numerycznej"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
 msgid "Backslash"
 msgstr "Backslash"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Mniejsze/Większe&gt;"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
 msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "CapsLock wybiera poziom 3., jednorazowo blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 3."
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
 msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Odwrotny ukośnik wybiera poziom 3., jednorazowo blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 3."
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
 msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "&lt;Mniejsze/Większe&gt; wybiera poziom 3., jednorazowo blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 3."
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
 msgid "Ctrl key position"
 msgstr "Położenie klawisza Ctrl"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
 msgid "Caps Lock as Ctrl"
 msgstr "CapsLock jako Ctrl"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
 msgid "Left Ctrl as Meta"
 msgstr "Lewy Ctrl jako Meta"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Zamiana Ctrl i CapsLocka"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
 msgid "At left of 'A'"
 msgstr "Z lewej 'A'"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:924
 msgid "At bottom left"
 msgstr "W lewym dolnym rogu"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:925
 msgid "Right Ctrl as Right Alt"
 msgstr "Prawy Ctrl jako prawy Alt"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:926
 msgid "Menu as Right Ctrl"
 msgstr "Menu jako prawy Ctrl"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:927
 msgid "Right Alt as Right Ctrl"
 msgstr "Prawy Alt jako prawy Ctrl"
 
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:928
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Używanie diody na klawiaturze do sygnalizacji układu alternatywnego"
 
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:929
 msgid "Num Lock"
 msgstr "NumLock"
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:930
 msgid "Numeric keypad layout selection"
 msgstr "Wybór układu klawiatury numerycznej"
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:931
 msgid "Legacy"
 msgstr "Stary"
 
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:932
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Dodatki Unicode (strzałki i symbole matematyczne)"
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:933
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Dodatki Unicode (strzałki i symbole matematyczne). Symbole matematyczne na poziomie domyślnym"
 
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:934
 msgid "Legacy Wang 724"
 msgstr "Legacy Wang 724"
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:935
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Klawiatura numeryczna Wang 724 z dodatkami Unicode (strzałki i symbole matematyczne)"
 
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:936
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Klawiatura numeryczna Wang 724 z dodatkami Unicode (strzałki i symbole matematyczne). Symbole matematyczne na poziomie domyślnym"
 
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:937
 msgid "Hexadecimal"
 msgstr "Szesnastkowy"
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:938
 msgid "ATM/phone-style"
 msgstr "ATM/telefoniczna"
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:939
 msgid "Numeric keypad delete key behaviour"
 msgstr "Zachowanie klawisza Delete na klawiaturze numerycznej"
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:940
 msgid "Legacy key with dot"
 msgstr "Klawisz tradycyjny z kropką"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:942
 msgid "Legacy key with comma"
 msgstr "Klawisz tradycyjny z przecinkiem"
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:943
 msgid "Four-level key with dot"
 msgstr "Klawisz czterofunkcyjny z kropką"
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:944
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Klawisz czterofunkcyjny z kropką, tylko latin-9"
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:945
 msgid "Four-level key with comma"
 msgstr "Klawisz czterofunkcyjny z przecinkiem"
 
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:946
 msgid "Four-level key with momayyez"
 msgstr "Klawisz czterofunkcyjny ze znakiem momayyez"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:949
 msgid "Four-level key with abstract separators"
 msgstr "Klawisz czterofunkcyjny z abstrakcyjnymi separatorami"
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:950
 msgid "Semi-colon on third level"
 msgstr "Średnik na poziomie 3."
 
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:951
 msgid "Caps Lock key behavior"
 msgstr "Zachowanie klawisza CapsLock"
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:952
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "CapsLock używa wewnętrznej zmiany rozmiaru liter. Shift wstrzymuje CapsLock"
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:953
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "CapsLock używa wewnętrznej zmiany rozmiaru liter. Shift nie wpływa na CapsLock"
 
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:954
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "CapsLock działa jako Shift z blokadą. Shift wstrzymuje CapsLock"
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:955
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "CapsLock działa jako Shift z blokadą. Shift nie wpływa na CapsLock"
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:956
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "CapsLock przełącza wielkość znaków alfabetycznych"
 
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:957
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "CapsLock jako dodatkowy NumLock"
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:958
 msgid "Swap ESC and Caps Lock"
 msgstr "Zamiana Esc i CapsLocka"
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:959
 msgid "Make Caps Lock an additional ESC"
 msgstr "CapsLock jako dodatkowy Esc"
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:960
 msgid "Make Caps Lock an additional Backspace"
 msgstr "CapsLock jako dodatkowy Backspace"
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:961
 msgid "Make Caps Lock an additional Super"
 msgstr "CapsLock jako dodatkowy Super"
 
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:962
 msgid "Make Caps Lock an additional Hyper"
 msgstr "CapsLock jako dodatkowy Hyper"
 
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:963
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "CapsLock przełącza Shift wpływając na wszystkie klawisze"
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:964
 msgid "Caps Lock is disabled"
 msgstr "CapsLock wyłączony"
 
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:965
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "CapsLock jako dodatkowy Ctrl, ale z pozostawieniem symbolu Caps_Lock"
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:966
 msgid "Alt/Win key behavior"
 msgstr "Zachowanie klawiszy Alt/Win"
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:967
 msgid "Add the standard behavior to Menu key"
 msgstr "Dodanie standardowego działania klawisza Menu"
 
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:968
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt i Meta pod klawiszami Alt"
 
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:969
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Control pod klawiszami Win (oraz zwykłymi klawiszami Ctrl)"
 
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:970
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Control pod klawiszami Alt, Alt pod klawiszami Win"
 
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:971
 msgid "Meta is mapped to Win keys"
 msgstr "Meta pod klawiszami Win"
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:972
 msgid "Meta is mapped to Left Win"
 msgstr "Meta pod lewym Win"
 
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:973
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper pod klawiszami Win"
 
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:974
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt pod prawym Win, Super pod Menu"
 
-#: ../rules/base.xml.in.h:965
-msgid "Left Alt is swapped with Left Win"
-msgstr "Lewy Alt zamieniony z lewym Win"
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
+msgstr "Lewy zamieniony z Win"
 
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:976
 msgid "Compose key position"
 msgstr "Położenie klawisza Compose"
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:977
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:978
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:979
 msgid "Miscellaneous compatibility options"
 msgstr "Różne opcje kompatybilności"
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:980
 msgid "Default numeric keypad keys"
 msgstr "Domyślne klawisze klawiatury numerycznej"
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:981
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr "Klawiatura numeryczna zawsze prowadza cyfry (jak w Mac OS)"
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:982
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shift z klawiaturą numeryczną działą jak pod MS Windows"
 
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:983
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift nie anuluje NumLocka, wybiera poziom 3."
 
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:984
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Klawisze specjalne (Ctrl+Alt+&lt;klawisz&gt;) obsługiwane przez serwer"
 
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:985
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Apple Aluminium Keyboard: emulacja klawiszy PC (Print, ScrollLock, Pause, NumLock)"
 
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:986
 msgid "Shift cancels Caps Lock"
 msgstr "Shift anuluje CapsLock"
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:987
 msgid "Enable extra typographic characters"
 msgstr "Włączenie dodatkowych znaków typograficznych"
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:988
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Oba klawisze Shift naraz przełączają CapsLock"
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:989
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Oba klawisze Shift naraz włączają CapsLock, jeden Shift wyłącza"
 
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:990
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Oba klawisze Shift naraz przełączają ShiftLock"
 
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:991
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Przełączanie klawiszy kursorów przez Shift + NumLock."
 
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:992
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr "Akcje klawiatury mogą przełamywać przechwytywanie (uwaga: zagrożenie bezpieczeństwa)"
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:993
 msgid "Adding currency signs to certain keys"
 msgstr "Dodanie znaków walut do pewnych klawiszy"
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:994
 msgid "Euro on E"
 msgstr "Euro pod E"
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:995
 msgid "Euro on 2"
 msgstr "Euro pod 2"
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:996
 msgid "Euro on 4"
 msgstr "Euro pod 4"
 
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:997
 msgid "Euro on 5"
 msgstr "Euro pod 5"
 
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:998
 msgid "Rupee on 4"
 msgstr "Rupia pod 4"
 
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:999
 msgid "Key to choose 5th level"
 msgstr "Klawisz wybierający poziom 5."
 
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1000
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "&lt;Mniejsze/Większe&gt; wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5."
 
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1001
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Prawy Alt wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5."
 
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1002
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Lewy Win wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5."
 
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1003
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Prawy Win wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5."
 
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1004
 msgid "Using space key to input non-breakable space character"
 msgstr "Używanie klawisza spacji do wprowadzania znaku niełamliwej spacji"
 
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:1005
 msgid "Usual space at any level"
 msgstr "Zwykła spacja na dowolnym poziomie"
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1006
 msgid "Non-breakable space character at second level"
 msgstr "Znak niełamliwej spacji na poziomie 2."
 
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1007
 msgid "Non-breakable space character at third level"
 msgstr "Znak niełamliwej spacji na poziomie 3."
 
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1008
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Znak niełamliwej spacji na poziomie 3., nic na poziomie 4."
 
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1009
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Znak niełamliwej spacji na poziomie 3., wąskiej niełamliwej spacji na poziomie 4."
 
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1010
 msgid "Non-breakable space character at fourth level"
 msgstr "Znak niełamliwej spacji na poziomie 4."
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1011
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Znak niełamliwej spacji na poziomie 4., wąskiej niełamliwej spacji na poziomie 6."
 
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1012
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Znak niełamliwej spacji na poziomie 4., wąskiej niełamliwej spacji na poziomie 6. (z Ctrl+Shift)"
 
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1013
 msgid "Zero-width non-joiner character at second level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2."
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1014
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak łączący zerowej szerokości na poziomie 3."
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1015
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak łączący zerowej szerokości na poziomie 3., znak niełamliwej spacji na poziomie 4."
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1016
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak niełamliwej spacji na poziomie 3."
 
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1017
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak niełamliwej spacji na poziomie 3., nic na poziomie 4."
 
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1018
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak niełamliwej spacji na poziomie 3., znak łączący zerowej szerokości na poziomie 4."
 
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1019
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak niełamliwej spacji na poziomie 3., wąskiej niełamliwej spacji na poziomie 4."
 
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1020
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 3., znak łączący zerowej szerokości na poziomie 4."
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1021
 msgid "Japanese keyboard options"
 msgstr "Opcje klawiatury japońskiej"
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1022
 msgid "Kana Lock key is locking"
 msgstr "Blokujący klawisz Kana Lock"
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1023
 msgid "NICOLA-F style Backspace"
 msgstr "Backspace w stylu NICOLA-F"
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1024
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr "Zenkaku Hankaku jako dodatkowy Esc"
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1025
 msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr "Dodanie akcentów przeciągłych Esperanto (supersigno)"
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1026
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Pod odpowiednimi klawiszami wg układu QWERTY."
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1027
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Pod odpowiednimi klawiszami wg układu Dvoraka."
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Zachowanie zgodności klawiszy ze starymi kodami Solarisa"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "Zgodność klawiszy z Sunem"
+
+#: ../rules/base.xml.in.h:1030
 msgid "Key sequence to kill the X server"
 msgstr "Sekwencja klawiszy zabijająca serwer X"
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
@@ -3790,7 +3841,7 @@ msgid "apl"
 msgstr "apl"
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "APL Keyboard Symbols"
+msgid "APL keyboard symbols"
 msgstr "Symbole klawiatury APL"
 
 #: ../rules/base.extras.xml.in.h:5
@@ -3809,102 +3860,234 @@ msgstr "shs"
 msgid "Secwepemctsin"
 msgstr "Shuswap"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Wielojęzyczny (Kanada, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "Niemiecki (klawiatura US z literami niemieckimi)"
 
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "Niemiecki (z literami węgierskimi, bez klawiszy akcentów)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "Niemiecki (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:17
 msgid "Avestan"
 msgstr "Awestyjski"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:20
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Litewski (USA, Dvoraka z literami litewskimi)"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Litewski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "Łotewski (USA, Dvoraka)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Łotewski (USA, Dvoraka, wariant Y)"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Łotewski (USA, Dvoraka, wariant minus)"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Łotewski (USA, Dvoraka programisty)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Łotewski (USA, Dvoraka programisty, wariant Y)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Łotewski (USA, Dvoraka programisty, wariant minus)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:30
 msgid "Latvian (US Colemak)"
 msgstr "Łotewski (USA, Colemak)"
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:31
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Łotewski (USA, Colemak, wariant z apostrofem)"
 
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Łotewski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:35
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Angielski (USA, międzynarodowy, łączenie unikodu z AltGr)"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Angielski (USA, międzynarodowy, łączenie unikodu z AltGr, alternatywny)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "Atsina"
 msgstr "Atsina"
 
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:38
 msgid "Couer D'alene Salish"
 msgstr "Couer D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr "Angielski (USA, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr "Polski (międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "Polski (Colemak)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "Polski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:48
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr "Krymskotatarski (Dobruja Q)"
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Rumuński (ergonomiczny Touchtype)"
 
-#: ../rules/base.extras.xml.in.h:44
-msgid "Serbian"
-msgstr "Serbski"
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Rumuński (Sun Type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:53
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serbski (łączenie akcentów zamiast klawiszy akcentów)"
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "Rosyjski (z układem ukraińsko-białoruskim)"
 
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "Rosyjski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:60
 msgid "Armenian (OLPC phonetic)"
 msgstr "Armeński (fonetyczny OLPC)"
 
-#: ../rules/base.extras.xml.in.h:53
-msgid "Hebrew (Biblical SIL)"
-msgstr "Hebrajski (biblijny SIL)"
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "Hebrajski (biblijny, fonetyczny SIL)"
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Arabski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Belgijski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "Portugalski (Brazylia, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "Czeski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "Duński (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Holenderski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Estoński (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Fiński (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "Francuski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "Grecki (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "Włoski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "Japoński (Sun Type 6)"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Japoński (Sun Type 7 - kompatybilny z PC)"
+
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Japoński (Sun Type 7 - kompatybilny z Sunem)"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Norweski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Portugalski (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Słowacki (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "Hiszpański (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "Szwedzki (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr "Niemiecki (Szwajcaria)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Niemiecki (Szwajcaria, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Francuski (Szwajcaria, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Turecki (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Ukraiński (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "Angielski (USA, Sun Type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:54
-msgid "Biblical SIL phonetic"
-msgstr "Biblijny fonetyczny SIL"
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "Koreański (Sun Type 6/7)"
diff --git a/xorg-server/xkeyboard-config/po/ru.po b/xorg-server/xkeyboard-config/po/ru.po
index c6782dd44..aae53b128 100644
--- a/xorg-server/xkeyboard-config/po/ru.po
+++ b/xorg-server/xkeyboard-config/po/ru.po
@@ -7,14 +7,14 @@
 # Nickolay V. Shmyrev <nshmyrev@yandex.ru>, 2006.
 # Misha Shnurapet <zayzayats@yandex.ru>, 2010.
 # ChALkeR <chalkerx@gmail.com>, 2010.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011, 2012.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011, 2012, 2013.
 # Pavel Maryanov <acid@jack.kiev.ua>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.6.99\n"
+"Project-Id-Version: xkeyboard-config 2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-09-12 00:25+0100\n"
-"PO-Revision-Date: 2012-09-18 20:52+0400\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-18 18:46+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
@@ -705,3092 +705,3143 @@ msgid "OLPC"
 msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Sun Type 7 USB"
+msgstr "Sun Type 7 USB"
 
 #: ../rules/base.xml.in.h:172
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun Type 7 USB (европейская раскладка)"
+
+#: ../rules/base.xml.in.h:173
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun Type 7 USB (раскладка Unix)"
+
+#: ../rules/base.xml.in.h:174
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun Type 7 USB (японская раскладка) / японская 106 клавиш"
+
+#: ../rules/base.xml.in.h:175
+msgid "Sun Type 6/7 USB"
+msgstr "Sun Type 6/7 USB"
+
+#: ../rules/base.xml.in.h:176
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun Type 6/7 USB (европейская раскладка)"
+
+#: ../rules/base.xml.in.h:177
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun Type 6 USB (раскладка Unix)"
+
+#: ../rules/base.xml.in.h:178
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun Type 6 USB (японская раскладка)"
+
+#: ../rules/base.xml.in.h:179
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun Type 6 (японская раскладка)"
+
+#: ../rules/base.xml.in.h:180
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:181
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:182
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:183
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:184
 msgid "Htc Dream phone"
 msgstr "телефон Htc Dream"
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
 msgid "English (US)"
 msgstr "Английская (США)"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:189
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:190
 msgid "Cherokee"
 msgstr "Черокская"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:191
 msgid "English (US, with euro on 5)"
 msgstr "Английская (США, международная с символом евро на клавише 5)"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:192
 msgid "English (US, international with dead keys)"
 msgstr "Английская (США, международная с спец. клавишами (dead keys))"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:193
 msgid "English (US, alternative international)"
 msgstr "Английская (США, альтернативная международная)"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:194
 msgid "English (Colemak)"
 msgstr "Английская (Коулмак)"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:195
 msgid "English (Dvorak)"
 msgstr "Английская (Дворак)"
 
-#: ../rules/base.xml.in.h:188
-msgid "English (Dvorak international with dead keys)"
-msgstr "Английская (Дворак международная с спец. клавишами)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
+msgstr "Английская (Дворак, международная с спец. клавишами)"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:197
 msgid "English (Dvorak alternative international no dead keys)"
-msgstr "Английская (Дворак альтернативная международная (без спец. клавиш))"
+msgstr "Английская (Дворак альтернативная международная без спец. клавиш)"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:198
 msgid "English (left handed Dvorak)"
 msgstr "Английская (Дворак под левую руку)"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:199
 msgid "English (right handed Dvorak)"
 msgstr "Английская (Дворак под правую руку)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:200
 msgid "English (classic Dvorak)"
 msgstr "Английская (классическая Дворак)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:201
 msgid "English (programmer Dvorak)"
 msgstr "Английская (Дворак для программистов)"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:204
 msgid "Russian (US, phonetic)"
 msgstr "Русская (США, фонетическая)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
 msgstr "Английская (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:206
 msgid "English (international AltGr dead keys)"
 msgstr "Английская (международная с AltGr и спец. клавишами (dead keys))"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:207
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Английская (переключение раскладки по клавише умножения/деления)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:208
 msgid "Serbo-Croatian (US)"
 msgstr "Сербо-Хорватская (США)"
 
-#. Keyboard indicator for Catalan layouts
-#: ../rules/base.xml.in.h:202
-msgid "ca"
-msgstr "ca"
+#: ../rules/base.xml.in.h:209
+msgid "English (Workman)"
+msgstr "Английская (Воркман)"
 
-#: ../rules/base.xml.in.h:203
-msgid "Catalan"
-msgstr "Каталонская"
+#: ../rules/base.xml.in.h:210
+msgid "English (Workman, international with dead keys)"
+msgstr "Английская (Воркман, международная с спец. клавишами)"
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:213
 msgid "Afghani"
 msgstr "Афганская"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:215
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:216
 msgid "Pashto"
 msgstr "Пуштунская"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:218
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:219
 msgid "Uzbek (Afghanistan)"
 msgstr "Узбекская (Афганистан)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:220
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Пуштунская (Афганистан, OLPC)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:221
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Персидская (Афганистан, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:222
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Узбекская (Афганистан, OLPC)"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
 msgid "Arabic"
 msgstr "Арабская"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:226
 msgid "Arabic (azerty)"
 msgstr "Арабская (azerty)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:227
 msgid "Arabic (azerty/digits)"
 msgstr "Арабская (azerty/цифры)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:228
 msgid "Arabic (digits)"
 msgstr "Арабская (цифры)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:229
 msgid "Arabic (qwerty)"
 msgstr "Арабская (qwerty)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:230
 msgid "Arabic (qwerty/digits)"
 msgstr "Арабская (qwerty/цифры)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:231
 msgid "Arabic (Buckwalter)"
 msgstr "Арабская (Buckwalter)"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:233
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:234
 msgid "Albanian"
 msgstr "Албанская"
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
 msgid "Armenian"
 msgstr "Армянская"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:238
 msgid "Armenian (phonetic)"
 msgstr "Армянская (фонетическая)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:239
 msgid "Armenian (alternative phonetic)"
 msgstr "Армянская (альтернативная фонетическая)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:240
 msgid "Armenian (eastern)"
 msgstr "Армянская (восточная)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:241
 msgid "Armenian (western)"
 msgstr "Армянская (западная)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:242
 msgid "Armenian (alternative eastern)"
 msgstr "Армянская (альтернативная восточная)"
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:245
 msgid "German (Austria)"
 msgstr "Немецкая (Австрия)"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:246
+msgid "German (legacy)"
+msgstr "Немецкая (устаревшая)"
+
+#: ../rules/base.xml.in.h:247
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Немецкая (Австрия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:248
 msgid "German (Austria, Sun dead keys)"
 msgstr "Немецкая (Австрия, с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:249
 msgid "German (Austria, Macintosh)"
 msgstr "Немецкая (Австрия, Macintosh)"
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:251
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:252
 msgid "Azerbaijani"
 msgstr "Азербайджанская"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:253
 msgid "Azerbaijani (Cyrillic)"
 msgstr "Азербайджанская (кириллица)"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:255
 msgid "by"
 msgstr "by"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:256
 msgid "Belarusian"
 msgstr "Белорусская"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:257
 msgid "Belarusian (legacy)"
 msgstr "Белорусская (устаревшая)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:258
 msgid "Belarusian (Latin)"
 msgstr "Белорусская (латиница)"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
 msgid "Belgian"
 msgstr "Бельгийская"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:262
 msgid "Belgian (alternative)"
 msgstr "Бельгийская (альтернативная)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:263
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Бельгийская (альтернативная, только latin-9)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:264
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Бельгийская (альтернативная, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:265
 msgid "Belgian (ISO alternate)"
 msgstr "Бельгийская (альтернативная ISO)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:266
 msgid "Belgian (eliminate dead keys)"
 msgstr "Бельгийская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:267
 msgid "Belgian (Sun dead keys)"
 msgstr "Бельгийская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:268
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Бельгийская (Wang model 724 azerty)"
 
 #. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:270
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:271
 msgid "Bengali"
 msgstr "Бенгальская"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:272
 msgid "Bengali (Probhat)"
 msgstr "Бенгальская (Индия, Probhat)"
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:274
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:275
 msgid "Indian"
 msgstr "Индийская"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:276
 msgid "Bengali (India)"
 msgstr "Бенгальская (Индия)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:277
 msgid "Bengali (India, Probhat)"
 msgstr "Бенгальская (Индия, Probhat)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:278
 msgid "Bengali (India, Baishakhi)"
 msgstr "Бенгальская (Индия, Baishakhi)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:279
 msgid "Bengali (India, Bornona)"
 msgstr "Бенгальская (Индия, Bornona)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:280
 msgid "Bengali (India, Uni Gitanjali)"
 msgstr "Бенгальская (Индия, Uni Gitanjali)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:281
 msgid "Bengali (India, Baishakhi Inscript)"
 msgstr "Бенгальская (Индия, письменность Baishakhi)"
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:283
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:284
 msgid "Gujarati"
 msgstr "Гуджарати"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:286
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:287
 msgid "Punjabi (Gurmukhi)"
 msgstr "Пенджабская (гурмукхи)"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:288
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Пенджабская (гурмукхи Jhelum)"
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:290
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:291
 msgid "Kannada"
 msgstr "Каннада"
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:293
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:294
 msgid "Malayalam"
 msgstr "Малайaлам"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:295
 msgid "Malayalam (Lalitha)"
 msgstr "Малайaламская (лалита)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:296
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Малайaламская (улучшенный Inscript со символом рупии)"
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:298
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:299
 msgid "Oriya"
 msgstr "Орийя"
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:301
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:302
 msgid "Tamil (Unicode)"
 msgstr "Тамильская (юникодная)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:303
 msgid "Tamil (keyboard with numerals)"
 msgstr "Тамильская (клавиатура с цифрами)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:304
 msgid "Tamil (TAB typewriter)"
 msgstr "Тамильская (печатная машинка TAB)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:305
 msgid "Tamil (TSCII typewriter)"
 msgstr "Тамильская (печатная машинка TSCII)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:306
 msgid "Tamil"
 msgstr "Тамильская"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:308
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:309
 msgid "Telugu"
 msgstr "Телугская"
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:311
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:312
 msgid "Urdu (phonetic)"
 msgstr "Урдская (фонетическая)"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:313
 msgid "Urdu (alternative phonetic)"
 msgstr "Урдская (альтернативная фонетическая)"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:314
 msgid "Urdu (WinKeys)"
 msgstr "Урдcкая (с клавишами Win)"
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:316
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:317
 msgid "Hindi (Bolnagri)"
 msgstr "Хинди (Bolnagri)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:318
 msgid "Hindi (Wx)"
 msgstr "Хинди (Wx)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:319
 msgid "English (India, with RupeeSign)"
 msgstr "Английская (Индия, с знаком индийской рупии)"
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:321
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:322
 msgid "Bosnian"
 msgstr "Боснийская"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:323
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Боснийская (используются кавычки ёлочки как кавычки)"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:324
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Боснийская (используются боснийские диграфы)"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:325
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Боснийская (клавиатура США с боснийскими диграфами)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:326
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Боснийская (клавиатура США с боснийскими буквами)"
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
 msgid "Portuguese (Brazil)"
 msgstr "Португальская (Бразилия)"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:330
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Португальская (Бразилия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:331
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Португальская (Бразилия, Дворак)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:332
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Португальская (Бразилия, nativo)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:333
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Португальская (Бразилия, nativo для клавиатур США)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:334
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Португальская (Бразилия, nativo для эсперанто)"
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:336
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:337
 msgid "Bulgarian"
 msgstr "Болгарская"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:338
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Болгарская (традиционная фонетическая)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:339
 msgid "Bulgarian (new phonetic)"
 msgstr "Болгарская (новая фонетическая)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:340
 msgid "Arabic (Morocco)"
 msgstr "Арабская (Марокко)"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:343
 msgid "French (Morocco)"
 msgstr "Французская (Марокко)"
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:345
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:346
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Берберская (Марокко, тифинагская)"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:347
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Берберская (Марокко, тифинагская альтернативная)"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:348
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Берберская (Марокко, тифинагская альтернативная фонетическая)"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:349
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Берберская (Марокко, тифинагская расширенная)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:350
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Берберская (Марокко, тифинагская фонетическая)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:351
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Берберская (Марокко, тифинагская расширенная фонетическая)"
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
 msgid "English (Cameroon)"
 msgstr "Английская (Камерун)"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:355
 msgid "French (Cameroon)"
 msgstr "Французская (Камерун)"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:356
 msgid "Cameroon Multilingual (qwerty)"
 msgstr "Камерунская многоязыковая (qwerty)"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:357
 msgid "Cameroon Multilingual (azerty)"
 msgstr "Камерунская многоязыковая (azerty)"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:358
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr "Камерунская многоязыковая (Дворак)"
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:360
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:361
 msgid "Burmese"
 msgstr "Бирманская"
 
-#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr "Французская (Канада)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:363
 msgid "French (Canada, Dvorak)"
 msgstr "Французская (Канада, Дворак)"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:364
 msgid "French (Canada, legacy)"
 msgstr "Французская (Канада, устаревшая)"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:365
 msgid "Canadian Multilingual"
 msgstr "Канадская многоязыковая"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:366
 msgid "Canadian Multilingual (first part)"
 msgstr "Канадская многоязыковая (первая часть)"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:367
 msgid "Canadian Multilingual (second part)"
 msgstr "Канадская многоязыковая (вторая часть)"
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:369
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:370
 msgid "Inuktitut"
 msgstr "Иннуитская"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:371
 msgid "English (Canada)"
 msgstr "Английская (Канада)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:372
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Французская (Демократическая республика Конго)"
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:374
 msgid "zh"
 msgstr "zh"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:375
 msgid "Chinese"
 msgstr "Китайская"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:376
 msgid "Tibetan"
 msgstr "Тибетская"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:377
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Тибетская (с цифрами ASCII)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:378
 msgid "Uyghur"
 msgstr "Уйгурская"
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:380
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:381
 msgid "Croatian"
 msgstr "Хорватская"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:382
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Хорватская (используются кавычки ёлочки как кавычки)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:383
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Хорватская (используются хорватские диграфы)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:384
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Хорватская (клавиатура США с хорватскими диграфами)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:385
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Хорватская (клавиатура США с хорватскими буквами)"
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
 msgid "Czech"
 msgstr "Чешская"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:389
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Чешская (с клавишей &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:390
 msgid "Czech (qwerty)"
 msgstr "Чешская (qwerty)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:391
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Чешская (qwerty, расширенные функции Backslash)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:392
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Чешская (раскладка UCW, только символы акцентов)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:393
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Чешская (Дворак США с поддержкой CZ UCW)"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
 msgid "Danish"
 msgstr "Датская"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:397
 msgid "Danish (eliminate dead keys)"
 msgstr "Датская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:398
 msgid "Danish (Macintosh)"
 msgstr "Датская (Macintosh)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:399
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Датская (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:400
 msgid "Danish (Dvorak)"
 msgstr "Датская (Дворак)"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
 msgid "Dutch"
 msgstr "Голландская"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:404
 msgid "Dutch (Sun dead keys)"
 msgstr "Голландская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:405
 msgid "Dutch (Macintosh)"
 msgstr "Голландская (Macintosh)"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:406
 msgid "Dutch (standard)"
 msgstr "Голландская (стандартная)"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:408
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:409
 msgid "Dzongkha"
 msgstr "Дзонг-кэ (dz"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
 msgid "Estonian"
 msgstr "Эстонская"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:413
 msgid "Estonian (eliminate dead keys)"
 msgstr "Эстонская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:414
 msgid "Estonian (Dvorak)"
 msgstr "Эстонская (Дворак)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Эстонская (клавиатура США с эстонскими буквами)"
 
-#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
 msgid "Persian"
 msgstr "Персидская"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Persian (with Persian Keypad)"
 msgstr "Персидская (с персидской доп. панелью)"
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Курдская (Иран, латинская Q)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 msgid "Kurdish (Iran, F)"
 msgstr "Курдская (Иран, F)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Курдская (Иран, латинская Alt-Q)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Курдская (Иран, арабо-латинская)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
 msgid "Iraqi"
 msgstr "Иракская"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:425
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Курдская (Ирак, латинская Q)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:426
 msgid "Kurdish (Iraq, F)"
 msgstr "Курдская (Ирак, F)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:427
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Курдская (Ирак, латинская alt-Q)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:428
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Курдская (Ирак, арабо-латинская)"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:430
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:431
 msgid "Faroese"
 msgstr "Фарерская"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:432
 msgid "Faroese (eliminate dead keys)"
 msgstr "Фарерская (без спец. клавиш (dead keys))"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
 msgid "Finnish"
 msgstr "Финская"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:436
 msgid "Finnish (classic)"
 msgstr "Финская (классическая)"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Финская (классическая, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Northern Saami (Finland)"
 msgstr "Северная Саамская (Финляндия)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Finnish (Macintosh)"
 msgstr "Финская (Macintosh)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
 msgid "French"
 msgstr "Французская"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:441
 msgid "French (eliminate dead keys)"
 msgstr "Французская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "French (Sun dead keys)"
 msgstr "Французская (со спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "French (alternative)"
 msgstr "Французская (альтернативная)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "French (alternative, latin-9 only)"
 msgstr "Французская (альтернативная, только latin-9)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Французская (альтернативная, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "French (alternative, Sun dead keys)"
 msgstr "Французская (альтернативная, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "French (legacy, alternative)"
 msgstr "Французская (устаревшая, альтернативная)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Французская (устаревшая, альтернативная, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Французская (устаревшая, альтернативная, с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Французская (Бепо, эргономичная, похожая на Дворак)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Французская (Бепо, эргономичная, похожая на Дворак, только latin-9)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:452
 msgid "French (Dvorak)"
 msgstr "Французская (Дворак)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:453
 msgid "French (Macintosh)"
 msgstr "Французская (Macintosh)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:454
 msgid "French (Breton)"
 msgstr "Французская (бретонская)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:455
 msgid "Occitan"
 msgstr "Окситанский"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:456
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Грузинская (Франция, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:457
 msgid "English (Ghana)"
 msgstr "Английская (Гана)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:458
 msgid "English (Ghana, multilingual)"
 msgstr "Английская (Гана, международная)"
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:460
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:461
 msgid "Akan"
 msgstr "Аканская"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:463
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:464
 msgid "Ewe"
 msgstr "Ewe"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:466
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:467
 msgid "Fula"
 msgstr "Фулайская"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:469
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:470
 msgid "Ga"
 msgstr "Гайская"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:472
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:473
 msgid "Hausa"
 msgstr "Хауза"
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:475
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:476
 msgid "Avatime"
 msgstr "Аватайм"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:477
 msgid "English (Ghana, GILLBT)"
 msgstr "Английская (Гана, GILLBT)"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:478
 msgid "French (Guinea)"
 msgstr "Французская (Гвинея)"
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:480
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:481
 msgid "Georgian"
 msgstr "Грузинская"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:482
 msgid "Georgian (ergonomic)"
 msgstr "Georgian (эргономичная)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:483
 msgid "Georgian (MESS)"
 msgstr "Грузинская (MESS)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:484
 msgid "Russian (Georgia)"
 msgstr "Русская (Грузия)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:485
 msgid "Ossetian (Georgia)"
 msgstr "Осетинская (Грузия)"
 
-#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
 msgid "German"
 msgstr "Немецкая"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:487
 msgid "German (dead acute)"
 msgstr "Немецкая (с акутом (dead acute))"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:488
 msgid "German (dead grave acute)"
 msgstr "Немецкая (с dead grave acute)"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:489
 msgid "German (eliminate dead keys)"
 msgstr "Немецкая (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:490
 msgid "Romanian (Germany)"
 msgstr "Румынская (Германия)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:491
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Румынская (Германия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:492
 msgid "German (Dvorak)"
 msgstr "Немецкая (Дворак)"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:493
 msgid "German (Sun dead keys)"
 msgstr "Немецкая (со спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:494
 msgid "German (Neo 2)"
 msgstr "Немецкая (Neo 2)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:495
 msgid "German (Macintosh)"
 msgstr "Немецкая (Macintosh)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:496
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Немецкая (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:497
 msgid "Lower Sorbian"
 msgstr "Нижнелужицкая"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:498
 msgid "Lower Sorbian (qwertz)"
 msgstr "Нижнелужицкая (qwertz)"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:499
 msgid "German (qwerty)"
 msgstr "Немецкая (qwerty)"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:500
 msgid "Russian (Germany, phonetic)"
 msgstr "Русская (Германия, фонетическая)"
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
 msgid "Greek"
 msgstr "Греческая"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:504
 msgid "Greek (simple)"
 msgstr "Греческая (простая)"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:505
 msgid "Greek (extended)"
 msgstr "Греческая (расширенная)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:506
 msgid "Greek (eliminate dead keys)"
 msgstr "Греческая (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:507
 msgid "Greek (polytonic)"
 msgstr "Греческая (полифоническая)"
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:509
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian"
 msgstr "Венгерская"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (standard)"
 msgstr "Венгерская (стандартная)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Венгерская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (qwerty)"
 msgstr "Венгерская (qwerty)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Венгерская (101/qwertz/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Венгерская (101/qwertz/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Венгерская (101/qwertz/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Венгерская (101/qwertz/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Венгерская (pc101/qwerty/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Венгерская (pc101/qwerty/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Венгерская (pc101/qwerty/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:521
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Венгерская (pc101/qwerty/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:522
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Венгерская (102/qwertz/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:523
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Венгерская (102/qwertz/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:524
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Венгерская (102/qwertz/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:525
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Венгерская (102/qwertz/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:526
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Венгерская (102/qwerty/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:527
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Венгерская (102/qwerty/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:528
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Венгерская (102/qwerty/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:529
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Венгерская (102/qwerty/точка/без спец. клавиш (dead keys))"
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:531
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:532
 msgid "Icelandic"
 msgstr "Исландская"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:533
 msgid "Icelandic (Sun dead keys)"
 msgstr "Исландская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:534
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Исландская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:535
 msgid "Icelandic (Macintosh)"
 msgstr "Исландская (Macintosh)"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:536
 msgid "Icelandic (Dvorak)"
 msgstr "Исландская (Дворак)"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:540
 msgid "Hebrew (lyx)"
 msgstr "Иврит (lyx)"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:541
 msgid "Hebrew (phonetic)"
 msgstr "Иврит (фонетическая)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:542
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Иврит (библейский, Tiro)"
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
 msgid "Italian"
 msgstr "Итальянская"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:546
 msgid "Italian (eliminate dead keys)"
 msgstr "Итальянская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:547
 msgid "Italian (Macintosh)"
 msgstr "Итальянская (Macintosh)"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:548
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Итальянская (клавиатура США с итальянскими буквами)"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:549
 msgid "Georgian (Italy)"
 msgstr "Грузинская (Италия)"
 
+#: ../rules/base.xml.in.h:550
+msgid "Italian (IBM 142)"
+msgstr "Итальянская (IBM 142)"
+
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
 msgid "Japanese"
 msgstr "Японская"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:554
 msgid "Japanese (Kana)"
 msgstr "Японская (Кана)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:555
 msgid "Japanese (Kana 86)"
 msgstr "Японская (Кана 86)"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:556
 msgid "Japanese (OADG 109A)"
 msgstr "Японская (OADG 109A)"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:557
 msgid "Japanese (Macintosh)"
 msgstr "Японская (Macintosh)"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:558
 msgid "Japanese (Dvorak)"
 msgstr "Японская (Дворак)"
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:560
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:561
 msgid "Kyrgyz"
 msgstr "Киргизская"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:562
 msgid "Kyrgyz (phonetic)"
 msgstr "Киргизская (фонетическая)"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:564
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:565
 msgid "Khmer (Cambodia)"
 msgstr "Кхмерская (Камбоджа)"
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:567
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:568
 msgid "Kazakh"
 msgstr "Казахская"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:569
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Русская (Казахстан, с казахской)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:570
 msgid "Kazakh (with Russian)"
 msgstr "Казахская (с русским)"
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:572
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:573
 msgid "Lao"
 msgstr "Лаосская"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:574
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Лаосская (стандартная раскладка, предложенная STEA)"
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:577
 msgid "Spanish (Latin American)"
 msgstr "Испанская (латиноамериканская)"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:578
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Испанская (латиноамериканская, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:579
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Испанская (латиноамериканская, с dead tilde)"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:580
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Испанская (латиноамериканская, с спец. клавишами (dead keys) Sun)"
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
 msgid "Lithuanian"
 msgstr "Литовская"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:584
 msgid "Lithuanian (standard)"
 msgstr "Литовская (стандартная)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:585
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Литовская (клавиатура США с литовскими буквами)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:586
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Литовская (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:587
 msgid "Lithuanian (LEKP)"
 msgstr "Литовская (LEKP)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:588
 msgid "Lithuanian (LEKPa)"
 msgstr "Литовская (LEKPa)"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
 msgid "Latvian"
 msgstr "Латышская"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:592
 msgid "Latvian (apostrophe variant)"
 msgstr "Латышская (вариант с апострофом)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:593
 msgid "Latvian (tilde variant)"
 msgstr "Латышская (вариант с тильдой)"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:594
 msgid "Latvian (F variant)"
 msgstr "Латышская (вариант с F)"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:595
 msgid "Latvian (modern)"
 msgstr "Латышская (современная)"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:596
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Латышская (эргономичная, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:597
 msgid "Latvian (adapted)"
 msgstr "Латышская (адаптированная)"
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:599
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:600
 msgid "Maori"
 msgstr "Маори"
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:603
 msgid "Montenegrin"
 msgstr "Черногорская"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:604
 msgid "Montenegrin (Cyrillic)"
 msgstr "Черногорская (кириллица)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:605
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Черногорская (кириллица, З и Ж переставлены местами)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:606
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Черногорская (латинская юникодная)"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:607
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Черногорская (латинская qwerty)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:608
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Черногорская (латинская юникодная qwerty)"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:609
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Черногорская (кириллица с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:610
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Черногорская (латинская с кавычками ёлочками)"
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:612
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:613
 msgid "Macedonian"
 msgstr "Македонская"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:614
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Македонская (без спец. клавиш (dead keys))"
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:616
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:617
 msgid "Maltese"
 msgstr "Мальтийская"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:618
 msgid "Maltese (with US layout)"
 msgstr "Мальтийская (с раскладкой США)"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:620
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:621
 msgid "Mongolian"
 msgstr "Монгольская"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
 msgid "Norwegian"
 msgstr "Норвежская"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:625
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Норвежская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:626
 msgid "Norwegian (Dvorak)"
 msgstr "Норвежская (Дворак)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:627
 msgid "Northern Saami (Norway)"
 msgstr "Северная Саамская (Норвегия)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:628
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Северная Саамская (Норвегия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:629
 msgid "Norwegian (Macintosh)"
 msgstr "Норвежская (Macintosh)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:630
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Норвежская (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:631
 msgid "Norwegian (Colemak)"
 msgstr "Норвежская (Коулмак)"
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
 msgid "Polish"
 msgstr "Польская"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:635
+msgid "Polish (legacy)"
+msgstr "Польская (устаревшая)"
+
+#: ../rules/base.xml.in.h:636
 msgid "Polish (qwertz)"
 msgstr "Польская (qwertz)"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:637
 msgid "Polish (Dvorak)"
 msgstr "Польская (Дворак)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:638
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Польская (Дворак, польские кавычки на клавишах с кавычками)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:639
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Польская (Дворак, польские кавычки на клавише 1)"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:640
 msgid "Kashubian"
 msgstr "Кашубская"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:641
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Русский (Польша, фонетический Дворак)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:642
 msgid "Polish (programmer Dvorak)"
 msgstr "Польская (Дворак для программистов)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
 msgid "Portuguese"
 msgstr "Португальская"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:644
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Португальская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:645
 msgid "Portuguese (Sun dead keys)"
 msgstr "Португальская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:646
 msgid "Portuguese (Macintosh)"
 msgstr "Португальская (Macintosh)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:647
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Португальская (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:648
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Португальская (Macintosh, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:649
 msgid "Portuguese (Nativo)"
 msgstr "Португальская (Nativo)"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:650
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Португальская (Nativo для клавиатур США)"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:651
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Эсперанто (Португалия, Nativo)"
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
 msgid "Romanian"
 msgstr "Румынская"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
 msgstr "Румынская (седиль)"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Румынская (стандартная)"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard cedilla)"
 msgstr "Румынская (стандартная седиль)"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:658
 msgid "Romanian (WinKeys)"
 msgstr "Румынская (клавиши Win)"
 
-#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "Русская"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:660
 msgid "Russian (phonetic)"
 msgstr "Русская (фонетическая)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:661
 msgid "Russian (phonetic WinKeys)"
 msgstr "Русская (фонетическая с клавишами Win)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:662
 msgid "Russian (typewriter)"
 msgstr "Русская (печатная машинка)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:663
 msgid "Russian (legacy)"
 msgstr "Русская (устаревшая)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:664
 msgid "Russian (typewriter, legacy)"
 msgstr "Русская (печатная машинка, устаревшая)"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:665
 msgid "Tatar"
 msgstr "Татарская"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Ossetian (legacy)"
 msgstr "Осетинская (устаревшая)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:667
 msgid "Ossetian (WinKeys)"
 msgstr "Осетинская (с клавишами Win)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:668
 msgid "Chuvash"
 msgstr "Чувашия"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:669
 msgid "Chuvash (Latin)"
 msgstr "Чувашская (латиница)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:670
 msgid "Udmurt"
 msgstr "Удмуртская"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:671
 msgid "Komi"
 msgstr "Коми"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:672
 msgid "Yakut"
 msgstr "Якутская"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:673
 msgid "Kalmyk"
 msgstr "Калмыцкая"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:674
 msgid "Russian (DOS)"
 msgstr "Русская (DOS)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:675
 msgid "Serbian (Russia)"
 msgstr "Сербская (Россия)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:676
 msgid "Bashkirian"
 msgstr "Башкирская"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:677
 msgid "Mari"
 msgstr "Марийская"
 
-#: ../rules/base.xml.in.h:668
-msgid "Serbian (Cyrillic)"
-msgstr "Сербская (Кириллица)"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "Сербская"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:679
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr "Сербская (кириллица, З и Ж переставлены местами)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:680
 msgid "Serbian (Latin)"
 msgstr "Сербская (латинская)"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:681
 msgid "Serbian (Latin Unicode)"
 msgstr "Сербская (латинская юникодная)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:682
 msgid "Serbian (Latin qwerty)"
 msgstr "Сербская (латинская qwerty)"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:683
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Сербская (латинская юникодная qwerty)"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr "Сербская (кириллица с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin with guillemets)"
 msgstr "Сербская (латинская с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:686
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Паннонская русинская (омофоническая)"
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:688
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:689
 msgid "Slovenian"
 msgstr "Словенская"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:690
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Словенская (используются кавычки ёлочки как кавычки)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:691
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Словенская (клавиатура США с словенскими буквами)"
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
 msgid "Slovak"
 msgstr "Словацкая"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:695
 msgid "Slovak (extended Backslash)"
 msgstr "Словацкая (расширенные функции Backslash)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:696
 msgid "Slovak (qwerty)"
 msgstr "Словацкая (qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:697
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Словацкая (qwerty, расширенные функции Backslash)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
 msgid "Spanish"
 msgstr "Испанская"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:699
 msgid "Spanish (eliminate dead keys)"
 msgstr "Испанская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:700
 msgid "Spanish (include dead tilde)"
 msgstr "Испанская (с dead tilde)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:701
 msgid "Spanish (Sun dead keys)"
 msgstr "Испанская (с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:702
 msgid "Spanish (Dvorak)"
 msgstr "Испанская (Дворак)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:703
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr "Астурлеонская (испанский вариант с нижними точками у H и L)"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:704
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Каталонская (испанский вариант с точкой в L посередине)"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:705
 msgid "Spanish (Macintosh)"
 msgstr "Испанская (Macintosh)"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
 msgid "Swedish"
 msgstr "Шведская"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:709
 msgid "Swedish (eliminate dead keys)"
 msgstr "Шведская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:710
 msgid "Swedish (Dvorak)"
 msgstr "Шведская (Дворак)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:711
 msgid "Russian (Sweden, phonetic)"
 msgstr "Русская (Швеция, фонетическая)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:712
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Русская (Швеция, фонетическая, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:713
 msgid "Northern Saami (Sweden)"
 msgstr "Северная Саамская (Швеция)"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:714
 msgid "Swedish (Macintosh)"
 msgstr "Шведская (Macintosh)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:715
 msgid "Swedish (Svdvorak)"
 msgstr "Шведская (Svdvorak)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:716
 msgid "Swedish Sign Language"
 msgstr "Шведский язык жестов"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:717
 msgid "German (Switzerland)"
 msgstr "Немецкая (Швейцария)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:718
 msgid "German (Switzerland, legacy)"
 msgstr "Немецкая (Швейцария, устаревшая)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:719
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Немецкая (Швейцария, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:720
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Немецкая (Швейцария, с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:721
 msgid "French (Switzerland)"
 msgstr "Французская (Швейцария)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:722
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Французская (Швейцария, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Французская (Швейцария, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
 msgid "French (Switzerland, Macintosh)"
 msgstr "Французская (Швейцария, Macintosh)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
 msgid "German (Switzerland, Macintosh)"
 msgstr "Немецкая (Швейцария, Macintosh)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
 msgid "Arabic (Syria)"
 msgstr "Арабская (Сирия)"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:728
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:729
 msgid "Syriac"
 msgstr "Сирийская"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:730
 msgid "Syriac (phonetic)"
 msgstr "Сирийская (фонетическая)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Курдская (Сирия, латинская Q)"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
 msgid "Kurdish (Syria, F)"
 msgstr "Курдская (Сирия, F)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Курдская (Сирия, латинская Alt-Q)"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
 msgid "Tajik"
 msgstr "Таджикская"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "Таджикская (устаревшая)"
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:739
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
 msgid "Sinhala (phonetic)"
 msgstr "Сингальская (фонетическая)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Тамильская (Шри-Ланка, юникодная)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Тамильская (Шри-Ланка, печатная машинка TAB)"
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
 msgid "Thai"
 msgstr "Тайская"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
 msgid "Thai (TIS-820.2538)"
 msgstr "Тайская (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Тайская (паттачотская)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
 msgid "Turkish"
 msgstr "Турецкая"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
 msgid "Turkish (F)"
 msgstr "Турецкая (F)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
 msgid "Turkish (Alt-Q)"
 msgstr "Турецкая (Alt-Q)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
 msgid "Turkish (Sun dead keys)"
 msgstr "Турецкая (со спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Курдская (Турция, латинская Q)"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
 msgid "Kurdish (Turkey, F)"
 msgstr "Курдская (Турция, F)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:756
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Курдская (Турция, латинская Alt-Q)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
 msgid "Turkish (international with dead keys)"
 msgstr "Турецкая (международная со спец. клавишами)"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:760
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Крымско-татарская (турецкая Q)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Крымско-татарская (турецкая F)"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Крымско-татарская (турецкая Alt-Q)"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
 msgid "Taiwanese"
 msgstr "Тайваньская"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
 msgid "Taiwanese (indigenous)"
 msgstr "Тайваньская (туземная)"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
 msgid "Saisiyat (Taiwan)"
 msgstr "Сайсьят (Тайвань)"
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
 msgid "Ukrainian"
 msgstr "Украинская"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:771
 msgid "Ukrainian (phonetic)"
 msgstr "Украинская (фонетическая)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:772
 msgid "Ukrainian (typewriter)"
 msgstr "Украинская (печатная машинка)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
 msgid "Ukrainian (WinKeys)"
 msgstr "Украинская (с клавишами Win)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (legacy)"
 msgstr "Украинская (устаревшая)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (standard RSTU)"
 msgstr "Украинская (стандартная RSTU)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Русская (Украина, стандартная RSTU)"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Украинская (омофоническая)"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
 msgid "English (UK)"
 msgstr "Английская (Великобритания)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
 msgid "English (UK, extended WinKeys)"
 msgstr "Английская (Великобритания, расширенная клавишами Win)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:780
 msgid "English (UK, international with dead keys)"
 msgstr "Английская (Великобритания, международная с спец. клавишами (dead keys))"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:781
 msgid "English (UK, Dvorak)"
 msgstr "Английская (Великобритания, Дворак)"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Английская (Великобритания, Дворак с английской пунктуацией)"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
 msgid "English (UK, Macintosh)"
 msgstr "Английская (Великобритания, Macintosh)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
 msgid "English (UK, Macintosh international)"
 msgstr "Английская (Великобритания, Macintosh международная)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
 msgid "English (UK, Colemak)"
 msgstr "Английская (Великобритания, Коулмак)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
 msgid "Uzbek"
 msgstr "Узбекская"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:787
 msgid "Uzbek (Latin)"
 msgstr "Узбекская (латинская)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:790
 msgid "Vietnamese"
 msgstr "Вьетнамская"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
 msgid "Korean"
 msgstr "Корейская"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
 msgid "Korean (101/104 key compatible)"
 msgstr "Корейская (совместимая c 101/104 кнопочной)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
 msgid "Japanese (PC-98xx Series)"
 msgstr "Японская (PC-98xx Series)"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
 msgid "Irish"
 msgstr "Ирландская"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:800
 msgid "Irish (UnicodeExpert)"
 msgstr "Ирландская (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
 msgid "Ogham"
 msgstr "Огхам"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
 msgid "Ogham (IS434)"
 msgstr "Огхам (IS434)"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
 msgid "Urdu (Pakistan)"
 msgstr "Урдская (Пакистан)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Урдская (Пакистан, CRULP)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Урдская (Пакистан, NLA)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
 msgid "Arabic (Pakistan)"
 msgstr "Арабская (Пакистан)"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
 msgid "Sindhi"
 msgstr "Синдхи"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
 msgid "Dhivehi"
 msgstr "Дивехи"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:813
 msgid "English (South Africa)"
 msgstr "Английская (Южная Африка)"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:815
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Эсперанто (смещённые точка с запятой и кавычка, устарела)"
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
 msgid "Nepali"
 msgstr "Непальская"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
 msgid "English (Nigeria)"
 msgstr "Английская (Нигерия)"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
 msgid "Igbo"
 msgstr "Игбо"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
 msgid "Yoruba"
 msgstr "Йорубская"
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:829
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
 msgid "Amharic"
 msgstr "Амхарская"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:832
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
 msgid "Wolof"
 msgstr "Волофская"
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:836
 msgid "Braille"
 msgstr "Брайля"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
 msgid "Braille (left hand)"
 msgstr "Брайля (под левую руку)"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
 msgid "Braille (right hand)"
 msgstr "Брайля (под правую руку)"
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:840
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
 msgid "Turkmen"
 msgstr "Туркменская"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
 msgid "Turkmen (Alt-Q)"
 msgstr "Туркменская (Alt-Q)"
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:844
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
 msgid "Bambara"
 msgstr "Баманская"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
 msgid "French (Mali, alternative)"
 msgstr "Французская (Мали, альтернативная)"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:847
 msgid "English (Mali, US Macintosh)"
 msgstr "Английская (Мали, Macintosh США)"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
 msgid "English (Mali, US international)"
 msgstr "Английская (Мали, международная США)"
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:850
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
 msgid "Swahili (Tanzania)"
 msgstr "Суахильская (Танзания)"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
 msgid "Swahili (Kenya)"
 msgstr "Суахильская (Кения)"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:853
 msgid "Kikuyu"
 msgstr "Кикуйу"
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:856
 msgid "Tswana"
 msgstr "Тсванская"
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
 msgid "Filipino"
 msgstr "Филиппинская"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Филиппинская (QWERTY байбайинская)"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:861
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Филиппинская (Кэйпвелл-Дворак латиница)"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Филиппинская (Кэйпвелл-Дворак байбайинcкая)"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Филиппинская (Кэйпвелл-QWERF 2006 латиница)"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Филиппинская (Кэйпвелл-QWERF 2006 байбайинская)"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:865
 msgid "Filipino (Colemak Latin)"
 msgstr "Филиппинская (Коулмак латиница)"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Филиппинская (Коулмак байбайинская)"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
 msgid "Filipino (Dvorak Latin)"
 msgstr "Филиппинская (Дворак латиница)"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Филиппинская (Дворак байбайинcкая)"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
 msgid "md"
 msgstr "md"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
 msgid "Moldavian"
 msgstr "Молдавская"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:871
 msgid "gag"
 msgstr "gag"
 
-#: ../rules/base.xml.in.h:862
-msgid "Gagauz"
-msgstr "Гагаузская"
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "Молдавская (гагаузская)"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
 msgid "Key(s) to change layout"
 msgstr "Клавиша(и) для смены раскладки"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
 msgid "Right Alt (while pressed)"
 msgstr "Правая клавиша Alt (пока нажата)"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
 msgid "Left Alt (while pressed)"
 msgstr "Левая клавиша Alt (пока нажата)"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:876
 msgid "Left Win (while pressed)"
 msgstr "Левая клавиша Win (пока нажата)"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
 msgid "Right Win (while pressed)"
 msgstr "Правая клавиша Win (пока нажата)"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
 msgid "Any Win key (while pressed)"
 msgstr "Любая клавиша Win (на время нажатия)"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:879
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (пока нажата), Alt+Caps Lock выполняет первоначальную функцию capslock"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
 msgid "Right Ctrl (while pressed)"
 msgstr "Правая клавиша Ctrl (пока нажата)"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
 msgid "Right Alt"
 msgstr "Правая клавиша Alt"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
 msgid "Left Alt"
 msgstr "Левая клавиша Alt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (на первую раскладку), Shift+Caps Lock (на последнюю раскладку)"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Левая Win (на первую раскладку), Правая Win/Menu (на последнюю раскладку)"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Левая Ctrl (на первую раскладку), Правая Ctrl (на последнюю раскладку)"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
 msgid "Both Shift keys together"
 msgstr "Обе клавиши Shift, нажатые вместе"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
 msgid "Both Alt keys together"
 msgstr "Обе клавиши Alt, нажатые вместе"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
 msgid "Both Ctrl keys together"
 msgstr "Обе клавиши Ctrl, нажатые вместе"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
 msgid "Left Ctrl+Left Shift"
 msgstr "Левая Ctrl+Левая Shift"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
 msgid "Right Ctrl+Right Shift"
 msgstr "Правая Ctrl+Правая Shift"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
 msgid "Left Alt+Left Shift"
 msgstr "Левая Alt+Левая Shift"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
 msgid "Alt+Space"
 msgstr "Alt+Пробел"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
 msgid "Left Win"
 msgstr "Левая клавиша Win"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
 msgid "Right Win"
 msgstr "Правая клавиша Win"
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
 msgid "Left Shift"
 msgstr "Левая клавиша Shift"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
 msgid "Right Shift"
 msgstr "Правая клавиша Shift"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl"
 msgstr "Левая клавиша Ctrl"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
 msgid "Right Ctrl"
 msgstr "Правая клавиша Ctrl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Левая-Ctrl+Левая-Win (на первую раскладку), Правая-Ctrl+Menu (на вторую раскладку)"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
 msgid "Key to choose 3rd level"
 msgstr "Клавиша для выбора 3-го ряда"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
 msgid "Any Win key"
 msgstr "Любая клавиша Win"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
 msgid "Any Alt key"
 msgstr "Любая клавиша Alt"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Правая клавиша Alt, Shift и правая Alt вместе работают как Multi_Key"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:912
 msgid "Right Alt key never chooses 3rd level"
 msgstr "По правой клавише Alt никогда не выбирается третий ряд"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
 msgid "Enter on keypad"
 msgstr "Enter на цифровой клавиатуре"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
 msgid "Backslash"
 msgstr "Backslash"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Меньше чем/Больше чем&gt;"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
 msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Caps Lock выбирается 3-й ряд, действует как разовая блокировка при нажатии вместе с другим выборщиком-3-го-ряда"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
 msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Backslash выбирается 3-й ряд, действует как разовая блокировка при нажатии вместе с другим выборщиком-3-го-ряда"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
 msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "&lt;Меньше чем/Больше чем&gt; выбирается 3-й ряд, действует как разовая блокировка при нажатии вместе с другим выборщиком-3-го-ряда"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
 msgid "Ctrl key position"
 msgstr "Положение клавиши Ctrl"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
 msgid "Caps Lock as Ctrl"
 msgstr "Caps Lock как Ctrl"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
 msgid "Left Ctrl as Meta"
 msgstr "Левая клавиша Ctrl как Meta"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Поменять местами клавиши Ctrl и Caps Lock"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
 msgid "At left of 'A'"
 msgstr "Слева от 'A'"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:924
 msgid "At bottom left"
 msgstr "Снизу слева"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:925
 msgid "Right Ctrl as Right Alt"
 msgstr "Правая клавиша Ctrl работает как правая клавиша Alt"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:926
 msgid "Menu as Right Ctrl"
 msgstr "Menu как правая клавиша Ctrl"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:927
 msgid "Right Alt as Right Ctrl"
 msgstr "Правая клавиша Alt как правая клавиша Ctrl"
 
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:928
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Использовать клавиатурные индикаторы для отображения дополнительных раскладок"
 
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:929
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:930
 msgid "Numeric keypad layout selection"
 msgstr "Выбор раскладки цифровой клавиатуры"
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:931
 msgid "Legacy"
 msgstr "Legacy"
 
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:932
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Дополнения юникода (стрелки и математические операторы)"
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:933
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Дополнения юникода (стрелки и математические операторы). Математические операторы в ряду по умолчанию"
 
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:934
 msgid "Legacy Wang 724"
 msgstr "Старая Wang 724"
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:935
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Цифровая клавиатура Wang 724 с дополнениями юникода (стрелки и математические операторы)"
 
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:936
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Цифровая клавиатура Wang 724 с дополнениями юникода (стрелки и математические операторы). Математические операторы в ряду по умолчанию"
 
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:937
 msgid "Hexadecimal"
 msgstr "Шестнадцатеричная"
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:938
 msgid "ATM/phone-style"
 msgstr "В стиле банкоматной/телефонной"
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:939
 msgid "Numeric keypad delete key behaviour"
 msgstr "Функция клавиши Delete на цифровой клавиатуре"
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:940
 msgid "Legacy key with dot"
 msgstr "Клавиша Legacy с точкой"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:942
 msgid "Legacy key with comma"
 msgstr "Клавиша Legacy с запятой"
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:943
 msgid "Four-level key with dot"
 msgstr "Четырёх-рядная клавиша с точкой"
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:944
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Четырёх-рядная клавиша с точкой, ограничена latin-9"
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:945
 msgid "Four-level key with comma"
 msgstr "Четырёх-рядная клавиша с запятой"
 
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:946
 msgid "Four-level key with momayyez"
 msgstr "Четырёх-рядная клавиша с momayyez"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:949
 msgid "Four-level key with abstract separators"
 msgstr "Четырёх-рядная клавиша с абстрактными разделителями"
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:950
 msgid "Semi-colon on third level"
 msgstr "Точка с запятой в третьем ряду"
 
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:951
 msgid "Caps Lock key behavior"
 msgstr "Поведение клавиши Caps Lock"
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:952
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock включает внутреннюю капитализацию. Shift приостанавливает действие Caps Lock"
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:953
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock включает внутреннюю капитализацию. Shift не влияет на Caps Lock"
 
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:954
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock действует как Shift с блокировкой. Shift приостанавливает действие Caps Lock"
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:955
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock действует как Shift с блокировкой. Shift не влияет на Caps Lock"
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:956
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock переключает обычную капитализацию символов алфавита"
 
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:957
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Использовать Caps Lock как дополнительную клавишу Num Lock"
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:958
 msgid "Swap ESC and Caps Lock"
 msgstr "Поменять местами клавиши ESC и Caps Lock"
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:959
 msgid "Make Caps Lock an additional ESC"
 msgstr "Использовать Caps Lock как дополнительную клавишу ESC"
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:960
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Использовать Caps Lock как дополнительную клавишу Backspace"
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:961
 msgid "Make Caps Lock an additional Super"
 msgstr "Использовать Caps Lock как дополнительную клавишу Super"
 
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:962
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Использовать Caps Lock как дополнительную клавишу Hyper"
 
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:963
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Caps Lock переключает Shift, таким образом что, он действует сразу на все клавиши"
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:964
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock выключен"
 
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:965
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Использовать Caps Lock как дополнительную клавишу Control, но сохранить символ клавиши Caps_Lock"
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:966
 msgid "Alt/Win key behavior"
 msgstr "Поведение клавиши Alt/Win"
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:967
 msgid "Add the standard behavior to Menu key"
 msgstr "Добавить обыкновенное поведение на клавишу Menu"
 
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:968
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt и Meta на клавишах Alt"
 
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:969
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Control используется в качестве клавиш Win (и как обычный Control)"
 
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:970
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Control используется в качестве клавиш Alt, Alt используется в качестве клавиш Win"
 
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:971
 msgid "Meta is mapped to Win keys"
 msgstr "Meta соответствует клавишам Win"
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:972
 msgid "Meta is mapped to Left Win"
 msgstr "Meta соответствует левой клавише Win"
 
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:973
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper соответствует клавишам Win"
 
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:974
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt соответствует правой клавише Win, а Super — Menu"
 
-#: ../rules/base.xml.in.h:965
-msgid "Left Alt is swapped with Left Win"
-msgstr "Левая клавиша Alt поменяна местами с левой клавишей Win"
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
+msgstr "Клавиша Alt поменяна местами с клавишей Win"
 
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:976
 msgid "Compose key position"
 msgstr "Положение клавиши Compose"
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:977
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:978
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:979
 msgid "Miscellaneous compatibility options"
 msgstr "Разные параметры совместимости"
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:980
 msgid "Default numeric keypad keys"
 msgstr "Клавиши цифровой клавиатуры по умолчанию"
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:981
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr "С клавиш цифровой клавиатуры всегда вводятся цифры (как в Mac OS)"
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:982
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Клавиша Shift с клавишами цифровой клавиатуры работают также как в MS Windows"
 
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:983
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift не отменяет Num Lock, а выбирает третий ряд"
 
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:984
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Специальные клавиши (Ctrl+Alt+&lt;клв&gt;) обрабатываются сервером"
 
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:985
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Алюминиевая клавиатура Apple: эмуляция клавиш ПК (Print, Scroll Lock, Pause, Num Lock)"
 
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:986
 msgid "Shift cancels Caps Lock"
 msgstr "Shift отменяет Caps Lock"
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:987
 msgid "Enable extra typographic characters"
 msgstr "Включить дополнительные типографские символы"
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:988
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Обе клавиши Shift, нажатые вместе, переключают Caps Lock"
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:989
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Обе клавиши Shift, нажатые вместе, включают Caps Lock, одна клавиша Shift выключает"
 
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:990
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Обе клавиши Shift, нажатые вместе, переключают ShiftLock"
 
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:991
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Переключать PointerKeys с помощью Shift + NumLock."
 
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:992
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr "Позволить прерывать захват с помощью клавиатуры (предупреждение: угроза безопасности)"
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:993
 msgid "Adding currency signs to certain keys"
 msgstr "Добавление знаков валют к некоторым клавишам"
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:994
 msgid "Euro on E"
 msgstr "Символ евро на клавише E"
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:995
 msgid "Euro on 2"
 msgstr "Символ евро на клавише 2"
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:996
 msgid "Euro on 4"
 msgstr "Символ евро на клавише 4"
 
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:997
 msgid "Euro on 5"
 msgstr "Символ евро на клавише 5"
 
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:998
 msgid "Rupee on 4"
 msgstr "Символ рупии на клавише 4"
 
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:999
 msgid "Key to choose 5th level"
 msgstr "Клавиша для выбора 5-го ряда"
 
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1000
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "По клавише &lt;Меньше чем/Больше чем&gt; выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда"
 
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1001
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "По правой клавише Alt выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда"
 
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1002
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "По левой клавише Win выбирается 5-й ряд, блокирует, блокирует при нажатии вместе с другим выборщиком-5-го-ряда"
 
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1003
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "По правой клавише Win выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда"
 
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1004
 msgid "Using space key to input non-breakable space character"
 msgstr "Клавиша пробела используется для ввода символа неразрывного пробела"
 
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:1005
 msgid "Usual space at any level"
 msgstr "Обычный пробел в любом ряду"
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1006
 msgid "Non-breakable space character at second level"
 msgstr "Символ неразрывного пробела во втором ряду"
 
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1007
 msgid "Non-breakable space character at third level"
 msgstr "Символ неразрывного пробела в третьем ряду"
 
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1008
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Символ неразрывного пробела в третьем ряду, ничего на четвёртом"
 
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1009
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Символ неразрывного пробела в третьем ряду, символ тонкого неразрывного пробела в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1010
 msgid "Non-breakable space character at fourth level"
 msgstr "Символ неразрывного пробела в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1011
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Символ неразрывного пробела в четвёртом ряду, символ тонкого неразрывного пробела в шестом ряду"
 
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1012
 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:1003
+#: ../rules/base.xml.in.h:1013
 msgid "Zero-width non-joiner character at second level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду"
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1014
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, связывающий символ нулевой ширины в третьем ряду"
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1015
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, связывающий символ нулевой ширины в третьем ряду, символ неразрывного пробела в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1016
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду"
 
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1017
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду, ничего в четвёртом"
 
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1018
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду, связывающий символ нулевой ширины в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1019
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду, тонкий неразрывный пробел в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1020
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Несвязывающий символ нулевой ширины в третьем ряду, связывающий символ нулевой ширины в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1021
 msgid "Japanese keyboard options"
 msgstr "Настройки японской клавиатуры"
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1022
 msgid "Kana Lock key is locking"
 msgstr "Кана блокируется клавишей Lock"
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1023
 msgid "NICOLA-F style Backspace"
 msgstr "Backspace в стиле NICOLA-F"
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1024
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr "Использовать Zenkaku Hankaku как дополнительную клавишу ESC"
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1025
 msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr "Добавление диакритических знаков эсперанто"
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1026
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "На соответствующую клавишу на клавиатуре Qwerty."
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1027
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "На соответствующую клавишу на клавиатуре Дворак."
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Сохранить совместимость со старыми кодами клавиш Solaris"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "Совместимость с клавишами Sun"
+
+#: ../rules/base.xml.in.h:1030
 msgid "Key sequence to kill the X server"
 msgstr "Комбинация клавиш для прерывания работы X-сервера"
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
@@ -3799,8 +3850,8 @@ msgid "apl"
 msgstr "apl"
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "APL Keyboard Symbols"
-msgstr "APL Keyboard Symbols"
+msgid "APL keyboard symbols"
+msgstr "Клавиатурные символы APL"
 
 #: ../rules/base.extras.xml.in.h:5
 msgid "kut"
@@ -3818,105 +3869,252 @@ msgstr "shs"
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Многоязыковая (Канада, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "Немецкая (клавиатура США с немецкими буквами)"
 
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "Немецкая (с венгерскими буквами и без спец. клавиш (dead keys))"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "Немецкая (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:17
 msgid "Avestan"
 msgstr "Авестийская"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:20
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Литовская (Дворак США с литовскими буквами)"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Литовская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "Латышская (Дворак США)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Латышская (Дворак США, вариант с Y)"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Латышская (Дворак США, вариант с минусом)"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Латышская (Дворак США для программистов)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Латышская (Дворак США для программистов, вариант с Y)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Латышская (Дворак США для программистов, вариант с минусом)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:30
 msgid "Latvian (US Colemak)"
 msgstr "Латышская (Коулмак США)"
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:31
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Латышская (Коулмак США, вариант с апострофом)"
 
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Латышская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:35
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Английская (США, международная, объединённая с юникодным AltGr)"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Английская (США, международная, объединённая с юникодным AltGr, альтернативная)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "Atsina"
 msgstr "Атсинская"
 
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:38
 msgid "Couer D'alene Salish"
 msgstr "Салишская кёр-д’ален"
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr "Английская (США, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr "Польская (международная со спец. клавишами)"
 
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "Польская (Коулмак)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "Польская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:48
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr "Крымско-татарская (Dobruja Q)"
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Румынская (эргономичная для слепой печати)"
 
-#: ../rules/base.extras.xml.in.h:44
-msgid "Serbian"
-msgstr "Сербская"
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Румынская (Sun Type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:53
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Сербская (объединённые надбуквенные знаки вместе спец. клавиш (dead keys))"
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "Русская (с украинско-белорусской раскладкой)"
 
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "Русская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:60
 msgid "Armenian (OLPC phonetic)"
 msgstr "Армянская (фонетическая на OLPC)"
 
-#: ../rules/base.extras.xml.in.h:53
-msgid "Hebrew (Biblical SIL)"
-msgstr "Иврит (библейская, SIL)"
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "Иврит (Библейская, фонетическая SIL)"
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Арабская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Бельгийская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "Португальская (Бразилия, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "Чешская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "Датская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Голландская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Эстонская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Финская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "Французская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "Греческая (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "Итальянская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "Японская (Sun Type 6)"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Японская (Sun Type 7, совместимая с pc)"
 
-#: ../rules/base.extras.xml.in.h:54
-msgid "Biblical SIL phonetic"
-msgstr "Библейская фонетическая (SIL)"
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Японская (Sun Type 7, совместимая с sun)"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Норвежская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Португальская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Словацкая (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "Испанская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "Шведская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr ">Немецкая (Швейцария)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Немецкая (Швейцария, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Французская (Швейцария, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Турецкая (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Украинская (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "Английская (Великобритания, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "Корейская (Sun Type 6/7)"
+
+#~ msgid "ca"
+#~ msgstr "ca"
+
+#~ msgid "Catalan"
+#~ msgstr "Каталонская"
+
+#~ msgid "Serbian (Cyrillic)"
+#~ msgstr "Сербская (Кириллица)"
+
+#~ msgid "Gagauz"
+#~ msgstr "Гагаузская"
+
+#~ msgid "Hebrew (Biblical SIL)"
+#~ msgstr "Иврит (библейская, SIL)"
 
 #~ msgid "&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 #~ msgstr "По клавише &lt;Меньше чем/Больше чем&gt; выбирается 5-й ряд и активируется level5-Lock при нажатии вместе с другим выборщиком-5-го-ряда, однократное нажатие снимает блокировку"
@@ -3975,9 +4173,6 @@ msgstr "Библейская фонетическая (SIL)"
 #~ msgid "Danish (Mac)"
 #~ msgstr "Датская (Mac)"
 
-#~ msgid "English (UK, Mac)"
-#~ msgstr "Английская (Великобритания, Mac)"
-
 #~ msgid "Finnish (Mac)"
 #~ msgstr "Финская (Mac)"
 
@@ -4059,9 +4254,6 @@ msgstr "Библейская фонетическая (SIL)"
 #~ msgid "Swiss"
 #~ msgstr "Швейцарская"
 
-#~ msgid "Swiss (legacy)"
-#~ msgstr "Швейцарская (унаследованная)"
-
 #~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
 #~ msgstr "Турецкая (крымско-татарская турецкая Alt-Q)"
 
diff --git a/xorg-server/xkeyboard-config/po/uk.po b/xorg-server/xkeyboard-config/po/uk.po
index f47b75e3f..acd2dbc02 100644
--- a/xorg-server/xkeyboard-config/po/uk.po
+++ b/xorg-server/xkeyboard-config/po/uk.po
@@ -7,13 +7,13 @@
 # Andriy Rysin <arysin@bcsii.com>, 2007, 2008.
 # Andriy Rysin <arysin@gmail.com>, 2008.
 # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2011.
-# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2012.
+# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2012, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.6.99\n"
+"Project-Id-Version: xkeyboard-config-2.7.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-09-12 00:25+0100\n"
-"PO-Revision-Date: 2012-09-16 10:05+0300\n"
+"POT-Creation-Date: 2013-01-15 23:47+0000\n"
+"PO-Revision-Date: 2013-01-18 15:19+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.4\n"
 
 #: ../rules/base.xml.in.h:1
 msgid "Generic 101-key PC"
@@ -704,3092 +704,3143 @@ msgid "OLPC"
 msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:171
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Sun Type 7 USB"
+msgstr "Sun Type 7 USB"
 
 #: ../rules/base.xml.in.h:172
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun Type 7 USB (європейська розкладка)"
+
+#: ../rules/base.xml.in.h:173
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun Type 7 USB (розкладка Unix)"
+
+#: ../rules/base.xml.in.h:174
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun Type 7 USB (японська розкладка) / японська 106-клавішна"
+
+#: ../rules/base.xml.in.h:175
+msgid "Sun Type 6/7 USB"
+msgstr "Sun Type 6/7 USB"
+
+#: ../rules/base.xml.in.h:176
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun Type 6/7 USB (європейська розкладка)"
+
+#: ../rules/base.xml.in.h:177
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun Type 6 USB (розкладка Unix)"
+
+#: ../rules/base.xml.in.h:178
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun Type 6 USB (японська розкладка)"
+
+#: ../rules/base.xml.in.h:179
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun Type 6 (японська розкладка)"
+
+#: ../rules/base.xml.in.h:180
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:181
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:182
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:183
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:184
 msgid "Htc Dream phone"
 msgstr "Телефон HTC Dream"
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
 msgid "English (US)"
 msgstr "Англійська (США)"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:189
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:190
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:191
 msgid "English (US, with euro on 5)"
 msgstr "Англійська (США, з символом євро на клавіші 5)"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:192
 msgid "English (US, international with dead keys)"
 msgstr "Англійська (США, інтернаціональна зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:193
 msgid "English (US, alternative international)"
 msgstr "Англійська (США, альтернативна інтернаціональна)"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:194
 msgid "English (Colemak)"
 msgstr "Англійська (Коулмак)"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:195
 msgid "English (Dvorak)"
 msgstr "Англійська (Дворак)"
 
-#: ../rules/base.xml.in.h:188
-msgid "English (Dvorak international with dead keys)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
 msgstr "Англійська (інтернаціональна Дворака зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:197
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Англійська (альтернативна інтернаціональна Дворака без сліпих клавіш)"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:198
 msgid "English (left handed Dvorak)"
 msgstr "Англійська (Дворака для шульги)"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:199
 msgid "English (right handed Dvorak)"
 msgstr "Англійська (Дворак для правші)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:200
 msgid "English (classic Dvorak)"
 msgstr "Англійська (класична Дворака)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:201
 msgid "English (programmer Dvorak)"
 msgstr "Англійська (програмістський Дворак)"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:204
 msgid "Russian (US, phonetic)"
 msgstr "Російська (США, фонетична)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
 msgstr "Англійська (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:206
 msgid "English (international AltGr dead keys)"
 msgstr "Англійська (інтернаціональна зі сліпими клавішами AltGr)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:207
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Англійська (перемикання розкладки клавішею «помножити/ділити»)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:208
 msgid "Serbo-Croatian (US)"
 msgstr "Сербо-хорватська (США)"
 
-#. Keyboard indicator for Catalan layouts
-#: ../rules/base.xml.in.h:202
-msgid "ca"
-msgstr "ca"
+#: ../rules/base.xml.in.h:209
+msgid "English (Workman)"
+msgstr "Англійська (Воркмен)"
 
-#: ../rules/base.xml.in.h:203
-msgid "Catalan"
-msgstr "Каталонська"
+#: ../rules/base.xml.in.h:210
+msgid "English (Workman, international with dead keys)"
+msgstr "Англійська (інтернаціональна Воркмена зі сліпими клавішами)"
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:213
 msgid "Afghani"
 msgstr "Афгані"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:215
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:216
 msgid "Pashto"
 msgstr "Пушту"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:218
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:219
 msgid "Uzbek (Afghanistan)"
 msgstr "Узбецька (Афганістан)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:220
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Пушту (Афганістан, OLPC)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:221
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Перська (Афганістан, дарі OLPC)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:222
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Узбецька (Афганістан, OLPC)"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
 msgid "Arabic"
 msgstr "Арабська"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:226
 msgid "Arabic (azerty)"
 msgstr "Арабська (azerty)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:227
 msgid "Arabic (azerty/digits)"
 msgstr "Арабська (azerty/цифри)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:228
 msgid "Arabic (digits)"
 msgstr "Арабська (цифри)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:229
 msgid "Arabic (qwerty)"
 msgstr "Арабська (qwerty)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:230
 msgid "Arabic (qwerty/digits)"
 msgstr "Арабська (qwerty/цифри)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:231
 msgid "Arabic (Buckwalter)"
 msgstr "Арабська (Бакволтера)"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:233
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:234
 msgid "Albanian"
 msgstr "Албанська"
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
 msgid "Armenian"
 msgstr "Вірменська"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:238
 msgid "Armenian (phonetic)"
 msgstr "Вірменська (фонетична)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:239
 msgid "Armenian (alternative phonetic)"
 msgstr "Вірменська (альтернативна фонетична)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:240
 msgid "Armenian (eastern)"
 msgstr "Вірменська (східна)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:241
 msgid "Armenian (western)"
 msgstr "Вірменська (західна)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:242
 msgid "Armenian (alternative eastern)"
 msgstr "Вірменська (альтернативна східна)"
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:245
 msgid "German (Austria)"
 msgstr "Німецька (Австрія)"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:246
+msgid "German (legacy)"
+msgstr "Німецька (застаріла)"
+
+#: ../rules/base.xml.in.h:247
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Німецька (Австрія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:248
 msgid "German (Austria, Sun dead keys)"
 msgstr "Німецька (Австрія, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:249
 msgid "German (Austria, Macintosh)"
 msgstr "Німецька (Австрія, Macintosh)"
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:251
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:252
 msgid "Azerbaijani"
 msgstr "Азербайджанська"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:253
 msgid "Azerbaijani (Cyrillic)"
 msgstr "Азербайджанська (кирилиця)"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:255
 msgid "by"
 msgstr "by"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:256
 msgid "Belarusian"
 msgstr "Білоруська"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:257
 msgid "Belarusian (legacy)"
 msgstr "Білоруська (застаріла)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:258
 msgid "Belarusian (Latin)"
 msgstr "Білоруська (латиниця)"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
 msgid "Belgian"
 msgstr "Бельгійська"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:262
 msgid "Belgian (alternative)"
 msgstr "Бельгійська (альтернативна)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:263
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Бельгійська (альтернативна, лише latin-9)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:264
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Бельгійська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:265
 msgid "Belgian (ISO alternate)"
 msgstr "Бельгійська (додаткова ISO)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:266
 msgid "Belgian (eliminate dead keys)"
 msgstr "Бельгійська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:267
 msgid "Belgian (Sun dead keys)"
 msgstr "Бельгійська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:268
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Бельгійська (модель Wang 724, azerty)"
 
 #. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:270
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:271
 msgid "Bengali"
 msgstr "Бенгальська"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:272
 msgid "Bengali (Probhat)"
 msgstr "Бенгальська (пробхат)"
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:274
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:275
 msgid "Indian"
 msgstr "Індійська"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:276
 msgid "Bengali (India)"
 msgstr "Бенгальська (Індія)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:277
 msgid "Bengali (India, Probhat)"
 msgstr "Бенгальська (Індія, пробхат)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:278
 msgid "Bengali (India, Baishakhi)"
 msgstr "Бенгальська (Індія, байшахі)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:279
 msgid "Bengali (India, Bornona)"
 msgstr "Бенгальська (Індія, борнона)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:280
 msgid "Bengali (India, Uni Gitanjali)"
 msgstr "Бенгальська (Індія, уні гітанджалі)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:281
 msgid "Bengali (India, Baishakhi Inscript)"
 msgstr "Бенгальська (Індія, байшахі, індійські символи)"
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:283
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:284
 msgid "Gujarati"
 msgstr "Гуджараті"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:286
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:287
 msgid "Punjabi (Gurmukhi)"
 msgstr "Пенджабська (гурмухі)"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:288
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Пенджабська (гурмухі, джелум)"
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:290
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:291
 msgid "Kannada"
 msgstr "Канадська"
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:293
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:294
 msgid "Malayalam"
 msgstr "Малаяламська"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:295
 msgid "Malayalam (Lalitha)"
 msgstr "Малаяламська (лаліта)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:296
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Малаяламська (покращений запис індійських мов з символом рупії)"
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:298
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:299
 msgid "Oriya"
 msgstr "Орія"
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:301
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:302
 msgid "Tamil (Unicode)"
 msgstr "Тамільська (Unicode)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:303
 msgid "Tamil (keyboard with numerals)"
 msgstr "Тамільська (клавіатура з цифрами)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:304
 msgid "Tamil (TAB typewriter)"
 msgstr "Тамільська (TAB, машинопис)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:305
 msgid "Tamil (TSCII typewriter)"
 msgstr "Тамільська (TSCII, машинопис)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:306
 msgid "Tamil"
 msgstr "Тамільська"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:308
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:309
 msgid "Telugu"
 msgstr "Телугу"
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:311
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:312
 msgid "Urdu (phonetic)"
 msgstr "Урду (фонетична)"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:313
 msgid "Urdu (alternative phonetic)"
 msgstr "Урду (альтернативна фонетична)"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:314
 msgid "Urdu (WinKeys)"
 msgstr "Урду (з клавішами Win)"
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:316
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:317
 msgid "Hindi (Bolnagri)"
 msgstr "Хінді (болнагрі)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:318
 msgid "Hindi (Wx)"
 msgstr "Хінді (Wx)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:319
 msgid "English (India, with RupeeSign)"
 msgstr "Англійська (Індія, з підтримкою символу рупії)"
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:321
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:322
 msgid "Bosnian"
 msgstr "Боснійська"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:323
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Боснійська (кутові лапки)"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:324
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Боснійська (з боснійськими диграфами)"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:325
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Боснійська (клавіатура США з боснійськими диграфами)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:326
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Боснійська (клавіатура США з боснійськими літерами)"
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
 msgid "Portuguese (Brazil)"
 msgstr "Португальська (Бразилія)"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:330
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Португальська (Бразилія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:331
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Португальська (Бразилія, Дворак)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:332
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Португальська (Бразилія, nativo)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:333
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Португальська (Бразилія, nativo для клавіатур США)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:334
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Португальська (Бразилія, nativo для есперанто)"
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:336
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:337
 msgid "Bulgarian"
 msgstr "Болгарська"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:338
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Болгарська (традиційна фонетична)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:339
 msgid "Bulgarian (new phonetic)"
 msgstr "Болгарська (нова фонетична)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:340
 msgid "Arabic (Morocco)"
 msgstr "Арабська (Марокко)"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:343
 msgid "French (Morocco)"
 msgstr "Французька (Марокко)"
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:345
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:346
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Берберська (Марокко, давньолівійська)"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:347
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Берберська (Марокко, тифінаг, альтернативна)"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:348
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Берберська (Марокко, тифінаг, альтернативна фонетична)"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:349
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Берберська (Марокко, тифінаг, розширена)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:350
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Берберська (Марокко, тифінаг, фонетична)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:351
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Берберська (Марокко, тифінаг, розширена фонетична)"
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
 msgid "English (Cameroon)"
 msgstr "Англійська (Камерун)"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:355
 msgid "French (Cameroon)"
 msgstr "Французька (Камерун)"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:356
 msgid "Cameroon Multilingual (qwerty)"
 msgstr "Камерунська (багатомовна, qwerty)"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:357
 msgid "Cameroon Multilingual (azerty)"
 msgstr "Камерунська (багатомовна, azerty)"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:358
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr "Камерунська (багатомовна, Дворак)"
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:360
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:361
 msgid "Burmese"
 msgstr "Бірманська"
 
-#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr "Французька (Канада)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:363
 msgid "French (Canada, Dvorak)"
 msgstr "Французька (Канада, Дворак)"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:364
 msgid "French (Canada, legacy)"
 msgstr "Французька (Канада, застаріла)"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:365
 msgid "Canadian Multilingual"
 msgstr "Канадська (багатомовна)"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:366
 msgid "Canadian Multilingual (first part)"
 msgstr "Канадська (багатомовна, перша частина)"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:367
 msgid "Canadian Multilingual (second part)"
 msgstr "Канадська (багатомовна, друга частина)"
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:369
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:370
 msgid "Inuktitut"
 msgstr "Інуктитут"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:371
 msgid "English (Canada)"
 msgstr "Англійська (Канада)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:372
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Французька (Демократична республіка Конго)"
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:374
 msgid "zh"
 msgstr "zh"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:375
 msgid "Chinese"
 msgstr "Китайська"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:376
 msgid "Tibetan"
 msgstr "Тибетська"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:377
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Тибетська (з ASCII числами)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:378
 msgid "Uyghur"
 msgstr "Уйгурська"
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:380
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:381
 msgid "Croatian"
 msgstr "Хорватська"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:382
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Хорватська (кутові лапки)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:383
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Хорватська (з хорватськими диграфами)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:384
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Хорватська (клавіатура США з хорватськими диграфами)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:385
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Хорватська (клавіатура США з хорватськими літерами)"
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
 msgid "Czech"
 msgstr "Чеська"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:389
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Чеська (з клавішею &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:390
 msgid "Czech (qwerty)"
 msgstr "Чеська (qwerty)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:391
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Чеська (qwerty, розширені функції Backslash)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:392
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Чеська (UCW-розкладка, лише літери з акцентами)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:393
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Чеська (Дворак-США з підтримкою CZ UCW)"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
 msgid "Danish"
 msgstr "Данська"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:397
 msgid "Danish (eliminate dead keys)"
 msgstr "Данська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:398
 msgid "Danish (Macintosh)"
 msgstr "Данська (Macintosh)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:399
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Данська (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:400
 msgid "Danish (Dvorak)"
 msgstr "Данська (Дворака)"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
 msgid "Dutch"
 msgstr "Голландська"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:404
 msgid "Dutch (Sun dead keys)"
 msgstr "Голландська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:405
 msgid "Dutch (Macintosh)"
 msgstr "Голландська (Macintosh)"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:406
 msgid "Dutch (standard)"
 msgstr "Голландська (стандартна)"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:408
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:409
 msgid "Dzongkha"
 msgstr "Дзонг-ке"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
 msgid "Estonian"
 msgstr "Естонська"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:413
 msgid "Estonian (eliminate dead keys)"
 msgstr "Естонська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:414
 msgid "Estonian (Dvorak)"
 msgstr "Естонська (Дворака)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Естонська (клавіатура США з естонськими літерами)"
 
-#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
 msgid "Persian"
 msgstr "Перська"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Persian (with Persian Keypad)"
 msgstr "Перська (з перською дод. панеллю)"
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Курдська (Іран, латиниця Q)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 msgid "Kurdish (Iran, F)"
 msgstr "Курдська (Іран, F)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Курдська (Іран, латиниця Alt-Q)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Курдська (Іран, арабсько-латинська)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
 msgid "Iraqi"
 msgstr "Іракська"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:425
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Курдська (Ірак, латиниця Q)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:426
 msgid "Kurdish (Iraq, F)"
 msgstr "Курдська (Ірак, F)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:427
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Курдська (Ірак, латиниця Alt-Q)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:428
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Курдська (Ірак, арабсько-латинська)"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:430
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:431
 msgid "Faroese"
 msgstr "Фарерська"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:432
 msgid "Faroese (eliminate dead keys)"
 msgstr "Фарерська (вимкнути сліпі клавіші)"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
 msgid "Finnish"
 msgstr "Фінська"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:436
 msgid "Finnish (classic)"
 msgstr "Фінська (класична)"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Фінська (класична, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Northern Saami (Finland)"
 msgstr "Північно-саамська (Фінляндія)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Finnish (Macintosh)"
 msgstr "Фінська (Macintosh)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
 msgid "French"
 msgstr "Французька"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:441
 msgid "French (eliminate dead keys)"
 msgstr "Французька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "French (Sun dead keys)"
 msgstr "Французька (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "French (alternative)"
 msgstr "Французька (альтернативна)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "French (alternative, latin-9 only)"
 msgstr "Французька (альтернативна, лише latin-9)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Французька (альтернативна, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "French (alternative, Sun dead keys)"
 msgstr "Французька (альтернативна, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "French (legacy, alternative)"
 msgstr "Французька (застаріла, альтернативна)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Французька (застаріла, альтернативна, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Французька (застаріла, альтернативна, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Французька (Bepo, ергономічна, варіант Дворак)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Французька (Bepo, ергономічна, варіант Дворак, лише latin-9)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:452
 msgid "French (Dvorak)"
 msgstr "Французька (Дворак)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:453
 msgid "French (Macintosh)"
 msgstr "Французька (Macintosh)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:454
 msgid "French (Breton)"
 msgstr "Французька (бретонська)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:455
 msgid "Occitan"
 msgstr "Окситанська"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:456
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Грузинська (Франція, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:457
 msgid "English (Ghana)"
 msgstr "Англійська (Гана)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:458
 msgid "English (Ghana, multilingual)"
 msgstr "Англійська (Гана, інтернаціональна)"
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:460
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:461
 msgid "Akan"
 msgstr "Акан"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:463
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:464
 msgid "Ewe"
 msgstr "Ewe"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:466
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:467
 msgid "Fula"
 msgstr "Фула"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:469
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:470
 msgid "Ga"
 msgstr "Га"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:472
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:473
 msgid "Hausa"
 msgstr "Hausa"
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:475
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:476
 msgid "Avatime"
 msgstr "Аватіме"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:477
 msgid "English (Ghana, GILLBT)"
 msgstr "Англійська (Гана, GILLBT)"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:478
 msgid "French (Guinea)"
 msgstr "Французька (Гвінея)"
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:480
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:481
 msgid "Georgian"
 msgstr "Грузинська"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:482
 msgid "Georgian (ergonomic)"
 msgstr "Грузинська (ергономічна)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:483
 msgid "Georgian (MESS)"
 msgstr "Грузинська (MESS)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:484
 msgid "Russian (Georgia)"
 msgstr "Російська (Грузія)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:485
 msgid "Ossetian (Georgia)"
 msgstr "Осетинська (Грузія)"
 
-#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
 msgid "German"
 msgstr "Німецька"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:487
 msgid "German (dead acute)"
 msgstr "Німецька (сліпий акут)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:488
 msgid "German (dead grave acute)"
 msgstr "Німецька (сліпий наголос-акут)"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:489
 msgid "German (eliminate dead keys)"
 msgstr "Німецька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:490
 msgid "Romanian (Germany)"
 msgstr "Румунська (Німеччина)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:491
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Німецька (Німеччина, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:492
 msgid "German (Dvorak)"
 msgstr "Німецька (Дворак)"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:493
 msgid "German (Sun dead keys)"
 msgstr "Німецька (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:494
 msgid "German (Neo 2)"
 msgstr "Німецька (Neo 2)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:495
 msgid "German (Macintosh)"
 msgstr "Німецька (Macintosh)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:496
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Німецька (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:497
 msgid "Lower Sorbian"
 msgstr "Нижньолужицька"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:498
 msgid "Lower Sorbian (qwertz)"
 msgstr "Нижньолужицька (qwertz)"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:499
 msgid "German (qwerty)"
 msgstr "Німецька (qwerty)"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:500
 msgid "Russian (Germany, phonetic)"
 msgstr "Російська (Німеччина, фонетична)"
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
 msgid "Greek"
 msgstr "Грецька"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:504
 msgid "Greek (simple)"
 msgstr "Грецька (проста)"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:505
 msgid "Greek (extended)"
 msgstr "Грецька (розширена)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:506
 msgid "Greek (eliminate dead keys)"
 msgstr "Грецька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:507
 msgid "Greek (polytonic)"
 msgstr "Грецька (поліфонічна)"
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:509
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian"
 msgstr "Угорська"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (standard)"
 msgstr "Угорська (стандартна)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Угорська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (qwerty)"
 msgstr "Угорська (qwerty)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Угорська (101/qwertz/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Угорська (101/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Угорська (101/qwertz/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Угорська (101/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Угорська (101/qwerty/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Угорська (101/qwerty/кома/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Угорська (101/qwerty/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:521
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Угорська (101/qwerty/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:522
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Угорська (102/qwertz/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:523
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Угорська (102/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:524
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Угорська (102/qwertz/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:525
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Угорська (102/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:526
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Угорська (102/qwerty/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:527
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Угорська (102/qwerty/кома/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:528
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Угорська (102/qwerty/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:529
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Угорська (102/qwerty/крапка/вимкнути сліпі клавіші)"
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:531
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:532
 msgid "Icelandic"
 msgstr "Ісландська"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:533
 msgid "Icelandic (Sun dead keys)"
 msgstr "Ісландська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:534
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Ісландська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:535
 msgid "Icelandic (Macintosh)"
 msgstr "Ісландська (Macintosh)"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:536
 msgid "Icelandic (Dvorak)"
 msgstr "Ісландська (Дворак)"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
 msgid "Hebrew"
 msgstr "Іврит"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:540
 msgid "Hebrew (lyx)"
 msgstr "Іврит (lyx)"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:541
 msgid "Hebrew (phonetic)"
 msgstr "Іврит (фонетична)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:542
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Іврит (Біблейська, Tiro)"
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
 msgid "Italian"
 msgstr "Італійська"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:546
 msgid "Italian (eliminate dead keys)"
 msgstr "Італійська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:547
 msgid "Italian (Macintosh)"
 msgstr "Італійська (Macintosh)"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:548
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Італійська (клавіатура США з італійськими літерами)"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:549
 msgid "Georgian (Italy)"
 msgstr "Грузинська (Італія)"
 
+#: ../rules/base.xml.in.h:550
+msgid "Italian (IBM 142)"
+msgstr "Італійська (IBM 142)"
+
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
 msgid "Japanese"
 msgstr "Японська"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:554
 msgid "Japanese (Kana)"
 msgstr "Японська (кана)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:555
 msgid "Japanese (Kana 86)"
 msgstr "Японська (кана 86)"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:556
 msgid "Japanese (OADG 109A)"
 msgstr "Японська (OADG 109A)"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:557
 msgid "Japanese (Macintosh)"
 msgstr "Японська (Macintosh)"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:558
 msgid "Japanese (Dvorak)"
 msgstr "Японська (Дворак)"
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:560
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:561
 msgid "Kyrgyz"
 msgstr "Киргизька"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:562
 msgid "Kyrgyz (phonetic)"
 msgstr "Киргизька (фонетична)"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:564
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:565
 msgid "Khmer (Cambodia)"
 msgstr "Кхмерська (Камбоджа)"
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:567
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:568
 msgid "Kazakh"
 msgstr "Казахська"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:569
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Російська (Казахстан, з казахською)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:570
 msgid "Kazakh (with Russian)"
 msgstr "Казахська (з російськими)"
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:572
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:573
 msgid "Lao"
 msgstr "Лаоська"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:574
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Лаоська (стандартна розкладка, запропонована STEA)"
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:577
 msgid "Spanish (Latin American)"
 msgstr "Іспанська (латиноамериканська)"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:578
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Іспанська (латиноамериканська, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:579
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Іспанська (латиноамериканська зі «спеціальною» тильдою)"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:580
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Іспанська (латиноамериканська, сліпі клавіші Sun)"
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
 msgid "Lithuanian"
 msgstr "Литовська"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:584
 msgid "Lithuanian (standard)"
 msgstr "Литовська (стандартна)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:585
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Литовська (клавіатура США, з литовськими літерами)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:586
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Литовська (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:587
 msgid "Lithuanian (LEKP)"
 msgstr "Литовська (LEKP)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:588
 msgid "Lithuanian (LEKPa)"
 msgstr "Литовська (LEKPa)"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
 msgid "Latvian"
 msgstr "Латвійська"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:592
 msgid "Latvian (apostrophe variant)"
 msgstr "Латвійська (варіант з апострофом)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:593
 msgid "Latvian (tilde variant)"
 msgstr "Латвійська (варіант з тильдою)"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:594
 msgid "Latvian (F variant)"
 msgstr "Латвійська (варіант з літерою F)"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:595
 msgid "Latvian (modern)"
 msgstr "Латвійська (сучасна)"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:596
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Латвійська (ергономічна, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:597
 msgid "Latvian (adapted)"
 msgstr "Латвійська (адаптована)"
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:599
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:600
 msgid "Maori"
 msgstr "Маорійська"
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:603
 msgid "Montenegrin"
 msgstr "Чорногорська"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:604
 msgid "Montenegrin (Cyrillic)"
 msgstr "Чорногорська (кирилиця)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:605
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Чорногорська (кирилиця, З та Ж поміняні місцями)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:606
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Чорногорська (латиниця, Unicode)"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:607
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Чорногорська (латиниця, qwerty)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:608
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Чорногорська (латиниця, Unicode, qwerty)"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:609
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Чорногорська (кирилиця з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:610
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Чорногорська (латиниця з кутовими лапками)"
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:612
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:613
 msgid "Macedonian"
 msgstr "Македонська"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:614
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Македонська (вимкнути сліпі клавіші)"
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:616
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:617
 msgid "Maltese"
 msgstr "Мальтійська"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:618
 msgid "Maltese (with US layout)"
 msgstr "Мальтійська (клавіатура з розкладкою США)"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:620
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:621
 msgid "Mongolian"
 msgstr "Монгольська"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
 msgid "Norwegian"
 msgstr "Норвезька"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:625
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Норвезька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:626
 msgid "Norwegian (Dvorak)"
 msgstr "Норвезька (Дворак)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:627
 msgid "Northern Saami (Norway)"
 msgstr "Північно-саамська (Норвегія)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:628
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Північно-саамська (Норвегія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:629
 msgid "Norwegian (Macintosh)"
 msgstr "Норвезька (Macintosh)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:630
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Норвезька (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:631
 msgid "Norwegian (Colemak)"
 msgstr "Норвезька (Колемак)"
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
 msgid "Polish"
 msgstr "Польська"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:635
+msgid "Polish (legacy)"
+msgstr "Польська (застаріла)"
+
+#: ../rules/base.xml.in.h:636
 msgid "Polish (qwertz)"
 msgstr "Польська (qwertz)"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:637
 msgid "Polish (Dvorak)"
 msgstr "Польська (Дворак)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:638
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Польська (Дворак, польські лапки на знаку лапки)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:639
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Польська (Дворак, польські лапки на клавіші 1)"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:640
 msgid "Kashubian"
 msgstr "Кашубська"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:641
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Російська (Польща, фонетична Дворака)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:642
 msgid "Polish (programmer Dvorak)"
 msgstr "Польська (програмістський Дворак)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
 msgid "Portuguese"
 msgstr "Португальська"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:644
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Португальська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:645
 msgid "Portuguese (Sun dead keys)"
 msgstr "Португальська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:646
 msgid "Portuguese (Macintosh)"
 msgstr "Португальська (Macintosh)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:647
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Португальська (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:648
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Португальська (Macintosh, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:649
 msgid "Portuguese (Nativo)"
 msgstr "Португальська (Nativo)"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:650
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Португальська (nativo для клавіатур у США)"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:651
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Есперанто (португальська, Nativo)"
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
 msgid "Romanian"
 msgstr "Румунська"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
 msgstr "Румунська (седиль)"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Румунська (стандартна)"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard cedilla)"
 msgstr "Румунська (стандартна седиль)"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:658
 msgid "Romanian (WinKeys)"
 msgstr "Румунська (з клавішами Win)"
 
-#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr "Російська"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:660
 msgid "Russian (phonetic)"
 msgstr "Російська (фонетична)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:661
 msgid "Russian (phonetic WinKeys)"
 msgstr "Російська (фонетична з клавішами Win)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:662
 msgid "Russian (typewriter)"
 msgstr "Російська (машинопис)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:663
 msgid "Russian (legacy)"
 msgstr "Російська (застаріла)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:664
 msgid "Russian (typewriter, legacy)"
 msgstr "Російська (машинопис, застаріла)"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:665
 msgid "Tatar"
 msgstr "Татарська"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Ossetian (legacy)"
 msgstr "Осетинська (застаріла)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:667
 msgid "Ossetian (WinKeys)"
 msgstr "Осетинська (з клавішами Win)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:668
 msgid "Chuvash"
 msgstr "Чуваська"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:669
 msgid "Chuvash (Latin)"
 msgstr "Чуваська (латиниця)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:670
 msgid "Udmurt"
 msgstr "Удмуртська"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:671
 msgid "Komi"
 msgstr "Комі"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:672
 msgid "Yakut"
 msgstr "Якутська"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:673
 msgid "Kalmyk"
 msgstr "Калмицька"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:674
 msgid "Russian (DOS)"
 msgstr "Російська (DOS)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:675
 msgid "Serbian (Russia)"
 msgstr "Сербська (Росія)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:676
 msgid "Bashkirian"
 msgstr "Башкирська"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:677
 msgid "Mari"
 msgstr "Марійська"
 
-#: ../rules/base.xml.in.h:668
-msgid "Serbian (Cyrillic)"
-msgstr "Сербська (кирилиця)"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
+msgstr "Сербська"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:679
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr "Сербська (кирилиця, З та Ж поміняні місцями)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:680
 msgid "Serbian (Latin)"
 msgstr "Сербська (латиниця)"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:681
 msgid "Serbian (Latin Unicode)"
 msgstr "Сербська (латиниця Unicode)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:682
 msgid "Serbian (Latin qwerty)"
 msgstr "Сербська (латиниця, qwerty)"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:683
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Сербська (латиниця, Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr "Сербська (кирилиця з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin with guillemets)"
 msgstr "Сербська (латиниця з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:686
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Паннонська русинська (гомофонна)"
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:688
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:689
 msgid "Slovenian"
 msgstr "Словенська"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:690
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Словенська (кутові лапки)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:691
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Словенська (клавіатура США із словенськими літерами)"
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
 msgid "Slovak"
 msgstr "Словацька"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:695
 msgid "Slovak (extended Backslash)"
 msgstr "Словацька (розширені функції Backslash)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:696
 msgid "Slovak (qwerty)"
 msgstr "Словацька (qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:697
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Словацька (qwerty, розширені функції Backslash)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
 msgid "Spanish"
 msgstr "Іспанська"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:699
 msgid "Spanish (eliminate dead keys)"
 msgstr "Іспанська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:700
 msgid "Spanish (include dead tilde)"
 msgstr "Іспанська (зі «спеціальною» тильдою)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:701
 msgid "Spanish (Sun dead keys)"
 msgstr "Іспанська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:702
 msgid "Spanish (Dvorak)"
 msgstr "Іспанська (Дворак)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:703
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr "Астурійська (Іспанія, з H та L з нижньою крапкою)"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:704
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Іспанська (Іспанія, варіант з L із середньою точкою)"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:705
 msgid "Spanish (Macintosh)"
 msgstr "Іспанська (Macintosh)"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
 msgid "Swedish"
 msgstr "Шведська"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:709
 msgid "Swedish (eliminate dead keys)"
 msgstr "Шведська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:710
 msgid "Swedish (Dvorak)"
 msgstr "Шведська (Дворак)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:711
 msgid "Russian (Sweden, phonetic)"
 msgstr "Російська (шведська, фонетична)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:712
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Російська (шведська, фонетична, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:713
 msgid "Northern Saami (Sweden)"
 msgstr "Північно-саамська (Швеція)"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:714
 msgid "Swedish (Macintosh)"
 msgstr "Шведська (Macintosh)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:715
 msgid "Swedish (Svdvorak)"
 msgstr "Шведська (Svdvorak)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:716
 msgid "Swedish Sign Language"
 msgstr "Шведська мова жестів"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:717
 msgid "German (Switzerland)"
 msgstr "Німецька (Швейцарія)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:718
 msgid "German (Switzerland, legacy)"
 msgstr "Німецька (Швейцарія, застаріла)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:719
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Німецька (Швейцарія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:720
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Німецька (Швейцарія, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:721
 msgid "French (Switzerland)"
 msgstr "Французька (Швейцарія)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:722
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Французька (Швейцарія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Французька (Швейцарія, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
 msgid "French (Switzerland, Macintosh)"
 msgstr "Французька (Швейцарія, Macintosh)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
 msgid "German (Switzerland, Macintosh)"
 msgstr "Німецька (Швейцарія, Macintosh)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
 msgid "Arabic (Syria)"
 msgstr "Арабська (Сирія)"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:728
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:729
 msgid "Syriac"
 msgstr "Сирійська"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:730
 msgid "Syriac (phonetic)"
 msgstr "Сирійська (фонетична)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Курдська (Сирія, латиниця Q)"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
 msgid "Kurdish (Syria, F)"
 msgstr "Курдська (Сирія, F)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Курдська (Сирія, латиниця Alt-Q)"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
 msgid "Tajik"
 msgstr "Таджицька"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr "Таджицька (застаріла)"
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:739
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
 msgid "Sinhala (phonetic)"
 msgstr "Сингальська (фонетична)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Тамільська (Шрі-Ланка, Unicode)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Тамільська (Шрі-Ланка, TAB, машинопис)"
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
 msgid "Thai"
 msgstr "Тайська"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
 msgid "Thai (TIS-820.2538)"
 msgstr "Тайська (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Тайська (паттачот)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
 msgid "Turkish"
 msgstr "Турецька"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
 msgid "Turkish (F)"
 msgstr "Турецька (F)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
 msgid "Turkish (Alt-Q)"
 msgstr "Турецька (Alt-Q)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
 msgid "Turkish (Sun dead keys)"
 msgstr "Турецька (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Курдська (Туреччина, латиниця Q)"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
 msgid "Kurdish (Turkey, F)"
 msgstr "Курдська (Туреччина, F)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:756
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Курдська (Туреччина, латиниця Alt-Q)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
 msgid "Turkish (international with dead keys)"
 msgstr "Турецька (інтернаціональна зі сліпими клавішами)"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:760
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Кримськотатарська (турецька Q)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Кримськотатарська (турецька F)"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Кримськотатарська (турецька Alt-Q)"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
 msgid "Taiwanese"
 msgstr "Тайванська"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
 msgid "Taiwanese (indigenous)"
 msgstr "Тайванська (місцева)"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
 msgid "Saisiyat (Taiwan)"
 msgstr "Сайсіят (Тайвань)"
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:771
 msgid "Ukrainian (phonetic)"
 msgstr "Українська (фонетична)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:772
 msgid "Ukrainian (typewriter)"
 msgstr "Українська (друкарська машинка)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
 msgid "Ukrainian (WinKeys)"
 msgstr "Українська (з клавішами Win)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (legacy)"
 msgstr "Українська (застаріла)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (standard RSTU)"
 msgstr "Українська (стандартна RSTU)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Російська (Україна, стандартна RSTU)"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Українська (гомофонна)"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
 msgid "English (UK)"
 msgstr "Англійська (Великобританія)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
 msgid "English (UK, extended WinKeys)"
 msgstr "Англійська (Великобританія, розширена, з клавішами Win)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:780
 msgid "English (UK, international with dead keys)"
 msgstr "Англійська (Великобританія, інтернаціональна зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:781
 msgid "English (UK, Dvorak)"
 msgstr "Англійська (Великобританія, Дворак)"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Англійська (Великобританія, Дворак з британською пунктуацією)"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
 msgid "English (UK, Macintosh)"
 msgstr "Англійська (Великобританія, Macintosh)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
 msgid "English (UK, Macintosh international)"
 msgstr "Англійська (Великобританія, інтернаціональна Macintosh)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
 msgid "English (UK, Colemak)"
 msgstr "Англійська (США, Коулмак)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
 msgid "Uzbek"
 msgstr "Узбецька"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:787
 msgid "Uzbek (Latin)"
 msgstr "Узбецька (латиниця)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:790
 msgid "Vietnamese"
 msgstr "В'єтнамська"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
 msgid "Korean"
 msgstr "Корейська"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
 msgid "Korean (101/104 key compatible)"
 msgstr "Корейська (сумісна з 101/104 клавішною)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
 msgid "Japanese (PC-98xx Series)"
 msgstr "Японська (родина PC-98xx)"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
 msgid "Irish"
 msgstr "Ірландська"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
 msgid "CloGaelach"
 msgstr "Гаельський шрифт"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:800
 msgid "Irish (UnicodeExpert)"
 msgstr "Ірландська (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
 msgid "Ogham"
 msgstr "Огам"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
 msgid "Ogham (IS434)"
 msgstr "Огам (IS434)"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
 msgid "Urdu (Pakistan)"
 msgstr "Урду (Пакистан)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Урду (Пакистан, CRULP)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Урду (Пакистан, NLA)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
 msgid "Arabic (Pakistan)"
 msgstr "Арабська (Пакистан)"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
 msgid "Sindhi"
 msgstr "Синдхі"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
 msgid "Dhivehi"
 msgstr "Мальдивська"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:813
 msgid "English (South Africa)"
 msgstr "Англійська (ПАР)"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:815
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Есперанто (посунута крапка з комою та лапки, застаріла)"
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
 msgid "Nepali"
 msgstr "Непальська"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
 msgid "English (Nigeria)"
 msgstr "Англійська (Нігерія)"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
 msgid "Igbo"
 msgstr "Igbo"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
 msgid "Yoruba"
 msgstr "Йоруба"
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:829
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
 msgid "Amharic"
 msgstr "Амхарська"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:832
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
 msgid "Wolof"
 msgstr "Волоф"
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:836
 msgid "Braille"
 msgstr "Брайля"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
 msgid "Braille (left hand)"
 msgstr "Брайля (для шульги)"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
 msgid "Braille (right hand)"
 msgstr "Брайль (для правші)"
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:840
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
 msgid "Turkmen"
 msgstr "Туркменська"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
 msgid "Turkmen (Alt-Q)"
 msgstr "Туркменська (Alt-Q)"
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:844
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
 msgid "Bambara"
 msgstr "Бамбара"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
 msgid "French (Mali, alternative)"
 msgstr "Французька (Малі, альтернативна)"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:847
 msgid "English (Mali, US Macintosh)"
 msgstr "Англійська (Малі, Macintosh США)"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
 msgid "English (Mali, US international)"
 msgstr "Англійська (Малі, інтернаціональна США)"
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:850
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
 msgid "Swahili (Tanzania)"
 msgstr "Суахілі (Танзанія)"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
 msgid "Swahili (Kenya)"
 msgstr "Суахілі (Кенія)"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:853
 msgid "Kikuyu"
 msgstr "Кікуйю"
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:856
 msgid "Tswana"
 msgstr "Тсвана"
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
 msgid "Filipino"
 msgstr "Філіппінська"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Філіппінська (QWERTY, байбаїн)"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:861
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Філіппінська (Кейпвелл-Дворак, латиниця)"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Філіппінська (Кейпвелл-Дворак, байбаїн)"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Філіппінська (Кейпвелл-QWERF 2006, латиниця)"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Філіппінська (Кейпвелл-QWERF 2006, байбаїн)"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:865
 msgid "Filipino (Colemak Latin)"
 msgstr "Філіппінська (Коулмак, латиниця)"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Філіппінська (Коулмак, байбаїн)"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
 msgid "Filipino (Dvorak Latin)"
 msgstr "Філіппінська (Дворак, латиниця)"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Філіппінська (Дворат, байбаїн)"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
 msgid "md"
 msgstr "md"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
 msgid "Moldavian"
 msgstr "Молдавська"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:871
 msgid "gag"
 msgstr "gag"
 
-#: ../rules/base.xml.in.h:862
-msgid "Gagauz"
-msgstr "Гагаузька"
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
+msgstr "Молдавська (гагаузька)"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
 msgid "Key(s) to change layout"
 msgstr "Клавіші для зміни розкладки"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
 msgid "Right Alt (while pressed)"
 msgstr "Права клавіша Alt (поки натиснена)"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
 msgid "Left Alt (while pressed)"
 msgstr "Ліва клавіша Alt (поки натиснена)"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:876
 msgid "Left Win (while pressed)"
 msgstr "Ліва клавіша Win (поки натиснута)"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
 msgid "Right Win (while pressed)"
 msgstr "Права клавіша Win (поки натиснена)"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
 msgid "Any Win key (while pressed)"
 msgstr "Будь-яка клавіша Win (на час натискання)"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:879
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (поки натиснена), Alt+Caps Lock виконує оригінальну функцію capslock"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
 msgid "Right Ctrl (while pressed)"
 msgstr "Права клавіша Ctrl (поки натиснута)"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
 msgid "Right Alt"
 msgstr "Права клавіша Alt"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
 msgid "Left Alt"
 msgstr "Ліва клавіша Alt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (на першу розкладку), Shift+Caps Lock (на останню розкладку)"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Ліва Win (на першу розкладку), Права Win/Menu (на останню розкладку)"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Ліва Ctrl (на першу розкладку), Правий Ctrl (на останню розкладку)"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
 msgid "Both Shift keys together"
 msgstr "Обидві клавіші Shift разом"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
 msgid "Both Alt keys together"
 msgstr "Обидві клавіші Alt разом"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
 msgid "Both Ctrl keys together"
 msgstr "Обидві клавіші Ctrl разом"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
 msgid "Left Ctrl+Left Shift"
 msgstr "Лівий Ctrl+Лівий Shift"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
 msgid "Right Ctrl+Right Shift"
 msgstr "Права Ctrl+Права Shift"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
 msgid "Left Alt+Left Shift"
 msgstr "Лівий Alt+Лівий Shift"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
 msgid "Alt+Space"
 msgstr "Alt+Пробіл"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
 msgid "Left Win"
 msgstr "Ліва клавіша Win"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
 msgid "Right Win"
 msgstr "Права клавіша Win"
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
 msgid "Left Shift"
 msgstr "Ліва клавіша Shift"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
 msgid "Right Shift"
 msgstr "Права клавіша Shift"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl"
 msgstr "Ліва клавіша Ctrl"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
 msgid "Right Ctrl"
 msgstr "Права клавіша Ctrl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Ліва Ctrl+ліва Win (на першу розкладку), правий Ctrl+Menu (на другу розкладку)"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
 msgid "Key to choose 3rd level"
 msgstr "Клавіша для вибору 3-го ряду"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
 msgid "Any Win key"
 msgstr "Будь-яка клавіша Win"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
 msgid "Any Alt key"
 msgstr "Будь-яка клавіша Alt"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Вибір 3-го рівня натисненням правої клавіші Alt, Shift+права клавіша Alt діє як Multi_Key"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:912
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Права клавіша Alt ніколи не обирає 3-й рівень"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
 msgid "Enter on keypad"
 msgstr "Enter на цифровій клавіатурі"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
 msgid "Backslash"
 msgstr "Зворотна риска"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Менше ніж/Більше ніж&gt;"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
 msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Caps Lock вибирає 3-ій рівень, одноразовий вибір регістру, якщо натиснути разом зі іншою комбінацією вибору 3-го рівня"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
 msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "Зворотна похила риска вибирає 3-ій рівень, одноразовий вибір регістру, якщо натиснути разом зі іншою комбінацією вибору 3-го рівня"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
 msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
 msgstr "&lt;Менше/Більше&gt; вибирає 3-ій рівень, одноразовий вибір регістру, якщо натиснути разом зі іншою комбінацією вибору 3-го рівня"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
 msgid "Ctrl key position"
 msgstr "Розташування клавіші Ctrl"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
 msgid "Caps Lock as Ctrl"
 msgstr "Caps Lock працює як Ctrl"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
 msgid "Left Ctrl as Meta"
 msgstr "Ліва клавіша Ctrl як Meta"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Поміняти місцями клавіші Ctrl та Caps Lock"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
 msgid "At left of 'A'"
 msgstr "Ліворуч від 'A'"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:924
 msgid "At bottom left"
 msgstr "Знизу ліворуч"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:925
 msgid "Right Ctrl as Right Alt"
 msgstr "Права клавіша Ctrl працює як права клавіша Alt"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:926
 msgid "Menu as Right Ctrl"
 msgstr "Menu працює як права клавіша Ctrl"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:927
 msgid "Right Alt as Right Ctrl"
 msgstr "Права клавіша Alt працює як права клавіша Ctrl"
 
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:928
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Використовувати клавіатурні індикатори для індикації альтернативних розкладок"
 
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:929
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:930
 msgid "Numeric keypad layout selection"
 msgstr "Вибір розкладки цифрової клавіатури"
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:931
 msgid "Legacy"
 msgstr "Застаріла"
 
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:932
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Доповнення Unicode (стрілки та математичні оператори)"
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:933
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Доповнення Unicode (стрілки та математичні оператори). Математичні оператори на типовому рівні."
 
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:934
 msgid "Legacy Wang 724"
 msgstr "Стара Wang 724"
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:935
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Клавіатура Wang 724 з доповненнями Unicode (стрілки та математичні оператори)"
 
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:936
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Клавіатура Wang 724 з доповненнями Unicode (стрілки та математичні оператори). Математичні операції на типовому рівні"
 
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:937
 msgid "Hexadecimal"
 msgstr "Шістнадцяткова"
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:938
 msgid "ATM/phone-style"
 msgstr "У стилі банкоматної/телефонної"
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:939
 msgid "Numeric keypad delete key behaviour"
 msgstr "Вибір поведінки клавіші del на цифровій клавіатурі"
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:940
 msgid "Legacy key with dot"
 msgstr "Застаріла клавіша з крапкою"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:942
 msgid "Legacy key with comma"
 msgstr "Застаріла клавіша з комою"
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:943
 msgid "Four-level key with dot"
 msgstr "Клавіша четвертого рівня з крапкою"
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:944
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Клавіша четвертого рівня з крапкою, обмежена latin-9"
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:945
 msgid "Four-level key with comma"
 msgstr "Клавіша четвертого рівня з комою"
 
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:946
 msgid "Four-level key with momayyez"
 msgstr "Клавіша четвертого рівня з momayyez"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:949
 msgid "Four-level key with abstract separators"
 msgstr "Клавіша четвертого рівня з абстрактним розділювачем "
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:950
 msgid "Semi-colon on third level"
 msgstr "Крапка з комою на третьому рівні"
 
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:951
 msgid "Caps Lock key behavior"
 msgstr "Поведінка клавіші Caps Lock"
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:952
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock вмикає внутрішню капіталізацію. Shift призупиняє дію Caps Lock"
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:953
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock вмикає внутрішню капіталізацію. Shift не впливає на Caps Lock"
 
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:954
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock дія як Shift з блокуванням. Shift призупиняє дію Caps Lock"
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:955
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock діє як Shift з блокуванням. Shift не впливає на Caps Lock"
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:956
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock вмикає звичайну капіталізацію символів алфавіту"
 
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:957
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Caps Lock — додаткова клавіша Num Lock"
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:958
 msgid "Swap ESC and Caps Lock"
 msgstr "Поміняти місцями клавіші ESC та Caps Lock"
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:959
 msgid "Make Caps Lock an additional ESC"
 msgstr "Caps Lock — додаткова клавіша ESC"
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:960
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Caps Lock — додаткова клавіша Backspace"
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:961
 msgid "Make Caps Lock an additional Super"
 msgstr "Caps Lock — додаткова клавіша Super"
 
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:962
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Caps Lock — додаткова клавіша Hyper"
 
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:963
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Caps Lock вмикає Shift, таким чином, він діє одразу на всі клавіші"
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:964
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock вимкнено"
 
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:965
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Caps Lock — додаткова клавіша Ctrl, але зі збереженням символу клавіші Caps_Lock"
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:966
 msgid "Alt/Win key behavior"
 msgstr "Поведінка клавіш Alt/Win"
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:967
 msgid "Add the standard behavior to Menu key"
 msgstr "Додати звичайну поведінку на клавішу Menu"
 
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:968
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt та Meta на клавішах Alt"
 
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:969
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Control використовується як Win (і як звичайний Control)"
 
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:970
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Control використовується як клавіші Alt, Alt використовується як Win"
 
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:971
 msgid "Meta is mapped to Win keys"
 msgstr "Meta відповідає клавішам Win"
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:972
 msgid "Meta is mapped to Left Win"
 msgstr "Meta відповідає лівій клавіші Win"
 
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:973
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper відповідає клавішам Win"
 
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:974
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Клавіша Alt відповідає правій клавіші Win, а Super - клавіші Menu."
 
-#: ../rules/base.xml.in.h:965
-msgid "Left Alt is swapped with Left Win"
-msgstr "Ліва Alt міняється з лівою клавішею Win"
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
+msgstr "Alt міняється з клавішею Win"
 
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:976
 msgid "Compose key position"
 msgstr "Розташування клавіші Compose"
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:977
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:978
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:979
 msgid "Miscellaneous compatibility options"
 msgstr "Різні параметри сумісності"
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:980
 msgid "Default numeric keypad keys"
 msgstr "Типові клавіші цифрової клавіатури"
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:981
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr "За допомогою цифрова клавіатура вводяться лише цифри (як у Mac OS)"
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:982
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shift з цифровою клавіатурою працює як у Microsoft Windows"
 
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:983
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift не скасовує Num Lock, а вибирає третій рівень"
 
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:984
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Сліпі клавіші (Ctrl+Alt+&lt;key&gt;) обробляються на сервері"
 
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:985
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Клавіатура Apple Aluminium (емуляція клавіш ПК: Print, Scroll Lock, Pause, Num Lock)"
 
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:986
 msgid "Shift cancels Caps Lock"
 msgstr "Shift скасовує Caps Lock"
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:987
 msgid "Enable extra typographic characters"
 msgstr "Увімкнути додаткові типографські символи"
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:988
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Обидві клавіші Shift разом перемикають стан Caps Lock"
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:989
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Натискання обох клавіш Shift вмикають Caps Lock, одна клавіша Shift — вимикає"
 
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:990
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Обидві клавіші Shift разом перемикають стан Shift"
 
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:991
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Вмикати або вимикати PointerKeys за допомогою Shift + NumLock."
 
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:992
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr "Дозволити скасування захоплення діями з клавіатури (увага: небезпечно)"
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:993
 msgid "Adding currency signs to certain keys"
 msgstr "Додавання знаків валюти до деяких клавіш"
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:994
 msgid "Euro on E"
 msgstr "Євро на E"
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:995
 msgid "Euro on 2"
 msgstr "Євро на 2"
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:996
 msgid "Euro on 4"
 msgstr "Євро на 4"
 
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:997
 msgid "Euro on 5"
 msgstr "Євро на 5"
 
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:998
 msgid "Rupee on 4"
 msgstr "Символ рупії на 4"
 
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:999
 msgid "Key to choose 5th level"
 msgstr "Клавіша для вибору 5-го ряду"
 
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1000
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "&lt;Менше ніж/Більше ніж&gt; вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1001
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Права клавіша Alt вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1002
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Ліва клавіша Win вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1003
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Права клавіша Win вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1004
 msgid "Using space key to input non-breakable space character"
 msgstr "Клавіша пробіл генерує символ нерозривного пробілу"
 
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:1005
 msgid "Usual space at any level"
 msgstr "Звичайний пробіл на будь-якому рівні"
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1006
 msgid "Non-breakable space character at second level"
 msgstr "Символ нерозривного пробілу на другому рівні"
 
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1007
 msgid "Non-breakable space character at third level"
 msgstr "Символ нерозривного пробілу на третьому рівні"
 
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1008
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Символ нерозривного пробілу на третьому рівні, нічого на четвертому"
 
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1009
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Символ нерозривного пробілу на третьому рівні, символ тонкого нерозривного пробілу на четвертому рівні"
 
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1010
 msgid "Non-breakable space character at fourth level"
 msgstr "Символ нерозривного пробілу на четвертому рівні"
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1011
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Клавіша пробіл видає нерозривний пробіл на 4-му рівні, вузький нерозривний пробіл на 6-му рівні"
 
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1012
 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:1003
+#: ../rules/base.xml.in.h:1013
 msgid "Zero-width non-joiner character at second level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні"
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1014
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, зв’язувальний символ нульової ширини на третьому рівні"
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1015
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, зв’язувальний символ нульової ширини на третьому рівні, символ нерозривного пробілу на четвертому рівні"
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1016
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, нерозривний пробіл на третьому рівні"
 
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1017
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, нерозривний пробіл на третьому рівні, нічого на четвертому рівні"
 
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1018
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, символ нерозривного пробілу на третьому рівні, зв’язувальний символ нульової ширини на четвертому"
 
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1019
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, нерозривний пробіл на третьому рівні, вузький нерозривний пробіл на четвертому рівні"
 
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1020
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Незв’язувальний символ нульової ширини на третьому рівні, зв’язувальний символ нульової ширини на четвертому"
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1021
 msgid "Japanese keyboard options"
 msgstr "Параметри японської клавіатури"
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1022
 msgid "Kana Lock key is locking"
 msgstr "Клавіша Kana Lock фіксується"
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1023
 msgid "NICOLA-F style Backspace"
 msgstr "NICOLA-F style Backspace"
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1024
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr "Клавіша повних/половинних форм — додаткова клавіша ESC"
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1025
 msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr "Додавання діакритичних знаків есперанто"
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1026
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "На відповідну клавішу на клавіатурі Qwerty."
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1027
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "На відповідну клавішу на клавіатурі Дворак."
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Підтримувати сумісність клавіш з застарілими кодами клавіш Solaris"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr "Сумісність з кодами клавіш Sun"
+
+#: ../rules/base.xml.in.h:1030
 msgid "Key sequence to kill the X server"
 msgstr "Комбінація клавіш для переривання роботи X-сервера"
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
@@ -3798,7 +3849,7 @@ msgid "apl"
 msgstr "apl"
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "APL Keyboard Symbols"
+msgid "APL keyboard symbols"
 msgstr "Клавіатурні символи APL"
 
 #: ../rules/base.extras.xml.in.h:5
@@ -3817,105 +3868,252 @@ msgstr "shs"
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Багатомовна (Канада, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (US keyboard with German letters)"
 msgstr "Німецька (американська клавіатура з німецькими літерами)"
 
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr "Німецька (з літерами угорської без сліпих клавіш)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr "Німецька (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:17
 msgid "Avestan"
 msgstr "Авестанська"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:20
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Литовська (Дворак, США, з литовськими літерами)"
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Литовська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr "Латвійська (Дворак, США)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Латвійська (Дворак, США, варіант з літерою Y)"
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Латвійська (Дворак, США, варіант з мінусом)"
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Латвійська (програмістський Дворак)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Латвійська (програмістський Дворак, варіант з літерою Y)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Латвійська (програмістський Дворак, варіант з мінусом)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:30
 msgid "Latvian (US Colemak)"
 msgstr "Латвійська (США, Коулмак)"
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:31
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Латвійська (Коулмак, США, варіант з апострофом)"
 
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Латвійська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:35
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Англійська (США, інтернаціональна, введення Unicode за допомогою AltGr)"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Англійська (США, інтернаціональна, введення Unicode за допомогою AltGr, альтернативна)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "Atsina"
 msgstr "Атсінська"
 
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:38
 msgid "Couer D'alene Salish"
 msgstr "Салішська кер-д’ален"
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr "Англійська (США, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr "Польська (інтернаціональна зі сліпими клавішами)"
 
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr "Польська (Коулмак)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr "Польська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:48
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr "Кримськотатарська (Dobruja Q)"
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Румунська (ергономічна для друку наосліп)"
 
-#: ../rules/base.extras.xml.in.h:44
-msgid "Serbian"
-msgstr "Сербська"
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Румунська (Sun Type 6/7)"
 
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:53
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Сербська (комбінації з акцентами замість сліпих клавіш)"
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr "Російська (з українсько-білоруською розкладкою)"
 
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr "Російська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:60
 msgid "Armenian (OLPC phonetic)"
 msgstr "Вірменська (OLPC, фонетична)"
 
-#: ../rules/base.extras.xml.in.h:53
-msgid "Hebrew (Biblical SIL)"
-msgstr "Іврит (біблійна, SIL)"
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "Іврит (біблійна, фонетична, SIL)"
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Арабська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Бельгійська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil,Sun Type 6/7)"
+msgstr "Португальська (Бразилія, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr "Чеська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr "Данська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Голландська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Естонська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Фінська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr "Французька (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr "Грецька (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr "Італійська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr "Японська (Sun Type 6)"
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Японська (Sun Type 7, сумісна з ПК)"
+
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Японська (Sun Type 7, сумісна з комп’ютерами Sun)"
 
-#: ../rules/base.extras.xml.in.h:54
-msgid "Biblical SIL phonetic"
-msgstr "Біблійна (фонетична, SIL)"
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Норвезька (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Португальська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Словацька (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr "Іспанська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr "Шведська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid ">German (Switzerland)"
+msgstr "Німецька (Швейцарія)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Німецька (Швейцарія, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Французька (Швейцарія, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Турецька (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Українська (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
+msgstr "Англійська (Великобританія, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
+msgstr "Корейська (Sun Type 6/7)"
+
+#~ msgid "ca"
+#~ msgstr "ca"
+
+#~ msgid "Catalan"
+#~ msgstr "Каталонська"
+
+#~ msgid "Serbian (Cyrillic)"
+#~ msgstr "Сербська (кирилиця)"
+
+#~ msgid "Gagauz"
+#~ msgstr "Гагаузька"
+
+#~ msgid "Hebrew (Biblical SIL)"
+#~ msgstr "Іврит (біблійна, SIL)"
 
 #~ msgid "&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 #~ msgstr "&lt;Менше ніж/Більше ніж&gt; вибирає 5-ий рівень і активує блокування рівня 5, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
@@ -3974,9 +4172,6 @@ msgstr "Біблійна (фонетична, SIL)"
 #~ msgid "Danish (Mac)"
 #~ msgstr "Данська (Mac)"
 
-#~ msgid "English (UK, Mac)"
-#~ msgstr "Англійська (Великобританія, Mac)"
-
 #~ msgid "Finnish (Mac)"
 #~ msgstr "Фінська (Mac)"
 
@@ -4055,9 +4250,6 @@ msgstr "Біблійна (фонетична, SIL)"
 #~ msgid "Swiss"
 #~ msgstr "Швейцарська"
 
-#~ msgid "Swiss (legacy)"
-#~ msgstr "Швейцарська (застаріла)"
-
 #~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
 #~ msgstr "Турецька (кримськотатарська турецька Alt-Q)"
 
diff --git a/xorg-server/xkeyboard-config/po/xkeyboard-config.pot b/xorg-server/xkeyboard-config/po/xkeyboard-config.pot
index 3c640c3b5..4a5dd4c88 100644
--- a/xorg-server/xkeyboard-config/po/xkeyboard-config.pot
+++ b/xorg-server/xkeyboard-config/po/xkeyboard-config.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-09-12 00:25+0100\n"
+"POT-Creation-Date: 2013-01-29 22:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -698,3133 +698,3184 @@ msgid "OLPC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:171
-msgid "Sun Type 5/6"
+msgid "Sun Type 7 USB"
 msgstr ""
 
 #: ../rules/base.xml.in.h:172
-msgid "Targa Visionary 811"
+msgid "Sun Type 7 USB (European layout)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:173
-msgid "Unitek KB-1925"
+msgid "Sun Type 7 USB (Unix layout)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:174
-msgid "FL90"
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
 msgstr ""
 
 #: ../rules/base.xml.in.h:175
-msgid "Creative Desktop Wireless 7000"
+msgid "Sun Type 6/7 USB"
 msgstr ""
 
 #: ../rules/base.xml.in.h:176
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:177
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:178
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:179
+msgid "Sun Type 6 (Japanese layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:180
+msgid "Targa Visionary 811"
+msgstr ""
+
+#: ../rules/base.xml.in.h:181
+msgid "Unitek KB-1925"
+msgstr ""
+
+#: ../rules/base.xml.in.h:182
+msgid "FL90"
+msgstr ""
+
+#: ../rules/base.xml.in.h:183
+msgid "Creative Desktop Wireless 7000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:184
 msgid "Htc Dream phone"
 msgstr ""
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
 msgid "en"
 msgstr ""
 
-#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
 msgid "English (US)"
 msgstr ""
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:189
 msgid "chr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:190
 msgid "Cherokee"
 msgstr ""
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:191
 msgid "English (US, with euro on 5)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:192
 msgid "English (US, international with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:193
 msgid "English (US, alternative international)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:194
 msgid "English (Colemak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:195
 msgid "English (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:188
-msgid "English (Dvorak international with dead keys)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:197
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:198
 msgid "English (left handed Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:199
 msgid "English (right handed Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:200
 msgid "English (classic Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:201
 msgid "English (programmer Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
 msgid "ru"
 msgstr ""
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:204
 msgid "Russian (US, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:206
 msgid "English (international AltGr dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:207
 msgid "English (layout toggle on multiply/divide key)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:208
 msgid "Serbo-Croatian (US)"
 msgstr ""
 
-#. Keyboard indicator for Catalan layouts
-#: ../rules/base.xml.in.h:202
-msgid "ca"
+#: ../rules/base.xml.in.h:209
+msgid "English (Workman)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:203
-msgid "Catalan"
+#: ../rules/base.xml.in.h:210
+msgid "English (Workman, international with dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
 msgid "fa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:213
 msgid "Afghani"
 msgstr ""
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:215
 msgid "ps"
 msgstr ""
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:216
 msgid "Pashto"
 msgstr ""
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:218
 msgid "uz"
 msgstr ""
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:219
 msgid "Uzbek (Afghanistan)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:220
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:221
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:222
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr ""
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
 msgid "ar"
 msgstr ""
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
 msgid "Arabic"
 msgstr ""
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:226
 msgid "Arabic (azerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:227
 msgid "Arabic (azerty/digits)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:228
 msgid "Arabic (digits)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:229
 msgid "Arabic (qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:230
 msgid "Arabic (qwerty/digits)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:231
 msgid "Arabic (Buckwalter)"
 msgstr ""
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:233
 msgid "sq"
 msgstr ""
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:234
 msgid "Albanian"
 msgstr ""
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
 msgid "hy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
 msgid "Armenian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:238
 msgid "Armenian (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:239
 msgid "Armenian (alternative phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:240
 msgid "Armenian (eastern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:241
 msgid "Armenian (western)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:242
 msgid "Armenian (alternative eastern)"
 msgstr ""
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
 msgid "de"
 msgstr ""
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:245
 msgid "German (Austria)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:246
+msgid "German (legacy)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:247
 msgid "German (Austria, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:248
 msgid "German (Austria, Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:249
 msgid "German (Austria, Macintosh)"
 msgstr ""
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:251
 msgid "az"
 msgstr ""
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:252
 msgid "Azerbaijani"
 msgstr ""
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:253
 msgid "Azerbaijani (Cyrillic)"
 msgstr ""
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:255
 msgid "by"
 msgstr ""
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:256
 msgid "Belarusian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:257
 msgid "Belarusian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:258
 msgid "Belarusian (Latin)"
 msgstr ""
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:67
 msgid "be"
 msgstr ""
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:68
 msgid "Belgian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:262
 msgid "Belgian (alternative)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:263
 msgid "Belgian (alternative, latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:264
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:265
 msgid "Belgian (ISO alternate)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:266
 msgid "Belgian (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:267
 msgid "Belgian (Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:268
 msgid "Belgian (Wang model 724 azerty)"
 msgstr ""
 
 #. Keyboard indicator for Bengali layouts
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:270
 msgid "bn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:271
 msgid "Bengali"
 msgstr ""
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:272
 msgid "Bengali (Probhat)"
 msgstr ""
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:274
 msgid "in"
 msgstr ""
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:275
 msgid "Indian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:276
 msgid "Bengali (India)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:277
 msgid "Bengali (India, Probhat)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:278
 msgid "Bengali (India, Baishakhi)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:279
 msgid "Bengali (India, Bornona)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:280
 msgid "Bengali (India, Uni Gitanjali)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:281
 msgid "Bengali (India, Baishakhi Inscript)"
 msgstr ""
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:283
 msgid "gu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:284
 msgid "Gujarati"
 msgstr ""
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:286
 msgid "pa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:287
 msgid "Punjabi (Gurmukhi)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:288
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr ""
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:290
 msgid "kn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:291
 msgid "Kannada"
 msgstr ""
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:293
 msgid "ml"
 msgstr ""
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:294
 msgid "Malayalam"
 msgstr ""
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:295
 msgid "Malayalam (Lalitha)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:296
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr ""
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:298
 msgid "or"
 msgstr ""
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:299
 msgid "Oriya"
 msgstr ""
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:301
 msgid "ta"
 msgstr ""
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:302
 msgid "Tamil (Unicode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:303
 msgid "Tamil (keyboard with numerals)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:304
 msgid "Tamil (TAB typewriter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:305
 msgid "Tamil (TSCII typewriter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:306
 msgid "Tamil"
 msgstr ""
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:308
 msgid "te"
 msgstr ""
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:309
 msgid "Telugu"
 msgstr ""
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:311
 msgid "ur"
 msgstr ""
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:312
 msgid "Urdu (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:313
 msgid "Urdu (alternative phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:314
 msgid "Urdu (WinKeys)"
 msgstr ""
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:316
 msgid "hi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:317
 msgid "Hindi (Bolnagri)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:318
 msgid "Hindi (Wx)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:319
 msgid "English (India, with RupeeSign)"
 msgstr ""
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:321
 msgid "bs"
 msgstr ""
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:322
 msgid "Bosnian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:323
 msgid "Bosnian (use guillemets for quotes)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:324
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:325
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:326
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr ""
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:328 ../rules/base.extras.xml.in.h:70
 msgid "pt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:329 ../rules/base.extras.xml.in.h:71
 msgid "Portuguese (Brazil)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:330
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:331
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:332
 msgid "Portuguese (Brazil, nativo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:333
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:334
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr ""
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:336
 msgid "bg"
 msgstr ""
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:337
 msgid "Bulgarian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:338
 msgid "Bulgarian (traditional phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:339
 msgid "Bulgarian (new phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:340
 msgid "Arabic (Morocco)"
 msgstr ""
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:342 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:343
 msgid "French (Morocco)"
 msgstr ""
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:345
 msgid "ber"
 msgstr ""
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:346
 msgid "Berber (Morocco, Tifinagh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:347
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:348
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:349
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:350
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:351
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "cm"
 msgstr ""
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
 msgid "English (Cameroon)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:355
 msgid "French (Cameroon)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:356
 msgid "Cameroon Multilingual (qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:357
 msgid "Cameroon Multilingual (azerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:358
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:360
 msgid "my"
 msgstr ""
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:361
 msgid "Burmese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:362 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:363
 msgid "French (Canada, Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:364
 msgid "French (Canada, legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:365
 msgid "Canadian Multilingual"
 msgstr ""
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:366
 msgid "Canadian Multilingual (first part)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:367
 msgid "Canadian Multilingual (second part)"
 msgstr ""
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:369
 msgid "ike"
 msgstr ""
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:370
 msgid "Inuktitut"
 msgstr ""
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:371
 msgid "English (Canada)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:372
 msgid "French (Democratic Republic of the Congo)"
 msgstr ""
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:374
 msgid "zh"
 msgstr ""
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:375
 msgid "Chinese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:376
 msgid "Tibetan"
 msgstr ""
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:377
 msgid "Tibetan (with ASCII numerals)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:378
 msgid "Uyghur"
 msgstr ""
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:380
 msgid "hr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:381
 msgid "Croatian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:382
 msgid "Croatian (use guillemets for quotes)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:383
 msgid "Croatian (use Croatian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:384
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:385
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr ""
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:387 ../rules/base.extras.xml.in.h:73
 msgid "cs"
 msgstr ""
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:388 ../rules/base.extras.xml.in.h:74
 msgid "Czech"
 msgstr ""
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:389
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:390
 msgid "Czech (qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:391
 msgid "Czech (qwerty, extended Backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:392
 msgid "Czech (UCW layout, accented letters only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:393
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr ""
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:76
 msgid "da"
 msgstr ""
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:77
 msgid "Danish"
 msgstr ""
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:397
 msgid "Danish (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:398
 msgid "Danish (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:399
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:400
 msgid "Danish (Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:402 ../rules/base.extras.xml.in.h:79
 msgid "nl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:80
 msgid "Dutch"
 msgstr ""
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:404
 msgid "Dutch (Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:405
 msgid "Dutch (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:406
 msgid "Dutch (standard)"
 msgstr ""
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:408
 msgid "dz"
 msgstr ""
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:409
 msgid "Dzongkha"
 msgstr ""
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:82
 msgid "et"
 msgstr ""
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:83
 msgid "Estonian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:413
 msgid "Estonian (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:414
 msgid "Estonian (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+#: ../rules/base.xml.in.h:416 ../rules/base.extras.xml.in.h:16
 msgid "Persian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Persian (with Persian Keypad)"
 msgstr ""
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 msgid "ku"
 msgstr ""
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iran, Latin Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 msgid "Kurdish (Iran, F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
 msgid "Iraqi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:425
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:426
 msgid "Kurdish (Iraq, F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:427
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:428
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr ""
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:430
 msgid "fo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:431
 msgid "Faroese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:432
 msgid "Faroese (eliminate dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:434 ../rules/base.extras.xml.in.h:85
 msgid "fi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:435 ../rules/base.extras.xml.in.h:86
 msgid "Finnish"
 msgstr ""
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:436
 msgid "Finnish (classic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Northern Saami (Finland)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Finnish (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440 ../rules/base.extras.xml.in.h:88
 msgid "French"
 msgstr ""
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:441
 msgid "French (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "French (Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "French (alternative)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "French (alternative, latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "French (alternative, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "French (alternative, Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "French (legacy, alternative)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:452
 msgid "French (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:453
 msgid "French (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:454
 msgid "French (Breton)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:455
 msgid "Occitan"
 msgstr ""
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:456
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:457
 msgid "English (Ghana)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:458
 msgid "English (Ghana, multilingual)"
 msgstr ""
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:460
 msgid "ak"
 msgstr ""
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:461
 msgid "Akan"
 msgstr ""
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:463
 msgid "ee"
 msgstr ""
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:464
 msgid "Ewe"
 msgstr ""
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:466
 msgid "ff"
 msgstr ""
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:467
 msgid "Fula"
 msgstr ""
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:469
 msgid "gaa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:470
 msgid "Ga"
 msgstr ""
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:472
 msgid "ha"
 msgstr ""
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:473
 msgid "Hausa"
 msgstr ""
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:475
 msgid "avn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:476
 msgid "Avatime"
 msgstr ""
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:477
 msgid "English (Ghana, GILLBT)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:478
 msgid "French (Guinea)"
 msgstr ""
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:480
 msgid "ka"
 msgstr ""
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:481
 msgid "Georgian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:482
 msgid "Georgian (ergonomic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:483
 msgid "Georgian (MESS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:484
 msgid "Russian (Georgia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:485
 msgid "Ossetian (Georgia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:486 ../rules/base.extras.xml.in.h:11
 msgid "German"
 msgstr ""
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:487
 msgid "German (dead acute)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:488
 msgid "German (dead grave acute)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:489
 msgid "German (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:490
 msgid "Romanian (Germany)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:491
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:492
 msgid "German (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:493
 msgid "German (Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:494
 msgid "German (Neo 2)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:495
 msgid "German (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:496
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:497
 msgid "Lower Sorbian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:498
 msgid "Lower Sorbian (qwertz)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:499
 msgid "German (qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:500
 msgid "Russian (Germany, phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:502 ../rules/base.extras.xml.in.h:90
 msgid "gr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:503 ../rules/base.extras.xml.in.h:91
 msgid "Greek"
 msgstr ""
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:504
 msgid "Greek (simple)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:505
 msgid "Greek (extended)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:506
 msgid "Greek (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:507
 msgid "Greek (polytonic)"
 msgstr ""
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:509
 msgid "hu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (standard)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:521
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:522
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:523
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:524
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:525
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:526
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:527
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:528
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:529
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:531
 msgid "is"
 msgstr ""
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:532
 msgid "Icelandic"
 msgstr ""
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:533
 msgid "Icelandic (Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:534
 msgid "Icelandic (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:535
 msgid "Icelandic (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:536
 msgid "Icelandic (Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:530 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:538 ../rules/base.extras.xml.in.h:61
 msgid "he"
 msgstr ""
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:539 ../rules/base.extras.xml.in.h:62
 msgid "Hebrew"
 msgstr ""
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:540
 msgid "Hebrew (lyx)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:541
 msgid "Hebrew (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:542
 msgid "Hebrew (Biblical, Tiro)"
 msgstr ""
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:544 ../rules/base.extras.xml.in.h:93
 msgid "it"
 msgstr ""
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:545 ../rules/base.extras.xml.in.h:94
 msgid "Italian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:546
 msgid "Italian (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:547
 msgid "Italian (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:548
 msgid "Italian (US keyboard with Italian letters)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:549
 msgid "Georgian (Italy)"
 msgstr ""
 
+#: ../rules/base.xml.in.h:550
+msgid "Italian (IBM 142)"
+msgstr ""
+
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:552 ../rules/base.extras.xml.in.h:96
 msgid "ja"
 msgstr ""
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:553 ../rules/base.extras.xml.in.h:97
 msgid "Japanese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:554
 msgid "Japanese (Kana)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:555
 msgid "Japanese (Kana 86)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:556
 msgid "Japanese (OADG 109A)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:557
 msgid "Japanese (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:558
 msgid "Japanese (Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:560
 msgid "ki"
 msgstr ""
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:561
 msgid "Kyrgyz"
 msgstr ""
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:562
 msgid "Kyrgyz (phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:564
 msgid "km"
 msgstr ""
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:565
 msgid "Khmer (Cambodia)"
 msgstr ""
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:567
 msgid "kk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:568
 msgid "Kazakh"
 msgstr ""
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:569
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:570
 msgid "Kazakh (with Russian)"
 msgstr ""
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:572
 msgid "lo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:573
 msgid "Lao"
 msgstr ""
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:574
 msgid "Lao (STEA proposed standard layout)"
 msgstr ""
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:576 ../rules/base.extras.xml.in.h:109
 msgid "es"
 msgstr ""
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:577
 msgid "Spanish (Latin American)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:578
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:579
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:580
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:573 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:18
 msgid "lt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:574 ../rules/base.extras.xml.in.h:17
+#: ../rules/base.xml.in.h:583 ../rules/base.extras.xml.in.h:19
 msgid "Lithuanian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:584
 msgid "Lithuanian (standard)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:585
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:586
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:587
 msgid "Lithuanian (LEKP)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:588
 msgid "Lithuanian (LEKPa)"
 msgstr ""
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:581 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:590 ../rules/base.extras.xml.in.h:22
 msgid "lv"
 msgstr ""
 
-#: ../rules/base.xml.in.h:582 ../rules/base.extras.xml.in.h:20
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:23
 msgid "Latvian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:592
 msgid "Latvian (apostrophe variant)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:593
 msgid "Latvian (tilde variant)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:594
 msgid "Latvian (F variant)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:595
 msgid "Latvian (modern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:596
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:597
 msgid "Latvian (adapted)"
 msgstr ""
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:599
 msgid "mi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:600
 msgid "Maori"
 msgstr ""
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:603
 msgid "Montenegrin"
 msgstr ""
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:604
 msgid "Montenegrin (Cyrillic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:605
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:606
 msgid "Montenegrin (Latin Unicode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:607
 msgid "Montenegrin (Latin qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:608
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:609
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:610
 msgid "Montenegrin (Latin with guillemets)"
 msgstr ""
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:612
 msgid "mk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:613
 msgid "Macedonian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:614
 msgid "Macedonian (eliminate dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:616
 msgid "mt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:617
 msgid "Maltese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:618
 msgid "Maltese (with US layout)"
 msgstr ""
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:620
 msgid "mn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:621
 msgid "Mongolian"
 msgstr ""
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:101
 msgid "no"
 msgstr ""
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:102
 msgid "Norwegian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:625
 msgid "Norwegian (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:626
 msgid "Norwegian (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:627
 msgid "Northern Saami (Norway)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:628
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:629
 msgid "Norwegian (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:630
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:631
 msgid "Norwegian (Colemak)"
 msgstr ""
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:624 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:40
 msgid "pl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:625 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:41
 msgid "Polish"
 msgstr ""
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:635
+msgid "Polish (legacy)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:636
 msgid "Polish (qwertz)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:637
 msgid "Polish (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:638
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:639
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:640
 msgid "Kashubian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:641
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:642
 msgid "Polish (programmer Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:104
 msgid "Portuguese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:644
 msgid "Portuguese (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:645
 msgid "Portuguese (Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:646
 msgid "Portuguese (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:647
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:648
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:649
 msgid "Portuguese (Nativo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:650
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:651
 msgid "Esperanto (Portugal, Nativo)"
 msgstr ""
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:38
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:45
 msgid "ro"
 msgstr ""
 
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:46
 msgid "Romanian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (cedilla)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:657
 msgid "Romanian (standard cedilla)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:658
 msgid "Romanian (WinKeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:649 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:659 ../rules/base.extras.xml.in.h:55
 msgid "Russian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:660
 msgid "Russian (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:661
 msgid "Russian (phonetic WinKeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:662
 msgid "Russian (typewriter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:663
 msgid "Russian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:664
 msgid "Russian (typewriter, legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:665
 msgid "Tatar"
 msgstr ""
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Ossetian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:667
 msgid "Ossetian (WinKeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:668
 msgid "Chuvash"
 msgstr ""
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:669
 msgid "Chuvash (Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:670
 msgid "Udmurt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:671
 msgid "Komi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:672
 msgid "Yakut"
 msgstr ""
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:673
 msgid "Kalmyk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:674
 msgid "Russian (DOS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:675
 msgid "Serbian (Russia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:676
 msgid "Bashkirian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:677
 msgid "Mari"
 msgstr ""
 
-#: ../rules/base.xml.in.h:668
-msgid "Serbian (Cyrillic)"
+#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:52
+msgid "Serbian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:679
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:680
 msgid "Serbian (Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:681
 msgid "Serbian (Latin Unicode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:682
 msgid "Serbian (Latin qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:683
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:686
 msgid "Pannonian Rusyn (homophonic)"
 msgstr ""
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:688
 msgid "sl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:689
 msgid "Slovenian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:690
 msgid "Slovenian (use guillemets for quotes)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:691
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr ""
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:693 ../rules/base.extras.xml.in.h:106
 msgid "sk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:107
 msgid "Slovak"
 msgstr ""
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:695
 msgid "Slovak (extended Backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:696
 msgid "Slovak (qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:697
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:110
 msgid "Spanish"
 msgstr ""
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:699
 msgid "Spanish (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:700
 msgid "Spanish (include dead tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:701
 msgid "Spanish (Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:702
 msgid "Spanish (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:703
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:704
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:705
 msgid "Spanish (Macintosh)"
 msgstr ""
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:707 ../rules/base.extras.xml.in.h:112
 msgid "sv"
 msgstr ""
 
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:708 ../rules/base.extras.xml.in.h:113
 msgid "Swedish"
 msgstr ""
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:709
 msgid "Swedish (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:710
 msgid "Swedish (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:711
 msgid "Russian (Sweden, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:712
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:713
 msgid "Northern Saami (Sweden)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:714
 msgid "Swedish (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:715
 msgid "Swedish (Svdvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:716
 msgid "Swedish Sign Language"
 msgstr ""
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:115
 msgid "German (Switzerland)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:718
 msgid "German (Switzerland, legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:719
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:720
 msgid "German (Switzerland, Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:721
 msgid "French (Switzerland)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:722
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
 msgid "French (Switzerland, Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
 msgid "French (Switzerland, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
 msgid "German (Switzerland, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
 msgid "Arabic (Syria)"
 msgstr ""
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:728
 msgid "syc"
 msgstr ""
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:729
 msgid "Syriac"
 msgstr ""
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:730
 msgid "Syriac (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
 msgid "Kurdish (Syria, Latin Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
 msgid "Kurdish (Syria, F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr ""
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
 msgid "tg"
 msgstr ""
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
 msgid "Tajik"
 msgstr ""
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
 msgid "Tajik (legacy)"
 msgstr ""
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:739
 msgid "si"
 msgstr ""
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
 msgid "Sinhala (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr ""
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
 msgid "th"
 msgstr ""
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
 msgid "Thai"
 msgstr ""
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
 msgid "Thai (TIS-820.2538)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr ""
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:118
 msgid "tr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:119
 msgid "Turkish"
 msgstr ""
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
 msgid "Turkish (F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
 msgid "Turkish (Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
 msgid "Turkish (Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
 msgid "Kurdish (Turkey, F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:756
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
 msgid "Turkish (international with dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:759 ../rules/base.extras.xml.in.h:47
 msgid "crh"
 msgstr ""
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:760
 msgid "Crimean Tatar (Turkish Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
 msgid "Crimean Tatar (Turkish F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
 msgid "Taiwanese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
 msgid "Taiwanese (indigenous)"
 msgstr ""
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
 msgid "xsy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
 msgid "Saisiyat (Taiwan)"
 msgstr ""
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769 ../rules/base.extras.xml.in.h:121
 msgid "uk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:122
 msgid "Ukrainian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:771
 msgid "Ukrainian (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:772
 msgid "Ukrainian (typewriter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
 msgid "Ukrainian (WinKeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (standard RSTU)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:124
 msgid "English (UK)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
 msgid "English (UK, extended WinKeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:780
 msgid "English (UK, international with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:781
 msgid "English (UK, Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
 msgid "English (UK, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
 msgid "English (UK, Macintosh international)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
 msgid "English (UK, Colemak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
 msgid "Uzbek"
 msgstr ""
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:787
 msgid "Uzbek (Latin)"
 msgstr ""
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
 msgid "vi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:790
 msgid "Vietnamese"
 msgstr ""
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:126
 msgid "ko"
 msgstr ""
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:127
 msgid "Korean"
 msgstr ""
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
 msgid "Korean (101/104 key compatible)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
 msgid "Japanese (PC-98xx Series)"
 msgstr ""
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
 msgid "ie"
 msgstr ""
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
 msgid "Irish"
 msgstr ""
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
 msgid "CloGaelach"
 msgstr ""
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:800
 msgid "Irish (UnicodeExpert)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
 msgid "Ogham"
 msgstr ""
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
 msgid "Ogham (IS434)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
 msgid "Urdu (Pakistan)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
 msgid "Urdu (Pakistan, CRULP)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
 msgid "Urdu (Pakistan, NLA)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
 msgid "Arabic (Pakistan)"
 msgstr ""
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
 msgid "sd"
 msgstr ""
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
 msgid "Sindhi"
 msgstr ""
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
 msgid "dv"
 msgstr ""
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
 msgid "Dhivehi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:813
 msgid "English (South Africa)"
 msgstr ""
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:815
 msgid "eo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
 msgid "Esperanto"
 msgstr ""
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr ""
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
 msgid "ne"
 msgstr ""
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
 msgid "Nepali"
 msgstr ""
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
 msgid "English (Nigeria)"
 msgstr ""
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
 msgid "ig"
 msgstr ""
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
 msgid "Igbo"
 msgstr ""
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
 msgid "yo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
 msgid "Yoruba"
 msgstr ""
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:829
 msgid "am"
 msgstr ""
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
 msgid "Amharic"
 msgstr ""
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:832
 msgid "wo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
 msgid "Wolof"
 msgstr ""
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
 msgid "brl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:836
 msgid "Braille"
 msgstr ""
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
 msgid "Braille (left hand)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
 msgid "Braille (right hand)"
 msgstr ""
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:840
 msgid "tk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
 msgid "Turkmen"
 msgstr ""
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
 msgid "Turkmen (Alt-Q)"
 msgstr ""
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:844
 msgid "bm"
 msgstr ""
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
 msgid "Bambara"
 msgstr ""
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
 msgid "French (Mali, alternative)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:847
 msgid "English (Mali, US Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
 msgid "English (Mali, US international)"
 msgstr ""
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:850
 msgid "sw"
 msgstr ""
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
 msgid "Swahili (Tanzania)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
 msgid "Swahili (Kenya)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:853
 msgid "Kikuyu"
 msgstr ""
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
 msgid "tn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:856
 msgid "Tswana"
 msgstr ""
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
 msgid "ph"
 msgstr ""
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
 msgid "Filipino"
 msgstr ""
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
 msgid "Filipino (QWERTY Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:861
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:865
 msgid "Filipino (Colemak Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
 msgid "Filipino (Colemak Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
 msgid "Filipino (Dvorak Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
 msgid "Filipino (Dvorak Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
 msgid "md"
 msgstr ""
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
 msgid "Moldavian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:871
 msgid "gag"
 msgstr ""
 
-#: ../rules/base.xml.in.h:862
-msgid "Gagauz"
+#: ../rules/base.xml.in.h:872
+msgid "Moldavian (Gagauz)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
 msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
 msgid "Right Alt (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
 msgid "Left Alt (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:876
 msgid "Left Win (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
 msgid "Right Win (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
 msgid "Any Win key (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:879
 msgid ""
 "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr ""
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
 msgid "Right Ctrl (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
 msgid "Right Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
 msgid "Left Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
 msgid "Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
 msgid "Shift+Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
 msgid "Alt+Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
 msgid "Both Shift keys together"
 msgstr ""
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
 msgid "Both Alt keys together"
 msgstr ""
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
 msgid "Both Ctrl keys together"
 msgstr ""
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
 msgid "Ctrl+Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
 msgid "Left Ctrl+Left Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
 msgid "Right Ctrl+Right Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
 msgid "Alt+Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
 msgid "Alt+Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
 msgid "Left Alt+Left Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
 msgid "Alt+Space"
 msgstr ""
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
 msgid "Menu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
 msgid "Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
 msgid "Right Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
 msgid "Left Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
 msgid "Right Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
 msgid "Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
 msgid "Scroll Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
 msgid "Key to choose 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
 msgid "Any Win key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
 msgid "Any Alt key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:912
 msgid "Right Alt key never chooses 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
 msgid "Enter on keypad"
 msgstr ""
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
 msgid "Backslash"
 msgstr ""
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
 msgid "&lt;Less/Greater&gt;"
 msgstr ""
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
 msgid ""
 "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with "
 "another 3rd-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
 msgid ""
 "Backslash chooses 3rd level, acts as onetime lock when pressed together with "
 "another 3rd-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
 msgid ""
 "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed "
 "together with another 3rd-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
 msgid "Ctrl key position"
 msgstr ""
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
 msgid "Caps Lock as Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
 msgid "Left Ctrl as Meta"
 msgstr ""
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
 msgid "Swap Ctrl and Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
 msgid "At left of 'A'"
 msgstr ""
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:924
 msgid "At bottom left"
 msgstr ""
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:925
 msgid "Right Ctrl as Right Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:926
 msgid "Menu as Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:927
 msgid "Right Alt as Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:928
 msgid "Use keyboard LED to show alternative layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:929
 msgid "Num Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:930
 msgid "Numeric keypad layout selection"
 msgstr ""
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:931
 msgid "Legacy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:932
 msgid "Unicode additions (arrows and math operators)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:933
 msgid ""
 "Unicode additions (arrows and math operators). Math operators on default "
 "level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:934
 msgid "Legacy Wang 724"
 msgstr ""
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:935
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:936
 msgid ""
 "Wang 724 keypad with Unicode additions (arrows and math operators). Math "
 "operators on default level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:937
 msgid "Hexadecimal"
 msgstr ""
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:938
 msgid "ATM/phone-style"
 msgstr ""
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:939
 msgid "Numeric keypad delete key behaviour"
 msgstr ""
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:940
 msgid "Legacy key with dot"
 msgstr ""
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:942
 msgid "Legacy key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:943
 msgid "Four-level key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:944
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr ""
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:945
 msgid "Four-level key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:946
 msgid "Four-level key with momayyez"
 msgstr ""
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:949
 msgid "Four-level key with abstract separators"
 msgstr ""
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:950
 msgid "Semi-colon on third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:951
 msgid "Caps Lock key behavior"
 msgstr ""
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:952
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:953
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:954
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:955
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:956
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:957
 msgid "Make Caps Lock an additional Num Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:958
 msgid "Swap ESC and Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:959
 msgid "Make Caps Lock an additional ESC"
 msgstr ""
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:960
 msgid "Make Caps Lock an additional Backspace"
 msgstr ""
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:961
 msgid "Make Caps Lock an additional Super"
 msgstr ""
 
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:962
 msgid "Make Caps Lock an additional Hyper"
 msgstr ""
 
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:963
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr ""
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:964
 msgid "Caps Lock is disabled"
 msgstr ""
 
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:965
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr ""
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:966
 msgid "Alt/Win key behavior"
 msgstr ""
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:967
 msgid "Add the standard behavior to Menu key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:968
 msgid "Alt and Meta are on Alt keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:969
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:970
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:971
 msgid "Meta is mapped to Win keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:972
 msgid "Meta is mapped to Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:973
 msgid "Hyper is mapped to Win-keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:974
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:965
-msgid "Left Alt is swapped with Left Win"
+#: ../rules/base.xml.in.h:975
+msgid "Alt is swapped with Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:976
 msgid "Compose key position"
 msgstr ""
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:977
 msgid "Pause"
 msgstr ""
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:978
 msgid "PrtSc"
 msgstr ""
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:979
 msgid "Miscellaneous compatibility options"
 msgstr ""
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:980
 msgid "Default numeric keypad keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:981
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:982
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr ""
 
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:983
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr ""
 
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:984
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr ""
 
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:985
 msgid ""
 "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num "
 "Lock)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:986
 msgid "Shift cancels Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:987
 msgid "Enable extra typographic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:988
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:989
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr ""
 
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:990
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:991
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr ""
 
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:992
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:993
 msgid "Adding currency signs to certain keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:994
 msgid "Euro on E"
 msgstr ""
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:995
 msgid "Euro on 2"
 msgstr ""
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:996
 msgid "Euro on 4"
 msgstr ""
 
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:997
 msgid "Euro on 5"
 msgstr ""
 
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:998
 msgid "Rupee on 4"
 msgstr ""
 
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:999
 msgid "Key to choose 5th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1000
 msgid ""
 "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with "
 "another 5th-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1001
 msgid ""
 "Right Alt chooses 5th level, locks when pressed together with another 5th-"
 "level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1002
 msgid ""
 "Left Win chooses 5th level, locks when pressed together with another 5th-"
 "level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1003
 msgid ""
 "Right Win chooses 5th level, locks when pressed together with another 5th-"
 "level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1004
 msgid "Using space key to input non-breakable space character"
 msgstr ""
 
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:1005
 msgid "Usual space at any level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1006
 msgid "Non-breakable space character at second level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1007
 msgid "Non-breakable space character at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1008
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1009
 msgid ""
 "Non-breakable space character at third level, thin non-breakable space "
 "character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1010
 msgid "Non-breakable space character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1011
 msgid ""
 "Non-breakable space character at fourth level, thin non-breakable space "
 "character at sixth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1012
 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:1003
+#: ../rules/base.xml.in.h:1013
 msgid "Zero-width non-joiner character at second level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1014
 msgid ""
 "Zero-width non-joiner character at second level, zero-width joiner character "
 "at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1015
 msgid ""
 "Zero-width non-joiner character at second level, zero-width joiner character "
 "at third level, non-breakable space character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1016
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1017
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level, nothing at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1018
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level, zero-width joiner at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1019
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level, thin non-breakable space at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1020
 msgid ""
 "Zero-width non-joiner character at third level, zero-width joiner at fourth "
 "level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1021
 msgid "Japanese keyboard options"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1022
 msgid "Kana Lock key is locking"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1023
 msgid "NICOLA-F style Backspace"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1024
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1025
 msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1026
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr ""
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1027
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr ""
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1028
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1029
+msgid "Sun Key compatibility"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1030
 msgid "Key sequence to kill the X server"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
 msgid "Control + Alt + Backspace"
 msgstr ""
 
@@ -3833,7 +3884,7 @@ msgid "apl"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "APL Keyboard Symbols"
+msgid "APL keyboard symbols"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:5
@@ -3852,102 +3903,230 @@ msgstr ""
 msgid "Secwepemctsin"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:11
-msgid "German (US keyboard with German letters)"
+#: ../rules/base.extras.xml.in.h:9
+msgid "Multilingual (Canada, Sun Type 6/7)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:12
+msgid "German (US keyboard with German letters)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:13
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:17
 msgid "Avestan"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:20
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (US Dvorak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (programmer US Dvorak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:29
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:30
 msgid "Latvian (US Colemak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:31
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:32
+msgid "Latvian (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:35
 msgid "English (US, international AltGr Unicode combining)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "Atsina"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:38
 msgid "Couer D'alene Salish"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:39
+msgid "English (US, Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Polish (international with dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:43
+msgid "Polish (Colemak)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Polish (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:48
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:49
 msgid "Romanian (ergonomic Touchtype)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:44
-msgid "Serbian"
+#: ../rules/base.extras.xml.in.h:50
+msgid "Romanian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:53
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:56
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:57
+msgid "Russian (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:60
 msgid "Armenian (OLPC phonetic)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:53
-msgid "Hebrew (Biblical SIL)"
+#: ../rules/base.extras.xml.in.h:63
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:66
+msgid "Arabic (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Belgian (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Portuguese (Brazil, Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:75
+msgid "Czech (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:78
+msgid "Danish (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:81
+msgid "Dutch (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:84
+msgid "Estonian (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:87
+msgid "Finnish (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:89
+msgid "French (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Greek (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Italian (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Japanese (Sun Type 6)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:99
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:100
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Norwegian (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "Portuguese (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Slovak (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Spanish (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Swedish (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Turkish (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:123
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "English (UK, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:54
-msgid "Biblical SIL phonetic"
+#: ../rules/base.extras.xml.in.h:128
+msgid "Korean (Sun Type 6/7)"
 msgstr ""
diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet
index b8f4d194a..4c172faa2 100644
--- a/xorg-server/xkeyboard-config/symbols/inet
+++ b/xorg-server/xkeyboard-config/symbols/inet
@@ -97,7 +97,7 @@ xkb_symbols "evdev" {
     key <UNDO>   {      [ Undo                  ]       };
     key <FRNT>   {      [ SunFront              ]       };
     key <COPY>   {      [ XF86Copy              ]       };
-    key <OPEN>   {      [ SunOpen               ]       };
+    key <OPEN>   {      [ XF86Open              ]       };
     key <PAST>   {      [ XF86Paste             ]       };
     key <FIND>   {      [ Find                  ]       };
     key <CUT>    {      [ XF86Cut               ]       };