aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/Xext/xcmisc.c1
-rw-r--r--xorg-server/Xext/xvdisp.c20
-rw-r--r--xorg-server/Xi/chgdctl.c8
-rw-r--r--xorg-server/Xi/chgfctl.c2
-rw-r--r--xorg-server/Xi/exevents.c5
-rw-r--r--xorg-server/Xi/sendexev.c3
-rw-r--r--xorg-server/Xi/xiallowev.c2
-rw-r--r--xorg-server/Xi/xichangecursor.c2
-rw-r--r--xorg-server/Xi/xichangehierarchy.c35
-rw-r--r--xorg-server/Xi/xigetclientpointer.c1
-rw-r--r--xorg-server/Xi/xigrabdev.c9
-rw-r--r--xorg-server/Xi/xipassivegrab.c12
-rw-r--r--xorg-server/Xi/xiproperty.c14
-rw-r--r--xorg-server/Xi/xiquerydevice.c1
-rw-r--r--xorg-server/Xi/xiquerypointer.c2
-rw-r--r--xorg-server/Xi/xiselectev.c8
-rw-r--r--xorg-server/Xi/xisetclientpointer.c3
-rw-r--r--xorg-server/Xi/xisetdevfocus.c4
-rw-r--r--xorg-server/Xi/xiwarppointer.c2
-rw-r--r--xorg-server/config/udev.c37
-rw-r--r--xorg-server/configure.ac9
-rw-r--r--xorg-server/dbe/dbe.c17
-rw-r--r--xorg-server/devbook.am10
-rw-r--r--xorg-server/dix/Xserver.d5
-rwxr-xr-xxorg-server/dix/dispatch.c8
-rw-r--r--xorg-server/dix/events.c8
-rw-r--r--xorg-server/dix/getevents.c13
-rw-r--r--xorg-server/dix/region.c20
-rw-r--r--xorg-server/dix/resource.c5
-rw-r--r--xorg-server/doc/Makefile.am2
-rw-r--r--xorg-server/doc/filter-xmlto.sh21
-rw-r--r--xorg-server/dri3/dri3_request.c6
-rw-r--r--xorg-server/glamor/glamor.c57
-rw-r--r--xorg-server/glamor/glamor.h4
-rw-r--r--xorg-server/glamor/glamor_egl.c89
-rw-r--r--xorg-server/glamor/glamor_egl_stubs.c2
-rw-r--r--xorg-server/glamor/glamor_fbo.c4
-rw-r--r--xorg-server/glamor/glamor_priv.h3
-rw-r--r--xorg-server/glamor/glamor_xv.c26
-rw-r--r--xorg-server/glx/clientinfo.c20
-rw-r--r--xorg-server/glx/dispatch.h1652
-rw-r--r--xorg-server/glx/glfunctions.h68
-rw-r--r--xorg-server/glx/glprocs.h2248
-rwxr-xr-x[-rw-r--r--]xorg-server/glx/glxcmds.c167
-rw-r--r--xorg-server/glx/glxcmdsswap.c4
-rwxr-xr-xxorg-server/glx/glxext.c8
-rw-r--r--xorg-server/glx/glxext.h1
-rw-r--r--xorg-server/glx/glxserver.h43
-rw-r--r--xorg-server/glx/indirect_dispatch.h24
-rw-r--r--xorg-server/glx/indirect_program.c2
-rwxr-xr-x[-rw-r--r--]xorg-server/glx/indirect_reqsize.c154
-rwxr-xr-x[-rw-r--r--]xorg-server/glx/indirect_reqsize.h148
-rw-r--r--xorg-server/glx/indirect_size_get.c1
-rw-r--r--xorg-server/glx/indirect_texture_compression.c4
-rw-r--r--xorg-server/glx/indirect_util.c9
-rw-r--r--xorg-server/glx/remap_helper.h4835
-rw-r--r--xorg-server/glx/rensize.c114
-rw-r--r--xorg-server/glx/single2.c23
-rw-r--r--xorg-server/glx/single2swap.c19
-rw-r--r--xorg-server/glx/singlepix.c60
-rw-r--r--xorg-server/glx/singlepixswap.c50
-rw-r--r--xorg-server/glx/swap_interval.c2
-rw-r--r--xorg-server/glx/unpack.h3
-rw-r--r--xorg-server/hw/dmx/config/dmxparse.h3
-rw-r--r--xorg-server/hw/dmx/config/dmxprint.c20
-rw-r--r--xorg-server/hw/dmx/dmx.c1
-rw-r--r--xorg-server/hw/dmx/dmxcb.c3
-rw-r--r--xorg-server/hw/dmx/dmxfont.h2
-rw-r--r--xorg-server/hw/dmx/dmxgc.c4
-rw-r--r--xorg-server/hw/dmx/dmxgc.h4
-rw-r--r--xorg-server/hw/dmx/dmxinit.c42
-rw-r--r--xorg-server/hw/dmx/dmxpict.c1
-rw-r--r--xorg-server/hw/dmx/dmxprop.c6
-rw-r--r--xorg-server/hw/dmx/dmxscrinit.c1
-rw-r--r--xorg-server/hw/dmx/dmxwindow.c4
-rw-r--r--xorg-server/hw/dmx/glxProxy/compsize.h7
-rw-r--r--xorg-server/hw/dmx/glxProxy/g_disptab.h21
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxcmds.c7
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxcmds.h6
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxcmdsswap.c2
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxext.h1
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxscreens.c6
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxscreens.h2
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxserver.h8
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxsingle.c6
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxsingle.h4
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxswap.c4
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxvendor.c6
-rw-r--r--xorg-server/hw/dmx/input/dmxinputinit.c10
-rw-r--r--xorg-server/hw/kdrive/ephyr/ephyr.c10
-rw-r--r--xorg-server/hw/kdrive/ephyr/ephyr.h1
-rwxr-xr-xxorg-server/hw/kdrive/ephyr/hostx.c11
-rw-r--r--xorg-server/hw/kdrive/ephyr/hostx.h2
-rw-r--r--xorg-server/hw/xfree86/Makefile.am2
-rw-r--r--xorg-server/hw/xfree86/Xorg.sh.in4
-rw-r--r--xorg-server/hw/xfree86/common/xf86AutoConfig.c1
-rw-r--r--xorg-server/hw/xfree86/dri2/dri2.c9
-rw-r--r--xorg-server/hw/xfree86/dri2/dri2ext.c3
-rw-r--r--xorg-server/hw/xfree86/drivers/modesetting/Makefile.am3
-rw-r--r--xorg-server/hw/xfree86/drivers/modesetting/dri2.c2
-rw-r--r--xorg-server/hw/xfree86/drivers/modesetting/driver.c106
-rw-r--r--xorg-server/hw/xfree86/drivers/modesetting/driver.h15
-rw-r--r--xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.c487
-rw-r--r--xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.h37
-rw-r--r--xorg-server/hw/xfree86/drivers/modesetting/dumb_bo.c134
-rw-r--r--xorg-server/hw/xfree86/drivers/modesetting/dumb_bo.h45
-rw-r--r--xorg-server/hw/xfree86/drivers/modesetting/present.c228
-rw-r--r--xorg-server/hw/xfree86/drivers/modesetting/vblank.c37
-rw-r--r--xorg-server/hw/xfree86/man/Xorg.wrap.man2
-rw-r--r--xorg-server/hw/xfree86/os-support/solaris/sun_init.c33
-rw-r--r--xorg-server/hw/xfree86/os-support/xf86_OSlib.h5
-rw-r--r--xorg-server/hw/xfree86/xorg-wrapper.c10
-rw-r--r--xorg-server/hw/xnest/Keyboard.c9
-rw-r--r--xorg-server/hw/xwayland/Makefile.am1
-rw-r--r--xorg-server/hw/xwayland/xwayland-glamor.c6
-rw-r--r--xorg-server/hw/xwayland/xwayland-input.c7
-rw-r--r--xorg-server/hw/xwayland/xwayland.c2
-rwxr-xr-xxorg-server/hw/xwin/InitOutput.c4
-rw-r--r--xorg-server/hw/xwin/XWin.rc1
-rw-r--r--xorg-server/hw/xwin/man/XWin.man6
-rwxr-xr-xxorg-server/hw/xwin/winclipboard/internal.h38
-rwxr-xr-xxorg-server/hw/xwin/winclipboard/thread.c124
-rw-r--r--xorg-server/hw/xwin/winclipboard/winclipboard.h4
-rwxr-xr-xxorg-server/hw/xwin/winclipboard/wndproc.c245
-rwxr-xr-xxorg-server/hw/xwin/winclipboard/xevents.c426
-rw-r--r--xorg-server/hw/xwin/winclipboard/xwinclip.c7
-rw-r--r--xorg-server/hw/xwin/winclipboard/xwinclip.man3
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winclipboardwrappers.c7
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winprocarg.c27
-rw-r--r--xorg-server/hw/xwin/winresource.h1
-rw-r--r--xorg-server/hw/xwin/wintrayicon.c19
-rwxr-xr-xxorg-server/hw/xwin/winwndproc.c6
-rw-r--r--xorg-server/include/Makefile.am1
-rwxr-xr-xxorg-server/include/dix.h7
-rw-r--r--xorg-server/include/probes.h41
-rw-r--r--xorg-server/include/regionstr.h10
-rw-r--r--xorg-server/man/Xserver.man10
-rw-r--r--xorg-server/mi/mipointer.c4
-rw-r--r--xorg-server/os/WaitFor.c41
-rw-r--r--xorg-server/os/access.c6
-rwxr-xr-xxorg-server/os/connection.c12
-rw-r--r--xorg-server/os/io.c7
-rw-r--r--xorg-server/os/log.c7
-rw-r--r--xorg-server/os/osinit.c6
-rw-r--r--xorg-server/os/rpcauth.c4
-rw-r--r--xorg-server/os/xsha1.c25
-rw-r--r--xorg-server/present/present.c28
-rw-r--r--xorg-server/present/present_request.c6
-rw-r--r--xorg-server/randr/rroutput.c7
-rw-r--r--xorg-server/randr/rrscreen.c22
-rw-r--r--xorg-server/randr/rrsdispatch.c4
-rw-r--r--xorg-server/randr/rrxinerama.c12
-rw-r--r--xorg-server/render/picture.c45
-rwxr-xr-x[-rw-r--r--]xorg-server/render/render.c20
-rw-r--r--xorg-server/test/Makefile.am2
-rw-r--r--xorg-server/test/misc.c37
-rw-r--r--xorg-server/test/xi1/Makefile.am34
-rw-r--r--xorg-server/test/xi1/protocol-xchangedevicecontrol.c122
-rw-r--r--xorg-server/test/xi2/protocol-xigetclientpointer.c5
-rw-r--r--xorg-server/test/xi2/protocol-xipassivegrabdevice.c8
-rw-r--r--xorg-server/test/xi2/protocol-xiquerypointer.c4
-rw-r--r--xorg-server/test/xi2/protocol-xiwarppointer.c3
-rw-r--r--xorg-server/xfixes/select.c1
-rw-r--r--xorg-server/xkb/xkb.c100
-rw-r--r--xorg-server/xkeyboard-config/NEWS2
-rw-r--r--xorg-server/xkeyboard-config/configure.ac2
-rw-r--r--xorg-server/xkeyboard-config/po/ca.po941
-rw-r--r--xorg-server/xkeyboard-config/po/cs.po939
-rw-r--r--xorg-server/xkeyboard-config/po/da.po958
-rw-r--r--xorg-server/xkeyboard-config/po/de.po941
-rw-r--r--xorg-server/xkeyboard-config/po/eo.po1171
-rw-r--r--xorg-server/xkeyboard-config/po/fr.po941
-rw-r--r--xorg-server/xkeyboard-config/po/gl.po1171
-rw-r--r--xorg-server/xkeyboard-config/po/hu.po949
-rw-r--r--xorg-server/xkeyboard-config/po/ko.po936
-rw-r--r--xorg-server/xkeyboard-config/po/lt.po1766
-rw-r--r--xorg-server/xkeyboard-config/po/nl.po965
-rw-r--r--xorg-server/xkeyboard-config/po/pl.po936
-rw-r--r--xorg-server/xkeyboard-config/po/ru.po1167
-rw-r--r--xorg-server/xkeyboard-config/po/sv.po5011
-rw-r--r--xorg-server/xkeyboard-config/po/tr.po5509
-rw-r--r--xorg-server/xkeyboard-config/po/vi.po1314
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in10
-rw-r--r--xorg-server/xkeyboard-config/rules/base.o_s.part2
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in34
-rw-r--r--xorg-server/xkeyboard-config/symbols/ara51
-rw-r--r--xorg-server/xkeyboard-config/symbols/ch1
-rw-r--r--xorg-server/xkeyboard-config/symbols/de34
-rw-r--r--xorg-server/xkeyboard-config/symbols/fi1
-rw-r--r--xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp2
-rw-r--r--xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us2
-rw-r--r--xorg-server/xkeyboard-config/symbols/il2
-rw-r--r--xorg-server/xkeyboard-config/symbols/kr48
-rw-r--r--xorg-server/xkeyboard-config/symbols/ru9
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/kr28
195 files changed, 22797 insertions, 16137 deletions
diff --git a/xorg-server/Xext/xcmisc.c b/xorg-server/Xext/xcmisc.c
index a48f61282..ddbae0d31 100644
--- a/xorg-server/Xext/xcmisc.c
+++ b/xorg-server/Xext/xcmisc.c
@@ -163,6 +163,7 @@ static int
SProcXCMiscGetXIDList(ClientPtr client)
{
REQUEST(xXCMiscGetXIDListReq);
+ REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
swaps(&stuff->length);
swapl(&stuff->count);
diff --git a/xorg-server/Xext/xvdisp.c b/xorg-server/Xext/xvdisp.c
index 86f982ae2..c2d0fc9c1 100644
--- a/xorg-server/Xext/xvdisp.c
+++ b/xorg-server/Xext/xvdisp.c
@@ -1121,6 +1121,7 @@ static int
SProcXvQueryExtension(ClientPtr client)
{
REQUEST(xvQueryExtensionReq);
+ REQUEST_SIZE_MATCH(xvQueryExtensionReq);
swaps(&stuff->length);
return XvProcVector[xv_QueryExtension] (client);
}
@@ -1129,6 +1130,7 @@ static int
SProcXvQueryAdaptors(ClientPtr client)
{
REQUEST(xvQueryAdaptorsReq);
+ REQUEST_SIZE_MATCH(xvQueryAdaptorsReq);
swaps(&stuff->length);
swapl(&stuff->window);
return XvProcVector[xv_QueryAdaptors] (client);
@@ -1138,6 +1140,7 @@ static int
SProcXvQueryEncodings(ClientPtr client)
{
REQUEST(xvQueryEncodingsReq);
+ REQUEST_SIZE_MATCH(xvQueryEncodingsReq);
swaps(&stuff->length);
swapl(&stuff->port);
return XvProcVector[xv_QueryEncodings] (client);
@@ -1147,6 +1150,7 @@ static int
SProcXvGrabPort(ClientPtr client)
{
REQUEST(xvGrabPortReq);
+ REQUEST_SIZE_MATCH(xvGrabPortReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->time);
@@ -1157,6 +1161,7 @@ static int
SProcXvUngrabPort(ClientPtr client)
{
REQUEST(xvUngrabPortReq);
+ REQUEST_SIZE_MATCH(xvUngrabPortReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->time);
@@ -1167,6 +1172,7 @@ static int
SProcXvPutVideo(ClientPtr client)
{
REQUEST(xvPutVideoReq);
+ REQUEST_SIZE_MATCH(xvPutVideoReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->drawable);
@@ -1186,6 +1192,7 @@ static int
SProcXvPutStill(ClientPtr client)
{
REQUEST(xvPutStillReq);
+ REQUEST_SIZE_MATCH(xvPutStillReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->drawable);
@@ -1205,6 +1212,7 @@ static int
SProcXvGetVideo(ClientPtr client)
{
REQUEST(xvGetVideoReq);
+ REQUEST_SIZE_MATCH(xvGetVideoReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->drawable);
@@ -1224,6 +1232,7 @@ static int
SProcXvGetStill(ClientPtr client)
{
REQUEST(xvGetStillReq);
+ REQUEST_SIZE_MATCH(xvGetStillReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->drawable);
@@ -1243,6 +1252,7 @@ static int
SProcXvPutImage(ClientPtr client)
{
REQUEST(xvPutImageReq);
+ REQUEST_AT_LEAST_SIZE(xvPutImageReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->drawable);
@@ -1266,6 +1276,7 @@ static int
SProcXvShmPutImage(ClientPtr client)
{
REQUEST(xvShmPutImageReq);
+ REQUEST_SIZE_MATCH(xvShmPutImageReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->drawable);
@@ -1293,6 +1304,7 @@ static int
SProcXvSelectVideoNotify(ClientPtr client)
{
REQUEST(xvSelectVideoNotifyReq);
+ REQUEST_SIZE_MATCH(xvSelectVideoNotifyReq);
swaps(&stuff->length);
swapl(&stuff->drawable);
return XvProcVector[xv_SelectVideoNotify] (client);
@@ -1302,6 +1314,7 @@ static int
SProcXvSelectPortNotify(ClientPtr client)
{
REQUEST(xvSelectPortNotifyReq);
+ REQUEST_SIZE_MATCH(xvSelectPortNotifyReq);
swaps(&stuff->length);
swapl(&stuff->port);
return XvProcVector[xv_SelectPortNotify] (client);
@@ -1311,6 +1324,7 @@ static int
SProcXvStopVideo(ClientPtr client)
{
REQUEST(xvStopVideoReq);
+ REQUEST_SIZE_MATCH(xvStopVideoReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->drawable);
@@ -1321,6 +1335,7 @@ static int
SProcXvSetPortAttribute(ClientPtr client)
{
REQUEST(xvSetPortAttributeReq);
+ REQUEST_SIZE_MATCH(xvSetPortAttributeReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->attribute);
@@ -1332,6 +1347,7 @@ static int
SProcXvGetPortAttribute(ClientPtr client)
{
REQUEST(xvGetPortAttributeReq);
+ REQUEST_SIZE_MATCH(xvGetPortAttributeReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->attribute);
@@ -1342,6 +1358,7 @@ static int
SProcXvQueryBestSize(ClientPtr client)
{
REQUEST(xvQueryBestSizeReq);
+ REQUEST_SIZE_MATCH(xvQueryBestSizeReq);
swaps(&stuff->length);
swapl(&stuff->port);
swaps(&stuff->vid_w);
@@ -1355,6 +1372,7 @@ static int
SProcXvQueryPortAttributes(ClientPtr client)
{
REQUEST(xvQueryPortAttributesReq);
+ REQUEST_SIZE_MATCH(xvQueryPortAttributesReq);
swaps(&stuff->length);
swapl(&stuff->port);
return XvProcVector[xv_QueryPortAttributes] (client);
@@ -1364,6 +1382,7 @@ static int
SProcXvQueryImageAttributes(ClientPtr client)
{
REQUEST(xvQueryImageAttributesReq);
+ REQUEST_SIZE_MATCH(xvQueryImageAttributesReq);
swaps(&stuff->length);
swapl(&stuff->port);
swapl(&stuff->id);
@@ -1376,6 +1395,7 @@ static int
SProcXvListImageFormats(ClientPtr client)
{
REQUEST(xvListImageFormatsReq);
+ REQUEST_SIZE_MATCH(xvListImageFormatsReq);
swaps(&stuff->length);
swapl(&stuff->port);
return XvProcVector[xv_ListImageFormats] (client);
diff --git a/xorg-server/Xi/chgdctl.c b/xorg-server/Xi/chgdctl.c
index 106b9aaed..cb7ad1ebc 100644
--- a/xorg-server/Xi/chgdctl.c
+++ b/xorg-server/Xi/chgdctl.c
@@ -78,7 +78,7 @@ SProcXChangeDeviceControl(ClientPtr client)
REQUEST(xChangeDeviceControlReq);
swaps(&stuff->length);
- REQUEST_AT_LEAST_SIZE(xChangeDeviceControlReq);
+ REQUEST_AT_LEAST_EXTRA_SIZE(xChangeDeviceControlReq, sizeof(xDeviceCtl));
swaps(&stuff->control);
ctl = (xDeviceCtl *) &stuff[1];
swaps(&ctl->control);
@@ -115,7 +115,7 @@ ProcXChangeDeviceControl(ClientPtr client)
xDeviceEnableCtl *e;
REQUEST(xChangeDeviceControlReq);
- REQUEST_AT_LEAST_SIZE(xChangeDeviceControlReq);
+ REQUEST_AT_LEAST_EXTRA_SIZE(xChangeDeviceControlReq, sizeof(xDeviceCtl));
len = stuff->length - bytes_to_int32(sizeof(xChangeDeviceControlReq));
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess);
@@ -191,6 +191,10 @@ ProcXChangeDeviceControl(ClientPtr client)
break;
case DEVICE_ENABLE:
e = (xDeviceEnableCtl *) &stuff[1];
+ if ((len != bytes_to_int32(sizeof(xDeviceEnableCtl)))) {
+ ret = BadLength;
+ goto out;
+ }
if (IsXTestDevice(dev, NULL))
status = !Success;
diff --git a/xorg-server/Xi/chgfctl.c b/xorg-server/Xi/chgfctl.c
index 6dcf60c66..224c2ba0a 100644
--- a/xorg-server/Xi/chgfctl.c
+++ b/xorg-server/Xi/chgfctl.c
@@ -467,6 +467,8 @@ ProcXChangeFeedbackControl(ClientPtr client)
xStringFeedbackCtl *f = ((xStringFeedbackCtl *) &stuff[1]);
if (client->swapped) {
+ if (len < bytes_to_int32(sizeof(xStringFeedbackCtl)))
+ return BadLength;
swaps(&f->num_keysyms);
}
if (len !=
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 551db92b4..abf816847 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -1405,7 +1405,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
if (grab->ownerEvents) {
WindowPtr focus = NullWindow;
- WindowPtr sprite_win = dev->spriteInfo->sprite->win;
+ WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite);
deliveries = DeliverDeviceEvents(sprite_win, ptrev, grab, focus, dev);
}
@@ -1431,8 +1431,9 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
}
else {
GrabPtr devgrab = dev->deviceGrab.grab;
+ WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite);
- DeliverDeviceEvents(win, ptrev, grab, win, dev);
+ DeliverDeviceEvents(sprite_win, ptrev, grab, win, dev);
/* FIXME: bad hack
* Implicit passive grab activated in response to this event. Store
* the event.
diff --git a/xorg-server/Xi/sendexev.c b/xorg-server/Xi/sendexev.c
index 3c213864b..183f88dae 100644
--- a/xorg-server/Xi/sendexev.c
+++ b/xorg-server/Xi/sendexev.c
@@ -135,6 +135,9 @@ ProcXSendExtensionEvent(ClientPtr client)
if (ret != Success)
return ret;
+ if (stuff->num_events == 0)
+ return ret;
+
/* The client's event type must be one defined by an extension. */
first = ((xEvent *) &stuff[1]);
diff --git a/xorg-server/Xi/xiallowev.c b/xorg-server/Xi/xiallowev.c
index ebef23344..ca263ef1f 100644
--- a/xorg-server/Xi/xiallowev.c
+++ b/xorg-server/Xi/xiallowev.c
@@ -48,6 +48,7 @@ int
SProcXIAllowEvents(ClientPtr client)
{
REQUEST(xXIAllowEventsReq);
+ REQUEST_AT_LEAST_SIZE(xXIAllowEventsReq);
swaps(&stuff->length);
swaps(&stuff->deviceid);
@@ -55,6 +56,7 @@ SProcXIAllowEvents(ClientPtr client)
if (stuff->length > 3) {
xXI2_2AllowEventsReq *req_xi22 = (xXI2_2AllowEventsReq *) stuff;
+ REQUEST_AT_LEAST_SIZE(xXI2_2AllowEventsReq);
swapl(&req_xi22->touchid);
swapl(&req_xi22->grab_window);
}
diff --git a/xorg-server/Xi/xichangecursor.c b/xorg-server/Xi/xichangecursor.c
index 7a1bb7a0d..8e6255b6e 100644
--- a/xorg-server/Xi/xichangecursor.c
+++ b/xorg-server/Xi/xichangecursor.c
@@ -57,11 +57,11 @@ int
SProcXIChangeCursor(ClientPtr client)
{
REQUEST(xXIChangeCursorReq);
+ REQUEST_SIZE_MATCH(xXIChangeCursorReq);
swaps(&stuff->length);
swapl(&stuff->win);
swapl(&stuff->cursor);
swaps(&stuff->deviceid);
- REQUEST_SIZE_MATCH(xXIChangeCursorReq);
return (ProcXIChangeCursor(client));
}
diff --git a/xorg-server/Xi/xichangehierarchy.c b/xorg-server/Xi/xichangehierarchy.c
index 9e36354d1..27324452d 100644
--- a/xorg-server/Xi/xichangehierarchy.c
+++ b/xorg-server/Xi/xichangehierarchy.c
@@ -411,7 +411,7 @@ int
ProcXIChangeHierarchy(ClientPtr client)
{
xXIAnyHierarchyChangeInfo *any;
- int required_len = sizeof(xXIChangeHierarchyReq);
+ size_t len; /* length of data remaining in request */
int rc = Success;
int flags[MAXDEVICES] = { 0 };
@@ -421,21 +421,46 @@ ProcXIChangeHierarchy(ClientPtr client)
if (!stuff->num_changes)
return rc;
+ if (stuff->length > (INT_MAX >> 2))
+ return BadAlloc;
+ len = (stuff->length << 2) - sizeof(xXIAnyHierarchyChangeInfo);
+
any = (xXIAnyHierarchyChangeInfo *) &stuff[1];
while (stuff->num_changes--) {
+ if (len < sizeof(xXIAnyHierarchyChangeInfo)) {
+ rc = BadLength;
+ goto unwind;
+ }
+
SWAPIF(swaps(&any->type));
SWAPIF(swaps(&any->length));
- required_len += any->length;
- if ((stuff->length * 4) < required_len)
+ if ((any->length > (INT_MAX >> 2)) || (len < (any->length << 2)))
return BadLength;
+#define CHANGE_SIZE_MATCH(type) \
+ do { \
+ if ((len < sizeof(type)) || (any->length != (sizeof(type) >> 2))) { \
+ rc = BadLength; \
+ goto unwind; \
+ } \
+ } while(0)
+
switch (any->type) {
case XIAddMaster:
{
xXIAddMasterInfo *c = (xXIAddMasterInfo *) any;
+ /* Variable length, due to appended name string */
+ if (len < sizeof(xXIAddMasterInfo)) {
+ rc = BadLength;
+ goto unwind;
+ }
SWAPIF(swaps(&c->name_len));
+ if (c->name_len > (len - sizeof(xXIAddMasterInfo))) {
+ rc = BadLength;
+ goto unwind;
+ }
rc = add_master(client, c, flags);
if (rc != Success)
@@ -446,6 +471,7 @@ ProcXIChangeHierarchy(ClientPtr client)
{
xXIRemoveMasterInfo *r = (xXIRemoveMasterInfo *) any;
+ CHANGE_SIZE_MATCH(xXIRemoveMasterInfo);
rc = remove_master(client, r, flags);
if (rc != Success)
goto unwind;
@@ -455,6 +481,7 @@ ProcXIChangeHierarchy(ClientPtr client)
{
xXIDetachSlaveInfo *c = (xXIDetachSlaveInfo *) any;
+ CHANGE_SIZE_MATCH(xXIDetachSlaveInfo);
rc = detach_slave(client, c, flags);
if (rc != Success)
goto unwind;
@@ -464,6 +491,7 @@ ProcXIChangeHierarchy(ClientPtr client)
{
xXIAttachSlaveInfo *c = (xXIAttachSlaveInfo *) any;
+ CHANGE_SIZE_MATCH(xXIAttachSlaveInfo);
rc = attach_slave(client, c, flags);
if (rc != Success)
goto unwind;
@@ -471,6 +499,7 @@ ProcXIChangeHierarchy(ClientPtr client)
break;
}
+ len -= any->length * 4;
any = (xXIAnyHierarchyChangeInfo *) ((char *) any + any->length * 4);
}
diff --git a/xorg-server/Xi/xigetclientpointer.c b/xorg-server/Xi/xigetclientpointer.c
index 6ab2867f7..9d7feca4c 100644
--- a/xorg-server/Xi/xigetclientpointer.c
+++ b/xorg-server/Xi/xigetclientpointer.c
@@ -50,6 +50,7 @@ int
SProcXIGetClientPointer(ClientPtr client)
{
REQUEST(xXIGetClientPointerReq);
+ REQUEST_SIZE_MATCH(xXIGetClientPointerReq);
swaps(&stuff->length);
swapl(&stuff->win);
diff --git a/xorg-server/Xi/xigrabdev.c b/xorg-server/Xi/xigrabdev.c
index 086e275d8..6be9971c9 100644
--- a/xorg-server/Xi/xigrabdev.c
+++ b/xorg-server/Xi/xigrabdev.c
@@ -47,6 +47,11 @@ int
SProcXIGrabDevice(ClientPtr client)
{
REQUEST(xXIGrabDeviceReq);
+ /*
+ * Check here for at least the length of the struct we swap, then
+ * let ProcXIGrabDevice check the full size after we swap mask_len.
+ */
+ REQUEST_AT_LEAST_SIZE(xXIGrabDeviceReq);
swaps(&stuff->length);
swaps(&stuff->deviceid);
@@ -71,7 +76,7 @@ ProcXIGrabDevice(ClientPtr client)
unsigned int pointer_mode;
REQUEST(xXIGrabDeviceReq);
- REQUEST_AT_LEAST_SIZE(xXIGrabDeviceReq);
+ REQUEST_FIXED_SIZE(xXIGrabDeviceReq, ((size_t) stuff->mask_len) * 4);
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
if (ret != Success)
@@ -130,6 +135,7 @@ int
SProcXIUngrabDevice(ClientPtr client)
{
REQUEST(xXIUngrabDeviceReq);
+ REQUEST_SIZE_MATCH(xXIUngrabDeviceReq);
swaps(&stuff->length);
swaps(&stuff->deviceid);
@@ -147,6 +153,7 @@ ProcXIUngrabDevice(ClientPtr client)
TimeStamp time;
REQUEST(xXIUngrabDeviceReq);
+ REQUEST_SIZE_MATCH(xXIUngrabDeviceReq);
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
if (ret != Success)
diff --git a/xorg-server/Xi/xipassivegrab.c b/xorg-server/Xi/xipassivegrab.c
index ca69050b2..3f6268f69 100644
--- a/xorg-server/Xi/xipassivegrab.c
+++ b/xorg-server/Xi/xipassivegrab.c
@@ -53,6 +53,7 @@ SProcXIPassiveGrabDevice(ClientPtr client)
uint32_t *mods;
REQUEST(xXIPassiveGrabDeviceReq);
+ REQUEST_AT_LEAST_SIZE(xXIPassiveGrabDeviceReq);
swaps(&stuff->length);
swaps(&stuff->deviceid);
@@ -63,6 +64,8 @@ SProcXIPassiveGrabDevice(ClientPtr client)
swaps(&stuff->mask_len);
swaps(&stuff->num_modifiers);
+ REQUEST_FIXED_SIZE(xXIPassiveGrabDeviceReq,
+ ((uint32_t) stuff->mask_len + stuff->num_modifiers) *4);
mods = (uint32_t *) &stuff[1] + stuff->mask_len;
for (i = 0; i < stuff->num_modifiers; i++, mods++) {
@@ -86,7 +89,8 @@ ProcXIPassiveGrabDevice(ClientPtr client)
int mask_len;
REQUEST(xXIPassiveGrabDeviceReq);
- REQUEST_AT_LEAST_SIZE(xXIPassiveGrabDeviceReq);
+ REQUEST_FIXED_SIZE(xXIPassiveGrabDeviceReq,
+ ((uint32_t) stuff->mask_len + stuff->num_modifiers) * 4);
rep.repType = X_Reply;
rep.RepType = X_XIPassiveGrabDevice;
@@ -252,6 +256,7 @@ SProcXIPassiveUngrabDevice(ClientPtr client)
uint32_t *modifiers;
REQUEST(xXIPassiveUngrabDeviceReq);
+ REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq);
swaps(&stuff->length);
swapl(&stuff->grab_window);
@@ -259,6 +264,8 @@ SProcXIPassiveUngrabDevice(ClientPtr client)
swapl(&stuff->detail);
swaps(&stuff->num_modifiers);
+ REQUEST_FIXED_SIZE(xXIPassiveUngrabDeviceReq,
+ ((uint32_t) stuff->num_modifiers) << 2);
modifiers = (uint32_t *) &stuff[1];
for (i = 0; i < stuff->num_modifiers; i++, modifiers++)
@@ -277,7 +284,8 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
int i, rc;
REQUEST(xXIPassiveUngrabDeviceReq);
- REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq);
+ REQUEST_FIXED_SIZE(xXIPassiveUngrabDeviceReq,
+ ((uint32_t) stuff->num_modifiers) << 2);
if (stuff->deviceid == XIAllDevices)
dev = inputInfo.all_devices;
diff --git a/xorg-server/Xi/xiproperty.c b/xorg-server/Xi/xiproperty.c
index 18936c587..13c478e65 100644
--- a/xorg-server/Xi/xiproperty.c
+++ b/xorg-server/Xi/xiproperty.c
@@ -1011,10 +1011,9 @@ int
SProcXListDeviceProperties(ClientPtr client)
{
REQUEST(xListDevicePropertiesReq);
+ REQUEST_SIZE_MATCH(xListDevicePropertiesReq);
swaps(&stuff->length);
-
- REQUEST_SIZE_MATCH(xListDevicePropertiesReq);
return (ProcXListDeviceProperties(client));
}
@@ -1035,10 +1034,10 @@ int
SProcXDeleteDeviceProperty(ClientPtr client)
{
REQUEST(xDeleteDevicePropertyReq);
+ REQUEST_SIZE_MATCH(xDeleteDevicePropertyReq);
swaps(&stuff->length);
swapl(&stuff->property);
- REQUEST_SIZE_MATCH(xDeleteDevicePropertyReq);
return (ProcXDeleteDeviceProperty(client));
}
@@ -1046,13 +1045,13 @@ int
SProcXGetDeviceProperty(ClientPtr client)
{
REQUEST(xGetDevicePropertyReq);
+ REQUEST_SIZE_MATCH(xGetDevicePropertyReq);
swaps(&stuff->length);
swapl(&stuff->property);
swapl(&stuff->type);
swapl(&stuff->longOffset);
swapl(&stuff->longLength);
- REQUEST_SIZE_MATCH(xGetDevicePropertyReq);
return (ProcXGetDeviceProperty(client));
}
@@ -1249,11 +1248,10 @@ int
SProcXIListProperties(ClientPtr client)
{
REQUEST(xXIListPropertiesReq);
+ REQUEST_SIZE_MATCH(xXIListPropertiesReq);
swaps(&stuff->length);
swaps(&stuff->deviceid);
-
- REQUEST_SIZE_MATCH(xXIListPropertiesReq);
return (ProcXIListProperties(client));
}
@@ -1275,11 +1273,11 @@ int
SProcXIDeleteProperty(ClientPtr client)
{
REQUEST(xXIDeletePropertyReq);
+ REQUEST_SIZE_MATCH(xXIDeletePropertyReq);
swaps(&stuff->length);
swaps(&stuff->deviceid);
swapl(&stuff->property);
- REQUEST_SIZE_MATCH(xXIDeletePropertyReq);
return (ProcXIDeleteProperty(client));
}
@@ -1287,6 +1285,7 @@ int
SProcXIGetProperty(ClientPtr client)
{
REQUEST(xXIGetPropertyReq);
+ REQUEST_SIZE_MATCH(xXIGetPropertyReq);
swaps(&stuff->length);
swaps(&stuff->deviceid);
@@ -1294,7 +1293,6 @@ SProcXIGetProperty(ClientPtr client)
swapl(&stuff->type);
swapl(&stuff->offset);
swapl(&stuff->len);
- REQUEST_SIZE_MATCH(xXIGetPropertyReq);
return (ProcXIGetProperty(client));
}
diff --git a/xorg-server/Xi/xiquerydevice.c b/xorg-server/Xi/xiquerydevice.c
index 1d1090046..186e21bf6 100644
--- a/xorg-server/Xi/xiquerydevice.c
+++ b/xorg-server/Xi/xiquerydevice.c
@@ -54,6 +54,7 @@ int
SProcXIQueryDevice(ClientPtr client)
{
REQUEST(xXIQueryDeviceReq);
+ REQUEST_SIZE_MATCH(xXIQueryDeviceReq);
swaps(&stuff->length);
swaps(&stuff->deviceid);
diff --git a/xorg-server/Xi/xiquerypointer.c b/xorg-server/Xi/xiquerypointer.c
index a87326181..014bffa7f 100644
--- a/xorg-server/Xi/xiquerypointer.c
+++ b/xorg-server/Xi/xiquerypointer.c
@@ -63,6 +63,8 @@ int
SProcXIQueryPointer(ClientPtr client)
{
REQUEST(xXIQueryPointerReq);
+ REQUEST_SIZE_MATCH(xXIQueryPointerReq);
+
swaps(&stuff->length);
swaps(&stuff->deviceid);
swapl(&stuff->win);
diff --git a/xorg-server/Xi/xiselectev.c b/xorg-server/Xi/xiselectev.c
index 8592747f6..701748eeb 100644
--- a/xorg-server/Xi/xiselectev.c
+++ b/xorg-server/Xi/xiselectev.c
@@ -114,6 +114,7 @@ int
SProcXISelectEvents(ClientPtr client)
{
int i;
+ int len;
xXIEventMask *evmask;
REQUEST(xXISelectEventsReq);
@@ -122,10 +123,17 @@ SProcXISelectEvents(ClientPtr client)
swapl(&stuff->win);
swaps(&stuff->num_masks);
+ len = stuff->length - bytes_to_int32(sizeof(xXISelectEventsReq));
evmask = (xXIEventMask *) &stuff[1];
for (i = 0; i < stuff->num_masks; i++) {
+ if (len < bytes_to_int32(sizeof(xXIEventMask)))
+ return BadLength;
+ len -= bytes_to_int32(sizeof(xXIEventMask));
swaps(&evmask->deviceid);
swaps(&evmask->mask_len);
+ if (len < evmask->mask_len)
+ return BadLength;
+ len -= evmask->mask_len;
evmask =
(xXIEventMask *) (((char *) &evmask[1]) + evmask->mask_len * 4);
}
diff --git a/xorg-server/Xi/xisetclientpointer.c b/xorg-server/Xi/xisetclientpointer.c
index 38ff51e86..24d4a5379 100644
--- a/xorg-server/Xi/xisetclientpointer.c
+++ b/xorg-server/Xi/xisetclientpointer.c
@@ -51,10 +51,11 @@ int
SProcXISetClientPointer(ClientPtr client)
{
REQUEST(xXISetClientPointerReq);
+ REQUEST_SIZE_MATCH(xXISetClientPointerReq);
+
swaps(&stuff->length);
swapl(&stuff->win);
swaps(&stuff->deviceid);
- REQUEST_SIZE_MATCH(xXISetClientPointerReq);
return (ProcXISetClientPointer(client));
}
diff --git a/xorg-server/Xi/xisetdevfocus.c b/xorg-server/Xi/xisetdevfocus.c
index aec822c6b..f3584d567 100644
--- a/xorg-server/Xi/xisetdevfocus.c
+++ b/xorg-server/Xi/xisetdevfocus.c
@@ -44,6 +44,8 @@ int
SProcXISetFocus(ClientPtr client)
{
REQUEST(xXISetFocusReq);
+ REQUEST_AT_LEAST_SIZE(xXISetFocusReq);
+
swaps(&stuff->length);
swaps(&stuff->deviceid);
swapl(&stuff->focus);
@@ -56,6 +58,8 @@ int
SProcXIGetFocus(ClientPtr client)
{
REQUEST(xXIGetFocusReq);
+ REQUEST_AT_LEAST_SIZE(xXIGetFocusReq);
+
swaps(&stuff->length);
swaps(&stuff->deviceid);
diff --git a/xorg-server/Xi/xiwarppointer.c b/xorg-server/Xi/xiwarppointer.c
index 3f051f759..780758a9e 100644
--- a/xorg-server/Xi/xiwarppointer.c
+++ b/xorg-server/Xi/xiwarppointer.c
@@ -56,6 +56,8 @@ int
SProcXIWarpPointer(ClientPtr client)
{
REQUEST(xXIWarpPointerReq);
+ REQUEST_SIZE_MATCH(xXIWarpPointerReq);
+
swaps(&stuff->length);
swapl(&stuff->src_win);
swapl(&stuff->dst_win);
diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c
index 1e4a9d7a6..28c265817 100644
--- a/xorg-server/config/udev.c
+++ b/xorg-server/config/udev.c
@@ -69,6 +69,24 @@ static const char *itoa(int i)
return itoa_buf;
}
+static Bool
+check_seat(struct udev_device *udev_device)
+{
+ const char *dev_seat;
+
+ dev_seat = udev_device_get_property_value(udev_device, "ID_SEAT");
+ if (!dev_seat)
+ dev_seat = "seat0";
+
+ if (SeatId && strcmp(dev_seat, SeatId))
+ return FALSE;
+
+ if (!SeatId && strcmp(dev_seat, "seat0"))
+ return FALSE;
+
+ return TRUE;
+}
+
static void
device_added(struct udev_device *udev_device)
{
@@ -83,7 +101,6 @@ device_added(struct udev_device *udev_device)
struct udev_list_entry *set, *entry;
struct udev_device *parent;
int rc;
- const char *dev_seat;
dev_t devnum;
path = udev_device_get_devnode(udev_device);
@@ -93,14 +110,7 @@ device_added(struct udev_device *udev_device)
if (!path || !syspath)
return;
- dev_seat = udev_device_get_property_value(udev_device, "ID_SEAT");
- if (!dev_seat)
- dev_seat = "seat0";
-
- if (SeatId && strcmp(dev_seat, SeatId))
- return;
-
- if (!SeatId && strcmp(dev_seat, "seat0"))
+ if (!check_seat(udev_device))
return;
devnum = udev_device_get_devnum(udev_device);
@@ -300,12 +310,11 @@ device_removed(struct udev_device *device)
const char *path = udev_device_get_devnode(device);
dev_t devnum = udev_device_get_devnum(device);
- if (strncmp(sysname,"card", 4) != 0)
- return;
- ErrorF("removing GPU device %s %s\n", syspath, path);
- if (!path)
+ if ((strncmp(sysname,"card", 4) != 0) || (path == NULL))
return;
+ LogMessage(X_INFO, "config/udev: removing GPU device %s %s\n",
+ syspath, path);
config_udev_odev_setup_attribs(path, syspath, major(devnum),
minor(devnum), DeleteGPUDeviceRequest);
/* Retry vtenter after a drm node removal */
@@ -506,6 +515,8 @@ config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback)
goto no_probe;
else if (strncmp(sysname, "card", 4) != 0)
goto no_probe;
+ else if (!check_seat(udev_device))
+ goto no_probe;
config_udev_odev_setup_attribs(path, syspath, major(devnum),
minor(devnum), probe_callback);
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 140e33e45..280c3692a 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.16.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2014-10-28"
-RELEASE_NAME="Chanterelle"
+AC_INIT([xorg-server], 1.17.99.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2015-02-02"
+RELEASE_NAME="Côte de veau"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
@@ -923,7 +923,7 @@ if test "x$SUID_WRAPPER" = xyes; then
PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
dnl This is a define so that if some platforms want to put the wrapper
dnl somewhere else this can be easily changed
- AC_DEFINE_DIR(SUID_WRAPPER_DIR, libexecdir, [Where to install Xorg.bin and Xorg.wrap])
+ AC_DEFINE_DIR(SUID_WRAPPER_DIR, libexecdir, [Where to install the Xorg binary and Xorg.wrap])
SETUID="no"
fi
AM_CONDITIONAL(SUID_WRAPPER, [test "x$SUID_WRAPPER" = xyes])
@@ -2621,6 +2621,7 @@ hw/kdrive/linux/Makefile
hw/kdrive/src/Makefile
hw/xwayland/Makefile
test/Makefile
+test/xi1/Makefile
test/xi2/Makefile
xserver.ent
xorg-server.pc
diff --git a/xorg-server/dbe/dbe.c b/xorg-server/dbe/dbe.c
index 475ba4c18..c19f4a47f 100644
--- a/xorg-server/dbe/dbe.c
+++ b/xorg-server/dbe/dbe.c
@@ -450,18 +450,21 @@ ProcDbeSwapBuffers(ClientPtr client)
DbeSwapInfoPtr swapInfo;
xDbeSwapInfo *dbeSwapInfo;
int error;
- register int i, j;
- int nStuff;
+ unsigned int i, j;
+ unsigned int nStuff;
+ int nStuff_i; /* DDX API requires int for nStuff */
REQUEST_AT_LEAST_SIZE(xDbeSwapBuffersReq);
nStuff = stuff->n; /* use local variable for performance. */
if (nStuff == 0) {
+ REQUEST_SIZE_MATCH(xDbeSwapBuffersReq);
return Success;
}
if (nStuff > UINT32_MAX / sizeof(DbeSwapInfoRec))
return BadAlloc;
+ REQUEST_FIXED_SIZE(xDbeSwapBuffersReq, nStuff * sizeof(xDbeSwapInfo));
/* Get to the swap info appended to the end of the request. */
dbeSwapInfo = (xDbeSwapInfo *) &stuff[1];
@@ -525,9 +528,10 @@ ProcDbeSwapBuffers(ClientPtr client)
* could deal with cross-screen synchronization.
*/
- while (nStuff > 0) {
+ nStuff_i = nStuff;
+ while (nStuff_i > 0) {
pDbeScreenPriv = DBE_SCREEN_PRIV_FROM_WINDOW(swapInfo[0].pWindow);
- error = (*pDbeScreenPriv->SwapBuffers) (client, &nStuff, swapInfo);
+ error = (*pDbeScreenPriv->SwapBuffers) (client, &nStuff_i, swapInfo);
if (error != Success) {
free(swapInfo);
return error;
@@ -912,13 +916,16 @@ static int
SProcDbeSwapBuffers(ClientPtr client)
{
REQUEST(xDbeSwapBuffersReq);
- register int i;
+ unsigned int i;
xDbeSwapInfo *pSwapInfo;
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xDbeSwapBuffersReq);
swapl(&stuff->n);
+ if (stuff->n > UINT32_MAX / sizeof(DbeSwapInfoRec))
+ return BadAlloc;
+ REQUEST_FIXED_SIZE(xDbeSwapBuffersReq, stuff->n * sizeof(xDbeSwapInfo));
if (stuff->n != 0) {
pSwapInfo = (xDbeSwapInfo *) stuff + 1;
diff --git a/xorg-server/devbook.am b/xorg-server/devbook.am
index 400b2ca55..edddc863d 100644
--- a/xorg-server/devbook.am
+++ b/xorg-server/devbook.am
@@ -20,6 +20,8 @@ noinst_DATA =
# DocBook/XML file with chapters, appendix and images it includes
dist_noinst_DATA = $(docbook) $(chapters)
+FILTER_XMLTO=$(SHELL) $(top_srcdir)/doc/filter-xmlto.sh $(XMLTO)
+
if HAVE_STYLESHEETS
XMLTO_HTML_FLAGS = \
@@ -29,12 +31,12 @@ XMLTO_HTML_FLAGS = \
noinst_DATA += $(docbook:.xml=.html)
%.html: %.xml $(chapters)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+ $(AM_V_GEN)$(FILTER_XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
if HAVE_XMLTO_TEXT
noinst_DATA += $(docbook:.xml=.txt)
%.txt: %.xml $(chapters)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+ $(AM_V_GEN)$(FILTER_XMLTO) $(XMLTO_HTML_FLAGS) txt $<
endif HAVE_XMLTO_TEXT
if HAVE_FOP
@@ -46,9 +48,9 @@ XMLTO_FO_FLAGS = \
noinst_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
%.pdf: %.xml $(chapters)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+ $(AM_V_GEN)$(FILTER_XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
%.ps: %.xml $(chapters)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+ $(AM_V_GEN)$(FILTER_XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
endif HAVE_FOP
endif HAVE_STYLESHEETS
diff --git a/xorg-server/dix/Xserver.d b/xorg-server/dix/Xserver.d
index 248d48e24..f4f229d84 100644
--- a/xorg-server/dix/Xserver.d
+++ b/xorg-server/dix/Xserver.d
@@ -31,6 +31,9 @@
#include <sys/types.h>
#endif
+typedef const uint8_t *const_uint8_p;
+typedef const double *const_double_p;
+
provider Xserver {
/* reqType, data, length, client id, request buffer */
probe request__start(string, uint8_t, uint16_t, int, void *);
@@ -49,7 +52,7 @@ provider Xserver {
/* client id, event type, event* */
probe send__event(int, uint8_t, void *);
/* deviceid, type, button/keycode/touchid, flags, nvalues, mask, values */
- probe input__event(int, int, uint32_t, uint32_t, int8_t, uint8_t*, double*);
+ probe input__event(int, int, uint32_t, uint32_t, int8_t, const_uint8_p, const_double_p);
};
#pragma D attributes Unstable/Unstable/Common provider Xserver provider
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index ff59ad237..45bd238ff 100755
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -135,10 +135,7 @@ int ProcInitialConnection();
#ifdef XSERVER_DTRACE
#include "registry.h"
-#include <sys/types.h>
-typedef const char *string;
-
-#include "Xserver-dtrace.h"
+#include "probes.h"
#endif
#define mskcnt ((MAXCLIENTS + 31) / 32)
@@ -2046,6 +2043,9 @@ ProcPutImage(ClientPtr client)
tmpImage = (char *) &stuff[1];
lengthProto = length;
+ if (stuff->height != 0 && lengthProto >= (INT32_MAX / stuff->height))
+ return BadLength;
+
if ((bytes_to_int32(lengthProto * stuff->height) +
bytes_to_int32(sizeof(xPutImageReq))) != client->req_len)
return BadLength;
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index e3f5e2372..60712f00c 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -125,13 +125,7 @@ Equipment Corporation.
#include <X11/extensions/XKBproto.h>
#include "xkbsrv.h"
#include "xace.h"
-
-#ifdef XSERVER_DTRACE
-#include <sys/types.h>
-typedef const char *string;
-
-#include "Xserver-dtrace.h"
-#endif
+#include "probes.h"
#include <X11/extensions/XIproto.h>
#include <X11/extensions/XI2proto.h>
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index 2c4287b01..5e6963fe4 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -68,12 +68,7 @@
#include "exevents.h"
#include "extnsionst.h"
#include "listdev.h" /* for sizing up DeviceClassesChangedEvent */
-
-#if XSERVER_DTRACE
-#include <sys/types.h>
-typedef const char *string;
-#include <Xserver-dtrace.h>
-#endif
+#include "probes.h"
#ifdef _MSC_VER
#include <math.h>
@@ -2060,7 +2055,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
event->root = scr->root->drawable.id;
- event_set_root_coordinates(event, screenx, screeny);
+ event_set_root_coordinates(event, screenx - scr->x, screeny - scr->y);
event->touchid = client_id;
event->flags = flags;
@@ -2098,8 +2093,8 @@ GetDixTouchEnd(InternalEvent *ievent, DeviceIntPtr dev, TouchPointInfoPtr ti,
/* Get screen event coordinates from the sprite. Is this really the best
* we can do? */
event_set_root_coordinates(event,
- dev->last.valuators[0],
- dev->last.valuators[1]);
+ dev->last.valuators[0] - scr->x,
+ dev->last.valuators[1] - scr->y);
event->touchid = ti->client_id;
event->flags = flags;
diff --git a/xorg-server/dix/region.c b/xorg-server/dix/region.c
index ce1014ef8..04e590170 100644
--- a/xorg-server/dix/region.c
+++ b/xorg-server/dix/region.c
@@ -169,7 +169,6 @@ Equipment Corporation.
((r1)->y1 <= (r2)->y1) && \
((r1)->y2 >= (r2)->y2) )
-#define xallocData(n) malloc(RegionSizeof(n))
#define xfreeData(reg) if ((reg)->data && (reg)->data->size) free((reg)->data)
#define RECTALLOC_BAIL(pReg,n,bail) \
@@ -205,8 +204,9 @@ if (!(pReg)->data || (((pReg)->data->numRects + (n)) > (pReg)->data->size)) \
#define DOWNSIZE(reg,numRects) \
if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \
{ \
- RegDataPtr NewData; \
- NewData = (RegDataPtr)realloc((reg)->data, RegionSizeof(numRects)); \
+ size_t NewSize = RegionSizeof(numRects); \
+ RegDataPtr NewData = \
+ (NewSize > 0) ? realloc((reg)->data, NewSize) : NULL ; \
if (NewData) \
{ \
NewData->size = (numRects); \
@@ -345,17 +345,20 @@ Bool
RegionRectAlloc(RegionPtr pRgn, int n)
{
RegDataPtr data;
+ size_t rgnSize;
if (!pRgn->data) {
n++;
- pRgn->data = xallocData(n);
+ rgnSize = RegionSizeof(n);
+ pRgn->data = (rgnSize > 0) ? malloc(rgnSize) : NULL;
if (!pRgn->data)
return RegionBreak(pRgn);
pRgn->data->numRects = 1;
*RegionBoxptr(pRgn) = pRgn->extents;
}
else if (!pRgn->data->size) {
- pRgn->data = xallocData(n);
+ rgnSize = RegionSizeof(n);
+ pRgn->data = (rgnSize > 0) ? malloc(rgnSize) : NULL;
if (!pRgn->data)
return RegionBreak(pRgn);
pRgn->data->numRects = 0;
@@ -367,7 +370,8 @@ RegionRectAlloc(RegionPtr pRgn, int n)
n = 250;
}
n += pRgn->data->numRects;
- data = (RegDataPtr) realloc(pRgn->data, RegionSizeof(n));
+ rgnSize = RegionSizeof(n);
+ data = (rgnSize > 0) ? realloc(pRgn->data, rgnSize) : NULL;
if (!data)
return RegionBreak(pRgn);
pRgn->data = data;
@@ -1312,6 +1316,7 @@ RegionFromRects(int nrects, xRectangle *prect, int ctype)
{
RegionPtr pRgn;
+ size_t rgnSize;
RegDataPtr pData;
BoxPtr pBox;
int i;
@@ -1338,7 +1343,8 @@ RegionFromRects(int nrects, xRectangle *prect, int ctype)
}
return pRgn;
}
- pData = xallocData(nrects);
+ rgnSize = RegionSizeof(nrects);
+ pData = (rgnSize > 0) ? malloc(rgnSize) : NULL;
if (!pData) {
RegionBreak(pRgn);
return pRgn;
diff --git a/xorg-server/dix/resource.c b/xorg-server/dix/resource.c
index 297348ad2..2bec75ac7 100644
--- a/xorg-server/dix/resource.c
+++ b/xorg-server/dix/resource.c
@@ -144,10 +144,7 @@ Equipment Corporation.
#include "gcstruct.h"
#ifdef XSERVER_DTRACE
-#include <sys/types.h>
-typedef const char *string;
-
-#include "Xserver-dtrace.h"
+#include "probes.h"
#define TypeNameString(t) LookupResourceName(t)
#endif
diff --git a/xorg-server/doc/Makefile.am b/xorg-server/doc/Makefile.am
index e6974fef1..b305f4db7 100644
--- a/xorg-server/doc/Makefile.am
+++ b/xorg-server/doc/Makefile.am
@@ -12,4 +12,4 @@ include $(top_srcdir)/devbook.am
endif HAVE_XMLTO
endif ENABLE_DEVEL_DOCS
-EXTRA_DIST = smartsched
+EXTRA_DIST = smartsched filter-xmlto.sh
diff --git a/xorg-server/doc/filter-xmlto.sh b/xorg-server/doc/filter-xmlto.sh
new file mode 100644
index 000000000..3596ed13a
--- /dev/null
+++ b/xorg-server/doc/filter-xmlto.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Run the xmlto command, filtering its output to
+# reduce the amount of useless warnings in the build log.
+#
+# Exit with the status of the xmlto process, not the status of the
+# output filtering commands
+#
+# This is a bit twisty, but avoids any temp files by using pipes for
+# everything. It routes the command output through file
+# descriptor 4 while sending the (numeric) exit status through
+# standard output.
+#
+(((("$@" 2>&1; echo $? >&3) |
+ grep -v overflows |
+ grep -v 'Making' |
+ grep -v 'hyphenation' |
+ grep -v 'Font.*not found' |
+ grep -v '/tmp/xml' |
+ grep -v Rendered >&4) 3>&1) |
+ (read status; exit $status)) 4>&1
diff --git a/xorg-server/dri3/dri3_request.c b/xorg-server/dri3/dri3_request.c
index fe45620c9..2d7558863 100644
--- a/xorg-server/dri3/dri3_request.c
+++ b/xorg-server/dri3/dri3_request.c
@@ -321,6 +321,7 @@ static int
sproc_dri3_query_version(ClientPtr client)
{
REQUEST(xDRI3QueryVersionReq);
+ REQUEST_SIZE_MATCH(xDRI3QueryVersionReq);
swaps(&stuff->length);
swapl(&stuff->majorVersion);
@@ -332,6 +333,7 @@ static int
sproc_dri3_open(ClientPtr client)
{
REQUEST(xDRI3OpenReq);
+ REQUEST_SIZE_MATCH(xDRI3OpenReq);
swaps(&stuff->length);
swapl(&stuff->drawable);
@@ -343,6 +345,7 @@ static int
sproc_dri3_pixmap_from_buffer(ClientPtr client)
{
REQUEST(xDRI3PixmapFromBufferReq);
+ REQUEST_SIZE_MATCH(xDRI3PixmapFromBufferReq);
swaps(&stuff->length);
swapl(&stuff->pixmap);
@@ -358,6 +361,7 @@ static int
sproc_dri3_buffer_from_pixmap(ClientPtr client)
{
REQUEST(xDRI3BufferFromPixmapReq);
+ REQUEST_SIZE_MATCH(xDRI3BufferFromPixmapReq);
swaps(&stuff->length);
swapl(&stuff->pixmap);
@@ -368,6 +372,7 @@ static int
sproc_dri3_fence_from_fd(ClientPtr client)
{
REQUEST(xDRI3FenceFromFDReq);
+ REQUEST_SIZE_MATCH(xDRI3FenceFromFDReq);
swaps(&stuff->length);
swapl(&stuff->drawable);
@@ -379,6 +384,7 @@ static int
sproc_dri3_fd_from_fence(ClientPtr client)
{
REQUEST(xDRI3FDFromFenceReq);
+ REQUEST_SIZE_MATCH(xDRI3FDFromFenceReq);
swaps(&stuff->length);
swapl(&stuff->drawable);
diff --git a/xorg-server/glamor/glamor.c b/xorg-server/glamor/glamor.c
index d228e35ad..017266a85 100644
--- a/xorg-server/glamor/glamor.c
+++ b/xorg-server/glamor/glamor.c
@@ -123,8 +123,6 @@ glamor_set_screen_pixmap(PixmapPtr screen_pixmap, PixmapPtr *back_pixmap)
pixmap_priv->base.fbo->width = screen_pixmap->drawable.width;
pixmap_priv->base.fbo->height = screen_pixmap->drawable.height;
-
- glamor_priv->back_pixmap = back_pixmap;
}
uint32_t
@@ -222,23 +220,20 @@ void
glamor_destroy_textured_pixmap(PixmapPtr pixmap)
{
if (pixmap->refcnt == 1) {
- glamor_pixmap_private *pixmap_priv;
-
- pixmap_priv = glamor_get_pixmap_private(pixmap);
- if (pixmap_priv != NULL)
- glamor_pixmap_destroy_fbo(pixmap_priv);
+ glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
+ if (pixmap_priv != NULL) {
+#if GLAMOR_HAS_GBM
+ glamor_egl_destroy_pixmap_image(pixmap);
+#endif
+ glamor_set_pixmap_private(pixmap, NULL);
+ }
}
}
Bool
glamor_destroy_pixmap(PixmapPtr pixmap)
{
- glamor_screen_private
- *glamor_priv = glamor_get_screen_private(pixmap->drawable.pScreen);
- if (glamor_priv->dri3_enabled)
- glamor_egl_destroy_textured_pixmap(pixmap);
- else
- glamor_destroy_textured_pixmap(pixmap);
+ glamor_destroy_textured_pixmap(pixmap);
return fbDestroyPixmap(pixmap);
}
@@ -254,20 +249,20 @@ glamor_block_handler(ScreenPtr screen)
}
static void
-_glamor_block_handler(void *data, OSTimePtr timeout, void *last_select_mask)
+_glamor_block_handler(ScreenPtr screen, void *timeout, void *readmask)
{
- glamor_screen_private *glamor_priv = data;
+ glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
+
+ screen->BlockHandler = glamor_priv->saved_procs.block_handler;
+ screen->BlockHandler(screen, timeout, readmask);
+ glamor_priv->saved_procs.block_handler = screen->BlockHandler;
+ screen->BlockHandler = _glamor_block_handler;
glamor_make_current(glamor_priv);
glFlush();
}
static void
-_glamor_wakeup_handler(void *data, int result, void *last_select_mask)
-{
-}
-
-static void
glamor_set_debug_level(int *debug_level)
{
char *debug_level_string;
@@ -428,6 +423,9 @@ glamor_init(ScreenPtr screen, unsigned int flags)
glamor_set_debug_level(&glamor_debug_level);
+ glamor_priv->saved_procs.close_screen = screen->CloseScreen;
+ screen->CloseScreen = glamor_close_screen;
+
/* If we are using egl screen, call egl screen init to
* register correct close screen function. */
if (flags & GLAMOR_USE_EGL_SCREEN) {
@@ -437,9 +435,6 @@ glamor_init(ScreenPtr screen, unsigned int flags)
goto fail;
}
- glamor_priv->saved_procs.close_screen = screen->CloseScreen;
- screen->CloseScreen = glamor_close_screen;
-
glamor_priv->saved_procs.create_screen_resources =
screen->CreateScreenResources;
screen->CreateScreenResources = glamor_create_screen_resources;
@@ -448,11 +443,9 @@ glamor_init(ScreenPtr screen, unsigned int flags)
goto fail;
if (flags & GLAMOR_USE_SCREEN) {
- if (!RegisterBlockAndWakeupHandlers(_glamor_block_handler,
- _glamor_wakeup_handler,
- glamor_priv)) {
- goto fail;
- }
+
+ glamor_priv->saved_procs.block_handler = screen->BlockHandler;
+ screen->BlockHandler = _glamor_block_handler;
glamor_priv->saved_procs.create_gc = screen->CreateGC;
screen->CreateGC = glamor_create_gc;
@@ -558,7 +551,6 @@ _X_EXPORT void
glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv)
{
glamor_pixmap_private *old_priv;
- glamor_pixmap_fbo *fbo;
old_priv = dixGetPrivate(&pixmap->devPrivates, &glamor_pixmap_private_key);
@@ -568,8 +560,8 @@ glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv)
else {
if (old_priv == NULL)
return;
- fbo = glamor_pixmap_detach_fbo(old_priv);
- glamor_purge_fbo(fbo);
+
+ glamor_pixmap_destroy_fbo(old_priv);
free(old_priv);
}
@@ -603,6 +595,7 @@ glamor_close_screen(ScreenPtr screen)
glamor_priv->saved_procs.change_window_attributes;
screen->CopyWindow = glamor_priv->saved_procs.copy_window;
screen->BitmapToRegion = glamor_priv->saved_procs.bitmap_to_region;
+ screen->BlockHandler = glamor_priv->saved_procs.block_handler;
}
#ifdef RENDER
if (ps && (flags & GLAMOR_USE_PICTURE_SCREEN)) {
@@ -619,8 +612,6 @@ glamor_close_screen(ScreenPtr screen)
#endif
screen_pixmap = screen->GetScreenPixmap(screen);
glamor_set_pixmap_private(screen_pixmap, NULL);
- if (glamor_priv->back_pixmap && *glamor_priv->back_pixmap)
- glamor_set_pixmap_private(*glamor_priv->back_pixmap, NULL);
glamor_release_screen_priv(screen);
diff --git a/xorg-server/glamor/glamor.h b/xorg-server/glamor/glamor.h
index 405dbe8ed..206158c02 100644
--- a/xorg-server/glamor/glamor.h
+++ b/xorg-server/glamor/glamor.h
@@ -170,6 +170,10 @@ extern _X_EXPORT int glamor_egl_dri3_fd_name_from_tex(ScreenPtr, PixmapPtr,
unsigned int, Bool,
CARD16 *, CARD32 *);
+extern void glamor_egl_destroy_pixmap_image(PixmapPtr pixmap);
+
+extern _X_EXPORT void *glamor_egl_get_gbm_device(ScreenPtr screen);
+
/* @glamor_supports_pixmap_import_export: Returns whether
* glamor_fd_from_pixmap(), glamor_name_from_pixmap(), and
* glamor_pixmap_from_fd() are supported.
diff --git a/xorg-server/glamor/glamor_egl.c b/xorg-server/glamor/glamor_egl.c
index 182e2e8c9..113450c8d 100644
--- a/xorg-server/glamor/glamor_egl.c
+++ b/xorg-server/glamor/glamor_egl.c
@@ -69,8 +69,6 @@ struct glamor_egl_screen_private {
CreateScreenResourcesProcPtr CreateScreenResources;
CloseScreenProcPtr CloseScreen;
int fd;
- EGLImageKHR front_image;
- PixmapPtr *back_pixmap;
int cpp;
#ifdef GLAMOR_HAS_GBM
struct gbm_device *gbm;
@@ -176,6 +174,18 @@ glamor_create_texture_from_image(ScreenPtr screen,
return TRUE;
}
+void *
+glamor_egl_get_gbm_device(ScreenPtr screen)
+{
+#ifdef GLAMOR_HAS_GBM
+ struct glamor_egl_screen_private *glamor_egl =
+ glamor_egl_get_screen_private(xf86ScreenToScrn(screen));
+ return glamor_egl->gbm;
+#else
+ return NULL;
+#endif
+}
+
unsigned int
glamor_egl_create_argb8888_based_texture(ScreenPtr screen, int w, int h)
{
@@ -220,13 +230,9 @@ Bool
glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- struct glamor_pixmap_private *pixmap_priv;
- struct glamor_egl_screen_private *glamor_egl;
PixmapPtr screen_pixmap;
- glamor_egl = glamor_egl_get_screen_private(scrn);
screen_pixmap = screen->GetScreenPixmap(screen);
- pixmap_priv = glamor_get_pixmap_private(screen_pixmap);
if (!glamor_egl_create_textured_pixmap(screen_pixmap, handle, stride)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
@@ -234,8 +240,7 @@ glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride)
return FALSE;
}
- glamor_egl->front_image = pixmap_priv->base.image;
- glamor_set_screen_pixmap(screen_pixmap, glamor_egl->back_pixmap);
+ glamor_set_screen_pixmap(screen_pixmap, NULL);
return TRUE;
}
@@ -244,15 +249,7 @@ glamor_egl_create_textured_screen_ext(ScreenPtr screen,
int handle,
int stride, PixmapPtr *back_pixmap)
{
- ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- struct glamor_egl_screen_private *glamor_egl;
-
- glamor_egl = glamor_egl_get_screen_private(scrn);
-
- glamor_egl->back_pixmap = back_pixmap;
- if (!glamor_egl_create_textured_screen(screen, handle, stride))
- return FALSE;
- return TRUE;
+ return glamor_egl_create_textured_screen(screen, handle, stride);
}
static Bool
@@ -268,6 +265,24 @@ glamor_egl_check_has_gem(int fd)
return FALSE;
}
+static void
+glamor_egl_set_pixmap_image(PixmapPtr pixmap, EGLImageKHR image)
+{
+ struct glamor_pixmap_private *pixmap_priv =
+ glamor_get_pixmap_private(pixmap);
+ EGLImageKHR old;
+
+ old = pixmap_priv->base.image;
+ if (old) {
+ ScreenPtr screen = pixmap->drawable.pScreen;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ struct glamor_egl_screen_private *glamor_egl = glamor_egl_get_screen_private(scrn);
+
+ eglDestroyImageKHR(glamor_egl->display, old);
+ }
+ pixmap_priv->base.image = image;
+}
+
Bool
glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
{
@@ -275,8 +290,6 @@ glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct glamor_screen_private *glamor_priv =
glamor_get_screen_private(screen);
- struct glamor_pixmap_private *pixmap_priv =
- glamor_get_pixmap_private(pixmap);
struct glamor_egl_screen_private *glamor_egl;
EGLImageKHR image;
GLuint texture;
@@ -311,7 +324,7 @@ glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
glamor_create_texture_from_image(screen, image, &texture);
glamor_set_pixmap_type(pixmap, GLAMOR_TEXTURE_DRM);
glamor_set_pixmap_texture(pixmap, texture);
- pixmap_priv->base.image = image;
+ glamor_egl_set_pixmap_image(pixmap, image);
ret = TRUE;
done:
@@ -325,8 +338,6 @@ glamor_egl_create_textured_pixmap_from_gbm_bo(PixmapPtr pixmap, void *bo)
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct glamor_screen_private *glamor_priv =
glamor_get_screen_private(screen);
- struct glamor_pixmap_private *pixmap_priv =
- glamor_get_pixmap_private(pixmap);
struct glamor_egl_screen_private *glamor_egl;
EGLImageKHR image;
GLuint texture;
@@ -346,7 +357,7 @@ glamor_egl_create_textured_pixmap_from_gbm_bo(PixmapPtr pixmap, void *bo)
glamor_create_texture_from_image(screen, image, &texture);
glamor_set_pixmap_type(pixmap, GLAMOR_TEXTURE_DRM);
glamor_set_pixmap_texture(pixmap, texture);
- pixmap_priv->base.image = image;
+ glamor_egl_set_pixmap_image(pixmap, image);
ret = TRUE;
done:
@@ -419,8 +430,8 @@ glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen,
if (image == EGL_NO_IMAGE_KHR)
goto failure;
- pixmap_priv->base.image = image;
glamor_set_pixmap_type(pixmap, GLAMOR_TEXTURE_DRM);
+ glamor_egl_set_pixmap_image(pixmap, image);
}
bo = gbm_bo_import(glamor_egl->gbm, GBM_BO_IMPORT_EGL_IMAGE, image, 0);
@@ -519,16 +530,17 @@ glamor_pixmap_from_fd(ScreenPtr screen,
#endif
}
-static void
-_glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
+void
+glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
{
- ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen);
- struct glamor_egl_screen_private *glamor_egl =
- glamor_egl_get_screen_private(scrn);
struct glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(pixmap);
- if (pixmap_priv->base.image) {
+ if (pixmap_priv && pixmap_priv->base.image) {
+ ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen);
+ struct glamor_egl_screen_private *glamor_egl =
+ glamor_egl_get_screen_private(scrn);
+
/* Before destroy an image which was attached to
* a texture. we must call glFlush to make sure the
* operation on that texture has been done.*/
@@ -541,9 +553,6 @@ _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
_X_EXPORT void
glamor_egl_exchange_buffers(PixmapPtr front, PixmapPtr back)
{
- ScrnInfoPtr scrn = xf86ScreenToScrn(front->drawable.pScreen);
- struct glamor_egl_screen_private *glamor_egl =
- glamor_egl_get_screen_private(scrn);
EGLImageKHR temp;
struct glamor_pixmap_private *front_priv =
glamor_get_pixmap_private(front);
@@ -558,15 +567,12 @@ glamor_egl_exchange_buffers(PixmapPtr front, PixmapPtr back)
glamor_set_pixmap_type(front, GLAMOR_TEXTURE_DRM);
glamor_set_pixmap_type(back, GLAMOR_TEXTURE_DRM);
- glamor_egl->front_image = front_priv->base.image;
}
void
glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap)
{
- if (pixmap->refcnt == 1)
- _glamor_egl_destroy_pixmap_image(pixmap);
glamor_destroy_textured_pixmap(pixmap);
}
@@ -583,17 +589,8 @@ glamor_egl_close_screen(ScreenPtr screen)
screen_pixmap = screen->GetScreenPixmap(screen);
pixmap_priv = glamor_get_pixmap_private(screen_pixmap);
- eglDestroyImageKHR(glamor_egl->display, glamor_egl->front_image);
+ eglDestroyImageKHR(glamor_egl->display, pixmap_priv->base.image);
pixmap_priv->base.image = NULL;
- glamor_egl->front_image = NULL;
-
- if (glamor_egl->back_pixmap && *glamor_egl->back_pixmap) {
- pixmap_priv = glamor_get_pixmap_private(*glamor_egl->back_pixmap);
- if (pixmap_priv->base.image) {
- eglDestroyImageKHR(glamor_egl->display, pixmap_priv->base.image);
- pixmap_priv->base.image = NULL;
- }
- }
screen->CloseScreen = glamor_egl->saved_close_screen;
diff --git a/xorg-server/glamor/glamor_egl_stubs.c b/xorg-server/glamor/glamor_egl_stubs.c
index 028d1cc05..a93f62dcb 100644
--- a/xorg-server/glamor/glamor_egl_stubs.c
+++ b/xorg-server/glamor/glamor_egl_stubs.c
@@ -36,7 +36,7 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
}
void
-glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap)
+glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
{
}
diff --git a/xorg-server/glamor/glamor_fbo.c b/xorg-server/glamor/glamor_fbo.c
index 42738268c..8d73e4765 100644
--- a/xorg-server/glamor/glamor_fbo.c
+++ b/xorg-server/glamor/glamor_fbo.c
@@ -126,7 +126,7 @@ glamor_pixmap_fbo_cache_get(glamor_screen_private *glamor_priv,
#endif
}
-void
+static void
glamor_purge_fbo(glamor_pixmap_fbo *fbo)
{
glamor_make_current(fbo->glamor_priv);
@@ -540,8 +540,6 @@ glamor_pixmap_destroy_fbo(glamor_pixmap_private *priv)
if (fbo)
glamor_destroy_fbo(fbo);
}
-
- free(priv);
}
Bool
diff --git a/xorg-server/glamor/glamor_priv.h b/xorg-server/glamor/glamor_priv.h
index 885f12a6d..ed6e2d192 100644
--- a/xorg-server/glamor/glamor_priv.h
+++ b/xorg-server/glamor/glamor_priv.h
@@ -215,6 +215,7 @@ struct glamor_saved_procs {
#if XSYNC
SyncScreenFuncsRec sync_screen_funcs;
#endif
+ ScreenBlockHandlerProcPtr block_handler;
};
#define CACHE_FORMAT_COUNT 3
@@ -306,7 +307,6 @@ typedef struct glamor_screen_private {
int linear_max_nstops;
int radial_max_nstops;
- PixmapPtr *back_pixmap;
int screen_fbo;
struct glamor_saved_procs saved_procs;
char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
@@ -654,7 +654,6 @@ glamor_pixmap_fbo *glamor_create_fbo(glamor_screen_private *glamor_priv, int w,
int h, GLenum format, int flag);
void glamor_destroy_fbo(glamor_pixmap_fbo *fbo);
void glamor_pixmap_destroy_fbo(glamor_pixmap_private *priv);
-void glamor_purge_fbo(glamor_pixmap_fbo *fbo);
void glamor_init_pixmap_fbo(ScreenPtr screen);
void glamor_fini_pixmap_fbo(ScreenPtr screen);
diff --git a/xorg-server/glamor/glamor_xv.c b/xorg-server/glamor/glamor_xv.c
index 26bdef66b..83e24adb2 100644
--- a/xorg-server/glamor/glamor_xv.c
+++ b/xorg-server/glamor/glamor_xv.c
@@ -208,15 +208,14 @@ glamor_xv_query_image_attributes(int id,
switch (id) {
case FOURCC_YV12:
case FOURCC_I420:
- *h = *h;
- *w = *w;
- size = *w;
+ *h = ALIGN(*h, 2);
+ size = ALIGN(*w, 4);
if (pitches)
pitches[0] = size;
size *= *h;
if (offsets)
offsets[1] = size;
- tmp = *w >> 1;
+ tmp = ALIGN(*w >> 1, 4);
if (pitches)
pitches[1] = pitches[2] = tmp;
tmp *= (*h >> 1);
@@ -413,9 +412,6 @@ glamor_xv_put_image(glamor_port_private *port_priv,
s2offset = s3offset = srcPitch2 = 0;
- srcPitch = width;
- srcPitch2 = width >> 1;
-
if (!port_priv->src_pix[0] ||
(width != port_priv->src_pix_w || height != port_priv->src_pix_h)) {
int i;
@@ -439,11 +435,13 @@ glamor_xv_put_image(glamor_port_private *port_priv,
}
top = (src_y) & ~1;
- nlines = (src_y + height) - top;
+ nlines = (src_y + src_h) - top;
switch (id) {
case FOURCC_YV12:
case FOURCC_I420:
+ srcPitch = ALIGN(width, 4);
+ srcPitch2 = ALIGN(width >> 1, 4);
s2offset = srcPitch * height;
s3offset = s2offset + (srcPitch2 * ((height + 1) >> 1));
s2offset += ((top >> 1) * srcPitch2);
@@ -454,18 +452,18 @@ glamor_xv_put_image(glamor_port_private *port_priv,
s3offset = tmp;
}
glamor_upload_sub_pixmap_to_texture(port_priv->src_pix[0],
- 0, 0, srcPitch, nlines,
- port_priv->src_pix[0]->devKind,
+ 0, 0, width, nlines,
+ srcPitch,
buf + (top * srcPitch), 0);
glamor_upload_sub_pixmap_to_texture(port_priv->src_pix[1],
- 0, 0, srcPitch2, (nlines + 1) >> 1,
- port_priv->src_pix[1]->devKind,
+ 0, 0, width >> 1, (nlines + 1) >> 1,
+ srcPitch2,
buf + s2offset, 0);
glamor_upload_sub_pixmap_to_texture(port_priv->src_pix[2],
- 0, 0, srcPitch2, (nlines + 1) >> 1,
- port_priv->src_pix[2]->devKind,
+ 0, 0, width >> 1, (nlines + 1) >> 1,
+ srcPitch2,
buf + s3offset, 0);
break;
default:
diff --git a/xorg-server/glx/clientinfo.c b/xorg-server/glx/clientinfo.c
index 4aaa4c967..74ad91991 100644
--- a/xorg-server/glx/clientinfo.c
+++ b/xorg-server/glx/clientinfo.c
@@ -33,18 +33,22 @@ static int
set_client_info(__GLXclientState * cl, xGLXSetClientInfoARBReq * req,
unsigned bytes_per_version)
{
+ ClientPtr client = cl->client;
char *gl_extensions;
char *glx_extensions;
+ int size;
+
+ REQUEST_AT_LEAST_SIZE(xGLXSetClientInfoARBReq);
/* Verify that the size of the packet matches the size inferred from the
* sizes specified for the various fields.
*/
- const unsigned expected_size = sz_xGLXSetClientInfoARBReq
- + (req->numVersions * bytes_per_version)
- + __GLX_PAD(req->numGLExtensionBytes)
- + __GLX_PAD(req->numGLXExtensionBytes);
+ size = sz_xGLXSetClientInfoARBReq;
+ size = safe_add(size, safe_mul(req->numVersions, bytes_per_version));
+ size = safe_add(size, safe_pad(req->numGLExtensionBytes));
+ size = safe_add(size, safe_pad(req->numGLXExtensionBytes));
- if (req->length != (expected_size / 4))
+ if (size < 0 || req->length != (size / 4))
return BadLength;
/* Verify that the actual length of the GL extension string matches what's
@@ -80,8 +84,11 @@ __glXDisp_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc)
int
__glXDispSwap_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
xGLXSetClientInfoARBReq *req = (xGLXSetClientInfoARBReq *) pc;
+ REQUEST_AT_LEAST_SIZE(xGLXSetClientInfoARBReq);
+
req->length = bswap_16(req->length);
req->numVersions = bswap_32(req->numVersions);
req->numGLExtensionBytes = bswap_32(req->numGLExtensionBytes);
@@ -99,8 +106,11 @@ __glXDisp_SetClientInfo2ARB(__GLXclientState * cl, GLbyte * pc)
int
__glXDispSwap_SetClientInfo2ARB(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
xGLXSetClientInfoARBReq *req = (xGLXSetClientInfoARBReq *) pc;
+ REQUEST_AT_LEAST_SIZE(xGLXSetClientInfoARBReq);
+
req->length = bswap_16(req->length);
req->numVersions = bswap_32(req->numVersions);
req->numGLExtensionBytes = bswap_32(req->numGLExtensionBytes);
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index 027b39567..4dd277093 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -63,7 +63,7 @@
} while(0)
/* total number of offsets below */
-#define _gloffset_COUNT 1156
+#define _gloffset_COUNT 1224
#define _gloffset_NewList 0
#define _gloffset_EndList 1
@@ -473,7 +473,7 @@
#define _gloffset_MultiTexCoord4iv 405
#define _gloffset_MultiTexCoord4s 406
#define _gloffset_MultiTexCoord4sv 407
-#define driDispatchRemapTable_size 748
+#define driDispatchRemapTable_size 816
SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define CompressedTexImage1D_remap_index 0
@@ -842,388 +842,456 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define VertexP4uiv_remap_index 363
#define DrawArraysIndirect_remap_index 364
#define DrawElementsIndirect_remap_index 365
-#define BindTransformFeedback_remap_index 366
-#define DeleteTransformFeedbacks_remap_index 367
-#define DrawTransformFeedback_remap_index 368
-#define GenTransformFeedbacks_remap_index 369
-#define IsTransformFeedback_remap_index 370
-#define PauseTransformFeedback_remap_index 371
-#define ResumeTransformFeedback_remap_index 372
-#define BeginQueryIndexed_remap_index 373
-#define DrawTransformFeedbackStream_remap_index 374
-#define EndQueryIndexed_remap_index 375
-#define GetQueryIndexediv_remap_index 376
-#define ClearDepthf_remap_index 377
-#define DepthRangef_remap_index 378
-#define GetShaderPrecisionFormat_remap_index 379
-#define ReleaseShaderCompiler_remap_index 380
-#define ShaderBinary_remap_index 381
-#define GetProgramBinary_remap_index 382
-#define ProgramBinary_remap_index 383
-#define ProgramParameteri_remap_index 384
-#define DepthRangeArrayv_remap_index 385
-#define DepthRangeIndexed_remap_index 386
-#define GetDoublei_v_remap_index 387
-#define GetFloati_v_remap_index 388
-#define ScissorArrayv_remap_index 389
-#define ScissorIndexed_remap_index 390
-#define ScissorIndexedv_remap_index 391
-#define ViewportArrayv_remap_index 392
-#define ViewportIndexedf_remap_index 393
-#define ViewportIndexedfv_remap_index 394
-#define GetGraphicsResetStatusARB_remap_index 395
-#define GetnColorTableARB_remap_index 396
-#define GetnCompressedTexImageARB_remap_index 397
-#define GetnConvolutionFilterARB_remap_index 398
-#define GetnHistogramARB_remap_index 399
-#define GetnMapdvARB_remap_index 400
-#define GetnMapfvARB_remap_index 401
-#define GetnMapivARB_remap_index 402
-#define GetnMinmaxARB_remap_index 403
-#define GetnPixelMapfvARB_remap_index 404
-#define GetnPixelMapuivARB_remap_index 405
-#define GetnPixelMapusvARB_remap_index 406
-#define GetnPolygonStippleARB_remap_index 407
-#define GetnSeparableFilterARB_remap_index 408
-#define GetnTexImageARB_remap_index 409
-#define GetnUniformdvARB_remap_index 410
-#define GetnUniformfvARB_remap_index 411
-#define GetnUniformivARB_remap_index 412
-#define GetnUniformuivARB_remap_index 413
-#define ReadnPixelsARB_remap_index 414
-#define DrawArraysInstancedBaseInstance_remap_index 415
-#define DrawElementsInstancedBaseInstance_remap_index 416
-#define DrawElementsInstancedBaseVertexBaseInstance_remap_index 417
-#define DrawTransformFeedbackInstanced_remap_index 418
-#define DrawTransformFeedbackStreamInstanced_remap_index 419
-#define GetInternalformativ_remap_index 420
-#define GetActiveAtomicCounterBufferiv_remap_index 421
-#define BindImageTexture_remap_index 422
-#define MemoryBarrier_remap_index 423
-#define TexStorage1D_remap_index 424
-#define TexStorage2D_remap_index 425
-#define TexStorage3D_remap_index 426
-#define TextureStorage1DEXT_remap_index 427
-#define TextureStorage2DEXT_remap_index 428
-#define TextureStorage3DEXT_remap_index 429
-#define ClearBufferData_remap_index 430
-#define ClearBufferSubData_remap_index 431
-#define DispatchCompute_remap_index 432
-#define DispatchComputeIndirect_remap_index 433
-#define CopyImageSubData_remap_index 434
-#define TextureView_remap_index 435
-#define BindVertexBuffer_remap_index 436
-#define VertexAttribBinding_remap_index 437
-#define VertexAttribFormat_remap_index 438
-#define VertexAttribIFormat_remap_index 439
-#define VertexAttribLFormat_remap_index 440
-#define VertexBindingDivisor_remap_index 441
-#define MultiDrawArraysIndirect_remap_index 442
-#define MultiDrawElementsIndirect_remap_index 443
-#define TexBufferRange_remap_index 444
-#define TexStorage2DMultisample_remap_index 445
-#define TexStorage3DMultisample_remap_index 446
-#define BufferStorage_remap_index 447
-#define ClearTexImage_remap_index 448
-#define ClearTexSubImage_remap_index 449
-#define BindBuffersBase_remap_index 450
-#define BindBuffersRange_remap_index 451
-#define BindImageTextures_remap_index 452
-#define BindSamplers_remap_index 453
-#define BindTextures_remap_index 454
-#define BindVertexBuffers_remap_index 455
-#define ClipControl_remap_index 456
-#define InvalidateBufferData_remap_index 457
-#define InvalidateBufferSubData_remap_index 458
-#define InvalidateFramebuffer_remap_index 459
-#define InvalidateSubFramebuffer_remap_index 460
-#define InvalidateTexImage_remap_index 461
-#define InvalidateTexSubImage_remap_index 462
-#define PolygonOffsetEXT_remap_index 463
-#define DrawTexfOES_remap_index 464
-#define DrawTexfvOES_remap_index 465
-#define DrawTexiOES_remap_index 466
-#define DrawTexivOES_remap_index 467
-#define DrawTexsOES_remap_index 468
-#define DrawTexsvOES_remap_index 469
-#define DrawTexxOES_remap_index 470
-#define DrawTexxvOES_remap_index 471
-#define PointSizePointerOES_remap_index 472
-#define QueryMatrixxOES_remap_index 473
-#define SampleMaskSGIS_remap_index 474
-#define SamplePatternSGIS_remap_index 475
-#define ColorPointerEXT_remap_index 476
-#define EdgeFlagPointerEXT_remap_index 477
-#define IndexPointerEXT_remap_index 478
-#define NormalPointerEXT_remap_index 479
-#define TexCoordPointerEXT_remap_index 480
-#define VertexPointerEXT_remap_index 481
-#define DiscardFramebufferEXT_remap_index 482
-#define ActiveShaderProgram_remap_index 483
-#define BindProgramPipeline_remap_index 484
-#define CreateShaderProgramv_remap_index 485
-#define DeleteProgramPipelines_remap_index 486
-#define GenProgramPipelines_remap_index 487
-#define GetProgramPipelineInfoLog_remap_index 488
-#define GetProgramPipelineiv_remap_index 489
-#define IsProgramPipeline_remap_index 490
-#define LockArraysEXT_remap_index 491
-#define ProgramUniform1f_remap_index 492
-#define ProgramUniform1fv_remap_index 493
-#define ProgramUniform1i_remap_index 494
-#define ProgramUniform1iv_remap_index 495
-#define ProgramUniform1ui_remap_index 496
-#define ProgramUniform1uiv_remap_index 497
-#define ProgramUniform2f_remap_index 498
-#define ProgramUniform2fv_remap_index 499
-#define ProgramUniform2i_remap_index 500
-#define ProgramUniform2iv_remap_index 501
-#define ProgramUniform2ui_remap_index 502
-#define ProgramUniform2uiv_remap_index 503
-#define ProgramUniform3f_remap_index 504
-#define ProgramUniform3fv_remap_index 505
-#define ProgramUniform3i_remap_index 506
-#define ProgramUniform3iv_remap_index 507
-#define ProgramUniform3ui_remap_index 508
-#define ProgramUniform3uiv_remap_index 509
-#define ProgramUniform4f_remap_index 510
-#define ProgramUniform4fv_remap_index 511
-#define ProgramUniform4i_remap_index 512
-#define ProgramUniform4iv_remap_index 513
-#define ProgramUniform4ui_remap_index 514
-#define ProgramUniform4uiv_remap_index 515
-#define ProgramUniformMatrix2fv_remap_index 516
-#define ProgramUniformMatrix2x3fv_remap_index 517
-#define ProgramUniformMatrix2x4fv_remap_index 518
-#define ProgramUniformMatrix3fv_remap_index 519
-#define ProgramUniformMatrix3x2fv_remap_index 520
-#define ProgramUniformMatrix3x4fv_remap_index 521
-#define ProgramUniformMatrix4fv_remap_index 522
-#define ProgramUniformMatrix4x2fv_remap_index 523
-#define ProgramUniformMatrix4x3fv_remap_index 524
-#define UnlockArraysEXT_remap_index 525
-#define UseProgramStages_remap_index 526
-#define ValidateProgramPipeline_remap_index 527
-#define DebugMessageCallback_remap_index 528
-#define DebugMessageControl_remap_index 529
-#define DebugMessageInsert_remap_index 530
-#define GetDebugMessageLog_remap_index 531
-#define GetObjectLabel_remap_index 532
-#define GetObjectPtrLabel_remap_index 533
-#define ObjectLabel_remap_index 534
-#define ObjectPtrLabel_remap_index 535
-#define PopDebugGroup_remap_index 536
-#define PushDebugGroup_remap_index 537
-#define SecondaryColor3fEXT_remap_index 538
-#define SecondaryColor3fvEXT_remap_index 539
-#define MultiDrawElementsEXT_remap_index 540
-#define FogCoordfEXT_remap_index 541
-#define FogCoordfvEXT_remap_index 542
-#define ResizeBuffersMESA_remap_index 543
-#define WindowPos4dMESA_remap_index 544
-#define WindowPos4dvMESA_remap_index 545
-#define WindowPos4fMESA_remap_index 546
-#define WindowPos4fvMESA_remap_index 547
-#define WindowPos4iMESA_remap_index 548
-#define WindowPos4ivMESA_remap_index 549
-#define WindowPos4sMESA_remap_index 550
-#define WindowPos4svMESA_remap_index 551
-#define MultiModeDrawArraysIBM_remap_index 552
-#define MultiModeDrawElementsIBM_remap_index 553
-#define AreProgramsResidentNV_remap_index 554
-#define ExecuteProgramNV_remap_index 555
-#define GetProgramParameterdvNV_remap_index 556
-#define GetProgramParameterfvNV_remap_index 557
-#define GetProgramStringNV_remap_index 558
-#define GetProgramivNV_remap_index 559
-#define GetTrackMatrixivNV_remap_index 560
-#define GetVertexAttribdvNV_remap_index 561
-#define GetVertexAttribfvNV_remap_index 562
-#define GetVertexAttribivNV_remap_index 563
-#define LoadProgramNV_remap_index 564
-#define ProgramParameters4dvNV_remap_index 565
-#define ProgramParameters4fvNV_remap_index 566
-#define RequestResidentProgramsNV_remap_index 567
-#define TrackMatrixNV_remap_index 568
-#define VertexAttrib1dNV_remap_index 569
-#define VertexAttrib1dvNV_remap_index 570
-#define VertexAttrib1fNV_remap_index 571
-#define VertexAttrib1fvNV_remap_index 572
-#define VertexAttrib1sNV_remap_index 573
-#define VertexAttrib1svNV_remap_index 574
-#define VertexAttrib2dNV_remap_index 575
-#define VertexAttrib2dvNV_remap_index 576
-#define VertexAttrib2fNV_remap_index 577
-#define VertexAttrib2fvNV_remap_index 578
-#define VertexAttrib2sNV_remap_index 579
-#define VertexAttrib2svNV_remap_index 580
-#define VertexAttrib3dNV_remap_index 581
-#define VertexAttrib3dvNV_remap_index 582
-#define VertexAttrib3fNV_remap_index 583
-#define VertexAttrib3fvNV_remap_index 584
-#define VertexAttrib3sNV_remap_index 585
-#define VertexAttrib3svNV_remap_index 586
-#define VertexAttrib4dNV_remap_index 587
-#define VertexAttrib4dvNV_remap_index 588
-#define VertexAttrib4fNV_remap_index 589
-#define VertexAttrib4fvNV_remap_index 590
-#define VertexAttrib4sNV_remap_index 591
-#define VertexAttrib4svNV_remap_index 592
-#define VertexAttrib4ubNV_remap_index 593
-#define VertexAttrib4ubvNV_remap_index 594
-#define VertexAttribPointerNV_remap_index 595
-#define VertexAttribs1dvNV_remap_index 596
-#define VertexAttribs1fvNV_remap_index 597
-#define VertexAttribs1svNV_remap_index 598
-#define VertexAttribs2dvNV_remap_index 599
-#define VertexAttribs2fvNV_remap_index 600
-#define VertexAttribs2svNV_remap_index 601
-#define VertexAttribs3dvNV_remap_index 602
-#define VertexAttribs3fvNV_remap_index 603
-#define VertexAttribs3svNV_remap_index 604
-#define VertexAttribs4dvNV_remap_index 605
-#define VertexAttribs4fvNV_remap_index 606
-#define VertexAttribs4svNV_remap_index 607
-#define VertexAttribs4ubvNV_remap_index 608
-#define GetTexBumpParameterfvATI_remap_index 609
-#define GetTexBumpParameterivATI_remap_index 610
-#define TexBumpParameterfvATI_remap_index 611
-#define TexBumpParameterivATI_remap_index 612
-#define AlphaFragmentOp1ATI_remap_index 613
-#define AlphaFragmentOp2ATI_remap_index 614
-#define AlphaFragmentOp3ATI_remap_index 615
-#define BeginFragmentShaderATI_remap_index 616
-#define BindFragmentShaderATI_remap_index 617
-#define ColorFragmentOp1ATI_remap_index 618
-#define ColorFragmentOp2ATI_remap_index 619
-#define ColorFragmentOp3ATI_remap_index 620
-#define DeleteFragmentShaderATI_remap_index 621
-#define EndFragmentShaderATI_remap_index 622
-#define GenFragmentShadersATI_remap_index 623
-#define PassTexCoordATI_remap_index 624
-#define SampleMapATI_remap_index 625
-#define SetFragmentShaderConstantATI_remap_index 626
-#define ActiveStencilFaceEXT_remap_index 627
-#define BindVertexArrayAPPLE_remap_index 628
-#define GenVertexArraysAPPLE_remap_index 629
-#define GetProgramNamedParameterdvNV_remap_index 630
-#define GetProgramNamedParameterfvNV_remap_index 631
-#define ProgramNamedParameter4dNV_remap_index 632
-#define ProgramNamedParameter4dvNV_remap_index 633
-#define ProgramNamedParameter4fNV_remap_index 634
-#define ProgramNamedParameter4fvNV_remap_index 635
-#define PrimitiveRestartNV_remap_index 636
-#define GetTexGenxvOES_remap_index 637
-#define TexGenxOES_remap_index 638
-#define TexGenxvOES_remap_index 639
-#define DepthBoundsEXT_remap_index 640
-#define BindFramebufferEXT_remap_index 641
-#define BindRenderbufferEXT_remap_index 642
-#define BufferParameteriAPPLE_remap_index 643
-#define FlushMappedBufferRangeAPPLE_remap_index 644
-#define VertexAttribI1iEXT_remap_index 645
-#define VertexAttribI1uiEXT_remap_index 646
-#define VertexAttribI2iEXT_remap_index 647
-#define VertexAttribI2ivEXT_remap_index 648
-#define VertexAttribI2uiEXT_remap_index 649
-#define VertexAttribI2uivEXT_remap_index 650
-#define VertexAttribI3iEXT_remap_index 651
-#define VertexAttribI3ivEXT_remap_index 652
-#define VertexAttribI3uiEXT_remap_index 653
-#define VertexAttribI3uivEXT_remap_index 654
-#define VertexAttribI4iEXT_remap_index 655
-#define VertexAttribI4ivEXT_remap_index 656
-#define VertexAttribI4uiEXT_remap_index 657
-#define VertexAttribI4uivEXT_remap_index 658
-#define ClearColorIiEXT_remap_index 659
-#define ClearColorIuiEXT_remap_index 660
-#define BindBufferOffsetEXT_remap_index 661
-#define BeginPerfMonitorAMD_remap_index 662
-#define DeletePerfMonitorsAMD_remap_index 663
-#define EndPerfMonitorAMD_remap_index 664
-#define GenPerfMonitorsAMD_remap_index 665
-#define GetPerfMonitorCounterDataAMD_remap_index 666
-#define GetPerfMonitorCounterInfoAMD_remap_index 667
-#define GetPerfMonitorCounterStringAMD_remap_index 668
-#define GetPerfMonitorCountersAMD_remap_index 669
-#define GetPerfMonitorGroupStringAMD_remap_index 670
-#define GetPerfMonitorGroupsAMD_remap_index 671
-#define SelectPerfMonitorCountersAMD_remap_index 672
-#define GetObjectParameterivAPPLE_remap_index 673
-#define ObjectPurgeableAPPLE_remap_index 674
-#define ObjectUnpurgeableAPPLE_remap_index 675
-#define ActiveProgramEXT_remap_index 676
-#define CreateShaderProgramEXT_remap_index 677
-#define UseShaderProgramEXT_remap_index 678
-#define TextureBarrierNV_remap_index 679
-#define VDPAUFiniNV_remap_index 680
-#define VDPAUGetSurfaceivNV_remap_index 681
-#define VDPAUInitNV_remap_index 682
-#define VDPAUIsSurfaceNV_remap_index 683
-#define VDPAUMapSurfacesNV_remap_index 684
-#define VDPAURegisterOutputSurfaceNV_remap_index 685
-#define VDPAURegisterVideoSurfaceNV_remap_index 686
-#define VDPAUSurfaceAccessNV_remap_index 687
-#define VDPAUUnmapSurfacesNV_remap_index 688
-#define VDPAUUnregisterSurfaceNV_remap_index 689
-#define BeginPerfQueryINTEL_remap_index 690
-#define CreatePerfQueryINTEL_remap_index 691
-#define DeletePerfQueryINTEL_remap_index 692
-#define EndPerfQueryINTEL_remap_index 693
-#define GetFirstPerfQueryIdINTEL_remap_index 694
-#define GetNextPerfQueryIdINTEL_remap_index 695
-#define GetPerfCounterInfoINTEL_remap_index 696
-#define GetPerfQueryDataINTEL_remap_index 697
-#define GetPerfQueryIdByNameINTEL_remap_index 698
-#define GetPerfQueryInfoINTEL_remap_index 699
-#define StencilFuncSeparateATI_remap_index 700
-#define ProgramEnvParameters4fvEXT_remap_index 701
-#define ProgramLocalParameters4fvEXT_remap_index 702
-#define EGLImageTargetRenderbufferStorageOES_remap_index 703
-#define EGLImageTargetTexture2DOES_remap_index 704
-#define AlphaFuncx_remap_index 705
-#define ClearColorx_remap_index 706
-#define ClearDepthx_remap_index 707
-#define Color4x_remap_index 708
-#define DepthRangex_remap_index 709
-#define Fogx_remap_index 710
-#define Fogxv_remap_index 711
-#define Frustumf_remap_index 712
-#define Frustumx_remap_index 713
-#define LightModelx_remap_index 714
-#define LightModelxv_remap_index 715
-#define Lightx_remap_index 716
-#define Lightxv_remap_index 717
-#define LineWidthx_remap_index 718
-#define LoadMatrixx_remap_index 719
-#define Materialx_remap_index 720
-#define Materialxv_remap_index 721
-#define MultMatrixx_remap_index 722
-#define MultiTexCoord4x_remap_index 723
-#define Normal3x_remap_index 724
-#define Orthof_remap_index 725
-#define Orthox_remap_index 726
-#define PointSizex_remap_index 727
-#define PolygonOffsetx_remap_index 728
-#define Rotatex_remap_index 729
-#define SampleCoveragex_remap_index 730
-#define Scalex_remap_index 731
-#define TexEnvx_remap_index 732
-#define TexEnvxv_remap_index 733
-#define TexParameterx_remap_index 734
-#define Translatex_remap_index 735
-#define ClipPlanef_remap_index 736
-#define ClipPlanex_remap_index 737
-#define GetClipPlanef_remap_index 738
-#define GetClipPlanex_remap_index 739
-#define GetFixedv_remap_index 740
-#define GetLightxv_remap_index 741
-#define GetMaterialxv_remap_index 742
-#define GetTexEnvxv_remap_index 743
-#define GetTexParameterxv_remap_index 744
-#define PointParameterx_remap_index 745
-#define PointParameterxv_remap_index 746
-#define TexParameterxv_remap_index 747
+#define GetUniformdv_remap_index 366
+#define Uniform1d_remap_index 367
+#define Uniform1dv_remap_index 368
+#define Uniform2d_remap_index 369
+#define Uniform2dv_remap_index 370
+#define Uniform3d_remap_index 371
+#define Uniform3dv_remap_index 372
+#define Uniform4d_remap_index 373
+#define Uniform4dv_remap_index 374
+#define UniformMatrix2dv_remap_index 375
+#define UniformMatrix2x3dv_remap_index 376
+#define UniformMatrix2x4dv_remap_index 377
+#define UniformMatrix3dv_remap_index 378
+#define UniformMatrix3x2dv_remap_index 379
+#define UniformMatrix3x4dv_remap_index 380
+#define UniformMatrix4dv_remap_index 381
+#define UniformMatrix4x2dv_remap_index 382
+#define UniformMatrix4x3dv_remap_index 383
+#define BindTransformFeedback_remap_index 384
+#define DeleteTransformFeedbacks_remap_index 385
+#define DrawTransformFeedback_remap_index 386
+#define GenTransformFeedbacks_remap_index 387
+#define IsTransformFeedback_remap_index 388
+#define PauseTransformFeedback_remap_index 389
+#define ResumeTransformFeedback_remap_index 390
+#define BeginQueryIndexed_remap_index 391
+#define DrawTransformFeedbackStream_remap_index 392
+#define EndQueryIndexed_remap_index 393
+#define GetQueryIndexediv_remap_index 394
+#define ClearDepthf_remap_index 395
+#define DepthRangef_remap_index 396
+#define GetShaderPrecisionFormat_remap_index 397
+#define ReleaseShaderCompiler_remap_index 398
+#define ShaderBinary_remap_index 399
+#define GetProgramBinary_remap_index 400
+#define ProgramBinary_remap_index 401
+#define ProgramParameteri_remap_index 402
+#define DepthRangeArrayv_remap_index 403
+#define DepthRangeIndexed_remap_index 404
+#define GetDoublei_v_remap_index 405
+#define GetFloati_v_remap_index 406
+#define ScissorArrayv_remap_index 407
+#define ScissorIndexed_remap_index 408
+#define ScissorIndexedv_remap_index 409
+#define ViewportArrayv_remap_index 410
+#define ViewportIndexedf_remap_index 411
+#define ViewportIndexedfv_remap_index 412
+#define GetGraphicsResetStatusARB_remap_index 413
+#define GetnColorTableARB_remap_index 414
+#define GetnCompressedTexImageARB_remap_index 415
+#define GetnConvolutionFilterARB_remap_index 416
+#define GetnHistogramARB_remap_index 417
+#define GetnMapdvARB_remap_index 418
+#define GetnMapfvARB_remap_index 419
+#define GetnMapivARB_remap_index 420
+#define GetnMinmaxARB_remap_index 421
+#define GetnPixelMapfvARB_remap_index 422
+#define GetnPixelMapuivARB_remap_index 423
+#define GetnPixelMapusvARB_remap_index 424
+#define GetnPolygonStippleARB_remap_index 425
+#define GetnSeparableFilterARB_remap_index 426
+#define GetnTexImageARB_remap_index 427
+#define GetnUniformdvARB_remap_index 428
+#define GetnUniformfvARB_remap_index 429
+#define GetnUniformivARB_remap_index 430
+#define GetnUniformuivARB_remap_index 431
+#define ReadnPixelsARB_remap_index 432
+#define DrawArraysInstancedBaseInstance_remap_index 433
+#define DrawElementsInstancedBaseInstance_remap_index 434
+#define DrawElementsInstancedBaseVertexBaseInstance_remap_index 435
+#define DrawTransformFeedbackInstanced_remap_index 436
+#define DrawTransformFeedbackStreamInstanced_remap_index 437
+#define GetInternalformativ_remap_index 438
+#define GetActiveAtomicCounterBufferiv_remap_index 439
+#define BindImageTexture_remap_index 440
+#define MemoryBarrier_remap_index 441
+#define TexStorage1D_remap_index 442
+#define TexStorage2D_remap_index 443
+#define TexStorage3D_remap_index 444
+#define TextureStorage1DEXT_remap_index 445
+#define TextureStorage2DEXT_remap_index 446
+#define TextureStorage3DEXT_remap_index 447
+#define ClearBufferData_remap_index 448
+#define ClearBufferSubData_remap_index 449
+#define DispatchCompute_remap_index 450
+#define DispatchComputeIndirect_remap_index 451
+#define CopyImageSubData_remap_index 452
+#define TextureView_remap_index 453
+#define BindVertexBuffer_remap_index 454
+#define VertexAttribBinding_remap_index 455
+#define VertexAttribFormat_remap_index 456
+#define VertexAttribIFormat_remap_index 457
+#define VertexAttribLFormat_remap_index 458
+#define VertexBindingDivisor_remap_index 459
+#define MultiDrawArraysIndirect_remap_index 460
+#define MultiDrawElementsIndirect_remap_index 461
+#define TexBufferRange_remap_index 462
+#define TexStorage2DMultisample_remap_index 463
+#define TexStorage3DMultisample_remap_index 464
+#define BufferStorage_remap_index 465
+#define ClearTexImage_remap_index 466
+#define ClearTexSubImage_remap_index 467
+#define BindBuffersBase_remap_index 468
+#define BindBuffersRange_remap_index 469
+#define BindImageTextures_remap_index 470
+#define BindSamplers_remap_index 471
+#define BindTextures_remap_index 472
+#define BindVertexBuffers_remap_index 473
+#define ClipControl_remap_index 474
+#define BindTextureUnit_remap_index 475
+#define CompressedTextureSubImage1D_remap_index 476
+#define CompressedTextureSubImage2D_remap_index 477
+#define CompressedTextureSubImage3D_remap_index 478
+#define CopyTextureSubImage1D_remap_index 479
+#define CopyTextureSubImage2D_remap_index 480
+#define CopyTextureSubImage3D_remap_index 481
+#define CreateTextures_remap_index 482
+#define GenerateTextureMipmap_remap_index 483
+#define GetCompressedTextureImage_remap_index 484
+#define GetTextureImage_remap_index 485
+#define GetTextureLevelParameterfv_remap_index 486
+#define GetTextureLevelParameteriv_remap_index 487
+#define GetTextureParameterIiv_remap_index 488
+#define GetTextureParameterIuiv_remap_index 489
+#define GetTextureParameterfv_remap_index 490
+#define GetTextureParameteriv_remap_index 491
+#define TextureBuffer_remap_index 492
+#define TextureParameterIiv_remap_index 493
+#define TextureParameterIuiv_remap_index 494
+#define TextureParameterf_remap_index 495
+#define TextureParameterfv_remap_index 496
+#define TextureParameteri_remap_index 497
+#define TextureParameteriv_remap_index 498
+#define TextureStorage1D_remap_index 499
+#define TextureStorage2D_remap_index 500
+#define TextureStorage2DMultisample_remap_index 501
+#define TextureStorage3D_remap_index 502
+#define TextureStorage3DMultisample_remap_index 503
+#define TextureSubImage1D_remap_index 504
+#define TextureSubImage2D_remap_index 505
+#define TextureSubImage3D_remap_index 506
+#define InvalidateBufferData_remap_index 507
+#define InvalidateBufferSubData_remap_index 508
+#define InvalidateFramebuffer_remap_index 509
+#define InvalidateSubFramebuffer_remap_index 510
+#define InvalidateTexImage_remap_index 511
+#define InvalidateTexSubImage_remap_index 512
+#define PolygonOffsetEXT_remap_index 513
+#define DrawTexfOES_remap_index 514
+#define DrawTexfvOES_remap_index 515
+#define DrawTexiOES_remap_index 516
+#define DrawTexivOES_remap_index 517
+#define DrawTexsOES_remap_index 518
+#define DrawTexsvOES_remap_index 519
+#define DrawTexxOES_remap_index 520
+#define DrawTexxvOES_remap_index 521
+#define PointSizePointerOES_remap_index 522
+#define QueryMatrixxOES_remap_index 523
+#define SampleMaskSGIS_remap_index 524
+#define SamplePatternSGIS_remap_index 525
+#define ColorPointerEXT_remap_index 526
+#define EdgeFlagPointerEXT_remap_index 527
+#define IndexPointerEXT_remap_index 528
+#define NormalPointerEXT_remap_index 529
+#define TexCoordPointerEXT_remap_index 530
+#define VertexPointerEXT_remap_index 531
+#define DiscardFramebufferEXT_remap_index 532
+#define ActiveShaderProgram_remap_index 533
+#define BindProgramPipeline_remap_index 534
+#define CreateShaderProgramv_remap_index 535
+#define DeleteProgramPipelines_remap_index 536
+#define GenProgramPipelines_remap_index 537
+#define GetProgramPipelineInfoLog_remap_index 538
+#define GetProgramPipelineiv_remap_index 539
+#define IsProgramPipeline_remap_index 540
+#define LockArraysEXT_remap_index 541
+#define ProgramUniform1d_remap_index 542
+#define ProgramUniform1dv_remap_index 543
+#define ProgramUniform1f_remap_index 544
+#define ProgramUniform1fv_remap_index 545
+#define ProgramUniform1i_remap_index 546
+#define ProgramUniform1iv_remap_index 547
+#define ProgramUniform1ui_remap_index 548
+#define ProgramUniform1uiv_remap_index 549
+#define ProgramUniform2d_remap_index 550
+#define ProgramUniform2dv_remap_index 551
+#define ProgramUniform2f_remap_index 552
+#define ProgramUniform2fv_remap_index 553
+#define ProgramUniform2i_remap_index 554
+#define ProgramUniform2iv_remap_index 555
+#define ProgramUniform2ui_remap_index 556
+#define ProgramUniform2uiv_remap_index 557
+#define ProgramUniform3d_remap_index 558
+#define ProgramUniform3dv_remap_index 559
+#define ProgramUniform3f_remap_index 560
+#define ProgramUniform3fv_remap_index 561
+#define ProgramUniform3i_remap_index 562
+#define ProgramUniform3iv_remap_index 563
+#define ProgramUniform3ui_remap_index 564
+#define ProgramUniform3uiv_remap_index 565
+#define ProgramUniform4d_remap_index 566
+#define ProgramUniform4dv_remap_index 567
+#define ProgramUniform4f_remap_index 568
+#define ProgramUniform4fv_remap_index 569
+#define ProgramUniform4i_remap_index 570
+#define ProgramUniform4iv_remap_index 571
+#define ProgramUniform4ui_remap_index 572
+#define ProgramUniform4uiv_remap_index 573
+#define ProgramUniformMatrix2dv_remap_index 574
+#define ProgramUniformMatrix2fv_remap_index 575
+#define ProgramUniformMatrix2x3dv_remap_index 576
+#define ProgramUniformMatrix2x3fv_remap_index 577
+#define ProgramUniformMatrix2x4dv_remap_index 578
+#define ProgramUniformMatrix2x4fv_remap_index 579
+#define ProgramUniformMatrix3dv_remap_index 580
+#define ProgramUniformMatrix3fv_remap_index 581
+#define ProgramUniformMatrix3x2dv_remap_index 582
+#define ProgramUniformMatrix3x2fv_remap_index 583
+#define ProgramUniformMatrix3x4dv_remap_index 584
+#define ProgramUniformMatrix3x4fv_remap_index 585
+#define ProgramUniformMatrix4dv_remap_index 586
+#define ProgramUniformMatrix4fv_remap_index 587
+#define ProgramUniformMatrix4x2dv_remap_index 588
+#define ProgramUniformMatrix4x2fv_remap_index 589
+#define ProgramUniformMatrix4x3dv_remap_index 590
+#define ProgramUniformMatrix4x3fv_remap_index 591
+#define UnlockArraysEXT_remap_index 592
+#define UseProgramStages_remap_index 593
+#define ValidateProgramPipeline_remap_index 594
+#define DebugMessageCallback_remap_index 595
+#define DebugMessageControl_remap_index 596
+#define DebugMessageInsert_remap_index 597
+#define GetDebugMessageLog_remap_index 598
+#define GetObjectLabel_remap_index 599
+#define GetObjectPtrLabel_remap_index 600
+#define ObjectLabel_remap_index 601
+#define ObjectPtrLabel_remap_index 602
+#define PopDebugGroup_remap_index 603
+#define PushDebugGroup_remap_index 604
+#define SecondaryColor3fEXT_remap_index 605
+#define SecondaryColor3fvEXT_remap_index 606
+#define MultiDrawElementsEXT_remap_index 607
+#define FogCoordfEXT_remap_index 608
+#define FogCoordfvEXT_remap_index 609
+#define ResizeBuffersMESA_remap_index 610
+#define WindowPos4dMESA_remap_index 611
+#define WindowPos4dvMESA_remap_index 612
+#define WindowPos4fMESA_remap_index 613
+#define WindowPos4fvMESA_remap_index 614
+#define WindowPos4iMESA_remap_index 615
+#define WindowPos4ivMESA_remap_index 616
+#define WindowPos4sMESA_remap_index 617
+#define WindowPos4svMESA_remap_index 618
+#define MultiModeDrawArraysIBM_remap_index 619
+#define MultiModeDrawElementsIBM_remap_index 620
+#define AreProgramsResidentNV_remap_index 621
+#define ExecuteProgramNV_remap_index 622
+#define GetProgramParameterdvNV_remap_index 623
+#define GetProgramParameterfvNV_remap_index 624
+#define GetProgramStringNV_remap_index 625
+#define GetProgramivNV_remap_index 626
+#define GetTrackMatrixivNV_remap_index 627
+#define GetVertexAttribdvNV_remap_index 628
+#define GetVertexAttribfvNV_remap_index 629
+#define GetVertexAttribivNV_remap_index 630
+#define LoadProgramNV_remap_index 631
+#define ProgramParameters4dvNV_remap_index 632
+#define ProgramParameters4fvNV_remap_index 633
+#define RequestResidentProgramsNV_remap_index 634
+#define TrackMatrixNV_remap_index 635
+#define VertexAttrib1dNV_remap_index 636
+#define VertexAttrib1dvNV_remap_index 637
+#define VertexAttrib1fNV_remap_index 638
+#define VertexAttrib1fvNV_remap_index 639
+#define VertexAttrib1sNV_remap_index 640
+#define VertexAttrib1svNV_remap_index 641
+#define VertexAttrib2dNV_remap_index 642
+#define VertexAttrib2dvNV_remap_index 643
+#define VertexAttrib2fNV_remap_index 644
+#define VertexAttrib2fvNV_remap_index 645
+#define VertexAttrib2sNV_remap_index 646
+#define VertexAttrib2svNV_remap_index 647
+#define VertexAttrib3dNV_remap_index 648
+#define VertexAttrib3dvNV_remap_index 649
+#define VertexAttrib3fNV_remap_index 650
+#define VertexAttrib3fvNV_remap_index 651
+#define VertexAttrib3sNV_remap_index 652
+#define VertexAttrib3svNV_remap_index 653
+#define VertexAttrib4dNV_remap_index 654
+#define VertexAttrib4dvNV_remap_index 655
+#define VertexAttrib4fNV_remap_index 656
+#define VertexAttrib4fvNV_remap_index 657
+#define VertexAttrib4sNV_remap_index 658
+#define VertexAttrib4svNV_remap_index 659
+#define VertexAttrib4ubNV_remap_index 660
+#define VertexAttrib4ubvNV_remap_index 661
+#define VertexAttribPointerNV_remap_index 662
+#define VertexAttribs1dvNV_remap_index 663
+#define VertexAttribs1fvNV_remap_index 664
+#define VertexAttribs1svNV_remap_index 665
+#define VertexAttribs2dvNV_remap_index 666
+#define VertexAttribs2fvNV_remap_index 667
+#define VertexAttribs2svNV_remap_index 668
+#define VertexAttribs3dvNV_remap_index 669
+#define VertexAttribs3fvNV_remap_index 670
+#define VertexAttribs3svNV_remap_index 671
+#define VertexAttribs4dvNV_remap_index 672
+#define VertexAttribs4fvNV_remap_index 673
+#define VertexAttribs4svNV_remap_index 674
+#define VertexAttribs4ubvNV_remap_index 675
+#define GetTexBumpParameterfvATI_remap_index 676
+#define GetTexBumpParameterivATI_remap_index 677
+#define TexBumpParameterfvATI_remap_index 678
+#define TexBumpParameterivATI_remap_index 679
+#define AlphaFragmentOp1ATI_remap_index 680
+#define AlphaFragmentOp2ATI_remap_index 681
+#define AlphaFragmentOp3ATI_remap_index 682
+#define BeginFragmentShaderATI_remap_index 683
+#define BindFragmentShaderATI_remap_index 684
+#define ColorFragmentOp1ATI_remap_index 685
+#define ColorFragmentOp2ATI_remap_index 686
+#define ColorFragmentOp3ATI_remap_index 687
+#define DeleteFragmentShaderATI_remap_index 688
+#define EndFragmentShaderATI_remap_index 689
+#define GenFragmentShadersATI_remap_index 690
+#define PassTexCoordATI_remap_index 691
+#define SampleMapATI_remap_index 692
+#define SetFragmentShaderConstantATI_remap_index 693
+#define ActiveStencilFaceEXT_remap_index 694
+#define BindVertexArrayAPPLE_remap_index 695
+#define GenVertexArraysAPPLE_remap_index 696
+#define GetProgramNamedParameterdvNV_remap_index 697
+#define GetProgramNamedParameterfvNV_remap_index 698
+#define ProgramNamedParameter4dNV_remap_index 699
+#define ProgramNamedParameter4dvNV_remap_index 700
+#define ProgramNamedParameter4fNV_remap_index 701
+#define ProgramNamedParameter4fvNV_remap_index 702
+#define PrimitiveRestartNV_remap_index 703
+#define GetTexGenxvOES_remap_index 704
+#define TexGenxOES_remap_index 705
+#define TexGenxvOES_remap_index 706
+#define DepthBoundsEXT_remap_index 707
+#define BindFramebufferEXT_remap_index 708
+#define BindRenderbufferEXT_remap_index 709
+#define BufferParameteriAPPLE_remap_index 710
+#define FlushMappedBufferRangeAPPLE_remap_index 711
+#define VertexAttribI1iEXT_remap_index 712
+#define VertexAttribI1uiEXT_remap_index 713
+#define VertexAttribI2iEXT_remap_index 714
+#define VertexAttribI2ivEXT_remap_index 715
+#define VertexAttribI2uiEXT_remap_index 716
+#define VertexAttribI2uivEXT_remap_index 717
+#define VertexAttribI3iEXT_remap_index 718
+#define VertexAttribI3ivEXT_remap_index 719
+#define VertexAttribI3uiEXT_remap_index 720
+#define VertexAttribI3uivEXT_remap_index 721
+#define VertexAttribI4iEXT_remap_index 722
+#define VertexAttribI4ivEXT_remap_index 723
+#define VertexAttribI4uiEXT_remap_index 724
+#define VertexAttribI4uivEXT_remap_index 725
+#define ClearColorIiEXT_remap_index 726
+#define ClearColorIuiEXT_remap_index 727
+#define BindBufferOffsetEXT_remap_index 728
+#define BeginPerfMonitorAMD_remap_index 729
+#define DeletePerfMonitorsAMD_remap_index 730
+#define EndPerfMonitorAMD_remap_index 731
+#define GenPerfMonitorsAMD_remap_index 732
+#define GetPerfMonitorCounterDataAMD_remap_index 733
+#define GetPerfMonitorCounterInfoAMD_remap_index 734
+#define GetPerfMonitorCounterStringAMD_remap_index 735
+#define GetPerfMonitorCountersAMD_remap_index 736
+#define GetPerfMonitorGroupStringAMD_remap_index 737
+#define GetPerfMonitorGroupsAMD_remap_index 738
+#define SelectPerfMonitorCountersAMD_remap_index 739
+#define GetObjectParameterivAPPLE_remap_index 740
+#define ObjectPurgeableAPPLE_remap_index 741
+#define ObjectUnpurgeableAPPLE_remap_index 742
+#define ActiveProgramEXT_remap_index 743
+#define CreateShaderProgramEXT_remap_index 744
+#define UseShaderProgramEXT_remap_index 745
+#define TextureBarrierNV_remap_index 746
+#define VDPAUFiniNV_remap_index 747
+#define VDPAUGetSurfaceivNV_remap_index 748
+#define VDPAUInitNV_remap_index 749
+#define VDPAUIsSurfaceNV_remap_index 750
+#define VDPAUMapSurfacesNV_remap_index 751
+#define VDPAURegisterOutputSurfaceNV_remap_index 752
+#define VDPAURegisterVideoSurfaceNV_remap_index 753
+#define VDPAUSurfaceAccessNV_remap_index 754
+#define VDPAUUnmapSurfacesNV_remap_index 755
+#define VDPAUUnregisterSurfaceNV_remap_index 756
+#define BeginPerfQueryINTEL_remap_index 757
+#define CreatePerfQueryINTEL_remap_index 758
+#define DeletePerfQueryINTEL_remap_index 759
+#define EndPerfQueryINTEL_remap_index 760
+#define GetFirstPerfQueryIdINTEL_remap_index 761
+#define GetNextPerfQueryIdINTEL_remap_index 762
+#define GetPerfCounterInfoINTEL_remap_index 763
+#define GetPerfQueryDataINTEL_remap_index 764
+#define GetPerfQueryIdByNameINTEL_remap_index 765
+#define GetPerfQueryInfoINTEL_remap_index 766
+#define PolygonOffsetClampEXT_remap_index 767
+#define StencilFuncSeparateATI_remap_index 768
+#define ProgramEnvParameters4fvEXT_remap_index 769
+#define ProgramLocalParameters4fvEXT_remap_index 770
+#define EGLImageTargetRenderbufferStorageOES_remap_index 771
+#define EGLImageTargetTexture2DOES_remap_index 772
+#define AlphaFuncx_remap_index 773
+#define ClearColorx_remap_index 774
+#define ClearDepthx_remap_index 775
+#define Color4x_remap_index 776
+#define DepthRangex_remap_index 777
+#define Fogx_remap_index 778
+#define Fogxv_remap_index 779
+#define Frustumf_remap_index 780
+#define Frustumx_remap_index 781
+#define LightModelx_remap_index 782
+#define LightModelxv_remap_index 783
+#define Lightx_remap_index 784
+#define Lightxv_remap_index 785
+#define LineWidthx_remap_index 786
+#define LoadMatrixx_remap_index 787
+#define Materialx_remap_index 788
+#define Materialxv_remap_index 789
+#define MultMatrixx_remap_index 790
+#define MultiTexCoord4x_remap_index 791
+#define Normal3x_remap_index 792
+#define Orthof_remap_index 793
+#define Orthox_remap_index 794
+#define PointSizex_remap_index 795
+#define PolygonOffsetx_remap_index 796
+#define Rotatex_remap_index 797
+#define SampleCoveragex_remap_index 798
+#define Scalex_remap_index 799
+#define TexEnvx_remap_index 800
+#define TexEnvxv_remap_index 801
+#define TexParameterx_remap_index 802
+#define Translatex_remap_index 803
+#define ClipPlanef_remap_index 804
+#define ClipPlanex_remap_index 805
+#define GetClipPlanef_remap_index 806
+#define GetClipPlanex_remap_index 807
+#define GetFixedv_remap_index 808
+#define GetLightxv_remap_index 809
+#define GetMaterialxv_remap_index 810
+#define GetTexEnvxv_remap_index 811
+#define GetTexParameterxv_remap_index 812
+#define PointParameterx_remap_index 813
+#define PointParameterxv_remap_index 814
+#define TexParameterxv_remap_index 815
#define _gloffset_CompressedTexImage1D driDispatchRemapTable[CompressedTexImage1D_remap_index]
#define _gloffset_CompressedTexImage2D driDispatchRemapTable[CompressedTexImage2D_remap_index]
@@ -1591,6 +1659,24 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define _gloffset_VertexP4uiv driDispatchRemapTable[VertexP4uiv_remap_index]
#define _gloffset_DrawArraysIndirect driDispatchRemapTable[DrawArraysIndirect_remap_index]
#define _gloffset_DrawElementsIndirect driDispatchRemapTable[DrawElementsIndirect_remap_index]
+#define _gloffset_GetUniformdv driDispatchRemapTable[GetUniformdv_remap_index]
+#define _gloffset_Uniform1d driDispatchRemapTable[Uniform1d_remap_index]
+#define _gloffset_Uniform1dv driDispatchRemapTable[Uniform1dv_remap_index]
+#define _gloffset_Uniform2d driDispatchRemapTable[Uniform2d_remap_index]
+#define _gloffset_Uniform2dv driDispatchRemapTable[Uniform2dv_remap_index]
+#define _gloffset_Uniform3d driDispatchRemapTable[Uniform3d_remap_index]
+#define _gloffset_Uniform3dv driDispatchRemapTable[Uniform3dv_remap_index]
+#define _gloffset_Uniform4d driDispatchRemapTable[Uniform4d_remap_index]
+#define _gloffset_Uniform4dv driDispatchRemapTable[Uniform4dv_remap_index]
+#define _gloffset_UniformMatrix2dv driDispatchRemapTable[UniformMatrix2dv_remap_index]
+#define _gloffset_UniformMatrix2x3dv driDispatchRemapTable[UniformMatrix2x3dv_remap_index]
+#define _gloffset_UniformMatrix2x4dv driDispatchRemapTable[UniformMatrix2x4dv_remap_index]
+#define _gloffset_UniformMatrix3dv driDispatchRemapTable[UniformMatrix3dv_remap_index]
+#define _gloffset_UniformMatrix3x2dv driDispatchRemapTable[UniformMatrix3x2dv_remap_index]
+#define _gloffset_UniformMatrix3x4dv driDispatchRemapTable[UniformMatrix3x4dv_remap_index]
+#define _gloffset_UniformMatrix4dv driDispatchRemapTable[UniformMatrix4dv_remap_index]
+#define _gloffset_UniformMatrix4x2dv driDispatchRemapTable[UniformMatrix4x2dv_remap_index]
+#define _gloffset_UniformMatrix4x3dv driDispatchRemapTable[UniformMatrix4x3dv_remap_index]
#define _gloffset_BindTransformFeedback driDispatchRemapTable[BindTransformFeedback_remap_index]
#define _gloffset_DeleteTransformFeedbacks driDispatchRemapTable[DeleteTransformFeedbacks_remap_index]
#define _gloffset_DrawTransformFeedback driDispatchRemapTable[DrawTransformFeedback_remap_index]
@@ -1682,6 +1768,38 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define _gloffset_BindTextures driDispatchRemapTable[BindTextures_remap_index]
#define _gloffset_BindVertexBuffers driDispatchRemapTable[BindVertexBuffers_remap_index]
#define _gloffset_ClipControl driDispatchRemapTable[ClipControl_remap_index]
+#define _gloffset_BindTextureUnit driDispatchRemapTable[BindTextureUnit_remap_index]
+#define _gloffset_CompressedTextureSubImage1D driDispatchRemapTable[CompressedTextureSubImage1D_remap_index]
+#define _gloffset_CompressedTextureSubImage2D driDispatchRemapTable[CompressedTextureSubImage2D_remap_index]
+#define _gloffset_CompressedTextureSubImage3D driDispatchRemapTable[CompressedTextureSubImage3D_remap_index]
+#define _gloffset_CopyTextureSubImage1D driDispatchRemapTable[CopyTextureSubImage1D_remap_index]
+#define _gloffset_CopyTextureSubImage2D driDispatchRemapTable[CopyTextureSubImage2D_remap_index]
+#define _gloffset_CopyTextureSubImage3D driDispatchRemapTable[CopyTextureSubImage3D_remap_index]
+#define _gloffset_CreateTextures driDispatchRemapTable[CreateTextures_remap_index]
+#define _gloffset_GenerateTextureMipmap driDispatchRemapTable[GenerateTextureMipmap_remap_index]
+#define _gloffset_GetCompressedTextureImage driDispatchRemapTable[GetCompressedTextureImage_remap_index]
+#define _gloffset_GetTextureImage driDispatchRemapTable[GetTextureImage_remap_index]
+#define _gloffset_GetTextureLevelParameterfv driDispatchRemapTable[GetTextureLevelParameterfv_remap_index]
+#define _gloffset_GetTextureLevelParameteriv driDispatchRemapTable[GetTextureLevelParameteriv_remap_index]
+#define _gloffset_GetTextureParameterIiv driDispatchRemapTable[GetTextureParameterIiv_remap_index]
+#define _gloffset_GetTextureParameterIuiv driDispatchRemapTable[GetTextureParameterIuiv_remap_index]
+#define _gloffset_GetTextureParameterfv driDispatchRemapTable[GetTextureParameterfv_remap_index]
+#define _gloffset_GetTextureParameteriv driDispatchRemapTable[GetTextureParameteriv_remap_index]
+#define _gloffset_TextureBuffer driDispatchRemapTable[TextureBuffer_remap_index]
+#define _gloffset_TextureParameterIiv driDispatchRemapTable[TextureParameterIiv_remap_index]
+#define _gloffset_TextureParameterIuiv driDispatchRemapTable[TextureParameterIuiv_remap_index]
+#define _gloffset_TextureParameterf driDispatchRemapTable[TextureParameterf_remap_index]
+#define _gloffset_TextureParameterfv driDispatchRemapTable[TextureParameterfv_remap_index]
+#define _gloffset_TextureParameteri driDispatchRemapTable[TextureParameteri_remap_index]
+#define _gloffset_TextureParameteriv driDispatchRemapTable[TextureParameteriv_remap_index]
+#define _gloffset_TextureStorage1D driDispatchRemapTable[TextureStorage1D_remap_index]
+#define _gloffset_TextureStorage2D driDispatchRemapTable[TextureStorage2D_remap_index]
+#define _gloffset_TextureStorage2DMultisample driDispatchRemapTable[TextureStorage2DMultisample_remap_index]
+#define _gloffset_TextureStorage3D driDispatchRemapTable[TextureStorage3D_remap_index]
+#define _gloffset_TextureStorage3DMultisample driDispatchRemapTable[TextureStorage3DMultisample_remap_index]
+#define _gloffset_TextureSubImage1D driDispatchRemapTable[TextureSubImage1D_remap_index]
+#define _gloffset_TextureSubImage2D driDispatchRemapTable[TextureSubImage2D_remap_index]
+#define _gloffset_TextureSubImage3D driDispatchRemapTable[TextureSubImage3D_remap_index]
#define _gloffset_InvalidateBufferData driDispatchRemapTable[InvalidateBufferData_remap_index]
#define _gloffset_InvalidateBufferSubData driDispatchRemapTable[InvalidateBufferSubData_remap_index]
#define _gloffset_InvalidateFramebuffer driDispatchRemapTable[InvalidateFramebuffer_remap_index]
@@ -1717,38 +1835,55 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define _gloffset_GetProgramPipelineiv driDispatchRemapTable[GetProgramPipelineiv_remap_index]
#define _gloffset_IsProgramPipeline driDispatchRemapTable[IsProgramPipeline_remap_index]
#define _gloffset_LockArraysEXT driDispatchRemapTable[LockArraysEXT_remap_index]
+#define _gloffset_ProgramUniform1d driDispatchRemapTable[ProgramUniform1d_remap_index]
+#define _gloffset_ProgramUniform1dv driDispatchRemapTable[ProgramUniform1dv_remap_index]
#define _gloffset_ProgramUniform1f driDispatchRemapTable[ProgramUniform1f_remap_index]
#define _gloffset_ProgramUniform1fv driDispatchRemapTable[ProgramUniform1fv_remap_index]
#define _gloffset_ProgramUniform1i driDispatchRemapTable[ProgramUniform1i_remap_index]
#define _gloffset_ProgramUniform1iv driDispatchRemapTable[ProgramUniform1iv_remap_index]
#define _gloffset_ProgramUniform1ui driDispatchRemapTable[ProgramUniform1ui_remap_index]
#define _gloffset_ProgramUniform1uiv driDispatchRemapTable[ProgramUniform1uiv_remap_index]
+#define _gloffset_ProgramUniform2d driDispatchRemapTable[ProgramUniform2d_remap_index]
+#define _gloffset_ProgramUniform2dv driDispatchRemapTable[ProgramUniform2dv_remap_index]
#define _gloffset_ProgramUniform2f driDispatchRemapTable[ProgramUniform2f_remap_index]
#define _gloffset_ProgramUniform2fv driDispatchRemapTable[ProgramUniform2fv_remap_index]
#define _gloffset_ProgramUniform2i driDispatchRemapTable[ProgramUniform2i_remap_index]
#define _gloffset_ProgramUniform2iv driDispatchRemapTable[ProgramUniform2iv_remap_index]
#define _gloffset_ProgramUniform2ui driDispatchRemapTable[ProgramUniform2ui_remap_index]
#define _gloffset_ProgramUniform2uiv driDispatchRemapTable[ProgramUniform2uiv_remap_index]
+#define _gloffset_ProgramUniform3d driDispatchRemapTable[ProgramUniform3d_remap_index]
+#define _gloffset_ProgramUniform3dv driDispatchRemapTable[ProgramUniform3dv_remap_index]
#define _gloffset_ProgramUniform3f driDispatchRemapTable[ProgramUniform3f_remap_index]
#define _gloffset_ProgramUniform3fv driDispatchRemapTable[ProgramUniform3fv_remap_index]
#define _gloffset_ProgramUniform3i driDispatchRemapTable[ProgramUniform3i_remap_index]
#define _gloffset_ProgramUniform3iv driDispatchRemapTable[ProgramUniform3iv_remap_index]
#define _gloffset_ProgramUniform3ui driDispatchRemapTable[ProgramUniform3ui_remap_index]
#define _gloffset_ProgramUniform3uiv driDispatchRemapTable[ProgramUniform3uiv_remap_index]
+#define _gloffset_ProgramUniform4d driDispatchRemapTable[ProgramUniform4d_remap_index]
+#define _gloffset_ProgramUniform4dv driDispatchRemapTable[ProgramUniform4dv_remap_index]
#define _gloffset_ProgramUniform4f driDispatchRemapTable[ProgramUniform4f_remap_index]
#define _gloffset_ProgramUniform4fv driDispatchRemapTable[ProgramUniform4fv_remap_index]
#define _gloffset_ProgramUniform4i driDispatchRemapTable[ProgramUniform4i_remap_index]
#define _gloffset_ProgramUniform4iv driDispatchRemapTable[ProgramUniform4iv_remap_index]
#define _gloffset_ProgramUniform4ui driDispatchRemapTable[ProgramUniform4ui_remap_index]
#define _gloffset_ProgramUniform4uiv driDispatchRemapTable[ProgramUniform4uiv_remap_index]
+#define _gloffset_ProgramUniformMatrix2dv driDispatchRemapTable[ProgramUniformMatrix2dv_remap_index]
#define _gloffset_ProgramUniformMatrix2fv driDispatchRemapTable[ProgramUniformMatrix2fv_remap_index]
+#define _gloffset_ProgramUniformMatrix2x3dv driDispatchRemapTable[ProgramUniformMatrix2x3dv_remap_index]
#define _gloffset_ProgramUniformMatrix2x3fv driDispatchRemapTable[ProgramUniformMatrix2x3fv_remap_index]
+#define _gloffset_ProgramUniformMatrix2x4dv driDispatchRemapTable[ProgramUniformMatrix2x4dv_remap_index]
#define _gloffset_ProgramUniformMatrix2x4fv driDispatchRemapTable[ProgramUniformMatrix2x4fv_remap_index]
+#define _gloffset_ProgramUniformMatrix3dv driDispatchRemapTable[ProgramUniformMatrix3dv_remap_index]
#define _gloffset_ProgramUniformMatrix3fv driDispatchRemapTable[ProgramUniformMatrix3fv_remap_index]
+#define _gloffset_ProgramUniformMatrix3x2dv driDispatchRemapTable[ProgramUniformMatrix3x2dv_remap_index]
#define _gloffset_ProgramUniformMatrix3x2fv driDispatchRemapTable[ProgramUniformMatrix3x2fv_remap_index]
+#define _gloffset_ProgramUniformMatrix3x4dv driDispatchRemapTable[ProgramUniformMatrix3x4dv_remap_index]
#define _gloffset_ProgramUniformMatrix3x4fv driDispatchRemapTable[ProgramUniformMatrix3x4fv_remap_index]
+#define _gloffset_ProgramUniformMatrix4dv driDispatchRemapTable[ProgramUniformMatrix4dv_remap_index]
#define _gloffset_ProgramUniformMatrix4fv driDispatchRemapTable[ProgramUniformMatrix4fv_remap_index]
+#define _gloffset_ProgramUniformMatrix4x2dv driDispatchRemapTable[ProgramUniformMatrix4x2dv_remap_index]
#define _gloffset_ProgramUniformMatrix4x2fv driDispatchRemapTable[ProgramUniformMatrix4x2fv_remap_index]
+#define _gloffset_ProgramUniformMatrix4x3dv driDispatchRemapTable[ProgramUniformMatrix4x3dv_remap_index]
#define _gloffset_ProgramUniformMatrix4x3fv driDispatchRemapTable[ProgramUniformMatrix4x3fv_remap_index]
#define _gloffset_UnlockArraysEXT driDispatchRemapTable[UnlockArraysEXT_remap_index]
#define _gloffset_UseProgramStages driDispatchRemapTable[UseProgramStages_remap_index]
@@ -1925,6 +2060,7 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define _gloffset_GetPerfQueryDataINTEL driDispatchRemapTable[GetPerfQueryDataINTEL_remap_index]
#define _gloffset_GetPerfQueryIdByNameINTEL driDispatchRemapTable[GetPerfQueryIdByNameINTEL_remap_index]
#define _gloffset_GetPerfQueryInfoINTEL driDispatchRemapTable[GetPerfQueryInfoINTEL_remap_index]
+#define _gloffset_PolygonOffsetClampEXT driDispatchRemapTable[PolygonOffsetClampEXT_remap_index]
#define _gloffset_StencilFuncSeparateATI driDispatchRemapTable[StencilFuncSeparateATI_remap_index]
#define _gloffset_ProgramEnvParameters4fvEXT driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index]
#define _gloffset_ProgramLocalParameters4fvEXT driDispatchRemapTable[ProgramLocalParameters4fvEXT_remap_index]
@@ -10488,6 +10624,204 @@ static INLINE void SET_DrawElementsIndirect(struct _glapi_table *disp, void (GLA
SET_by_offset(disp, _gloffset_DrawElementsIndirect, fn);
}
+typedef void (GLAPIENTRYP _glptr_GetUniformdv)(GLuint, GLint, GLdouble *);
+#define CALL_GetUniformdv(disp, parameters) \
+ (* GET_GetUniformdv(disp)) parameters
+static INLINE _glptr_GetUniformdv GET_GetUniformdv(struct _glapi_table *disp) {
+ return (_glptr_GetUniformdv) (GET_by_offset(disp, _gloffset_GetUniformdv));
+}
+
+static INLINE void SET_GetUniformdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLdouble *)) {
+ SET_by_offset(disp, _gloffset_GetUniformdv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Uniform1d)(GLint, GLdouble);
+#define CALL_Uniform1d(disp, parameters) \
+ (* GET_Uniform1d(disp)) parameters
+static INLINE _glptr_Uniform1d GET_Uniform1d(struct _glapi_table *disp) {
+ return (_glptr_Uniform1d) (GET_by_offset(disp, _gloffset_Uniform1d));
+}
+
+static INLINE void SET_Uniform1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLdouble)) {
+ SET_by_offset(disp, _gloffset_Uniform1d, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Uniform1dv)(GLint, GLsizei, const GLdouble *);
+#define CALL_Uniform1dv(disp, parameters) \
+ (* GET_Uniform1dv(disp)) parameters
+static INLINE _glptr_Uniform1dv GET_Uniform1dv(struct _glapi_table *disp) {
+ return (_glptr_Uniform1dv) (GET_by_offset(disp, _gloffset_Uniform1dv));
+}
+
+static INLINE void SET_Uniform1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_Uniform1dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Uniform2d)(GLint, GLdouble, GLdouble);
+#define CALL_Uniform2d(disp, parameters) \
+ (* GET_Uniform2d(disp)) parameters
+static INLINE _glptr_Uniform2d GET_Uniform2d(struct _glapi_table *disp) {
+ return (_glptr_Uniform2d) (GET_by_offset(disp, _gloffset_Uniform2d));
+}
+
+static INLINE void SET_Uniform2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLdouble, GLdouble)) {
+ SET_by_offset(disp, _gloffset_Uniform2d, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Uniform2dv)(GLint, GLsizei, const GLdouble *);
+#define CALL_Uniform2dv(disp, parameters) \
+ (* GET_Uniform2dv(disp)) parameters
+static INLINE _glptr_Uniform2dv GET_Uniform2dv(struct _glapi_table *disp) {
+ return (_glptr_Uniform2dv) (GET_by_offset(disp, _gloffset_Uniform2dv));
+}
+
+static INLINE void SET_Uniform2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_Uniform2dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Uniform3d)(GLint, GLdouble, GLdouble, GLdouble);
+#define CALL_Uniform3d(disp, parameters) \
+ (* GET_Uniform3d(disp)) parameters
+static INLINE _glptr_Uniform3d GET_Uniform3d(struct _glapi_table *disp) {
+ return (_glptr_Uniform3d) (GET_by_offset(disp, _gloffset_Uniform3d));
+}
+
+static INLINE void SET_Uniform3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLdouble, GLdouble, GLdouble)) {
+ SET_by_offset(disp, _gloffset_Uniform3d, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Uniform3dv)(GLint, GLsizei, const GLdouble *);
+#define CALL_Uniform3dv(disp, parameters) \
+ (* GET_Uniform3dv(disp)) parameters
+static INLINE _glptr_Uniform3dv GET_Uniform3dv(struct _glapi_table *disp) {
+ return (_glptr_Uniform3dv) (GET_by_offset(disp, _gloffset_Uniform3dv));
+}
+
+static INLINE void SET_Uniform3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_Uniform3dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Uniform4d)(GLint, GLdouble, GLdouble, GLdouble, GLdouble);
+#define CALL_Uniform4d(disp, parameters) \
+ (* GET_Uniform4d(disp)) parameters
+static INLINE _glptr_Uniform4d GET_Uniform4d(struct _glapi_table *disp) {
+ return (_glptr_Uniform4d) (GET_by_offset(disp, _gloffset_Uniform4d));
+}
+
+static INLINE void SET_Uniform4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLdouble, GLdouble, GLdouble, GLdouble)) {
+ SET_by_offset(disp, _gloffset_Uniform4d, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Uniform4dv)(GLint, GLsizei, const GLdouble *);
+#define CALL_Uniform4dv(disp, parameters) \
+ (* GET_Uniform4dv(disp)) parameters
+static INLINE _glptr_Uniform4dv GET_Uniform4dv(struct _glapi_table *disp) {
+ return (_glptr_Uniform4dv) (GET_by_offset(disp, _gloffset_Uniform4dv));
+}
+
+static INLINE void SET_Uniform4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_Uniform4dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_UniformMatrix2dv)(GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_UniformMatrix2dv(disp, parameters) \
+ (* GET_UniformMatrix2dv(disp)) parameters
+static INLINE _glptr_UniformMatrix2dv GET_UniformMatrix2dv(struct _glapi_table *disp) {
+ return (_glptr_UniformMatrix2dv) (GET_by_offset(disp, _gloffset_UniformMatrix2dv));
+}
+
+static INLINE void SET_UniformMatrix2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_UniformMatrix2dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_UniformMatrix2x3dv)(GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_UniformMatrix2x3dv(disp, parameters) \
+ (* GET_UniformMatrix2x3dv(disp)) parameters
+static INLINE _glptr_UniformMatrix2x3dv GET_UniformMatrix2x3dv(struct _glapi_table *disp) {
+ return (_glptr_UniformMatrix2x3dv) (GET_by_offset(disp, _gloffset_UniformMatrix2x3dv));
+}
+
+static INLINE void SET_UniformMatrix2x3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_UniformMatrix2x3dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_UniformMatrix2x4dv)(GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_UniformMatrix2x4dv(disp, parameters) \
+ (* GET_UniformMatrix2x4dv(disp)) parameters
+static INLINE _glptr_UniformMatrix2x4dv GET_UniformMatrix2x4dv(struct _glapi_table *disp) {
+ return (_glptr_UniformMatrix2x4dv) (GET_by_offset(disp, _gloffset_UniformMatrix2x4dv));
+}
+
+static INLINE void SET_UniformMatrix2x4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_UniformMatrix2x4dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_UniformMatrix3dv)(GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_UniformMatrix3dv(disp, parameters) \
+ (* GET_UniformMatrix3dv(disp)) parameters
+static INLINE _glptr_UniformMatrix3dv GET_UniformMatrix3dv(struct _glapi_table *disp) {
+ return (_glptr_UniformMatrix3dv) (GET_by_offset(disp, _gloffset_UniformMatrix3dv));
+}
+
+static INLINE void SET_UniformMatrix3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_UniformMatrix3dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_UniformMatrix3x2dv)(GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_UniformMatrix3x2dv(disp, parameters) \
+ (* GET_UniformMatrix3x2dv(disp)) parameters
+static INLINE _glptr_UniformMatrix3x2dv GET_UniformMatrix3x2dv(struct _glapi_table *disp) {
+ return (_glptr_UniformMatrix3x2dv) (GET_by_offset(disp, _gloffset_UniformMatrix3x2dv));
+}
+
+static INLINE void SET_UniformMatrix3x2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_UniformMatrix3x2dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_UniformMatrix3x4dv)(GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_UniformMatrix3x4dv(disp, parameters) \
+ (* GET_UniformMatrix3x4dv(disp)) parameters
+static INLINE _glptr_UniformMatrix3x4dv GET_UniformMatrix3x4dv(struct _glapi_table *disp) {
+ return (_glptr_UniformMatrix3x4dv) (GET_by_offset(disp, _gloffset_UniformMatrix3x4dv));
+}
+
+static INLINE void SET_UniformMatrix3x4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_UniformMatrix3x4dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_UniformMatrix4dv)(GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_UniformMatrix4dv(disp, parameters) \
+ (* GET_UniformMatrix4dv(disp)) parameters
+static INLINE _glptr_UniformMatrix4dv GET_UniformMatrix4dv(struct _glapi_table *disp) {
+ return (_glptr_UniformMatrix4dv) (GET_by_offset(disp, _gloffset_UniformMatrix4dv));
+}
+
+static INLINE void SET_UniformMatrix4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_UniformMatrix4dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_UniformMatrix4x2dv)(GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_UniformMatrix4x2dv(disp, parameters) \
+ (* GET_UniformMatrix4x2dv(disp)) parameters
+static INLINE _glptr_UniformMatrix4x2dv GET_UniformMatrix4x2dv(struct _glapi_table *disp) {
+ return (_glptr_UniformMatrix4x2dv) (GET_by_offset(disp, _gloffset_UniformMatrix4x2dv));
+}
+
+static INLINE void SET_UniformMatrix4x2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_UniformMatrix4x2dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_UniformMatrix4x3dv)(GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_UniformMatrix4x3dv(disp, parameters) \
+ (* GET_UniformMatrix4x3dv(disp)) parameters
+static INLINE _glptr_UniformMatrix4x3dv GET_UniformMatrix4x3dv(struct _glapi_table *disp) {
+ return (_glptr_UniformMatrix4x3dv) (GET_by_offset(disp, _gloffset_UniformMatrix4x3dv));
+}
+
+static INLINE void SET_UniformMatrix4x3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_UniformMatrix4x3dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_BindTransformFeedback)(GLenum, GLuint);
#define CALL_BindTransformFeedback(disp, parameters) \
(* GET_BindTransformFeedback(disp)) parameters
@@ -11489,6 +11823,358 @@ static INLINE void SET_ClipControl(struct _glapi_table *disp, void (GLAPIENTRYP
SET_by_offset(disp, _gloffset_ClipControl, fn);
}
+typedef void (GLAPIENTRYP _glptr_BindTextureUnit)(GLuint, GLuint);
+#define CALL_BindTextureUnit(disp, parameters) \
+ (* GET_BindTextureUnit(disp)) parameters
+static INLINE _glptr_BindTextureUnit GET_BindTextureUnit(struct _glapi_table *disp) {
+ return (_glptr_BindTextureUnit) (GET_by_offset(disp, _gloffset_BindTextureUnit));
+}
+
+static INLINE void SET_BindTextureUnit(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
+ SET_by_offset(disp, _gloffset_BindTextureUnit, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CompressedTextureSubImage1D)(GLuint, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+#define CALL_CompressedTextureSubImage1D(disp, parameters) \
+ (* GET_CompressedTextureSubImage1D(disp)) parameters
+static INLINE _glptr_CompressedTextureSubImage1D GET_CompressedTextureSubImage1D(struct _glapi_table *disp) {
+ return (_glptr_CompressedTextureSubImage1D) (GET_by_offset(disp, _gloffset_CompressedTextureSubImage1D));
+}
+
+static INLINE void SET_CompressedTextureSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *)) {
+ SET_by_offset(disp, _gloffset_CompressedTextureSubImage1D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CompressedTextureSubImage2D)(GLuint, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+#define CALL_CompressedTextureSubImage2D(disp, parameters) \
+ (* GET_CompressedTextureSubImage2D(disp)) parameters
+static INLINE _glptr_CompressedTextureSubImage2D GET_CompressedTextureSubImage2D(struct _glapi_table *disp) {
+ return (_glptr_CompressedTextureSubImage2D) (GET_by_offset(disp, _gloffset_CompressedTextureSubImage2D));
+}
+
+static INLINE void SET_CompressedTextureSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)) {
+ SET_by_offset(disp, _gloffset_CompressedTextureSubImage2D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CompressedTextureSubImage3D)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+#define CALL_CompressedTextureSubImage3D(disp, parameters) \
+ (* GET_CompressedTextureSubImage3D(disp)) parameters
+static INLINE _glptr_CompressedTextureSubImage3D GET_CompressedTextureSubImage3D(struct _glapi_table *disp) {
+ return (_glptr_CompressedTextureSubImage3D) (GET_by_offset(disp, _gloffset_CompressedTextureSubImage3D));
+}
+
+static INLINE void SET_CompressedTextureSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)) {
+ SET_by_offset(disp, _gloffset_CompressedTextureSubImage3D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CopyTextureSubImage1D)(GLuint, GLint, GLint, GLint, GLint, GLsizei);
+#define CALL_CopyTextureSubImage1D(disp, parameters) \
+ (* GET_CopyTextureSubImage1D(disp)) parameters
+static INLINE _glptr_CopyTextureSubImage1D GET_CopyTextureSubImage1D(struct _glapi_table *disp) {
+ return (_glptr_CopyTextureSubImage1D) (GET_by_offset(disp, _gloffset_CopyTextureSubImage1D));
+}
+
+static INLINE void SET_CopyTextureSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint, GLsizei)) {
+ SET_by_offset(disp, _gloffset_CopyTextureSubImage1D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CopyTextureSubImage2D)(GLuint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#define CALL_CopyTextureSubImage2D(disp, parameters) \
+ (* GET_CopyTextureSubImage2D(disp)) parameters
+static INLINE _glptr_CopyTextureSubImage2D GET_CopyTextureSubImage2D(struct _glapi_table *disp) {
+ return (_glptr_CopyTextureSubImage2D) (GET_by_offset(disp, _gloffset_CopyTextureSubImage2D));
+}
+
+static INLINE void SET_CopyTextureSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)) {
+ SET_by_offset(disp, _gloffset_CopyTextureSubImage2D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CopyTextureSubImage3D)(GLuint, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#define CALL_CopyTextureSubImage3D(disp, parameters) \
+ (* GET_CopyTextureSubImage3D(disp)) parameters
+static INLINE _glptr_CopyTextureSubImage3D GET_CopyTextureSubImage3D(struct _glapi_table *disp) {
+ return (_glptr_CopyTextureSubImage3D) (GET_by_offset(disp, _gloffset_CopyTextureSubImage3D));
+}
+
+static INLINE void SET_CopyTextureSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)) {
+ SET_by_offset(disp, _gloffset_CopyTextureSubImage3D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CreateTextures)(GLenum, GLsizei, GLuint *);
+#define CALL_CreateTextures(disp, parameters) \
+ (* GET_CreateTextures(disp)) parameters
+static INLINE _glptr_CreateTextures GET_CreateTextures(struct _glapi_table *disp) {
+ return (_glptr_CreateTextures) (GET_by_offset(disp, _gloffset_CreateTextures));
+}
+
+static INLINE void SET_CreateTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLuint *)) {
+ SET_by_offset(disp, _gloffset_CreateTextures, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GenerateTextureMipmap)(GLuint);
+#define CALL_GenerateTextureMipmap(disp, parameters) \
+ (* GET_GenerateTextureMipmap(disp)) parameters
+static INLINE _glptr_GenerateTextureMipmap GET_GenerateTextureMipmap(struct _glapi_table *disp) {
+ return (_glptr_GenerateTextureMipmap) (GET_by_offset(disp, _gloffset_GenerateTextureMipmap));
+}
+
+static INLINE void SET_GenerateTextureMipmap(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+ SET_by_offset(disp, _gloffset_GenerateTextureMipmap, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetCompressedTextureImage)(GLuint, GLint, GLsizei, GLvoid *);
+#define CALL_GetCompressedTextureImage(disp, parameters) \
+ (* GET_GetCompressedTextureImage(disp)) parameters
+static INLINE _glptr_GetCompressedTextureImage GET_GetCompressedTextureImage(struct _glapi_table *disp) {
+ return (_glptr_GetCompressedTextureImage) (GET_by_offset(disp, _gloffset_GetCompressedTextureImage));
+}
+
+static INLINE void SET_GetCompressedTextureImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLvoid *)) {
+ SET_by_offset(disp, _gloffset_GetCompressedTextureImage, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTextureImage)(GLuint, GLint, GLenum, GLenum, GLsizei, GLvoid *);
+#define CALL_GetTextureImage(disp, parameters) \
+ (* GET_GetTextureImage(disp)) parameters
+static INLINE _glptr_GetTextureImage GET_GetTextureImage(struct _glapi_table *disp) {
+ return (_glptr_GetTextureImage) (GET_by_offset(disp, _gloffset_GetTextureImage));
+}
+
+static INLINE void SET_GetTextureImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLenum, GLsizei, GLvoid *)) {
+ SET_by_offset(disp, _gloffset_GetTextureImage, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTextureLevelParameterfv)(GLuint, GLint, GLenum, GLfloat *);
+#define CALL_GetTextureLevelParameterfv(disp, parameters) \
+ (* GET_GetTextureLevelParameterfv(disp)) parameters
+static INLINE _glptr_GetTextureLevelParameterfv GET_GetTextureLevelParameterfv(struct _glapi_table *disp) {
+ return (_glptr_GetTextureLevelParameterfv) (GET_by_offset(disp, _gloffset_GetTextureLevelParameterfv));
+}
+
+static INLINE void SET_GetTextureLevelParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLfloat *)) {
+ SET_by_offset(disp, _gloffset_GetTextureLevelParameterfv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTextureLevelParameteriv)(GLuint, GLint, GLenum, GLint *);
+#define CALL_GetTextureLevelParameteriv(disp, parameters) \
+ (* GET_GetTextureLevelParameteriv(disp)) parameters
+static INLINE _glptr_GetTextureLevelParameteriv GET_GetTextureLevelParameteriv(struct _glapi_table *disp) {
+ return (_glptr_GetTextureLevelParameteriv) (GET_by_offset(disp, _gloffset_GetTextureLevelParameteriv));
+}
+
+static INLINE void SET_GetTextureLevelParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLint *)) {
+ SET_by_offset(disp, _gloffset_GetTextureLevelParameteriv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTextureParameterIiv)(GLuint, GLenum, GLint *);
+#define CALL_GetTextureParameterIiv(disp, parameters) \
+ (* GET_GetTextureParameterIiv(disp)) parameters
+static INLINE _glptr_GetTextureParameterIiv GET_GetTextureParameterIiv(struct _glapi_table *disp) {
+ return (_glptr_GetTextureParameterIiv) (GET_by_offset(disp, _gloffset_GetTextureParameterIiv));
+}
+
+static INLINE void SET_GetTextureParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+ SET_by_offset(disp, _gloffset_GetTextureParameterIiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTextureParameterIuiv)(GLuint, GLenum, GLuint *);
+#define CALL_GetTextureParameterIuiv(disp, parameters) \
+ (* GET_GetTextureParameterIuiv(disp)) parameters
+static INLINE _glptr_GetTextureParameterIuiv GET_GetTextureParameterIuiv(struct _glapi_table *disp) {
+ return (_glptr_GetTextureParameterIuiv) (GET_by_offset(disp, _gloffset_GetTextureParameterIuiv));
+}
+
+static INLINE void SET_GetTextureParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) {
+ SET_by_offset(disp, _gloffset_GetTextureParameterIuiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTextureParameterfv)(GLuint, GLenum, GLfloat *);
+#define CALL_GetTextureParameterfv(disp, parameters) \
+ (* GET_GetTextureParameterfv(disp)) parameters
+static INLINE _glptr_GetTextureParameterfv GET_GetTextureParameterfv(struct _glapi_table *disp) {
+ return (_glptr_GetTextureParameterfv) (GET_by_offset(disp, _gloffset_GetTextureParameterfv));
+}
+
+static INLINE void SET_GetTextureParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) {
+ SET_by_offset(disp, _gloffset_GetTextureParameterfv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTextureParameteriv)(GLuint, GLenum, GLint *);
+#define CALL_GetTextureParameteriv(disp, parameters) \
+ (* GET_GetTextureParameteriv(disp)) parameters
+static INLINE _glptr_GetTextureParameteriv GET_GetTextureParameteriv(struct _glapi_table *disp) {
+ return (_glptr_GetTextureParameteriv) (GET_by_offset(disp, _gloffset_GetTextureParameteriv));
+}
+
+static INLINE void SET_GetTextureParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+ SET_by_offset(disp, _gloffset_GetTextureParameteriv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureBuffer)(GLuint, GLenum, GLuint);
+#define CALL_TextureBuffer(disp, parameters) \
+ (* GET_TextureBuffer(disp)) parameters
+static INLINE _glptr_TextureBuffer GET_TextureBuffer(struct _glapi_table *disp) {
+ return (_glptr_TextureBuffer) (GET_by_offset(disp, _gloffset_TextureBuffer));
+}
+
+static INLINE void SET_TextureBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint)) {
+ SET_by_offset(disp, _gloffset_TextureBuffer, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureParameterIiv)(GLuint, GLenum, const GLint *);
+#define CALL_TextureParameterIiv(disp, parameters) \
+ (* GET_TextureParameterIiv(disp)) parameters
+static INLINE _glptr_TextureParameterIiv GET_TextureParameterIiv(struct _glapi_table *disp) {
+ return (_glptr_TextureParameterIiv) (GET_by_offset(disp, _gloffset_TextureParameterIiv));
+}
+
+static INLINE void SET_TextureParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLint *)) {
+ SET_by_offset(disp, _gloffset_TextureParameterIiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureParameterIuiv)(GLuint, GLenum, const GLuint *);
+#define CALL_TextureParameterIuiv(disp, parameters) \
+ (* GET_TextureParameterIuiv(disp)) parameters
+static INLINE _glptr_TextureParameterIuiv GET_TextureParameterIuiv(struct _glapi_table *disp) {
+ return (_glptr_TextureParameterIuiv) (GET_by_offset(disp, _gloffset_TextureParameterIuiv));
+}
+
+static INLINE void SET_TextureParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLuint *)) {
+ SET_by_offset(disp, _gloffset_TextureParameterIuiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureParameterf)(GLuint, GLenum, GLfloat);
+#define CALL_TextureParameterf(disp, parameters) \
+ (* GET_TextureParameterf(disp)) parameters
+static INLINE _glptr_TextureParameterf GET_TextureParameterf(struct _glapi_table *disp) {
+ return (_glptr_TextureParameterf) (GET_by_offset(disp, _gloffset_TextureParameterf));
+}
+
+static INLINE void SET_TextureParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat)) {
+ SET_by_offset(disp, _gloffset_TextureParameterf, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureParameterfv)(GLuint, GLenum, const GLfloat *);
+#define CALL_TextureParameterfv(disp, parameters) \
+ (* GET_TextureParameterfv(disp)) parameters
+static INLINE _glptr_TextureParameterfv GET_TextureParameterfv(struct _glapi_table *disp) {
+ return (_glptr_TextureParameterfv) (GET_by_offset(disp, _gloffset_TextureParameterfv));
+}
+
+static INLINE void SET_TextureParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLfloat *)) {
+ SET_by_offset(disp, _gloffset_TextureParameterfv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureParameteri)(GLuint, GLenum, GLint);
+#define CALL_TextureParameteri(disp, parameters) \
+ (* GET_TextureParameteri(disp)) parameters
+static INLINE _glptr_TextureParameteri GET_TextureParameteri(struct _glapi_table *disp) {
+ return (_glptr_TextureParameteri) (GET_by_offset(disp, _gloffset_TextureParameteri));
+}
+
+static INLINE void SET_TextureParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint)) {
+ SET_by_offset(disp, _gloffset_TextureParameteri, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureParameteriv)(GLuint, GLenum, const GLint *);
+#define CALL_TextureParameteriv(disp, parameters) \
+ (* GET_TextureParameteriv(disp)) parameters
+static INLINE _glptr_TextureParameteriv GET_TextureParameteriv(struct _glapi_table *disp) {
+ return (_glptr_TextureParameteriv) (GET_by_offset(disp, _gloffset_TextureParameteriv));
+}
+
+static INLINE void SET_TextureParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLint *)) {
+ SET_by_offset(disp, _gloffset_TextureParameteriv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureStorage1D)(GLuint, GLsizei, GLenum, GLsizei);
+#define CALL_TextureStorage1D(disp, parameters) \
+ (* GET_TextureStorage1D(disp)) parameters
+static INLINE _glptr_TextureStorage1D GET_TextureStorage1D(struct _glapi_table *disp) {
+ return (_glptr_TextureStorage1D) (GET_by_offset(disp, _gloffset_TextureStorage1D));
+}
+
+static INLINE void SET_TextureStorage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum, GLsizei)) {
+ SET_by_offset(disp, _gloffset_TextureStorage1D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureStorage2D)(GLuint, GLsizei, GLenum, GLsizei, GLsizei);
+#define CALL_TextureStorage2D(disp, parameters) \
+ (* GET_TextureStorage2D(disp)) parameters
+static INLINE _glptr_TextureStorage2D GET_TextureStorage2D(struct _glapi_table *disp) {
+ return (_glptr_TextureStorage2D) (GET_by_offset(disp, _gloffset_TextureStorage2D));
+}
+
+static INLINE void SET_TextureStorage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum, GLsizei, GLsizei)) {
+ SET_by_offset(disp, _gloffset_TextureStorage2D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureStorage2DMultisample)(GLuint, GLsizei, GLenum, GLsizei, GLsizei, GLboolean);
+#define CALL_TextureStorage2DMultisample(disp, parameters) \
+ (* GET_TextureStorage2DMultisample(disp)) parameters
+static INLINE _glptr_TextureStorage2DMultisample GET_TextureStorage2DMultisample(struct _glapi_table *disp) {
+ return (_glptr_TextureStorage2DMultisample) (GET_by_offset(disp, _gloffset_TextureStorage2DMultisample));
+}
+
+static INLINE void SET_TextureStorage2DMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum, GLsizei, GLsizei, GLboolean)) {
+ SET_by_offset(disp, _gloffset_TextureStorage2DMultisample, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureStorage3D)(GLuint, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
+#define CALL_TextureStorage3D(disp, parameters) \
+ (* GET_TextureStorage3D(disp)) parameters
+static INLINE _glptr_TextureStorage3D GET_TextureStorage3D(struct _glapi_table *disp) {
+ return (_glptr_TextureStorage3D) (GET_by_offset(disp, _gloffset_TextureStorage3D));
+}
+
+static INLINE void SET_TextureStorage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)) {
+ SET_by_offset(disp, _gloffset_TextureStorage3D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureStorage3DMultisample)(GLuint, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean);
+#define CALL_TextureStorage3DMultisample(disp, parameters) \
+ (* GET_TextureStorage3DMultisample(disp)) parameters
+static INLINE _glptr_TextureStorage3DMultisample GET_TextureStorage3DMultisample(struct _glapi_table *disp) {
+ return (_glptr_TextureStorage3DMultisample) (GET_by_offset(disp, _gloffset_TextureStorage3DMultisample));
+}
+
+static INLINE void SET_TextureStorage3DMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean)) {
+ SET_by_offset(disp, _gloffset_TextureStorage3DMultisample, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureSubImage1D)(GLuint, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+#define CALL_TextureSubImage1D(disp, parameters) \
+ (* GET_TextureSubImage1D(disp)) parameters
+static INLINE _glptr_TextureSubImage1D GET_TextureSubImage1D(struct _glapi_table *disp) {
+ return (_glptr_TextureSubImage1D) (GET_by_offset(disp, _gloffset_TextureSubImage1D));
+}
+
+static INLINE void SET_TextureSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *)) {
+ SET_by_offset(disp, _gloffset_TextureSubImage1D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureSubImage2D)(GLuint, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#define CALL_TextureSubImage2D(disp, parameters) \
+ (* GET_TextureSubImage2D(disp)) parameters
+static INLINE _glptr_TextureSubImage2D GET_TextureSubImage2D(struct _glapi_table *disp) {
+ return (_glptr_TextureSubImage2D) (GET_by_offset(disp, _gloffset_TextureSubImage2D));
+}
+
+static INLINE void SET_TextureSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
+ SET_by_offset(disp, _gloffset_TextureSubImage2D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureSubImage3D)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#define CALL_TextureSubImage3D(disp, parameters) \
+ (* GET_TextureSubImage3D(disp)) parameters
+static INLINE _glptr_TextureSubImage3D GET_TextureSubImage3D(struct _glapi_table *disp) {
+ return (_glptr_TextureSubImage3D) (GET_by_offset(disp, _gloffset_TextureSubImage3D));
+}
+
+static INLINE void SET_TextureSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
+ SET_by_offset(disp, _gloffset_TextureSubImage3D, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_InvalidateBufferData)(GLuint);
#define CALL_InvalidateBufferData(disp, parameters) \
(* GET_InvalidateBufferData(disp)) parameters
@@ -11874,6 +12560,28 @@ static INLINE void SET_LockArraysEXT(struct _glapi_table *disp, void (GLAPIENTRY
SET_by_offset(disp, _gloffset_LockArraysEXT, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniform1d)(GLuint, GLint, GLdouble);
+#define CALL_ProgramUniform1d(disp, parameters) \
+ (* GET_ProgramUniform1d(disp)) parameters
+static INLINE _glptr_ProgramUniform1d GET_ProgramUniform1d(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniform1d) (GET_by_offset(disp, _gloffset_ProgramUniform1d));
+}
+
+static INLINE void SET_ProgramUniform1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLdouble)) {
+ SET_by_offset(disp, _gloffset_ProgramUniform1d, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramUniform1dv)(GLuint, GLint, GLsizei, const GLdouble *);
+#define CALL_ProgramUniform1dv(disp, parameters) \
+ (* GET_ProgramUniform1dv(disp)) parameters
+static INLINE _glptr_ProgramUniform1dv GET_ProgramUniform1dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniform1dv) (GET_by_offset(disp, _gloffset_ProgramUniform1dv));
+}
+
+static INLINE void SET_ProgramUniform1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniform1dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniform1f)(GLuint, GLint, GLfloat);
#define CALL_ProgramUniform1f(disp, parameters) \
(* GET_ProgramUniform1f(disp)) parameters
@@ -11940,6 +12648,28 @@ static INLINE void SET_ProgramUniform1uiv(struct _glapi_table *disp, void (GLAPI
SET_by_offset(disp, _gloffset_ProgramUniform1uiv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniform2d)(GLuint, GLint, GLdouble, GLdouble);
+#define CALL_ProgramUniform2d(disp, parameters) \
+ (* GET_ProgramUniform2d(disp)) parameters
+static INLINE _glptr_ProgramUniform2d GET_ProgramUniform2d(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniform2d) (GET_by_offset(disp, _gloffset_ProgramUniform2d));
+}
+
+static INLINE void SET_ProgramUniform2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLdouble, GLdouble)) {
+ SET_by_offset(disp, _gloffset_ProgramUniform2d, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramUniform2dv)(GLuint, GLint, GLsizei, const GLdouble *);
+#define CALL_ProgramUniform2dv(disp, parameters) \
+ (* GET_ProgramUniform2dv(disp)) parameters
+static INLINE _glptr_ProgramUniform2dv GET_ProgramUniform2dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniform2dv) (GET_by_offset(disp, _gloffset_ProgramUniform2dv));
+}
+
+static INLINE void SET_ProgramUniform2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniform2dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniform2f)(GLuint, GLint, GLfloat, GLfloat);
#define CALL_ProgramUniform2f(disp, parameters) \
(* GET_ProgramUniform2f(disp)) parameters
@@ -12006,6 +12736,28 @@ static INLINE void SET_ProgramUniform2uiv(struct _glapi_table *disp, void (GLAPI
SET_by_offset(disp, _gloffset_ProgramUniform2uiv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniform3d)(GLuint, GLint, GLdouble, GLdouble, GLdouble);
+#define CALL_ProgramUniform3d(disp, parameters) \
+ (* GET_ProgramUniform3d(disp)) parameters
+static INLINE _glptr_ProgramUniform3d GET_ProgramUniform3d(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniform3d) (GET_by_offset(disp, _gloffset_ProgramUniform3d));
+}
+
+static INLINE void SET_ProgramUniform3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLdouble, GLdouble, GLdouble)) {
+ SET_by_offset(disp, _gloffset_ProgramUniform3d, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramUniform3dv)(GLuint, GLint, GLsizei, const GLdouble *);
+#define CALL_ProgramUniform3dv(disp, parameters) \
+ (* GET_ProgramUniform3dv(disp)) parameters
+static INLINE _glptr_ProgramUniform3dv GET_ProgramUniform3dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniform3dv) (GET_by_offset(disp, _gloffset_ProgramUniform3dv));
+}
+
+static INLINE void SET_ProgramUniform3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniform3dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniform3f)(GLuint, GLint, GLfloat, GLfloat, GLfloat);
#define CALL_ProgramUniform3f(disp, parameters) \
(* GET_ProgramUniform3f(disp)) parameters
@@ -12072,6 +12824,28 @@ static INLINE void SET_ProgramUniform3uiv(struct _glapi_table *disp, void (GLAPI
SET_by_offset(disp, _gloffset_ProgramUniform3uiv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniform4d)(GLuint, GLint, GLdouble, GLdouble, GLdouble, GLdouble);
+#define CALL_ProgramUniform4d(disp, parameters) \
+ (* GET_ProgramUniform4d(disp)) parameters
+static INLINE _glptr_ProgramUniform4d GET_ProgramUniform4d(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniform4d) (GET_by_offset(disp, _gloffset_ProgramUniform4d));
+}
+
+static INLINE void SET_ProgramUniform4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLdouble, GLdouble, GLdouble, GLdouble)) {
+ SET_by_offset(disp, _gloffset_ProgramUniform4d, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramUniform4dv)(GLuint, GLint, GLsizei, const GLdouble *);
+#define CALL_ProgramUniform4dv(disp, parameters) \
+ (* GET_ProgramUniform4dv(disp)) parameters
+static INLINE _glptr_ProgramUniform4dv GET_ProgramUniform4dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniform4dv) (GET_by_offset(disp, _gloffset_ProgramUniform4dv));
+}
+
+static INLINE void SET_ProgramUniform4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniform4dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniform4f)(GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat);
#define CALL_ProgramUniform4f(disp, parameters) \
(* GET_ProgramUniform4f(disp)) parameters
@@ -12138,6 +12912,17 @@ static INLINE void SET_ProgramUniform4uiv(struct _glapi_table *disp, void (GLAPI
SET_by_offset(disp, _gloffset_ProgramUniform4uiv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix2dv)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_ProgramUniformMatrix2dv(disp, parameters) \
+ (* GET_ProgramUniformMatrix2dv(disp)) parameters
+static INLINE _glptr_ProgramUniformMatrix2dv GET_ProgramUniformMatrix2dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniformMatrix2dv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix2dv));
+}
+
+static INLINE void SET_ProgramUniformMatrix2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniformMatrix2dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix2fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
#define CALL_ProgramUniformMatrix2fv(disp, parameters) \
(* GET_ProgramUniformMatrix2fv(disp)) parameters
@@ -12149,6 +12934,17 @@ static INLINE void SET_ProgramUniformMatrix2fv(struct _glapi_table *disp, void (
SET_by_offset(disp, _gloffset_ProgramUniformMatrix2fv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix2x3dv)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_ProgramUniformMatrix2x3dv(disp, parameters) \
+ (* GET_ProgramUniformMatrix2x3dv(disp)) parameters
+static INLINE _glptr_ProgramUniformMatrix2x3dv GET_ProgramUniformMatrix2x3dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniformMatrix2x3dv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix2x3dv));
+}
+
+static INLINE void SET_ProgramUniformMatrix2x3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniformMatrix2x3dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix2x3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
#define CALL_ProgramUniformMatrix2x3fv(disp, parameters) \
(* GET_ProgramUniformMatrix2x3fv(disp)) parameters
@@ -12160,6 +12956,17 @@ static INLINE void SET_ProgramUniformMatrix2x3fv(struct _glapi_table *disp, void
SET_by_offset(disp, _gloffset_ProgramUniformMatrix2x3fv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix2x4dv)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_ProgramUniformMatrix2x4dv(disp, parameters) \
+ (* GET_ProgramUniformMatrix2x4dv(disp)) parameters
+static INLINE _glptr_ProgramUniformMatrix2x4dv GET_ProgramUniformMatrix2x4dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniformMatrix2x4dv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix2x4dv));
+}
+
+static INLINE void SET_ProgramUniformMatrix2x4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniformMatrix2x4dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix2x4fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
#define CALL_ProgramUniformMatrix2x4fv(disp, parameters) \
(* GET_ProgramUniformMatrix2x4fv(disp)) parameters
@@ -12171,6 +12978,17 @@ static INLINE void SET_ProgramUniformMatrix2x4fv(struct _glapi_table *disp, void
SET_by_offset(disp, _gloffset_ProgramUniformMatrix2x4fv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix3dv)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_ProgramUniformMatrix3dv(disp, parameters) \
+ (* GET_ProgramUniformMatrix3dv(disp)) parameters
+static INLINE _glptr_ProgramUniformMatrix3dv GET_ProgramUniformMatrix3dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniformMatrix3dv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix3dv));
+}
+
+static INLINE void SET_ProgramUniformMatrix3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniformMatrix3dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
#define CALL_ProgramUniformMatrix3fv(disp, parameters) \
(* GET_ProgramUniformMatrix3fv(disp)) parameters
@@ -12182,6 +13000,17 @@ static INLINE void SET_ProgramUniformMatrix3fv(struct _glapi_table *disp, void (
SET_by_offset(disp, _gloffset_ProgramUniformMatrix3fv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix3x2dv)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_ProgramUniformMatrix3x2dv(disp, parameters) \
+ (* GET_ProgramUniformMatrix3x2dv(disp)) parameters
+static INLINE _glptr_ProgramUniformMatrix3x2dv GET_ProgramUniformMatrix3x2dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniformMatrix3x2dv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix3x2dv));
+}
+
+static INLINE void SET_ProgramUniformMatrix3x2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniformMatrix3x2dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix3x2fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
#define CALL_ProgramUniformMatrix3x2fv(disp, parameters) \
(* GET_ProgramUniformMatrix3x2fv(disp)) parameters
@@ -12193,6 +13022,17 @@ static INLINE void SET_ProgramUniformMatrix3x2fv(struct _glapi_table *disp, void
SET_by_offset(disp, _gloffset_ProgramUniformMatrix3x2fv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix3x4dv)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_ProgramUniformMatrix3x4dv(disp, parameters) \
+ (* GET_ProgramUniformMatrix3x4dv(disp)) parameters
+static INLINE _glptr_ProgramUniformMatrix3x4dv GET_ProgramUniformMatrix3x4dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniformMatrix3x4dv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix3x4dv));
+}
+
+static INLINE void SET_ProgramUniformMatrix3x4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniformMatrix3x4dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix3x4fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
#define CALL_ProgramUniformMatrix3x4fv(disp, parameters) \
(* GET_ProgramUniformMatrix3x4fv(disp)) parameters
@@ -12204,6 +13044,17 @@ static INLINE void SET_ProgramUniformMatrix3x4fv(struct _glapi_table *disp, void
SET_by_offset(disp, _gloffset_ProgramUniformMatrix3x4fv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix4dv)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_ProgramUniformMatrix4dv(disp, parameters) \
+ (* GET_ProgramUniformMatrix4dv(disp)) parameters
+static INLINE _glptr_ProgramUniformMatrix4dv GET_ProgramUniformMatrix4dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniformMatrix4dv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix4dv));
+}
+
+static INLINE void SET_ProgramUniformMatrix4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniformMatrix4dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix4fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
#define CALL_ProgramUniformMatrix4fv(disp, parameters) \
(* GET_ProgramUniformMatrix4fv(disp)) parameters
@@ -12215,6 +13066,17 @@ static INLINE void SET_ProgramUniformMatrix4fv(struct _glapi_table *disp, void (
SET_by_offset(disp, _gloffset_ProgramUniformMatrix4fv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix4x2dv)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_ProgramUniformMatrix4x2dv(disp, parameters) \
+ (* GET_ProgramUniformMatrix4x2dv(disp)) parameters
+static INLINE _glptr_ProgramUniformMatrix4x2dv GET_ProgramUniformMatrix4x2dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniformMatrix4x2dv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix4x2dv));
+}
+
+static INLINE void SET_ProgramUniformMatrix4x2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniformMatrix4x2dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix4x2fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
#define CALL_ProgramUniformMatrix4x2fv(disp, parameters) \
(* GET_ProgramUniformMatrix4x2fv(disp)) parameters
@@ -12226,6 +13088,17 @@ static INLINE void SET_ProgramUniformMatrix4x2fv(struct _glapi_table *disp, void
SET_by_offset(disp, _gloffset_ProgramUniformMatrix4x2fv, fn);
}
+typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix4x3dv)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
+#define CALL_ProgramUniformMatrix4x3dv(disp, parameters) \
+ (* GET_ProgramUniformMatrix4x3dv(disp)) parameters
+static INLINE _glptr_ProgramUniformMatrix4x3dv GET_ProgramUniformMatrix4x3dv(struct _glapi_table *disp) {
+ return (_glptr_ProgramUniformMatrix4x3dv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix4x3dv));
+}
+
+static INLINE void SET_ProgramUniformMatrix4x3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *)) {
+ SET_by_offset(disp, _gloffset_ProgramUniformMatrix4x3dv, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix4x3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
#define CALL_ProgramUniformMatrix4x3fv(disp, parameters) \
(* GET_ProgramUniformMatrix4x3fv(disp)) parameters
@@ -14162,6 +15035,17 @@ static INLINE void SET_GetPerfQueryInfoINTEL(struct _glapi_table *disp, void (GL
SET_by_offset(disp, _gloffset_GetPerfQueryInfoINTEL, fn);
}
+typedef void (GLAPIENTRYP _glptr_PolygonOffsetClampEXT)(GLfloat, GLfloat, GLfloat);
+#define CALL_PolygonOffsetClampEXT(disp, parameters) \
+ (* GET_PolygonOffsetClampEXT(disp)) parameters
+static INLINE _glptr_PolygonOffsetClampEXT GET_PolygonOffsetClampEXT(struct _glapi_table *disp) {
+ return (_glptr_PolygonOffsetClampEXT) (GET_by_offset(disp, _gloffset_PolygonOffsetClampEXT));
+}
+
+static INLINE void SET_PolygonOffsetClampEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+ SET_by_offset(disp, _gloffset_PolygonOffsetClampEXT, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_StencilFuncSeparateATI)(GLenum, GLenum, GLint, GLuint);
#define CALL_StencilFuncSeparateATI(disp, parameters) \
(* GET_StencilFuncSeparateATI(disp)) parameters
diff --git a/xorg-server/glx/glfunctions.h b/xorg-server/glx/glfunctions.h
index d060031a4..fa5080278 100644
--- a/xorg-server/glx/glfunctions.h
+++ b/xorg-server/glx/glfunctions.h
@@ -808,6 +808,24 @@
#define glVertexP4uiv(a1, a2) CALL_VertexP4uiv(GET_DISPATCH(), (a1, a2))
#define glDrawArraysIndirect(a1, a2) CALL_DrawArraysIndirect(GET_DISPATCH(), (a1, a2))
#define glDrawElementsIndirect(a1, a2, a3) CALL_DrawElementsIndirect(GET_DISPATCH(), (a1, a2, a3))
+#define glGetUniformdv(a1, a2, a3) CALL_GetUniformdv(GET_DISPATCH(), (a1, a2, a3))
+#define glUniform1d(a1, a2) CALL_Uniform1d(GET_DISPATCH(), (a1, a2))
+#define glUniform1dv(a1, a2, a3) CALL_Uniform1dv(GET_DISPATCH(), (a1, a2, a3))
+#define glUniform2d(a1, a2, a3) CALL_Uniform2d(GET_DISPATCH(), (a1, a2, a3))
+#define glUniform2dv(a1, a2, a3) CALL_Uniform2dv(GET_DISPATCH(), (a1, a2, a3))
+#define glUniform3d(a1, a2, a3, a4) CALL_Uniform3d(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniform3dv(a1, a2, a3) CALL_Uniform3dv(GET_DISPATCH(), (a1, a2, a3))
+#define glUniform4d(a1, a2, a3, a4, a5) CALL_Uniform4d(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glUniform4dv(a1, a2, a3) CALL_Uniform4dv(GET_DISPATCH(), (a1, a2, a3))
+#define glUniformMatrix2dv(a1, a2, a3, a4) CALL_UniformMatrix2dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix2x3dv(a1, a2, a3, a4) CALL_UniformMatrix2x3dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix2x4dv(a1, a2, a3, a4) CALL_UniformMatrix2x4dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix3dv(a1, a2, a3, a4) CALL_UniformMatrix3dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix3x2dv(a1, a2, a3, a4) CALL_UniformMatrix3x2dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix3x4dv(a1, a2, a3, a4) CALL_UniformMatrix3x4dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix4dv(a1, a2, a3, a4) CALL_UniformMatrix4dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix4x2dv(a1, a2, a3, a4) CALL_UniformMatrix4x2dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix4x3dv(a1, a2, a3, a4) CALL_UniformMatrix4x3dv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glBindTransformFeedback(a1, a2) CALL_BindTransformFeedback(GET_DISPATCH(), (a1, a2))
#define glDeleteTransformFeedbacks(a1, a2) CALL_DeleteTransformFeedbacks(GET_DISPATCH(), (a1, a2))
#define glDrawTransformFeedback(a1, a2) CALL_DrawTransformFeedback(GET_DISPATCH(), (a1, a2))
@@ -899,6 +917,38 @@
#define glBindTextures(a1, a2, a3) CALL_BindTextures(GET_DISPATCH(), (a1, a2, a3))
#define glBindVertexBuffers(a1, a2, a3, a4, a5) CALL_BindVertexBuffers(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glClipControl(a1, a2) CALL_ClipControl(GET_DISPATCH(), (a1, a2))
+#define glBindTextureUnit(a1, a2) CALL_BindTextureUnit(GET_DISPATCH(), (a1, a2))
+#define glCompressedTextureSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_CompressedTextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
+#define glCompressedTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CompressedTextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
+#define glCompressedTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_CompressedTextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11))
+#define glCopyTextureSubImage1D(a1, a2, a3, a4, a5, a6) CALL_CopyTextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glCopyTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8) CALL_CopyTextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8))
+#define glCopyTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CopyTextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
+#define glCreateTextures(a1, a2, a3) CALL_CreateTextures(GET_DISPATCH(), (a1, a2, a3))
+#define glGenerateTextureMipmap(a1) CALL_GenerateTextureMipmap(GET_DISPATCH(), (a1))
+#define glGetCompressedTextureImage(a1, a2, a3, a4) CALL_GetCompressedTextureImage(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetTextureImage(a1, a2, a3, a4, a5, a6) CALL_GetTextureImage(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glGetTextureLevelParameterfv(a1, a2, a3, a4) CALL_GetTextureLevelParameterfv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetTextureLevelParameteriv(a1, a2, a3, a4) CALL_GetTextureLevelParameteriv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetTextureParameterIiv(a1, a2, a3) CALL_GetTextureParameterIiv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetTextureParameterIuiv(a1, a2, a3) CALL_GetTextureParameterIuiv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetTextureParameterfv(a1, a2, a3) CALL_GetTextureParameterfv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetTextureParameteriv(a1, a2, a3) CALL_GetTextureParameteriv(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureBuffer(a1, a2, a3) CALL_TextureBuffer(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameterIiv(a1, a2, a3) CALL_TextureParameterIiv(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameterIuiv(a1, a2, a3) CALL_TextureParameterIuiv(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameterf(a1, a2, a3) CALL_TextureParameterf(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameterfv(a1, a2, a3) CALL_TextureParameterfv(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameteri(a1, a2, a3) CALL_TextureParameteri(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameteriv(a1, a2, a3) CALL_TextureParameteriv(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureStorage1D(a1, a2, a3, a4) CALL_TextureStorage1D(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glTextureStorage2D(a1, a2, a3, a4, a5) CALL_TextureStorage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glTextureStorage2DMultisample(a1, a2, a3, a4, a5, a6) CALL_TextureStorage2DMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glTextureStorage3D(a1, a2, a3, a4, a5, a6) CALL_TextureStorage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glTextureStorage3DMultisample(a1, a2, a3, a4, a5, a6, a7) CALL_TextureStorage3DMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
+#define glTextureSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_TextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
+#define glTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_TextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
+#define glTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_TextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11))
#define glInvalidateBufferData(a1) CALL_InvalidateBufferData(GET_DISPATCH(), (a1))
#define glInvalidateBufferSubData(a1, a2, a3) CALL_InvalidateBufferSubData(GET_DISPATCH(), (a1, a2, a3))
#define glInvalidateFramebuffer(a1, a2, a3) CALL_InvalidateFramebuffer(GET_DISPATCH(), (a1, a2, a3))
@@ -934,38 +984,55 @@
#define glGetProgramPipelineiv(a1, a2, a3) CALL_GetProgramPipelineiv(GET_DISPATCH(), (a1, a2, a3))
#define glIsProgramPipeline(a1) CALL_IsProgramPipeline(GET_DISPATCH(), (a1))
#define glLockArraysEXT(a1, a2) CALL_LockArraysEXT(GET_DISPATCH(), (a1, a2))
+#define glProgramUniform1d(a1, a2, a3) CALL_ProgramUniform1d(GET_DISPATCH(), (a1, a2, a3))
+#define glProgramUniform1dv(a1, a2, a3, a4) CALL_ProgramUniform1dv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform1f(a1, a2, a3) CALL_ProgramUniform1f(GET_DISPATCH(), (a1, a2, a3))
#define glProgramUniform1fv(a1, a2, a3, a4) CALL_ProgramUniform1fv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform1i(a1, a2, a3) CALL_ProgramUniform1i(GET_DISPATCH(), (a1, a2, a3))
#define glProgramUniform1iv(a1, a2, a3, a4) CALL_ProgramUniform1iv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform1ui(a1, a2, a3) CALL_ProgramUniform1ui(GET_DISPATCH(), (a1, a2, a3))
#define glProgramUniform1uiv(a1, a2, a3, a4) CALL_ProgramUniform1uiv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glProgramUniform2d(a1, a2, a3, a4) CALL_ProgramUniform2d(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glProgramUniform2dv(a1, a2, a3, a4) CALL_ProgramUniform2dv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform2f(a1, a2, a3, a4) CALL_ProgramUniform2f(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform2fv(a1, a2, a3, a4) CALL_ProgramUniform2fv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform2i(a1, a2, a3, a4) CALL_ProgramUniform2i(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform2iv(a1, a2, a3, a4) CALL_ProgramUniform2iv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform2ui(a1, a2, a3, a4) CALL_ProgramUniform2ui(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform2uiv(a1, a2, a3, a4) CALL_ProgramUniform2uiv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glProgramUniform3d(a1, a2, a3, a4, a5) CALL_ProgramUniform3d(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniform3dv(a1, a2, a3, a4) CALL_ProgramUniform3dv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform3f(a1, a2, a3, a4, a5) CALL_ProgramUniform3f(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniform3fv(a1, a2, a3, a4) CALL_ProgramUniform3fv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform3i(a1, a2, a3, a4, a5) CALL_ProgramUniform3i(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniform3iv(a1, a2, a3, a4) CALL_ProgramUniform3iv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform3ui(a1, a2, a3, a4, a5) CALL_ProgramUniform3ui(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniform3uiv(a1, a2, a3, a4) CALL_ProgramUniform3uiv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glProgramUniform4d(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4d(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glProgramUniform4dv(a1, a2, a3, a4) CALL_ProgramUniform4dv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform4f(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4f(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
#define glProgramUniform4fv(a1, a2, a3, a4) CALL_ProgramUniform4fv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform4i(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4i(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
#define glProgramUniform4iv(a1, a2, a3, a4) CALL_ProgramUniform4iv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramUniform4ui(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4ui(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
#define glProgramUniform4uiv(a1, a2, a3, a4) CALL_ProgramUniform4uiv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glProgramUniformMatrix2dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniformMatrix2fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix2x3dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2x3dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniformMatrix2x3fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2x3fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix2x4dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2x4dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniformMatrix2x4fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2x4fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix3dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniformMatrix3fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix3x2dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3x2dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniformMatrix3x2fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3x2fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix3x4dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3x4dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniformMatrix3x4fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3x4fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix4dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniformMatrix4fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix4x2dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4x2dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniformMatrix4x2fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4x2fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix4x3dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4x3dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glProgramUniformMatrix4x3fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4x3fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glUnlockArraysEXT() CALL_UnlockArraysEXT(GET_DISPATCH(), ())
#define glUseProgramStages(a1, a2, a3) CALL_UseProgramStages(GET_DISPATCH(), (a1, a2, a3))
@@ -1142,6 +1209,7 @@
#define glGetPerfQueryDataINTEL(a1, a2, a3, a4, a5) CALL_GetPerfQueryDataINTEL(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glGetPerfQueryIdByNameINTEL(a1, a2) CALL_GetPerfQueryIdByNameINTEL(GET_DISPATCH(), (a1, a2))
#define glGetPerfQueryInfoINTEL(a1, a2, a3, a4, a5, a6, a7) CALL_GetPerfQueryInfoINTEL(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
+#define glPolygonOffsetClampEXT(a1, a2, a3) CALL_PolygonOffsetClampEXT(GET_DISPATCH(), (a1, a2, a3))
#define glStencilFuncSeparateATI(a1, a2, a3, a4) CALL_StencilFuncSeparateATI(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramEnvParameters4fvEXT(a1, a2, a3, a4) CALL_ProgramEnvParameters4fvEXT(GET_DISPATCH(), (a1, a2, a3, a4))
#define glProgramLocalParameters4fvEXT(a1, a2, a3, a4) CALL_ProgramLocalParameters4fvEXT(GET_DISPATCH(), (a1, a2, a3, a4))
diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h
index 756f9a60d..5aa1cb8ad 100644
--- a/xorg-server/glx/glprocs.h
+++ b/xorg-server/glx/glprocs.h
@@ -826,6 +826,24 @@ static const char gl_string_table[] =
"glVertexP4uiv\0"
"glDrawArraysIndirect\0"
"glDrawElementsIndirect\0"
+ "glGetUniformdv\0"
+ "glUniform1d\0"
+ "glUniform1dv\0"
+ "glUniform2d\0"
+ "glUniform2dv\0"
+ "glUniform3d\0"
+ "glUniform3dv\0"
+ "glUniform4d\0"
+ "glUniform4dv\0"
+ "glUniformMatrix2dv\0"
+ "glUniformMatrix2x3dv\0"
+ "glUniformMatrix2x4dv\0"
+ "glUniformMatrix3dv\0"
+ "glUniformMatrix3x2dv\0"
+ "glUniformMatrix3x4dv\0"
+ "glUniformMatrix4dv\0"
+ "glUniformMatrix4x2dv\0"
+ "glUniformMatrix4x3dv\0"
"glBindTransformFeedback\0"
"glDeleteTransformFeedbacks\0"
"glDrawTransformFeedback\0"
@@ -917,6 +935,38 @@ static const char gl_string_table[] =
"glBindTextures\0"
"glBindVertexBuffers\0"
"glClipControl\0"
+ "glBindTextureUnit\0"
+ "glCompressedTextureSubImage1D\0"
+ "glCompressedTextureSubImage2D\0"
+ "glCompressedTextureSubImage3D\0"
+ "glCopyTextureSubImage1D\0"
+ "glCopyTextureSubImage2D\0"
+ "glCopyTextureSubImage3D\0"
+ "glCreateTextures\0"
+ "glGenerateTextureMipmap\0"
+ "glGetCompressedTextureImage\0"
+ "glGetTextureImage\0"
+ "glGetTextureLevelParameterfv\0"
+ "glGetTextureLevelParameteriv\0"
+ "glGetTextureParameterIiv\0"
+ "glGetTextureParameterIuiv\0"
+ "glGetTextureParameterfv\0"
+ "glGetTextureParameteriv\0"
+ "glTextureBuffer\0"
+ "glTextureParameterIiv\0"
+ "glTextureParameterIuiv\0"
+ "glTextureParameterf\0"
+ "glTextureParameterfv\0"
+ "glTextureParameteri\0"
+ "glTextureParameteriv\0"
+ "glTextureStorage1D\0"
+ "glTextureStorage2D\0"
+ "glTextureStorage2DMultisample\0"
+ "glTextureStorage3D\0"
+ "glTextureStorage3DMultisample\0"
+ "glTextureSubImage1D\0"
+ "glTextureSubImage2D\0"
+ "glTextureSubImage3D\0"
"glInvalidateBufferData\0"
"glInvalidateBufferSubData\0"
"glInvalidateFramebuffer\0"
@@ -952,38 +1002,55 @@ static const char gl_string_table[] =
"glGetProgramPipelineiv\0"
"glIsProgramPipeline\0"
"glLockArraysEXT\0"
+ "glProgramUniform1d\0"
+ "glProgramUniform1dv\0"
"glProgramUniform1f\0"
"glProgramUniform1fv\0"
"glProgramUniform1i\0"
"glProgramUniform1iv\0"
"glProgramUniform1ui\0"
"glProgramUniform1uiv\0"
+ "glProgramUniform2d\0"
+ "glProgramUniform2dv\0"
"glProgramUniform2f\0"
"glProgramUniform2fv\0"
"glProgramUniform2i\0"
"glProgramUniform2iv\0"
"glProgramUniform2ui\0"
"glProgramUniform2uiv\0"
+ "glProgramUniform3d\0"
+ "glProgramUniform3dv\0"
"glProgramUniform3f\0"
"glProgramUniform3fv\0"
"glProgramUniform3i\0"
"glProgramUniform3iv\0"
"glProgramUniform3ui\0"
"glProgramUniform3uiv\0"
+ "glProgramUniform4d\0"
+ "glProgramUniform4dv\0"
"glProgramUniform4f\0"
"glProgramUniform4fv\0"
"glProgramUniform4i\0"
"glProgramUniform4iv\0"
"glProgramUniform4ui\0"
"glProgramUniform4uiv\0"
+ "glProgramUniformMatrix2dv\0"
"glProgramUniformMatrix2fv\0"
+ "glProgramUniformMatrix2x3dv\0"
"glProgramUniformMatrix2x3fv\0"
+ "glProgramUniformMatrix2x4dv\0"
"glProgramUniformMatrix2x4fv\0"
+ "glProgramUniformMatrix3dv\0"
"glProgramUniformMatrix3fv\0"
+ "glProgramUniformMatrix3x2dv\0"
"glProgramUniformMatrix3x2fv\0"
+ "glProgramUniformMatrix3x4dv\0"
"glProgramUniformMatrix3x4fv\0"
+ "glProgramUniformMatrix4dv\0"
"glProgramUniformMatrix4fv\0"
+ "glProgramUniformMatrix4x2dv\0"
"glProgramUniformMatrix4x2fv\0"
+ "glProgramUniformMatrix4x3dv\0"
"glProgramUniformMatrix4x3fv\0"
"glUnlockArraysEXT\0"
"glUseProgramStages\0"
@@ -1160,6 +1227,7 @@ static const char gl_string_table[] =
"glGetPerfQueryDataINTEL\0"
"glGetPerfQueryIdByNameINTEL\0"
"glGetPerfQueryInfoINTEL\0"
+ "glPolygonOffsetClampEXT\0"
"glStencilFuncSeparateATI\0"
"glProgramEnvParameters4fvEXT\0"
"glProgramLocalParameters4fvEXT\0"
@@ -1417,6 +1485,7 @@ static const char gl_string_table[] =
"glDrawBuffersARB\0"
"glDrawBuffersATI\0"
"glDrawBuffersNV\0"
+ "glDrawBuffersEXT\0"
"glEnableVertexAttribArrayARB\0"
"glGetActiveAttribARB\0"
"glGetActiveUniformARB\0"
@@ -1739,49 +1808,7 @@ static const char gl_string_table[] =
#define gl_dispatch_stub_731 mgl_dispatch_stub_731
#define gl_dispatch_stub_732 mgl_dispatch_stub_732
#define gl_dispatch_stub_733 mgl_dispatch_stub_733
-#define gl_dispatch_stub_828 mgl_dispatch_stub_828
-#define gl_dispatch_stub_872 mgl_dispatch_stub_872
-#define gl_dispatch_stub_873 mgl_dispatch_stub_873
-#define gl_dispatch_stub_874 mgl_dispatch_stub_874
-#define gl_dispatch_stub_875 mgl_dispatch_stub_875
-#define gl_dispatch_stub_876 mgl_dispatch_stub_876
-#define gl_dispatch_stub_877 mgl_dispatch_stub_877
-#define gl_dispatch_stub_878 mgl_dispatch_stub_878
-#define gl_dispatch_stub_879 mgl_dispatch_stub_879
-#define gl_dispatch_stub_881 mgl_dispatch_stub_881
-#define gl_dispatch_stub_882 mgl_dispatch_stub_882
-#define gl_dispatch_stub_883 mgl_dispatch_stub_883
-#define gl_dispatch_stub_890 mgl_dispatch_stub_890
-#define gl_dispatch_stub_891 mgl_dispatch_stub_891
-#define gl_dispatch_stub_892 mgl_dispatch_stub_892
-#define gl_dispatch_stub_893 mgl_dispatch_stub_893
-#define gl_dispatch_stub_894 mgl_dispatch_stub_894
-#define gl_dispatch_stub_895 mgl_dispatch_stub_895
-#define gl_dispatch_stub_896 mgl_dispatch_stub_896
-#define gl_dispatch_stub_897 mgl_dispatch_stub_897
-#define gl_dispatch_stub_898 mgl_dispatch_stub_898
-#define gl_dispatch_stub_900 mgl_dispatch_stub_900
-#define gl_dispatch_stub_901 mgl_dispatch_stub_901
-#define gl_dispatch_stub_902 mgl_dispatch_stub_902
-#define gl_dispatch_stub_903 mgl_dispatch_stub_903
-#define gl_dispatch_stub_904 mgl_dispatch_stub_904
-#define gl_dispatch_stub_905 mgl_dispatch_stub_905
-#define gl_dispatch_stub_906 mgl_dispatch_stub_906
-#define gl_dispatch_stub_907 mgl_dispatch_stub_907
-#define gl_dispatch_stub_908 mgl_dispatch_stub_908
-#define gl_dispatch_stub_909 mgl_dispatch_stub_909
-#define gl_dispatch_stub_910 mgl_dispatch_stub_910
-#define gl_dispatch_stub_911 mgl_dispatch_stub_911
-#define gl_dispatch_stub_912 mgl_dispatch_stub_912
-#define gl_dispatch_stub_913 mgl_dispatch_stub_913
-#define gl_dispatch_stub_914 mgl_dispatch_stub_914
-#define gl_dispatch_stub_915 mgl_dispatch_stub_915
-#define gl_dispatch_stub_916 mgl_dispatch_stub_916
-#define gl_dispatch_stub_917 mgl_dispatch_stub_917
-#define gl_dispatch_stub_918 mgl_dispatch_stub_918
-#define gl_dispatch_stub_919 mgl_dispatch_stub_919
-#define gl_dispatch_stub_920 mgl_dispatch_stub_920
-#define gl_dispatch_stub_921 mgl_dispatch_stub_921
+#define gl_dispatch_stub_846 mgl_dispatch_stub_846
#define gl_dispatch_stub_922 mgl_dispatch_stub_922
#define gl_dispatch_stub_923 mgl_dispatch_stub_923
#define gl_dispatch_stub_924 mgl_dispatch_stub_924
@@ -1790,35 +1817,94 @@ static const char gl_string_table[] =
#define gl_dispatch_stub_927 mgl_dispatch_stub_927
#define gl_dispatch_stub_928 mgl_dispatch_stub_928
#define gl_dispatch_stub_929 mgl_dispatch_stub_929
-#define gl_dispatch_stub_930 mgl_dispatch_stub_930
#define gl_dispatch_stub_931 mgl_dispatch_stub_931
#define gl_dispatch_stub_932 mgl_dispatch_stub_932
-#define gl_dispatch_stub_934 mgl_dispatch_stub_934
-#define gl_dispatch_stub_935 mgl_dispatch_stub_935
+#define gl_dispatch_stub_933 mgl_dispatch_stub_933
+#define gl_dispatch_stub_940 mgl_dispatch_stub_940
+#define gl_dispatch_stub_941 mgl_dispatch_stub_941
+#define gl_dispatch_stub_942 mgl_dispatch_stub_942
+#define gl_dispatch_stub_943 mgl_dispatch_stub_943
+#define gl_dispatch_stub_944 mgl_dispatch_stub_944
+#define gl_dispatch_stub_945 mgl_dispatch_stub_945
+#define gl_dispatch_stub_946 mgl_dispatch_stub_946
+#define gl_dispatch_stub_947 mgl_dispatch_stub_947
+#define gl_dispatch_stub_948 mgl_dispatch_stub_948
+#define gl_dispatch_stub_950 mgl_dispatch_stub_950
+#define gl_dispatch_stub_951 mgl_dispatch_stub_951
+#define gl_dispatch_stub_952 mgl_dispatch_stub_952
+#define gl_dispatch_stub_953 mgl_dispatch_stub_953
+#define gl_dispatch_stub_954 mgl_dispatch_stub_954
+#define gl_dispatch_stub_955 mgl_dispatch_stub_955
+#define gl_dispatch_stub_956 mgl_dispatch_stub_956
+#define gl_dispatch_stub_957 mgl_dispatch_stub_957
+#define gl_dispatch_stub_958 mgl_dispatch_stub_958
+#define gl_dispatch_stub_959 mgl_dispatch_stub_959
#define gl_dispatch_stub_960 mgl_dispatch_stub_960
#define gl_dispatch_stub_961 mgl_dispatch_stub_961
-#define gl_dispatch_stub_1035 mgl_dispatch_stub_1035
-#define gl_dispatch_stub_1036 mgl_dispatch_stub_1036
-#define gl_dispatch_stub_1037 mgl_dispatch_stub_1037
-#define gl_dispatch_stub_1045 mgl_dispatch_stub_1045
-#define gl_dispatch_stub_1046 mgl_dispatch_stub_1046
-#define gl_dispatch_stub_1047 mgl_dispatch_stub_1047
-#define gl_dispatch_stub_1048 mgl_dispatch_stub_1048
-#define gl_dispatch_stub_1051 mgl_dispatch_stub_1051
-#define gl_dispatch_stub_1052 mgl_dispatch_stub_1052
-#define gl_dispatch_stub_1098 mgl_dispatch_stub_1098
-#define gl_dispatch_stub_1099 mgl_dispatch_stub_1099
-#define gl_dispatch_stub_1100 mgl_dispatch_stub_1100
-#define gl_dispatch_stub_1101 mgl_dispatch_stub_1101
+#define gl_dispatch_stub_962 mgl_dispatch_stub_962
+#define gl_dispatch_stub_963 mgl_dispatch_stub_963
+#define gl_dispatch_stub_964 mgl_dispatch_stub_964
+#define gl_dispatch_stub_965 mgl_dispatch_stub_965
+#define gl_dispatch_stub_966 mgl_dispatch_stub_966
+#define gl_dispatch_stub_967 mgl_dispatch_stub_967
+#define gl_dispatch_stub_968 mgl_dispatch_stub_968
+#define gl_dispatch_stub_969 mgl_dispatch_stub_969
+#define gl_dispatch_stub_970 mgl_dispatch_stub_970
+#define gl_dispatch_stub_971 mgl_dispatch_stub_971
+#define gl_dispatch_stub_972 mgl_dispatch_stub_972
+#define gl_dispatch_stub_973 mgl_dispatch_stub_973
+#define gl_dispatch_stub_974 mgl_dispatch_stub_974
+#define gl_dispatch_stub_975 mgl_dispatch_stub_975
+#define gl_dispatch_stub_976 mgl_dispatch_stub_976
+#define gl_dispatch_stub_977 mgl_dispatch_stub_977
+#define gl_dispatch_stub_978 mgl_dispatch_stub_978
+#define gl_dispatch_stub_979 mgl_dispatch_stub_979
+#define gl_dispatch_stub_980 mgl_dispatch_stub_980
+#define gl_dispatch_stub_981 mgl_dispatch_stub_981
+#define gl_dispatch_stub_982 mgl_dispatch_stub_982
+#define gl_dispatch_stub_983 mgl_dispatch_stub_983
+#define gl_dispatch_stub_984 mgl_dispatch_stub_984
+#define gl_dispatch_stub_985 mgl_dispatch_stub_985
+#define gl_dispatch_stub_986 mgl_dispatch_stub_986
+#define gl_dispatch_stub_987 mgl_dispatch_stub_987
+#define gl_dispatch_stub_988 mgl_dispatch_stub_988
+#define gl_dispatch_stub_989 mgl_dispatch_stub_989
+#define gl_dispatch_stub_990 mgl_dispatch_stub_990
+#define gl_dispatch_stub_991 mgl_dispatch_stub_991
+#define gl_dispatch_stub_992 mgl_dispatch_stub_992
+#define gl_dispatch_stub_993 mgl_dispatch_stub_993
+#define gl_dispatch_stub_994 mgl_dispatch_stub_994
+#define gl_dispatch_stub_995 mgl_dispatch_stub_995
+#define gl_dispatch_stub_996 mgl_dispatch_stub_996
+#define gl_dispatch_stub_997 mgl_dispatch_stub_997
+#define gl_dispatch_stub_998 mgl_dispatch_stub_998
+#define gl_dispatch_stub_999 mgl_dispatch_stub_999
+#define gl_dispatch_stub_1001 mgl_dispatch_stub_1001
+#define gl_dispatch_stub_1002 mgl_dispatch_stub_1002
+#define gl_dispatch_stub_1027 mgl_dispatch_stub_1027
+#define gl_dispatch_stub_1028 mgl_dispatch_stub_1028
#define gl_dispatch_stub_1102 mgl_dispatch_stub_1102
#define gl_dispatch_stub_1103 mgl_dispatch_stub_1103
#define gl_dispatch_stub_1104 mgl_dispatch_stub_1104
-#define gl_dispatch_stub_1105 mgl_dispatch_stub_1105
-#define gl_dispatch_stub_1106 mgl_dispatch_stub_1106
-#define gl_dispatch_stub_1107 mgl_dispatch_stub_1107
-#define gl_dispatch_stub_1108 mgl_dispatch_stub_1108
-#define gl_dispatch_stub_1109 mgl_dispatch_stub_1109
-#define gl_dispatch_stub_1110 mgl_dispatch_stub_1110
+#define gl_dispatch_stub_1112 mgl_dispatch_stub_1112
+#define gl_dispatch_stub_1113 mgl_dispatch_stub_1113
+#define gl_dispatch_stub_1114 mgl_dispatch_stub_1114
+#define gl_dispatch_stub_1115 mgl_dispatch_stub_1115
+#define gl_dispatch_stub_1118 mgl_dispatch_stub_1118
+#define gl_dispatch_stub_1119 mgl_dispatch_stub_1119
+#define gl_dispatch_stub_1165 mgl_dispatch_stub_1165
+#define gl_dispatch_stub_1166 mgl_dispatch_stub_1166
+#define gl_dispatch_stub_1167 mgl_dispatch_stub_1167
+#define gl_dispatch_stub_1168 mgl_dispatch_stub_1168
+#define gl_dispatch_stub_1169 mgl_dispatch_stub_1169
+#define gl_dispatch_stub_1170 mgl_dispatch_stub_1170
+#define gl_dispatch_stub_1171 mgl_dispatch_stub_1171
+#define gl_dispatch_stub_1172 mgl_dispatch_stub_1172
+#define gl_dispatch_stub_1173 mgl_dispatch_stub_1173
+#define gl_dispatch_stub_1174 mgl_dispatch_stub_1174
+#define gl_dispatch_stub_1176 mgl_dispatch_stub_1176
+#define gl_dispatch_stub_1177 mgl_dispatch_stub_1177
+#define gl_dispatch_stub_1178 mgl_dispatch_stub_1178
#endif /* USE_MGL_NAMESPACE */
@@ -1839,86 +1925,103 @@ void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params
void GLAPIENTRY gl_dispatch_stub_731(GLuint id, GLenum pname, GLint64 * params);
void GLAPIENTRY gl_dispatch_stub_732(GLuint id, GLenum pname, GLuint64 * params);
void GLAPIENTRY gl_dispatch_stub_733(GLuint id, GLenum target);
-void GLAPIENTRY gl_dispatch_stub_828(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_872(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-void GLAPIENTRY gl_dispatch_stub_873(const GLfloat * coords);
-void GLAPIENTRY gl_dispatch_stub_874(GLint x, GLint y, GLint z, GLint width, GLint height);
-void GLAPIENTRY gl_dispatch_stub_875(const GLint * coords);
-void GLAPIENTRY gl_dispatch_stub_876(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-void GLAPIENTRY gl_dispatch_stub_877(const GLshort * coords);
-void GLAPIENTRY gl_dispatch_stub_878(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-void GLAPIENTRY gl_dispatch_stub_879(const GLfixed * coords);
-GLbitfield GLAPIENTRY gl_dispatch_stub_881(GLfixed * mantissa, GLint * exponent);
-void GLAPIENTRY gl_dispatch_stub_882(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_883(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_890(GLenum target, GLsizei numAttachments, const GLenum * attachments);
-void GLAPIENTRY gl_dispatch_stub_891(GLuint pipeline, GLuint program);
-void GLAPIENTRY gl_dispatch_stub_892(GLuint pipeline);
-GLuint GLAPIENTRY gl_dispatch_stub_893(GLenum type, GLsizei count, const GLchar * const * strings);
-void GLAPIENTRY gl_dispatch_stub_894(GLsizei n, const GLuint * pipelines);
-void GLAPIENTRY gl_dispatch_stub_895(GLsizei n, GLuint * pipelines);
-void GLAPIENTRY gl_dispatch_stub_896(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
-void GLAPIENTRY gl_dispatch_stub_897(GLuint pipeline, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_898(GLuint pipeline);
-void GLAPIENTRY gl_dispatch_stub_900(GLuint program, GLint location, GLfloat x);
-void GLAPIENTRY gl_dispatch_stub_901(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_902(GLuint program, GLint location, GLint x);
-void GLAPIENTRY gl_dispatch_stub_903(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_904(GLuint program, GLint location, GLuint x);
-void GLAPIENTRY gl_dispatch_stub_905(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_906(GLuint program, GLint location, GLfloat x, GLfloat y);
-void GLAPIENTRY gl_dispatch_stub_907(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_908(GLuint program, GLint location, GLint x, GLint y);
-void GLAPIENTRY gl_dispatch_stub_909(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_910(GLuint program, GLint location, GLuint x, GLuint y);
-void GLAPIENTRY gl_dispatch_stub_911(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_912(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
-void GLAPIENTRY gl_dispatch_stub_913(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_914(GLuint program, GLint location, GLint x, GLint y, GLint z);
-void GLAPIENTRY gl_dispatch_stub_915(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_916(GLuint program, GLint location, GLuint x, GLuint y, GLuint z);
-void GLAPIENTRY gl_dispatch_stub_917(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_918(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-void GLAPIENTRY gl_dispatch_stub_919(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_920(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
-void GLAPIENTRY gl_dispatch_stub_921(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_922(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w);
-void GLAPIENTRY gl_dispatch_stub_923(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_924(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_925(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_926(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_927(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_928(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_929(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_930(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_931(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_932(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_934(GLuint pipeline, GLbitfield stages, GLuint program);
-void GLAPIENTRY gl_dispatch_stub_935(GLuint pipeline);
-void GLAPIENTRY gl_dispatch_stub_960(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_961(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_1035(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_1036(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_1037(GLsizei n, GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_1045(GLenum coord, GLenum pname, GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1046(GLenum coord, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_1047(GLenum coord, GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1048(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_1051(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_1052(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_1098(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1099(GLuint queryId, GLuint * queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1100(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1101(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1102(GLuint * queryId);
-void GLAPIENTRY gl_dispatch_stub_1103(GLuint queryId, GLuint * nextQueryId);
-void GLAPIENTRY gl_dispatch_stub_1104(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue);
-void GLAPIENTRY gl_dispatch_stub_1105(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten);
-void GLAPIENTRY gl_dispatch_stub_1106(GLchar * queryName, GLuint * queryId);
-void GLAPIENTRY gl_dispatch_stub_1107(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask);
-void GLAPIENTRY gl_dispatch_stub_1108(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_1109(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_1110(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_846(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_922(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void GLAPIENTRY gl_dispatch_stub_923(const GLfloat * coords);
+void GLAPIENTRY gl_dispatch_stub_924(GLint x, GLint y, GLint z, GLint width, GLint height);
+void GLAPIENTRY gl_dispatch_stub_925(const GLint * coords);
+void GLAPIENTRY gl_dispatch_stub_926(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void GLAPIENTRY gl_dispatch_stub_927(const GLshort * coords);
+void GLAPIENTRY gl_dispatch_stub_928(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void GLAPIENTRY gl_dispatch_stub_929(const GLfixed * coords);
+GLbitfield GLAPIENTRY gl_dispatch_stub_931(GLfixed * mantissa, GLint * exponent);
+void GLAPIENTRY gl_dispatch_stub_932(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_933(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_940(GLenum target, GLsizei numAttachments, const GLenum * attachments);
+void GLAPIENTRY gl_dispatch_stub_941(GLuint pipeline, GLuint program);
+void GLAPIENTRY gl_dispatch_stub_942(GLuint pipeline);
+GLuint GLAPIENTRY gl_dispatch_stub_943(GLenum type, GLsizei count, const GLchar * const * strings);
+void GLAPIENTRY gl_dispatch_stub_944(GLsizei n, const GLuint * pipelines);
+void GLAPIENTRY gl_dispatch_stub_945(GLsizei n, GLuint * pipelines);
+void GLAPIENTRY gl_dispatch_stub_946(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
+void GLAPIENTRY gl_dispatch_stub_947(GLuint pipeline, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_948(GLuint pipeline);
+void GLAPIENTRY gl_dispatch_stub_950(GLuint program, GLint location, GLdouble x);
+void GLAPIENTRY gl_dispatch_stub_951(GLuint program, GLint location, GLsizei count, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_952(GLuint program, GLint location, GLfloat x);
+void GLAPIENTRY gl_dispatch_stub_953(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_954(GLuint program, GLint location, GLint x);
+void GLAPIENTRY gl_dispatch_stub_955(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_956(GLuint program, GLint location, GLuint x);
+void GLAPIENTRY gl_dispatch_stub_957(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_958(GLuint program, GLint location, GLdouble x, GLdouble y);
+void GLAPIENTRY gl_dispatch_stub_959(GLuint program, GLint location, GLsizei count, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_960(GLuint program, GLint location, GLfloat x, GLfloat y);
+void GLAPIENTRY gl_dispatch_stub_961(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_962(GLuint program, GLint location, GLint x, GLint y);
+void GLAPIENTRY gl_dispatch_stub_963(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_964(GLuint program, GLint location, GLuint x, GLuint y);
+void GLAPIENTRY gl_dispatch_stub_965(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_966(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+void GLAPIENTRY gl_dispatch_stub_967(GLuint program, GLint location, GLsizei count, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_968(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
+void GLAPIENTRY gl_dispatch_stub_969(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_970(GLuint program, GLint location, GLint x, GLint y, GLint z);
+void GLAPIENTRY gl_dispatch_stub_971(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_972(GLuint program, GLint location, GLuint x, GLuint y, GLuint z);
+void GLAPIENTRY gl_dispatch_stub_973(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_974(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+void GLAPIENTRY gl_dispatch_stub_975(GLuint program, GLint location, GLsizei count, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_976(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+void GLAPIENTRY gl_dispatch_stub_977(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_978(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
+void GLAPIENTRY gl_dispatch_stub_979(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_980(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w);
+void GLAPIENTRY gl_dispatch_stub_981(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_982(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_983(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_984(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_985(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_986(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_987(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_988(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_989(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_990(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_991(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_992(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_993(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_994(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_995(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_996(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_997(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_998(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_999(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1001(GLuint pipeline, GLbitfield stages, GLuint program);
+void GLAPIENTRY gl_dispatch_stub_1002(GLuint pipeline);
+void GLAPIENTRY gl_dispatch_stub_1027(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_1028(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_1102(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_1103(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_1104(GLsizei n, GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_1112(GLenum coord, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1113(GLenum coord, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_1114(GLenum coord, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1115(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_1118(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_1119(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_1165(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1166(GLuint queryId, GLuint * queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1167(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1168(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1169(GLuint * queryId);
+void GLAPIENTRY gl_dispatch_stub_1170(GLuint queryId, GLuint * nextQueryId);
+void GLAPIENTRY gl_dispatch_stub_1171(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue);
+void GLAPIENTRY gl_dispatch_stub_1172(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten);
+void GLAPIENTRY gl_dispatch_stub_1173(GLchar * queryName, GLuint * queryId);
+void GLAPIENTRY gl_dispatch_stub_1174(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask);
+void GLAPIENTRY gl_dispatch_stub_1176(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_1177(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_1178(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
#endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
static const glprocs_table_t static_functions[] = {
@@ -2696,899 +2799,968 @@ static const glprocs_table_t static_functions[] = {
NAME_FUNC_OFFSET(12563, glVertexP4uiv, glVertexP4uiv, NULL, 771),
NAME_FUNC_OFFSET(12577, glDrawArraysIndirect, glDrawArraysIndirect, NULL, 772),
NAME_FUNC_OFFSET(12598, glDrawElementsIndirect, glDrawElementsIndirect, NULL, 773),
- NAME_FUNC_OFFSET(12621, glBindTransformFeedback, glBindTransformFeedback, NULL, 774),
- NAME_FUNC_OFFSET(12645, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 775),
- NAME_FUNC_OFFSET(12672, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 776),
- NAME_FUNC_OFFSET(12696, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 777),
- NAME_FUNC_OFFSET(12720, glIsTransformFeedback, glIsTransformFeedback, NULL, 778),
- NAME_FUNC_OFFSET(12742, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 779),
- NAME_FUNC_OFFSET(12767, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 780),
- NAME_FUNC_OFFSET(12793, glBeginQueryIndexed, glBeginQueryIndexed, NULL, 781),
- NAME_FUNC_OFFSET(12813, glDrawTransformFeedbackStream, glDrawTransformFeedbackStream, NULL, 782),
- NAME_FUNC_OFFSET(12843, glEndQueryIndexed, glEndQueryIndexed, NULL, 783),
- NAME_FUNC_OFFSET(12861, glGetQueryIndexediv, glGetQueryIndexediv, NULL, 784),
- NAME_FUNC_OFFSET(12881, glClearDepthf, glClearDepthf, NULL, 785),
- NAME_FUNC_OFFSET(12895, glDepthRangef, glDepthRangef, NULL, 786),
- NAME_FUNC_OFFSET(12909, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 787),
- NAME_FUNC_OFFSET(12936, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 788),
- NAME_FUNC_OFFSET(12960, glShaderBinary, glShaderBinary, NULL, 789),
- NAME_FUNC_OFFSET(12975, glGetProgramBinary, glGetProgramBinary, NULL, 790),
- NAME_FUNC_OFFSET(12994, glProgramBinary, glProgramBinary, NULL, 791),
- NAME_FUNC_OFFSET(13010, glProgramParameteri, glProgramParameteri, NULL, 792),
- NAME_FUNC_OFFSET(13030, glDepthRangeArrayv, glDepthRangeArrayv, NULL, 793),
- NAME_FUNC_OFFSET(13049, glDepthRangeIndexed, glDepthRangeIndexed, NULL, 794),
- NAME_FUNC_OFFSET(13069, glGetDoublei_v, glGetDoublei_v, NULL, 795),
- NAME_FUNC_OFFSET(13084, glGetFloati_v, glGetFloati_v, NULL, 796),
- NAME_FUNC_OFFSET(13098, glScissorArrayv, glScissorArrayv, NULL, 797),
- NAME_FUNC_OFFSET(13114, glScissorIndexed, glScissorIndexed, NULL, 798),
- NAME_FUNC_OFFSET(13131, glScissorIndexedv, glScissorIndexedv, NULL, 799),
- NAME_FUNC_OFFSET(13149, glViewportArrayv, glViewportArrayv, NULL, 800),
- NAME_FUNC_OFFSET(13166, glViewportIndexedf, glViewportIndexedf, NULL, 801),
- NAME_FUNC_OFFSET(13185, glViewportIndexedfv, glViewportIndexedfv, NULL, 802),
- NAME_FUNC_OFFSET(13205, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 803),
- NAME_FUNC_OFFSET(13233, glGetnColorTableARB, glGetnColorTableARB, NULL, 804),
- NAME_FUNC_OFFSET(13253, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 805),
- NAME_FUNC_OFFSET(13281, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 806),
- NAME_FUNC_OFFSET(13308, glGetnHistogramARB, glGetnHistogramARB, NULL, 807),
- NAME_FUNC_OFFSET(13327, glGetnMapdvARB, glGetnMapdvARB, NULL, 808),
- NAME_FUNC_OFFSET(13342, glGetnMapfvARB, glGetnMapfvARB, NULL, 809),
- NAME_FUNC_OFFSET(13357, glGetnMapivARB, glGetnMapivARB, NULL, 810),
- NAME_FUNC_OFFSET(13372, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 811),
- NAME_FUNC_OFFSET(13388, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 812),
- NAME_FUNC_OFFSET(13408, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 813),
- NAME_FUNC_OFFSET(13429, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 814),
- NAME_FUNC_OFFSET(13450, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 815),
- NAME_FUNC_OFFSET(13474, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 816),
- NAME_FUNC_OFFSET(13499, glGetnTexImageARB, glGetnTexImageARB, NULL, 817),
- NAME_FUNC_OFFSET(13517, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 818),
- NAME_FUNC_OFFSET(13536, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 819),
- NAME_FUNC_OFFSET(13555, glGetnUniformivARB, glGetnUniformivARB, NULL, 820),
- NAME_FUNC_OFFSET(13574, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 821),
- NAME_FUNC_OFFSET(13594, glReadnPixelsARB, glReadnPixelsARB, NULL, 822),
- NAME_FUNC_OFFSET(13611, glDrawArraysInstancedBaseInstance, glDrawArraysInstancedBaseInstance, NULL, 823),
- NAME_FUNC_OFFSET(13645, glDrawElementsInstancedBaseInstance, glDrawElementsInstancedBaseInstance, NULL, 824),
- NAME_FUNC_OFFSET(13681, glDrawElementsInstancedBaseVertexBaseInstance, glDrawElementsInstancedBaseVertexBaseInstance, NULL, 825),
- NAME_FUNC_OFFSET(13727, glDrawTransformFeedbackInstanced, glDrawTransformFeedbackInstanced, NULL, 826),
- NAME_FUNC_OFFSET(13760, glDrawTransformFeedbackStreamInstanced, glDrawTransformFeedbackStreamInstanced, NULL, 827),
- NAME_FUNC_OFFSET(13799, gl_dispatch_stub_828, gl_dispatch_stub_828, NULL, 828),
- NAME_FUNC_OFFSET(13821, glGetActiveAtomicCounterBufferiv, glGetActiveAtomicCounterBufferiv, NULL, 829),
- NAME_FUNC_OFFSET(13854, glBindImageTexture, glBindImageTexture, NULL, 830),
- NAME_FUNC_OFFSET(13873, glMemoryBarrier, glMemoryBarrier, NULL, 831),
- NAME_FUNC_OFFSET(13889, glTexStorage1D, glTexStorage1D, NULL, 832),
- NAME_FUNC_OFFSET(13904, glTexStorage2D, glTexStorage2D, NULL, 833),
- NAME_FUNC_OFFSET(13919, glTexStorage3D, glTexStorage3D, NULL, 834),
- NAME_FUNC_OFFSET(13934, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 835),
- NAME_FUNC_OFFSET(13956, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 836),
- NAME_FUNC_OFFSET(13978, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 837),
- NAME_FUNC_OFFSET(14000, glClearBufferData, glClearBufferData, NULL, 838),
- NAME_FUNC_OFFSET(14018, glClearBufferSubData, glClearBufferSubData, NULL, 839),
- NAME_FUNC_OFFSET(14039, glDispatchCompute, glDispatchCompute, NULL, 840),
- NAME_FUNC_OFFSET(14057, glDispatchComputeIndirect, glDispatchComputeIndirect, NULL, 841),
- NAME_FUNC_OFFSET(14083, glCopyImageSubData, glCopyImageSubData, NULL, 842),
- NAME_FUNC_OFFSET(14102, glTextureView, glTextureView, NULL, 843),
- NAME_FUNC_OFFSET(14116, glBindVertexBuffer, glBindVertexBuffer, NULL, 844),
- NAME_FUNC_OFFSET(14135, glVertexAttribBinding, glVertexAttribBinding, NULL, 845),
- NAME_FUNC_OFFSET(14157, glVertexAttribFormat, glVertexAttribFormat, NULL, 846),
- NAME_FUNC_OFFSET(14178, glVertexAttribIFormat, glVertexAttribIFormat, NULL, 847),
- NAME_FUNC_OFFSET(14200, glVertexAttribLFormat, glVertexAttribLFormat, NULL, 848),
- NAME_FUNC_OFFSET(14222, glVertexBindingDivisor, glVertexBindingDivisor, NULL, 849),
- NAME_FUNC_OFFSET(14245, glMultiDrawArraysIndirect, glMultiDrawArraysIndirect, NULL, 850),
- NAME_FUNC_OFFSET(14271, glMultiDrawElementsIndirect, glMultiDrawElementsIndirect, NULL, 851),
- NAME_FUNC_OFFSET(14299, glTexBufferRange, glTexBufferRange, NULL, 852),
- NAME_FUNC_OFFSET(14316, glTexStorage2DMultisample, glTexStorage2DMultisample, NULL, 853),
- NAME_FUNC_OFFSET(14342, glTexStorage3DMultisample, glTexStorage3DMultisample, NULL, 854),
- NAME_FUNC_OFFSET(14368, glBufferStorage, glBufferStorage, NULL, 855),
- NAME_FUNC_OFFSET(14384, glClearTexImage, glClearTexImage, NULL, 856),
- NAME_FUNC_OFFSET(14400, glClearTexSubImage, glClearTexSubImage, NULL, 857),
- NAME_FUNC_OFFSET(14419, glBindBuffersBase, glBindBuffersBase, NULL, 858),
- NAME_FUNC_OFFSET(14437, glBindBuffersRange, glBindBuffersRange, NULL, 859),
- NAME_FUNC_OFFSET(14456, glBindImageTextures, glBindImageTextures, NULL, 860),
- NAME_FUNC_OFFSET(14476, glBindSamplers, glBindSamplers, NULL, 861),
- NAME_FUNC_OFFSET(14491, glBindTextures, glBindTextures, NULL, 862),
- NAME_FUNC_OFFSET(14506, glBindVertexBuffers, glBindVertexBuffers, NULL, 863),
- NAME_FUNC_OFFSET(14526, glClipControl, glClipControl, NULL, 864),
- NAME_FUNC_OFFSET(14540, glInvalidateBufferData, glInvalidateBufferData, NULL, 865),
- NAME_FUNC_OFFSET(14563, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 866),
- NAME_FUNC_OFFSET(14589, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 867),
- NAME_FUNC_OFFSET(14613, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 868),
- NAME_FUNC_OFFSET(14640, glInvalidateTexImage, glInvalidateTexImage, NULL, 869),
- NAME_FUNC_OFFSET(14661, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 870),
- NAME_FUNC_OFFSET(14685, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 871),
- NAME_FUNC_OFFSET(14704, gl_dispatch_stub_872, gl_dispatch_stub_872, NULL, 872),
- NAME_FUNC_OFFSET(14718, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
- NAME_FUNC_OFFSET(14733, gl_dispatch_stub_874, gl_dispatch_stub_874, NULL, 874),
- NAME_FUNC_OFFSET(14747, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
- NAME_FUNC_OFFSET(14762, gl_dispatch_stub_876, gl_dispatch_stub_876, NULL, 876),
- NAME_FUNC_OFFSET(14776, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
- NAME_FUNC_OFFSET(14791, gl_dispatch_stub_878, gl_dispatch_stub_878, NULL, 878),
- NAME_FUNC_OFFSET(14805, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL, 879),
- NAME_FUNC_OFFSET(14820, glPointSizePointerOES, glPointSizePointerOES, NULL, 880),
- NAME_FUNC_OFFSET(14842, gl_dispatch_stub_881, gl_dispatch_stub_881, NULL, 881),
- NAME_FUNC_OFFSET(14860, gl_dispatch_stub_882, gl_dispatch_stub_882, NULL, 882),
- NAME_FUNC_OFFSET(14877, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
- NAME_FUNC_OFFSET(14897, glColorPointerEXT, glColorPointerEXT, NULL, 884),
- NAME_FUNC_OFFSET(14915, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 885),
- NAME_FUNC_OFFSET(14936, glIndexPointerEXT, glIndexPointerEXT, NULL, 886),
- NAME_FUNC_OFFSET(14954, glNormalPointerEXT, glNormalPointerEXT, NULL, 887),
- NAME_FUNC_OFFSET(14973, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 888),
- NAME_FUNC_OFFSET(14994, glVertexPointerEXT, glVertexPointerEXT, NULL, 889),
- NAME_FUNC_OFFSET(15013, gl_dispatch_stub_890, gl_dispatch_stub_890, NULL, 890),
- NAME_FUNC_OFFSET(15037, gl_dispatch_stub_891, gl_dispatch_stub_891, NULL, 891),
- NAME_FUNC_OFFSET(15059, gl_dispatch_stub_892, gl_dispatch_stub_892, NULL, 892),
- NAME_FUNC_OFFSET(15081, gl_dispatch_stub_893, gl_dispatch_stub_893, NULL, 893),
- NAME_FUNC_OFFSET(15104, gl_dispatch_stub_894, gl_dispatch_stub_894, NULL, 894),
- NAME_FUNC_OFFSET(15129, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
- NAME_FUNC_OFFSET(15151, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
- NAME_FUNC_OFFSET(15179, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
- NAME_FUNC_OFFSET(15202, gl_dispatch_stub_898, gl_dispatch_stub_898, NULL, 898),
- NAME_FUNC_OFFSET(15222, glLockArraysEXT, glLockArraysEXT, NULL, 899),
- NAME_FUNC_OFFSET(15238, gl_dispatch_stub_900, gl_dispatch_stub_900, NULL, 900),
- NAME_FUNC_OFFSET(15257, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
- NAME_FUNC_OFFSET(15277, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
- NAME_FUNC_OFFSET(15296, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
- NAME_FUNC_OFFSET(15316, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
- NAME_FUNC_OFFSET(15336, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
- NAME_FUNC_OFFSET(15357, gl_dispatch_stub_906, gl_dispatch_stub_906, NULL, 906),
- NAME_FUNC_OFFSET(15376, gl_dispatch_stub_907, gl_dispatch_stub_907, NULL, 907),
- NAME_FUNC_OFFSET(15396, gl_dispatch_stub_908, gl_dispatch_stub_908, NULL, 908),
- NAME_FUNC_OFFSET(15415, gl_dispatch_stub_909, gl_dispatch_stub_909, NULL, 909),
- NAME_FUNC_OFFSET(15435, gl_dispatch_stub_910, gl_dispatch_stub_910, NULL, 910),
- NAME_FUNC_OFFSET(15455, gl_dispatch_stub_911, gl_dispatch_stub_911, NULL, 911),
- NAME_FUNC_OFFSET(15476, gl_dispatch_stub_912, gl_dispatch_stub_912, NULL, 912),
- NAME_FUNC_OFFSET(15495, gl_dispatch_stub_913, gl_dispatch_stub_913, NULL, 913),
- NAME_FUNC_OFFSET(15515, gl_dispatch_stub_914, gl_dispatch_stub_914, NULL, 914),
- NAME_FUNC_OFFSET(15534, gl_dispatch_stub_915, gl_dispatch_stub_915, NULL, 915),
- NAME_FUNC_OFFSET(15554, gl_dispatch_stub_916, gl_dispatch_stub_916, NULL, 916),
- NAME_FUNC_OFFSET(15574, gl_dispatch_stub_917, gl_dispatch_stub_917, NULL, 917),
- NAME_FUNC_OFFSET(15595, gl_dispatch_stub_918, gl_dispatch_stub_918, NULL, 918),
- NAME_FUNC_OFFSET(15614, gl_dispatch_stub_919, gl_dispatch_stub_919, NULL, 919),
- NAME_FUNC_OFFSET(15634, gl_dispatch_stub_920, gl_dispatch_stub_920, NULL, 920),
- NAME_FUNC_OFFSET(15653, gl_dispatch_stub_921, gl_dispatch_stub_921, NULL, 921),
- NAME_FUNC_OFFSET(15673, gl_dispatch_stub_922, gl_dispatch_stub_922, NULL, 922),
- NAME_FUNC_OFFSET(15693, gl_dispatch_stub_923, gl_dispatch_stub_923, NULL, 923),
- NAME_FUNC_OFFSET(15714, gl_dispatch_stub_924, gl_dispatch_stub_924, NULL, 924),
- NAME_FUNC_OFFSET(15740, gl_dispatch_stub_925, gl_dispatch_stub_925, NULL, 925),
- NAME_FUNC_OFFSET(15768, gl_dispatch_stub_926, gl_dispatch_stub_926, NULL, 926),
- NAME_FUNC_OFFSET(15796, gl_dispatch_stub_927, gl_dispatch_stub_927, NULL, 927),
- NAME_FUNC_OFFSET(15822, gl_dispatch_stub_928, gl_dispatch_stub_928, NULL, 928),
- NAME_FUNC_OFFSET(15850, gl_dispatch_stub_929, gl_dispatch_stub_929, NULL, 929),
- NAME_FUNC_OFFSET(15878, gl_dispatch_stub_930, gl_dispatch_stub_930, NULL, 930),
- NAME_FUNC_OFFSET(15904, gl_dispatch_stub_931, gl_dispatch_stub_931, NULL, 931),
- NAME_FUNC_OFFSET(15932, gl_dispatch_stub_932, gl_dispatch_stub_932, NULL, 932),
- NAME_FUNC_OFFSET(15960, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 933),
- NAME_FUNC_OFFSET(15978, gl_dispatch_stub_934, gl_dispatch_stub_934, NULL, 934),
- NAME_FUNC_OFFSET(15997, gl_dispatch_stub_935, gl_dispatch_stub_935, NULL, 935),
- NAME_FUNC_OFFSET(16023, glDebugMessageCallback, glDebugMessageCallback, NULL, 936),
- NAME_FUNC_OFFSET(16046, glDebugMessageControl, glDebugMessageControl, NULL, 937),
- NAME_FUNC_OFFSET(16068, glDebugMessageInsert, glDebugMessageInsert, NULL, 938),
- NAME_FUNC_OFFSET(16089, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 939),
- NAME_FUNC_OFFSET(16110, glGetObjectLabel, glGetObjectLabel, NULL, 940),
- NAME_FUNC_OFFSET(16127, glGetObjectPtrLabel, glGetObjectPtrLabel, NULL, 941),
- NAME_FUNC_OFFSET(16147, glObjectLabel, glObjectLabel, NULL, 942),
- NAME_FUNC_OFFSET(16161, glObjectPtrLabel, glObjectPtrLabel, NULL, 943),
- NAME_FUNC_OFFSET(16178, glPopDebugGroup, glPopDebugGroup, NULL, 944),
- NAME_FUNC_OFFSET(16194, glPushDebugGroup, glPushDebugGroup, NULL, 945),
- NAME_FUNC_OFFSET(16211, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 946),
- NAME_FUNC_OFFSET(16233, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 947),
- NAME_FUNC_OFFSET(16256, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 948),
- NAME_FUNC_OFFSET(16279, glFogCoordfEXT, glFogCoordfEXT, NULL, 949),
- NAME_FUNC_OFFSET(16294, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 950),
- NAME_FUNC_OFFSET(16310, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 951),
- NAME_FUNC_OFFSET(16330, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 952),
- NAME_FUNC_OFFSET(16348, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 953),
- NAME_FUNC_OFFSET(16367, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 954),
- NAME_FUNC_OFFSET(16385, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 955),
- NAME_FUNC_OFFSET(16404, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 956),
- NAME_FUNC_OFFSET(16422, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 957),
- NAME_FUNC_OFFSET(16441, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 958),
- NAME_FUNC_OFFSET(16459, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 959),
- NAME_FUNC_OFFSET(16478, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
- NAME_FUNC_OFFSET(16503, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
- NAME_FUNC_OFFSET(16530, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 962),
- NAME_FUNC_OFFSET(16554, glExecuteProgramNV, glExecuteProgramNV, NULL, 963),
- NAME_FUNC_OFFSET(16573, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 964),
- NAME_FUNC_OFFSET(16599, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 965),
- NAME_FUNC_OFFSET(16625, glGetProgramStringNV, glGetProgramStringNV, NULL, 966),
- NAME_FUNC_OFFSET(16646, glGetProgramivNV, glGetProgramivNV, NULL, 967),
- NAME_FUNC_OFFSET(16663, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 968),
- NAME_FUNC_OFFSET(16684, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 969),
- NAME_FUNC_OFFSET(16706, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 970),
- NAME_FUNC_OFFSET(16728, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 971),
- NAME_FUNC_OFFSET(16750, glLoadProgramNV, glLoadProgramNV, NULL, 972),
- NAME_FUNC_OFFSET(16766, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 973),
- NAME_FUNC_OFFSET(16791, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 974),
- NAME_FUNC_OFFSET(16816, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 975),
- NAME_FUNC_OFFSET(16844, glTrackMatrixNV, glTrackMatrixNV, NULL, 976),
- NAME_FUNC_OFFSET(16860, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 977),
- NAME_FUNC_OFFSET(16879, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 978),
- NAME_FUNC_OFFSET(16899, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 979),
- NAME_FUNC_OFFSET(16918, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 980),
- NAME_FUNC_OFFSET(16938, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 981),
- NAME_FUNC_OFFSET(16957, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 982),
- NAME_FUNC_OFFSET(16977, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 983),
- NAME_FUNC_OFFSET(16996, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 984),
- NAME_FUNC_OFFSET(17016, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 985),
- NAME_FUNC_OFFSET(17035, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 986),
- NAME_FUNC_OFFSET(17055, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 987),
- NAME_FUNC_OFFSET(17074, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 988),
- NAME_FUNC_OFFSET(17094, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 989),
- NAME_FUNC_OFFSET(17113, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 990),
- NAME_FUNC_OFFSET(17133, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 991),
- NAME_FUNC_OFFSET(17152, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 992),
- NAME_FUNC_OFFSET(17172, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 993),
- NAME_FUNC_OFFSET(17191, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 994),
- NAME_FUNC_OFFSET(17211, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 995),
- NAME_FUNC_OFFSET(17230, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 996),
- NAME_FUNC_OFFSET(17250, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 997),
- NAME_FUNC_OFFSET(17269, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 998),
- NAME_FUNC_OFFSET(17289, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 999),
- NAME_FUNC_OFFSET(17308, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 1000),
- NAME_FUNC_OFFSET(17328, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 1001),
- NAME_FUNC_OFFSET(17348, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 1002),
- NAME_FUNC_OFFSET(17369, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 1003),
- NAME_FUNC_OFFSET(17393, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 1004),
- NAME_FUNC_OFFSET(17414, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 1005),
- NAME_FUNC_OFFSET(17435, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 1006),
- NAME_FUNC_OFFSET(17456, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 1007),
- NAME_FUNC_OFFSET(17477, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 1008),
- NAME_FUNC_OFFSET(17498, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 1009),
- NAME_FUNC_OFFSET(17519, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 1010),
- NAME_FUNC_OFFSET(17540, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 1011),
- NAME_FUNC_OFFSET(17561, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 1012),
- NAME_FUNC_OFFSET(17582, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 1013),
- NAME_FUNC_OFFSET(17603, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 1014),
- NAME_FUNC_OFFSET(17624, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 1015),
- NAME_FUNC_OFFSET(17645, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 1016),
- NAME_FUNC_OFFSET(17667, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 1017),
- NAME_FUNC_OFFSET(17694, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 1018),
- NAME_FUNC_OFFSET(17721, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 1019),
- NAME_FUNC_OFFSET(17745, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 1020),
- NAME_FUNC_OFFSET(17769, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 1021),
- NAME_FUNC_OFFSET(17791, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 1022),
- NAME_FUNC_OFFSET(17813, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 1023),
- NAME_FUNC_OFFSET(17835, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 1024),
- NAME_FUNC_OFFSET(17860, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 1025),
- NAME_FUNC_OFFSET(17884, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 1026),
- NAME_FUNC_OFFSET(17906, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 1027),
- NAME_FUNC_OFFSET(17928, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 1028),
- NAME_FUNC_OFFSET(17950, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 1029),
- NAME_FUNC_OFFSET(17976, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 1030),
- NAME_FUNC_OFFSET(17999, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 1031),
- NAME_FUNC_OFFSET(18023, glPassTexCoordATI, glPassTexCoordATI, NULL, 1032),
- NAME_FUNC_OFFSET(18041, glSampleMapATI, glSampleMapATI, NULL, 1033),
- NAME_FUNC_OFFSET(18056, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 1034),
- NAME_FUNC_OFFSET(18087, gl_dispatch_stub_1035, gl_dispatch_stub_1035, NULL, 1035),
- NAME_FUNC_OFFSET(18110, gl_dispatch_stub_1036, gl_dispatch_stub_1036, NULL, 1036),
- NAME_FUNC_OFFSET(18133, gl_dispatch_stub_1037, gl_dispatch_stub_1037, NULL, 1037),
- NAME_FUNC_OFFSET(18156, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 1038),
- NAME_FUNC_OFFSET(18187, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 1039),
- NAME_FUNC_OFFSET(18218, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 1040),
- NAME_FUNC_OFFSET(18246, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 1041),
- NAME_FUNC_OFFSET(18275, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 1042),
- NAME_FUNC_OFFSET(18303, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 1043),
- NAME_FUNC_OFFSET(18332, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 1044),
- NAME_FUNC_OFFSET(18353, gl_dispatch_stub_1045, gl_dispatch_stub_1045, NULL, 1045),
- NAME_FUNC_OFFSET(18370, gl_dispatch_stub_1046, gl_dispatch_stub_1046, NULL, 1046),
- NAME_FUNC_OFFSET(18383, gl_dispatch_stub_1047, gl_dispatch_stub_1047, NULL, 1047),
- NAME_FUNC_OFFSET(18397, gl_dispatch_stub_1048, gl_dispatch_stub_1048, NULL, 1048),
- NAME_FUNC_OFFSET(18414, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 1049),
- NAME_FUNC_OFFSET(18435, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 1050),
- NAME_FUNC_OFFSET(18457, gl_dispatch_stub_1051, gl_dispatch_stub_1051, NULL, 1051),
- NAME_FUNC_OFFSET(18481, gl_dispatch_stub_1052, gl_dispatch_stub_1052, NULL, 1052),
- NAME_FUNC_OFFSET(18511, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1053),
- NAME_FUNC_OFFSET(18532, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1054),
- NAME_FUNC_OFFSET(18554, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1055),
- NAME_FUNC_OFFSET(18575, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1056),
- NAME_FUNC_OFFSET(18597, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1057),
- NAME_FUNC_OFFSET(18619, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1058),
- NAME_FUNC_OFFSET(18642, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1059),
- NAME_FUNC_OFFSET(18663, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1060),
- NAME_FUNC_OFFSET(18685, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1061),
- NAME_FUNC_OFFSET(18707, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1062),
- NAME_FUNC_OFFSET(18730, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1063),
- NAME_FUNC_OFFSET(18751, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1064),
- NAME_FUNC_OFFSET(18773, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1065),
- NAME_FUNC_OFFSET(18795, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1066),
- NAME_FUNC_OFFSET(18818, glClearColorIiEXT, glClearColorIiEXT, NULL, 1067),
- NAME_FUNC_OFFSET(18836, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 1068),
- NAME_FUNC_OFFSET(18855, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1069),
- NAME_FUNC_OFFSET(18877, glBeginPerfMonitorAMD, glBeginPerfMonitorAMD, NULL, 1070),
- NAME_FUNC_OFFSET(18899, glDeletePerfMonitorsAMD, glDeletePerfMonitorsAMD, NULL, 1071),
- NAME_FUNC_OFFSET(18923, glEndPerfMonitorAMD, glEndPerfMonitorAMD, NULL, 1072),
- NAME_FUNC_OFFSET(18943, glGenPerfMonitorsAMD, glGenPerfMonitorsAMD, NULL, 1073),
- NAME_FUNC_OFFSET(18964, glGetPerfMonitorCounterDataAMD, glGetPerfMonitorCounterDataAMD, NULL, 1074),
- NAME_FUNC_OFFSET(18995, glGetPerfMonitorCounterInfoAMD, glGetPerfMonitorCounterInfoAMD, NULL, 1075),
- NAME_FUNC_OFFSET(19026, glGetPerfMonitorCounterStringAMD, glGetPerfMonitorCounterStringAMD, NULL, 1076),
- NAME_FUNC_OFFSET(19059, glGetPerfMonitorCountersAMD, glGetPerfMonitorCountersAMD, NULL, 1077),
- NAME_FUNC_OFFSET(19087, glGetPerfMonitorGroupStringAMD, glGetPerfMonitorGroupStringAMD, NULL, 1078),
- NAME_FUNC_OFFSET(19118, glGetPerfMonitorGroupsAMD, glGetPerfMonitorGroupsAMD, NULL, 1079),
- NAME_FUNC_OFFSET(19144, glSelectPerfMonitorCountersAMD, glSelectPerfMonitorCountersAMD, NULL, 1080),
- NAME_FUNC_OFFSET(19175, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1081),
- NAME_FUNC_OFFSET(19203, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1082),
- NAME_FUNC_OFFSET(19226, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1083),
- NAME_FUNC_OFFSET(19251, glActiveProgramEXT, glActiveProgramEXT, NULL, 1084),
- NAME_FUNC_OFFSET(19270, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1085),
- NAME_FUNC_OFFSET(19295, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1086),
- NAME_FUNC_OFFSET(19317, glTextureBarrierNV, glTextureBarrierNV, NULL, 1087),
- NAME_FUNC_OFFSET(19336, glVDPAUFiniNV, glVDPAUFiniNV, NULL, 1088),
- NAME_FUNC_OFFSET(19350, glVDPAUGetSurfaceivNV, glVDPAUGetSurfaceivNV, NULL, 1089),
- NAME_FUNC_OFFSET(19372, glVDPAUInitNV, glVDPAUInitNV, NULL, 1090),
- NAME_FUNC_OFFSET(19386, glVDPAUIsSurfaceNV, glVDPAUIsSurfaceNV, NULL, 1091),
- NAME_FUNC_OFFSET(19405, glVDPAUMapSurfacesNV, glVDPAUMapSurfacesNV, NULL, 1092),
- NAME_FUNC_OFFSET(19426, glVDPAURegisterOutputSurfaceNV, glVDPAURegisterOutputSurfaceNV, NULL, 1093),
- NAME_FUNC_OFFSET(19457, glVDPAURegisterVideoSurfaceNV, glVDPAURegisterVideoSurfaceNV, NULL, 1094),
- NAME_FUNC_OFFSET(19487, glVDPAUSurfaceAccessNV, glVDPAUSurfaceAccessNV, NULL, 1095),
- NAME_FUNC_OFFSET(19510, glVDPAUUnmapSurfacesNV, glVDPAUUnmapSurfacesNV, NULL, 1096),
- NAME_FUNC_OFFSET(19533, glVDPAUUnregisterSurfaceNV, glVDPAUUnregisterSurfaceNV, NULL, 1097),
- NAME_FUNC_OFFSET(19560, gl_dispatch_stub_1098, gl_dispatch_stub_1098, NULL, 1098),
- NAME_FUNC_OFFSET(19582, gl_dispatch_stub_1099, gl_dispatch_stub_1099, NULL, 1099),
- NAME_FUNC_OFFSET(19605, gl_dispatch_stub_1100, gl_dispatch_stub_1100, NULL, 1100),
- NAME_FUNC_OFFSET(19628, gl_dispatch_stub_1101, gl_dispatch_stub_1101, NULL, 1101),
- NAME_FUNC_OFFSET(19648, gl_dispatch_stub_1102, gl_dispatch_stub_1102, NULL, 1102),
- NAME_FUNC_OFFSET(19675, gl_dispatch_stub_1103, gl_dispatch_stub_1103, NULL, 1103),
- NAME_FUNC_OFFSET(19701, gl_dispatch_stub_1104, gl_dispatch_stub_1104, NULL, 1104),
- NAME_FUNC_OFFSET(19727, gl_dispatch_stub_1105, gl_dispatch_stub_1105, NULL, 1105),
- NAME_FUNC_OFFSET(19751, gl_dispatch_stub_1106, gl_dispatch_stub_1106, NULL, 1106),
- NAME_FUNC_OFFSET(19779, gl_dispatch_stub_1107, gl_dispatch_stub_1107, NULL, 1107),
- NAME_FUNC_OFFSET(19803, gl_dispatch_stub_1108, gl_dispatch_stub_1108, NULL, 1108),
- NAME_FUNC_OFFSET(19828, gl_dispatch_stub_1109, gl_dispatch_stub_1109, NULL, 1109),
- NAME_FUNC_OFFSET(19857, gl_dispatch_stub_1110, gl_dispatch_stub_1110, NULL, 1110),
- NAME_FUNC_OFFSET(19888, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1111),
- NAME_FUNC_OFFSET(19927, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1112),
- NAME_FUNC_OFFSET(19956, glAlphaFuncx, glAlphaFuncx, NULL, 1113),
- NAME_FUNC_OFFSET(19969, glClearColorx, glClearColorx, NULL, 1114),
- NAME_FUNC_OFFSET(19983, glClearDepthx, glClearDepthx, NULL, 1115),
- NAME_FUNC_OFFSET(19997, glColor4x, glColor4x, NULL, 1116),
- NAME_FUNC_OFFSET(20007, glDepthRangex, glDepthRangex, NULL, 1117),
- NAME_FUNC_OFFSET(20021, glFogx, glFogx, NULL, 1118),
- NAME_FUNC_OFFSET(20028, glFogxv, glFogxv, NULL, 1119),
- NAME_FUNC_OFFSET(20036, glFrustumf, glFrustumf, NULL, 1120),
- NAME_FUNC_OFFSET(20047, glFrustumx, glFrustumx, NULL, 1121),
- NAME_FUNC_OFFSET(20058, glLightModelx, glLightModelx, NULL, 1122),
- NAME_FUNC_OFFSET(20072, glLightModelxv, glLightModelxv, NULL, 1123),
- NAME_FUNC_OFFSET(20087, glLightx, glLightx, NULL, 1124),
- NAME_FUNC_OFFSET(20096, glLightxv, glLightxv, NULL, 1125),
- NAME_FUNC_OFFSET(20106, glLineWidthx, glLineWidthx, NULL, 1126),
- NAME_FUNC_OFFSET(20119, glLoadMatrixx, glLoadMatrixx, NULL, 1127),
- NAME_FUNC_OFFSET(20133, glMaterialx, glMaterialx, NULL, 1128),
- NAME_FUNC_OFFSET(20145, glMaterialxv, glMaterialxv, NULL, 1129),
- NAME_FUNC_OFFSET(20158, glMultMatrixx, glMultMatrixx, NULL, 1130),
- NAME_FUNC_OFFSET(20172, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1131),
- NAME_FUNC_OFFSET(20190, glNormal3x, glNormal3x, NULL, 1132),
- NAME_FUNC_OFFSET(20201, glOrthof, glOrthof, NULL, 1133),
- NAME_FUNC_OFFSET(20210, glOrthox, glOrthox, NULL, 1134),
- NAME_FUNC_OFFSET(20219, glPointSizex, glPointSizex, NULL, 1135),
- NAME_FUNC_OFFSET(20232, glPolygonOffsetx, glPolygonOffsetx, NULL, 1136),
- NAME_FUNC_OFFSET(20249, glRotatex, glRotatex, NULL, 1137),
- NAME_FUNC_OFFSET(20259, glSampleCoveragex, glSampleCoveragex, NULL, 1138),
- NAME_FUNC_OFFSET(20277, glScalex, glScalex, NULL, 1139),
- NAME_FUNC_OFFSET(20286, glTexEnvx, glTexEnvx, NULL, 1140),
- NAME_FUNC_OFFSET(20296, glTexEnvxv, glTexEnvxv, NULL, 1141),
- NAME_FUNC_OFFSET(20307, glTexParameterx, glTexParameterx, NULL, 1142),
- NAME_FUNC_OFFSET(20323, glTranslatex, glTranslatex, NULL, 1143),
- NAME_FUNC_OFFSET(20336, glClipPlanef, glClipPlanef, NULL, 1144),
- NAME_FUNC_OFFSET(20349, glClipPlanex, glClipPlanex, NULL, 1145),
- NAME_FUNC_OFFSET(20362, glGetClipPlanef, glGetClipPlanef, NULL, 1146),
- NAME_FUNC_OFFSET(20378, glGetClipPlanex, glGetClipPlanex, NULL, 1147),
- NAME_FUNC_OFFSET(20394, glGetFixedv, glGetFixedv, NULL, 1148),
- NAME_FUNC_OFFSET(20406, glGetLightxv, glGetLightxv, NULL, 1149),
- NAME_FUNC_OFFSET(20419, glGetMaterialxv, glGetMaterialxv, NULL, 1150),
- NAME_FUNC_OFFSET(20435, glGetTexEnvxv, glGetTexEnvxv, NULL, 1151),
- NAME_FUNC_OFFSET(20449, glGetTexParameterxv, glGetTexParameterxv, NULL, 1152),
- NAME_FUNC_OFFSET(20469, glPointParameterx, glPointParameterx, NULL, 1153),
- NAME_FUNC_OFFSET(20487, glPointParameterxv, glPointParameterxv, NULL, 1154),
- NAME_FUNC_OFFSET(20506, glTexParameterxv, glTexParameterxv, NULL, 1155),
- NAME_FUNC_OFFSET(20523, glTexGenf, glTexGenf, NULL, 190),
- NAME_FUNC_OFFSET(20536, glTexGenfv, glTexGenfv, NULL, 191),
- NAME_FUNC_OFFSET(20550, glTexGeni, glTexGeni, NULL, 192),
- NAME_FUNC_OFFSET(20563, glTexGeniv, glTexGeniv, NULL, 193),
- NAME_FUNC_OFFSET(20577, glReadBuffer, glReadBuffer, NULL, 254),
- NAME_FUNC_OFFSET(20592, glGetTexGenfv, glGetTexGenfv, NULL, 279),
- NAME_FUNC_OFFSET(20609, glGetTexGeniv, glGetTexGeniv, NULL, 280),
- NAME_FUNC_OFFSET(20626, glArrayElement, glArrayElement, NULL, 306),
- NAME_FUNC_OFFSET(20644, glBindTexture, glBindTexture, NULL, 307),
- NAME_FUNC_OFFSET(20661, glDrawArrays, glDrawArrays, NULL, 310),
- NAME_FUNC_OFFSET(20677, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
- NAME_FUNC_OFFSET(20702, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
- NAME_FUNC_OFFSET(20722, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
- NAME_FUNC_OFFSET(20742, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
- NAME_FUNC_OFFSET(20765, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
- NAME_FUNC_OFFSET(20788, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
- NAME_FUNC_OFFSET(20808, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
- NAME_FUNC_OFFSET(20825, glGetPointerv, glGetPointerv, NULL, 329),
- NAME_FUNC_OFFSET(20842, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
- NAME_FUNC_OFFSET(20857, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
- NAME_FUNC_OFFSET(20881, glTexSubImage1D, glTexSubImage1D, NULL, 332),
- NAME_FUNC_OFFSET(20900, glTexSubImage2D, glTexSubImage2D, NULL, 333),
- NAME_FUNC_OFFSET(20919, glBlendColor, glBlendColor, NULL, 336),
- NAME_FUNC_OFFSET(20935, glBlendEquation, glBlendEquation, NULL, 337),
- NAME_FUNC_OFFSET(20954, glBlendEquation, glBlendEquation, NULL, 337),
- NAME_FUNC_OFFSET(20973, glDrawRangeElements, glDrawRangeElements, NULL, 338),
- NAME_FUNC_OFFSET(20996, glColorTable, glColorTable, NULL, 339),
- NAME_FUNC_OFFSET(21012, glColorTable, glColorTable, NULL, 339),
- NAME_FUNC_OFFSET(21028, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
- NAME_FUNC_OFFSET(21055, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
- NAME_FUNC_OFFSET(21082, glCopyColorTable, glCopyColorTable, NULL, 342),
- NAME_FUNC_OFFSET(21102, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
- NAME_FUNC_OFFSET(21121, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
- NAME_FUNC_OFFSET(21140, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
- NAME_FUNC_OFFSET(21170, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
- NAME_FUNC_OFFSET(21200, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
- NAME_FUNC_OFFSET(21230, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
- NAME_FUNC_OFFSET(21260, glColorSubTable, glColorSubTable, NULL, 346),
- NAME_FUNC_OFFSET(21279, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
- NAME_FUNC_OFFSET(21302, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
- NAME_FUNC_OFFSET(21327, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
- NAME_FUNC_OFFSET(21352, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
- NAME_FUNC_OFFSET(21379, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
- NAME_FUNC_OFFSET(21407, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
- NAME_FUNC_OFFSET(21434, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
- NAME_FUNC_OFFSET(21462, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
- NAME_FUNC_OFFSET(21491, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
- NAME_FUNC_OFFSET(21520, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
- NAME_FUNC_OFFSET(21546, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
- NAME_FUNC_OFFSET(21577, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
- NAME_FUNC_OFFSET(21608, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
- NAME_FUNC_OFFSET(21632, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
- NAME_FUNC_OFFSET(21655, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
- NAME_FUNC_OFFSET(21673, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
- NAME_FUNC_OFFSET(21702, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
- NAME_FUNC_OFFSET(21731, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
- NAME_FUNC_OFFSET(21746, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
- NAME_FUNC_OFFSET(21772, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
- NAME_FUNC_OFFSET(21798, glHistogram, glHistogram, NULL, 367),
- NAME_FUNC_OFFSET(21813, glMinmax, glMinmax, NULL, 368),
- NAME_FUNC_OFFSET(21825, glResetHistogram, glResetHistogram, NULL, 369),
- NAME_FUNC_OFFSET(21845, glResetMinmax, glResetMinmax, NULL, 370),
- NAME_FUNC_OFFSET(21862, glTexImage3D, glTexImage3D, NULL, 371),
- NAME_FUNC_OFFSET(21878, glTexImage3D, glTexImage3D, NULL, 371),
- NAME_FUNC_OFFSET(21894, glTexSubImage3D, glTexSubImage3D, NULL, 372),
- NAME_FUNC_OFFSET(21913, glTexSubImage3D, glTexSubImage3D, NULL, 372),
- NAME_FUNC_OFFSET(21932, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
- NAME_FUNC_OFFSET(21955, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
- NAME_FUNC_OFFSET(21978, glActiveTexture, glActiveTexture, NULL, 374),
- NAME_FUNC_OFFSET(21997, glClientActiveTexture, glClientActiveTexture, NULL, 375),
- NAME_FUNC_OFFSET(22022, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
- NAME_FUNC_OFFSET(22043, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
- NAME_FUNC_OFFSET(22065, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
- NAME_FUNC_OFFSET(22083, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
- NAME_FUNC_OFFSET(22102, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
- NAME_FUNC_OFFSET(22123, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
- NAME_FUNC_OFFSET(22145, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
- NAME_FUNC_OFFSET(22166, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
- NAME_FUNC_OFFSET(22188, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
- NAME_FUNC_OFFSET(22209, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
- NAME_FUNC_OFFSET(22231, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
- NAME_FUNC_OFFSET(22249, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
- NAME_FUNC_OFFSET(22268, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
- NAME_FUNC_OFFSET(22289, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
- NAME_FUNC_OFFSET(22311, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
- NAME_FUNC_OFFSET(22332, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
- NAME_FUNC_OFFSET(22354, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
- NAME_FUNC_OFFSET(22375, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
- NAME_FUNC_OFFSET(22397, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
- NAME_FUNC_OFFSET(22415, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
- NAME_FUNC_OFFSET(22434, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
- NAME_FUNC_OFFSET(22455, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
- NAME_FUNC_OFFSET(22477, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
- NAME_FUNC_OFFSET(22498, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
- NAME_FUNC_OFFSET(22520, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
- NAME_FUNC_OFFSET(22541, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
- NAME_FUNC_OFFSET(22563, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
- NAME_FUNC_OFFSET(22581, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
- NAME_FUNC_OFFSET(22600, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
- NAME_FUNC_OFFSET(22621, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
- NAME_FUNC_OFFSET(22643, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
- NAME_FUNC_OFFSET(22664, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
- NAME_FUNC_OFFSET(22686, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
- NAME_FUNC_OFFSET(22712, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
- NAME_FUNC_OFFSET(22738, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
- NAME_FUNC_OFFSET(22764, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
- NAME_FUNC_OFFSET(22790, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
- NAME_FUNC_OFFSET(22819, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
- NAME_FUNC_OFFSET(22848, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
- NAME_FUNC_OFFSET(22877, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
- NAME_FUNC_OFFSET(22906, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
- NAME_FUNC_OFFSET(22933, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
- NAME_FUNC_OFFSET(22959, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
- NAME_FUNC_OFFSET(22985, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
- NAME_FUNC_OFFSET(23011, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
- NAME_FUNC_OFFSET(23037, glSampleCoverage, glSampleCoverage, NULL, 419),
- NAME_FUNC_OFFSET(23057, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
- NAME_FUNC_OFFSET(23080, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
- NAME_FUNC_OFFSET(23104, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
- NAME_FUNC_OFFSET(23127, glFogCoordPointer, glFogCoordPointer, NULL, 421),
- NAME_FUNC_OFFSET(23148, glFogCoordd, glFogCoordd, NULL, 422),
- NAME_FUNC_OFFSET(23163, glFogCoorddv, glFogCoorddv, NULL, 423),
- NAME_FUNC_OFFSET(23179, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
- NAME_FUNC_OFFSET(23200, glPointParameterf, glPointParameterf, NULL, 425),
- NAME_FUNC_OFFSET(23221, glPointParameterf, glPointParameterf, NULL, 425),
- NAME_FUNC_OFFSET(23242, glPointParameterf, glPointParameterf, NULL, 425),
- NAME_FUNC_OFFSET(23264, glPointParameterfv, glPointParameterfv, NULL, 426),
- NAME_FUNC_OFFSET(23286, glPointParameterfv, glPointParameterfv, NULL, 426),
- NAME_FUNC_OFFSET(23308, glPointParameterfv, glPointParameterfv, NULL, 426),
- NAME_FUNC_OFFSET(23331, glPointParameteri, glPointParameteri, NULL, 427),
- NAME_FUNC_OFFSET(23351, glPointParameteriv, glPointParameteriv, NULL, 428),
- NAME_FUNC_OFFSET(23372, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
- NAME_FUNC_OFFSET(23394, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
- NAME_FUNC_OFFSET(23417, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
- NAME_FUNC_OFFSET(23439, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
- NAME_FUNC_OFFSET(23462, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
- NAME_FUNC_OFFSET(23484, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
- NAME_FUNC_OFFSET(23507, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
- NAME_FUNC_OFFSET(23529, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
- NAME_FUNC_OFFSET(23552, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
- NAME_FUNC_OFFSET(23575, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
- NAME_FUNC_OFFSET(23599, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
- NAME_FUNC_OFFSET(23622, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
- NAME_FUNC_OFFSET(23646, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
- NAME_FUNC_OFFSET(23669, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
- NAME_FUNC_OFFSET(23693, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
- NAME_FUNC_OFFSET(23720, glWindowPos2d, glWindowPos2d, NULL, 444),
- NAME_FUNC_OFFSET(23737, glWindowPos2d, glWindowPos2d, NULL, 444),
- NAME_FUNC_OFFSET(23755, glWindowPos2dv, glWindowPos2dv, NULL, 445),
- NAME_FUNC_OFFSET(23773, glWindowPos2dv, glWindowPos2dv, NULL, 445),
- NAME_FUNC_OFFSET(23792, glWindowPos2f, glWindowPos2f, NULL, 446),
- NAME_FUNC_OFFSET(23809, glWindowPos2f, glWindowPos2f, NULL, 446),
- NAME_FUNC_OFFSET(23827, glWindowPos2fv, glWindowPos2fv, NULL, 447),
- NAME_FUNC_OFFSET(23845, glWindowPos2fv, glWindowPos2fv, NULL, 447),
- NAME_FUNC_OFFSET(23864, glWindowPos2i, glWindowPos2i, NULL, 448),
- NAME_FUNC_OFFSET(23881, glWindowPos2i, glWindowPos2i, NULL, 448),
- NAME_FUNC_OFFSET(23899, glWindowPos2iv, glWindowPos2iv, NULL, 449),
- NAME_FUNC_OFFSET(23917, glWindowPos2iv, glWindowPos2iv, NULL, 449),
- NAME_FUNC_OFFSET(23936, glWindowPos2s, glWindowPos2s, NULL, 450),
- NAME_FUNC_OFFSET(23953, glWindowPos2s, glWindowPos2s, NULL, 450),
- NAME_FUNC_OFFSET(23971, glWindowPos2sv, glWindowPos2sv, NULL, 451),
- NAME_FUNC_OFFSET(23989, glWindowPos2sv, glWindowPos2sv, NULL, 451),
- NAME_FUNC_OFFSET(24008, glWindowPos3d, glWindowPos3d, NULL, 452),
- NAME_FUNC_OFFSET(24025, glWindowPos3d, glWindowPos3d, NULL, 452),
- NAME_FUNC_OFFSET(24043, glWindowPos3dv, glWindowPos3dv, NULL, 453),
- NAME_FUNC_OFFSET(24061, glWindowPos3dv, glWindowPos3dv, NULL, 453),
- NAME_FUNC_OFFSET(24080, glWindowPos3f, glWindowPos3f, NULL, 454),
- NAME_FUNC_OFFSET(24097, glWindowPos3f, glWindowPos3f, NULL, 454),
- NAME_FUNC_OFFSET(24115, glWindowPos3fv, glWindowPos3fv, NULL, 455),
- NAME_FUNC_OFFSET(24133, glWindowPos3fv, glWindowPos3fv, NULL, 455),
- NAME_FUNC_OFFSET(24152, glWindowPos3i, glWindowPos3i, NULL, 456),
- NAME_FUNC_OFFSET(24169, glWindowPos3i, glWindowPos3i, NULL, 456),
- NAME_FUNC_OFFSET(24187, glWindowPos3iv, glWindowPos3iv, NULL, 457),
- NAME_FUNC_OFFSET(24205, glWindowPos3iv, glWindowPos3iv, NULL, 457),
- NAME_FUNC_OFFSET(24224, glWindowPos3s, glWindowPos3s, NULL, 458),
- NAME_FUNC_OFFSET(24241, glWindowPos3s, glWindowPos3s, NULL, 458),
- NAME_FUNC_OFFSET(24259, glWindowPos3sv, glWindowPos3sv, NULL, 459),
- NAME_FUNC_OFFSET(24277, glWindowPos3sv, glWindowPos3sv, NULL, 459),
- NAME_FUNC_OFFSET(24296, glBeginQuery, glBeginQuery, NULL, 460),
- NAME_FUNC_OFFSET(24312, glBindBuffer, glBindBuffer, NULL, 461),
- NAME_FUNC_OFFSET(24328, glBufferData, glBufferData, NULL, 462),
- NAME_FUNC_OFFSET(24344, glBufferSubData, glBufferSubData, NULL, 463),
- NAME_FUNC_OFFSET(24363, glDeleteBuffers, glDeleteBuffers, NULL, 464),
- NAME_FUNC_OFFSET(24382, glDeleteQueries, glDeleteQueries, NULL, 465),
- NAME_FUNC_OFFSET(24401, glEndQuery, glEndQuery, NULL, 466),
- NAME_FUNC_OFFSET(24415, glGenBuffers, glGenBuffers, NULL, 467),
- NAME_FUNC_OFFSET(24431, glGenQueries, glGenQueries, NULL, 468),
- NAME_FUNC_OFFSET(24447, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
- NAME_FUNC_OFFSET(24473, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
- NAME_FUNC_OFFSET(24496, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
- NAME_FUNC_OFFSET(24519, glGetBufferSubData, glGetBufferSubData, NULL, 471),
- NAME_FUNC_OFFSET(24541, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
- NAME_FUNC_OFFSET(24563, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
- NAME_FUNC_OFFSET(24586, glGetQueryiv, glGetQueryiv, NULL, 474),
- NAME_FUNC_OFFSET(24602, glIsBuffer, glIsBuffer, NULL, 475),
- NAME_FUNC_OFFSET(24616, glIsQuery, glIsQuery, NULL, 476),
- NAME_FUNC_OFFSET(24629, glMapBuffer, glMapBuffer, NULL, 477),
- NAME_FUNC_OFFSET(24644, glMapBuffer, glMapBuffer, NULL, 477),
- NAME_FUNC_OFFSET(24659, glUnmapBuffer, glUnmapBuffer, NULL, 478),
- NAME_FUNC_OFFSET(24676, glUnmapBuffer, glUnmapBuffer, NULL, 478),
- NAME_FUNC_OFFSET(24693, glBindAttribLocation, glBindAttribLocation, NULL, 480),
- NAME_FUNC_OFFSET(24717, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
- NAME_FUNC_OFFSET(24744, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
- NAME_FUNC_OFFSET(24771, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
- NAME_FUNC_OFFSET(24798, glCompileShader, glCompileShader, NULL, 482),
- NAME_FUNC_OFFSET(24817, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
- NAME_FUNC_OFFSET(24847, glDrawBuffers, glDrawBuffers, NULL, 489),
- NAME_FUNC_OFFSET(24864, glDrawBuffers, glDrawBuffers, NULL, 489),
- NAME_FUNC_OFFSET(24881, glDrawBuffers, glDrawBuffers, NULL, 489),
- NAME_FUNC_OFFSET(24897, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
- NAME_FUNC_OFFSET(24926, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
- NAME_FUNC_OFFSET(24947, glGetActiveUniform, glGetActiveUniform, NULL, 492),
- NAME_FUNC_OFFSET(24969, glGetAttribLocation, glGetAttribLocation, NULL, 494),
- NAME_FUNC_OFFSET(24992, glGetShaderSource, glGetShaderSource, NULL, 498),
- NAME_FUNC_OFFSET(25013, glGetUniformLocation, glGetUniformLocation, NULL, 500),
- NAME_FUNC_OFFSET(25037, glGetUniformfv, glGetUniformfv, NULL, 501),
- NAME_FUNC_OFFSET(25055, glGetUniformiv, glGetUniformiv, NULL, 502),
- NAME_FUNC_OFFSET(25073, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
- NAME_FUNC_OFFSET(25102, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
- NAME_FUNC_OFFSET(25130, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
- NAME_FUNC_OFFSET(25153, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
- NAME_FUNC_OFFSET(25176, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
- NAME_FUNC_OFFSET(25199, glLinkProgram, glLinkProgram, NULL, 509),
- NAME_FUNC_OFFSET(25216, glShaderSource, glShaderSource, NULL, 510),
- NAME_FUNC_OFFSET(25234, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
- NAME_FUNC_OFFSET(25257, glUniform1f, glUniform1f, NULL, 514),
- NAME_FUNC_OFFSET(25272, glUniform1fv, glUniform1fv, NULL, 515),
- NAME_FUNC_OFFSET(25288, glUniform1i, glUniform1i, NULL, 516),
- NAME_FUNC_OFFSET(25303, glUniform1iv, glUniform1iv, NULL, 517),
- NAME_FUNC_OFFSET(25319, glUniform2f, glUniform2f, NULL, 518),
- NAME_FUNC_OFFSET(25334, glUniform2fv, glUniform2fv, NULL, 519),
- NAME_FUNC_OFFSET(25350, glUniform2i, glUniform2i, NULL, 520),
- NAME_FUNC_OFFSET(25365, glUniform2iv, glUniform2iv, NULL, 521),
- NAME_FUNC_OFFSET(25381, glUniform3f, glUniform3f, NULL, 522),
- NAME_FUNC_OFFSET(25396, glUniform3fv, glUniform3fv, NULL, 523),
- NAME_FUNC_OFFSET(25412, glUniform3i, glUniform3i, NULL, 524),
- NAME_FUNC_OFFSET(25427, glUniform3iv, glUniform3iv, NULL, 525),
- NAME_FUNC_OFFSET(25443, glUniform4f, glUniform4f, NULL, 526),
- NAME_FUNC_OFFSET(25458, glUniform4fv, glUniform4fv, NULL, 527),
- NAME_FUNC_OFFSET(25474, glUniform4i, glUniform4i, NULL, 528),
- NAME_FUNC_OFFSET(25489, glUniform4iv, glUniform4iv, NULL, 529),
- NAME_FUNC_OFFSET(25505, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
- NAME_FUNC_OFFSET(25527, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
- NAME_FUNC_OFFSET(25549, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
- NAME_FUNC_OFFSET(25571, glUseProgram, glUseProgram, NULL, 533),
- NAME_FUNC_OFFSET(25593, glValidateProgram, glValidateProgram, NULL, 534),
- NAME_FUNC_OFFSET(25614, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
- NAME_FUNC_OFFSET(25634, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
- NAME_FUNC_OFFSET(25655, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
- NAME_FUNC_OFFSET(25675, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
- NAME_FUNC_OFFSET(25696, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
- NAME_FUNC_OFFSET(25716, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
- NAME_FUNC_OFFSET(25737, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
- NAME_FUNC_OFFSET(25757, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
- NAME_FUNC_OFFSET(25778, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
- NAME_FUNC_OFFSET(25798, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
- NAME_FUNC_OFFSET(25819, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
- NAME_FUNC_OFFSET(25839, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
- NAME_FUNC_OFFSET(25860, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
- NAME_FUNC_OFFSET(25882, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
- NAME_FUNC_OFFSET(25904, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
- NAME_FUNC_OFFSET(25926, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
- NAME_FUNC_OFFSET(25948, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
- NAME_FUNC_OFFSET(25971, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
- NAME_FUNC_OFFSET(25994, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
- NAME_FUNC_OFFSET(26017, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
- NAME_FUNC_OFFSET(26038, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
- NAME_FUNC_OFFSET(26058, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
- NAME_FUNC_OFFSET(26079, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
- NAME_FUNC_OFFSET(26100, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
- NAME_FUNC_OFFSET(26120, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
- NAME_FUNC_OFFSET(26141, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
- NAME_FUNC_OFFSET(26163, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
- NAME_FUNC_OFFSET(26185, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
- NAME_FUNC_OFFSET(26207, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
- NAME_FUNC_OFFSET(26232, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
- NAME_FUNC_OFFSET(26259, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
- NAME_FUNC_OFFSET(26287, glBindBufferBase, glBindBufferBase, NULL, 572),
- NAME_FUNC_OFFSET(26307, glBindBufferRange, glBindBufferRange, NULL, 573),
- NAME_FUNC_OFFSET(26328, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
- NAME_FUNC_OFFSET(26354, glClampColor, glClampColor, NULL, 575),
- NAME_FUNC_OFFSET(26370, glColorMaski, glColorMaski, NULL, 580),
- NAME_FUNC_OFFSET(26392, glDisablei, glDisablei, NULL, 581),
- NAME_FUNC_OFFSET(26412, glEnablei, glEnablei, NULL, 582),
- NAME_FUNC_OFFSET(26431, glEndConditionalRender, glEndConditionalRender, NULL, 583),
- NAME_FUNC_OFFSET(26456, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
- NAME_FUNC_OFFSET(26482, glGetBooleani_v, glGetBooleani_v, NULL, 585),
- NAME_FUNC_OFFSET(26506, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
- NAME_FUNC_OFFSET(26531, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
- NAME_FUNC_OFFSET(26555, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
- NAME_FUNC_OFFSET(26579, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
- NAME_FUNC_OFFSET(26604, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
- NAME_FUNC_OFFSET(26637, glGetUniformuiv, glGetUniformuiv, NULL, 592),
- NAME_FUNC_OFFSET(26656, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
- NAME_FUNC_OFFSET(26680, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
- NAME_FUNC_OFFSET(26705, glIsEnabledi, glIsEnabledi, NULL, 595),
- NAME_FUNC_OFFSET(26727, glTexParameterIiv, glTexParameterIiv, NULL, 596),
- NAME_FUNC_OFFSET(26748, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
- NAME_FUNC_OFFSET(26770, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
- NAME_FUNC_OFFSET(26801, glUniform1ui, glUniform1ui, NULL, 599),
- NAME_FUNC_OFFSET(26817, glUniform1uiv, glUniform1uiv, NULL, 600),
- NAME_FUNC_OFFSET(26834, glUniform2ui, glUniform2ui, NULL, 601),
- NAME_FUNC_OFFSET(26850, glUniform2uiv, glUniform2uiv, NULL, 602),
- NAME_FUNC_OFFSET(26867, glUniform3ui, glUniform3ui, NULL, 603),
- NAME_FUNC_OFFSET(26883, glUniform3uiv, glUniform3uiv, NULL, 604),
- NAME_FUNC_OFFSET(26900, glUniform4ui, glUniform4ui, NULL, 605),
- NAME_FUNC_OFFSET(26916, glUniform4uiv, glUniform4uiv, NULL, 606),
- NAME_FUNC_OFFSET(26933, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
- NAME_FUNC_OFFSET(26955, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
- NAME_FUNC_OFFSET(26978, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
- NAME_FUNC_OFFSET(27000, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
- NAME_FUNC_OFFSET(27022, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
- NAME_FUNC_OFFSET(27045, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
- NAME_FUNC_OFFSET(27068, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
- NAME_FUNC_OFFSET(27094, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
- NAME_FUNC_OFFSET(27120, glTexBuffer, glTexBuffer, NULL, 615),
- NAME_FUNC_OFFSET(27135, glFramebufferTexture, glFramebufferTexture, NULL, 616),
- NAME_FUNC_OFFSET(27159, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
- NAME_FUNC_OFFSET(27184, glMinSampleShading, glMinSampleShading, NULL, 620),
- NAME_FUNC_OFFSET(27206, glBindProgramARB, glBindProgramARB, NULL, 621),
- NAME_FUNC_OFFSET(27222, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622),
- NAME_FUNC_OFFSET(27241, glGenProgramsARB, glGenProgramsARB, NULL, 623),
- NAME_FUNC_OFFSET(27257, glIsProgramARB, glIsProgramARB, NULL, 630),
- NAME_FUNC_OFFSET(27271, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631),
- NAME_FUNC_OFFSET(27294, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632),
- NAME_FUNC_OFFSET(27318, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633),
- NAME_FUNC_OFFSET(27341, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634),
- NAME_FUNC_OFFSET(27365, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640),
- NAME_FUNC_OFFSET(27382, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641),
- NAME_FUNC_OFFSET(27400, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642),
- NAME_FUNC_OFFSET(27417, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643),
- NAME_FUNC_OFFSET(27435, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644),
- NAME_FUNC_OFFSET(27452, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645),
- NAME_FUNC_OFFSET(27470, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646),
- NAME_FUNC_OFFSET(27487, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647),
- NAME_FUNC_OFFSET(27505, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
- NAME_FUNC_OFFSET(27530, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
- NAME_FUNC_OFFSET(27552, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
- NAME_FUNC_OFFSET(27579, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
- NAME_FUNC_OFFSET(27603, glBindFramebuffer, glBindFramebuffer, NULL, 660),
- NAME_FUNC_OFFSET(27624, glBindRenderbuffer, glBindRenderbuffer, NULL, 661),
- NAME_FUNC_OFFSET(27646, glBlitFramebuffer, glBlitFramebuffer, NULL, 662),
- NAME_FUNC_OFFSET(27667, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
- NAME_FUNC_OFFSET(27695, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
- NAME_FUNC_OFFSET(27723, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
- NAME_FUNC_OFFSET(27747, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
- NAME_FUNC_OFFSET(27771, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
- NAME_FUNC_OFFSET(27796, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
- NAME_FUNC_OFFSET(27821, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
- NAME_FUNC_OFFSET(27850, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
- NAME_FUNC_OFFSET(27879, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667),
- NAME_FUNC_OFFSET(27905, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
- NAME_FUNC_OFFSET(27931, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
- NAME_FUNC_OFFSET(27957, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
- NAME_FUNC_OFFSET(27983, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
- NAME_FUNC_OFFSET(28009, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
- NAME_FUNC_OFFSET(28038, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
- NAME_FUNC_OFFSET(28067, glGenFramebuffers, glGenFramebuffers, NULL, 671),
- NAME_FUNC_OFFSET(28088, glGenFramebuffers, glGenFramebuffers, NULL, 671),
- NAME_FUNC_OFFSET(28109, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
- NAME_FUNC_OFFSET(28131, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
- NAME_FUNC_OFFSET(28153, glGenerateMipmap, glGenerateMipmap, NULL, 673),
- NAME_FUNC_OFFSET(28173, glGenerateMipmap, glGenerateMipmap, NULL, 673),
- NAME_FUNC_OFFSET(28193, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
- NAME_FUNC_OFFSET(28234, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
- NAME_FUNC_OFFSET(28275, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
- NAME_FUNC_OFFSET(28307, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
- NAME_FUNC_OFFSET(28339, glIsFramebuffer, glIsFramebuffer, NULL, 676),
- NAME_FUNC_OFFSET(28358, glIsFramebuffer, glIsFramebuffer, NULL, 676),
- NAME_FUNC_OFFSET(28377, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
- NAME_FUNC_OFFSET(28397, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
- NAME_FUNC_OFFSET(28417, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
- NAME_FUNC_OFFSET(28442, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
- NAME_FUNC_OFFSET(28467, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679),
- NAME_FUNC_OFFSET(28503, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681),
- NAME_FUNC_OFFSET(28531, glMapBufferRange, glMapBufferRange, NULL, 682),
- NAME_FUNC_OFFSET(28551, glBindVertexArray, glBindVertexArray, NULL, 683),
- NAME_FUNC_OFFSET(28572, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
- NAME_FUNC_OFFSET(28598, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
- NAME_FUNC_OFFSET(28622, glGenVertexArrays, glGenVertexArrays, NULL, 685),
- NAME_FUNC_OFFSET(28643, glIsVertexArray, glIsVertexArray, NULL, 686),
- NAME_FUNC_OFFSET(28664, glIsVertexArray, glIsVertexArray, NULL, 686),
- NAME_FUNC_OFFSET(28683, glProvokingVertex, glProvokingVertex, NULL, 706),
- NAME_FUNC_OFFSET(28704, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
- NAME_FUNC_OFFSET(28738, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
- NAME_FUNC_OFFSET(28763, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
- NAME_FUNC_OFFSET(28789, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
- NAME_FUNC_OFFSET(28806, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
- NAME_FUNC_OFFSET(28836, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
- NAME_FUNC_OFFSET(28857, glBlendFunciARB, glBlendFunciARB, NULL, 714),
- NAME_FUNC_OFFSET(28879, glBlendFunciARB, glBlendFunciARB, NULL, 714),
- NAME_FUNC_OFFSET(28892, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731),
- NAME_FUNC_OFFSET(28916, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732),
- NAME_FUNC_OFFSET(28941, glClearDepthf, glClearDepthf, NULL, 785),
- NAME_FUNC_OFFSET(28958, glDepthRangef, glDepthRangef, NULL, 786),
- NAME_FUNC_OFFSET(28975, glGetProgramBinary, glGetProgramBinary, NULL, 790),
- NAME_FUNC_OFFSET(28997, glProgramBinary, glProgramBinary, NULL, 791),
- NAME_FUNC_OFFSET(29016, glProgramParameteri, glProgramParameteri, NULL, 792),
- NAME_FUNC_OFFSET(29039, glProgramParameteri, glProgramParameteri, NULL, 792),
- NAME_FUNC_OFFSET(29062, gl_dispatch_stub_882, gl_dispatch_stub_882, NULL, 882),
- NAME_FUNC_OFFSET(29078, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
- NAME_FUNC_OFFSET(29097, gl_dispatch_stub_891, gl_dispatch_stub_891, NULL, 891),
- NAME_FUNC_OFFSET(29122, gl_dispatch_stub_892, gl_dispatch_stub_892, NULL, 892),
- NAME_FUNC_OFFSET(29147, gl_dispatch_stub_893, gl_dispatch_stub_893, NULL, 893),
- NAME_FUNC_OFFSET(29173, gl_dispatch_stub_894, gl_dispatch_stub_894, NULL, 894),
- NAME_FUNC_OFFSET(29201, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
- NAME_FUNC_OFFSET(29226, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
- NAME_FUNC_OFFSET(29257, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
- NAME_FUNC_OFFSET(29283, gl_dispatch_stub_898, gl_dispatch_stub_898, NULL, 898),
- NAME_FUNC_OFFSET(29306, gl_dispatch_stub_900, gl_dispatch_stub_900, NULL, 900),
- NAME_FUNC_OFFSET(29328, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
- NAME_FUNC_OFFSET(29351, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
- NAME_FUNC_OFFSET(29373, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
- NAME_FUNC_OFFSET(29396, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
- NAME_FUNC_OFFSET(29419, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
- NAME_FUNC_OFFSET(29443, gl_dispatch_stub_906, gl_dispatch_stub_906, NULL, 906),
- NAME_FUNC_OFFSET(29465, gl_dispatch_stub_907, gl_dispatch_stub_907, NULL, 907),
- NAME_FUNC_OFFSET(29488, gl_dispatch_stub_908, gl_dispatch_stub_908, NULL, 908),
- NAME_FUNC_OFFSET(29510, gl_dispatch_stub_909, gl_dispatch_stub_909, NULL, 909),
- NAME_FUNC_OFFSET(29533, gl_dispatch_stub_910, gl_dispatch_stub_910, NULL, 910),
- NAME_FUNC_OFFSET(29556, gl_dispatch_stub_911, gl_dispatch_stub_911, NULL, 911),
- NAME_FUNC_OFFSET(29580, gl_dispatch_stub_912, gl_dispatch_stub_912, NULL, 912),
- NAME_FUNC_OFFSET(29602, gl_dispatch_stub_913, gl_dispatch_stub_913, NULL, 913),
- NAME_FUNC_OFFSET(29625, gl_dispatch_stub_914, gl_dispatch_stub_914, NULL, 914),
- NAME_FUNC_OFFSET(29647, gl_dispatch_stub_915, gl_dispatch_stub_915, NULL, 915),
- NAME_FUNC_OFFSET(29670, gl_dispatch_stub_916, gl_dispatch_stub_916, NULL, 916),
- NAME_FUNC_OFFSET(29693, gl_dispatch_stub_917, gl_dispatch_stub_917, NULL, 917),
- NAME_FUNC_OFFSET(29717, gl_dispatch_stub_918, gl_dispatch_stub_918, NULL, 918),
- NAME_FUNC_OFFSET(29739, gl_dispatch_stub_919, gl_dispatch_stub_919, NULL, 919),
- NAME_FUNC_OFFSET(29762, gl_dispatch_stub_920, gl_dispatch_stub_920, NULL, 920),
- NAME_FUNC_OFFSET(29784, gl_dispatch_stub_921, gl_dispatch_stub_921, NULL, 921),
- NAME_FUNC_OFFSET(29807, gl_dispatch_stub_922, gl_dispatch_stub_922, NULL, 922),
- NAME_FUNC_OFFSET(29830, gl_dispatch_stub_923, gl_dispatch_stub_923, NULL, 923),
- NAME_FUNC_OFFSET(29854, gl_dispatch_stub_924, gl_dispatch_stub_924, NULL, 924),
- NAME_FUNC_OFFSET(29883, gl_dispatch_stub_925, gl_dispatch_stub_925, NULL, 925),
- NAME_FUNC_OFFSET(29914, gl_dispatch_stub_926, gl_dispatch_stub_926, NULL, 926),
- NAME_FUNC_OFFSET(29945, gl_dispatch_stub_927, gl_dispatch_stub_927, NULL, 927),
- NAME_FUNC_OFFSET(29974, gl_dispatch_stub_928, gl_dispatch_stub_928, NULL, 928),
- NAME_FUNC_OFFSET(30005, gl_dispatch_stub_929, gl_dispatch_stub_929, NULL, 929),
- NAME_FUNC_OFFSET(30036, gl_dispatch_stub_930, gl_dispatch_stub_930, NULL, 930),
- NAME_FUNC_OFFSET(30065, gl_dispatch_stub_931, gl_dispatch_stub_931, NULL, 931),
- NAME_FUNC_OFFSET(30096, gl_dispatch_stub_932, gl_dispatch_stub_932, NULL, 932),
- NAME_FUNC_OFFSET(30127, gl_dispatch_stub_934, gl_dispatch_stub_934, NULL, 934),
- NAME_FUNC_OFFSET(30149, gl_dispatch_stub_935, gl_dispatch_stub_935, NULL, 935),
- NAME_FUNC_OFFSET(30178, glDebugMessageCallback, glDebugMessageCallback, NULL, 936),
- NAME_FUNC_OFFSET(30204, glDebugMessageControl, glDebugMessageControl, NULL, 937),
- NAME_FUNC_OFFSET(30229, glDebugMessageInsert, glDebugMessageInsert, NULL, 938),
- NAME_FUNC_OFFSET(30253, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 939),
- NAME_FUNC_OFFSET(30277, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 946),
- NAME_FUNC_OFFSET(30296, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 947),
- NAME_FUNC_OFFSET(30316, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 948),
- NAME_FUNC_OFFSET(30336, glFogCoordfEXT, glFogCoordfEXT, NULL, 949),
- NAME_FUNC_OFFSET(30348, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 950),
- NAME_FUNC_OFFSET(30361, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1053),
- NAME_FUNC_OFFSET(30379, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1054),
- NAME_FUNC_OFFSET(30398, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1055),
- NAME_FUNC_OFFSET(30416, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1056),
- NAME_FUNC_OFFSET(30435, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1057),
- NAME_FUNC_OFFSET(30454, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1058),
- NAME_FUNC_OFFSET(30474, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1059),
- NAME_FUNC_OFFSET(30492, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1060),
- NAME_FUNC_OFFSET(30511, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1061),
- NAME_FUNC_OFFSET(30530, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1062),
- NAME_FUNC_OFFSET(30550, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1063),
- NAME_FUNC_OFFSET(30568, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1064),
- NAME_FUNC_OFFSET(30587, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1065),
- NAME_FUNC_OFFSET(30606, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1066),
- NAME_FUNC_OFFSET(30626, glTextureBarrierNV, glTextureBarrierNV, NULL, 1087),
- NAME_FUNC_OFFSET(30643, glAlphaFuncx, glAlphaFuncx, NULL, 1113),
- NAME_FUNC_OFFSET(30659, glClearColorx, glClearColorx, NULL, 1114),
- NAME_FUNC_OFFSET(30676, glClearDepthx, glClearDepthx, NULL, 1115),
- NAME_FUNC_OFFSET(30693, glColor4x, glColor4x, NULL, 1116),
- NAME_FUNC_OFFSET(30706, glDepthRangex, glDepthRangex, NULL, 1117),
- NAME_FUNC_OFFSET(30723, glFogx, glFogx, NULL, 1118),
- NAME_FUNC_OFFSET(30733, glFogxv, glFogxv, NULL, 1119),
- NAME_FUNC_OFFSET(30744, glFrustumf, glFrustumf, NULL, 1120),
- NAME_FUNC_OFFSET(30758, glFrustumx, glFrustumx, NULL, 1121),
- NAME_FUNC_OFFSET(30772, glLightModelx, glLightModelx, NULL, 1122),
- NAME_FUNC_OFFSET(30789, glLightModelxv, glLightModelxv, NULL, 1123),
- NAME_FUNC_OFFSET(30807, glLightx, glLightx, NULL, 1124),
- NAME_FUNC_OFFSET(30819, glLightxv, glLightxv, NULL, 1125),
- NAME_FUNC_OFFSET(30832, glLineWidthx, glLineWidthx, NULL, 1126),
- NAME_FUNC_OFFSET(30848, glLoadMatrixx, glLoadMatrixx, NULL, 1127),
- NAME_FUNC_OFFSET(30865, glMaterialx, glMaterialx, NULL, 1128),
- NAME_FUNC_OFFSET(30880, glMaterialxv, glMaterialxv, NULL, 1129),
- NAME_FUNC_OFFSET(30896, glMultMatrixx, glMultMatrixx, NULL, 1130),
- NAME_FUNC_OFFSET(30913, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1131),
- NAME_FUNC_OFFSET(30934, glNormal3x, glNormal3x, NULL, 1132),
- NAME_FUNC_OFFSET(30948, glOrthof, glOrthof, NULL, 1133),
- NAME_FUNC_OFFSET(30960, glOrthox, glOrthox, NULL, 1134),
- NAME_FUNC_OFFSET(30972, glPointSizex, glPointSizex, NULL, 1135),
- NAME_FUNC_OFFSET(30988, glPolygonOffsetx, glPolygonOffsetx, NULL, 1136),
- NAME_FUNC_OFFSET(31008, glRotatex, glRotatex, NULL, 1137),
- NAME_FUNC_OFFSET(31021, glSampleCoveragex, glSampleCoveragex, NULL, 1138),
- NAME_FUNC_OFFSET(31042, glScalex, glScalex, NULL, 1139),
- NAME_FUNC_OFFSET(31054, glTexEnvx, glTexEnvx, NULL, 1140),
- NAME_FUNC_OFFSET(31067, glTexEnvxv, glTexEnvxv, NULL, 1141),
- NAME_FUNC_OFFSET(31081, glTexParameterx, glTexParameterx, NULL, 1142),
- NAME_FUNC_OFFSET(31100, glTranslatex, glTranslatex, NULL, 1143),
- NAME_FUNC_OFFSET(31116, glClipPlanef, glClipPlanef, NULL, 1144),
- NAME_FUNC_OFFSET(31132, glClipPlanex, glClipPlanex, NULL, 1145),
- NAME_FUNC_OFFSET(31148, glGetClipPlanef, glGetClipPlanef, NULL, 1146),
- NAME_FUNC_OFFSET(31167, glGetClipPlanex, glGetClipPlanex, NULL, 1147),
- NAME_FUNC_OFFSET(31186, glGetFixedv, glGetFixedv, NULL, 1148),
- NAME_FUNC_OFFSET(31201, glGetLightxv, glGetLightxv, NULL, 1149),
- NAME_FUNC_OFFSET(31217, glGetMaterialxv, glGetMaterialxv, NULL, 1150),
- NAME_FUNC_OFFSET(31236, glGetTexEnvxv, glGetTexEnvxv, NULL, 1151),
- NAME_FUNC_OFFSET(31253, glGetTexParameterxv, glGetTexParameterxv, NULL, 1152),
- NAME_FUNC_OFFSET(31276, glPointParameterx, glPointParameterx, NULL, 1153),
- NAME_FUNC_OFFSET(31297, glPointParameterxv, glPointParameterxv, NULL, 1154),
- NAME_FUNC_OFFSET(31319, glTexParameterxv, glTexParameterxv, NULL, 1155),
+ NAME_FUNC_OFFSET(12621, glGetUniformdv, glGetUniformdv, NULL, 774),
+ NAME_FUNC_OFFSET(12636, glUniform1d, glUniform1d, NULL, 775),
+ NAME_FUNC_OFFSET(12648, glUniform1dv, glUniform1dv, NULL, 776),
+ NAME_FUNC_OFFSET(12661, glUniform2d, glUniform2d, NULL, 777),
+ NAME_FUNC_OFFSET(12673, glUniform2dv, glUniform2dv, NULL, 778),
+ NAME_FUNC_OFFSET(12686, glUniform3d, glUniform3d, NULL, 779),
+ NAME_FUNC_OFFSET(12698, glUniform3dv, glUniform3dv, NULL, 780),
+ NAME_FUNC_OFFSET(12711, glUniform4d, glUniform4d, NULL, 781),
+ NAME_FUNC_OFFSET(12723, glUniform4dv, glUniform4dv, NULL, 782),
+ NAME_FUNC_OFFSET(12736, glUniformMatrix2dv, glUniformMatrix2dv, NULL, 783),
+ NAME_FUNC_OFFSET(12755, glUniformMatrix2x3dv, glUniformMatrix2x3dv, NULL, 784),
+ NAME_FUNC_OFFSET(12776, glUniformMatrix2x4dv, glUniformMatrix2x4dv, NULL, 785),
+ NAME_FUNC_OFFSET(12797, glUniformMatrix3dv, glUniformMatrix3dv, NULL, 786),
+ NAME_FUNC_OFFSET(12816, glUniformMatrix3x2dv, glUniformMatrix3x2dv, NULL, 787),
+ NAME_FUNC_OFFSET(12837, glUniformMatrix3x4dv, glUniformMatrix3x4dv, NULL, 788),
+ NAME_FUNC_OFFSET(12858, glUniformMatrix4dv, glUniformMatrix4dv, NULL, 789),
+ NAME_FUNC_OFFSET(12877, glUniformMatrix4x2dv, glUniformMatrix4x2dv, NULL, 790),
+ NAME_FUNC_OFFSET(12898, glUniformMatrix4x3dv, glUniformMatrix4x3dv, NULL, 791),
+ NAME_FUNC_OFFSET(12919, glBindTransformFeedback, glBindTransformFeedback, NULL, 792),
+ NAME_FUNC_OFFSET(12943, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 793),
+ NAME_FUNC_OFFSET(12970, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 794),
+ NAME_FUNC_OFFSET(12994, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 795),
+ NAME_FUNC_OFFSET(13018, glIsTransformFeedback, glIsTransformFeedback, NULL, 796),
+ NAME_FUNC_OFFSET(13040, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 797),
+ NAME_FUNC_OFFSET(13065, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 798),
+ NAME_FUNC_OFFSET(13091, glBeginQueryIndexed, glBeginQueryIndexed, NULL, 799),
+ NAME_FUNC_OFFSET(13111, glDrawTransformFeedbackStream, glDrawTransformFeedbackStream, NULL, 800),
+ NAME_FUNC_OFFSET(13141, glEndQueryIndexed, glEndQueryIndexed, NULL, 801),
+ NAME_FUNC_OFFSET(13159, glGetQueryIndexediv, glGetQueryIndexediv, NULL, 802),
+ NAME_FUNC_OFFSET(13179, glClearDepthf, glClearDepthf, NULL, 803),
+ NAME_FUNC_OFFSET(13193, glDepthRangef, glDepthRangef, NULL, 804),
+ NAME_FUNC_OFFSET(13207, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 805),
+ NAME_FUNC_OFFSET(13234, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 806),
+ NAME_FUNC_OFFSET(13258, glShaderBinary, glShaderBinary, NULL, 807),
+ NAME_FUNC_OFFSET(13273, glGetProgramBinary, glGetProgramBinary, NULL, 808),
+ NAME_FUNC_OFFSET(13292, glProgramBinary, glProgramBinary, NULL, 809),
+ NAME_FUNC_OFFSET(13308, glProgramParameteri, glProgramParameteri, NULL, 810),
+ NAME_FUNC_OFFSET(13328, glDepthRangeArrayv, glDepthRangeArrayv, NULL, 811),
+ NAME_FUNC_OFFSET(13347, glDepthRangeIndexed, glDepthRangeIndexed, NULL, 812),
+ NAME_FUNC_OFFSET(13367, glGetDoublei_v, glGetDoublei_v, NULL, 813),
+ NAME_FUNC_OFFSET(13382, glGetFloati_v, glGetFloati_v, NULL, 814),
+ NAME_FUNC_OFFSET(13396, glScissorArrayv, glScissorArrayv, NULL, 815),
+ NAME_FUNC_OFFSET(13412, glScissorIndexed, glScissorIndexed, NULL, 816),
+ NAME_FUNC_OFFSET(13429, glScissorIndexedv, glScissorIndexedv, NULL, 817),
+ NAME_FUNC_OFFSET(13447, glViewportArrayv, glViewportArrayv, NULL, 818),
+ NAME_FUNC_OFFSET(13464, glViewportIndexedf, glViewportIndexedf, NULL, 819),
+ NAME_FUNC_OFFSET(13483, glViewportIndexedfv, glViewportIndexedfv, NULL, 820),
+ NAME_FUNC_OFFSET(13503, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 821),
+ NAME_FUNC_OFFSET(13531, glGetnColorTableARB, glGetnColorTableARB, NULL, 822),
+ NAME_FUNC_OFFSET(13551, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 823),
+ NAME_FUNC_OFFSET(13579, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 824),
+ NAME_FUNC_OFFSET(13606, glGetnHistogramARB, glGetnHistogramARB, NULL, 825),
+ NAME_FUNC_OFFSET(13625, glGetnMapdvARB, glGetnMapdvARB, NULL, 826),
+ NAME_FUNC_OFFSET(13640, glGetnMapfvARB, glGetnMapfvARB, NULL, 827),
+ NAME_FUNC_OFFSET(13655, glGetnMapivARB, glGetnMapivARB, NULL, 828),
+ NAME_FUNC_OFFSET(13670, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 829),
+ NAME_FUNC_OFFSET(13686, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 830),
+ NAME_FUNC_OFFSET(13706, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 831),
+ NAME_FUNC_OFFSET(13727, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 832),
+ NAME_FUNC_OFFSET(13748, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 833),
+ NAME_FUNC_OFFSET(13772, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 834),
+ NAME_FUNC_OFFSET(13797, glGetnTexImageARB, glGetnTexImageARB, NULL, 835),
+ NAME_FUNC_OFFSET(13815, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 836),
+ NAME_FUNC_OFFSET(13834, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 837),
+ NAME_FUNC_OFFSET(13853, glGetnUniformivARB, glGetnUniformivARB, NULL, 838),
+ NAME_FUNC_OFFSET(13872, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 839),
+ NAME_FUNC_OFFSET(13892, glReadnPixelsARB, glReadnPixelsARB, NULL, 840),
+ NAME_FUNC_OFFSET(13909, glDrawArraysInstancedBaseInstance, glDrawArraysInstancedBaseInstance, NULL, 841),
+ NAME_FUNC_OFFSET(13943, glDrawElementsInstancedBaseInstance, glDrawElementsInstancedBaseInstance, NULL, 842),
+ NAME_FUNC_OFFSET(13979, glDrawElementsInstancedBaseVertexBaseInstance, glDrawElementsInstancedBaseVertexBaseInstance, NULL, 843),
+ NAME_FUNC_OFFSET(14025, glDrawTransformFeedbackInstanced, glDrawTransformFeedbackInstanced, NULL, 844),
+ NAME_FUNC_OFFSET(14058, glDrawTransformFeedbackStreamInstanced, glDrawTransformFeedbackStreamInstanced, NULL, 845),
+ NAME_FUNC_OFFSET(14097, gl_dispatch_stub_846, gl_dispatch_stub_846, NULL, 846),
+ NAME_FUNC_OFFSET(14119, glGetActiveAtomicCounterBufferiv, glGetActiveAtomicCounterBufferiv, NULL, 847),
+ NAME_FUNC_OFFSET(14152, glBindImageTexture, glBindImageTexture, NULL, 848),
+ NAME_FUNC_OFFSET(14171, glMemoryBarrier, glMemoryBarrier, NULL, 849),
+ NAME_FUNC_OFFSET(14187, glTexStorage1D, glTexStorage1D, NULL, 850),
+ NAME_FUNC_OFFSET(14202, glTexStorage2D, glTexStorage2D, NULL, 851),
+ NAME_FUNC_OFFSET(14217, glTexStorage3D, glTexStorage3D, NULL, 852),
+ NAME_FUNC_OFFSET(14232, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 853),
+ NAME_FUNC_OFFSET(14254, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 854),
+ NAME_FUNC_OFFSET(14276, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 855),
+ NAME_FUNC_OFFSET(14298, glClearBufferData, glClearBufferData, NULL, 856),
+ NAME_FUNC_OFFSET(14316, glClearBufferSubData, glClearBufferSubData, NULL, 857),
+ NAME_FUNC_OFFSET(14337, glDispatchCompute, glDispatchCompute, NULL, 858),
+ NAME_FUNC_OFFSET(14355, glDispatchComputeIndirect, glDispatchComputeIndirect, NULL, 859),
+ NAME_FUNC_OFFSET(14381, glCopyImageSubData, glCopyImageSubData, NULL, 860),
+ NAME_FUNC_OFFSET(14400, glTextureView, glTextureView, NULL, 861),
+ NAME_FUNC_OFFSET(14414, glBindVertexBuffer, glBindVertexBuffer, NULL, 862),
+ NAME_FUNC_OFFSET(14433, glVertexAttribBinding, glVertexAttribBinding, NULL, 863),
+ NAME_FUNC_OFFSET(14455, glVertexAttribFormat, glVertexAttribFormat, NULL, 864),
+ NAME_FUNC_OFFSET(14476, glVertexAttribIFormat, glVertexAttribIFormat, NULL, 865),
+ NAME_FUNC_OFFSET(14498, glVertexAttribLFormat, glVertexAttribLFormat, NULL, 866),
+ NAME_FUNC_OFFSET(14520, glVertexBindingDivisor, glVertexBindingDivisor, NULL, 867),
+ NAME_FUNC_OFFSET(14543, glMultiDrawArraysIndirect, glMultiDrawArraysIndirect, NULL, 868),
+ NAME_FUNC_OFFSET(14569, glMultiDrawElementsIndirect, glMultiDrawElementsIndirect, NULL, 869),
+ NAME_FUNC_OFFSET(14597, glTexBufferRange, glTexBufferRange, NULL, 870),
+ NAME_FUNC_OFFSET(14614, glTexStorage2DMultisample, glTexStorage2DMultisample, NULL, 871),
+ NAME_FUNC_OFFSET(14640, glTexStorage3DMultisample, glTexStorage3DMultisample, NULL, 872),
+ NAME_FUNC_OFFSET(14666, glBufferStorage, glBufferStorage, NULL, 873),
+ NAME_FUNC_OFFSET(14682, glClearTexImage, glClearTexImage, NULL, 874),
+ NAME_FUNC_OFFSET(14698, glClearTexSubImage, glClearTexSubImage, NULL, 875),
+ NAME_FUNC_OFFSET(14717, glBindBuffersBase, glBindBuffersBase, NULL, 876),
+ NAME_FUNC_OFFSET(14735, glBindBuffersRange, glBindBuffersRange, NULL, 877),
+ NAME_FUNC_OFFSET(14754, glBindImageTextures, glBindImageTextures, NULL, 878),
+ NAME_FUNC_OFFSET(14774, glBindSamplers, glBindSamplers, NULL, 879),
+ NAME_FUNC_OFFSET(14789, glBindTextures, glBindTextures, NULL, 880),
+ NAME_FUNC_OFFSET(14804, glBindVertexBuffers, glBindVertexBuffers, NULL, 881),
+ NAME_FUNC_OFFSET(14824, glClipControl, glClipControl, NULL, 882),
+ NAME_FUNC_OFFSET(14838, glBindTextureUnit, glBindTextureUnit, NULL, 883),
+ NAME_FUNC_OFFSET(14856, glCompressedTextureSubImage1D, glCompressedTextureSubImage1D, NULL, 884),
+ NAME_FUNC_OFFSET(14886, glCompressedTextureSubImage2D, glCompressedTextureSubImage2D, NULL, 885),
+ NAME_FUNC_OFFSET(14916, glCompressedTextureSubImage3D, glCompressedTextureSubImage3D, NULL, 886),
+ NAME_FUNC_OFFSET(14946, glCopyTextureSubImage1D, glCopyTextureSubImage1D, NULL, 887),
+ NAME_FUNC_OFFSET(14970, glCopyTextureSubImage2D, glCopyTextureSubImage2D, NULL, 888),
+ NAME_FUNC_OFFSET(14994, glCopyTextureSubImage3D, glCopyTextureSubImage3D, NULL, 889),
+ NAME_FUNC_OFFSET(15018, glCreateTextures, glCreateTextures, NULL, 890),
+ NAME_FUNC_OFFSET(15035, glGenerateTextureMipmap, glGenerateTextureMipmap, NULL, 891),
+ NAME_FUNC_OFFSET(15059, glGetCompressedTextureImage, glGetCompressedTextureImage, NULL, 892),
+ NAME_FUNC_OFFSET(15087, glGetTextureImage, glGetTextureImage, NULL, 893),
+ NAME_FUNC_OFFSET(15105, glGetTextureLevelParameterfv, glGetTextureLevelParameterfv, NULL, 894),
+ NAME_FUNC_OFFSET(15134, glGetTextureLevelParameteriv, glGetTextureLevelParameteriv, NULL, 895),
+ NAME_FUNC_OFFSET(15163, glGetTextureParameterIiv, glGetTextureParameterIiv, NULL, 896),
+ NAME_FUNC_OFFSET(15188, glGetTextureParameterIuiv, glGetTextureParameterIuiv, NULL, 897),
+ NAME_FUNC_OFFSET(15214, glGetTextureParameterfv, glGetTextureParameterfv, NULL, 898),
+ NAME_FUNC_OFFSET(15238, glGetTextureParameteriv, glGetTextureParameteriv, NULL, 899),
+ NAME_FUNC_OFFSET(15262, glTextureBuffer, glTextureBuffer, NULL, 900),
+ NAME_FUNC_OFFSET(15278, glTextureParameterIiv, glTextureParameterIiv, NULL, 901),
+ NAME_FUNC_OFFSET(15300, glTextureParameterIuiv, glTextureParameterIuiv, NULL, 902),
+ NAME_FUNC_OFFSET(15323, glTextureParameterf, glTextureParameterf, NULL, 903),
+ NAME_FUNC_OFFSET(15343, glTextureParameterfv, glTextureParameterfv, NULL, 904),
+ NAME_FUNC_OFFSET(15364, glTextureParameteri, glTextureParameteri, NULL, 905),
+ NAME_FUNC_OFFSET(15384, glTextureParameteriv, glTextureParameteriv, NULL, 906),
+ NAME_FUNC_OFFSET(15405, glTextureStorage1D, glTextureStorage1D, NULL, 907),
+ NAME_FUNC_OFFSET(15424, glTextureStorage2D, glTextureStorage2D, NULL, 908),
+ NAME_FUNC_OFFSET(15443, glTextureStorage2DMultisample, glTextureStorage2DMultisample, NULL, 909),
+ NAME_FUNC_OFFSET(15473, glTextureStorage3D, glTextureStorage3D, NULL, 910),
+ NAME_FUNC_OFFSET(15492, glTextureStorage3DMultisample, glTextureStorage3DMultisample, NULL, 911),
+ NAME_FUNC_OFFSET(15522, glTextureSubImage1D, glTextureSubImage1D, NULL, 912),
+ NAME_FUNC_OFFSET(15542, glTextureSubImage2D, glTextureSubImage2D, NULL, 913),
+ NAME_FUNC_OFFSET(15562, glTextureSubImage3D, glTextureSubImage3D, NULL, 914),
+ NAME_FUNC_OFFSET(15582, glInvalidateBufferData, glInvalidateBufferData, NULL, 915),
+ NAME_FUNC_OFFSET(15605, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 916),
+ NAME_FUNC_OFFSET(15631, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 917),
+ NAME_FUNC_OFFSET(15655, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 918),
+ NAME_FUNC_OFFSET(15682, glInvalidateTexImage, glInvalidateTexImage, NULL, 919),
+ NAME_FUNC_OFFSET(15703, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 920),
+ NAME_FUNC_OFFSET(15727, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 921),
+ NAME_FUNC_OFFSET(15746, gl_dispatch_stub_922, gl_dispatch_stub_922, NULL, 922),
+ NAME_FUNC_OFFSET(15760, gl_dispatch_stub_923, gl_dispatch_stub_923, NULL, 923),
+ NAME_FUNC_OFFSET(15775, gl_dispatch_stub_924, gl_dispatch_stub_924, NULL, 924),
+ NAME_FUNC_OFFSET(15789, gl_dispatch_stub_925, gl_dispatch_stub_925, NULL, 925),
+ NAME_FUNC_OFFSET(15804, gl_dispatch_stub_926, gl_dispatch_stub_926, NULL, 926),
+ NAME_FUNC_OFFSET(15818, gl_dispatch_stub_927, gl_dispatch_stub_927, NULL, 927),
+ NAME_FUNC_OFFSET(15833, gl_dispatch_stub_928, gl_dispatch_stub_928, NULL, 928),
+ NAME_FUNC_OFFSET(15847, gl_dispatch_stub_929, gl_dispatch_stub_929, NULL, 929),
+ NAME_FUNC_OFFSET(15862, glPointSizePointerOES, glPointSizePointerOES, NULL, 930),
+ NAME_FUNC_OFFSET(15884, gl_dispatch_stub_931, gl_dispatch_stub_931, NULL, 931),
+ NAME_FUNC_OFFSET(15902, gl_dispatch_stub_932, gl_dispatch_stub_932, NULL, 932),
+ NAME_FUNC_OFFSET(15919, gl_dispatch_stub_933, gl_dispatch_stub_933, NULL, 933),
+ NAME_FUNC_OFFSET(15939, glColorPointerEXT, glColorPointerEXT, NULL, 934),
+ NAME_FUNC_OFFSET(15957, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 935),
+ NAME_FUNC_OFFSET(15978, glIndexPointerEXT, glIndexPointerEXT, NULL, 936),
+ NAME_FUNC_OFFSET(15996, glNormalPointerEXT, glNormalPointerEXT, NULL, 937),
+ NAME_FUNC_OFFSET(16015, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 938),
+ NAME_FUNC_OFFSET(16036, glVertexPointerEXT, glVertexPointerEXT, NULL, 939),
+ NAME_FUNC_OFFSET(16055, gl_dispatch_stub_940, gl_dispatch_stub_940, NULL, 940),
+ NAME_FUNC_OFFSET(16079, gl_dispatch_stub_941, gl_dispatch_stub_941, NULL, 941),
+ NAME_FUNC_OFFSET(16101, gl_dispatch_stub_942, gl_dispatch_stub_942, NULL, 942),
+ NAME_FUNC_OFFSET(16123, gl_dispatch_stub_943, gl_dispatch_stub_943, NULL, 943),
+ NAME_FUNC_OFFSET(16146, gl_dispatch_stub_944, gl_dispatch_stub_944, NULL, 944),
+ NAME_FUNC_OFFSET(16171, gl_dispatch_stub_945, gl_dispatch_stub_945, NULL, 945),
+ NAME_FUNC_OFFSET(16193, gl_dispatch_stub_946, gl_dispatch_stub_946, NULL, 946),
+ NAME_FUNC_OFFSET(16221, gl_dispatch_stub_947, gl_dispatch_stub_947, NULL, 947),
+ NAME_FUNC_OFFSET(16244, gl_dispatch_stub_948, gl_dispatch_stub_948, NULL, 948),
+ NAME_FUNC_OFFSET(16264, glLockArraysEXT, glLockArraysEXT, NULL, 949),
+ NAME_FUNC_OFFSET(16280, gl_dispatch_stub_950, gl_dispatch_stub_950, NULL, 950),
+ NAME_FUNC_OFFSET(16299, gl_dispatch_stub_951, gl_dispatch_stub_951, NULL, 951),
+ NAME_FUNC_OFFSET(16319, gl_dispatch_stub_952, gl_dispatch_stub_952, NULL, 952),
+ NAME_FUNC_OFFSET(16338, gl_dispatch_stub_953, gl_dispatch_stub_953, NULL, 953),
+ NAME_FUNC_OFFSET(16358, gl_dispatch_stub_954, gl_dispatch_stub_954, NULL, 954),
+ NAME_FUNC_OFFSET(16377, gl_dispatch_stub_955, gl_dispatch_stub_955, NULL, 955),
+ NAME_FUNC_OFFSET(16397, gl_dispatch_stub_956, gl_dispatch_stub_956, NULL, 956),
+ NAME_FUNC_OFFSET(16417, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL, 957),
+ NAME_FUNC_OFFSET(16438, gl_dispatch_stub_958, gl_dispatch_stub_958, NULL, 958),
+ NAME_FUNC_OFFSET(16457, gl_dispatch_stub_959, gl_dispatch_stub_959, NULL, 959),
+ NAME_FUNC_OFFSET(16477, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
+ NAME_FUNC_OFFSET(16496, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
+ NAME_FUNC_OFFSET(16516, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
+ NAME_FUNC_OFFSET(16535, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
+ NAME_FUNC_OFFSET(16555, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
+ NAME_FUNC_OFFSET(16575, gl_dispatch_stub_965, gl_dispatch_stub_965, NULL, 965),
+ NAME_FUNC_OFFSET(16596, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
+ NAME_FUNC_OFFSET(16615, gl_dispatch_stub_967, gl_dispatch_stub_967, NULL, 967),
+ NAME_FUNC_OFFSET(16635, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL, 968),
+ NAME_FUNC_OFFSET(16654, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL, 969),
+ NAME_FUNC_OFFSET(16674, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
+ NAME_FUNC_OFFSET(16693, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
+ NAME_FUNC_OFFSET(16713, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
+ NAME_FUNC_OFFSET(16733, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
+ NAME_FUNC_OFFSET(16754, gl_dispatch_stub_974, gl_dispatch_stub_974, NULL, 974),
+ NAME_FUNC_OFFSET(16773, gl_dispatch_stub_975, gl_dispatch_stub_975, NULL, 975),
+ NAME_FUNC_OFFSET(16793, gl_dispatch_stub_976, gl_dispatch_stub_976, NULL, 976),
+ NAME_FUNC_OFFSET(16812, gl_dispatch_stub_977, gl_dispatch_stub_977, NULL, 977),
+ NAME_FUNC_OFFSET(16832, gl_dispatch_stub_978, gl_dispatch_stub_978, NULL, 978),
+ NAME_FUNC_OFFSET(16851, gl_dispatch_stub_979, gl_dispatch_stub_979, NULL, 979),
+ NAME_FUNC_OFFSET(16871, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
+ NAME_FUNC_OFFSET(16891, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
+ NAME_FUNC_OFFSET(16912, gl_dispatch_stub_982, gl_dispatch_stub_982, NULL, 982),
+ NAME_FUNC_OFFSET(16938, gl_dispatch_stub_983, gl_dispatch_stub_983, NULL, 983),
+ NAME_FUNC_OFFSET(16964, gl_dispatch_stub_984, gl_dispatch_stub_984, NULL, 984),
+ NAME_FUNC_OFFSET(16992, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
+ NAME_FUNC_OFFSET(17020, gl_dispatch_stub_986, gl_dispatch_stub_986, NULL, 986),
+ NAME_FUNC_OFFSET(17048, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
+ NAME_FUNC_OFFSET(17076, gl_dispatch_stub_988, gl_dispatch_stub_988, NULL, 988),
+ NAME_FUNC_OFFSET(17102, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
+ NAME_FUNC_OFFSET(17128, gl_dispatch_stub_990, gl_dispatch_stub_990, NULL, 990),
+ NAME_FUNC_OFFSET(17156, gl_dispatch_stub_991, gl_dispatch_stub_991, NULL, 991),
+ NAME_FUNC_OFFSET(17184, gl_dispatch_stub_992, gl_dispatch_stub_992, NULL, 992),
+ NAME_FUNC_OFFSET(17212, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
+ NAME_FUNC_OFFSET(17240, gl_dispatch_stub_994, gl_dispatch_stub_994, NULL, 994),
+ NAME_FUNC_OFFSET(17266, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
+ NAME_FUNC_OFFSET(17292, gl_dispatch_stub_996, gl_dispatch_stub_996, NULL, 996),
+ NAME_FUNC_OFFSET(17320, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
+ NAME_FUNC_OFFSET(17348, gl_dispatch_stub_998, gl_dispatch_stub_998, NULL, 998),
+ NAME_FUNC_OFFSET(17376, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
+ NAME_FUNC_OFFSET(17404, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 1000),
+ NAME_FUNC_OFFSET(17422, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
+ NAME_FUNC_OFFSET(17441, gl_dispatch_stub_1002, gl_dispatch_stub_1002, NULL, 1002),
+ NAME_FUNC_OFFSET(17467, glDebugMessageCallback, glDebugMessageCallback, NULL, 1003),
+ NAME_FUNC_OFFSET(17490, glDebugMessageControl, glDebugMessageControl, NULL, 1004),
+ NAME_FUNC_OFFSET(17512, glDebugMessageInsert, glDebugMessageInsert, NULL, 1005),
+ NAME_FUNC_OFFSET(17533, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 1006),
+ NAME_FUNC_OFFSET(17554, glGetObjectLabel, glGetObjectLabel, NULL, 1007),
+ NAME_FUNC_OFFSET(17571, glGetObjectPtrLabel, glGetObjectPtrLabel, NULL, 1008),
+ NAME_FUNC_OFFSET(17591, glObjectLabel, glObjectLabel, NULL, 1009),
+ NAME_FUNC_OFFSET(17605, glObjectPtrLabel, glObjectPtrLabel, NULL, 1010),
+ NAME_FUNC_OFFSET(17622, glPopDebugGroup, glPopDebugGroup, NULL, 1011),
+ NAME_FUNC_OFFSET(17638, glPushDebugGroup, glPushDebugGroup, NULL, 1012),
+ NAME_FUNC_OFFSET(17655, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 1013),
+ NAME_FUNC_OFFSET(17677, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 1014),
+ NAME_FUNC_OFFSET(17700, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 1015),
+ NAME_FUNC_OFFSET(17723, glFogCoordfEXT, glFogCoordfEXT, NULL, 1016),
+ NAME_FUNC_OFFSET(17738, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 1017),
+ NAME_FUNC_OFFSET(17754, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 1018),
+ NAME_FUNC_OFFSET(17774, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 1019),
+ NAME_FUNC_OFFSET(17792, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 1020),
+ NAME_FUNC_OFFSET(17811, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 1021),
+ NAME_FUNC_OFFSET(17829, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 1022),
+ NAME_FUNC_OFFSET(17848, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 1023),
+ NAME_FUNC_OFFSET(17866, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 1024),
+ NAME_FUNC_OFFSET(17885, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 1025),
+ NAME_FUNC_OFFSET(17903, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 1026),
+ NAME_FUNC_OFFSET(17922, gl_dispatch_stub_1027, gl_dispatch_stub_1027, NULL, 1027),
+ NAME_FUNC_OFFSET(17947, gl_dispatch_stub_1028, gl_dispatch_stub_1028, NULL, 1028),
+ NAME_FUNC_OFFSET(17974, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 1029),
+ NAME_FUNC_OFFSET(17998, glExecuteProgramNV, glExecuteProgramNV, NULL, 1030),
+ NAME_FUNC_OFFSET(18017, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 1031),
+ NAME_FUNC_OFFSET(18043, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 1032),
+ NAME_FUNC_OFFSET(18069, glGetProgramStringNV, glGetProgramStringNV, NULL, 1033),
+ NAME_FUNC_OFFSET(18090, glGetProgramivNV, glGetProgramivNV, NULL, 1034),
+ NAME_FUNC_OFFSET(18107, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 1035),
+ NAME_FUNC_OFFSET(18128, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 1036),
+ NAME_FUNC_OFFSET(18150, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 1037),
+ NAME_FUNC_OFFSET(18172, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 1038),
+ NAME_FUNC_OFFSET(18194, glLoadProgramNV, glLoadProgramNV, NULL, 1039),
+ NAME_FUNC_OFFSET(18210, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 1040),
+ NAME_FUNC_OFFSET(18235, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 1041),
+ NAME_FUNC_OFFSET(18260, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 1042),
+ NAME_FUNC_OFFSET(18288, glTrackMatrixNV, glTrackMatrixNV, NULL, 1043),
+ NAME_FUNC_OFFSET(18304, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 1044),
+ NAME_FUNC_OFFSET(18323, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 1045),
+ NAME_FUNC_OFFSET(18343, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 1046),
+ NAME_FUNC_OFFSET(18362, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 1047),
+ NAME_FUNC_OFFSET(18382, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 1048),
+ NAME_FUNC_OFFSET(18401, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 1049),
+ NAME_FUNC_OFFSET(18421, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 1050),
+ NAME_FUNC_OFFSET(18440, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 1051),
+ NAME_FUNC_OFFSET(18460, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 1052),
+ NAME_FUNC_OFFSET(18479, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 1053),
+ NAME_FUNC_OFFSET(18499, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 1054),
+ NAME_FUNC_OFFSET(18518, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 1055),
+ NAME_FUNC_OFFSET(18538, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 1056),
+ NAME_FUNC_OFFSET(18557, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 1057),
+ NAME_FUNC_OFFSET(18577, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 1058),
+ NAME_FUNC_OFFSET(18596, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 1059),
+ NAME_FUNC_OFFSET(18616, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 1060),
+ NAME_FUNC_OFFSET(18635, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 1061),
+ NAME_FUNC_OFFSET(18655, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 1062),
+ NAME_FUNC_OFFSET(18674, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 1063),
+ NAME_FUNC_OFFSET(18694, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 1064),
+ NAME_FUNC_OFFSET(18713, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 1065),
+ NAME_FUNC_OFFSET(18733, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 1066),
+ NAME_FUNC_OFFSET(18752, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 1067),
+ NAME_FUNC_OFFSET(18772, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 1068),
+ NAME_FUNC_OFFSET(18792, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 1069),
+ NAME_FUNC_OFFSET(18813, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 1070),
+ NAME_FUNC_OFFSET(18837, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 1071),
+ NAME_FUNC_OFFSET(18858, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 1072),
+ NAME_FUNC_OFFSET(18879, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 1073),
+ NAME_FUNC_OFFSET(18900, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 1074),
+ NAME_FUNC_OFFSET(18921, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 1075),
+ NAME_FUNC_OFFSET(18942, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 1076),
+ NAME_FUNC_OFFSET(18963, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 1077),
+ NAME_FUNC_OFFSET(18984, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 1078),
+ NAME_FUNC_OFFSET(19005, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 1079),
+ NAME_FUNC_OFFSET(19026, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 1080),
+ NAME_FUNC_OFFSET(19047, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 1081),
+ NAME_FUNC_OFFSET(19068, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 1082),
+ NAME_FUNC_OFFSET(19089, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 1083),
+ NAME_FUNC_OFFSET(19111, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 1084),
+ NAME_FUNC_OFFSET(19138, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 1085),
+ NAME_FUNC_OFFSET(19165, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 1086),
+ NAME_FUNC_OFFSET(19189, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 1087),
+ NAME_FUNC_OFFSET(19213, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 1088),
+ NAME_FUNC_OFFSET(19235, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 1089),
+ NAME_FUNC_OFFSET(19257, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 1090),
+ NAME_FUNC_OFFSET(19279, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 1091),
+ NAME_FUNC_OFFSET(19304, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 1092),
+ NAME_FUNC_OFFSET(19328, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 1093),
+ NAME_FUNC_OFFSET(19350, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 1094),
+ NAME_FUNC_OFFSET(19372, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 1095),
+ NAME_FUNC_OFFSET(19394, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 1096),
+ NAME_FUNC_OFFSET(19420, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 1097),
+ NAME_FUNC_OFFSET(19443, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 1098),
+ NAME_FUNC_OFFSET(19467, glPassTexCoordATI, glPassTexCoordATI, NULL, 1099),
+ NAME_FUNC_OFFSET(19485, glSampleMapATI, glSampleMapATI, NULL, 1100),
+ NAME_FUNC_OFFSET(19500, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 1101),
+ NAME_FUNC_OFFSET(19531, gl_dispatch_stub_1102, gl_dispatch_stub_1102, NULL, 1102),
+ NAME_FUNC_OFFSET(19554, gl_dispatch_stub_1103, gl_dispatch_stub_1103, NULL, 1103),
+ NAME_FUNC_OFFSET(19577, gl_dispatch_stub_1104, gl_dispatch_stub_1104, NULL, 1104),
+ NAME_FUNC_OFFSET(19600, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 1105),
+ NAME_FUNC_OFFSET(19631, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 1106),
+ NAME_FUNC_OFFSET(19662, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 1107),
+ NAME_FUNC_OFFSET(19690, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 1108),
+ NAME_FUNC_OFFSET(19719, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 1109),
+ NAME_FUNC_OFFSET(19747, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 1110),
+ NAME_FUNC_OFFSET(19776, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 1111),
+ NAME_FUNC_OFFSET(19797, gl_dispatch_stub_1112, gl_dispatch_stub_1112, NULL, 1112),
+ NAME_FUNC_OFFSET(19814, gl_dispatch_stub_1113, gl_dispatch_stub_1113, NULL, 1113),
+ NAME_FUNC_OFFSET(19827, gl_dispatch_stub_1114, gl_dispatch_stub_1114, NULL, 1114),
+ NAME_FUNC_OFFSET(19841, gl_dispatch_stub_1115, gl_dispatch_stub_1115, NULL, 1115),
+ NAME_FUNC_OFFSET(19858, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 1116),
+ NAME_FUNC_OFFSET(19879, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 1117),
+ NAME_FUNC_OFFSET(19901, gl_dispatch_stub_1118, gl_dispatch_stub_1118, NULL, 1118),
+ NAME_FUNC_OFFSET(19925, gl_dispatch_stub_1119, gl_dispatch_stub_1119, NULL, 1119),
+ NAME_FUNC_OFFSET(19955, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1120),
+ NAME_FUNC_OFFSET(19976, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1121),
+ NAME_FUNC_OFFSET(19998, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1122),
+ NAME_FUNC_OFFSET(20019, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1123),
+ NAME_FUNC_OFFSET(20041, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1124),
+ NAME_FUNC_OFFSET(20063, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1125),
+ NAME_FUNC_OFFSET(20086, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1126),
+ NAME_FUNC_OFFSET(20107, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1127),
+ NAME_FUNC_OFFSET(20129, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1128),
+ NAME_FUNC_OFFSET(20151, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1129),
+ NAME_FUNC_OFFSET(20174, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1130),
+ NAME_FUNC_OFFSET(20195, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1131),
+ NAME_FUNC_OFFSET(20217, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1132),
+ NAME_FUNC_OFFSET(20239, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1133),
+ NAME_FUNC_OFFSET(20262, glClearColorIiEXT, glClearColorIiEXT, NULL, 1134),
+ NAME_FUNC_OFFSET(20280, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 1135),
+ NAME_FUNC_OFFSET(20299, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1136),
+ NAME_FUNC_OFFSET(20321, glBeginPerfMonitorAMD, glBeginPerfMonitorAMD, NULL, 1137),
+ NAME_FUNC_OFFSET(20343, glDeletePerfMonitorsAMD, glDeletePerfMonitorsAMD, NULL, 1138),
+ NAME_FUNC_OFFSET(20367, glEndPerfMonitorAMD, glEndPerfMonitorAMD, NULL, 1139),
+ NAME_FUNC_OFFSET(20387, glGenPerfMonitorsAMD, glGenPerfMonitorsAMD, NULL, 1140),
+ NAME_FUNC_OFFSET(20408, glGetPerfMonitorCounterDataAMD, glGetPerfMonitorCounterDataAMD, NULL, 1141),
+ NAME_FUNC_OFFSET(20439, glGetPerfMonitorCounterInfoAMD, glGetPerfMonitorCounterInfoAMD, NULL, 1142),
+ NAME_FUNC_OFFSET(20470, glGetPerfMonitorCounterStringAMD, glGetPerfMonitorCounterStringAMD, NULL, 1143),
+ NAME_FUNC_OFFSET(20503, glGetPerfMonitorCountersAMD, glGetPerfMonitorCountersAMD, NULL, 1144),
+ NAME_FUNC_OFFSET(20531, glGetPerfMonitorGroupStringAMD, glGetPerfMonitorGroupStringAMD, NULL, 1145),
+ NAME_FUNC_OFFSET(20562, glGetPerfMonitorGroupsAMD, glGetPerfMonitorGroupsAMD, NULL, 1146),
+ NAME_FUNC_OFFSET(20588, glSelectPerfMonitorCountersAMD, glSelectPerfMonitorCountersAMD, NULL, 1147),
+ NAME_FUNC_OFFSET(20619, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1148),
+ NAME_FUNC_OFFSET(20647, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1149),
+ NAME_FUNC_OFFSET(20670, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1150),
+ NAME_FUNC_OFFSET(20695, glActiveProgramEXT, glActiveProgramEXT, NULL, 1151),
+ NAME_FUNC_OFFSET(20714, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1152),
+ NAME_FUNC_OFFSET(20739, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1153),
+ NAME_FUNC_OFFSET(20761, glTextureBarrierNV, glTextureBarrierNV, NULL, 1154),
+ NAME_FUNC_OFFSET(20780, glVDPAUFiniNV, glVDPAUFiniNV, NULL, 1155),
+ NAME_FUNC_OFFSET(20794, glVDPAUGetSurfaceivNV, glVDPAUGetSurfaceivNV, NULL, 1156),
+ NAME_FUNC_OFFSET(20816, glVDPAUInitNV, glVDPAUInitNV, NULL, 1157),
+ NAME_FUNC_OFFSET(20830, glVDPAUIsSurfaceNV, glVDPAUIsSurfaceNV, NULL, 1158),
+ NAME_FUNC_OFFSET(20849, glVDPAUMapSurfacesNV, glVDPAUMapSurfacesNV, NULL, 1159),
+ NAME_FUNC_OFFSET(20870, glVDPAURegisterOutputSurfaceNV, glVDPAURegisterOutputSurfaceNV, NULL, 1160),
+ NAME_FUNC_OFFSET(20901, glVDPAURegisterVideoSurfaceNV, glVDPAURegisterVideoSurfaceNV, NULL, 1161),
+ NAME_FUNC_OFFSET(20931, glVDPAUSurfaceAccessNV, glVDPAUSurfaceAccessNV, NULL, 1162),
+ NAME_FUNC_OFFSET(20954, glVDPAUUnmapSurfacesNV, glVDPAUUnmapSurfacesNV, NULL, 1163),
+ NAME_FUNC_OFFSET(20977, glVDPAUUnregisterSurfaceNV, glVDPAUUnregisterSurfaceNV, NULL, 1164),
+ NAME_FUNC_OFFSET(21004, gl_dispatch_stub_1165, gl_dispatch_stub_1165, NULL, 1165),
+ NAME_FUNC_OFFSET(21026, gl_dispatch_stub_1166, gl_dispatch_stub_1166, NULL, 1166),
+ NAME_FUNC_OFFSET(21049, gl_dispatch_stub_1167, gl_dispatch_stub_1167, NULL, 1167),
+ NAME_FUNC_OFFSET(21072, gl_dispatch_stub_1168, gl_dispatch_stub_1168, NULL, 1168),
+ NAME_FUNC_OFFSET(21092, gl_dispatch_stub_1169, gl_dispatch_stub_1169, NULL, 1169),
+ NAME_FUNC_OFFSET(21119, gl_dispatch_stub_1170, gl_dispatch_stub_1170, NULL, 1170),
+ NAME_FUNC_OFFSET(21145, gl_dispatch_stub_1171, gl_dispatch_stub_1171, NULL, 1171),
+ NAME_FUNC_OFFSET(21171, gl_dispatch_stub_1172, gl_dispatch_stub_1172, NULL, 1172),
+ NAME_FUNC_OFFSET(21195, gl_dispatch_stub_1173, gl_dispatch_stub_1173, NULL, 1173),
+ NAME_FUNC_OFFSET(21223, gl_dispatch_stub_1174, gl_dispatch_stub_1174, NULL, 1174),
+ NAME_FUNC_OFFSET(21247, glPolygonOffsetClampEXT, glPolygonOffsetClampEXT, NULL, 1175),
+ NAME_FUNC_OFFSET(21271, gl_dispatch_stub_1176, gl_dispatch_stub_1176, NULL, 1176),
+ NAME_FUNC_OFFSET(21296, gl_dispatch_stub_1177, gl_dispatch_stub_1177, NULL, 1177),
+ NAME_FUNC_OFFSET(21325, gl_dispatch_stub_1178, gl_dispatch_stub_1178, NULL, 1178),
+ NAME_FUNC_OFFSET(21356, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1179),
+ NAME_FUNC_OFFSET(21395, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1180),
+ NAME_FUNC_OFFSET(21424, glAlphaFuncx, glAlphaFuncx, NULL, 1181),
+ NAME_FUNC_OFFSET(21437, glClearColorx, glClearColorx, NULL, 1182),
+ NAME_FUNC_OFFSET(21451, glClearDepthx, glClearDepthx, NULL, 1183),
+ NAME_FUNC_OFFSET(21465, glColor4x, glColor4x, NULL, 1184),
+ NAME_FUNC_OFFSET(21475, glDepthRangex, glDepthRangex, NULL, 1185),
+ NAME_FUNC_OFFSET(21489, glFogx, glFogx, NULL, 1186),
+ NAME_FUNC_OFFSET(21496, glFogxv, glFogxv, NULL, 1187),
+ NAME_FUNC_OFFSET(21504, glFrustumf, glFrustumf, NULL, 1188),
+ NAME_FUNC_OFFSET(21515, glFrustumx, glFrustumx, NULL, 1189),
+ NAME_FUNC_OFFSET(21526, glLightModelx, glLightModelx, NULL, 1190),
+ NAME_FUNC_OFFSET(21540, glLightModelxv, glLightModelxv, NULL, 1191),
+ NAME_FUNC_OFFSET(21555, glLightx, glLightx, NULL, 1192),
+ NAME_FUNC_OFFSET(21564, glLightxv, glLightxv, NULL, 1193),
+ NAME_FUNC_OFFSET(21574, glLineWidthx, glLineWidthx, NULL, 1194),
+ NAME_FUNC_OFFSET(21587, glLoadMatrixx, glLoadMatrixx, NULL, 1195),
+ NAME_FUNC_OFFSET(21601, glMaterialx, glMaterialx, NULL, 1196),
+ NAME_FUNC_OFFSET(21613, glMaterialxv, glMaterialxv, NULL, 1197),
+ NAME_FUNC_OFFSET(21626, glMultMatrixx, glMultMatrixx, NULL, 1198),
+ NAME_FUNC_OFFSET(21640, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1199),
+ NAME_FUNC_OFFSET(21658, glNormal3x, glNormal3x, NULL, 1200),
+ NAME_FUNC_OFFSET(21669, glOrthof, glOrthof, NULL, 1201),
+ NAME_FUNC_OFFSET(21678, glOrthox, glOrthox, NULL, 1202),
+ NAME_FUNC_OFFSET(21687, glPointSizex, glPointSizex, NULL, 1203),
+ NAME_FUNC_OFFSET(21700, glPolygonOffsetx, glPolygonOffsetx, NULL, 1204),
+ NAME_FUNC_OFFSET(21717, glRotatex, glRotatex, NULL, 1205),
+ NAME_FUNC_OFFSET(21727, glSampleCoveragex, glSampleCoveragex, NULL, 1206),
+ NAME_FUNC_OFFSET(21745, glScalex, glScalex, NULL, 1207),
+ NAME_FUNC_OFFSET(21754, glTexEnvx, glTexEnvx, NULL, 1208),
+ NAME_FUNC_OFFSET(21764, glTexEnvxv, glTexEnvxv, NULL, 1209),
+ NAME_FUNC_OFFSET(21775, glTexParameterx, glTexParameterx, NULL, 1210),
+ NAME_FUNC_OFFSET(21791, glTranslatex, glTranslatex, NULL, 1211),
+ NAME_FUNC_OFFSET(21804, glClipPlanef, glClipPlanef, NULL, 1212),
+ NAME_FUNC_OFFSET(21817, glClipPlanex, glClipPlanex, NULL, 1213),
+ NAME_FUNC_OFFSET(21830, glGetClipPlanef, glGetClipPlanef, NULL, 1214),
+ NAME_FUNC_OFFSET(21846, glGetClipPlanex, glGetClipPlanex, NULL, 1215),
+ NAME_FUNC_OFFSET(21862, glGetFixedv, glGetFixedv, NULL, 1216),
+ NAME_FUNC_OFFSET(21874, glGetLightxv, glGetLightxv, NULL, 1217),
+ NAME_FUNC_OFFSET(21887, glGetMaterialxv, glGetMaterialxv, NULL, 1218),
+ NAME_FUNC_OFFSET(21903, glGetTexEnvxv, glGetTexEnvxv, NULL, 1219),
+ NAME_FUNC_OFFSET(21917, glGetTexParameterxv, glGetTexParameterxv, NULL, 1220),
+ NAME_FUNC_OFFSET(21937, glPointParameterx, glPointParameterx, NULL, 1221),
+ NAME_FUNC_OFFSET(21955, glPointParameterxv, glPointParameterxv, NULL, 1222),
+ NAME_FUNC_OFFSET(21974, glTexParameterxv, glTexParameterxv, NULL, 1223),
+ NAME_FUNC_OFFSET(21991, glTexGenf, glTexGenf, NULL, 190),
+ NAME_FUNC_OFFSET(22004, glTexGenfv, glTexGenfv, NULL, 191),
+ NAME_FUNC_OFFSET(22018, glTexGeni, glTexGeni, NULL, 192),
+ NAME_FUNC_OFFSET(22031, glTexGeniv, glTexGeniv, NULL, 193),
+ NAME_FUNC_OFFSET(22045, glReadBuffer, glReadBuffer, NULL, 254),
+ NAME_FUNC_OFFSET(22060, glGetTexGenfv, glGetTexGenfv, NULL, 279),
+ NAME_FUNC_OFFSET(22077, glGetTexGeniv, glGetTexGeniv, NULL, 280),
+ NAME_FUNC_OFFSET(22094, glArrayElement, glArrayElement, NULL, 306),
+ NAME_FUNC_OFFSET(22112, glBindTexture, glBindTexture, NULL, 307),
+ NAME_FUNC_OFFSET(22129, glDrawArrays, glDrawArrays, NULL, 310),
+ NAME_FUNC_OFFSET(22145, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+ NAME_FUNC_OFFSET(22170, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+ NAME_FUNC_OFFSET(22190, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+ NAME_FUNC_OFFSET(22210, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+ NAME_FUNC_OFFSET(22233, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+ NAME_FUNC_OFFSET(22256, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+ NAME_FUNC_OFFSET(22276, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+ NAME_FUNC_OFFSET(22293, glGetPointerv, glGetPointerv, NULL, 329),
+ NAME_FUNC_OFFSET(22310, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+ NAME_FUNC_OFFSET(22325, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+ NAME_FUNC_OFFSET(22349, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+ NAME_FUNC_OFFSET(22368, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+ NAME_FUNC_OFFSET(22387, glBlendColor, glBlendColor, NULL, 336),
+ NAME_FUNC_OFFSET(22403, glBlendEquation, glBlendEquation, NULL, 337),
+ NAME_FUNC_OFFSET(22422, glBlendEquation, glBlendEquation, NULL, 337),
+ NAME_FUNC_OFFSET(22441, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+ NAME_FUNC_OFFSET(22464, glColorTable, glColorTable, NULL, 339),
+ NAME_FUNC_OFFSET(22480, glColorTable, glColorTable, NULL, 339),
+ NAME_FUNC_OFFSET(22496, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+ NAME_FUNC_OFFSET(22523, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+ NAME_FUNC_OFFSET(22550, glCopyColorTable, glCopyColorTable, NULL, 342),
+ NAME_FUNC_OFFSET(22570, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+ NAME_FUNC_OFFSET(22589, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+ NAME_FUNC_OFFSET(22608, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+ NAME_FUNC_OFFSET(22638, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+ NAME_FUNC_OFFSET(22668, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+ NAME_FUNC_OFFSET(22698, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+ NAME_FUNC_OFFSET(22728, glColorSubTable, glColorSubTable, NULL, 346),
+ NAME_FUNC_OFFSET(22747, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+ NAME_FUNC_OFFSET(22770, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+ NAME_FUNC_OFFSET(22795, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+ NAME_FUNC_OFFSET(22820, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+ NAME_FUNC_OFFSET(22847, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+ NAME_FUNC_OFFSET(22875, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+ NAME_FUNC_OFFSET(22902, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+ NAME_FUNC_OFFSET(22930, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+ NAME_FUNC_OFFSET(22959, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+ NAME_FUNC_OFFSET(22988, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+ NAME_FUNC_OFFSET(23014, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+ NAME_FUNC_OFFSET(23045, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+ NAME_FUNC_OFFSET(23076, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+ NAME_FUNC_OFFSET(23100, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+ NAME_FUNC_OFFSET(23123, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+ NAME_FUNC_OFFSET(23141, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+ NAME_FUNC_OFFSET(23170, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+ NAME_FUNC_OFFSET(23199, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+ NAME_FUNC_OFFSET(23214, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+ NAME_FUNC_OFFSET(23240, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+ NAME_FUNC_OFFSET(23266, glHistogram, glHistogram, NULL, 367),
+ NAME_FUNC_OFFSET(23281, glMinmax, glMinmax, NULL, 368),
+ NAME_FUNC_OFFSET(23293, glResetHistogram, glResetHistogram, NULL, 369),
+ NAME_FUNC_OFFSET(23313, glResetMinmax, glResetMinmax, NULL, 370),
+ NAME_FUNC_OFFSET(23330, glTexImage3D, glTexImage3D, NULL, 371),
+ NAME_FUNC_OFFSET(23346, glTexImage3D, glTexImage3D, NULL, 371),
+ NAME_FUNC_OFFSET(23362, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+ NAME_FUNC_OFFSET(23381, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+ NAME_FUNC_OFFSET(23400, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+ NAME_FUNC_OFFSET(23423, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+ NAME_FUNC_OFFSET(23446, glActiveTexture, glActiveTexture, NULL, 374),
+ NAME_FUNC_OFFSET(23465, glClientActiveTexture, glClientActiveTexture, NULL, 375),
+ NAME_FUNC_OFFSET(23490, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
+ NAME_FUNC_OFFSET(23511, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
+ NAME_FUNC_OFFSET(23533, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+ NAME_FUNC_OFFSET(23551, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+ NAME_FUNC_OFFSET(23570, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
+ NAME_FUNC_OFFSET(23591, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
+ NAME_FUNC_OFFSET(23613, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
+ NAME_FUNC_OFFSET(23634, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
+ NAME_FUNC_OFFSET(23656, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
+ NAME_FUNC_OFFSET(23677, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
+ NAME_FUNC_OFFSET(23699, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+ NAME_FUNC_OFFSET(23717, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+ NAME_FUNC_OFFSET(23736, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
+ NAME_FUNC_OFFSET(23757, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
+ NAME_FUNC_OFFSET(23779, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
+ NAME_FUNC_OFFSET(23800, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
+ NAME_FUNC_OFFSET(23822, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
+ NAME_FUNC_OFFSET(23843, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
+ NAME_FUNC_OFFSET(23865, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+ NAME_FUNC_OFFSET(23883, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+ NAME_FUNC_OFFSET(23902, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
+ NAME_FUNC_OFFSET(23923, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
+ NAME_FUNC_OFFSET(23945, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
+ NAME_FUNC_OFFSET(23966, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
+ NAME_FUNC_OFFSET(23988, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
+ NAME_FUNC_OFFSET(24009, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
+ NAME_FUNC_OFFSET(24031, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+ NAME_FUNC_OFFSET(24049, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+ NAME_FUNC_OFFSET(24068, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
+ NAME_FUNC_OFFSET(24089, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
+ NAME_FUNC_OFFSET(24111, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
+ NAME_FUNC_OFFSET(24132, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
+ NAME_FUNC_OFFSET(24154, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
+ NAME_FUNC_OFFSET(24180, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
+ NAME_FUNC_OFFSET(24206, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+ NAME_FUNC_OFFSET(24232, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+ NAME_FUNC_OFFSET(24258, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
+ NAME_FUNC_OFFSET(24287, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
+ NAME_FUNC_OFFSET(24316, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+ NAME_FUNC_OFFSET(24345, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+ NAME_FUNC_OFFSET(24374, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
+ NAME_FUNC_OFFSET(24401, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
+ NAME_FUNC_OFFSET(24427, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
+ NAME_FUNC_OFFSET(24453, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
+ NAME_FUNC_OFFSET(24479, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
+ NAME_FUNC_OFFSET(24505, glSampleCoverage, glSampleCoverage, NULL, 419),
+ NAME_FUNC_OFFSET(24525, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+ NAME_FUNC_OFFSET(24548, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+ NAME_FUNC_OFFSET(24572, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+ NAME_FUNC_OFFSET(24595, glFogCoordPointer, glFogCoordPointer, NULL, 421),
+ NAME_FUNC_OFFSET(24616, glFogCoordd, glFogCoordd, NULL, 422),
+ NAME_FUNC_OFFSET(24631, glFogCoorddv, glFogCoorddv, NULL, 423),
+ NAME_FUNC_OFFSET(24647, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
+ NAME_FUNC_OFFSET(24668, glPointParameterf, glPointParameterf, NULL, 425),
+ NAME_FUNC_OFFSET(24689, glPointParameterf, glPointParameterf, NULL, 425),
+ NAME_FUNC_OFFSET(24710, glPointParameterf, glPointParameterf, NULL, 425),
+ NAME_FUNC_OFFSET(24732, glPointParameterfv, glPointParameterfv, NULL, 426),
+ NAME_FUNC_OFFSET(24754, glPointParameterfv, glPointParameterfv, NULL, 426),
+ NAME_FUNC_OFFSET(24776, glPointParameterfv, glPointParameterfv, NULL, 426),
+ NAME_FUNC_OFFSET(24799, glPointParameteri, glPointParameteri, NULL, 427),
+ NAME_FUNC_OFFSET(24819, glPointParameteriv, glPointParameteriv, NULL, 428),
+ NAME_FUNC_OFFSET(24840, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
+ NAME_FUNC_OFFSET(24862, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
+ NAME_FUNC_OFFSET(24885, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
+ NAME_FUNC_OFFSET(24907, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
+ NAME_FUNC_OFFSET(24930, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
+ NAME_FUNC_OFFSET(24952, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
+ NAME_FUNC_OFFSET(24975, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
+ NAME_FUNC_OFFSET(24997, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
+ NAME_FUNC_OFFSET(25020, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
+ NAME_FUNC_OFFSET(25043, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
+ NAME_FUNC_OFFSET(25067, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
+ NAME_FUNC_OFFSET(25090, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
+ NAME_FUNC_OFFSET(25114, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
+ NAME_FUNC_OFFSET(25137, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
+ NAME_FUNC_OFFSET(25161, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
+ NAME_FUNC_OFFSET(25188, glWindowPos2d, glWindowPos2d, NULL, 444),
+ NAME_FUNC_OFFSET(25205, glWindowPos2d, glWindowPos2d, NULL, 444),
+ NAME_FUNC_OFFSET(25223, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+ NAME_FUNC_OFFSET(25241, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+ NAME_FUNC_OFFSET(25260, glWindowPos2f, glWindowPos2f, NULL, 446),
+ NAME_FUNC_OFFSET(25277, glWindowPos2f, glWindowPos2f, NULL, 446),
+ NAME_FUNC_OFFSET(25295, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+ NAME_FUNC_OFFSET(25313, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+ NAME_FUNC_OFFSET(25332, glWindowPos2i, glWindowPos2i, NULL, 448),
+ NAME_FUNC_OFFSET(25349, glWindowPos2i, glWindowPos2i, NULL, 448),
+ NAME_FUNC_OFFSET(25367, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+ NAME_FUNC_OFFSET(25385, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+ NAME_FUNC_OFFSET(25404, glWindowPos2s, glWindowPos2s, NULL, 450),
+ NAME_FUNC_OFFSET(25421, glWindowPos2s, glWindowPos2s, NULL, 450),
+ NAME_FUNC_OFFSET(25439, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+ NAME_FUNC_OFFSET(25457, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+ NAME_FUNC_OFFSET(25476, glWindowPos3d, glWindowPos3d, NULL, 452),
+ NAME_FUNC_OFFSET(25493, glWindowPos3d, glWindowPos3d, NULL, 452),
+ NAME_FUNC_OFFSET(25511, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+ NAME_FUNC_OFFSET(25529, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+ NAME_FUNC_OFFSET(25548, glWindowPos3f, glWindowPos3f, NULL, 454),
+ NAME_FUNC_OFFSET(25565, glWindowPos3f, glWindowPos3f, NULL, 454),
+ NAME_FUNC_OFFSET(25583, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+ NAME_FUNC_OFFSET(25601, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+ NAME_FUNC_OFFSET(25620, glWindowPos3i, glWindowPos3i, NULL, 456),
+ NAME_FUNC_OFFSET(25637, glWindowPos3i, glWindowPos3i, NULL, 456),
+ NAME_FUNC_OFFSET(25655, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+ NAME_FUNC_OFFSET(25673, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+ NAME_FUNC_OFFSET(25692, glWindowPos3s, glWindowPos3s, NULL, 458),
+ NAME_FUNC_OFFSET(25709, glWindowPos3s, glWindowPos3s, NULL, 458),
+ NAME_FUNC_OFFSET(25727, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+ NAME_FUNC_OFFSET(25745, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+ NAME_FUNC_OFFSET(25764, glBeginQuery, glBeginQuery, NULL, 460),
+ NAME_FUNC_OFFSET(25780, glBindBuffer, glBindBuffer, NULL, 461),
+ NAME_FUNC_OFFSET(25796, glBufferData, glBufferData, NULL, 462),
+ NAME_FUNC_OFFSET(25812, glBufferSubData, glBufferSubData, NULL, 463),
+ NAME_FUNC_OFFSET(25831, glDeleteBuffers, glDeleteBuffers, NULL, 464),
+ NAME_FUNC_OFFSET(25850, glDeleteQueries, glDeleteQueries, NULL, 465),
+ NAME_FUNC_OFFSET(25869, glEndQuery, glEndQuery, NULL, 466),
+ NAME_FUNC_OFFSET(25883, glGenBuffers, glGenBuffers, NULL, 467),
+ NAME_FUNC_OFFSET(25899, glGenQueries, glGenQueries, NULL, 468),
+ NAME_FUNC_OFFSET(25915, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
+ NAME_FUNC_OFFSET(25941, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+ NAME_FUNC_OFFSET(25964, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+ NAME_FUNC_OFFSET(25987, glGetBufferSubData, glGetBufferSubData, NULL, 471),
+ NAME_FUNC_OFFSET(26009, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
+ NAME_FUNC_OFFSET(26031, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
+ NAME_FUNC_OFFSET(26054, glGetQueryiv, glGetQueryiv, NULL, 474),
+ NAME_FUNC_OFFSET(26070, glIsBuffer, glIsBuffer, NULL, 475),
+ NAME_FUNC_OFFSET(26084, glIsQuery, glIsQuery, NULL, 476),
+ NAME_FUNC_OFFSET(26097, glMapBuffer, glMapBuffer, NULL, 477),
+ NAME_FUNC_OFFSET(26112, glMapBuffer, glMapBuffer, NULL, 477),
+ NAME_FUNC_OFFSET(26127, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+ NAME_FUNC_OFFSET(26144, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+ NAME_FUNC_OFFSET(26161, glBindAttribLocation, glBindAttribLocation, NULL, 480),
+ NAME_FUNC_OFFSET(26185, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+ NAME_FUNC_OFFSET(26212, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+ NAME_FUNC_OFFSET(26239, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+ NAME_FUNC_OFFSET(26266, glCompileShader, glCompileShader, NULL, 482),
+ NAME_FUNC_OFFSET(26285, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
+ NAME_FUNC_OFFSET(26315, glDrawBuffers, glDrawBuffers, NULL, 489),
+ NAME_FUNC_OFFSET(26332, glDrawBuffers, glDrawBuffers, NULL, 489),
+ NAME_FUNC_OFFSET(26349, glDrawBuffers, glDrawBuffers, NULL, 489),
+ NAME_FUNC_OFFSET(26365, glDrawBuffers, glDrawBuffers, NULL, 489),
+ NAME_FUNC_OFFSET(26382, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
+ NAME_FUNC_OFFSET(26411, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
+ NAME_FUNC_OFFSET(26432, glGetActiveUniform, glGetActiveUniform, NULL, 492),
+ NAME_FUNC_OFFSET(26454, glGetAttribLocation, glGetAttribLocation, NULL, 494),
+ NAME_FUNC_OFFSET(26477, glGetShaderSource, glGetShaderSource, NULL, 498),
+ NAME_FUNC_OFFSET(26498, glGetUniformLocation, glGetUniformLocation, NULL, 500),
+ NAME_FUNC_OFFSET(26522, glGetUniformfv, glGetUniformfv, NULL, 501),
+ NAME_FUNC_OFFSET(26540, glGetUniformiv, glGetUniformiv, NULL, 502),
+ NAME_FUNC_OFFSET(26558, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+ NAME_FUNC_OFFSET(26587, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+ NAME_FUNC_OFFSET(26615, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
+ NAME_FUNC_OFFSET(26638, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
+ NAME_FUNC_OFFSET(26661, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
+ NAME_FUNC_OFFSET(26684, glLinkProgram, glLinkProgram, NULL, 509),
+ NAME_FUNC_OFFSET(26701, glShaderSource, glShaderSource, NULL, 510),
+ NAME_FUNC_OFFSET(26719, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
+ NAME_FUNC_OFFSET(26742, glUniform1f, glUniform1f, NULL, 514),
+ NAME_FUNC_OFFSET(26757, glUniform1fv, glUniform1fv, NULL, 515),
+ NAME_FUNC_OFFSET(26773, glUniform1i, glUniform1i, NULL, 516),
+ NAME_FUNC_OFFSET(26788, glUniform1iv, glUniform1iv, NULL, 517),
+ NAME_FUNC_OFFSET(26804, glUniform2f, glUniform2f, NULL, 518),
+ NAME_FUNC_OFFSET(26819, glUniform2fv, glUniform2fv, NULL, 519),
+ NAME_FUNC_OFFSET(26835, glUniform2i, glUniform2i, NULL, 520),
+ NAME_FUNC_OFFSET(26850, glUniform2iv, glUniform2iv, NULL, 521),
+ NAME_FUNC_OFFSET(26866, glUniform3f, glUniform3f, NULL, 522),
+ NAME_FUNC_OFFSET(26881, glUniform3fv, glUniform3fv, NULL, 523),
+ NAME_FUNC_OFFSET(26897, glUniform3i, glUniform3i, NULL, 524),
+ NAME_FUNC_OFFSET(26912, glUniform3iv, glUniform3iv, NULL, 525),
+ NAME_FUNC_OFFSET(26928, glUniform4f, glUniform4f, NULL, 526),
+ NAME_FUNC_OFFSET(26943, glUniform4fv, glUniform4fv, NULL, 527),
+ NAME_FUNC_OFFSET(26959, glUniform4i, glUniform4i, NULL, 528),
+ NAME_FUNC_OFFSET(26974, glUniform4iv, glUniform4iv, NULL, 529),
+ NAME_FUNC_OFFSET(26990, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
+ NAME_FUNC_OFFSET(27012, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
+ NAME_FUNC_OFFSET(27034, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
+ NAME_FUNC_OFFSET(27056, glUseProgram, glUseProgram, NULL, 533),
+ NAME_FUNC_OFFSET(27078, glValidateProgram, glValidateProgram, NULL, 534),
+ NAME_FUNC_OFFSET(27099, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
+ NAME_FUNC_OFFSET(27119, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
+ NAME_FUNC_OFFSET(27140, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
+ NAME_FUNC_OFFSET(27160, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
+ NAME_FUNC_OFFSET(27181, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
+ NAME_FUNC_OFFSET(27201, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
+ NAME_FUNC_OFFSET(27222, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
+ NAME_FUNC_OFFSET(27242, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
+ NAME_FUNC_OFFSET(27263, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
+ NAME_FUNC_OFFSET(27283, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
+ NAME_FUNC_OFFSET(27304, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
+ NAME_FUNC_OFFSET(27324, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
+ NAME_FUNC_OFFSET(27345, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
+ NAME_FUNC_OFFSET(27367, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
+ NAME_FUNC_OFFSET(27389, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
+ NAME_FUNC_OFFSET(27411, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
+ NAME_FUNC_OFFSET(27433, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
+ NAME_FUNC_OFFSET(27456, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
+ NAME_FUNC_OFFSET(27479, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
+ NAME_FUNC_OFFSET(27502, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
+ NAME_FUNC_OFFSET(27523, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
+ NAME_FUNC_OFFSET(27543, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
+ NAME_FUNC_OFFSET(27564, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
+ NAME_FUNC_OFFSET(27585, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
+ NAME_FUNC_OFFSET(27605, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
+ NAME_FUNC_OFFSET(27626, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
+ NAME_FUNC_OFFSET(27648, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
+ NAME_FUNC_OFFSET(27670, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
+ NAME_FUNC_OFFSET(27692, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
+ NAME_FUNC_OFFSET(27717, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
+ NAME_FUNC_OFFSET(27744, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
+ NAME_FUNC_OFFSET(27772, glBindBufferBase, glBindBufferBase, NULL, 572),
+ NAME_FUNC_OFFSET(27792, glBindBufferRange, glBindBufferRange, NULL, 573),
+ NAME_FUNC_OFFSET(27813, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
+ NAME_FUNC_OFFSET(27839, glClampColor, glClampColor, NULL, 575),
+ NAME_FUNC_OFFSET(27855, glColorMaski, glColorMaski, NULL, 580),
+ NAME_FUNC_OFFSET(27877, glDisablei, glDisablei, NULL, 581),
+ NAME_FUNC_OFFSET(27897, glEnablei, glEnablei, NULL, 582),
+ NAME_FUNC_OFFSET(27916, glEndConditionalRender, glEndConditionalRender, NULL, 583),
+ NAME_FUNC_OFFSET(27941, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
+ NAME_FUNC_OFFSET(27967, glGetBooleani_v, glGetBooleani_v, NULL, 585),
+ NAME_FUNC_OFFSET(27991, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
+ NAME_FUNC_OFFSET(28016, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
+ NAME_FUNC_OFFSET(28040, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
+ NAME_FUNC_OFFSET(28064, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
+ NAME_FUNC_OFFSET(28089, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
+ NAME_FUNC_OFFSET(28122, glGetUniformuiv, glGetUniformuiv, NULL, 592),
+ NAME_FUNC_OFFSET(28141, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
+ NAME_FUNC_OFFSET(28165, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
+ NAME_FUNC_OFFSET(28190, glIsEnabledi, glIsEnabledi, NULL, 595),
+ NAME_FUNC_OFFSET(28212, glTexParameterIiv, glTexParameterIiv, NULL, 596),
+ NAME_FUNC_OFFSET(28233, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
+ NAME_FUNC_OFFSET(28255, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
+ NAME_FUNC_OFFSET(28286, glUniform1ui, glUniform1ui, NULL, 599),
+ NAME_FUNC_OFFSET(28302, glUniform1uiv, glUniform1uiv, NULL, 600),
+ NAME_FUNC_OFFSET(28319, glUniform2ui, glUniform2ui, NULL, 601),
+ NAME_FUNC_OFFSET(28335, glUniform2uiv, glUniform2uiv, NULL, 602),
+ NAME_FUNC_OFFSET(28352, glUniform3ui, glUniform3ui, NULL, 603),
+ NAME_FUNC_OFFSET(28368, glUniform3uiv, glUniform3uiv, NULL, 604),
+ NAME_FUNC_OFFSET(28385, glUniform4ui, glUniform4ui, NULL, 605),
+ NAME_FUNC_OFFSET(28401, glUniform4uiv, glUniform4uiv, NULL, 606),
+ NAME_FUNC_OFFSET(28418, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
+ NAME_FUNC_OFFSET(28440, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
+ NAME_FUNC_OFFSET(28463, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
+ NAME_FUNC_OFFSET(28485, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
+ NAME_FUNC_OFFSET(28507, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
+ NAME_FUNC_OFFSET(28530, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
+ NAME_FUNC_OFFSET(28553, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
+ NAME_FUNC_OFFSET(28579, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
+ NAME_FUNC_OFFSET(28605, glTexBuffer, glTexBuffer, NULL, 615),
+ NAME_FUNC_OFFSET(28620, glFramebufferTexture, glFramebufferTexture, NULL, 616),
+ NAME_FUNC_OFFSET(28644, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
+ NAME_FUNC_OFFSET(28669, glMinSampleShading, glMinSampleShading, NULL, 620),
+ NAME_FUNC_OFFSET(28691, glBindProgramARB, glBindProgramARB, NULL, 621),
+ NAME_FUNC_OFFSET(28707, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622),
+ NAME_FUNC_OFFSET(28726, glGenProgramsARB, glGenProgramsARB, NULL, 623),
+ NAME_FUNC_OFFSET(28742, glIsProgramARB, glIsProgramARB, NULL, 630),
+ NAME_FUNC_OFFSET(28756, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631),
+ NAME_FUNC_OFFSET(28779, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632),
+ NAME_FUNC_OFFSET(28803, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633),
+ NAME_FUNC_OFFSET(28826, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634),
+ NAME_FUNC_OFFSET(28850, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640),
+ NAME_FUNC_OFFSET(28867, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641),
+ NAME_FUNC_OFFSET(28885, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642),
+ NAME_FUNC_OFFSET(28902, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643),
+ NAME_FUNC_OFFSET(28920, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644),
+ NAME_FUNC_OFFSET(28937, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645),
+ NAME_FUNC_OFFSET(28955, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646),
+ NAME_FUNC_OFFSET(28972, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647),
+ NAME_FUNC_OFFSET(28990, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
+ NAME_FUNC_OFFSET(29015, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
+ NAME_FUNC_OFFSET(29037, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
+ NAME_FUNC_OFFSET(29064, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
+ NAME_FUNC_OFFSET(29088, glBindFramebuffer, glBindFramebuffer, NULL, 660),
+ NAME_FUNC_OFFSET(29109, glBindRenderbuffer, glBindRenderbuffer, NULL, 661),
+ NAME_FUNC_OFFSET(29131, glBlitFramebuffer, glBlitFramebuffer, NULL, 662),
+ NAME_FUNC_OFFSET(29152, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
+ NAME_FUNC_OFFSET(29180, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
+ NAME_FUNC_OFFSET(29208, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
+ NAME_FUNC_OFFSET(29232, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
+ NAME_FUNC_OFFSET(29256, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
+ NAME_FUNC_OFFSET(29281, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
+ NAME_FUNC_OFFSET(29306, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
+ NAME_FUNC_OFFSET(29335, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
+ NAME_FUNC_OFFSET(29364, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667),
+ NAME_FUNC_OFFSET(29390, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
+ NAME_FUNC_OFFSET(29416, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
+ NAME_FUNC_OFFSET(29442, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
+ NAME_FUNC_OFFSET(29468, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
+ NAME_FUNC_OFFSET(29494, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
+ NAME_FUNC_OFFSET(29523, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
+ NAME_FUNC_OFFSET(29552, glGenFramebuffers, glGenFramebuffers, NULL, 671),
+ NAME_FUNC_OFFSET(29573, glGenFramebuffers, glGenFramebuffers, NULL, 671),
+ NAME_FUNC_OFFSET(29594, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
+ NAME_FUNC_OFFSET(29616, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
+ NAME_FUNC_OFFSET(29638, glGenerateMipmap, glGenerateMipmap, NULL, 673),
+ NAME_FUNC_OFFSET(29658, glGenerateMipmap, glGenerateMipmap, NULL, 673),
+ NAME_FUNC_OFFSET(29678, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
+ NAME_FUNC_OFFSET(29719, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
+ NAME_FUNC_OFFSET(29760, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
+ NAME_FUNC_OFFSET(29792, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
+ NAME_FUNC_OFFSET(29824, glIsFramebuffer, glIsFramebuffer, NULL, 676),
+ NAME_FUNC_OFFSET(29843, glIsFramebuffer, glIsFramebuffer, NULL, 676),
+ NAME_FUNC_OFFSET(29862, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
+ NAME_FUNC_OFFSET(29882, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
+ NAME_FUNC_OFFSET(29902, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
+ NAME_FUNC_OFFSET(29927, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
+ NAME_FUNC_OFFSET(29952, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679),
+ NAME_FUNC_OFFSET(29988, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681),
+ NAME_FUNC_OFFSET(30016, glMapBufferRange, glMapBufferRange, NULL, 682),
+ NAME_FUNC_OFFSET(30036, glBindVertexArray, glBindVertexArray, NULL, 683),
+ NAME_FUNC_OFFSET(30057, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
+ NAME_FUNC_OFFSET(30083, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
+ NAME_FUNC_OFFSET(30107, glGenVertexArrays, glGenVertexArrays, NULL, 685),
+ NAME_FUNC_OFFSET(30128, glIsVertexArray, glIsVertexArray, NULL, 686),
+ NAME_FUNC_OFFSET(30149, glIsVertexArray, glIsVertexArray, NULL, 686),
+ NAME_FUNC_OFFSET(30168, glProvokingVertex, glProvokingVertex, NULL, 706),
+ NAME_FUNC_OFFSET(30189, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
+ NAME_FUNC_OFFSET(30223, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
+ NAME_FUNC_OFFSET(30248, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
+ NAME_FUNC_OFFSET(30274, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
+ NAME_FUNC_OFFSET(30291, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
+ NAME_FUNC_OFFSET(30321, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
+ NAME_FUNC_OFFSET(30342, glBlendFunciARB, glBlendFunciARB, NULL, 714),
+ NAME_FUNC_OFFSET(30364, glBlendFunciARB, glBlendFunciARB, NULL, 714),
+ NAME_FUNC_OFFSET(30377, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731),
+ NAME_FUNC_OFFSET(30401, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732),
+ NAME_FUNC_OFFSET(30426, glClearDepthf, glClearDepthf, NULL, 803),
+ NAME_FUNC_OFFSET(30443, glDepthRangef, glDepthRangef, NULL, 804),
+ NAME_FUNC_OFFSET(30460, glGetProgramBinary, glGetProgramBinary, NULL, 808),
+ NAME_FUNC_OFFSET(30482, glProgramBinary, glProgramBinary, NULL, 809),
+ NAME_FUNC_OFFSET(30501, glProgramParameteri, glProgramParameteri, NULL, 810),
+ NAME_FUNC_OFFSET(30524, glProgramParameteri, glProgramParameteri, NULL, 810),
+ NAME_FUNC_OFFSET(30547, gl_dispatch_stub_932, gl_dispatch_stub_932, NULL, 932),
+ NAME_FUNC_OFFSET(30563, gl_dispatch_stub_933, gl_dispatch_stub_933, NULL, 933),
+ NAME_FUNC_OFFSET(30582, gl_dispatch_stub_941, gl_dispatch_stub_941, NULL, 941),
+ NAME_FUNC_OFFSET(30607, gl_dispatch_stub_942, gl_dispatch_stub_942, NULL, 942),
+ NAME_FUNC_OFFSET(30632, gl_dispatch_stub_943, gl_dispatch_stub_943, NULL, 943),
+ NAME_FUNC_OFFSET(30658, gl_dispatch_stub_944, gl_dispatch_stub_944, NULL, 944),
+ NAME_FUNC_OFFSET(30686, gl_dispatch_stub_945, gl_dispatch_stub_945, NULL, 945),
+ NAME_FUNC_OFFSET(30711, gl_dispatch_stub_946, gl_dispatch_stub_946, NULL, 946),
+ NAME_FUNC_OFFSET(30742, gl_dispatch_stub_947, gl_dispatch_stub_947, NULL, 947),
+ NAME_FUNC_OFFSET(30768, gl_dispatch_stub_948, gl_dispatch_stub_948, NULL, 948),
+ NAME_FUNC_OFFSET(30791, gl_dispatch_stub_952, gl_dispatch_stub_952, NULL, 952),
+ NAME_FUNC_OFFSET(30813, gl_dispatch_stub_953, gl_dispatch_stub_953, NULL, 953),
+ NAME_FUNC_OFFSET(30836, gl_dispatch_stub_954, gl_dispatch_stub_954, NULL, 954),
+ NAME_FUNC_OFFSET(30858, gl_dispatch_stub_955, gl_dispatch_stub_955, NULL, 955),
+ NAME_FUNC_OFFSET(30881, gl_dispatch_stub_956, gl_dispatch_stub_956, NULL, 956),
+ NAME_FUNC_OFFSET(30904, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL, 957),
+ NAME_FUNC_OFFSET(30928, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
+ NAME_FUNC_OFFSET(30950, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
+ NAME_FUNC_OFFSET(30973, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
+ NAME_FUNC_OFFSET(30995, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
+ NAME_FUNC_OFFSET(31018, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
+ NAME_FUNC_OFFSET(31041, gl_dispatch_stub_965, gl_dispatch_stub_965, NULL, 965),
+ NAME_FUNC_OFFSET(31065, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL, 968),
+ NAME_FUNC_OFFSET(31087, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL, 969),
+ NAME_FUNC_OFFSET(31110, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
+ NAME_FUNC_OFFSET(31132, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
+ NAME_FUNC_OFFSET(31155, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
+ NAME_FUNC_OFFSET(31178, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
+ NAME_FUNC_OFFSET(31202, gl_dispatch_stub_976, gl_dispatch_stub_976, NULL, 976),
+ NAME_FUNC_OFFSET(31224, gl_dispatch_stub_977, gl_dispatch_stub_977, NULL, 977),
+ NAME_FUNC_OFFSET(31247, gl_dispatch_stub_978, gl_dispatch_stub_978, NULL, 978),
+ NAME_FUNC_OFFSET(31269, gl_dispatch_stub_979, gl_dispatch_stub_979, NULL, 979),
+ NAME_FUNC_OFFSET(31292, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
+ NAME_FUNC_OFFSET(31315, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
+ NAME_FUNC_OFFSET(31339, gl_dispatch_stub_983, gl_dispatch_stub_983, NULL, 983),
+ NAME_FUNC_OFFSET(31368, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
+ NAME_FUNC_OFFSET(31399, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
+ NAME_FUNC_OFFSET(31430, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
+ NAME_FUNC_OFFSET(31459, gl_dispatch_stub_991, gl_dispatch_stub_991, NULL, 991),
+ NAME_FUNC_OFFSET(31490, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
+ NAME_FUNC_OFFSET(31521, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
+ NAME_FUNC_OFFSET(31550, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
+ NAME_FUNC_OFFSET(31581, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
+ NAME_FUNC_OFFSET(31612, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
+ NAME_FUNC_OFFSET(31634, gl_dispatch_stub_1002, gl_dispatch_stub_1002, NULL, 1002),
+ NAME_FUNC_OFFSET(31663, glDebugMessageCallback, glDebugMessageCallback, NULL, 1003),
+ NAME_FUNC_OFFSET(31689, glDebugMessageControl, glDebugMessageControl, NULL, 1004),
+ NAME_FUNC_OFFSET(31714, glDebugMessageInsert, glDebugMessageInsert, NULL, 1005),
+ NAME_FUNC_OFFSET(31738, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 1006),
+ NAME_FUNC_OFFSET(31762, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 1013),
+ NAME_FUNC_OFFSET(31781, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 1014),
+ NAME_FUNC_OFFSET(31801, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 1015),
+ NAME_FUNC_OFFSET(31821, glFogCoordfEXT, glFogCoordfEXT, NULL, 1016),
+ NAME_FUNC_OFFSET(31833, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 1017),
+ NAME_FUNC_OFFSET(31846, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1120),
+ NAME_FUNC_OFFSET(31864, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1121),
+ NAME_FUNC_OFFSET(31883, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1122),
+ NAME_FUNC_OFFSET(31901, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1123),
+ NAME_FUNC_OFFSET(31920, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1124),
+ NAME_FUNC_OFFSET(31939, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1125),
+ NAME_FUNC_OFFSET(31959, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1126),
+ NAME_FUNC_OFFSET(31977, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1127),
+ NAME_FUNC_OFFSET(31996, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1128),
+ NAME_FUNC_OFFSET(32015, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1129),
+ NAME_FUNC_OFFSET(32035, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1130),
+ NAME_FUNC_OFFSET(32053, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1131),
+ NAME_FUNC_OFFSET(32072, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1132),
+ NAME_FUNC_OFFSET(32091, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1133),
+ NAME_FUNC_OFFSET(32111, glTextureBarrierNV, glTextureBarrierNV, NULL, 1154),
+ NAME_FUNC_OFFSET(32128, glAlphaFuncx, glAlphaFuncx, NULL, 1181),
+ NAME_FUNC_OFFSET(32144, glClearColorx, glClearColorx, NULL, 1182),
+ NAME_FUNC_OFFSET(32161, glClearDepthx, glClearDepthx, NULL, 1183),
+ NAME_FUNC_OFFSET(32178, glColor4x, glColor4x, NULL, 1184),
+ NAME_FUNC_OFFSET(32191, glDepthRangex, glDepthRangex, NULL, 1185),
+ NAME_FUNC_OFFSET(32208, glFogx, glFogx, NULL, 1186),
+ NAME_FUNC_OFFSET(32218, glFogxv, glFogxv, NULL, 1187),
+ NAME_FUNC_OFFSET(32229, glFrustumf, glFrustumf, NULL, 1188),
+ NAME_FUNC_OFFSET(32243, glFrustumx, glFrustumx, NULL, 1189),
+ NAME_FUNC_OFFSET(32257, glLightModelx, glLightModelx, NULL, 1190),
+ NAME_FUNC_OFFSET(32274, glLightModelxv, glLightModelxv, NULL, 1191),
+ NAME_FUNC_OFFSET(32292, glLightx, glLightx, NULL, 1192),
+ NAME_FUNC_OFFSET(32304, glLightxv, glLightxv, NULL, 1193),
+ NAME_FUNC_OFFSET(32317, glLineWidthx, glLineWidthx, NULL, 1194),
+ NAME_FUNC_OFFSET(32333, glLoadMatrixx, glLoadMatrixx, NULL, 1195),
+ NAME_FUNC_OFFSET(32350, glMaterialx, glMaterialx, NULL, 1196),
+ NAME_FUNC_OFFSET(32365, glMaterialxv, glMaterialxv, NULL, 1197),
+ NAME_FUNC_OFFSET(32381, glMultMatrixx, glMultMatrixx, NULL, 1198),
+ NAME_FUNC_OFFSET(32398, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1199),
+ NAME_FUNC_OFFSET(32419, glNormal3x, glNormal3x, NULL, 1200),
+ NAME_FUNC_OFFSET(32433, glOrthof, glOrthof, NULL, 1201),
+ NAME_FUNC_OFFSET(32445, glOrthox, glOrthox, NULL, 1202),
+ NAME_FUNC_OFFSET(32457, glPointSizex, glPointSizex, NULL, 1203),
+ NAME_FUNC_OFFSET(32473, glPolygonOffsetx, glPolygonOffsetx, NULL, 1204),
+ NAME_FUNC_OFFSET(32493, glRotatex, glRotatex, NULL, 1205),
+ NAME_FUNC_OFFSET(32506, glSampleCoveragex, glSampleCoveragex, NULL, 1206),
+ NAME_FUNC_OFFSET(32527, glScalex, glScalex, NULL, 1207),
+ NAME_FUNC_OFFSET(32539, glTexEnvx, glTexEnvx, NULL, 1208),
+ NAME_FUNC_OFFSET(32552, glTexEnvxv, glTexEnvxv, NULL, 1209),
+ NAME_FUNC_OFFSET(32566, glTexParameterx, glTexParameterx, NULL, 1210),
+ NAME_FUNC_OFFSET(32585, glTranslatex, glTranslatex, NULL, 1211),
+ NAME_FUNC_OFFSET(32601, glClipPlanef, glClipPlanef, NULL, 1212),
+ NAME_FUNC_OFFSET(32617, glClipPlanex, glClipPlanex, NULL, 1213),
+ NAME_FUNC_OFFSET(32633, glGetClipPlanef, glGetClipPlanef, NULL, 1214),
+ NAME_FUNC_OFFSET(32652, glGetClipPlanex, glGetClipPlanex, NULL, 1215),
+ NAME_FUNC_OFFSET(32671, glGetFixedv, glGetFixedv, NULL, 1216),
+ NAME_FUNC_OFFSET(32686, glGetLightxv, glGetLightxv, NULL, 1217),
+ NAME_FUNC_OFFSET(32702, glGetMaterialxv, glGetMaterialxv, NULL, 1218),
+ NAME_FUNC_OFFSET(32721, glGetTexEnvxv, glGetTexEnvxv, NULL, 1219),
+ NAME_FUNC_OFFSET(32738, glGetTexParameterxv, glGetTexParameterxv, NULL, 1220),
+ NAME_FUNC_OFFSET(32761, glPointParameterx, glPointParameterx, NULL, 1221),
+ NAME_FUNC_OFFSET(32782, glPointParameterxv, glPointParameterxv, NULL, 1222),
+ NAME_FUNC_OFFSET(32804, glTexParameterxv, glTexParameterxv, NULL, 1223),
NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
};
diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c
index df08967ab..4ac21a047 100644..100755
--- a/xorg-server/glx/glxcmds.c
+++ b/xorg-server/glx/glxcmds.c
@@ -201,6 +201,12 @@ __glXdirectContextDestroy(__GLXcontext * context)
free(context);
}
+static int
+__glXdirectContextLoseCurrent(__GLXcontext * context)
+{
+ return GL_TRUE;
+}
+
_X_HIDDEN __GLXcontext *
__glXdirectContextCreate(__GLXscreen * screen,
__GLXconfig * modes, __GLXcontext * shareContext)
@@ -212,6 +218,7 @@ __glXdirectContextCreate(__GLXscreen * screen,
return NULL;
context->destroy = __glXdirectContextDestroy;
+ context->loseCurrent = __glXdirectContextLoseCurrent;
return context;
}
@@ -416,7 +423,9 @@ __glXDisp_DestroyContext(__GLXclientState * cl, GLbyte * pc)
&glxc, &err))
return err;
- FreeResourceByType(req->context, __glXContextRes, FALSE);
+ glxc->idExists = GL_FALSE;
+ if (!glxc->currentClient)
+ FreeResourceByType(req->context, __glXContextRes, FALSE);
return Success;
}
@@ -1912,44 +1921,55 @@ DoGetDrawableAttributes(__GLXclientState * cl, XID drawId)
{
ClientPtr client = cl->client;
xGLXGetDrawableAttributesReply reply;
- __GLXdrawable *pGlxDraw;
+ __GLXdrawable *pGlxDraw = NULL;
+ DrawablePtr pDraw;
CARD32 attributes[14];
- int numAttribs = 0, error;
+ int num = 0, error;
if (!validGlxDrawable(client, drawId, GLX_DRAWABLE_ANY,
- DixGetAttrAccess, &pGlxDraw, &error))
- return error;
-
- attributes[0] = GLX_TEXTURE_TARGET_EXT;
- attributes[1] = pGlxDraw->target == GL_TEXTURE_2D ? GLX_TEXTURE_2D_EXT :
- GLX_TEXTURE_RECTANGLE_EXT;
- numAttribs++;
- attributes[2] = GLX_Y_INVERTED_EXT;
- attributes[3] = GL_FALSE;
- numAttribs++;
- attributes[4] = GLX_EVENT_MASK;
- attributes[5] = pGlxDraw->eventMask;
- numAttribs++;
- attributes[6] = GLX_WIDTH;
- attributes[7] = pGlxDraw->pDraw->width;
- numAttribs++;
- attributes[8] = GLX_HEIGHT;
- attributes[9] = pGlxDraw->pDraw->height;
- numAttribs++;
- attributes[10] = GLX_FBCONFIG_ID;
- attributes[11] = pGlxDraw->config->fbconfigID;
- numAttribs++;
- if (pGlxDraw->type == GLX_DRAWABLE_PBUFFER) {
- attributes[12] = GLX_PRESERVED_CONTENTS;
- attributes[13] = GL_TRUE;
- numAttribs++;
+ DixGetAttrAccess, &pGlxDraw, &error)) {
+ /* hack for GLX 1.2 naked windows */
+ int err = dixLookupWindow((WindowPtr *)&pDraw, drawId, client,
+ DixGetAttrAccess);
+ if (err != Success)
+ return error;
+ }
+ if (pGlxDraw)
+ pDraw = pGlxDraw->pDraw;
+
+ attributes[2*num] = GLX_Y_INVERTED_EXT;
+ attributes[2*num+1] = GL_FALSE;
+ num++;
+ attributes[2*num] = GLX_WIDTH;
+ attributes[2*num+1] = pDraw->width;
+ num++;
+ attributes[2*num] = GLX_HEIGHT;
+ attributes[2*num+1] = pDraw->height;
+ num++;
+ if (pGlxDraw) {
+ attributes[2*num] = GLX_TEXTURE_TARGET_EXT;
+ attributes[2*num+1] = pGlxDraw->target == GL_TEXTURE_2D ?
+ GLX_TEXTURE_2D_EXT :
+ GLX_TEXTURE_RECTANGLE_EXT;
+ num++;
+ attributes[2*num] = GLX_EVENT_MASK;
+ attributes[2*num+1] = pGlxDraw->eventMask;
+ num++;
+ attributes[2*num] = GLX_FBCONFIG_ID;
+ attributes[2*num+1] = pGlxDraw->config->fbconfigID;
+ num++;
+ if (pGlxDraw->type == GLX_DRAWABLE_PBUFFER) {
+ attributes[2*num] = GLX_PRESERVED_CONTENTS;
+ attributes[2*num+1] = GL_TRUE;
+ num++;
+ }
}
reply.type = X_Reply;
reply.sequenceNumber = client->sequence;
- reply.length = numAttribs << 1;
- reply.numAttribs = numAttribs;
+ reply.length = num << 1;
+ reply.numAttribs = num;
if (client->swapped) {
@@ -2028,7 +2048,7 @@ __glXDisp_Render(__GLXclientState * cl, GLbyte * pc)
left = (req->length << 2) - sz_xGLXRenderReq;
while (left > 0) {
__GLXrenderSizeData entry;
- int extra;
+ int extra = 0;
__GLXdispatchRenderProcPtr proc;
int err;
@@ -2047,6 +2067,9 @@ __glXDisp_Render(__GLXclientState * cl, GLbyte * pc)
cmdlen = hdr->length;
opcode = hdr->opcode;
+ if (left < cmdlen)
+ return BadLength;
+
/*
** Check for core opcodes and grab entry data.
*/
@@ -2060,24 +2083,21 @@ __glXDisp_Render(__GLXclientState * cl, GLbyte * pc)
return __glXError(GLXBadRenderRequest);
}
+ if (cmdlen < entry.bytes) {
+ return BadLength;
+ }
+
if (entry.varsize) {
/* variable size command */
extra = (*entry.varsize) (pc + __GLX_RENDER_HDR_SIZE,
- client->swapped);
+ client->swapped,
+ left - __GLX_RENDER_HDR_SIZE);
if (extra < 0) {
- extra = 0;
- }
- if (cmdlen != __GLX_PAD(entry.bytes + extra)) {
- return BadLength;
- }
- }
- else {
- /* constant size command */
- if (cmdlen != __GLX_PAD(entry.bytes)) {
return BadLength;
}
}
- if (left < cmdlen) {
+
+ if (cmdlen != safe_pad(safe_add(entry.bytes, extra))) {
return BadLength;
}
@@ -2113,6 +2133,8 @@ __glXDisp_RenderLarge(__GLXclientState * cl, GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
+ REQUEST_AT_LEAST_SIZE(xGLXRenderLargeReq);
+
req = (xGLXRenderLargeReq *) pc;
if (client->swapped) {
__GLX_SWAP_SHORT(&req->length);
@@ -2128,12 +2150,14 @@ __glXDisp_RenderLarge(__GLXclientState * cl, GLbyte * pc)
__glXResetLargeCommandStatus(cl);
return error;
}
+ if (safe_pad(req->dataBytes) < 0)
+ return BadLength;
dataBytes = req->dataBytes;
/*
** Check the request length.
*/
- if ((req->length << 2) != __GLX_PAD(dataBytes) + sz_xGLXRenderLargeReq) {
+ if ((req->length << 2) != safe_pad(dataBytes) + sz_xGLXRenderLargeReq) {
client->errorValue = req->length;
/* Reset in case this isn't 1st request. */
__glXResetLargeCommandStatus(cl);
@@ -2143,7 +2167,8 @@ __glXDisp_RenderLarge(__GLXclientState * cl, GLbyte * pc)
if (cl->largeCmdRequestsSoFar == 0) {
__GLXrenderSizeData entry;
- int extra;
+ int extra = 0;
+ int left = (req->length << 2) - sz_xGLXRenderLargeReq;
size_t cmdlen;
int err;
@@ -2156,13 +2181,17 @@ __glXDisp_RenderLarge(__GLXclientState * cl, GLbyte * pc)
return __glXError(GLXBadLargeRequest);
}
+ if (dataBytes < __GLX_RENDER_LARGE_HDR_SIZE)
+ return BadLength;
+
hdr = (__GLXrenderLargeHeader *) pc;
if (client->swapped) {
__GLX_SWAP_INT(&hdr->length);
__GLX_SWAP_INT(&hdr->opcode);
}
- cmdlen = hdr->length;
opcode = hdr->opcode;
+ if ((cmdlen = safe_pad(hdr->length)) < 0)
+ return BadLength;
/*
** Check for core opcodes and grab entry data.
@@ -2180,21 +2209,18 @@ __glXDisp_RenderLarge(__GLXclientState * cl, GLbyte * pc)
** will be in the 1st request, so it's okay to do this.
*/
extra = (*entry.varsize) (pc + __GLX_RENDER_LARGE_HDR_SIZE,
- client->swapped);
+ client->swapped,
+ left - __GLX_RENDER_LARGE_HDR_SIZE);
if (extra < 0) {
- extra = 0;
- }
- /* large command's header is 4 bytes longer, so add 4 */
- if (cmdlen != __GLX_PAD(entry.bytes + 4 + extra)) {
return BadLength;
}
}
- else {
- /* constant size command */
- if (cmdlen != __GLX_PAD(entry.bytes + 4)) {
- return BadLength;
- }
+
+ /* the +4 is safe because we know entry.bytes is small */
+ if (cmdlen != safe_pad(safe_add(entry.bytes + 4, extra))) {
+ return BadLength;
}
+
/*
** Make enough space in the buffer, then copy the entire request.
*/
@@ -2221,6 +2247,7 @@ __glXDisp_RenderLarge(__GLXclientState * cl, GLbyte * pc)
** We are receiving subsequent (i.e. not the first) requests of a
** multi request command.
*/
+ int bytesSoFar; /* including this packet */
/*
** Check the request number and the total request count.
@@ -2239,11 +2266,18 @@ __glXDisp_RenderLarge(__GLXclientState * cl, GLbyte * pc)
/*
** Check that we didn't get too much data.
*/
- if ((cl->largeCmdBytesSoFar + dataBytes) > cl->largeCmdBytesTotal) {
+ if ((bytesSoFar = safe_add(cl->largeCmdBytesSoFar, dataBytes)) < 0) {
+ client->errorValue = dataBytes;
+ __glXResetLargeCommandStatus(cl);
+ return __glXError(GLXBadLargeRequest);
+ }
+
+ if (bytesSoFar > cl->largeCmdBytesTotal) {
client->errorValue = dataBytes;
__glXResetLargeCommandStatus(cl);
return __glXError(GLXBadLargeRequest);
}
+
memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, pc, dataBytes);
cl->largeCmdBytesSoFar += dataBytes;
cl->largeCmdRequestsSoFar++;
@@ -2255,17 +2289,16 @@ __glXDisp_RenderLarge(__GLXclientState * cl, GLbyte * pc)
** This is the last request; it must have enough bytes to complete
** the command.
*/
- /* NOTE: the two pad macros have been added below; they are needed
- ** because the client library pads the total byte count, but not
- ** the per-request byte counts. The Protocol Encoding says the
- ** total byte count should not be padded, so a proposal will be
- ** made to the ARB to relax the padding constraint on the total
- ** byte count, thus preserving backward compatibility. Meanwhile,
- ** the padding done below fixes a bug that did not allow
- ** large commands of odd sizes to be accepted by the server.
+ /* NOTE: the pad macro below is needed because the client library
+ ** pads the total byte count, but not the per-request byte counts.
+ ** The Protocol Encoding says the total byte count should not be
+ ** padded, so a proposal will be made to the ARB to relax the
+ ** padding constraint on the total byte count, thus preserving
+ ** backward compatibility. Meanwhile, the padding done below
+ ** fixes a bug that did not allow large commands of odd sizes to
+ ** be accepted by the server.
*/
- if (__GLX_PAD(cl->largeCmdBytesSoFar) !=
- __GLX_PAD(cl->largeCmdBytesTotal)) {
+ if (safe_pad(cl->largeCmdBytesSoFar) != cl->largeCmdBytesTotal) {
client->errorValue = dataBytes;
__glXResetLargeCommandStatus(cl);
return __glXError(GLXBadLargeRequest);
diff --git a/xorg-server/glx/glxcmdsswap.c b/xorg-server/glx/glxcmdsswap.c
index fd1fd7006..eca700944 100644
--- a/xorg-server/glx/glxcmdsswap.c
+++ b/xorg-server/glx/glxcmdsswap.c
@@ -960,11 +960,13 @@ __glXDispSwap_RenderLarge(__GLXclientState * cl, GLbyte * pc)
int
__glXDispSwap_VendorPrivate(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
xGLXVendorPrivateReq *req;
GLint vendorcode;
__GLXdispatchVendorPrivProcPtr proc;
__GLX_DECLARE_SWAP_VARIABLES;
+ REQUEST_AT_LEAST_SIZE(xGLXVendorPrivateReq);
req = (xGLXVendorPrivateReq *) pc;
__GLX_SWAP_SHORT(&req->length);
@@ -987,11 +989,13 @@ __glXDispSwap_VendorPrivate(__GLXclientState * cl, GLbyte * pc)
int
__glXDispSwap_VendorPrivateWithReply(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
xGLXVendorPrivateWithReplyReq *req;
GLint vendorcode;
__GLXdispatchVendorPrivProcPtr proc;
__GLX_DECLARE_SWAP_VARIABLES;
+ REQUEST_AT_LEAST_SIZE(xGLXVendorPrivateWithReplyReq);
req = (xGLXVendorPrivateWithReplyReq *) pc;
__GLX_SWAP_SHORT(&req->length);
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c
index 64fa0ba55..08d90bd44 100755
--- a/xorg-server/glx/glxext.c
+++ b/xorg-server/glx/glxext.c
@@ -71,6 +71,7 @@ static DevPrivateKeyRec glxClientPrivateKeyRec;
** Forward declarations.
*/
static int __glXDispatch(ClientPtr);
+static GLboolean __glXFreeContext(__GLXcontext * cx);
/*
** Called when the extension is reset.
@@ -138,6 +139,9 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid)
next = c->next;
if (c->currentClient &&
(c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
+ /* flush the context */
+ glFlush();
+ c->hasUnflushedCommands = GL_FALSE;
/* just force a re-bind the next time through */
(*c->loseCurrent) (c);
lastGLContext = NULL;
@@ -191,7 +195,7 @@ __glXRemoveFromContextList(__GLXcontext * cx)
/*
** Free a context.
*/
-GLboolean
+static GLboolean
__glXFreeContext(__GLXcontext * cx)
{
if (cx->idExists || cx->currentClient)
@@ -296,7 +300,7 @@ glxClientCallback(CallbackListPtr *list, void *closure, void *data)
c->loseCurrent(c);
lastGLContext = NULL;
c->currentClient = NULL;
- __glXFreeContext(c);
+ FreeResourceByType(c->id, __glXContextRes, FALSE);
}
}
diff --git a/xorg-server/glx/glxext.h b/xorg-server/glx/glxext.h
index 7dc0ed476..8804a912b 100644
--- a/xorg-server/glx/glxext.h
+++ b/xorg-server/glx/glxext.h
@@ -57,7 +57,6 @@
#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1
#endif
-extern GLboolean __glXFreeContext(__GLXcontext * glxc);
extern void __glXFlushContextCache(void);
extern Bool __glXAddContext(__GLXcontext * cx);
diff --git a/xorg-server/glx/glxserver.h b/xorg-server/glx/glxserver.h
index a324b290f..9088ec478 100644
--- a/xorg-server/glx/glxserver.h
+++ b/xorg-server/glx/glxserver.h
@@ -177,7 +177,7 @@ typedef int (*__GLXprocPtr) (__GLXclientState *, char *pc);
/*
* Tables for computing the size of each rendering command.
*/
-typedef int (*gl_proto_size_func) (const GLbyte *, Bool);
+typedef int (*gl_proto_size_func) (const GLbyte *, Bool, int);
typedef struct {
int bytes;
@@ -228,6 +228,47 @@ extern void glxSwapQueryServerStringReply(ClientPtr client,
* Routines for computing the size of variably-sized rendering commands.
*/
+static _X_INLINE int
+safe_add(int a, int b)
+{
+ if (a < 0 || b < 0)
+ return -1;
+
+ if (INT_MAX - a < b)
+ return -1;
+
+ return a + b;
+}
+
+static _X_INLINE int
+safe_mul(int a, int b)
+{
+ if (a < 0 || b < 0)
+ return -1;
+
+ if (a == 0 || b == 0)
+ return 0;
+
+ if (a > INT_MAX / b)
+ return -1;
+
+ return a * b;
+}
+
+static _X_INLINE int
+safe_pad(int a)
+{
+ int ret;
+
+ if (a < 0)
+ return -1;
+
+ if ((ret = safe_add(a, 3)) < 0)
+ return -1;
+
+ return ret & (GLuint)~3;
+}
+
extern int __glXTypeSize(GLenum enm);
extern int __glXImageSize(GLenum format, GLenum type,
GLenum target, GLsizei w, GLsizei h, GLsizei d,
diff --git a/xorg-server/glx/indirect_dispatch.h b/xorg-server/glx/indirect_dispatch.h
index 8a636c37c..ca8344c1b 100644
--- a/xorg-server/glx/indirect_dispatch.h
+++ b/xorg-server/glx/indirect_dispatch.h
@@ -70,6 +70,8 @@ extern _X_HIDDEN int __glXDisp_GenQueries(struct __GLXclientStateRec *, GLbyte *
extern _X_HIDDEN int __glXDispSwap_GenQueries(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_TexCoord2iv(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_TexCoord2iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_Color4iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_Color4iv(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_TexParameterf(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_TexParameterf(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_TexParameteri(GLbyte * pc);
@@ -112,8 +114,6 @@ extern _X_HIDDEN int __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec
extern _X_HIDDEN int __glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_ProgramLocalParameter4dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_TexCoord4fv(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_TexCoord4fv(GLbyte * pc);
extern _X_HIDDEN int __glXDisp_WaitX(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDispSwap_WaitX(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDisp_GenTextures(struct __GLXclientStateRec *, GLbyte *);
@@ -248,6 +248,8 @@ extern _X_HIDDEN void __glXDisp_VertexAttrib4ubv(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_VertexAttrib4ubv(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_ColorMask(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_ColorMask(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttribs4svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs4svNV(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_VertexAttrib4Nuiv(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nuiv(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_MultiTexCoord2sv(GLbyte * pc);
@@ -278,6 +280,8 @@ extern _X_HIDDEN int __glXDisp_GetVisualConfigs(struct __GLXclientStateRec *, GL
extern _X_HIDDEN int __glXDispSwap_GetVisualConfigs(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_Color3fv(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_Color3fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_LineStipple(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_LineStipple(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_Scaled(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_Scaled(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_Scalef(GLbyte * pc);
@@ -286,6 +290,8 @@ extern _X_HIDDEN int __glXDisp_ReadPixels(struct __GLXclientStateRec *, GLbyte *
extern _X_HIDDEN int __glXDispSwap_ReadPixels(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_RasterPos3iv(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_RasterPos3iv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetTexParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexParameteriv(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_VertexAttrib2fvARB(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_VertexAttrib2fvARB(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_ColorTable(GLbyte * pc);
@@ -438,8 +444,6 @@ extern _X_HIDDEN void __glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_ProgramLocalParameter4fvARB(GLbyte * pc);
extern _X_HIDDEN int __glXDisp_GetProgramStringNV(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDispSwap_GetProgramStringNV(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttribs4dvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_CallList(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_CallList(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_Materialfv(GLbyte * pc);
@@ -468,8 +472,6 @@ extern _X_HIDDEN void __glXDisp_StencilMask(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_StencilMask(GLbyte * pc);
extern _X_HIDDEN int __glXDisp_IsList(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDispSwap_IsList(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttribs4svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs4svNV(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_InitNames(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_InitNames(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_Normal3sv(GLbyte * pc);
@@ -566,6 +568,8 @@ extern _X_HIDDEN void __glXDisp_RasterPos2dv(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_RasterPos2dv(GLbyte * pc);
extern _X_HIDDEN int __glXDisp_EndList(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDispSwap_EndList(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttribs4dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc);
extern _X_HIDDEN int __glXDisp_CreateNewContext(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDispSwap_CreateNewContext(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_End(GLbyte * pc);
@@ -576,6 +580,8 @@ extern _X_HIDDEN int __glXDisp_CreateContextWithConfigSGIX(struct __GLXclientSta
extern _X_HIDDEN int __glXDispSwap_CreateContextWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_Clear(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_Clear(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_TexCoord4fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_TexCoord4fv(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_ProgramNamedParameter4fvNV(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_ProgramNamedParameter4fvNV(GLbyte * pc);
extern _X_HIDDEN int __glXDisp_IsRenderbuffer(struct __GLXclientStateRec *, GLbyte *);
@@ -776,8 +782,6 @@ extern _X_HIDDEN int __glXDisp_AreProgramsResidentNV(struct __GLXclientStateRec
extern _X_HIDDEN int __glXDispSwap_AreProgramsResidentNV(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDisp_GetLightfv(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDispSwap_GetLightfv(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_LineStipple(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_LineStipple(GLbyte * pc);
extern _X_HIDDEN int __glXDisp_GenRenderbuffers(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDispSwap_GenRenderbuffers(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDisp_GetMinmaxParameterfv(struct __GLXclientStateRec *, GLbyte *);
@@ -886,8 +890,6 @@ extern _X_HIDDEN void __glXDisp_VertexAttrib1dv(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_VertexAttrib1dv(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_Rotated(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_Rotated(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_Color4iv(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_Color4iv(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_FramebufferTextureLayer(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_FramebufferTextureLayer(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_TexEnvfv(GLbyte * pc);
@@ -936,8 +938,6 @@ extern _X_HIDDEN int __glXDisp_CreatePixmap(struct __GLXclientStateRec *, GLbyte
extern _X_HIDDEN int __glXDispSwap_CreatePixmap(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_Lightiv(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_Lightiv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetTexParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexParameteriv(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_VertexAttrib3sv(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_VertexAttrib3sv(GLbyte * pc);
extern _X_HIDDEN int __glXDisp_GetPolygonStipple(struct __GLXclientStateRec *, GLbyte *);
diff --git a/xorg-server/glx/indirect_program.c b/xorg-server/glx/indirect_program.c
index 1ad620926..305a5f0e0 100644
--- a/xorg-server/glx/indirect_program.c
+++ b/xorg-server/glx/indirect_program.c
@@ -57,6 +57,8 @@ DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte * pc,
__GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateWithReplyReq, 8);
+
pc += __GLX_VENDPRIV_HDR_SIZE;
if (cx != NULL) {
GLenum target;
diff --git a/xorg-server/glx/indirect_reqsize.c b/xorg-server/glx/indirect_reqsize.c
index a87f7d230..d1af3c2a8 100644..100755
--- a/xorg-server/glx/indirect_reqsize.c
+++ b/xorg-server/glx/indirect_reqsize.c
@@ -40,25 +40,23 @@
#include "indirect_size.h"
#include "indirect_reqsize.h"
-#define __GLX_PAD(x) (((x) + 3) & ~3)
-
#if defined(__CYGWIN__) || defined(__MINGW32__)
# undef HAVE_ALIAS
#endif
#ifdef HAVE_ALIAS
# define ALIAS2(from,to) \
- GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
+ GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap, int reqlen ) \
__attribute__ ((alias( # to )));
# define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize )
#else
# define ALIAS(from,to) \
- GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
- { return __glX ## to ## ReqSize( pc, swap ); }
+ GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap, int reqlen ) \
+ { return __glX ## to ## ReqSize( pc, swap, reqlen ); }
#endif
int
-__glXCallListsReqSize( const GLbyte * pc, Bool swap )
+__glXCallListsReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei n = *(GLsizei *)(pc + 0);
GLenum type = * (GLenum *)(pc + 4);
@@ -70,11 +68,11 @@ GLenum type = * (GLenum *)(pc + 4);
}
compsize = __glCallLists_size(type);
- return __GLX_PAD((compsize * n));
+ return safe_pad(safe_mul(compsize , n));
}
int
-__glXBitmapReqSize( const GLbyte * pc, Bool swap )
+__glXBitmapReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -98,7 +96,7 @@ GLsizei height = *(GLsizei *)(pc + 24);
}
int
-__glXFogfvReqSize( const GLbyte * pc, Bool swap )
+__glXFogfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 0);
GLsizei compsize;
@@ -108,11 +106,11 @@ GLenum pname = * (GLenum *)(pc + 0);
}
compsize = __glFogfv_size(pname);
- return __GLX_PAD((compsize * 4));
+ return safe_pad(safe_mul(compsize , 4));
}
int
-__glXLightfvReqSize( const GLbyte * pc, Bool swap )
+__glXLightfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 4);
GLsizei compsize;
@@ -122,11 +120,11 @@ GLenum pname = * (GLenum *)(pc + 4);
}
compsize = __glLightfv_size(pname);
- return __GLX_PAD((compsize * 4));
+ return safe_pad(safe_mul(compsize , 4));
}
int
-__glXLightModelfvReqSize( const GLbyte * pc, Bool swap )
+__glXLightModelfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 0);
GLsizei compsize;
@@ -136,11 +134,11 @@ GLenum pname = * (GLenum *)(pc + 0);
}
compsize = __glLightModelfv_size(pname);
- return __GLX_PAD((compsize * 4));
+ return safe_pad(safe_mul(compsize , 4));
}
int
-__glXMaterialfvReqSize( const GLbyte * pc, Bool swap )
+__glXMaterialfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 4);
GLsizei compsize;
@@ -150,11 +148,11 @@ GLenum pname = * (GLenum *)(pc + 4);
}
compsize = __glMaterialfv_size(pname);
- return __GLX_PAD((compsize * 4));
+ return safe_pad(safe_mul(compsize , 4));
}
int
-__glXPolygonStippleReqSize( const GLbyte * pc, Bool swap )
+__glXPolygonStippleReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -174,7 +172,7 @@ __glXPolygonStippleReqSize( const GLbyte * pc, Bool swap )
}
int
-__glXTexParameterfvReqSize( const GLbyte * pc, Bool swap )
+__glXTexParameterfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 4);
GLsizei compsize;
@@ -184,11 +182,11 @@ GLenum pname = * (GLenum *)(pc + 4);
}
compsize = __glTexParameterfv_size(pname);
- return __GLX_PAD((compsize * 4));
+ return safe_pad(safe_mul(compsize , 4));
}
int
-__glXTexImage1DReqSize( const GLbyte * pc, Bool swap )
+__glXTexImage1DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -216,7 +214,7 @@ GLenum type = * (GLenum *)(pc + 48);
}
int
-__glXTexImage2DReqSize( const GLbyte * pc, Bool swap )
+__glXTexImage2DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -246,7 +244,7 @@ GLenum type = * (GLenum *)(pc + 48);
}
int
-__glXTexEnvfvReqSize( const GLbyte * pc, Bool swap )
+__glXTexEnvfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 4);
GLsizei compsize;
@@ -256,11 +254,11 @@ GLenum pname = * (GLenum *)(pc + 4);
}
compsize = __glTexEnvfv_size(pname);
- return __GLX_PAD((compsize * 4));
+ return safe_pad(safe_mul(compsize , 4));
}
int
-__glXTexGendvReqSize( const GLbyte * pc, Bool swap )
+__glXTexGendvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 4);
GLsizei compsize;
@@ -270,11 +268,11 @@ GLenum pname = * (GLenum *)(pc + 4);
}
compsize = __glTexGendv_size(pname);
- return __GLX_PAD((compsize * 8));
+ return safe_pad(safe_mul(compsize , 8));
}
int
-__glXTexGenfvReqSize( const GLbyte * pc, Bool swap )
+__glXTexGenfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 4);
GLsizei compsize;
@@ -284,11 +282,11 @@ GLenum pname = * (GLenum *)(pc + 4);
}
compsize = __glTexGenfv_size(pname);
- return __GLX_PAD((compsize * 4));
+ return safe_pad(safe_mul(compsize , 4));
}
int
-__glXPixelMapfvReqSize( const GLbyte * pc, Bool swap )
+__glXPixelMapfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei mapsize = *(GLsizei *)(pc + 4);
@@ -296,11 +294,11 @@ GLsizei mapsize = *(GLsizei *)(pc + 4);
mapsize = bswap_32(mapsize);
}
- return __GLX_PAD((mapsize * 4));
+ return safe_pad(safe_mul(mapsize , 4));
}
int
-__glXPixelMapusvReqSize( const GLbyte * pc, Bool swap )
+__glXPixelMapusvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei mapsize = *(GLsizei *)(pc + 4);
@@ -308,11 +306,11 @@ GLsizei mapsize = *(GLsizei *)(pc + 4);
mapsize = bswap_32(mapsize);
}
- return __GLX_PAD((mapsize * 2));
+ return safe_pad(safe_mul(mapsize , 2));
}
int
-__glXDrawPixelsReqSize( const GLbyte * pc, Bool swap )
+__glXDrawPixelsReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -340,7 +338,7 @@ GLenum type = * (GLenum *)(pc + 32);
}
int
-__glXPrioritizeTexturesReqSize( const GLbyte * pc, Bool swap )
+__glXPrioritizeTexturesReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei n = *(GLsizei *)(pc + 0);
@@ -348,11 +346,11 @@ GLsizei n = *(GLsizei *)(pc + 0);
n = bswap_32(n);
}
- return __GLX_PAD((n * 4) + (n * 4));
+ return safe_pad(safe_add(safe_mul(n , 4), safe_mul(n , 4)));
}
int
-__glXTexSubImage1DReqSize( const GLbyte * pc, Bool swap )
+__glXTexSubImage1DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -380,7 +378,7 @@ GLenum type = * (GLenum *)(pc + 48);
}
int
-__glXTexSubImage2DReqSize( const GLbyte * pc, Bool swap )
+__glXTexSubImage2DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -410,7 +408,7 @@ GLenum type = * (GLenum *)(pc + 48);
}
int
-__glXColorTableReqSize( const GLbyte * pc, Bool swap )
+__glXColorTableReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -438,7 +436,7 @@ GLenum type = * (GLenum *)(pc + 36);
}
int
-__glXColorTableParameterfvReqSize( const GLbyte * pc, Bool swap )
+__glXColorTableParameterfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 4);
GLsizei compsize;
@@ -448,11 +446,11 @@ GLenum pname = * (GLenum *)(pc + 4);
}
compsize = __glColorTableParameterfv_size(pname);
- return __GLX_PAD((compsize * 4));
+ return safe_pad(safe_mul(compsize , 4));
}
int
-__glXColorSubTableReqSize( const GLbyte * pc, Bool swap )
+__glXColorSubTableReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -480,7 +478,7 @@ GLenum type = * (GLenum *)(pc + 36);
}
int
-__glXConvolutionFilter1DReqSize( const GLbyte * pc, Bool swap )
+__glXConvolutionFilter1DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -508,7 +506,7 @@ GLenum type = * (GLenum *)(pc + 40);
}
int
-__glXConvolutionFilter2DReqSize( const GLbyte * pc, Bool swap )
+__glXConvolutionFilter2DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = 0;
@@ -538,7 +536,7 @@ GLenum type = * (GLenum *)(pc + 40);
}
int
-__glXConvolutionParameterfvReqSize( const GLbyte * pc, Bool swap )
+__glXConvolutionParameterfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 4);
GLsizei compsize;
@@ -548,11 +546,11 @@ GLenum pname = * (GLenum *)(pc + 4);
}
compsize = __glConvolutionParameterfv_size(pname);
- return __GLX_PAD((compsize * 4));
+ return safe_pad(safe_mul(compsize , 4));
}
int
-__glXTexImage3DReqSize( const GLbyte * pc, Bool swap )
+__glXTexImage3DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = * (GLint *)(pc + 8);
@@ -589,7 +587,7 @@ GLenum type = * (GLenum *)(pc + 72);
}
int
-__glXTexSubImage3DReqSize( const GLbyte * pc, Bool swap )
+__glXTexSubImage3DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLint row_length = * (GLint *)(pc + 4);
GLint image_height = * (GLint *)(pc + 8);
@@ -623,7 +621,7 @@ GLenum type = * (GLenum *)(pc + 80);
}
int
-__glXCompressedTexImage1DReqSize( const GLbyte * pc, Bool swap )
+__glXCompressedTexImage1DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei imageSize = *(GLsizei *)(pc + 20);
@@ -631,11 +629,11 @@ GLsizei imageSize = *(GLsizei *)(pc + 20);
imageSize = bswap_32(imageSize);
}
- return __GLX_PAD(imageSize);
+ return safe_pad(imageSize);
}
int
-__glXCompressedTexImage2DReqSize( const GLbyte * pc, Bool swap )
+__glXCompressedTexImage2DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei imageSize = *(GLsizei *)(pc + 24);
@@ -643,11 +641,11 @@ GLsizei imageSize = *(GLsizei *)(pc + 24);
imageSize = bswap_32(imageSize);
}
- return __GLX_PAD(imageSize);
+ return safe_pad(imageSize);
}
int
-__glXCompressedTexImage3DReqSize( const GLbyte * pc, Bool swap )
+__glXCompressedTexImage3DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei imageSize = *(GLsizei *)(pc + 28);
@@ -655,11 +653,11 @@ GLsizei imageSize = *(GLsizei *)(pc + 28);
imageSize = bswap_32(imageSize);
}
- return __GLX_PAD(imageSize);
+ return safe_pad(imageSize);
}
int
-__glXCompressedTexSubImage3DReqSize( const GLbyte * pc, Bool swap )
+__glXCompressedTexSubImage3DReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei imageSize = *(GLsizei *)(pc + 36);
@@ -667,11 +665,11 @@ GLsizei imageSize = *(GLsizei *)(pc + 36);
imageSize = bswap_32(imageSize);
}
- return __GLX_PAD(imageSize);
+ return safe_pad(imageSize);
}
int
-__glXPointParameterfvReqSize( const GLbyte * pc, Bool swap )
+__glXPointParameterfvReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLenum pname = * (GLenum *)(pc + 0);
GLsizei compsize;
@@ -681,11 +679,11 @@ GLenum pname = * (GLenum *)(pc + 0);
}
compsize = __glPointParameterfv_size(pname);
- return __GLX_PAD((compsize * 4));
+ return safe_pad(safe_mul(compsize , 4));
}
int
-__glXDrawBuffersReqSize( const GLbyte * pc, Bool swap )
+__glXDrawBuffersReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei n = *(GLsizei *)(pc + 0);
@@ -693,11 +691,11 @@ GLsizei n = *(GLsizei *)(pc + 0);
n = bswap_32(n);
}
- return __GLX_PAD((n * 4));
+ return safe_pad(safe_mul(n , 4));
}
int
-__glXProgramStringARBReqSize( const GLbyte * pc, Bool swap )
+__glXProgramStringARBReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei len = *(GLsizei *)(pc + 8);
@@ -705,11 +703,11 @@ GLsizei len = *(GLsizei *)(pc + 8);
len = bswap_32(len);
}
- return __GLX_PAD(len);
+ return safe_pad(len);
}
int
-__glXProgramParameters4dvNVReqSize( const GLbyte * pc, Bool swap )
+__glXProgramParameters4dvNVReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei num = *(GLsizei *)(pc + 8);
@@ -717,11 +715,11 @@ GLsizei num = *(GLsizei *)(pc + 8);
num = bswap_32(num);
}
- return __GLX_PAD((num * 32));
+ return safe_pad(safe_mul(num , 32));
}
int
-__glXProgramParameters4fvNVReqSize( const GLbyte * pc, Bool swap )
+__glXProgramParameters4fvNVReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei num = *(GLsizei *)(pc + 8);
@@ -729,11 +727,11 @@ GLsizei num = *(GLsizei *)(pc + 8);
num = bswap_32(num);
}
- return __GLX_PAD((num * 16));
+ return safe_pad(safe_mul(num , 16));
}
int
-__glXVertexAttribs1dvNVReqSize( const GLbyte * pc, Bool swap )
+__glXVertexAttribs1dvNVReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei n = *(GLsizei *)(pc + 4);
@@ -741,11 +739,11 @@ GLsizei n = *(GLsizei *)(pc + 4);
n = bswap_32(n);
}
- return __GLX_PAD((n * 8));
+ return safe_pad(safe_mul(n , 8));
}
int
-__glXVertexAttribs2dvNVReqSize( const GLbyte * pc, Bool swap )
+__glXVertexAttribs2dvNVReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei n = *(GLsizei *)(pc + 4);
@@ -753,11 +751,11 @@ GLsizei n = *(GLsizei *)(pc + 4);
n = bswap_32(n);
}
- return __GLX_PAD((n * 16));
+ return safe_pad(safe_mul(n , 16));
}
int
-__glXVertexAttribs3dvNVReqSize( const GLbyte * pc, Bool swap )
+__glXVertexAttribs3dvNVReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei n = *(GLsizei *)(pc + 4);
@@ -765,11 +763,11 @@ GLsizei n = *(GLsizei *)(pc + 4);
n = bswap_32(n);
}
- return __GLX_PAD((n * 24));
+ return safe_pad(safe_mul(n , 24));
}
int
-__glXVertexAttribs3fvNVReqSize( const GLbyte * pc, Bool swap )
+__glXVertexAttribs3fvNVReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei n = *(GLsizei *)(pc + 4);
@@ -777,11 +775,11 @@ GLsizei n = *(GLsizei *)(pc + 4);
n = bswap_32(n);
}
- return __GLX_PAD((n * 12));
+ return safe_pad(safe_mul(n , 12));
}
int
-__glXVertexAttribs3svNVReqSize( const GLbyte * pc, Bool swap )
+__glXVertexAttribs3svNVReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei n = *(GLsizei *)(pc + 4);
@@ -789,11 +787,11 @@ GLsizei n = *(GLsizei *)(pc + 4);
n = bswap_32(n);
}
- return __GLX_PAD((n * 6));
+ return safe_pad(safe_mul(n , 6));
}
int
-__glXVertexAttribs4dvNVReqSize( const GLbyte * pc, Bool swap )
+__glXVertexAttribs4dvNVReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei n = *(GLsizei *)(pc + 4);
@@ -801,11 +799,11 @@ GLsizei n = *(GLsizei *)(pc + 4);
n = bswap_32(n);
}
- return __GLX_PAD((n * 32));
+ return safe_pad(safe_mul(n , 32));
}
int
-__glXProgramNamedParameter4fvNVReqSize( const GLbyte * pc, Bool swap )
+__glXProgramNamedParameter4fvNVReqSize( const GLbyte * pc, Bool swap, int reqlen )
{
GLsizei len = *(GLsizei *)(pc + 4);
@@ -813,7 +811,7 @@ GLsizei len = *(GLsizei *)(pc + 4);
len = bswap_32(len);
}
- return __GLX_PAD(len);
+ return safe_pad(len);
}
ALIAS( Fogiv, Fogfv )
diff --git a/xorg-server/glx/indirect_reqsize.h b/xorg-server/glx/indirect_reqsize.h
index 1b7bd6ebf..9adba492d 100644..100755
--- a/xorg-server/glx/indirect_reqsize.h
+++ b/xorg-server/glx/indirect_reqsize.h
@@ -36,80 +36,80 @@
# define PURE
# endif
-extern PURE _X_HIDDEN int __glXCallListsReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXBitmapReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXFogfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXFogivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXLightfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXLightivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXLightModelfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXLightModelivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMaterialfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMaterialivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPolygonStippleReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexParameterfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexParameterivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexImage1DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexImage2DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexEnvfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexEnvivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexGendvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexGenfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexGenivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMap1dReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMap1fReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMap2dReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMap2fReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPixelMapfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPixelMapuivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPixelMapusvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXDrawPixelsReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXDrawArraysReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPrioritizeTexturesReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexSubImage1DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexSubImage2DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXColorTableReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXColorTableParameterfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXColorTableParameterivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXColorSubTableReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXConvolutionFilter1DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXConvolutionFilter2DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXConvolutionParameterfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXConvolutionParameterivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXSeparableFilter2DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexImage3DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexSubImage3DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexImage1DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexImage2DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexImage3DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexSubImage1DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexSubImage2DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexSubImage3DReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPointParameterfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPointParameterivReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXDrawBuffersReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXProgramStringARBReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXDeleteFramebuffersReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXDeleteRenderbuffersReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXLoadProgramNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXRequestResidentProgramsNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs1dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs1fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs1svNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs2dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs2fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs2svNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs3dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs3fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs3svNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs4dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs4fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs4svNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs4ubvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXProgramNamedParameter4dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE _X_HIDDEN int __glXProgramNamedParameter4fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXCallListsReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXBitmapReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXFogfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXFogivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXLightfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXLightivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXLightModelfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXLightModelivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXMaterialfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXMaterialivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXPolygonStippleReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexParameterfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexParameterivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexImage1DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexImage2DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexEnvfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexEnvivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexGendvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexGenfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexGenivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXMap1dReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXMap1fReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXMap2dReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXMap2fReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXPixelMapfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXPixelMapuivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXPixelMapusvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXDrawPixelsReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXDrawArraysReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXPrioritizeTexturesReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexSubImage1DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexSubImage2DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXColorTableReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXColorTableParameterfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXColorTableParameterivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXColorSubTableReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXConvolutionFilter1DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXConvolutionFilter2DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXConvolutionParameterfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXConvolutionParameterivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXSeparableFilter2DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexImage3DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXTexSubImage3DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXCompressedTexImage1DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXCompressedTexImage2DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXCompressedTexImage3DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXCompressedTexSubImage1DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXCompressedTexSubImage2DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXCompressedTexSubImage3DReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXPointParameterfvReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXPointParameterivReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXDrawBuffersReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXProgramStringARBReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXDeleteFramebuffersReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXDeleteRenderbuffersReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXLoadProgramNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXRequestResidentProgramsNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs1dvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs1fvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs1svNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs2dvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs2fvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs2svNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs3dvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs3fvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs3svNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs4dvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs4fvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs4svNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXVertexAttribs4ubvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXProgramNamedParameter4dvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
+extern PURE _X_HIDDEN int __glXProgramNamedParameter4fvNVReqSize(const GLbyte *pc, Bool swap, int reqlen);
# undef PURE
diff --git a/xorg-server/glx/indirect_size_get.c b/xorg-server/glx/indirect_size_get.c
index 9036ec732..7b9df3f75 100644
--- a/xorg-server/glx/indirect_size_get.c
+++ b/xorg-server/glx/indirect_size_get.c
@@ -829,6 +829,7 @@ __glGetBooleanv_size( GLenum e )
case GL_MIN_PROGRAM_TEXEL_OFFSET:
case GL_MAX_PROGRAM_TEXEL_OFFSET:
case GL_RGBA_INTEGER_MODE_EXT:
+ case GL_POLYGON_OFFSET_CLAMP_EXT:
return __glGetBooleanv_variable_size( e );
default: return 0;
}
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c
index b4ac1410c..c94723854 100644
--- a/xorg-server/glx/indirect_texture_compression.c
+++ b/xorg-server/glx/indirect_texture_compression.c
@@ -45,6 +45,8 @@ __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc)
__GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
+
pc += __GLX_SINGLE_HDR_SIZE;
if (cx != NULL) {
const GLenum target = *(GLenum *) (pc + 0);
@@ -89,6 +91,8 @@ __glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc)
__glXForceCurrent(cl, bswap_32(req->contextTag), &error);
ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
+
pc += __GLX_SINGLE_HDR_SIZE;
if (cx != NULL) {
const GLenum target = (GLenum) bswap_32(*(int *) (pc + 0));
diff --git a/xorg-server/glx/indirect_util.c b/xorg-server/glx/indirect_util.c
index f301c299d..36daf4f50 100644
--- a/xorg-server/glx/indirect_util.c
+++ b/xorg-server/glx/indirect_util.c
@@ -76,12 +76,17 @@ __glXGetAnswerBuffer(__GLXclientState * cl, size_t required_size,
void *local_buffer, size_t local_size, unsigned alignment)
{
void *buffer = local_buffer;
- const unsigned mask = alignment - 1;
+ const intptr_t mask = alignment - 1;
if (local_size < required_size) {
- const size_t worst_case_size = required_size + alignment;
+ size_t worst_case_size;
intptr_t temp_buf;
+ if (required_size < SIZE_MAX - alignment)
+ worst_case_size = required_size + alignment;
+ else
+ return NULL;
+
if (cl->returnBufSize < worst_case_size) {
void *temp = realloc(cl->returnBuf, worst_case_size);
diff --git a/xorg-server/glx/remap_helper.h b/xorg-server/glx/remap_helper.h
index fdbb66d87..3d005170d 100644
--- a/xorg-server/glx/remap_helper.h
+++ b/xorg-server/glx/remap_helper.h
@@ -95,6008 +95,6281 @@ static const char _mesa_function_pool[] =
"p\0"
"glIndexubv\0"
"\0"
- /* _mesa_function_pool[391]: MultiTexCoordP3uiv (will be remapped) */
+ /* _mesa_function_pool[391]: GetCompressedTextureImage (will be remapped) */
+ "iiip\0"
+ "glGetCompressedTextureImage\0"
+ "\0"
+ /* _mesa_function_pool[425]: MultiTexCoordP3uiv (will be remapped) */
"iip\0"
"glMultiTexCoordP3uiv\0"
"\0"
- /* _mesa_function_pool[417]: Color4fNormal3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[451]: Color4fNormal3fVertex3fSUN (dynamic) */
"ffffffffff\0"
"glColor4fNormal3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[458]: Color3ubv (offset 20) */
+ /* _mesa_function_pool[492]: Color3ubv (offset 20) */
"p\0"
"glColor3ubv\0"
"\0"
- /* _mesa_function_pool[473]: GetCombinerOutputParameterfvNV (dynamic) */
+ /* _mesa_function_pool[507]: GetCombinerOutputParameterfvNV (dynamic) */
"iiip\0"
"glGetCombinerOutputParameterfvNV\0"
"\0"
- /* _mesa_function_pool[512]: Binormal3ivEXT (dynamic) */
+ /* _mesa_function_pool[546]: Binormal3ivEXT (dynamic) */
"p\0"
"glBinormal3ivEXT\0"
"\0"
- /* _mesa_function_pool[532]: GetImageTransformParameterfvHP (dynamic) */
+ /* _mesa_function_pool[566]: GetImageTransformParameterfvHP (dynamic) */
"iip\0"
"glGetImageTransformParameterfvHP\0"
"\0"
- /* _mesa_function_pool[570]: GetClipPlanex (will be remapped) */
+ /* _mesa_function_pool[604]: GetClipPlanex (will be remapped) */
"ip\0"
"glGetClipPlanexOES\0"
"glGetClipPlanex\0"
"\0"
- /* _mesa_function_pool[609]: TexCoordP1uiv (will be remapped) */
+ /* _mesa_function_pool[643]: TexCoordP1uiv (will be remapped) */
"ip\0"
"glTexCoordP1uiv\0"
"\0"
- /* _mesa_function_pool[629]: RenderbufferStorage (will be remapped) */
+ /* _mesa_function_pool[663]: RenderbufferStorage (will be remapped) */
"iiii\0"
"glRenderbufferStorage\0"
"glRenderbufferStorageEXT\0"
"glRenderbufferStorageOES\0"
"\0"
- /* _mesa_function_pool[707]: GetClipPlanef (will be remapped) */
+ /* _mesa_function_pool[741]: GetClipPlanef (will be remapped) */
"ip\0"
"glGetClipPlanefOES\0"
"glGetClipPlanef\0"
"\0"
- /* _mesa_function_pool[746]: GetPerfQueryDataINTEL (will be remapped) */
+ /* _mesa_function_pool[780]: GetPerfQueryDataINTEL (will be remapped) */
"iiipp\0"
"glGetPerfQueryDataINTEL\0"
"\0"
- /* _mesa_function_pool[777]: DrawArraysIndirect (will be remapped) */
+ /* _mesa_function_pool[811]: DrawArraysIndirect (will be remapped) */
"ip\0"
"glDrawArraysIndirect\0"
"\0"
- /* _mesa_function_pool[802]: Uniform3i (will be remapped) */
+ /* _mesa_function_pool[836]: Uniform3i (will be remapped) */
"iiii\0"
"glUniform3i\0"
"glUniform3iARB\0"
"\0"
- /* _mesa_function_pool[835]: VDPAUGetSurfaceivNV (will be remapped) */
+ /* _mesa_function_pool[869]: VDPAUGetSurfaceivNV (will be remapped) */
"iiipp\0"
"glVDPAUGetSurfaceivNV\0"
"\0"
- /* _mesa_function_pool[864]: ReadInstrumentsSGIX (dynamic) */
- "i\0"
- "glReadInstrumentsSGIX\0"
+ /* _mesa_function_pool[898]: Uniform3d (will be remapped) */
+ "iddd\0"
+ "glUniform3d\0"
"\0"
- /* _mesa_function_pool[889]: Uniform3f (will be remapped) */
+ /* _mesa_function_pool[916]: Uniform3f (will be remapped) */
"ifff\0"
"glUniform3f\0"
"glUniform3fARB\0"
"\0"
- /* _mesa_function_pool[922]: UniformMatrix2x4fv (will be remapped) */
+ /* _mesa_function_pool[949]: UniformMatrix2x4fv (will be remapped) */
"iiip\0"
"glUniformMatrix2x4fv\0"
"\0"
- /* _mesa_function_pool[949]: QueryMatrixxOES (will be remapped) */
+ /* _mesa_function_pool[976]: QueryMatrixxOES (will be remapped) */
"pp\0"
"glQueryMatrixxOES\0"
"\0"
- /* _mesa_function_pool[971]: Normal3iv (offset 59) */
+ /* _mesa_function_pool[998]: Normal3iv (offset 59) */
"p\0"
"glNormal3iv\0"
"\0"
- /* _mesa_function_pool[986]: DrawTexiOES (will be remapped) */
+ /* _mesa_function_pool[1013]: DrawTexiOES (will be remapped) */
"iiiii\0"
"glDrawTexiOES\0"
"\0"
- /* _mesa_function_pool[1007]: Viewport (offset 305) */
+ /* _mesa_function_pool[1034]: Viewport (offset 305) */
"iiii\0"
"glViewport\0"
"\0"
- /* _mesa_function_pool[1024]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[1051]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
"pppp\0"
"glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[1080]: WindowPos4svMESA (will be remapped) */
+ /* _mesa_function_pool[1107]: WindowPos4svMESA (will be remapped) */
"p\0"
"glWindowPos4svMESA\0"
"\0"
- /* _mesa_function_pool[1102]: FragmentLightModelivSGIX (dynamic) */
+ /* _mesa_function_pool[1129]: FragmentLightModelivSGIX (dynamic) */
"ip\0"
"glFragmentLightModelivSGIX\0"
"\0"
- /* _mesa_function_pool[1133]: DeleteVertexArrays (will be remapped) */
+ /* _mesa_function_pool[1160]: DeleteVertexArrays (will be remapped) */
"ip\0"
"glDeleteVertexArrays\0"
"glDeleteVertexArraysAPPLE\0"
"glDeleteVertexArraysOES\0"
"\0"
- /* _mesa_function_pool[1208]: ClearColorIuiEXT (will be remapped) */
+ /* _mesa_function_pool[1235]: ClearColorIuiEXT (will be remapped) */
"iiii\0"
"glClearColorIuiEXT\0"
"\0"
- /* _mesa_function_pool[1233]: GetnConvolutionFilterARB (will be remapped) */
+ /* _mesa_function_pool[1260]: GetnConvolutionFilterARB (will be remapped) */
"iiiip\0"
"glGetnConvolutionFilterARB\0"
"\0"
- /* _mesa_function_pool[1267]: GetLightxv (will be remapped) */
+ /* _mesa_function_pool[1294]: GetLightxv (will be remapped) */
"iip\0"
"glGetLightxvOES\0"
"glGetLightxv\0"
"\0"
- /* _mesa_function_pool[1301]: GetConvolutionParameteriv (offset 358) */
+ /* _mesa_function_pool[1328]: GetConvolutionParameteriv (offset 358) */
"iip\0"
"glGetConvolutionParameteriv\0"
"glGetConvolutionParameterivEXT\0"
"\0"
- /* _mesa_function_pool[1365]: VertexAttrib4usv (will be remapped) */
+ /* _mesa_function_pool[1392]: VertexAttrib4usv (will be remapped) */
"ip\0"
"glVertexAttrib4usv\0"
"glVertexAttrib4usvARB\0"
"\0"
- /* _mesa_function_pool[1410]: TextureStorage1DEXT (will be remapped) */
+ /* _mesa_function_pool[1437]: TextureStorage1DEXT (will be remapped) */
"iiiii\0"
"glTextureStorage1DEXT\0"
"\0"
- /* _mesa_function_pool[1439]: VertexAttrib4Nub (will be remapped) */
+ /* _mesa_function_pool[1466]: VertexAttrib4Nub (will be remapped) */
"iiiii\0"
"glVertexAttrib4Nub\0"
"glVertexAttrib4NubARB\0"
"\0"
- /* _mesa_function_pool[1487]: VertexAttribP3ui (will be remapped) */
+ /* _mesa_function_pool[1514]: VertexAttribP3ui (will be remapped) */
"iiii\0"
"glVertexAttribP3ui\0"
"\0"
- /* _mesa_function_pool[1512]: Color4ubVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[1539]: Color4ubVertex3fSUN (dynamic) */
"iiiifff\0"
"glColor4ubVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[1543]: PointSize (offset 173) */
+ /* _mesa_function_pool[1570]: PointSize (offset 173) */
"f\0"
"glPointSize\0"
"\0"
- /* _mesa_function_pool[1558]: TexCoord2fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[1585]: TexCoord2fVertex3fSUN (dynamic) */
"fffff\0"
"glTexCoord2fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[1589]: PopName (offset 200) */
+ /* _mesa_function_pool[1616]: PopName (offset 200) */
"\0"
"glPopName\0"
"\0"
- /* _mesa_function_pool[1601]: VertexAttrib4ubNV (will be remapped) */
+ /* _mesa_function_pool[1628]: VertexAttrib4ubNV (will be remapped) */
"iiiii\0"
"glVertexAttrib4ubNV\0"
"\0"
- /* _mesa_function_pool[1628]: ValidateProgramPipeline (will be remapped) */
+ /* _mesa_function_pool[1655]: ValidateProgramPipeline (will be remapped) */
"i\0"
"glValidateProgramPipeline\0"
"glValidateProgramPipelineEXT\0"
"\0"
- /* _mesa_function_pool[1686]: BindFragDataLocationIndexed (will be remapped) */
+ /* _mesa_function_pool[1713]: BindFragDataLocationIndexed (will be remapped) */
"iiip\0"
"glBindFragDataLocationIndexed\0"
"\0"
- /* _mesa_function_pool[1722]: GetClipPlane (offset 259) */
+ /* _mesa_function_pool[1749]: GetClipPlane (offset 259) */
"ip\0"
"glGetClipPlane\0"
"\0"
- /* _mesa_function_pool[1741]: CombinerParameterfvNV (dynamic) */
+ /* _mesa_function_pool[1768]: CombinerParameterfvNV (dynamic) */
"ip\0"
"glCombinerParameterfvNV\0"
"\0"
- /* _mesa_function_pool[1769]: TexCoordP4uiv (will be remapped) */
+ /* _mesa_function_pool[1796]: TexCoordP4uiv (will be remapped) */
"ip\0"
"glTexCoordP4uiv\0"
"\0"
- /* _mesa_function_pool[1789]: VertexAttribs3dvNV (will be remapped) */
+ /* _mesa_function_pool[1816]: VertexAttribs3dvNV (will be remapped) */
"iip\0"
"glVertexAttribs3dvNV\0"
"\0"
- /* _mesa_function_pool[1815]: GenQueries (will be remapped) */
+ /* _mesa_function_pool[1842]: ProgramUniformMatrix2x4dv (will be remapped) */
+ "iiiip\0"
+ "glProgramUniformMatrix2x4dv\0"
+ "\0"
+ /* _mesa_function_pool[1877]: GenQueries (will be remapped) */
"ip\0"
"glGenQueries\0"
"glGenQueriesARB\0"
"\0"
- /* _mesa_function_pool[1848]: ProgramUniform4iv (will be remapped) */
+ /* _mesa_function_pool[1910]: ProgramUniform4iv (will be remapped) */
"iiip\0"
"glProgramUniform4iv\0"
"glProgramUniform4ivEXT\0"
"\0"
- /* _mesa_function_pool[1897]: ObjectUnpurgeableAPPLE (will be remapped) */
+ /* _mesa_function_pool[1959]: ObjectUnpurgeableAPPLE (will be remapped) */
"iii\0"
"glObjectUnpurgeableAPPLE\0"
"\0"
- /* _mesa_function_pool[1927]: TexCoord2iv (offset 107) */
+ /* _mesa_function_pool[1989]: TexCoord2iv (offset 107) */
"p\0"
"glTexCoord2iv\0"
"\0"
- /* _mesa_function_pool[1944]: TexImage2DMultisample (will be remapped) */
+ /* _mesa_function_pool[2006]: TexImage2DMultisample (will be remapped) */
"iiiiii\0"
"glTexImage2DMultisample\0"
"\0"
- /* _mesa_function_pool[1976]: TexParameterx (will be remapped) */
+ /* _mesa_function_pool[2038]: TexParameterx (will be remapped) */
"iii\0"
"glTexParameterxOES\0"
"glTexParameterx\0"
"\0"
- /* _mesa_function_pool[2016]: Rotatef (offset 300) */
- "ffff\0"
- "glRotatef\0"
+ /* _mesa_function_pool[2078]: Color4iv (offset 32) */
+ "p\0"
+ "glColor4iv\0"
"\0"
- /* _mesa_function_pool[2032]: TexParameterf (offset 178) */
+ /* _mesa_function_pool[2092]: TexParameterf (offset 178) */
"iif\0"
"glTexParameterf\0"
"\0"
- /* _mesa_function_pool[2053]: TexParameteri (offset 180) */
+ /* _mesa_function_pool[2113]: TexParameteri (offset 180) */
"iii\0"
"glTexParameteri\0"
"\0"
- /* _mesa_function_pool[2074]: GetUniformiv (will be remapped) */
+ /* _mesa_function_pool[2134]: GetUniformiv (will be remapped) */
"iip\0"
"glGetUniformiv\0"
"glGetUniformivARB\0"
"\0"
- /* _mesa_function_pool[2112]: ClearBufferSubData (will be remapped) */
+ /* _mesa_function_pool[2172]: ClearBufferSubData (will be remapped) */
"iiiiiip\0"
"glClearBufferSubData\0"
"\0"
- /* _mesa_function_pool[2142]: VDPAUFiniNV (will be remapped) */
+ /* _mesa_function_pool[2202]: TextureParameterfv (will be remapped) */
+ "iip\0"
+ "glTextureParameterfv\0"
+ "\0"
+ /* _mesa_function_pool[2228]: VDPAUFiniNV (will be remapped) */
"\0"
"glVDPAUFiniNV\0"
"\0"
- /* _mesa_function_pool[2158]: GlobalAlphaFactordSUN (dynamic) */
+ /* _mesa_function_pool[2244]: GlobalAlphaFactordSUN (dynamic) */
"d\0"
"glGlobalAlphaFactordSUN\0"
"\0"
- /* _mesa_function_pool[2185]: ProgramUniformMatrix4x2fv (will be remapped) */
+ /* _mesa_function_pool[2271]: ProgramUniformMatrix4x2fv (will be remapped) */
"iiiip\0"
"glProgramUniformMatrix4x2fv\0"
"glProgramUniformMatrix4x2fvEXT\0"
"\0"
- /* _mesa_function_pool[2251]: ProgramUniform2f (will be remapped) */
+ /* _mesa_function_pool[2337]: ProgramUniform2f (will be remapped) */
"iiff\0"
"glProgramUniform2f\0"
"glProgramUniform2fEXT\0"
"\0"
- /* _mesa_function_pool[2298]: PixelTransformParameterfvEXT (dynamic) */
- "iip\0"
- "glPixelTransformParameterfvEXT\0"
+ /* _mesa_function_pool[2384]: ProgramUniform2d (will be remapped) */
+ "iidd\0"
+ "glProgramUniform2d\0"
"\0"
- /* _mesa_function_pool[2334]: ProgramUniform2i (will be remapped) */
+ /* _mesa_function_pool[2409]: ProgramUniform2i (will be remapped) */
"iiii\0"
"glProgramUniform2i\0"
"glProgramUniform2iEXT\0"
"\0"
- /* _mesa_function_pool[2381]: Fogx (will be remapped) */
+ /* _mesa_function_pool[2456]: Fogx (will be remapped) */
"ii\0"
"glFogxOES\0"
"glFogx\0"
"\0"
- /* _mesa_function_pool[2402]: Fogf (offset 153) */
+ /* _mesa_function_pool[2477]: Fogf (offset 153) */
"if\0"
"glFogf\0"
"\0"
- /* _mesa_function_pool[2413]: TexSubImage1D (offset 332) */
+ /* _mesa_function_pool[2488]: TexSubImage1D (offset 332) */
"iiiiiip\0"
"glTexSubImage1D\0"
"glTexSubImage1DEXT\0"
"\0"
- /* _mesa_function_pool[2457]: Color4usv (offset 40) */
+ /* _mesa_function_pool[2532]: Color4usv (offset 40) */
"p\0"
"glColor4usv\0"
"\0"
- /* _mesa_function_pool[2472]: Fogi (offset 155) */
+ /* _mesa_function_pool[2547]: Fogi (offset 155) */
"ii\0"
"glFogi\0"
"\0"
- /* _mesa_function_pool[2483]: FinalCombinerInputNV (dynamic) */
+ /* _mesa_function_pool[2558]: FinalCombinerInputNV (dynamic) */
"iiii\0"
"glFinalCombinerInputNV\0"
"\0"
- /* _mesa_function_pool[2512]: DepthFunc (offset 245) */
+ /* _mesa_function_pool[2587]: DepthFunc (offset 245) */
"i\0"
"glDepthFunc\0"
"\0"
- /* _mesa_function_pool[2527]: GetSamplerParameterIiv (will be remapped) */
+ /* _mesa_function_pool[2602]: GetSamplerParameterIiv (will be remapped) */
"iip\0"
"glGetSamplerParameterIiv\0"
"\0"
- /* _mesa_function_pool[2557]: VertexAttribI4uiEXT (will be remapped) */
+ /* _mesa_function_pool[2632]: VertexAttribI4uiEXT (will be remapped) */
"iiiii\0"
"glVertexAttribI4uiEXT\0"
"glVertexAttribI4ui\0"
"\0"
- /* _mesa_function_pool[2605]: DrawElementsInstancedBaseVertexBaseInstance (will be remapped) */
+ /* _mesa_function_pool[2680]: DrawElementsInstancedBaseVertexBaseInstance (will be remapped) */
"iiipiii\0"
"glDrawElementsInstancedBaseVertexBaseInstance\0"
"\0"
- /* _mesa_function_pool[2660]: ProgramEnvParameter4dvARB (will be remapped) */
+ /* _mesa_function_pool[2735]: ProgramEnvParameter4dvARB (will be remapped) */
"iip\0"
"glProgramEnvParameter4dvARB\0"
"glProgramParameter4dvNV\0"
"\0"
- /* _mesa_function_pool[2717]: ColorTableParameteriv (offset 341) */
+ /* _mesa_function_pool[2792]: ColorTableParameteriv (offset 341) */
"iip\0"
"glColorTableParameteriv\0"
"glColorTableParameterivSGI\0"
"\0"
- /* _mesa_function_pool[2773]: BindSamplers (will be remapped) */
+ /* _mesa_function_pool[2848]: BindSamplers (will be remapped) */
"iip\0"
"glBindSamplers\0"
"\0"
- /* _mesa_function_pool[2793]: GetnCompressedTexImageARB (will be remapped) */
+ /* _mesa_function_pool[2868]: GetnCompressedTexImageARB (will be remapped) */
"iiip\0"
"glGetnCompressedTexImageARB\0"
"\0"
- /* _mesa_function_pool[2827]: BindSampler (will be remapped) */
+ /* _mesa_function_pool[2902]: BindSampler (will be remapped) */
"ii\0"
"glBindSampler\0"
"\0"
- /* _mesa_function_pool[2845]: MultiTexCoord2fARB (offset 386) */
+ /* _mesa_function_pool[2920]: MultiTexCoord2fARB (offset 386) */
"iff\0"
"glMultiTexCoord2f\0"
"glMultiTexCoord2fARB\0"
"\0"
- /* _mesa_function_pool[2889]: IndexPointer (offset 314) */
+ /* _mesa_function_pool[2964]: IndexPointer (offset 314) */
"iip\0"
"glIndexPointer\0"
"\0"
- /* _mesa_function_pool[2909]: MultiTexCoord3iv (offset 397) */
+ /* _mesa_function_pool[2984]: MultiTexCoord3iv (offset 397) */
"ip\0"
"glMultiTexCoord3iv\0"
"glMultiTexCoord3ivARB\0"
"\0"
- /* _mesa_function_pool[2954]: Finish (offset 216) */
+ /* _mesa_function_pool[3029]: Finish (offset 216) */
"\0"
"glFinish\0"
"\0"
- /* _mesa_function_pool[2965]: ClearStencil (offset 207) */
+ /* _mesa_function_pool[3040]: ClearStencil (offset 207) */
"i\0"
"glClearStencil\0"
"\0"
- /* _mesa_function_pool[2983]: ClearColorIiEXT (will be remapped) */
+ /* _mesa_function_pool[3058]: ClearColorIiEXT (will be remapped) */
"iiii\0"
"glClearColorIiEXT\0"
"\0"
- /* _mesa_function_pool[3007]: LoadMatrixd (offset 292) */
+ /* _mesa_function_pool[3082]: LoadMatrixd (offset 292) */
"p\0"
"glLoadMatrixd\0"
"\0"
- /* _mesa_function_pool[3024]: VDPAURegisterOutputSurfaceNV (will be remapped) */
+ /* _mesa_function_pool[3099]: VDPAURegisterOutputSurfaceNV (will be remapped) */
"piip\0"
"glVDPAURegisterOutputSurfaceNV\0"
"\0"
- /* _mesa_function_pool[3061]: VertexP4ui (will be remapped) */
+ /* _mesa_function_pool[3136]: VertexP4ui (will be remapped) */
"ii\0"
"glVertexP4ui\0"
"\0"
- /* _mesa_function_pool[3078]: SpriteParameterfvSGIX (dynamic) */
+ /* _mesa_function_pool[3153]: SpriteParameterfvSGIX (dynamic) */
"ip\0"
"glSpriteParameterfvSGIX\0"
"\0"
- /* _mesa_function_pool[3106]: GetActiveUniformName (will be remapped) */
- "iiipp\0"
- "glGetActiveUniformName\0"
+ /* _mesa_function_pool[3181]: TextureStorage3DMultisample (will be remapped) */
+ "iiiiiii\0"
+ "glTextureStorage3DMultisample\0"
"\0"
- /* _mesa_function_pool[3136]: GetnUniformivARB (will be remapped) */
+ /* _mesa_function_pool[3220]: GetnUniformivARB (will be remapped) */
"iiip\0"
"glGetnUniformivARB\0"
"\0"
- /* _mesa_function_pool[3161]: ReleaseShaderCompiler (will be remapped) */
+ /* _mesa_function_pool[3245]: ReleaseShaderCompiler (will be remapped) */
"\0"
"glReleaseShaderCompiler\0"
"\0"
- /* _mesa_function_pool[3187]: BlendFuncSeparate (will be remapped) */
+ /* _mesa_function_pool[3271]: BlendFuncSeparate (will be remapped) */
"iiii\0"
"glBlendFuncSeparate\0"
"glBlendFuncSeparateEXT\0"
"glBlendFuncSeparateINGR\0"
"glBlendFuncSeparateOES\0"
"\0"
- /* _mesa_function_pool[3283]: Color3us (offset 23) */
+ /* _mesa_function_pool[3367]: Color3us (offset 23) */
"iii\0"
"glColor3us\0"
"\0"
- /* _mesa_function_pool[3299]: MultiDrawArraysIndirect (will be remapped) */
- "ipii\0"
- "glMultiDrawArraysIndirect\0"
+ /* _mesa_function_pool[3383]: LoadMatrixx (will be remapped) */
+ "p\0"
+ "glLoadMatrixxOES\0"
+ "glLoadMatrixx\0"
"\0"
- /* _mesa_function_pool[3331]: BufferStorage (will be remapped) */
+ /* _mesa_function_pool[3417]: BufferStorage (will be remapped) */
"iipi\0"
"glBufferStorage\0"
"\0"
- /* _mesa_function_pool[3353]: Color3ub (offset 19) */
+ /* _mesa_function_pool[3439]: Color3ub (offset 19) */
"iii\0"
"glColor3ub\0"
"\0"
- /* _mesa_function_pool[3369]: GetInstrumentsSGIX (dynamic) */
+ /* _mesa_function_pool[3455]: GetInstrumentsSGIX (dynamic) */
"\0"
"glGetInstrumentsSGIX\0"
"\0"
- /* _mesa_function_pool[3392]: Color3ui (offset 21) */
+ /* _mesa_function_pool[3478]: Color3ui (offset 21) */
"iii\0"
"glColor3ui\0"
"\0"
- /* _mesa_function_pool[3408]: VertexAttrib4dvNV (will be remapped) */
+ /* _mesa_function_pool[3494]: VertexAttrib4dvNV (will be remapped) */
"ip\0"
"glVertexAttrib4dvNV\0"
"\0"
- /* _mesa_function_pool[3432]: AlphaFragmentOp2ATI (will be remapped) */
+ /* _mesa_function_pool[3518]: AlphaFragmentOp2ATI (will be remapped) */
"iiiiiiiii\0"
"glAlphaFragmentOp2ATI\0"
"\0"
- /* _mesa_function_pool[3465]: RasterPos4dv (offset 79) */
+ /* _mesa_function_pool[3551]: RasterPos4dv (offset 79) */
"p\0"
"glRasterPos4dv\0"
"\0"
- /* _mesa_function_pool[3483]: DeleteProgramPipelines (will be remapped) */
+ /* _mesa_function_pool[3569]: DeleteProgramPipelines (will be remapped) */
"ip\0"
"glDeleteProgramPipelines\0"
"glDeleteProgramPipelinesEXT\0"
"\0"
- /* _mesa_function_pool[3540]: LineWidthx (will be remapped) */
+ /* _mesa_function_pool[3626]: LineWidthx (will be remapped) */
"i\0"
"glLineWidthxOES\0"
"glLineWidthx\0"
"\0"
- /* _mesa_function_pool[3572]: Indexdv (offset 45) */
+ /* _mesa_function_pool[3658]: Indexdv (offset 45) */
"p\0"
"glIndexdv\0"
"\0"
- /* _mesa_function_pool[3585]: GetnPixelMapfvARB (will be remapped) */
+ /* _mesa_function_pool[3671]: GetnPixelMapfvARB (will be remapped) */
"iip\0"
"glGetnPixelMapfvARB\0"
"\0"
- /* _mesa_function_pool[3610]: EGLImageTargetTexture2DOES (will be remapped) */
+ /* _mesa_function_pool[3696]: EGLImageTargetTexture2DOES (will be remapped) */
"ip\0"
"glEGLImageTargetTexture2DOES\0"
"\0"
- /* _mesa_function_pool[3643]: DepthMask (offset 211) */
+ /* _mesa_function_pool[3729]: DepthMask (offset 211) */
"i\0"
"glDepthMask\0"
"\0"
- /* _mesa_function_pool[3658]: WindowPos4ivMESA (will be remapped) */
+ /* _mesa_function_pool[3744]: WindowPos4ivMESA (will be remapped) */
"p\0"
"glWindowPos4ivMESA\0"
"\0"
- /* _mesa_function_pool[3680]: GetShaderInfoLog (will be remapped) */
+ /* _mesa_function_pool[3766]: GetShaderInfoLog (will be remapped) */
"iipp\0"
"glGetShaderInfoLog\0"
"\0"
- /* _mesa_function_pool[3705]: BindFragmentShaderATI (will be remapped) */
+ /* _mesa_function_pool[3791]: BindFragmentShaderATI (will be remapped) */
"i\0"
"glBindFragmentShaderATI\0"
"\0"
- /* _mesa_function_pool[3732]: BlendFuncSeparateiARB (will be remapped) */
+ /* _mesa_function_pool[3818]: BlendFuncSeparateiARB (will be remapped) */
"iiiii\0"
"glBlendFuncSeparateiARB\0"
"glBlendFuncSeparateIndexedAMD\0"
"glBlendFuncSeparatei\0"
"\0"
- /* _mesa_function_pool[3814]: PixelTexGenParameteriSGIS (dynamic) */
+ /* _mesa_function_pool[3900]: PixelTexGenParameteriSGIS (dynamic) */
"ii\0"
"glPixelTexGenParameteriSGIS\0"
"\0"
- /* _mesa_function_pool[3846]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+ /* _mesa_function_pool[3932]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
"ip\0"
"glEGLImageTargetRenderbufferStorageOES\0"
"\0"
- /* _mesa_function_pool[3889]: GenTransformFeedbacks (will be remapped) */
+ /* _mesa_function_pool[3975]: GenTransformFeedbacks (will be remapped) */
"ip\0"
"glGenTransformFeedbacks\0"
"\0"
- /* _mesa_function_pool[3917]: VertexPointer (offset 321) */
+ /* _mesa_function_pool[4003]: VertexPointer (offset 321) */
"iiip\0"
"glVertexPointer\0"
"\0"
- /* _mesa_function_pool[3939]: GetCompressedTexImage (will be remapped) */
+ /* _mesa_function_pool[4025]: GetCompressedTexImage (will be remapped) */
"iip\0"
"glGetCompressedTexImage\0"
"glGetCompressedTexImageARB\0"
"\0"
- /* _mesa_function_pool[3995]: ProgramLocalParameter4dvARB (will be remapped) */
+ /* _mesa_function_pool[4081]: ProgramLocalParameter4dvARB (will be remapped) */
"iip\0"
"glProgramLocalParameter4dvARB\0"
"\0"
- /* _mesa_function_pool[4030]: TexCoord4fv (offset 121) */
- "p\0"
- "glTexCoord4fv\0"
+ /* _mesa_function_pool[4116]: UniformMatrix2dv (will be remapped) */
+ "iiip\0"
+ "glUniformMatrix2dv\0"
"\0"
- /* _mesa_function_pool[4047]: GetQueryObjectui64v (will be remapped) */
+ /* _mesa_function_pool[4141]: GetQueryObjectui64v (will be remapped) */
"iip\0"
"glGetQueryObjectui64v\0"
"glGetQueryObjectui64vEXT\0"
"\0"
- /* _mesa_function_pool[4099]: VertexAttribP1uiv (will be remapped) */
+ /* _mesa_function_pool[4193]: VertexAttribP1uiv (will be remapped) */
"iiip\0"
"glVertexAttribP1uiv\0"
"\0"
- /* _mesa_function_pool[4125]: IsProgram (will be remapped) */
+ /* _mesa_function_pool[4219]: IsProgram (will be remapped) */
"i\0"
"glIsProgram\0"
"\0"
- /* _mesa_function_pool[4140]: TexCoordPointerListIBM (dynamic) */
+ /* _mesa_function_pool[4234]: TexCoordPointerListIBM (dynamic) */
"iiipi\0"
"glTexCoordPointerListIBM\0"
"\0"
- /* _mesa_function_pool[4172]: ResizeBuffersMESA (will be remapped) */
+ /* _mesa_function_pool[4266]: ResizeBuffersMESA (will be remapped) */
"\0"
"glResizeBuffersMESA\0"
"\0"
- /* _mesa_function_pool[4194]: BindBuffersBase (will be remapped) */
+ /* _mesa_function_pool[4288]: BindBuffersBase (will be remapped) */
"iiip\0"
"glBindBuffersBase\0"
"\0"
- /* _mesa_function_pool[4218]: GenTextures (offset 328) */
+ /* _mesa_function_pool[4312]: GenTextures (offset 328) */
"ip\0"
"glGenTextures\0"
"glGenTexturesEXT\0"
"\0"
- /* _mesa_function_pool[4253]: IndexPointerListIBM (dynamic) */
+ /* _mesa_function_pool[4347]: IndexPointerListIBM (dynamic) */
"iipi\0"
"glIndexPointerListIBM\0"
"\0"
- /* _mesa_function_pool[4281]: WindowPos4fMESA (will be remapped) */
+ /* _mesa_function_pool[4375]: UniformMatrix3x2dv (will be remapped) */
+ "iiip\0"
+ "glUniformMatrix3x2dv\0"
+ "\0"
+ /* _mesa_function_pool[4402]: WindowPos4fMESA (will be remapped) */
"ffff\0"
"glWindowPos4fMESA\0"
"\0"
- /* _mesa_function_pool[4305]: VertexAttribs2fvNV (will be remapped) */
+ /* _mesa_function_pool[4426]: VertexAttribs2fvNV (will be remapped) */
"iip\0"
"glVertexAttribs2fvNV\0"
"\0"
- /* _mesa_function_pool[4331]: VertexAttribP4ui (will be remapped) */
+ /* _mesa_function_pool[4452]: VertexAttribP4ui (will be remapped) */
"iiii\0"
"glVertexAttribP4ui\0"
"\0"
- /* _mesa_function_pool[4356]: Uniform4i (will be remapped) */
+ /* _mesa_function_pool[4477]: Uniform4i (will be remapped) */
"iiiii\0"
"glUniform4i\0"
"glUniform4iARB\0"
"\0"
- /* _mesa_function_pool[4390]: BufferParameteriAPPLE (will be remapped) */
- "iii\0"
- "glBufferParameteriAPPLE\0"
+ /* _mesa_function_pool[4511]: Uniform4d (will be remapped) */
+ "idddd\0"
+ "glUniform4d\0"
"\0"
- /* _mesa_function_pool[4419]: Uniform4f (will be remapped) */
+ /* _mesa_function_pool[4530]: Uniform4f (will be remapped) */
"iffff\0"
"glUniform4f\0"
"glUniform4fARB\0"
"\0"
- /* _mesa_function_pool[4453]: ProgramUniform3f (will be remapped) */
+ /* _mesa_function_pool[4564]: ProgramUniform3d (will be remapped) */
+ "iiddd\0"
+ "glProgramUniform3d\0"
+ "\0"
+ /* _mesa_function_pool[4590]: ProgramUniform3f (will be remapped) */
"iifff\0"
"glProgramUniform3f\0"
"glProgramUniform3fEXT\0"
"\0"
- /* _mesa_function_pool[4501]: ProgramUniform3i (will be remapped) */
+ /* _mesa_function_pool[4638]: ProgramUniform3i (will be remapped) */
"iiiii\0"
"glProgramUniform3i\0"
"glProgramUniform3iEXT\0"
"\0"
- /* _mesa_function_pool[4549]: PointParameterfv (will be remapped) */
+ /* _mesa_function_pool[4686]: PointParameterfv (will be remapped) */
"ip\0"
"glPointParameterfv\0"
"glPointParameterfvARB\0"
"glPointParameterfvEXT\0"
"glPointParameterfvSGIS\0"
"\0"
- /* _mesa_function_pool[4639]: GetHistogramParameterfv (offset 362) */
+ /* _mesa_function_pool[4776]: GetHistogramParameterfv (offset 362) */
"iip\0"
"glGetHistogramParameterfv\0"
"glGetHistogramParameterfvEXT\0"
"\0"
- /* _mesa_function_pool[4699]: GetString (offset 275) */
+ /* _mesa_function_pool[4836]: GetString (offset 275) */
"i\0"
"glGetString\0"
"\0"
- /* _mesa_function_pool[4714]: ColorPointervINTEL (dynamic) */
+ /* _mesa_function_pool[4851]: ColorPointervINTEL (dynamic) */
"iip\0"
"glColorPointervINTEL\0"
"\0"
- /* _mesa_function_pool[4740]: VDPAUUnmapSurfacesNV (will be remapped) */
+ /* _mesa_function_pool[4877]: VDPAUUnmapSurfacesNV (will be remapped) */
"ip\0"
"glVDPAUUnmapSurfacesNV\0"
"\0"
- /* _mesa_function_pool[4767]: GetnHistogramARB (will be remapped) */
+ /* _mesa_function_pool[4904]: GetnHistogramARB (will be remapped) */
"iiiiip\0"
"glGetnHistogramARB\0"
"\0"
- /* _mesa_function_pool[4794]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[4931]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
"pppp\0"
"glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[4847]: SecondaryColor3s (will be remapped) */
+ /* _mesa_function_pool[4984]: SecondaryColor3s (will be remapped) */
"iii\0"
"glSecondaryColor3s\0"
"glSecondaryColor3sEXT\0"
"\0"
- /* _mesa_function_pool[4893]: VertexAttribP2uiv (will be remapped) */
+ /* _mesa_function_pool[5030]: VertexAttribP2uiv (will be remapped) */
"iiip\0"
"glVertexAttribP2uiv\0"
"\0"
- /* _mesa_function_pool[4919]: GetDetailTexFuncSGIS (dynamic) */
- "ip\0"
- "glGetDetailTexFuncSGIS\0"
+ /* _mesa_function_pool[5056]: UniformMatrix3x4dv (will be remapped) */
+ "iiip\0"
+ "glUniformMatrix3x4dv\0"
"\0"
- /* _mesa_function_pool[4946]: VertexAttrib3fNV (will be remapped) */
+ /* _mesa_function_pool[5083]: VertexAttrib3fNV (will be remapped) */
"ifff\0"
"glVertexAttrib3fNV\0"
"\0"
- /* _mesa_function_pool[4971]: SecondaryColor3b (will be remapped) */
+ /* _mesa_function_pool[5108]: SecondaryColor3b (will be remapped) */
"iii\0"
"glSecondaryColor3b\0"
"glSecondaryColor3bEXT\0"
"\0"
- /* _mesa_function_pool[5017]: EnableClientState (offset 313) */
+ /* _mesa_function_pool[5154]: EnableClientState (offset 313) */
"i\0"
"glEnableClientState\0"
"\0"
- /* _mesa_function_pool[5040]: Color4ubVertex2fvSUN (dynamic) */
+ /* _mesa_function_pool[5177]: Color4ubVertex2fvSUN (dynamic) */
"pp\0"
"glColor4ubVertex2fvSUN\0"
"\0"
- /* _mesa_function_pool[5067]: SecondaryColor3i (will be remapped) */
+ /* _mesa_function_pool[5204]: SecondaryColor3i (will be remapped) */
"iii\0"
"glSecondaryColor3i\0"
"glSecondaryColor3iEXT\0"
"\0"
- /* _mesa_function_pool[5113]: TexFilterFuncSGIS (dynamic) */
+ /* _mesa_function_pool[5250]: TexFilterFuncSGIS (dynamic) */
"iiip\0"
"glTexFilterFuncSGIS\0"
"\0"
- /* _mesa_function_pool[5139]: GetFragmentMaterialfvSGIX (dynamic) */
+ /* _mesa_function_pool[5276]: GetFragmentMaterialfvSGIX (dynamic) */
"iip\0"
"glGetFragmentMaterialfvSGIX\0"
"\0"
- /* _mesa_function_pool[5172]: DetailTexFuncSGIS (dynamic) */
+ /* _mesa_function_pool[5309]: DetailTexFuncSGIS (dynamic) */
"iip\0"
"glDetailTexFuncSGIS\0"
"\0"
- /* _mesa_function_pool[5197]: FlushMappedBufferRange (will be remapped) */
+ /* _mesa_function_pool[5334]: FlushMappedBufferRange (will be remapped) */
"iii\0"
"glFlushMappedBufferRange\0"
"glFlushMappedBufferRangeEXT\0"
"\0"
- /* _mesa_function_pool[5255]: Lightfv (offset 160) */
+ /* _mesa_function_pool[5392]: Lightfv (offset 160) */
"iip\0"
"glLightfv\0"
"\0"
- /* _mesa_function_pool[5270]: GetFramebufferAttachmentParameteriv (will be remapped) */
+ /* _mesa_function_pool[5407]: GetFramebufferAttachmentParameteriv (will be remapped) */
"iiip\0"
"glGetFramebufferAttachmentParameteriv\0"
"glGetFramebufferAttachmentParameterivEXT\0"
"glGetFramebufferAttachmentParameterivOES\0"
"\0"
- /* _mesa_function_pool[5396]: ColorSubTable (offset 346) */
+ /* _mesa_function_pool[5533]: ColorSubTable (offset 346) */
"iiiiip\0"
"glColorSubTable\0"
"glColorSubTableEXT\0"
"\0"
- /* _mesa_function_pool[5439]: EndPerfMonitorAMD (will be remapped) */
+ /* _mesa_function_pool[5576]: EndPerfMonitorAMD (will be remapped) */
"i\0"
"glEndPerfMonitorAMD\0"
"\0"
- /* _mesa_function_pool[5462]: Uniform1ui (will be remapped) */
+ /* _mesa_function_pool[5599]: Uniform1ui (will be remapped) */
"ii\0"
"glUniform1uiEXT\0"
"glUniform1ui\0"
"\0"
- /* _mesa_function_pool[5495]: MapParameterivNV (dynamic) */
+ /* _mesa_function_pool[5632]: MapParameterivNV (dynamic) */
"iip\0"
"glMapParameterivNV\0"
"\0"
- /* _mesa_function_pool[5519]: GetMultisamplefv (will be remapped) */
+ /* _mesa_function_pool[5656]: GetMultisamplefv (will be remapped) */
"iip\0"
"glGetMultisamplefv\0"
"\0"
- /* _mesa_function_pool[5543]: WeightbvARB (dynamic) */
+ /* _mesa_function_pool[5680]: WeightbvARB (dynamic) */
"ip\0"
"glWeightbvARB\0"
"\0"
- /* _mesa_function_pool[5561]: Rectdv (offset 87) */
+ /* _mesa_function_pool[5698]: Rectdv (offset 87) */
"pp\0"
"glRectdv\0"
"\0"
- /* _mesa_function_pool[5574]: DrawArraysInstancedARB (will be remapped) */
+ /* _mesa_function_pool[5711]: DrawArraysInstancedARB (will be remapped) */
"iiii\0"
"glDrawArraysInstancedARB\0"
"glDrawArraysInstancedEXT\0"
"glDrawArraysInstanced\0"
"\0"
- /* _mesa_function_pool[5652]: ProgramEnvParameters4fvEXT (will be remapped) */
+ /* _mesa_function_pool[5789]: ProgramEnvParameters4fvEXT (will be remapped) */
"iiip\0"
"glProgramEnvParameters4fvEXT\0"
"\0"
- /* _mesa_function_pool[5687]: VertexAttrib2svNV (will be remapped) */
+ /* _mesa_function_pool[5824]: VertexAttrib2svNV (will be remapped) */
"ip\0"
"glVertexAttrib2svNV\0"
"\0"
- /* _mesa_function_pool[5711]: SecondaryColorP3uiv (will be remapped) */
+ /* _mesa_function_pool[5848]: SecondaryColorP3uiv (will be remapped) */
"ip\0"
"glSecondaryColorP3uiv\0"
"\0"
- /* _mesa_function_pool[5737]: GetnPixelMapuivARB (will be remapped) */
+ /* _mesa_function_pool[5874]: GetnPixelMapuivARB (will be remapped) */
"iip\0"
"glGetnPixelMapuivARB\0"
"\0"
- /* _mesa_function_pool[5763]: GetSamplerParameterIuiv (will be remapped) */
+ /* _mesa_function_pool[5900]: GetSamplerParameterIuiv (will be remapped) */
"iip\0"
"glGetSamplerParameterIuiv\0"
"\0"
- /* _mesa_function_pool[5794]: Disablei (will be remapped) */
+ /* _mesa_function_pool[5931]: Disablei (will be remapped) */
"ii\0"
"glDisableIndexedEXT\0"
"glDisablei\0"
"\0"
- /* _mesa_function_pool[5829]: CompressedTexSubImage3D (will be remapped) */
+ /* _mesa_function_pool[5966]: CompressedTexSubImage3D (will be remapped) */
"iiiiiiiiiip\0"
"glCompressedTexSubImage3D\0"
"glCompressedTexSubImage3DARB\0"
"glCompressedTexSubImage3DOES\0"
"\0"
- /* _mesa_function_pool[5926]: BindFramebufferEXT (will be remapped) */
+ /* _mesa_function_pool[6063]: BindFramebufferEXT (will be remapped) */
"ii\0"
"glBindFramebufferEXT\0"
"\0"
- /* _mesa_function_pool[5951]: Color3dv (offset 12) */
+ /* _mesa_function_pool[6088]: Color3dv (offset 12) */
"p\0"
"glColor3dv\0"
"\0"
- /* _mesa_function_pool[5965]: BeginQuery (will be remapped) */
+ /* _mesa_function_pool[6102]: BeginQuery (will be remapped) */
"ii\0"
"glBeginQuery\0"
"glBeginQueryARB\0"
"\0"
- /* _mesa_function_pool[5998]: VertexP3uiv (will be remapped) */
+ /* _mesa_function_pool[6135]: VertexP3uiv (will be remapped) */
"ip\0"
"glVertexP3uiv\0"
"\0"
- /* _mesa_function_pool[6016]: GetUniformLocation (will be remapped) */
+ /* _mesa_function_pool[6153]: GetUniformLocation (will be remapped) */
"ip\0"
"glGetUniformLocation\0"
"glGetUniformLocationARB\0"
"\0"
- /* _mesa_function_pool[6065]: PixelStoref (offset 249) */
+ /* _mesa_function_pool[6202]: PixelStoref (offset 249) */
"if\0"
"glPixelStoref\0"
"\0"
- /* _mesa_function_pool[6083]: WindowPos2iv (will be remapped) */
+ /* _mesa_function_pool[6220]: WindowPos2iv (will be remapped) */
"p\0"
"glWindowPos2iv\0"
"glWindowPos2ivARB\0"
"glWindowPos2ivMESA\0"
"\0"
- /* _mesa_function_pool[6138]: PixelStorei (offset 250) */
+ /* _mesa_function_pool[6275]: PixelStorei (offset 250) */
"ii\0"
"glPixelStorei\0"
"\0"
- /* _mesa_function_pool[6156]: VertexAttribs1svNV (will be remapped) */
+ /* _mesa_function_pool[6293]: VertexAttribs1svNV (will be remapped) */
"iip\0"
"glVertexAttribs1svNV\0"
"\0"
- /* _mesa_function_pool[6182]: RequestResidentProgramsNV (will be remapped) */
+ /* _mesa_function_pool[6319]: RequestResidentProgramsNV (will be remapped) */
"ip\0"
"glRequestResidentProgramsNV\0"
"\0"
- /* _mesa_function_pool[6214]: ListParameterivSGIX (dynamic) */
+ /* _mesa_function_pool[6351]: ListParameterivSGIX (dynamic) */
"iip\0"
"glListParameterivSGIX\0"
"\0"
- /* _mesa_function_pool[6241]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[6378]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
"pppp\0"
"glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[6287]: CheckFramebufferStatus (will be remapped) */
+ /* _mesa_function_pool[6424]: CheckFramebufferStatus (will be remapped) */
"i\0"
"glCheckFramebufferStatus\0"
"glCheckFramebufferStatusEXT\0"
"glCheckFramebufferStatusOES\0"
"\0"
- /* _mesa_function_pool[6371]: DispatchComputeIndirect (will be remapped) */
+ /* _mesa_function_pool[6508]: DispatchComputeIndirect (will be remapped) */
"i\0"
"glDispatchComputeIndirect\0"
"\0"
- /* _mesa_function_pool[6400]: InvalidateBufferData (will be remapped) */
+ /* _mesa_function_pool[6537]: InvalidateBufferData (will be remapped) */
"i\0"
"glInvalidateBufferData\0"
"\0"
- /* _mesa_function_pool[6426]: VDPAUMapSurfacesNV (will be remapped) */
+ /* _mesa_function_pool[6563]: GetUniformdv (will be remapped) */
+ "iip\0"
+ "glGetUniformdv\0"
+ "\0"
+ /* _mesa_function_pool[6583]: VDPAUMapSurfacesNV (will be remapped) */
"ip\0"
"glVDPAUMapSurfacesNV\0"
"\0"
- /* _mesa_function_pool[6451]: IsFramebuffer (will be remapped) */
+ /* _mesa_function_pool[6608]: IsFramebuffer (will be remapped) */
"i\0"
"glIsFramebuffer\0"
"glIsFramebufferEXT\0"
"glIsFramebufferOES\0"
"\0"
- /* _mesa_function_pool[6508]: GetPixelTexGenParameterfvSGIS (dynamic) */
+ /* _mesa_function_pool[6665]: GetPixelTexGenParameterfvSGIS (dynamic) */
"ip\0"
"glGetPixelTexGenParameterfvSGIS\0"
"\0"
- /* _mesa_function_pool[6544]: GetDoublev (offset 260) */
+ /* _mesa_function_pool[6701]: GetDoublev (offset 260) */
"ip\0"
"glGetDoublev\0"
"\0"
- /* _mesa_function_pool[6561]: GetObjectLabel (will be remapped) */
+ /* _mesa_function_pool[6718]: GetObjectLabel (will be remapped) */
"iiipp\0"
"glGetObjectLabel\0"
"\0"
- /* _mesa_function_pool[6585]: TextureLightEXT (dynamic) */
+ /* _mesa_function_pool[6742]: TextureLightEXT (dynamic) */
"i\0"
"glTextureLightEXT\0"
"\0"
- /* _mesa_function_pool[6606]: ColorP3uiv (will be remapped) */
+ /* _mesa_function_pool[6763]: ColorP3uiv (will be remapped) */
"ip\0"
"glColorP3uiv\0"
"\0"
- /* _mesa_function_pool[6623]: CombinerParameteriNV (dynamic) */
+ /* _mesa_function_pool[6780]: CombinerParameteriNV (dynamic) */
"ii\0"
"glCombinerParameteriNV\0"
"\0"
- /* _mesa_function_pool[6650]: Normal3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[6807]: Normal3fVertex3fvSUN (dynamic) */
"pp\0"
"glNormal3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[6677]: VertexAttribI4ivEXT (will be remapped) */
+ /* _mesa_function_pool[6834]: VertexAttribI4ivEXT (will be remapped) */
"ip\0"
"glVertexAttribI4ivEXT\0"
"glVertexAttribI4iv\0"
"\0"
- /* _mesa_function_pool[6722]: SecondaryColor3ubv (will be remapped) */
+ /* _mesa_function_pool[6879]: SecondaryColor3ubv (will be remapped) */
"p\0"
"glSecondaryColor3ubv\0"
"glSecondaryColor3ubvEXT\0"
"\0"
- /* _mesa_function_pool[6770]: GetDebugMessageLog (will be remapped) */
+ /* _mesa_function_pool[6927]: GetDebugMessageLog (will be remapped) */
"iipppppp\0"
"glGetDebugMessageLogARB\0"
"glGetDebugMessageLog\0"
"\0"
- /* _mesa_function_pool[6825]: DeformationMap3fSGIX (dynamic) */
+ /* _mesa_function_pool[6982]: DeformationMap3fSGIX (dynamic) */
"iffiiffiiffiip\0"
"glDeformationMap3fSGIX\0"
"\0"
- /* _mesa_function_pool[6864]: MatrixIndexubvARB (dynamic) */
+ /* _mesa_function_pool[7021]: MatrixIndexubvARB (dynamic) */
"ip\0"
"glMatrixIndexubvARB\0"
"\0"
- /* _mesa_function_pool[6888]: VertexAttribI4usv (will be remapped) */
+ /* _mesa_function_pool[7045]: VertexAttribI4usv (will be remapped) */
"ip\0"
"glVertexAttribI4usvEXT\0"
"glVertexAttribI4usv\0"
"\0"
- /* _mesa_function_pool[6935]: PixelTexGenParameterfSGIS (dynamic) */
+ /* _mesa_function_pool[7092]: PixelTexGenParameterfSGIS (dynamic) */
"if\0"
"glPixelTexGenParameterfSGIS\0"
"\0"
- /* _mesa_function_pool[6967]: ProgramUniform2ui (will be remapped) */
+ /* _mesa_function_pool[7124]: ProgramUniform2ui (will be remapped) */
"iiii\0"
"glProgramUniform2ui\0"
"glProgramUniform2uiEXT\0"
"\0"
- /* _mesa_function_pool[7016]: TexCoord2fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[7173]: TexCoord2fVertex3fvSUN (dynamic) */
"pp\0"
"glTexCoord2fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[7045]: Color4ubVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[7202]: Color4ubVertex3fvSUN (dynamic) */
"pp\0"
"glColor4ubVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[7072]: GetShaderSource (will be remapped) */
+ /* _mesa_function_pool[7229]: GetShaderSource (will be remapped) */
"iipp\0"
"glGetShaderSource\0"
"glGetShaderSourceARB\0"
"\0"
- /* _mesa_function_pool[7117]: BindProgramARB (will be remapped) */
+ /* _mesa_function_pool[7274]: BindProgramARB (will be remapped) */
"ii\0"
"glBindProgramARB\0"
"glBindProgramNV\0"
"\0"
- /* _mesa_function_pool[7154]: VertexAttrib3sNV (will be remapped) */
+ /* _mesa_function_pool[7311]: VertexAttrib3sNV (will be remapped) */
"iiii\0"
"glVertexAttrib3sNV\0"
"\0"
- /* _mesa_function_pool[7179]: ColorFragmentOp1ATI (will be remapped) */
+ /* _mesa_function_pool[7336]: ColorFragmentOp1ATI (will be remapped) */
"iiiiiii\0"
"glColorFragmentOp1ATI\0"
"\0"
- /* _mesa_function_pool[7210]: ProgramUniformMatrix4x3fv (will be remapped) */
+ /* _mesa_function_pool[7367]: ProgramUniformMatrix4x3fv (will be remapped) */
"iiiip\0"
"glProgramUniformMatrix4x3fv\0"
"glProgramUniformMatrix4x3fvEXT\0"
"\0"
- /* _mesa_function_pool[7276]: PopClientAttrib (offset 334) */
+ /* _mesa_function_pool[7433]: PopClientAttrib (offset 334) */
"\0"
"glPopClientAttrib\0"
"\0"
- /* _mesa_function_pool[7296]: DrawElementsInstancedARB (will be remapped) */
+ /* _mesa_function_pool[7453]: DrawElementsInstancedARB (will be remapped) */
"iiipi\0"
"glDrawElementsInstancedARB\0"
"glDrawElementsInstancedEXT\0"
"glDrawElementsInstanced\0"
"\0"
- /* _mesa_function_pool[7381]: GetQueryObjectuiv (will be remapped) */
+ /* _mesa_function_pool[7538]: GetQueryObjectuiv (will be remapped) */
"iip\0"
"glGetQueryObjectuiv\0"
"glGetQueryObjectuivARB\0"
"\0"
- /* _mesa_function_pool[7429]: VertexAttribI4bv (will be remapped) */
+ /* _mesa_function_pool[7586]: VertexAttribI4bv (will be remapped) */
"ip\0"
"glVertexAttribI4bvEXT\0"
"glVertexAttribI4bv\0"
"\0"
- /* _mesa_function_pool[7474]: FogCoordPointerListIBM (dynamic) */
+ /* _mesa_function_pool[7631]: FogCoordPointerListIBM (dynamic) */
"iipi\0"
"glFogCoordPointerListIBM\0"
"\0"
- /* _mesa_function_pool[7505]: Binormal3sEXT (dynamic) */
+ /* _mesa_function_pool[7662]: Binormal3sEXT (dynamic) */
"iii\0"
"glBinormal3sEXT\0"
"\0"
- /* _mesa_function_pool[7526]: ListBase (offset 6) */
+ /* _mesa_function_pool[7683]: ListBase (offset 6) */
"i\0"
"glListBase\0"
"\0"
- /* _mesa_function_pool[7540]: GenerateMipmap (will be remapped) */
+ /* _mesa_function_pool[7697]: GenerateMipmap (will be remapped) */
"i\0"
"glGenerateMipmap\0"
"glGenerateMipmapEXT\0"
"glGenerateMipmapOES\0"
"\0"
- /* _mesa_function_pool[7600]: BindBufferRange (will be remapped) */
+ /* _mesa_function_pool[7757]: BindBufferRange (will be remapped) */
"iiiii\0"
"glBindBufferRange\0"
"glBindBufferRangeEXT\0"
"\0"
- /* _mesa_function_pool[7646]: ProgramUniformMatrix2x4fv (will be remapped) */
+ /* _mesa_function_pool[7803]: ProgramUniformMatrix2x4fv (will be remapped) */
"iiiip\0"
"glProgramUniformMatrix2x4fv\0"
"glProgramUniformMatrix2x4fvEXT\0"
"\0"
- /* _mesa_function_pool[7712]: GetQueryObjectiv (will be remapped) */
+ /* _mesa_function_pool[7869]: BindBufferBase (will be remapped) */
+ "iii\0"
+ "glBindBufferBase\0"
+ "glBindBufferBaseEXT\0"
+ "\0"
+ /* _mesa_function_pool[7911]: GetQueryObjectiv (will be remapped) */
"iip\0"
"glGetQueryObjectiv\0"
"glGetQueryObjectivARB\0"
"\0"
- /* _mesa_function_pool[7758]: VertexAttrib2s (will be remapped) */
+ /* _mesa_function_pool[7957]: VertexAttrib2s (will be remapped) */
"iii\0"
"glVertexAttrib2s\0"
"glVertexAttrib2sARB\0"
"\0"
- /* _mesa_function_pool[7800]: SecondaryColor3fvEXT (will be remapped) */
+ /* _mesa_function_pool[7999]: SecondaryColor3fvEXT (will be remapped) */
"p\0"
"glSecondaryColor3fv\0"
"glSecondaryColor3fvEXT\0"
"\0"
- /* _mesa_function_pool[7846]: VertexAttrib2d (will be remapped) */
+ /* _mesa_function_pool[8045]: VertexAttrib2d (will be remapped) */
"idd\0"
"glVertexAttrib2d\0"
"glVertexAttrib2dARB\0"
"\0"
- /* _mesa_function_pool[7888]: Uniform1fv (will be remapped) */
+ /* _mesa_function_pool[8087]: Uniform1fv (will be remapped) */
"iip\0"
"glUniform1fv\0"
"glUniform1fvARB\0"
"\0"
- /* _mesa_function_pool[7922]: GetProgramPipelineInfoLog (will be remapped) */
+ /* _mesa_function_pool[8121]: GetProgramPipelineInfoLog (will be remapped) */
"iipp\0"
"glGetProgramPipelineInfoLog\0"
"glGetProgramPipelineInfoLogEXT\0"
"\0"
- /* _mesa_function_pool[7987]: TextureMaterialEXT (dynamic) */
+ /* _mesa_function_pool[8186]: TextureMaterialEXT (dynamic) */
"ii\0"
"glTextureMaterialEXT\0"
"\0"
- /* _mesa_function_pool[8012]: DepthBoundsEXT (will be remapped) */
+ /* _mesa_function_pool[8211]: ReadInstrumentsSGIX (dynamic) */
+ "i\0"
+ "glReadInstrumentsSGIX\0"
+ "\0"
+ /* _mesa_function_pool[8236]: DepthBoundsEXT (will be remapped) */
"dd\0"
"glDepthBoundsEXT\0"
"\0"
- /* _mesa_function_pool[8033]: WindowPos3fv (will be remapped) */
+ /* _mesa_function_pool[8257]: WindowPos3fv (will be remapped) */
"p\0"
"glWindowPos3fv\0"
"glWindowPos3fvARB\0"
"glWindowPos3fvMESA\0"
"\0"
- /* _mesa_function_pool[8088]: BindVertexArrayAPPLE (will be remapped) */
+ /* _mesa_function_pool[8312]: BindVertexArrayAPPLE (will be remapped) */
"i\0"
"glBindVertexArrayAPPLE\0"
"\0"
- /* _mesa_function_pool[8114]: GetHistogramParameteriv (offset 363) */
+ /* _mesa_function_pool[8338]: GetHistogramParameteriv (offset 363) */
"iip\0"
"glGetHistogramParameteriv\0"
"glGetHistogramParameterivEXT\0"
"\0"
- /* _mesa_function_pool[8174]: PointParameteriv (will be remapped) */
+ /* _mesa_function_pool[8398]: PointParameteriv (will be remapped) */
"ip\0"
"glPointParameteriv\0"
"glPointParameterivNV\0"
"\0"
- /* _mesa_function_pool[8218]: GetProgramivARB (will be remapped) */
+ /* _mesa_function_pool[8442]: GetProgramivARB (will be remapped) */
"iip\0"
"glGetProgramivARB\0"
"\0"
- /* _mesa_function_pool[8241]: BindRenderbuffer (will be remapped) */
+ /* _mesa_function_pool[8465]: BindRenderbuffer (will be remapped) */
"ii\0"
"glBindRenderbuffer\0"
"glBindRenderbufferOES\0"
"\0"
- /* _mesa_function_pool[8286]: SecondaryColor3fEXT (will be remapped) */
+ /* _mesa_function_pool[8510]: SecondaryColor3fEXT (will be remapped) */
"fff\0"
"glSecondaryColor3f\0"
"glSecondaryColor3fEXT\0"
"\0"
- /* _mesa_function_pool[8332]: PrimitiveRestartIndex (will be remapped) */
+ /* _mesa_function_pool[8556]: PrimitiveRestartIndex (will be remapped) */
"i\0"
"glPrimitiveRestartIndex\0"
"glPrimitiveRestartIndexNV\0"
"\0"
- /* _mesa_function_pool[8385]: VertexAttribI4ubv (will be remapped) */
+ /* _mesa_function_pool[8609]: VertexAttribI4ubv (will be remapped) */
"ip\0"
"glVertexAttribI4ubvEXT\0"
"glVertexAttribI4ubv\0"
"\0"
- /* _mesa_function_pool[8432]: GetGraphicsResetStatusARB (will be remapped) */
+ /* _mesa_function_pool[8656]: GetGraphicsResetStatusARB (will be remapped) */
"\0"
"glGetGraphicsResetStatusARB\0"
"\0"
- /* _mesa_function_pool[8462]: ActiveStencilFaceEXT (will be remapped) */
+ /* _mesa_function_pool[8686]: ActiveStencilFaceEXT (will be remapped) */
"i\0"
"glActiveStencilFaceEXT\0"
"\0"
- /* _mesa_function_pool[8488]: VertexAttrib4dNV (will be remapped) */
+ /* _mesa_function_pool[8712]: VertexAttrib4dNV (will be remapped) */
"idddd\0"
"glVertexAttrib4dNV\0"
"\0"
- /* _mesa_function_pool[8514]: DepthRange (offset 288) */
+ /* _mesa_function_pool[8738]: DepthRange (offset 288) */
"dd\0"
"glDepthRange\0"
"\0"
- /* _mesa_function_pool[8531]: TexBumpParameterivATI (will be remapped) */
+ /* _mesa_function_pool[8755]: TexBumpParameterivATI (will be remapped) */
"ip\0"
"glTexBumpParameterivATI\0"
"\0"
- /* _mesa_function_pool[8559]: VertexAttrib4fNV (will be remapped) */
+ /* _mesa_function_pool[8783]: VertexAttrib4fNV (will be remapped) */
"iffff\0"
"glVertexAttrib4fNV\0"
"\0"
- /* _mesa_function_pool[8585]: Uniform4fv (will be remapped) */
+ /* _mesa_function_pool[8809]: Uniform4fv (will be remapped) */
"iip\0"
"glUniform4fv\0"
"glUniform4fvARB\0"
"\0"
- /* _mesa_function_pool[8619]: DrawMeshArraysSUN (dynamic) */
+ /* _mesa_function_pool[8843]: DrawMeshArraysSUN (dynamic) */
"iiii\0"
"glDrawMeshArraysSUN\0"
"\0"
- /* _mesa_function_pool[8645]: SamplerParameterIiv (will be remapped) */
+ /* _mesa_function_pool[8869]: SamplerParameterIiv (will be remapped) */
"iip\0"
"glSamplerParameterIiv\0"
"\0"
- /* _mesa_function_pool[8672]: GetMapControlPointsNV (dynamic) */
+ /* _mesa_function_pool[8896]: GetMapControlPointsNV (dynamic) */
"iiiiiip\0"
"glGetMapControlPointsNV\0"
"\0"
- /* _mesa_function_pool[8705]: SpriteParameterivSGIX (dynamic) */
+ /* _mesa_function_pool[8929]: SpriteParameterivSGIX (dynamic) */
"ip\0"
"glSpriteParameterivSGIX\0"
"\0"
- /* _mesa_function_pool[8733]: Frustumf (will be remapped) */
+ /* _mesa_function_pool[8957]: Frustumf (will be remapped) */
"ffffff\0"
"glFrustumfOES\0"
"glFrustumf\0"
"\0"
- /* _mesa_function_pool[8766]: ProgramUniform2uiv (will be remapped) */
+ /* _mesa_function_pool[8990]: ProgramUniform2uiv (will be remapped) */
"iiip\0"
"glProgramUniform2uiv\0"
"glProgramUniform2uivEXT\0"
"\0"
- /* _mesa_function_pool[8817]: Rectsv (offset 93) */
+ /* _mesa_function_pool[9041]: Rectsv (offset 93) */
"pp\0"
"glRectsv\0"
"\0"
- /* _mesa_function_pool[8830]: Frustumx (will be remapped) */
+ /* _mesa_function_pool[9054]: Frustumx (will be remapped) */
"iiiiii\0"
"glFrustumxOES\0"
"glFrustumx\0"
"\0"
- /* _mesa_function_pool[8863]: CullFace (offset 152) */
+ /* _mesa_function_pool[9087]: CullFace (offset 152) */
"i\0"
"glCullFace\0"
"\0"
- /* _mesa_function_pool[8877]: BindTexture (offset 307) */
+ /* _mesa_function_pool[9101]: BindTexture (offset 307) */
"ii\0"
"glBindTexture\0"
"glBindTextureEXT\0"
"\0"
- /* _mesa_function_pool[8912]: MultiTexCoord4fARB (offset 402) */
+ /* _mesa_function_pool[9136]: MultiTexCoord4fARB (offset 402) */
"iffff\0"
"glMultiTexCoord4f\0"
"glMultiTexCoord4fARB\0"
"\0"
- /* _mesa_function_pool[8958]: MultiTexCoordP2uiv (will be remapped) */
+ /* _mesa_function_pool[9182]: MultiTexCoordP2uiv (will be remapped) */
"iip\0"
"glMultiTexCoordP2uiv\0"
"\0"
- /* _mesa_function_pool[8984]: NormalPointervINTEL (dynamic) */
+ /* _mesa_function_pool[9208]: NormalPointervINTEL (dynamic) */
"ip\0"
"glNormalPointervINTEL\0"
"\0"
- /* _mesa_function_pool[9010]: NormalPointer (offset 318) */
+ /* _mesa_function_pool[9234]: NormalPointer (offset 318) */
"iip\0"
"glNormalPointer\0"
"\0"
- /* _mesa_function_pool[9031]: TangentPointerEXT (dynamic) */
+ /* _mesa_function_pool[9255]: TangentPointerEXT (dynamic) */
"iip\0"
"glTangentPointerEXT\0"
"\0"
- /* _mesa_function_pool[9056]: WindowPos4iMESA (will be remapped) */
+ /* _mesa_function_pool[9280]: WindowPos4iMESA (will be remapped) */
"iiii\0"
"glWindowPos4iMESA\0"
"\0"
- /* _mesa_function_pool[9080]: ReferencePlaneSGIX (dynamic) */
+ /* _mesa_function_pool[9304]: ReferencePlaneSGIX (dynamic) */
"p\0"
"glReferencePlaneSGIX\0"
"\0"
- /* _mesa_function_pool[9104]: VertexAttrib4bv (will be remapped) */
+ /* _mesa_function_pool[9328]: VertexAttrib4bv (will be remapped) */
"ip\0"
"glVertexAttrib4bv\0"
"glVertexAttrib4bvARB\0"
"\0"
- /* _mesa_function_pool[9147]: ReplacementCodeuivSUN (dynamic) */
+ /* _mesa_function_pool[9371]: ReplacementCodeuivSUN (dynamic) */
"p\0"
"glReplacementCodeuivSUN\0"
"\0"
- /* _mesa_function_pool[9174]: SecondaryColor3usv (will be remapped) */
+ /* _mesa_function_pool[9398]: SecondaryColor3usv (will be remapped) */
"p\0"
"glSecondaryColor3usv\0"
"glSecondaryColor3usvEXT\0"
"\0"
- /* _mesa_function_pool[9222]: GetPixelMapuiv (offset 272) */
+ /* _mesa_function_pool[9446]: GetPixelMapuiv (offset 272) */
"ip\0"
"glGetPixelMapuiv\0"
"\0"
- /* _mesa_function_pool[9243]: Indexfv (offset 47) */
+ /* _mesa_function_pool[9467]: Indexfv (offset 47) */
"p\0"
"glIndexfv\0"
"\0"
- /* _mesa_function_pool[9256]: AlphaFragmentOp1ATI (will be remapped) */
+ /* _mesa_function_pool[9480]: AlphaFragmentOp1ATI (will be remapped) */
"iiiiii\0"
"glAlphaFragmentOp1ATI\0"
"\0"
- /* _mesa_function_pool[9286]: ListParameteriSGIX (dynamic) */
+ /* _mesa_function_pool[9510]: ListParameteriSGIX (dynamic) */
"iii\0"
"glListParameteriSGIX\0"
"\0"
- /* _mesa_function_pool[9312]: GetFloatv (offset 262) */
+ /* _mesa_function_pool[9536]: GetFloatv (offset 262) */
"ip\0"
"glGetFloatv\0"
"\0"
- /* _mesa_function_pool[9328]: MultiTexCoord3i (offset 396) */
+ /* _mesa_function_pool[9552]: ProgramUniform2dv (will be remapped) */
+ "iiip\0"
+ "glProgramUniform2dv\0"
+ "\0"
+ /* _mesa_function_pool[9578]: MultiTexCoord3i (offset 396) */
"iiii\0"
"glMultiTexCoord3i\0"
"glMultiTexCoord3iARB\0"
"\0"
- /* _mesa_function_pool[9373]: ProgramUniform1fv (will be remapped) */
+ /* _mesa_function_pool[9623]: ProgramUniform1fv (will be remapped) */
"iiip\0"
"glProgramUniform1fv\0"
"glProgramUniform1fvEXT\0"
"\0"
- /* _mesa_function_pool[9422]: MultiTexCoord3d (offset 392) */
+ /* _mesa_function_pool[9672]: MultiTexCoord3d (offset 392) */
"iddd\0"
"glMultiTexCoord3d\0"
"glMultiTexCoord3dARB\0"
"\0"
- /* _mesa_function_pool[9467]: TexCoord3sv (offset 117) */
+ /* _mesa_function_pool[9717]: TexCoord3sv (offset 117) */
"p\0"
"glTexCoord3sv\0"
"\0"
- /* _mesa_function_pool[9484]: Fogfv (offset 154) */
+ /* _mesa_function_pool[9734]: Fogfv (offset 154) */
"ip\0"
"glFogfv\0"
"\0"
- /* _mesa_function_pool[9496]: Minmax (offset 368) */
+ /* _mesa_function_pool[9746]: Minmax (offset 368) */
"iii\0"
"glMinmax\0"
"glMinmaxEXT\0"
"\0"
- /* _mesa_function_pool[9522]: MultiTexCoord3s (offset 398) */
+ /* _mesa_function_pool[9772]: MultiTexCoord3s (offset 398) */
"iiii\0"
"glMultiTexCoord3s\0"
"glMultiTexCoord3sARB\0"
"\0"
- /* _mesa_function_pool[9567]: FinishTextureSUNX (dynamic) */
+ /* _mesa_function_pool[9817]: FinishTextureSUNX (dynamic) */
"\0"
"glFinishTextureSUNX\0"
"\0"
- /* _mesa_function_pool[9589]: GetFinalCombinerInputParameterfvNV (dynamic) */
+ /* _mesa_function_pool[9839]: GetFinalCombinerInputParameterfvNV (dynamic) */
"iip\0"
"glGetFinalCombinerInputParameterfvNV\0"
"\0"
- /* _mesa_function_pool[9631]: PollInstrumentsSGIX (dynamic) */
+ /* _mesa_function_pool[9881]: PollInstrumentsSGIX (dynamic) */
"p\0"
"glPollInstrumentsSGIX\0"
"\0"
- /* _mesa_function_pool[9656]: Vertex4iv (offset 147) */
+ /* _mesa_function_pool[9906]: Vertex4iv (offset 147) */
"p\0"
"glVertex4iv\0"
"\0"
- /* _mesa_function_pool[9671]: BufferSubData (will be remapped) */
+ /* _mesa_function_pool[9921]: BufferSubData (will be remapped) */
"iiip\0"
"glBufferSubData\0"
"glBufferSubDataARB\0"
"\0"
- /* _mesa_function_pool[9712]: AlphaFragmentOp3ATI (will be remapped) */
+ /* _mesa_function_pool[9962]: AlphaFragmentOp3ATI (will be remapped) */
"iiiiiiiiiiii\0"
"glAlphaFragmentOp3ATI\0"
"\0"
- /* _mesa_function_pool[9748]: Begin (offset 7) */
+ /* _mesa_function_pool[9998]: Normal3fVertex3fSUN (dynamic) */
+ "ffffff\0"
+ "glNormal3fVertex3fSUN\0"
+ "\0"
+ /* _mesa_function_pool[10028]: Begin (offset 7) */
"i\0"
"glBegin\0"
"\0"
- /* _mesa_function_pool[9759]: LightModeli (offset 165) */
+ /* _mesa_function_pool[10039]: LightModeli (offset 165) */
"ii\0"
"glLightModeli\0"
"\0"
- /* _mesa_function_pool[9777]: UniformMatrix2fv (will be remapped) */
+ /* _mesa_function_pool[10057]: UniformMatrix2fv (will be remapped) */
"iiip\0"
"glUniformMatrix2fv\0"
"glUniformMatrix2fvARB\0"
"\0"
- /* _mesa_function_pool[9824]: LightModelf (offset 163) */
+ /* _mesa_function_pool[10104]: LightModelf (offset 163) */
"if\0"
"glLightModelf\0"
"\0"
- /* _mesa_function_pool[9842]: GetTexParameterfv (offset 282) */
+ /* _mesa_function_pool[10122]: GetTexParameterfv (offset 282) */
"iip\0"
"glGetTexParameterfv\0"
"\0"
- /* _mesa_function_pool[9867]: BinormalPointerEXT (dynamic) */
+ /* _mesa_function_pool[10147]: TextureStorage1D (will be remapped) */
+ "iiii\0"
+ "glTextureStorage1D\0"
+ "\0"
+ /* _mesa_function_pool[10172]: BinormalPointerEXT (dynamic) */
"iip\0"
"glBinormalPointerEXT\0"
"\0"
- /* _mesa_function_pool[9893]: GetCombinerInputParameterivNV (dynamic) */
+ /* _mesa_function_pool[10198]: GetCombinerInputParameterivNV (dynamic) */
"iiiip\0"
"glGetCombinerInputParameterivNV\0"
"\0"
- /* _mesa_function_pool[9932]: DeleteAsyncMarkersSGIX (dynamic) */
+ /* _mesa_function_pool[10237]: DeleteAsyncMarkersSGIX (dynamic) */
"ii\0"
"glDeleteAsyncMarkersSGIX\0"
"\0"
- /* _mesa_function_pool[9961]: MultiTexCoord2fvARB (offset 387) */
+ /* _mesa_function_pool[10266]: MultiTexCoord2fvARB (offset 387) */
"ip\0"
"glMultiTexCoord2fv\0"
"glMultiTexCoord2fvARB\0"
"\0"
- /* _mesa_function_pool[10006]: VertexAttrib4ubv (will be remapped) */
+ /* _mesa_function_pool[10311]: VertexAttrib4ubv (will be remapped) */
"ip\0"
"glVertexAttrib4ubv\0"
"glVertexAttrib4ubvARB\0"
"\0"
- /* _mesa_function_pool[10051]: GetnTexImageARB (will be remapped) */
+ /* _mesa_function_pool[10356]: GetnTexImageARB (will be remapped) */
"iiiiip\0"
"glGetnTexImageARB\0"
"\0"
- /* _mesa_function_pool[10077]: ColorMask (offset 210) */
+ /* _mesa_function_pool[10382]: ColorMask (offset 210) */
"iiii\0"
"glColorMask\0"
"\0"
- /* _mesa_function_pool[10095]: GenAsyncMarkersSGIX (dynamic) */
+ /* _mesa_function_pool[10400]: GenAsyncMarkersSGIX (dynamic) */
"i\0"
"glGenAsyncMarkersSGIX\0"
"\0"
- /* _mesa_function_pool[10120]: ReplacementCodeuiVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[10425]: MultiTexCoord4x (will be remapped) */
+ "iiiii\0"
+ "glMultiTexCoord4xOES\0"
+ "glMultiTexCoord4x\0"
+ "\0"
+ /* _mesa_function_pool[10471]: ReplacementCodeuiVertex3fSUN (dynamic) */
"ifff\0"
"glReplacementCodeuiVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[10157]: VertexAttribI4sv (will be remapped) */
+ /* _mesa_function_pool[10508]: VertexAttribI4sv (will be remapped) */
"ip\0"
"glVertexAttribI4svEXT\0"
"glVertexAttribI4sv\0"
"\0"
- /* _mesa_function_pool[10202]: DrawElementsInstancedBaseInstance (will be remapped) */
+ /* _mesa_function_pool[10553]: DrawElementsInstancedBaseInstance (will be remapped) */
"iiipii\0"
"glDrawElementsInstancedBaseInstance\0"
"\0"
- /* _mesa_function_pool[10246]: UniformMatrix4fv (will be remapped) */
+ /* _mesa_function_pool[10597]: UniformMatrix4fv (will be remapped) */
"iiip\0"
"glUniformMatrix4fv\0"
"glUniformMatrix4fvARB\0"
"\0"
- /* _mesa_function_pool[10293]: UniformMatrix3x2fv (will be remapped) */
+ /* _mesa_function_pool[10644]: UniformMatrix3x2fv (will be remapped) */
"iiip\0"
"glUniformMatrix3x2fv\0"
"\0"
- /* _mesa_function_pool[10320]: VertexAttrib4Nuiv (will be remapped) */
+ /* _mesa_function_pool[10671]: VertexAttrib4Nuiv (will be remapped) */
"ip\0"
"glVertexAttrib4Nuiv\0"
"glVertexAttrib4NuivARB\0"
"\0"
- /* _mesa_function_pool[10367]: ClientActiveTexture (offset 375) */
+ /* _mesa_function_pool[10718]: ClientActiveTexture (offset 375) */
"i\0"
"glClientActiveTexture\0"
"glClientActiveTextureARB\0"
"\0"
- /* _mesa_function_pool[10417]: GetUniformIndices (will be remapped) */
+ /* _mesa_function_pool[10768]: GetUniformIndices (will be remapped) */
"iipp\0"
"glGetUniformIndices\0"
"\0"
- /* _mesa_function_pool[10443]: GetTexBumpParameterivATI (will be remapped) */
+ /* _mesa_function_pool[10794]: GetTexBumpParameterivATI (will be remapped) */
"ip\0"
"glGetTexBumpParameterivATI\0"
"\0"
- /* _mesa_function_pool[10474]: Binormal3bEXT (dynamic) */
+ /* _mesa_function_pool[10825]: Binormal3bEXT (dynamic) */
"iii\0"
"glBinormal3bEXT\0"
"\0"
- /* _mesa_function_pool[10495]: CombinerParameterivNV (dynamic) */
+ /* _mesa_function_pool[10846]: CombinerParameterivNV (dynamic) */
"ip\0"
"glCombinerParameterivNV\0"
"\0"
- /* _mesa_function_pool[10523]: MultiTexCoord2sv (offset 391) */
+ /* _mesa_function_pool[10874]: MultiTexCoord2sv (offset 391) */
"ip\0"
"glMultiTexCoord2sv\0"
"glMultiTexCoord2svARB\0"
"\0"
- /* _mesa_function_pool[10568]: LoadIdentity (offset 290) */
+ /* _mesa_function_pool[10919]: LoadIdentity (offset 290) */
"\0"
"glLoadIdentity\0"
"\0"
- /* _mesa_function_pool[10585]: ActiveShaderProgram (will be remapped) */
+ /* _mesa_function_pool[10936]: ActiveShaderProgram (will be remapped) */
"ii\0"
"glActiveShaderProgram\0"
"glActiveShaderProgramEXT\0"
"\0"
- /* _mesa_function_pool[10636]: BindImageTextures (will be remapped) */
+ /* _mesa_function_pool[10987]: BindImageTextures (will be remapped) */
"iip\0"
"glBindImageTextures\0"
"\0"
- /* _mesa_function_pool[10661]: DeleteTransformFeedbacks (will be remapped) */
+ /* _mesa_function_pool[11012]: DeleteTransformFeedbacks (will be remapped) */
"ip\0"
"glDeleteTransformFeedbacks\0"
"\0"
- /* _mesa_function_pool[10692]: VertexAttrib4ubvNV (will be remapped) */
+ /* _mesa_function_pool[11043]: VertexAttrib4ubvNV (will be remapped) */
"ip\0"
"glVertexAttrib4ubvNV\0"
"\0"
- /* _mesa_function_pool[10717]: FogCoordfEXT (will be remapped) */
+ /* _mesa_function_pool[11068]: FogCoordfEXT (will be remapped) */
"f\0"
"glFogCoordf\0"
"glFogCoordfEXT\0"
"\0"
- /* _mesa_function_pool[10747]: GetMapfv (offset 267) */
+ /* _mesa_function_pool[11098]: GetMapfv (offset 267) */
"iip\0"
"glGetMapfv\0"
"\0"
- /* _mesa_function_pool[10763]: GetProgramInfoLog (will be remapped) */
+ /* _mesa_function_pool[11114]: GetProgramInfoLog (will be remapped) */
"iipp\0"
"glGetProgramInfoLog\0"
"\0"
- /* _mesa_function_pool[10789]: BindTransformFeedback (will be remapped) */
+ /* _mesa_function_pool[11140]: BindTransformFeedback (will be remapped) */
"ii\0"
"glBindTransformFeedback\0"
"\0"
- /* _mesa_function_pool[10817]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+ /* _mesa_function_pool[11168]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
"pppp\0"
"glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
"\0"
- /* _mesa_function_pool[10863]: GetPixelMapfv (offset 271) */
+ /* _mesa_function_pool[11214]: GetPixelMapfv (offset 271) */
"ip\0"
"glGetPixelMapfv\0"
"\0"
- /* _mesa_function_pool[10883]: WeightivARB (dynamic) */
+ /* _mesa_function_pool[11234]: WeightivARB (dynamic) */
"ip\0"
"glWeightivARB\0"
"\0"
- /* _mesa_function_pool[10901]: VertexAttrib4svNV (will be remapped) */
+ /* _mesa_function_pool[11252]: VertexAttrib4svNV (will be remapped) */
"ip\0"
"glVertexAttrib4svNV\0"
"\0"
- /* _mesa_function_pool[10925]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[11276]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
"ifffff\0"
"glReplacementCodeuiTexCoord2fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[10974]: VDPAUSurfaceAccessNV (will be remapped) */
+ /* _mesa_function_pool[11325]: VDPAUSurfaceAccessNV (will be remapped) */
"ii\0"
"glVDPAUSurfaceAccessNV\0"
"\0"
- /* _mesa_function_pool[11001]: EdgeFlagPointer (offset 312) */
+ /* _mesa_function_pool[11352]: EdgeFlagPointer (offset 312) */
"ip\0"
"glEdgeFlagPointer\0"
"\0"
- /* _mesa_function_pool[11023]: WindowPos2f (will be remapped) */
+ /* _mesa_function_pool[11374]: WindowPos2f (will be remapped) */
"ff\0"
"glWindowPos2f\0"
"glWindowPos2fARB\0"
"glWindowPos2fMESA\0"
"\0"
- /* _mesa_function_pool[11076]: WindowPos2d (will be remapped) */
+ /* _mesa_function_pool[11427]: WindowPos2d (will be remapped) */
"dd\0"
"glWindowPos2d\0"
"glWindowPos2dARB\0"
"glWindowPos2dMESA\0"
"\0"
- /* _mesa_function_pool[11129]: WindowPos2i (will be remapped) */
+ /* _mesa_function_pool[11480]: WindowPos2i (will be remapped) */
"ii\0"
"glWindowPos2i\0"
"glWindowPos2iARB\0"
"glWindowPos2iMESA\0"
"\0"
- /* _mesa_function_pool[11182]: WindowPos2s (will be remapped) */
+ /* _mesa_function_pool[11533]: WindowPos2s (will be remapped) */
"ii\0"
"glWindowPos2s\0"
"glWindowPos2sARB\0"
"glWindowPos2sMESA\0"
"\0"
- /* _mesa_function_pool[11235]: VertexAttribI1uiEXT (will be remapped) */
+ /* _mesa_function_pool[11586]: VertexAttribI1uiEXT (will be remapped) */
"ii\0"
"glVertexAttribI1uiEXT\0"
"glVertexAttribI1ui\0"
"\0"
- /* _mesa_function_pool[11280]: DeleteSync (will be remapped) */
+ /* _mesa_function_pool[11631]: DeleteSync (will be remapped) */
"i\0"
"glDeleteSync\0"
"\0"
- /* _mesa_function_pool[11296]: WindowPos4fvMESA (will be remapped) */
+ /* _mesa_function_pool[11647]: WindowPos4fvMESA (will be remapped) */
"p\0"
"glWindowPos4fvMESA\0"
"\0"
- /* _mesa_function_pool[11318]: CompressedTexImage3D (will be remapped) */
+ /* _mesa_function_pool[11669]: CompressedTexImage3D (will be remapped) */
"iiiiiiiip\0"
"glCompressedTexImage3D\0"
"glCompressedTexImage3DARB\0"
"glCompressedTexImage3DOES\0"
"\0"
- /* _mesa_function_pool[11404]: VertexAttribI1uiv (will be remapped) */
+ /* _mesa_function_pool[11755]: VertexAttribI1uiv (will be remapped) */
"ip\0"
"glVertexAttribI1uivEXT\0"
"glVertexAttribI1uiv\0"
"\0"
- /* _mesa_function_pool[11451]: SecondaryColor3dv (will be remapped) */
+ /* _mesa_function_pool[11802]: SecondaryColor3dv (will be remapped) */
"p\0"
"glSecondaryColor3dv\0"
"glSecondaryColor3dvEXT\0"
"\0"
- /* _mesa_function_pool[11497]: GetListParameterivSGIX (dynamic) */
+ /* _mesa_function_pool[11848]: GetListParameterivSGIX (dynamic) */
"iip\0"
"glGetListParameterivSGIX\0"
"\0"
- /* _mesa_function_pool[11527]: GetnPixelMapusvARB (will be remapped) */
+ /* _mesa_function_pool[11878]: GetnPixelMapusvARB (will be remapped) */
"iip\0"
"glGetnPixelMapusvARB\0"
"\0"
- /* _mesa_function_pool[11553]: VertexAttrib3s (will be remapped) */
+ /* _mesa_function_pool[11904]: VertexAttrib3s (will be remapped) */
"iiii\0"
"glVertexAttrib3s\0"
"glVertexAttrib3sARB\0"
"\0"
- /* _mesa_function_pool[11596]: UniformMatrix4x3fv (will be remapped) */
+ /* _mesa_function_pool[11947]: UniformMatrix4x3fv (will be remapped) */
"iiip\0"
"glUniformMatrix4x3fv\0"
"\0"
- /* _mesa_function_pool[11623]: Binormal3dEXT (dynamic) */
+ /* _mesa_function_pool[11974]: Binormal3dEXT (dynamic) */
"ddd\0"
"glBinormal3dEXT\0"
"\0"
- /* _mesa_function_pool[11644]: GetQueryiv (will be remapped) */
+ /* _mesa_function_pool[11995]: GetQueryiv (will be remapped) */
"iip\0"
"glGetQueryiv\0"
"glGetQueryivARB\0"
"\0"
- /* _mesa_function_pool[11678]: VertexAttrib3d (will be remapped) */
+ /* _mesa_function_pool[12029]: VertexAttrib3d (will be remapped) */
"iddd\0"
"glVertexAttrib3d\0"
"glVertexAttrib3dARB\0"
"\0"
- /* _mesa_function_pool[11721]: ImageTransformParameterfHP (dynamic) */
+ /* _mesa_function_pool[12072]: ImageTransformParameterfHP (dynamic) */
"iif\0"
"glImageTransformParameterfHP\0"
"\0"
- /* _mesa_function_pool[11755]: MapBuffer (will be remapped) */
+ /* _mesa_function_pool[12106]: MapBuffer (will be remapped) */
"ii\0"
"glMapBuffer\0"
"glMapBufferARB\0"
"glMapBufferOES\0"
"\0"
- /* _mesa_function_pool[11801]: VertexAttrib4Nbv (will be remapped) */
+ /* _mesa_function_pool[12152]: VertexAttrib4Nbv (will be remapped) */
"ip\0"
"glVertexAttrib4Nbv\0"
"glVertexAttrib4NbvARB\0"
"\0"
- /* _mesa_function_pool[11846]: ProgramBinary (will be remapped) */
+ /* _mesa_function_pool[12197]: ProgramBinary (will be remapped) */
"iipi\0"
"glProgramBinary\0"
"glProgramBinaryOES\0"
"\0"
- /* _mesa_function_pool[11887]: InvalidateTexImage (will be remapped) */
+ /* _mesa_function_pool[12238]: InvalidateTexImage (will be remapped) */
"ii\0"
"glInvalidateTexImage\0"
"\0"
- /* _mesa_function_pool[11912]: Uniform4ui (will be remapped) */
+ /* _mesa_function_pool[12263]: Uniform4ui (will be remapped) */
"iiiii\0"
"glUniform4uiEXT\0"
"glUniform4ui\0"
"\0"
- /* _mesa_function_pool[11948]: VertexAttrib1fARB (will be remapped) */
+ /* _mesa_function_pool[12299]: VertexAttrib1fARB (will be remapped) */
"if\0"
"glVertexAttrib1f\0"
"glVertexAttrib1fARB\0"
"\0"
- /* _mesa_function_pool[11989]: GetBooleani_v (will be remapped) */
+ /* _mesa_function_pool[12340]: GetBooleani_v (will be remapped) */
"iip\0"
"glGetBooleanIndexedvEXT\0"
"glGetBooleani_v\0"
"\0"
- /* _mesa_function_pool[12034]: DrawTexsOES (will be remapped) */
+ /* _mesa_function_pool[12385]: DrawTexsOES (will be remapped) */
"iiiii\0"
"glDrawTexsOES\0"
"\0"
- /* _mesa_function_pool[12055]: GetObjectPtrLabel (will be remapped) */
+ /* _mesa_function_pool[12406]: GetObjectPtrLabel (will be remapped) */
"pipp\0"
"glGetObjectPtrLabel\0"
"\0"
- /* _mesa_function_pool[12081]: ProgramParameteri (will be remapped) */
+ /* _mesa_function_pool[12432]: ProgramParameteri (will be remapped) */
"iii\0"
"glProgramParameteriARB\0"
"glProgramParameteri\0"
"glProgramParameteriEXT\0"
"\0"
- /* _mesa_function_pool[12152]: SecondaryColorPointerListIBM (dynamic) */
+ /* _mesa_function_pool[12503]: SecondaryColorPointerListIBM (dynamic) */
"iiipi\0"
"glSecondaryColorPointerListIBM\0"
"\0"
- /* _mesa_function_pool[12190]: Color3fv (offset 14) */
+ /* _mesa_function_pool[12541]: Color3fv (offset 14) */
"p\0"
"glColor3fv\0"
"\0"
- /* _mesa_function_pool[12204]: ReplacementCodeubSUN (dynamic) */
+ /* _mesa_function_pool[12555]: ReplacementCodeubSUN (dynamic) */
"i\0"
"glReplacementCodeubSUN\0"
"\0"
- /* _mesa_function_pool[12230]: GetnMapfvARB (will be remapped) */
+ /* _mesa_function_pool[12581]: GetnMapfvARB (will be remapped) */
"iiip\0"
"glGetnMapfvARB\0"
"\0"
- /* _mesa_function_pool[12251]: MultiTexCoord2i (offset 388) */
+ /* _mesa_function_pool[12602]: MultiTexCoord2i (offset 388) */
"iii\0"
"glMultiTexCoord2i\0"
"glMultiTexCoord2iARB\0"
"\0"
- /* _mesa_function_pool[12295]: MultiTexCoord2d (offset 384) */
+ /* _mesa_function_pool[12646]: MultiTexCoord2d (offset 384) */
"idd\0"
"glMultiTexCoord2d\0"
"glMultiTexCoord2dARB\0"
"\0"
- /* _mesa_function_pool[12339]: SamplerParameterIuiv (will be remapped) */
+ /* _mesa_function_pool[12690]: SamplerParameterIuiv (will be remapped) */
"iip\0"
"glSamplerParameterIuiv\0"
"\0"
- /* _mesa_function_pool[12367]: MultiTexCoord2s (offset 390) */
+ /* _mesa_function_pool[12718]: MultiTexCoord2s (offset 390) */
"iii\0"
"glMultiTexCoord2s\0"
"glMultiTexCoord2sARB\0"
"\0"
- /* _mesa_function_pool[12411]: VDPAURegisterVideoSurfaceNV (will be remapped) */
+ /* _mesa_function_pool[12762]: VDPAURegisterVideoSurfaceNV (will be remapped) */
"piip\0"
"glVDPAURegisterVideoSurfaceNV\0"
"\0"
- /* _mesa_function_pool[12447]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[12798]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
"ffffffffffff\0"
"glTexCoord2fColor4fNormal3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[12500]: BindBufferBase (will be remapped) */
- "iii\0"
- "glBindBufferBase\0"
- "glBindBufferBaseEXT\0"
+ /* _mesa_function_pool[12851]: Indexub (offset 315) */
+ "i\0"
+ "glIndexub\0"
"\0"
- /* _mesa_function_pool[12542]: GetPerfMonitorCounterDataAMD (will be remapped) */
+ /* _mesa_function_pool[12864]: GetPerfMonitorCounterDataAMD (will be remapped) */
"iiipp\0"
"glGetPerfMonitorCounterDataAMD\0"
"\0"
- /* _mesa_function_pool[12580]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[12902]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
"ppp\0"
"glReplacementCodeuiNormal3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[12625]: MultTransposeMatrixf (will be remapped) */
+ /* _mesa_function_pool[12947]: MultTransposeMatrixf (will be remapped) */
"p\0"
"glMultTransposeMatrixf\0"
"glMultTransposeMatrixfARB\0"
"\0"
- /* _mesa_function_pool[12677]: PolygonOffsetEXT (will be remapped) */
+ /* _mesa_function_pool[12999]: PolygonOffsetEXT (will be remapped) */
"ff\0"
"glPolygonOffsetEXT\0"
"\0"
- /* _mesa_function_pool[12700]: Scalex (will be remapped) */
+ /* _mesa_function_pool[13022]: Scalex (will be remapped) */
"iii\0"
"glScalexOES\0"
"glScalex\0"
"\0"
- /* _mesa_function_pool[12726]: Scaled (offset 301) */
+ /* _mesa_function_pool[13048]: Scaled (offset 301) */
"ddd\0"
"glScaled\0"
"\0"
- /* _mesa_function_pool[12740]: Scalef (offset 302) */
+ /* _mesa_function_pool[13062]: Scalef (offset 302) */
"fff\0"
"glScalef\0"
"\0"
- /* _mesa_function_pool[12754]: IndexPointerEXT (will be remapped) */
+ /* _mesa_function_pool[13076]: IndexPointerEXT (will be remapped) */
"iiip\0"
"glIndexPointerEXT\0"
"\0"
- /* _mesa_function_pool[12778]: GetUniformfv (will be remapped) */
+ /* _mesa_function_pool[13100]: GetUniformfv (will be remapped) */
"iip\0"
"glGetUniformfv\0"
"glGetUniformfvARB\0"
"\0"
- /* _mesa_function_pool[12816]: ColorFragmentOp2ATI (will be remapped) */
+ /* _mesa_function_pool[13138]: ColorFragmentOp2ATI (will be remapped) */
"iiiiiiiiii\0"
"glColorFragmentOp2ATI\0"
"\0"
- /* _mesa_function_pool[12850]: VertexAttrib2sNV (will be remapped) */
+ /* _mesa_function_pool[13172]: VertexAttrib2sNV (will be remapped) */
"iii\0"
"glVertexAttrib2sNV\0"
"\0"
- /* _mesa_function_pool[12874]: ReadPixels (offset 256) */
+ /* _mesa_function_pool[13196]: ReadPixels (offset 256) */
"iiiiiip\0"
"glReadPixels\0"
"\0"
- /* _mesa_function_pool[12896]: NormalPointerListIBM (dynamic) */
+ /* _mesa_function_pool[13218]: NormalPointerListIBM (dynamic) */
"iipi\0"
"glNormalPointerListIBM\0"
"\0"
- /* _mesa_function_pool[12925]: QueryCounter (will be remapped) */
+ /* _mesa_function_pool[13247]: QueryCounter (will be remapped) */
"ii\0"
"glQueryCounter\0"
"\0"
- /* _mesa_function_pool[12944]: NormalPointerEXT (will be remapped) */
+ /* _mesa_function_pool[13266]: NormalPointerEXT (will be remapped) */
"iiip\0"
"glNormalPointerEXT\0"
"\0"
- /* _mesa_function_pool[12969]: ProgramUniform3iv (will be remapped) */
+ /* _mesa_function_pool[13291]: ProgramUniform3iv (will be remapped) */
"iiip\0"
"glProgramUniform3iv\0"
"glProgramUniform3ivEXT\0"
"\0"
- /* _mesa_function_pool[13018]: ClearTexSubImage (will be remapped) */
+ /* _mesa_function_pool[13340]: ProgramUniformMatrix2dv (will be remapped) */
+ "iiiip\0"
+ "glProgramUniformMatrix2dv\0"
+ "\0"
+ /* _mesa_function_pool[13373]: ClearTexSubImage (will be remapped) */
"iiiiiiiiiip\0"
"glClearTexSubImage\0"
"\0"
- /* _mesa_function_pool[13050]: GetActiveUniformBlockName (will be remapped) */
+ /* _mesa_function_pool[13405]: GetActiveUniformBlockName (will be remapped) */
"iiipp\0"
"glGetActiveUniformBlockName\0"
"\0"
- /* _mesa_function_pool[13085]: DrawElementsBaseVertex (will be remapped) */
+ /* _mesa_function_pool[13440]: DrawElementsBaseVertex (will be remapped) */
"iiipi\0"
"glDrawElementsBaseVertex\0"
"\0"
- /* _mesa_function_pool[13117]: RasterPos3iv (offset 75) */
+ /* _mesa_function_pool[13472]: RasterPos3iv (offset 75) */
"p\0"
"glRasterPos3iv\0"
"\0"
- /* _mesa_function_pool[13135]: ColorMaski (will be remapped) */
+ /* _mesa_function_pool[13490]: ColorMaski (will be remapped) */
"iiiii\0"
"glColorMaskIndexedEXT\0"
"glColorMaski\0"
"\0"
- /* _mesa_function_pool[13177]: Uniform2uiv (will be remapped) */
+ /* _mesa_function_pool[13532]: Uniform2uiv (will be remapped) */
"iip\0"
"glUniform2uivEXT\0"
"glUniform2uiv\0"
"\0"
- /* _mesa_function_pool[13213]: RasterPos3s (offset 76) */
+ /* _mesa_function_pool[13568]: RasterPos3s (offset 76) */
"iii\0"
"glRasterPos3s\0"
"\0"
- /* _mesa_function_pool[13232]: RasterPos3d (offset 70) */
+ /* _mesa_function_pool[13587]: RasterPos3d (offset 70) */
"ddd\0"
"glRasterPos3d\0"
"\0"
- /* _mesa_function_pool[13251]: RasterPos3f (offset 72) */
+ /* _mesa_function_pool[13606]: RasterPos3f (offset 72) */
"fff\0"
"glRasterPos3f\0"
"\0"
- /* _mesa_function_pool[13270]: BindVertexArray (will be remapped) */
+ /* _mesa_function_pool[13625]: BindVertexArray (will be remapped) */
"i\0"
"glBindVertexArray\0"
"glBindVertexArrayOES\0"
"\0"
- /* _mesa_function_pool[13312]: RasterPos3i (offset 74) */
+ /* _mesa_function_pool[13667]: RasterPos3i (offset 74) */
"iii\0"
"glRasterPos3i\0"
"\0"
- /* _mesa_function_pool[13331]: GetTexParameterIuiv (will be remapped) */
+ /* _mesa_function_pool[13686]: GetTexParameterIuiv (will be remapped) */
"iip\0"
"glGetTexParameterIuivEXT\0"
"glGetTexParameterIuiv\0"
"\0"
- /* _mesa_function_pool[13383]: DrawTransformFeedbackStreamInstanced (will be remapped) */
+ /* _mesa_function_pool[13738]: DrawTransformFeedbackStreamInstanced (will be remapped) */
"iiii\0"
"glDrawTransformFeedbackStreamInstanced\0"
"\0"
- /* _mesa_function_pool[13428]: VertexAttrib2fvARB (will be remapped) */
+ /* _mesa_function_pool[13783]: VertexAttrib2fvARB (will be remapped) */
"ip\0"
"glVertexAttrib2fv\0"
"glVertexAttrib2fvARB\0"
"\0"
- /* _mesa_function_pool[13471]: VertexPointerListIBM (dynamic) */
+ /* _mesa_function_pool[13826]: VertexPointerListIBM (dynamic) */
"iiipi\0"
"glVertexPointerListIBM\0"
"\0"
- /* _mesa_function_pool[13501]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[13856]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
"ffffffff\0"
"glTexCoord2fNormal3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[13543]: IsFenceNV (dynamic) */
+ /* _mesa_function_pool[13898]: ProgramUniformMatrix4x3dv (will be remapped) */
+ "iiiip\0"
+ "glProgramUniformMatrix4x3dv\0"
+ "\0"
+ /* _mesa_function_pool[13933]: IsFenceNV (dynamic) */
"i\0"
"glIsFenceNV\0"
"\0"
- /* _mesa_function_pool[13558]: ColorTable (offset 339) */
+ /* _mesa_function_pool[13948]: ColorTable (offset 339) */
"iiiiip\0"
"glColorTable\0"
"glColorTableSGI\0"
"glColorTableEXT\0"
"\0"
- /* _mesa_function_pool[13611]: LoadName (offset 198) */
+ /* _mesa_function_pool[14001]: LoadName (offset 198) */
"i\0"
"glLoadName\0"
"\0"
- /* _mesa_function_pool[13625]: Color3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[14015]: Color3fVertex3fSUN (dynamic) */
"ffffff\0"
"glColor3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[13654]: GetnUniformuivARB (will be remapped) */
+ /* _mesa_function_pool[14044]: GetnUniformuivARB (will be remapped) */
"iiip\0"
"glGetnUniformuivARB\0"
"\0"
- /* _mesa_function_pool[13680]: ClearIndex (offset 205) */
+ /* _mesa_function_pool[14070]: ClearIndex (offset 205) */
"f\0"
"glClearIndex\0"
"\0"
- /* _mesa_function_pool[13696]: ConvolutionParameterfv (offset 351) */
+ /* _mesa_function_pool[14086]: ConvolutionParameterfv (offset 351) */
"iip\0"
"glConvolutionParameterfv\0"
"glConvolutionParameterfvEXT\0"
"\0"
- /* _mesa_function_pool[13754]: TbufferMask3DFX (dynamic) */
+ /* _mesa_function_pool[14144]: TbufferMask3DFX (dynamic) */
"i\0"
"glTbufferMask3DFX\0"
"\0"
- /* _mesa_function_pool[13775]: GetTexGendv (offset 278) */
+ /* _mesa_function_pool[14165]: GetTexGendv (offset 278) */
"iip\0"
"glGetTexGendv\0"
"\0"
- /* _mesa_function_pool[13794]: MultiTexCoordP1ui (will be remapped) */
+ /* _mesa_function_pool[14184]: MultiTexCoordP1ui (will be remapped) */
"iii\0"
"glMultiTexCoordP1ui\0"
"\0"
- /* _mesa_function_pool[13819]: EvalMesh2 (offset 238) */
+ /* _mesa_function_pool[14209]: EvalMesh2 (offset 238) */
"iiiii\0"
"glEvalMesh2\0"
"\0"
- /* _mesa_function_pool[13838]: Vertex4fv (offset 145) */
+ /* _mesa_function_pool[14228]: Vertex4fv (offset 145) */
"p\0"
"glVertex4fv\0"
"\0"
- /* _mesa_function_pool[13853]: SelectPerfMonitorCountersAMD (will be remapped) */
+ /* _mesa_function_pool[14243]: SelectPerfMonitorCountersAMD (will be remapped) */
"iiiip\0"
"glSelectPerfMonitorCountersAMD\0"
"\0"
- /* _mesa_function_pool[13891]: BindFramebuffer (will be remapped) */
+ /* _mesa_function_pool[14281]: TextureStorage2D (will be remapped) */
+ "iiiii\0"
+ "glTextureStorage2D\0"
+ "\0"
+ /* _mesa_function_pool[14307]: GetTextureParameterIiv (will be remapped) */
+ "iip\0"
+ "glGetTextureParameterIiv\0"
+ "\0"
+ /* _mesa_function_pool[14337]: BindFramebuffer (will be remapped) */
"ii\0"
"glBindFramebuffer\0"
"glBindFramebufferOES\0"
"\0"
- /* _mesa_function_pool[13934]: CreateProgram (will be remapped) */
+ /* _mesa_function_pool[14380]: CreateProgram (will be remapped) */
"\0"
"glCreateProgram\0"
"\0"
- /* _mesa_function_pool[13952]: GetMinmax (offset 364) */
+ /* _mesa_function_pool[14398]: GetMinmax (offset 364) */
"iiiip\0"
"glGetMinmax\0"
"glGetMinmaxEXT\0"
"\0"
- /* _mesa_function_pool[13986]: Color3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[14432]: Color3fVertex3fvSUN (dynamic) */
"pp\0"
"glColor3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[14012]: VertexAttribs3svNV (will be remapped) */
+ /* _mesa_function_pool[14458]: VertexAttribs3svNV (will be remapped) */
"iip\0"
"glVertexAttribs3svNV\0"
"\0"
- /* _mesa_function_pool[14038]: GetActiveUniformsiv (will be remapped) */
+ /* _mesa_function_pool[14484]: GetActiveUniformsiv (will be remapped) */
"iipip\0"
"glGetActiveUniformsiv\0"
"\0"
- /* _mesa_function_pool[14067]: VertexAttrib2sv (will be remapped) */
+ /* _mesa_function_pool[14513]: VertexAttrib2sv (will be remapped) */
"ip\0"
"glVertexAttrib2sv\0"
"glVertexAttrib2svARB\0"
"\0"
- /* _mesa_function_pool[14110]: GetProgramEnvParameterdvARB (will be remapped) */
+ /* _mesa_function_pool[14556]: GetProgramEnvParameterdvARB (will be remapped) */
"iip\0"
"glGetProgramEnvParameterdvARB\0"
"\0"
- /* _mesa_function_pool[14145]: VertexAttrib1dNV (will be remapped) */
- "id\0"
- "glVertexAttrib1dNV\0"
+ /* _mesa_function_pool[14591]: GetSharpenTexFuncSGIS (dynamic) */
+ "ip\0"
+ "glGetSharpenTexFuncSGIS\0"
+ "\0"
+ /* _mesa_function_pool[14619]: Uniform1dv (will be remapped) */
+ "iip\0"
+ "glUniform1dv\0"
+ "\0"
+ /* _mesa_function_pool[14637]: PixelTransformParameterfvEXT (dynamic) */
+ "iip\0"
+ "glPixelTransformParameterfvEXT\0"
"\0"
- /* _mesa_function_pool[14168]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[14673]: PushDebugGroup (will be remapped) */
+ "iiip\0"
+ "glPushDebugGroup\0"
+ "\0"
+ /* _mesa_function_pool[14696]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
"iffffff\0"
"glReplacementCodeuiNormal3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[14216]: GetPerfMonitorGroupStringAMD (will be remapped) */
+ /* _mesa_function_pool[14744]: GetPerfMonitorGroupStringAMD (will be remapped) */
"iipp\0"
"glGetPerfMonitorGroupStringAMD\0"
"\0"
- /* _mesa_function_pool[14253]: GetError (offset 261) */
+ /* _mesa_function_pool[14781]: GetError (offset 261) */
"\0"
"glGetError\0"
"\0"
- /* _mesa_function_pool[14266]: PassThrough (offset 199) */
+ /* _mesa_function_pool[14794]: PassThrough (offset 199) */
"f\0"
"glPassThrough\0"
"\0"
- /* _mesa_function_pool[14283]: GetListParameterfvSGIX (dynamic) */
+ /* _mesa_function_pool[14811]: GetListParameterfvSGIX (dynamic) */
"iip\0"
"glGetListParameterfvSGIX\0"
"\0"
- /* _mesa_function_pool[14313]: GetObjectParameterivAPPLE (will be remapped) */
+ /* _mesa_function_pool[14841]: GetObjectParameterivAPPLE (will be remapped) */
"iiip\0"
"glGetObjectParameterivAPPLE\0"
"\0"
- /* _mesa_function_pool[14347]: GlobalAlphaFactorubSUN (dynamic) */
+ /* _mesa_function_pool[14875]: GlobalAlphaFactorubSUN (dynamic) */
"i\0"
"glGlobalAlphaFactorubSUN\0"
"\0"
- /* _mesa_function_pool[14375]: BindBuffersRange (will be remapped) */
+ /* _mesa_function_pool[14903]: BindBuffersRange (will be remapped) */
"iiippp\0"
"glBindBuffersRange\0"
"\0"
- /* _mesa_function_pool[14402]: VertexAttrib4fvARB (will be remapped) */
+ /* _mesa_function_pool[14930]: VertexAttrib4fvARB (will be remapped) */
"ip\0"
"glVertexAttrib4fv\0"
"glVertexAttrib4fvARB\0"
"\0"
- /* _mesa_function_pool[14445]: WindowPos3dv (will be remapped) */
+ /* _mesa_function_pool[14973]: WindowPos3dv (will be remapped) */
"p\0"
"glWindowPos3dv\0"
"glWindowPos3dvARB\0"
"glWindowPos3dvMESA\0"
"\0"
- /* _mesa_function_pool[14500]: TexGenxOES (will be remapped) */
+ /* _mesa_function_pool[15028]: TexGenxOES (will be remapped) */
"iii\0"
"glTexGenxOES\0"
"\0"
- /* _mesa_function_pool[14518]: DeleteFencesNV (dynamic) */
+ /* _mesa_function_pool[15046]: DeleteFencesNV (dynamic) */
"ip\0"
"glDeleteFencesNV\0"
"\0"
- /* _mesa_function_pool[14539]: GetImageTransformParameterivHP (dynamic) */
+ /* _mesa_function_pool[15067]: GetImageTransformParameterivHP (dynamic) */
"iip\0"
"glGetImageTransformParameterivHP\0"
"\0"
- /* _mesa_function_pool[14577]: StencilOp (offset 244) */
+ /* _mesa_function_pool[15105]: StencilOp (offset 244) */
"iii\0"
"glStencilOp\0"
"\0"
- /* _mesa_function_pool[14594]: Binormal3fEXT (dynamic) */
+ /* _mesa_function_pool[15122]: Binormal3fEXT (dynamic) */
"fff\0"
"glBinormal3fEXT\0"
"\0"
- /* _mesa_function_pool[14615]: ProgramUniform1iv (will be remapped) */
+ /* _mesa_function_pool[15143]: ProgramUniform1iv (will be remapped) */
"iiip\0"
"glProgramUniform1iv\0"
"glProgramUniform1ivEXT\0"
"\0"
- /* _mesa_function_pool[14664]: ProgramUniform3ui (will be remapped) */
+ /* _mesa_function_pool[15192]: ProgramUniform3ui (will be remapped) */
"iiiii\0"
"glProgramUniform3ui\0"
"glProgramUniform3uiEXT\0"
"\0"
- /* _mesa_function_pool[14714]: SecondaryColor3sv (will be remapped) */
+ /* _mesa_function_pool[15242]: SecondaryColor3sv (will be remapped) */
"p\0"
"glSecondaryColor3sv\0"
"glSecondaryColor3svEXT\0"
"\0"
- /* _mesa_function_pool[14760]: TexCoordP3ui (will be remapped) */
+ /* _mesa_function_pool[15288]: TexCoordP3ui (will be remapped) */
"ii\0"
"glTexCoordP3ui\0"
"\0"
- /* _mesa_function_pool[14779]: Fogxv (will be remapped) */
+ /* _mesa_function_pool[15307]: Fogxv (will be remapped) */
"ip\0"
"glFogxvOES\0"
"glFogxv\0"
"\0"
- /* _mesa_function_pool[14802]: VertexPointervINTEL (dynamic) */
+ /* _mesa_function_pool[15330]: VertexPointervINTEL (dynamic) */
"iip\0"
"glVertexPointervINTEL\0"
"\0"
- /* _mesa_function_pool[14829]: VertexAttribP1ui (will be remapped) */
+ /* _mesa_function_pool[15357]: VertexAttribP1ui (will be remapped) */
"iiii\0"
"glVertexAttribP1ui\0"
"\0"
- /* _mesa_function_pool[14854]: DeleteLists (offset 4) */
+ /* _mesa_function_pool[15382]: DeleteLists (offset 4) */
"ii\0"
"glDeleteLists\0"
"\0"
- /* _mesa_function_pool[14872]: LogicOp (offset 242) */
+ /* _mesa_function_pool[15400]: LogicOp (offset 242) */
"i\0"
"glLogicOp\0"
"\0"
- /* _mesa_function_pool[14885]: RenderbufferStorageMultisample (will be remapped) */
+ /* _mesa_function_pool[15413]: RenderbufferStorageMultisample (will be remapped) */
"iiiii\0"
"glRenderbufferStorageMultisample\0"
"glRenderbufferStorageMultisampleEXT\0"
"\0"
- /* _mesa_function_pool[14961]: WindowPos3d (will be remapped) */
+ /* _mesa_function_pool[15489]: WindowPos3d (will be remapped) */
"ddd\0"
"glWindowPos3d\0"
"glWindowPos3dARB\0"
"glWindowPos3dMESA\0"
"\0"
- /* _mesa_function_pool[15015]: Enablei (will be remapped) */
+ /* _mesa_function_pool[15543]: Enablei (will be remapped) */
"ii\0"
"glEnableIndexedEXT\0"
"glEnablei\0"
"\0"
- /* _mesa_function_pool[15048]: WindowPos3f (will be remapped) */
+ /* _mesa_function_pool[15576]: WindowPos3f (will be remapped) */
"fff\0"
"glWindowPos3f\0"
"glWindowPos3fARB\0"
"glWindowPos3fMESA\0"
"\0"
- /* _mesa_function_pool[15102]: GenProgramsARB (will be remapped) */
+ /* _mesa_function_pool[15630]: GenProgramsARB (will be remapped) */
"ip\0"
"glGenProgramsARB\0"
"glGenProgramsNV\0"
"\0"
- /* _mesa_function_pool[15139]: RasterPos2sv (offset 69) */
+ /* _mesa_function_pool[15667]: RasterPos2sv (offset 69) */
"p\0"
"glRasterPos2sv\0"
"\0"
- /* _mesa_function_pool[15157]: WindowPos3i (will be remapped) */
+ /* _mesa_function_pool[15685]: WindowPos3i (will be remapped) */
"iii\0"
"glWindowPos3i\0"
"glWindowPos3iARB\0"
"glWindowPos3iMESA\0"
"\0"
- /* _mesa_function_pool[15211]: MultiTexCoord4iv (offset 405) */
+ /* _mesa_function_pool[15739]: MultiTexCoord4iv (offset 405) */
"ip\0"
"glMultiTexCoord4iv\0"
"glMultiTexCoord4ivARB\0"
"\0"
- /* _mesa_function_pool[15256]: TexCoord1sv (offset 101) */
+ /* _mesa_function_pool[15784]: TexCoord1sv (offset 101) */
"p\0"
"glTexCoord1sv\0"
"\0"
- /* _mesa_function_pool[15273]: WindowPos3s (will be remapped) */
+ /* _mesa_function_pool[15801]: WindowPos3s (will be remapped) */
"iii\0"
"glWindowPos3s\0"
"glWindowPos3sARB\0"
"glWindowPos3sMESA\0"
"\0"
- /* _mesa_function_pool[15327]: PixelMapusv (offset 253) */
+ /* _mesa_function_pool[15855]: PixelMapusv (offset 253) */
"iip\0"
"glPixelMapusv\0"
"\0"
- /* _mesa_function_pool[15346]: DebugMessageInsert (will be remapped) */
+ /* _mesa_function_pool[15874]: DebugMessageInsert (will be remapped) */
"iiiiip\0"
"glDebugMessageInsertARB\0"
"glDebugMessageInsert\0"
"\0"
- /* _mesa_function_pool[15399]: Orthof (will be remapped) */
+ /* _mesa_function_pool[15927]: Orthof (will be remapped) */
"ffffff\0"
"glOrthofOES\0"
"glOrthof\0"
"\0"
- /* _mesa_function_pool[15428]: CompressedTexImage2D (will be remapped) */
+ /* _mesa_function_pool[15956]: CompressedTexImage2D (will be remapped) */
"iiiiiiip\0"
"glCompressedTexImage2D\0"
"glCompressedTexImage2DARB\0"
"\0"
- /* _mesa_function_pool[15487]: DeleteObjectARB (will be remapped) */
+ /* _mesa_function_pool[16015]: DeleteObjectARB (will be remapped) */
"i\0"
"glDeleteObjectARB\0"
"\0"
- /* _mesa_function_pool[15508]: IsSync (will be remapped) */
+ /* _mesa_function_pool[16036]: ProgramUniformMatrix2x3dv (will be remapped) */
+ "iiiip\0"
+ "glProgramUniformMatrix2x3dv\0"
+ "\0"
+ /* _mesa_function_pool[16071]: IsSync (will be remapped) */
"i\0"
"glIsSync\0"
"\0"
- /* _mesa_function_pool[15520]: Color4uiv (offset 38) */
+ /* _mesa_function_pool[16083]: Color4uiv (offset 38) */
"p\0"
"glColor4uiv\0"
"\0"
- /* _mesa_function_pool[15535]: MultiTexCoord1sv (offset 383) */
+ /* _mesa_function_pool[16098]: MultiTexCoord1sv (offset 383) */
"ip\0"
"glMultiTexCoord1sv\0"
"glMultiTexCoord1svARB\0"
"\0"
- /* _mesa_function_pool[15580]: Orthox (will be remapped) */
+ /* _mesa_function_pool[16143]: Orthox (will be remapped) */
"iiiiii\0"
"glOrthoxOES\0"
"glOrthox\0"
"\0"
- /* _mesa_function_pool[15609]: PushAttrib (offset 219) */
+ /* _mesa_function_pool[16172]: PushAttrib (offset 219) */
"i\0"
"glPushAttrib\0"
"\0"
- /* _mesa_function_pool[15625]: RasterPos2i (offset 66) */
+ /* _mesa_function_pool[16188]: RasterPos2i (offset 66) */
"ii\0"
"glRasterPos2i\0"
"\0"
- /* _mesa_function_pool[15643]: ClipPlane (offset 150) */
+ /* _mesa_function_pool[16206]: ClipPlane (offset 150) */
"ip\0"
"glClipPlane\0"
"\0"
- /* _mesa_function_pool[15659]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[16222]: TexCoord2fColor3fVertex3fSUN (dynamic) */
"ffffffff\0"
"glTexCoord2fColor3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[15700]: GetProgramivNV (will be remapped) */
+ /* _mesa_function_pool[16263]: GetProgramivNV (will be remapped) */
"iip\0"
"glGetProgramivNV\0"
"\0"
- /* _mesa_function_pool[15722]: RasterPos2f (offset 64) */
+ /* _mesa_function_pool[16285]: RasterPos2f (offset 64) */
"ff\0"
"glRasterPos2f\0"
"\0"
- /* _mesa_function_pool[15740]: RasterPos2d (offset 62) */
+ /* _mesa_function_pool[16303]: RasterPos2d (offset 62) */
"dd\0"
"glRasterPos2d\0"
"\0"
- /* _mesa_function_pool[15758]: RasterPos3fv (offset 73) */
+ /* _mesa_function_pool[16321]: RasterPos3fv (offset 73) */
"p\0"
"glRasterPos3fv\0"
"\0"
- /* _mesa_function_pool[15776]: InvalidateSubFramebuffer (will be remapped) */
+ /* _mesa_function_pool[16339]: InvalidateSubFramebuffer (will be remapped) */
"iipiiii\0"
"glInvalidateSubFramebuffer\0"
"\0"
- /* _mesa_function_pool[15812]: Color4ub (offset 35) */
+ /* _mesa_function_pool[16375]: Color4ub (offset 35) */
"iiii\0"
"glColor4ub\0"
"\0"
- /* _mesa_function_pool[15829]: RasterPos2s (offset 68) */
+ /* _mesa_function_pool[16392]: UniformMatrix2x4dv (will be remapped) */
+ "iiip\0"
+ "glUniformMatrix2x4dv\0"
+ "\0"
+ /* _mesa_function_pool[16419]: RasterPos2s (offset 68) */
"ii\0"
"glRasterPos2s\0"
"\0"
- /* _mesa_function_pool[15847]: Color4fNormal3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[16437]: VertexP2uiv (will be remapped) */
+ "ip\0"
+ "glVertexP2uiv\0"
+ "\0"
+ /* _mesa_function_pool[16455]: Color4fNormal3fVertex3fvSUN (dynamic) */
"ppp\0"
"glColor4fNormal3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[15882]: GetVertexAttribivNV (will be remapped) */
+ /* _mesa_function_pool[16490]: GetVertexAttribivNV (will be remapped) */
"iip\0"
"glGetVertexAttribivNV\0"
"\0"
- /* _mesa_function_pool[15909]: TexSubImage4DSGIS (dynamic) */
+ /* _mesa_function_pool[16517]: TexSubImage4DSGIS (dynamic) */
"iiiiiiiiiiiip\0"
"glTexSubImage4DSGIS\0"
"\0"
- /* _mesa_function_pool[15944]: MultiTexCoord3dv (offset 393) */
+ /* _mesa_function_pool[16552]: MultiTexCoord3dv (offset 393) */
"ip\0"
"glMultiTexCoord3dv\0"
"glMultiTexCoord3dvARB\0"
"\0"
- /* _mesa_function_pool[15989]: BindProgramPipeline (will be remapped) */
+ /* _mesa_function_pool[16597]: BindProgramPipeline (will be remapped) */
"i\0"
"glBindProgramPipeline\0"
"glBindProgramPipelineEXT\0"
"\0"
- /* _mesa_function_pool[16039]: VertexAttribP4uiv (will be remapped) */
+ /* _mesa_function_pool[16647]: VertexAttribP4uiv (will be remapped) */
"iiip\0"
"glVertexAttribP4uiv\0"
"\0"
- /* _mesa_function_pool[16065]: DebugMessageCallback (will be remapped) */
+ /* _mesa_function_pool[16673]: DebugMessageCallback (will be remapped) */
"pp\0"
"glDebugMessageCallbackARB\0"
"glDebugMessageCallback\0"
"\0"
- /* _mesa_function_pool[16118]: MultiTexCoord1i (offset 380) */
+ /* _mesa_function_pool[16726]: MultiTexCoord1i (offset 380) */
"ii\0"
"glMultiTexCoord1i\0"
"glMultiTexCoord1iARB\0"
"\0"
- /* _mesa_function_pool[16161]: WindowPos2dv (will be remapped) */
+ /* _mesa_function_pool[16769]: WindowPos2dv (will be remapped) */
"p\0"
"glWindowPos2dv\0"
"glWindowPos2dvARB\0"
"glWindowPos2dvMESA\0"
"\0"
- /* _mesa_function_pool[16216]: TexParameterIuiv (will be remapped) */
+ /* _mesa_function_pool[16824]: TexParameterIuiv (will be remapped) */
"iip\0"
"glTexParameterIuivEXT\0"
"glTexParameterIuiv\0"
"\0"
- /* _mesa_function_pool[16262]: DeletePerfQueryINTEL (will be remapped) */
+ /* _mesa_function_pool[16870]: DeletePerfQueryINTEL (will be remapped) */
"i\0"
"glDeletePerfQueryINTEL\0"
"\0"
- /* _mesa_function_pool[16288]: MultiTexCoord1d (offset 376) */
+ /* _mesa_function_pool[16896]: MultiTexCoord1d (offset 376) */
"id\0"
"glMultiTexCoord1d\0"
"glMultiTexCoord1dARB\0"
"\0"
- /* _mesa_function_pool[16331]: GenVertexArraysAPPLE (will be remapped) */
+ /* _mesa_function_pool[16939]: GenVertexArraysAPPLE (will be remapped) */
"ip\0"
"glGenVertexArraysAPPLE\0"
"\0"
- /* _mesa_function_pool[16358]: MultiTexCoord1s (offset 382) */
+ /* _mesa_function_pool[16966]: MultiTexCoord1s (offset 382) */
"ii\0"
"glMultiTexCoord1s\0"
"glMultiTexCoord1sARB\0"
"\0"
- /* _mesa_function_pool[16401]: BeginConditionalRender (will be remapped) */
+ /* _mesa_function_pool[17009]: BeginConditionalRender (will be remapped) */
"ii\0"
"glBeginConditionalRender\0"
"glBeginConditionalRenderNV\0"
"\0"
- /* _mesa_function_pool[16457]: LoadPaletteFromModelViewMatrixOES (dynamic) */
+ /* _mesa_function_pool[17065]: LoadPaletteFromModelViewMatrixOES (dynamic) */
"\0"
"glLoadPaletteFromModelViewMatrixOES\0"
"\0"
- /* _mesa_function_pool[16495]: GetShaderiv (will be remapped) */
+ /* _mesa_function_pool[17103]: GetShaderiv (will be remapped) */
"iip\0"
"glGetShaderiv\0"
"\0"
- /* _mesa_function_pool[16514]: GetMapAttribParameterfvNV (dynamic) */
+ /* _mesa_function_pool[17122]: GetMapAttribParameterfvNV (dynamic) */
"iiip\0"
"glGetMapAttribParameterfvNV\0"
"\0"
- /* _mesa_function_pool[16548]: CopyConvolutionFilter1D (offset 354) */
+ /* _mesa_function_pool[17156]: CopyConvolutionFilter1D (offset 354) */
"iiiii\0"
"glCopyConvolutionFilter1D\0"
"glCopyConvolutionFilter1DEXT\0"
"\0"
- /* _mesa_function_pool[16610]: ClearBufferfv (will be remapped) */
+ /* _mesa_function_pool[17218]: ClearBufferfv (will be remapped) */
"iip\0"
"glClearBufferfv\0"
"\0"
- /* _mesa_function_pool[16631]: InstrumentsBufferSGIX (dynamic) */
+ /* _mesa_function_pool[17239]: UniformMatrix4dv (will be remapped) */
+ "iiip\0"
+ "glUniformMatrix4dv\0"
+ "\0"
+ /* _mesa_function_pool[17264]: InstrumentsBufferSGIX (dynamic) */
"ip\0"
"glInstrumentsBufferSGIX\0"
"\0"
- /* _mesa_function_pool[16659]: CreateShaderObjectARB (will be remapped) */
+ /* _mesa_function_pool[17292]: CreateShaderObjectARB (will be remapped) */
"i\0"
"glCreateShaderObjectARB\0"
"\0"
- /* _mesa_function_pool[16686]: GetTexParameterxv (will be remapped) */
+ /* _mesa_function_pool[17319]: GetTexParameterxv (will be remapped) */
"iip\0"
"glGetTexParameterxvOES\0"
"glGetTexParameterxv\0"
"\0"
- /* _mesa_function_pool[16734]: GetAttachedShaders (will be remapped) */
+ /* _mesa_function_pool[17367]: GetAttachedShaders (will be remapped) */
"iipp\0"
"glGetAttachedShaders\0"
"\0"
- /* _mesa_function_pool[16761]: ClearBufferfi (will be remapped) */
+ /* _mesa_function_pool[17394]: ClearBufferfi (will be remapped) */
"iifi\0"
"glClearBufferfi\0"
"\0"
- /* _mesa_function_pool[16783]: Materialiv (offset 172) */
+ /* _mesa_function_pool[17416]: Materialiv (offset 172) */
"iip\0"
"glMaterialiv\0"
"\0"
- /* _mesa_function_pool[16801]: DeleteFragmentShaderATI (will be remapped) */
+ /* _mesa_function_pool[17434]: DeleteFragmentShaderATI (will be remapped) */
"i\0"
"glDeleteFragmentShaderATI\0"
"\0"
- /* _mesa_function_pool[16830]: Tangent3dvEXT (dynamic) */
+ /* _mesa_function_pool[17463]: Tangent3dvEXT (dynamic) */
"p\0"
"glTangent3dvEXT\0"
"\0"
- /* _mesa_function_pool[16849]: DrawElementsInstancedBaseVertex (will be remapped) */
+ /* _mesa_function_pool[17482]: DrawElementsInstancedBaseVertex (will be remapped) */
"iiipii\0"
"glDrawElementsInstancedBaseVertex\0"
"\0"
- /* _mesa_function_pool[16891]: DisableClientState (offset 309) */
+ /* _mesa_function_pool[17524]: DisableClientState (offset 309) */
"i\0"
"glDisableClientState\0"
"\0"
- /* _mesa_function_pool[16915]: TexGeni (offset 192) */
+ /* _mesa_function_pool[17548]: TexGeni (offset 192) */
"iii\0"
"glTexGeni\0"
"glTexGeniOES\0"
"\0"
- /* _mesa_function_pool[16943]: TexGenf (offset 190) */
+ /* _mesa_function_pool[17576]: TexGenf (offset 190) */
"iif\0"
"glTexGenf\0"
"glTexGenfOES\0"
"\0"
- /* _mesa_function_pool[16971]: TexGend (offset 188) */
+ /* _mesa_function_pool[17604]: TexGend (offset 188) */
"iid\0"
"glTexGend\0"
"\0"
- /* _mesa_function_pool[16986]: GetVertexAttribfvNV (will be remapped) */
+ /* _mesa_function_pool[17619]: GetVertexAttribfvNV (will be remapped) */
"iip\0"
"glGetVertexAttribfvNV\0"
"\0"
- /* _mesa_function_pool[17013]: ColorPointerListIBM (dynamic) */
+ /* _mesa_function_pool[17646]: ColorPointerListIBM (dynamic) */
"iiipi\0"
"glColorPointerListIBM\0"
"\0"
- /* _mesa_function_pool[17042]: Color4sv (offset 34) */
+ /* _mesa_function_pool[17675]: Color4sv (offset 34) */
"p\0"
"glColor4sv\0"
"\0"
- /* _mesa_function_pool[17056]: GetCombinerInputParameterfvNV (dynamic) */
+ /* _mesa_function_pool[17689]: GetCombinerInputParameterfvNV (dynamic) */
"iiiip\0"
"glGetCombinerInputParameterfvNV\0"
"\0"
- /* _mesa_function_pool[17095]: LoadTransposeMatrixf (will be remapped) */
+ /* _mesa_function_pool[17728]: LoadTransposeMatrixf (will be remapped) */
"p\0"
"glLoadTransposeMatrixf\0"
"glLoadTransposeMatrixfARB\0"
"\0"
- /* _mesa_function_pool[17147]: LoadTransposeMatrixd (will be remapped) */
+ /* _mesa_function_pool[17780]: LoadTransposeMatrixd (will be remapped) */
"p\0"
"glLoadTransposeMatrixd\0"
"glLoadTransposeMatrixdARB\0"
"\0"
- /* _mesa_function_pool[17199]: PixelZoom (offset 246) */
+ /* _mesa_function_pool[17832]: PixelZoom (offset 246) */
"ff\0"
"glPixelZoom\0"
"\0"
- /* _mesa_function_pool[17215]: ProgramEnvParameter4dARB (will be remapped) */
+ /* _mesa_function_pool[17848]: ProgramEnvParameter4dARB (will be remapped) */
"iidddd\0"
"glProgramEnvParameter4dARB\0"
"glProgramParameter4dNV\0"
"\0"
- /* _mesa_function_pool[17273]: ColorTableParameterfv (offset 340) */
+ /* _mesa_function_pool[17906]: ColorTableParameterfv (offset 340) */
"iip\0"
"glColorTableParameterfv\0"
"glColorTableParameterfvSGI\0"
"\0"
- /* _mesa_function_pool[17329]: IsTexture (offset 330) */
+ /* _mesa_function_pool[17962]: IsTexture (offset 330) */
"i\0"
"glIsTexture\0"
"glIsTextureEXT\0"
"\0"
- /* _mesa_function_pool[17359]: ProgramUniform3uiv (will be remapped) */
+ /* _mesa_function_pool[17992]: ProgramUniform3uiv (will be remapped) */
"iiip\0"
"glProgramUniform3uiv\0"
"glProgramUniform3uivEXT\0"
"\0"
- /* _mesa_function_pool[17410]: ProgramUniform2fv (will be remapped) */
- "iiip\0"
- "glProgramUniform2fv\0"
- "glProgramUniform2fvEXT\0"
+ /* _mesa_function_pool[18043]: GetTextureImage (will be remapped) */
+ "iiiiip\0"
+ "glGetTextureImage\0"
"\0"
- /* _mesa_function_pool[17459]: ImageTransformParameterivHP (dynamic) */
+ /* _mesa_function_pool[18069]: ImageTransformParameterivHP (dynamic) */
"iip\0"
"glImageTransformParameterivHP\0"
"\0"
- /* _mesa_function_pool[17494]: VertexAttrib4sNV (will be remapped) */
+ /* _mesa_function_pool[18104]: VertexAttrib4sNV (will be remapped) */
"iiiii\0"
"glVertexAttrib4sNV\0"
"\0"
- /* _mesa_function_pool[17520]: GetMapdv (offset 266) */
+ /* _mesa_function_pool[18130]: GetMapdv (offset 266) */
"iip\0"
"glGetMapdv\0"
"\0"
- /* _mesa_function_pool[17536]: GenVertexArrays (will be remapped) */
- "ip\0"
- "glGenVertexArrays\0"
- "glGenVertexArraysOES\0"
+ /* _mesa_function_pool[18146]: GetInteger64i_v (will be remapped) */
+ "iip\0"
+ "glGetInteger64i_v\0"
"\0"
- /* _mesa_function_pool[17579]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[18169]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
"iiiiifff\0"
"glReplacementCodeuiColor4ubVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[17628]: IsBuffer (will be remapped) */
+ /* _mesa_function_pool[18218]: IsBuffer (will be remapped) */
"i\0"
"glIsBuffer\0"
"glIsBufferARB\0"
"\0"
- /* _mesa_function_pool[17656]: ColorP4ui (will be remapped) */
+ /* _mesa_function_pool[18246]: ColorP4ui (will be remapped) */
"ii\0"
"glColorP4ui\0"
"\0"
- /* _mesa_function_pool[17672]: SpriteParameteriSGIX (dynamic) */
+ /* _mesa_function_pool[18262]: TextureStorage3D (will be remapped) */
+ "iiiiii\0"
+ "glTextureStorage3D\0"
+ "\0"
+ /* _mesa_function_pool[18289]: SpriteParameteriSGIX (dynamic) */
"ii\0"
"glSpriteParameteriSGIX\0"
"\0"
- /* _mesa_function_pool[17699]: TexCoordP3uiv (will be remapped) */
+ /* _mesa_function_pool[18316]: TexCoordP3uiv (will be remapped) */
"ip\0"
"glTexCoordP3uiv\0"
"\0"
- /* _mesa_function_pool[17719]: WeightusvARB (dynamic) */
+ /* _mesa_function_pool[18336]: WeightusvARB (dynamic) */
"ip\0"
"glWeightusvARB\0"
"\0"
- /* _mesa_function_pool[17738]: EvalMapsNV (dynamic) */
+ /* _mesa_function_pool[18355]: EvalMapsNV (dynamic) */
"ii\0"
"glEvalMapsNV\0"
"\0"
- /* _mesa_function_pool[17755]: ReplacementCodeuiSUN (dynamic) */
+ /* _mesa_function_pool[18372]: ReplacementCodeuiSUN (dynamic) */
"i\0"
"glReplacementCodeuiSUN\0"
"\0"
- /* _mesa_function_pool[17781]: GlobalAlphaFactoruiSUN (dynamic) */
+ /* _mesa_function_pool[18398]: GlobalAlphaFactoruiSUN (dynamic) */
"i\0"
"glGlobalAlphaFactoruiSUN\0"
"\0"
- /* _mesa_function_pool[17809]: Uniform1iv (will be remapped) */
+ /* _mesa_function_pool[18426]: Uniform1iv (will be remapped) */
"iip\0"
"glUniform1iv\0"
"glUniform1ivARB\0"
"\0"
- /* _mesa_function_pool[17843]: Uniform4uiv (will be remapped) */
+ /* _mesa_function_pool[18460]: Uniform4uiv (will be remapped) */
"iip\0"
"glUniform4uivEXT\0"
"glUniform4uiv\0"
"\0"
- /* _mesa_function_pool[17879]: PopDebugGroup (will be remapped) */
+ /* _mesa_function_pool[18496]: PopDebugGroup (will be remapped) */
"\0"
"glPopDebugGroup\0"
"\0"
- /* _mesa_function_pool[17897]: VertexAttrib1d (will be remapped) */
+ /* _mesa_function_pool[18514]: VertexAttrib1d (will be remapped) */
"id\0"
"glVertexAttrib1d\0"
"glVertexAttrib1dARB\0"
"\0"
- /* _mesa_function_pool[17938]: CompressedTexImage1D (will be remapped) */
+ /* _mesa_function_pool[18555]: CompressedTexImage1D (will be remapped) */
"iiiiiip\0"
"glCompressedTexImage1D\0"
"glCompressedTexImage1DARB\0"
"\0"
- /* _mesa_function_pool[17996]: TexBufferRange (will be remapped) */
+ /* _mesa_function_pool[18613]: TexBufferRange (will be remapped) */
"iiiii\0"
"glTexBufferRange\0"
"\0"
- /* _mesa_function_pool[18020]: VertexAttrib1s (will be remapped) */
+ /* _mesa_function_pool[18637]: VertexAttrib1s (will be remapped) */
"ii\0"
"glVertexAttrib1s\0"
"glVertexAttrib1sARB\0"
"\0"
- /* _mesa_function_pool[18061]: MultiDrawElementsIndirect (will be remapped) */
+ /* _mesa_function_pool[18678]: MultiDrawElementsIndirect (will be remapped) */
"iipii\0"
"glMultiDrawElementsIndirect\0"
"\0"
- /* _mesa_function_pool[18096]: FogCoordfvEXT (will be remapped) */
+ /* _mesa_function_pool[18713]: UniformMatrix4x3dv (will be remapped) */
+ "iiip\0"
+ "glUniformMatrix4x3dv\0"
+ "\0"
+ /* _mesa_function_pool[18740]: FogCoordfvEXT (will be remapped) */
"p\0"
"glFogCoordfv\0"
"glFogCoordfvEXT\0"
"\0"
- /* _mesa_function_pool[18128]: BeginPerfMonitorAMD (will be remapped) */
+ /* _mesa_function_pool[18772]: BeginPerfMonitorAMD (will be remapped) */
"i\0"
"glBeginPerfMonitorAMD\0"
"\0"
- /* _mesa_function_pool[18153]: GetColorTableParameterfv (offset 344) */
+ /* _mesa_function_pool[18797]: GetColorTableParameterfv (offset 344) */
"iip\0"
"glGetColorTableParameterfv\0"
"glGetColorTableParameterfvSGI\0"
"glGetColorTableParameterfvEXT\0"
"\0"
- /* _mesa_function_pool[18245]: MultiTexCoord3fARB (offset 394) */
+ /* _mesa_function_pool[18889]: MultiTexCoord3fARB (offset 394) */
"ifff\0"
"glMultiTexCoord3f\0"
"glMultiTexCoord3fARB\0"
"\0"
- /* _mesa_function_pool[18290]: GetTexLevelParameterfv (offset 284) */
+ /* _mesa_function_pool[18934]: GetTexLevelParameterfv (offset 284) */
"iiip\0"
"glGetTexLevelParameterfv\0"
"\0"
- /* _mesa_function_pool[18321]: Vertex2sv (offset 133) */
+ /* _mesa_function_pool[18965]: Vertex2sv (offset 133) */
"p\0"
"glVertex2sv\0"
"\0"
- /* _mesa_function_pool[18336]: GetnMapdvARB (will be remapped) */
+ /* _mesa_function_pool[18980]: GetnMapdvARB (will be remapped) */
"iiip\0"
"glGetnMapdvARB\0"
"\0"
- /* _mesa_function_pool[18357]: VertexAttrib2dNV (will be remapped) */
+ /* _mesa_function_pool[19001]: VertexAttrib2dNV (will be remapped) */
"idd\0"
"glVertexAttrib2dNV\0"
"\0"
- /* _mesa_function_pool[18381]: GetTrackMatrixivNV (will be remapped) */
+ /* _mesa_function_pool[19025]: GetTrackMatrixivNV (will be remapped) */
"iiip\0"
"glGetTrackMatrixivNV\0"
"\0"
- /* _mesa_function_pool[18408]: VertexAttrib3svNV (will be remapped) */
+ /* _mesa_function_pool[19052]: VertexAttrib3svNV (will be remapped) */
"ip\0"
"glVertexAttrib3svNV\0"
"\0"
- /* _mesa_function_pool[18432]: GetTexEnviv (offset 277) */
+ /* _mesa_function_pool[19076]: GetTexEnviv (offset 277) */
"iip\0"
"glGetTexEnviv\0"
"\0"
- /* _mesa_function_pool[18451]: ViewportArrayv (will be remapped) */
+ /* _mesa_function_pool[19095]: ViewportArrayv (will be remapped) */
"iip\0"
"glViewportArrayv\0"
"\0"
- /* _mesa_function_pool[18473]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[19117]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
"iffffffffffff\0"
"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[18544]: SeparableFilter2D (offset 360) */
+ /* _mesa_function_pool[19188]: SeparableFilter2D (offset 360) */
"iiiiiipp\0"
"glSeparableFilter2D\0"
"glSeparableFilter2DEXT\0"
"\0"
- /* _mesa_function_pool[18597]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[19241]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
"ppp\0"
"glReplacementCodeuiColor4ubVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[18642]: ArrayElement (offset 306) */
+ /* _mesa_function_pool[19286]: ArrayElement (offset 306) */
"i\0"
"glArrayElement\0"
"glArrayElementEXT\0"
"\0"
- /* _mesa_function_pool[18678]: TexImage2D (offset 183) */
+ /* _mesa_function_pool[19322]: TexImage2D (offset 183) */
"iiiiiiiip\0"
"glTexImage2D\0"
"\0"
- /* _mesa_function_pool[18702]: FragmentMaterialiSGIX (dynamic) */
+ /* _mesa_function_pool[19346]: FragmentMaterialiSGIX (dynamic) */
"iii\0"
"glFragmentMaterialiSGIX\0"
"\0"
- /* _mesa_function_pool[18731]: RasterPos2dv (offset 63) */
+ /* _mesa_function_pool[19375]: RasterPos2dv (offset 63) */
"p\0"
"glRasterPos2dv\0"
"\0"
- /* _mesa_function_pool[18749]: Fogiv (offset 156) */
+ /* _mesa_function_pool[19393]: Fogiv (offset 156) */
"ip\0"
"glFogiv\0"
"\0"
- /* _mesa_function_pool[18761]: EndQuery (will be remapped) */
+ /* _mesa_function_pool[19405]: EndQuery (will be remapped) */
"i\0"
"glEndQuery\0"
"glEndQueryARB\0"
"\0"
- /* _mesa_function_pool[18789]: TexCoord1dv (offset 95) */
+ /* _mesa_function_pool[19433]: TexCoord1dv (offset 95) */
"p\0"
"glTexCoord1dv\0"
"\0"
- /* _mesa_function_pool[18806]: TexCoord4dv (offset 119) */
+ /* _mesa_function_pool[19450]: TexCoord4dv (offset 119) */
"p\0"
"glTexCoord4dv\0"
"\0"
- /* _mesa_function_pool[18823]: GetVertexAttribdvNV (will be remapped) */
+ /* _mesa_function_pool[19467]: GetVertexAttribdvNV (will be remapped) */
"iip\0"
"glGetVertexAttribdvNV\0"
"\0"
- /* _mesa_function_pool[18850]: Clear (offset 203) */
+ /* _mesa_function_pool[19494]: Clear (offset 203) */
"i\0"
"glClear\0"
"\0"
- /* _mesa_function_pool[18861]: VertexAttrib4sv (will be remapped) */
+ /* _mesa_function_pool[19505]: VertexAttrib4sv (will be remapped) */
"ip\0"
"glVertexAttrib4sv\0"
"glVertexAttrib4svARB\0"
"\0"
- /* _mesa_function_pool[18904]: Ortho (offset 296) */
+ /* _mesa_function_pool[19548]: Ortho (offset 296) */
"dddddd\0"
"glOrtho\0"
"\0"
- /* _mesa_function_pool[18920]: Uniform3uiv (will be remapped) */
+ /* _mesa_function_pool[19564]: Uniform3uiv (will be remapped) */
"iip\0"
"glUniform3uivEXT\0"
"glUniform3uiv\0"
"\0"
- /* _mesa_function_pool[18956]: MatrixIndexPointerARB (dynamic) */
+ /* _mesa_function_pool[19600]: MatrixIndexPointerARB (dynamic) */
"iiip\0"
"glMatrixIndexPointerARB\0"
"glMatrixIndexPointerOES\0"
"\0"
- /* _mesa_function_pool[19010]: EndQueryIndexed (will be remapped) */
+ /* _mesa_function_pool[19654]: EndQueryIndexed (will be remapped) */
"ii\0"
"glEndQueryIndexed\0"
"\0"
- /* _mesa_function_pool[19032]: TexParameterxv (will be remapped) */
+ /* _mesa_function_pool[19676]: TexParameterxv (will be remapped) */
"iip\0"
"glTexParameterxvOES\0"
"glTexParameterxv\0"
"\0"
- /* _mesa_function_pool[19074]: SampleMaskSGIS (will be remapped) */
+ /* _mesa_function_pool[19718]: SampleMaskSGIS (will be remapped) */
"fi\0"
"glSampleMaskSGIS\0"
"glSampleMaskEXT\0"
"\0"
- /* _mesa_function_pool[19111]: FramebufferTextureFaceARB (will be remapped) */
+ /* _mesa_function_pool[19755]: FramebufferTextureFaceARB (will be remapped) */
"iiiii\0"
"glFramebufferTextureFaceARB\0"
"\0"
- /* _mesa_function_pool[19146]: ProgramUniformMatrix2fv (will be remapped) */
+ /* _mesa_function_pool[19790]: ProgramUniformMatrix2fv (will be remapped) */
"iiiip\0"
"glProgramUniformMatrix2fv\0"
"glProgramUniformMatrix2fvEXT\0"
"\0"
- /* _mesa_function_pool[19208]: ProgramLocalParameter4fvARB (will be remapped) */
+ /* _mesa_function_pool[19852]: ProgramLocalParameter4fvARB (will be remapped) */
"iip\0"
"glProgramLocalParameter4fvARB\0"
"\0"
- /* _mesa_function_pool[19243]: GetProgramStringNV (will be remapped) */
+ /* _mesa_function_pool[19887]: GetProgramStringNV (will be remapped) */
"iip\0"
"glGetProgramStringNV\0"
"\0"
- /* _mesa_function_pool[19269]: Binormal3svEXT (dynamic) */
+ /* _mesa_function_pool[19913]: Binormal3svEXT (dynamic) */
"p\0"
"glBinormal3svEXT\0"
"\0"
- /* _mesa_function_pool[19289]: LightModelx (will be remapped) */
+ /* _mesa_function_pool[19933]: Uniform4dv (will be remapped) */
+ "iip\0"
+ "glUniform4dv\0"
+ "\0"
+ /* _mesa_function_pool[19951]: LightModelx (will be remapped) */
"ii\0"
"glLightModelxOES\0"
"glLightModelx\0"
"\0"
- /* _mesa_function_pool[19324]: VertexAttribI3iEXT (will be remapped) */
+ /* _mesa_function_pool[19986]: VertexAttribI3iEXT (will be remapped) */
"iiii\0"
"glVertexAttribI3iEXT\0"
"glVertexAttribI3i\0"
"\0"
- /* _mesa_function_pool[19369]: ClearColorx (will be remapped) */
+ /* _mesa_function_pool[20031]: ClearColorx (will be remapped) */
"iiii\0"
"glClearColorxOES\0"
"glClearColorx\0"
"\0"
- /* _mesa_function_pool[19406]: EndTransformFeedback (will be remapped) */
+ /* _mesa_function_pool[20068]: EndTransformFeedback (will be remapped) */
"\0"
"glEndTransformFeedback\0"
"glEndTransformFeedbackEXT\0"
"\0"
- /* _mesa_function_pool[19457]: VertexAttribs4dvNV (will be remapped) */
- "iip\0"
- "glVertexAttribs4dvNV\0"
+ /* _mesa_function_pool[20119]: GetHandleARB (will be remapped) */
+ "i\0"
+ "glGetHandleARB\0"
"\0"
- /* _mesa_function_pool[19483]: GetProgramBinary (will be remapped) */
+ /* _mesa_function_pool[20137]: GetProgramBinary (will be remapped) */
"iippp\0"
"glGetProgramBinary\0"
"glGetProgramBinaryOES\0"
"\0"
- /* _mesa_function_pool[19531]: ViewportIndexedfv (will be remapped) */
+ /* _mesa_function_pool[20185]: ViewportIndexedfv (will be remapped) */
"ip\0"
"glViewportIndexedfv\0"
"\0"
- /* _mesa_function_pool[19555]: CallList (offset 2) */
+ /* _mesa_function_pool[20209]: BindTextureUnit (will be remapped) */
+ "ii\0"
+ "glBindTextureUnit\0"
+ "\0"
+ /* _mesa_function_pool[20231]: CallList (offset 2) */
"i\0"
"glCallList\0"
"\0"
- /* _mesa_function_pool[19569]: Materialfv (offset 170) */
+ /* _mesa_function_pool[20245]: Materialfv (offset 170) */
"iip\0"
"glMaterialfv\0"
"\0"
- /* _mesa_function_pool[19587]: DeleteProgram (will be remapped) */
+ /* _mesa_function_pool[20263]: DeleteProgram (will be remapped) */
"i\0"
"glDeleteProgram\0"
"\0"
- /* _mesa_function_pool[19606]: GetActiveAtomicCounterBufferiv (will be remapped) */
+ /* _mesa_function_pool[20282]: GetActiveAtomicCounterBufferiv (will be remapped) */
"iiip\0"
"glGetActiveAtomicCounterBufferiv\0"
"\0"
- /* _mesa_function_pool[19645]: TexParameterIiv (will be remapped) */
+ /* _mesa_function_pool[20321]: TexParameterIiv (will be remapped) */
"iip\0"
"glTexParameterIivEXT\0"
"glTexParameterIiv\0"
"\0"
- /* _mesa_function_pool[19689]: VertexWeightfEXT (dynamic) */
+ /* _mesa_function_pool[20365]: VertexWeightfEXT (dynamic) */
"f\0"
"glVertexWeightfEXT\0"
"\0"
- /* _mesa_function_pool[19711]: FlushVertexArrayRangeNV (dynamic) */
+ /* _mesa_function_pool[20387]: FlushVertexArrayRangeNV (dynamic) */
"\0"
"glFlushVertexArrayRangeNV\0"
"\0"
- /* _mesa_function_pool[19739]: GetConvolutionFilter (offset 356) */
+ /* _mesa_function_pool[20415]: GetConvolutionFilter (offset 356) */
"iiip\0"
"glGetConvolutionFilter\0"
"glGetConvolutionFilterEXT\0"
"\0"
- /* _mesa_function_pool[19794]: MultiModeDrawElementsIBM (will be remapped) */
+ /* _mesa_function_pool[20470]: MultiModeDrawElementsIBM (will be remapped) */
"ppipii\0"
"glMultiModeDrawElementsIBM\0"
"\0"
- /* _mesa_function_pool[19829]: Uniform2iv (will be remapped) */
+ /* _mesa_function_pool[20505]: Uniform2iv (will be remapped) */
"iip\0"
"glUniform2iv\0"
"glUniform2ivARB\0"
"\0"
- /* _mesa_function_pool[19863]: GetFixedv (will be remapped) */
+ /* _mesa_function_pool[20539]: GetFixedv (will be remapped) */
"ip\0"
"glGetFixedvOES\0"
"glGetFixedv\0"
"\0"
- /* _mesa_function_pool[19894]: ProgramParameters4dvNV (will be remapped) */
+ /* _mesa_function_pool[20570]: ProgramParameters4dvNV (will be remapped) */
"iiip\0"
"glProgramParameters4dvNV\0"
"\0"
- /* _mesa_function_pool[19925]: Binormal3dvEXT (dynamic) */
+ /* _mesa_function_pool[20601]: Binormal3dvEXT (dynamic) */
"p\0"
"glBinormal3dvEXT\0"
"\0"
- /* _mesa_function_pool[19945]: SampleCoveragex (will be remapped) */
+ /* _mesa_function_pool[20621]: SampleCoveragex (will be remapped) */
"ii\0"
"glSampleCoveragexOES\0"
"glSampleCoveragex\0"
"\0"
- /* _mesa_function_pool[19988]: GetPerfQueryInfoINTEL (will be remapped) */
+ /* _mesa_function_pool[20664]: GetPerfQueryInfoINTEL (will be remapped) */
"iippppp\0"
"glGetPerfQueryInfoINTEL\0"
"\0"
- /* _mesa_function_pool[20021]: DeleteFramebuffers (will be remapped) */
+ /* _mesa_function_pool[20697]: DeleteFramebuffers (will be remapped) */
"ip\0"
"glDeleteFramebuffers\0"
"glDeleteFramebuffersEXT\0"
"glDeleteFramebuffersOES\0"
"\0"
- /* _mesa_function_pool[20094]: CombinerInputNV (dynamic) */
+ /* _mesa_function_pool[20770]: CombinerInputNV (dynamic) */
"iiiiii\0"
"glCombinerInputNV\0"
"\0"
- /* _mesa_function_pool[20120]: VertexAttrib4uiv (will be remapped) */
+ /* _mesa_function_pool[20796]: VertexAttrib4uiv (will be remapped) */
"ip\0"
"glVertexAttrib4uiv\0"
"glVertexAttrib4uivARB\0"
"\0"
- /* _mesa_function_pool[20165]: VertexAttrib4Nsv (will be remapped) */
+ /* _mesa_function_pool[20841]: VertexAttrib4Nsv (will be remapped) */
"ip\0"
"glVertexAttrib4Nsv\0"
"glVertexAttrib4NsvARB\0"
"\0"
- /* _mesa_function_pool[20210]: Vertex4s (offset 148) */
+ /* _mesa_function_pool[20886]: Vertex4s (offset 148) */
"iiii\0"
"glVertex4s\0"
"\0"
- /* _mesa_function_pool[20227]: VertexAttribI2iEXT (will be remapped) */
+ /* _mesa_function_pool[20903]: VertexAttribI2iEXT (will be remapped) */
"iii\0"
"glVertexAttribI2iEXT\0"
"glVertexAttribI2i\0"
"\0"
- /* _mesa_function_pool[20271]: Vertex4f (offset 144) */
+ /* _mesa_function_pool[20947]: Vertex4f (offset 144) */
"ffff\0"
"glVertex4f\0"
"\0"
- /* _mesa_function_pool[20288]: Vertex4d (offset 142) */
+ /* _mesa_function_pool[20964]: Vertex4d (offset 142) */
"dddd\0"
"glVertex4d\0"
"\0"
- /* _mesa_function_pool[20305]: GetTexGenfv (offset 279) */
+ /* _mesa_function_pool[20981]: GetTexGenfv (offset 279) */
"iip\0"
"glGetTexGenfv\0"
"glGetTexGenfvOES\0"
"\0"
- /* _mesa_function_pool[20341]: Vertex4i (offset 146) */
+ /* _mesa_function_pool[21017]: Vertex4i (offset 146) */
"iiii\0"
"glVertex4i\0"
"\0"
- /* _mesa_function_pool[20358]: VertexWeightPointerEXT (dynamic) */
+ /* _mesa_function_pool[21034]: VertexWeightPointerEXT (dynamic) */
"iiip\0"
"glVertexWeightPointerEXT\0"
"\0"
- /* _mesa_function_pool[20389]: StencilFuncSeparateATI (will be remapped) */
+ /* _mesa_function_pool[21065]: StencilFuncSeparateATI (will be remapped) */
"iiii\0"
"glStencilFuncSeparateATI\0"
"\0"
- /* _mesa_function_pool[20420]: GetVertexAttribIuiv (will be remapped) */
+ /* _mesa_function_pool[21096]: GetVertexAttribIuiv (will be remapped) */
"iip\0"
"glGetVertexAttribIuivEXT\0"
"glGetVertexAttribIuiv\0"
"\0"
- /* _mesa_function_pool[20472]: LightModelfv (offset 164) */
+ /* _mesa_function_pool[21148]: LightModelfv (offset 164) */
"ip\0"
"glLightModelfv\0"
"\0"
- /* _mesa_function_pool[20491]: Vertex4dv (offset 143) */
+ /* _mesa_function_pool[21167]: Vertex4dv (offset 143) */
"p\0"
"glVertex4dv\0"
"\0"
- /* _mesa_function_pool[20506]: ProgramParameters4fvNV (will be remapped) */
+ /* _mesa_function_pool[21182]: ProgramParameters4fvNV (will be remapped) */
"iiip\0"
"glProgramParameters4fvNV\0"
"\0"
- /* _mesa_function_pool[20537]: GetInfoLogARB (will be remapped) */
+ /* _mesa_function_pool[21213]: GetInfoLogARB (will be remapped) */
"iipp\0"
"glGetInfoLogARB\0"
"\0"
- /* _mesa_function_pool[20559]: StencilMask (offset 209) */
+ /* _mesa_function_pool[21235]: StencilMask (offset 209) */
"i\0"
"glStencilMask\0"
"\0"
- /* _mesa_function_pool[20576]: IsList (offset 287) */
+ /* _mesa_function_pool[21252]: IsList (offset 287) */
"i\0"
"glIsList\0"
"\0"
- /* _mesa_function_pool[20588]: ClearBufferiv (will be remapped) */
- "iip\0"
- "glClearBufferiv\0"
- "\0"
- /* _mesa_function_pool[20609]: GetIntegeri_v (will be remapped) */
+ /* _mesa_function_pool[21264]: GetIntegeri_v (will be remapped) */
"iip\0"
"glGetIntegerIndexedvEXT\0"
"glGetIntegeri_v\0"
"\0"
- /* _mesa_function_pool[20654]: ProgramUniform2iv (will be remapped) */
+ /* _mesa_function_pool[21309]: ProgramUniform2iv (will be remapped) */
"iiip\0"
"glProgramUniform2iv\0"
"glProgramUniform2ivEXT\0"
"\0"
- /* _mesa_function_pool[20703]: VertexAttribs4svNV (will be remapped) */
+ /* _mesa_function_pool[21358]: VertexAttribs4svNV (will be remapped) */
"iip\0"
"glVertexAttribs4svNV\0"
"\0"
- /* _mesa_function_pool[20729]: FogCoordPointer (will be remapped) */
+ /* _mesa_function_pool[21384]: FogCoordPointer (will be remapped) */
"iip\0"
"glFogCoordPointer\0"
"glFogCoordPointerEXT\0"
"\0"
- /* _mesa_function_pool[20773]: SecondaryColor3us (will be remapped) */
+ /* _mesa_function_pool[21428]: SecondaryColor3us (will be remapped) */
"iii\0"
"glSecondaryColor3us\0"
"glSecondaryColor3usEXT\0"
"\0"
- /* _mesa_function_pool[20821]: DeformationMap3dSGIX (dynamic) */
+ /* _mesa_function_pool[21476]: DeformationMap3dSGIX (dynamic) */
"iddiiddiiddiip\0"
"glDeformationMap3dSGIX\0"
"\0"
- /* _mesa_function_pool[20860]: TextureNormalEXT (dynamic) */
+ /* _mesa_function_pool[21515]: TextureNormalEXT (dynamic) */
"i\0"
"glTextureNormalEXT\0"
"\0"
- /* _mesa_function_pool[20882]: SecondaryColor3ub (will be remapped) */
+ /* _mesa_function_pool[21537]: SecondaryColor3ub (will be remapped) */
"iii\0"
"glSecondaryColor3ub\0"
"glSecondaryColor3ubEXT\0"
"\0"
- /* _mesa_function_pool[20930]: SecondaryColor3ui (will be remapped) */
+ /* _mesa_function_pool[21585]: GetActiveUniformName (will be remapped) */
+ "iiipp\0"
+ "glGetActiveUniformName\0"
+ "\0"
+ /* _mesa_function_pool[21615]: SecondaryColor3ui (will be remapped) */
"iii\0"
"glSecondaryColor3ui\0"
"glSecondaryColor3uiEXT\0"
"\0"
- /* _mesa_function_pool[20978]: VertexAttribI3uivEXT (will be remapped) */
+ /* _mesa_function_pool[21663]: VertexAttribI3uivEXT (will be remapped) */
"ip\0"
"glVertexAttribI3uivEXT\0"
"glVertexAttribI3uiv\0"
"\0"
- /* _mesa_function_pool[21025]: Binormal3fvEXT (dynamic) */
+ /* _mesa_function_pool[21710]: Binormal3fvEXT (dynamic) */
"p\0"
"glBinormal3fvEXT\0"
"\0"
- /* _mesa_function_pool[21045]: TexCoordPointervINTEL (dynamic) */
+ /* _mesa_function_pool[21730]: TexCoordPointervINTEL (dynamic) */
"iip\0"
"glTexCoordPointervINTEL\0"
"\0"
- /* _mesa_function_pool[21074]: VertexAttrib1sNV (will be remapped) */
+ /* _mesa_function_pool[21759]: VertexAttrib1sNV (will be remapped) */
"ii\0"
"glVertexAttrib1sNV\0"
"\0"
- /* _mesa_function_pool[21097]: Tangent3bEXT (dynamic) */
+ /* _mesa_function_pool[21782]: Tangent3bEXT (dynamic) */
"iii\0"
"glTangent3bEXT\0"
"\0"
- /* _mesa_function_pool[21117]: FragmentLightModelfSGIX (dynamic) */
+ /* _mesa_function_pool[21802]: TextureBuffer (will be remapped) */
+ "iii\0"
+ "glTextureBuffer\0"
+ "\0"
+ /* _mesa_function_pool[21823]: FragmentLightModelfSGIX (dynamic) */
"if\0"
"glFragmentLightModelfSGIX\0"
"\0"
- /* _mesa_function_pool[21147]: InitNames (offset 197) */
+ /* _mesa_function_pool[21853]: InitNames (offset 197) */
"\0"
"glInitNames\0"
"\0"
- /* _mesa_function_pool[21161]: Normal3sv (offset 61) */
+ /* _mesa_function_pool[21867]: Normal3sv (offset 61) */
"p\0"
"glNormal3sv\0"
"\0"
- /* _mesa_function_pool[21176]: DeleteQueries (will be remapped) */
+ /* _mesa_function_pool[21882]: DeleteQueries (will be remapped) */
"ip\0"
"glDeleteQueries\0"
"glDeleteQueriesARB\0"
"\0"
- /* _mesa_function_pool[21215]: InvalidateFramebuffer (will be remapped) */
+ /* _mesa_function_pool[21921]: InvalidateFramebuffer (will be remapped) */
"iip\0"
"glInvalidateFramebuffer\0"
"\0"
- /* _mesa_function_pool[21244]: Hint (offset 158) */
+ /* _mesa_function_pool[21950]: Hint (offset 158) */
"ii\0"
"glHint\0"
"\0"
- /* _mesa_function_pool[21255]: MemoryBarrier (will be remapped) */
+ /* _mesa_function_pool[21961]: MemoryBarrier (will be remapped) */
"i\0"
"glMemoryBarrier\0"
"\0"
- /* _mesa_function_pool[21274]: CopyColorSubTable (offset 347) */
+ /* _mesa_function_pool[21980]: CopyColorSubTable (offset 347) */
"iiiii\0"
"glCopyColorSubTable\0"
"glCopyColorSubTableEXT\0"
"\0"
- /* _mesa_function_pool[21324]: WeightdvARB (dynamic) */
+ /* _mesa_function_pool[22030]: WeightdvARB (dynamic) */
"ip\0"
"glWeightdvARB\0"
"\0"
- /* _mesa_function_pool[21342]: GetObjectParameterfvARB (will be remapped) */
+ /* _mesa_function_pool[22048]: GetObjectParameterfvARB (will be remapped) */
"iip\0"
"glGetObjectParameterfvARB\0"
"\0"
- /* _mesa_function_pool[21373]: GetTexEnvxv (will be remapped) */
+ /* _mesa_function_pool[22079]: GetTexEnvxv (will be remapped) */
"iip\0"
"glGetTexEnvxvOES\0"
"glGetTexEnvxv\0"
"\0"
- /* _mesa_function_pool[21409]: DrawTexsvOES (will be remapped) */
+ /* _mesa_function_pool[22115]: DrawTexsvOES (will be remapped) */
"p\0"
"glDrawTexsvOES\0"
"\0"
- /* _mesa_function_pool[21427]: Disable (offset 214) */
+ /* _mesa_function_pool[22133]: Disable (offset 214) */
"i\0"
"glDisable\0"
"\0"
- /* _mesa_function_pool[21440]: ClearColor (offset 206) */
+ /* _mesa_function_pool[22146]: ClearColor (offset 206) */
"ffff\0"
"glClearColor\0"
"\0"
- /* _mesa_function_pool[21459]: WeightuivARB (dynamic) */
+ /* _mesa_function_pool[22165]: WeightuivARB (dynamic) */
"ip\0"
"glWeightuivARB\0"
"\0"
- /* _mesa_function_pool[21478]: RasterPos4iv (offset 83) */
+ /* _mesa_function_pool[22184]: GetTextureParameterIuiv (will be remapped) */
+ "iip\0"
+ "glGetTextureParameterIuiv\0"
+ "\0"
+ /* _mesa_function_pool[22215]: RasterPos4iv (offset 83) */
"p\0"
"glRasterPos4iv\0"
"\0"
- /* _mesa_function_pool[21496]: VDPAUIsSurfaceNV (will be remapped) */
+ /* _mesa_function_pool[22233]: VDPAUIsSurfaceNV (will be remapped) */
"i\0"
"glVDPAUIsSurfaceNV\0"
"\0"
- /* _mesa_function_pool[21518]: ProgramUniformMatrix2x3fv (will be remapped) */
+ /* _mesa_function_pool[22255]: ProgramUniformMatrix2x3fv (will be remapped) */
"iiiip\0"
"glProgramUniformMatrix2x3fv\0"
"glProgramUniformMatrix2x3fvEXT\0"
"\0"
- /* _mesa_function_pool[21584]: BindVertexBuffer (will be remapped) */
+ /* _mesa_function_pool[22321]: BindVertexBuffer (will be remapped) */
"iiii\0"
"glBindVertexBuffer\0"
"\0"
- /* _mesa_function_pool[21609]: Binormal3iEXT (dynamic) */
+ /* _mesa_function_pool[22346]: Binormal3iEXT (dynamic) */
"iii\0"
"glBinormal3iEXT\0"
"\0"
- /* _mesa_function_pool[21630]: RasterPos4i (offset 82) */
+ /* _mesa_function_pool[22367]: RasterPos4i (offset 82) */
"iiii\0"
"glRasterPos4i\0"
"\0"
- /* _mesa_function_pool[21650]: RasterPos4d (offset 78) */
+ /* _mesa_function_pool[22387]: RasterPos4d (offset 78) */
"dddd\0"
"glRasterPos4d\0"
"\0"
- /* _mesa_function_pool[21670]: RasterPos4f (offset 80) */
+ /* _mesa_function_pool[22407]: RasterPos4f (offset 80) */
"ffff\0"
"glRasterPos4f\0"
"\0"
- /* _mesa_function_pool[21690]: GetQueryIndexediv (will be remapped) */
+ /* _mesa_function_pool[22427]: GetQueryIndexediv (will be remapped) */
"iiip\0"
"glGetQueryIndexediv\0"
"\0"
- /* _mesa_function_pool[21716]: RasterPos3dv (offset 71) */
+ /* _mesa_function_pool[22453]: RasterPos3dv (offset 71) */
"p\0"
"glRasterPos3dv\0"
"\0"
- /* _mesa_function_pool[21734]: GetProgramiv (will be remapped) */
+ /* _mesa_function_pool[22471]: GetProgramiv (will be remapped) */
"iip\0"
"glGetProgramiv\0"
"\0"
- /* _mesa_function_pool[21754]: TexCoord1iv (offset 99) */
+ /* _mesa_function_pool[22491]: TexCoord1iv (offset 99) */
"p\0"
"glTexCoord1iv\0"
"\0"
- /* _mesa_function_pool[21771]: RasterPos4s (offset 84) */
+ /* _mesa_function_pool[22508]: RasterPos4s (offset 84) */
"iiii\0"
"glRasterPos4s\0"
"\0"
- /* _mesa_function_pool[21791]: PixelTexGenParameterfvSGIS (dynamic) */
+ /* _mesa_function_pool[22528]: PixelTexGenParameterfvSGIS (dynamic) */
"ip\0"
"glPixelTexGenParameterfvSGIS\0"
"\0"
- /* _mesa_function_pool[21824]: VertexAttrib3dv (will be remapped) */
+ /* _mesa_function_pool[22561]: VertexAttrib3dv (will be remapped) */
"ip\0"
"glVertexAttrib3dv\0"
"glVertexAttrib3dvARB\0"
"\0"
- /* _mesa_function_pool[21867]: Histogram (offset 367) */
+ /* _mesa_function_pool[22604]: Histogram (offset 367) */
"iiii\0"
"glHistogram\0"
"glHistogramEXT\0"
"\0"
- /* _mesa_function_pool[21900]: Uniform2fv (will be remapped) */
+ /* _mesa_function_pool[22637]: Uniform2fv (will be remapped) */
"iip\0"
"glUniform2fv\0"
"glUniform2fvARB\0"
"\0"
- /* _mesa_function_pool[21934]: TexImage4DSGIS (dynamic) */
+ /* _mesa_function_pool[22671]: TexImage4DSGIS (dynamic) */
"iiiiiiiiiip\0"
"glTexImage4DSGIS\0"
"\0"
- /* _mesa_function_pool[21964]: DrawBuffers (will be remapped) */
+ /* _mesa_function_pool[22701]: ProgramUniformMatrix3x4dv (will be remapped) */
+ "iiiip\0"
+ "glProgramUniformMatrix3x4dv\0"
+ "\0"
+ /* _mesa_function_pool[22736]: DrawBuffers (will be remapped) */
"ip\0"
"glDrawBuffers\0"
"glDrawBuffersARB\0"
"glDrawBuffersATI\0"
"glDrawBuffersNV\0"
+ "glDrawBuffersEXT\0"
"\0"
- /* _mesa_function_pool[22032]: GetnPolygonStippleARB (will be remapped) */
+ /* _mesa_function_pool[22821]: GetnPolygonStippleARB (will be remapped) */
"ip\0"
"glGetnPolygonStippleARB\0"
"\0"
- /* _mesa_function_pool[22060]: Color3uiv (offset 22) */
+ /* _mesa_function_pool[22849]: Color3uiv (offset 22) */
"p\0"
"glColor3uiv\0"
"\0"
- /* _mesa_function_pool[22075]: EvalCoord2fv (offset 235) */
+ /* _mesa_function_pool[22864]: EvalCoord2fv (offset 235) */
"p\0"
"glEvalCoord2fv\0"
"\0"
- /* _mesa_function_pool[22093]: TextureStorage3DEXT (will be remapped) */
+ /* _mesa_function_pool[22882]: TextureStorage3DEXT (will be remapped) */
"iiiiiii\0"
"glTextureStorage3DEXT\0"
"\0"
- /* _mesa_function_pool[22124]: VertexAttrib2fARB (will be remapped) */
+ /* _mesa_function_pool[22913]: VertexAttrib2fARB (will be remapped) */
"iff\0"
"glVertexAttrib2f\0"
"glVertexAttrib2fARB\0"
"\0"
- /* _mesa_function_pool[22166]: WindowPos2fv (will be remapped) */
+ /* _mesa_function_pool[22955]: WindowPos2fv (will be remapped) */
"p\0"
"glWindowPos2fv\0"
"glWindowPos2fvARB\0"
"glWindowPos2fvMESA\0"
"\0"
- /* _mesa_function_pool[22221]: Tangent3fEXT (dynamic) */
+ /* _mesa_function_pool[23010]: Tangent3fEXT (dynamic) */
"fff\0"
"glTangent3fEXT\0"
"\0"
- /* _mesa_function_pool[22241]: TexImage3D (offset 371) */
+ /* _mesa_function_pool[23030]: TexImage3D (offset 371) */
"iiiiiiiiip\0"
"glTexImage3D\0"
"glTexImage3DEXT\0"
"glTexImage3DOES\0"
"\0"
- /* _mesa_function_pool[22298]: GetPerfQueryIdByNameINTEL (will be remapped) */
+ /* _mesa_function_pool[23087]: GetPerfQueryIdByNameINTEL (will be remapped) */
"pp\0"
"glGetPerfQueryIdByNameINTEL\0"
"\0"
- /* _mesa_function_pool[22330]: BindFragDataLocation (will be remapped) */
+ /* _mesa_function_pool[23119]: BindFragDataLocation (will be remapped) */
"iip\0"
"glBindFragDataLocationEXT\0"
"glBindFragDataLocation\0"
"\0"
- /* _mesa_function_pool[22384]: LightModeliv (offset 166) */
+ /* _mesa_function_pool[23173]: LightModeliv (offset 166) */
"ip\0"
"glLightModeliv\0"
"\0"
- /* _mesa_function_pool[22403]: Normal3bv (offset 53) */
+ /* _mesa_function_pool[23192]: Normal3bv (offset 53) */
"p\0"
"glNormal3bv\0"
"\0"
- /* _mesa_function_pool[22418]: BeginQueryIndexed (will be remapped) */
+ /* _mesa_function_pool[23207]: BeginQueryIndexed (will be remapped) */
"iii\0"
"glBeginQueryIndexed\0"
"\0"
- /* _mesa_function_pool[22443]: Vertex3iv (offset 139) */
+ /* _mesa_function_pool[23232]: ProgramUniform3dv (will be remapped) */
+ "iiip\0"
+ "glProgramUniform3dv\0"
+ "\0"
+ /* _mesa_function_pool[23258]: Vertex3iv (offset 139) */
"p\0"
"glVertex3iv\0"
"\0"
- /* _mesa_function_pool[22458]: TexCoord3dv (offset 111) */
+ /* _mesa_function_pool[23273]: UniformMatrix2x3dv (will be remapped) */
+ "iiip\0"
+ "glUniformMatrix2x3dv\0"
+ "\0"
+ /* _mesa_function_pool[23300]: TexCoord3dv (offset 111) */
"p\0"
"glTexCoord3dv\0"
"\0"
- /* _mesa_function_pool[22475]: GetProgramStringARB (will be remapped) */
+ /* _mesa_function_pool[23317]: GetProgramStringARB (will be remapped) */
"iip\0"
"glGetProgramStringARB\0"
"\0"
- /* _mesa_function_pool[22502]: VertexP3ui (will be remapped) */
+ /* _mesa_function_pool[23344]: VertexP3ui (will be remapped) */
"ii\0"
"glVertexP3ui\0"
"\0"
- /* _mesa_function_pool[22519]: CreateProgramObjectARB (will be remapped) */
+ /* _mesa_function_pool[23361]: CreateProgramObjectARB (will be remapped) */
"\0"
"glCreateProgramObjectARB\0"
"\0"
- /* _mesa_function_pool[22546]: UniformMatrix3fv (will be remapped) */
+ /* _mesa_function_pool[23388]: UniformMatrix3fv (will be remapped) */
"iiip\0"
"glUniformMatrix3fv\0"
"glUniformMatrix3fvARB\0"
"\0"
- /* _mesa_function_pool[22593]: PrioritizeTextures (offset 331) */
+ /* _mesa_function_pool[23435]: PrioritizeTextures (offset 331) */
"ipp\0"
"glPrioritizeTextures\0"
"glPrioritizeTexturesEXT\0"
"\0"
- /* _mesa_function_pool[22643]: VertexAttribI3uiEXT (will be remapped) */
+ /* _mesa_function_pool[23485]: VertexAttribI3uiEXT (will be remapped) */
"iiii\0"
"glVertexAttribI3uiEXT\0"
"glVertexAttribI3ui\0"
"\0"
- /* _mesa_function_pool[22690]: AsyncMarkerSGIX (dynamic) */
+ /* _mesa_function_pool[23532]: AsyncMarkerSGIX (dynamic) */
"i\0"
"glAsyncMarkerSGIX\0"
"\0"
- /* _mesa_function_pool[22711]: GetProgramNamedParameterfvNV (will be remapped) */
+ /* _mesa_function_pool[23553]: GetProgramNamedParameterfvNV (will be remapped) */
"iipp\0"
"glGetProgramNamedParameterfvNV\0"
"\0"
- /* _mesa_function_pool[22748]: GetMaterialxv (will be remapped) */
+ /* _mesa_function_pool[23590]: GetMaterialxv (will be remapped) */
"iip\0"
"glGetMaterialxvOES\0"
"glGetMaterialxv\0"
"\0"
- /* _mesa_function_pool[22788]: MatrixIndexusvARB (dynamic) */
+ /* _mesa_function_pool[23630]: MatrixIndexusvARB (dynamic) */
"ip\0"
"glMatrixIndexusvARB\0"
"\0"
- /* _mesa_function_pool[22812]: SecondaryColor3uiv (will be remapped) */
+ /* _mesa_function_pool[23654]: SecondaryColor3uiv (will be remapped) */
"p\0"
"glSecondaryColor3uiv\0"
"glSecondaryColor3uivEXT\0"
"\0"
- /* _mesa_function_pool[22860]: EndConditionalRender (will be remapped) */
+ /* _mesa_function_pool[23702]: EndConditionalRender (will be remapped) */
"\0"
"glEndConditionalRender\0"
"glEndConditionalRenderNV\0"
"\0"
- /* _mesa_function_pool[22910]: ProgramLocalParameter4dARB (will be remapped) */
+ /* _mesa_function_pool[23752]: ProgramLocalParameter4dARB (will be remapped) */
"iidddd\0"
"glProgramLocalParameter4dARB\0"
"\0"
- /* _mesa_function_pool[22947]: Color3sv (offset 18) */
+ /* _mesa_function_pool[23789]: Color3sv (offset 18) */
"p\0"
"glColor3sv\0"
"\0"
- /* _mesa_function_pool[22961]: GenFragmentShadersATI (will be remapped) */
+ /* _mesa_function_pool[23803]: GenFragmentShadersATI (will be remapped) */
"i\0"
"glGenFragmentShadersATI\0"
"\0"
- /* _mesa_function_pool[22988]: BlendEquationSeparateiARB (will be remapped) */
+ /* _mesa_function_pool[23830]: BlendEquationSeparateiARB (will be remapped) */
"iii\0"
"glBlendEquationSeparateiARB\0"
"glBlendEquationSeparateIndexedAMD\0"
"glBlendEquationSeparatei\0"
"\0"
- /* _mesa_function_pool[23080]: TestFenceNV (dynamic) */
+ /* _mesa_function_pool[23922]: TestFenceNV (dynamic) */
"i\0"
"glTestFenceNV\0"
"\0"
- /* _mesa_function_pool[23097]: MultiTexCoord1fvARB (offset 379) */
+ /* _mesa_function_pool[23939]: MultiTexCoord1fvARB (offset 379) */
"ip\0"
"glMultiTexCoord1fv\0"
"glMultiTexCoord1fvARB\0"
"\0"
- /* _mesa_function_pool[23142]: TexStorage2D (will be remapped) */
+ /* _mesa_function_pool[23984]: TexStorage2D (will be remapped) */
"iiiii\0"
"glTexStorage2D\0"
"\0"
- /* _mesa_function_pool[23164]: GetPixelTexGenParameterivSGIS (dynamic) */
+ /* _mesa_function_pool[24006]: GetPixelTexGenParameterivSGIS (dynamic) */
"ip\0"
"glGetPixelTexGenParameterivSGIS\0"
"\0"
- /* _mesa_function_pool[23200]: FramebufferTexture2D (will be remapped) */
+ /* _mesa_function_pool[24042]: FramebufferTexture2D (will be remapped) */
"iiiii\0"
"glFramebufferTexture2D\0"
"glFramebufferTexture2DEXT\0"
"glFramebufferTexture2DOES\0"
"\0"
- /* _mesa_function_pool[23282]: GetSamplerParameterfv (will be remapped) */
+ /* _mesa_function_pool[24124]: GetSamplerParameterfv (will be remapped) */
"iip\0"
"glGetSamplerParameterfv\0"
"\0"
- /* _mesa_function_pool[23311]: VertexAttrib2dv (will be remapped) */
+ /* _mesa_function_pool[24153]: VertexAttrib2dv (will be remapped) */
"ip\0"
"glVertexAttrib2dv\0"
"glVertexAttrib2dvARB\0"
"\0"
- /* _mesa_function_pool[23354]: Vertex4sv (offset 149) */
+ /* _mesa_function_pool[24196]: Vertex4sv (offset 149) */
"p\0"
"glVertex4sv\0"
"\0"
- /* _mesa_function_pool[23369]: GetQueryObjecti64v (will be remapped) */
+ /* _mesa_function_pool[24211]: GetQueryObjecti64v (will be remapped) */
"iip\0"
"glGetQueryObjecti64v\0"
"glGetQueryObjecti64vEXT\0"
"\0"
- /* _mesa_function_pool[23419]: ClampColor (will be remapped) */
+ /* _mesa_function_pool[24261]: ClampColor (will be remapped) */
"ii\0"
"glClampColorARB\0"
"glClampColor\0"
"\0"
- /* _mesa_function_pool[23452]: TextureRangeAPPLE (dynamic) */
+ /* _mesa_function_pool[24294]: TextureRangeAPPLE (dynamic) */
"iip\0"
"glTextureRangeAPPLE\0"
"\0"
- /* _mesa_function_pool[23477]: ConvolutionFilter1D (offset 348) */
+ /* _mesa_function_pool[24319]: ConvolutionFilter1D (offset 348) */
"iiiiip\0"
"glConvolutionFilter1D\0"
"glConvolutionFilter1DEXT\0"
"\0"
- /* _mesa_function_pool[23532]: DrawElementsIndirect (will be remapped) */
+ /* _mesa_function_pool[24374]: DrawElementsIndirect (will be remapped) */
"iip\0"
"glDrawElementsIndirect\0"
"\0"
- /* _mesa_function_pool[23560]: WindowPos3sv (will be remapped) */
+ /* _mesa_function_pool[24402]: WindowPos3sv (will be remapped) */
"p\0"
"glWindowPos3sv\0"
"glWindowPos3svARB\0"
"glWindowPos3svMESA\0"
"\0"
- /* _mesa_function_pool[23615]: FragmentMaterialfvSGIX (dynamic) */
+ /* _mesa_function_pool[24457]: FragmentMaterialfvSGIX (dynamic) */
"iip\0"
"glFragmentMaterialfvSGIX\0"
"\0"
- /* _mesa_function_pool[23645]: CallLists (offset 3) */
+ /* _mesa_function_pool[24487]: CallLists (offset 3) */
"iip\0"
"glCallLists\0"
"\0"
- /* _mesa_function_pool[23662]: AlphaFunc (offset 240) */
+ /* _mesa_function_pool[24504]: AlphaFunc (offset 240) */
"if\0"
"glAlphaFunc\0"
"\0"
- /* _mesa_function_pool[23678]: EdgeFlag (offset 41) */
+ /* _mesa_function_pool[24520]: GetTextureParameterfv (will be remapped) */
+ "iip\0"
+ "glGetTextureParameterfv\0"
+ "\0"
+ /* _mesa_function_pool[24549]: EdgeFlag (offset 41) */
"i\0"
"glEdgeFlag\0"
"\0"
- /* _mesa_function_pool[23692]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[24563]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
"ppp\0"
"glTexCoord2fNormal3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[23730]: EdgeFlagv (offset 42) */
+ /* _mesa_function_pool[24601]: EdgeFlagv (offset 42) */
"p\0"
"glEdgeFlagv\0"
"\0"
- /* _mesa_function_pool[23745]: DepthRangex (will be remapped) */
+ /* _mesa_function_pool[24616]: DepthRangex (will be remapped) */
"ii\0"
"glDepthRangexOES\0"
"glDepthRangex\0"
"\0"
- /* _mesa_function_pool[23780]: ReplacementCodeubvSUN (dynamic) */
+ /* _mesa_function_pool[24651]: ReplacementCodeubvSUN (dynamic) */
"p\0"
"glReplacementCodeubvSUN\0"
"\0"
- /* _mesa_function_pool[23807]: VDPAUInitNV (will be remapped) */
+ /* _mesa_function_pool[24678]: VDPAUInitNV (will be remapped) */
"pp\0"
"glVDPAUInitNV\0"
"\0"
- /* _mesa_function_pool[23825]: GetBufferParameteri64v (will be remapped) */
+ /* _mesa_function_pool[24696]: GetBufferParameteri64v (will be remapped) */
"iip\0"
"glGetBufferParameteri64v\0"
"\0"
- /* _mesa_function_pool[23855]: LoadIdentityDeformationMapSGIX (dynamic) */
+ /* _mesa_function_pool[24726]: LoadIdentityDeformationMapSGIX (dynamic) */
"i\0"
"glLoadIdentityDeformationMapSGIX\0"
"\0"
- /* _mesa_function_pool[23891]: DepthRangef (will be remapped) */
+ /* _mesa_function_pool[24762]: DepthRangef (will be remapped) */
"ff\0"
"glDepthRangef\0"
"glDepthRangefOES\0"
"\0"
- /* _mesa_function_pool[23926]: GetSharpenTexFuncSGIS (dynamic) */
- "ip\0"
- "glGetSharpenTexFuncSGIS\0"
+ /* _mesa_function_pool[24797]: TextureParameteriv (will be remapped) */
+ "iip\0"
+ "glTextureParameteriv\0"
"\0"
- /* _mesa_function_pool[23954]: ColorFragmentOp3ATI (will be remapped) */
+ /* _mesa_function_pool[24823]: ColorFragmentOp3ATI (will be remapped) */
"iiiiiiiiiiiii\0"
"glColorFragmentOp3ATI\0"
"\0"
- /* _mesa_function_pool[23991]: ValidateProgram (will be remapped) */
+ /* _mesa_function_pool[24860]: ValidateProgram (will be remapped) */
"i\0"
"glValidateProgram\0"
"glValidateProgramARB\0"
"\0"
- /* _mesa_function_pool[24033]: VertexPointerEXT (will be remapped) */
+ /* _mesa_function_pool[24902]: VertexPointerEXT (will be remapped) */
"iiiip\0"
"glVertexPointerEXT\0"
"\0"
- /* _mesa_function_pool[24059]: Scissor (offset 176) */
+ /* _mesa_function_pool[24928]: Scissor (offset 176) */
"iiii\0"
"glScissor\0"
"\0"
- /* _mesa_function_pool[24075]: BeginTransformFeedback (will be remapped) */
+ /* _mesa_function_pool[24944]: BeginTransformFeedback (will be remapped) */
"i\0"
"glBeginTransformFeedback\0"
"glBeginTransformFeedbackEXT\0"
"\0"
- /* _mesa_function_pool[24131]: TexCoord2i (offset 106) */
+ /* _mesa_function_pool[25000]: TexCoord2i (offset 106) */
"ii\0"
"glTexCoord2i\0"
"\0"
- /* _mesa_function_pool[24148]: Color4ui (offset 37) */
+ /* _mesa_function_pool[25017]: Color4ui (offset 37) */
"iiii\0"
"glColor4ui\0"
"\0"
- /* _mesa_function_pool[24165]: TexCoord2f (offset 104) */
+ /* _mesa_function_pool[25034]: TexCoord2f (offset 104) */
"ff\0"
"glTexCoord2f\0"
"\0"
- /* _mesa_function_pool[24182]: TexCoord2d (offset 102) */
+ /* _mesa_function_pool[25051]: TexCoord2d (offset 102) */
"dd\0"
"glTexCoord2d\0"
"\0"
- /* _mesa_function_pool[24199]: TexCoord2s (offset 108) */
+ /* _mesa_function_pool[25068]: TexCoord2s (offset 108) */
"ii\0"
"glTexCoord2s\0"
"\0"
- /* _mesa_function_pool[24216]: PointSizePointerOES (will be remapped) */
+ /* _mesa_function_pool[25085]: PointSizePointerOES (will be remapped) */
"iip\0"
"glPointSizePointerOES\0"
"\0"
- /* _mesa_function_pool[24243]: Color4us (offset 39) */
+ /* _mesa_function_pool[25112]: Color4us (offset 39) */
"iiii\0"
"glColor4us\0"
"\0"
- /* _mesa_function_pool[24260]: Color3bv (offset 10) */
+ /* _mesa_function_pool[25129]: Color3bv (offset 10) */
"p\0"
"glColor3bv\0"
"\0"
- /* _mesa_function_pool[24274]: PrimitiveRestartNV (will be remapped) */
+ /* _mesa_function_pool[25143]: PrimitiveRestartNV (will be remapped) */
"\0"
"glPrimitiveRestartNV\0"
"\0"
- /* _mesa_function_pool[24297]: BindBufferOffsetEXT (will be remapped) */
+ /* _mesa_function_pool[25166]: BindBufferOffsetEXT (will be remapped) */
"iiii\0"
"glBindBufferOffsetEXT\0"
"\0"
- /* _mesa_function_pool[24325]: ProvokingVertex (will be remapped) */
+ /* _mesa_function_pool[25194]: ProvokingVertex (will be remapped) */
"i\0"
"glProvokingVertexEXT\0"
"glProvokingVertex\0"
"\0"
- /* _mesa_function_pool[24367]: VertexAttribs4fvNV (will be remapped) */
+ /* _mesa_function_pool[25236]: VertexAttribs4fvNV (will be remapped) */
"iip\0"
"glVertexAttribs4fvNV\0"
"\0"
- /* _mesa_function_pool[24393]: MapControlPointsNV (dynamic) */
+ /* _mesa_function_pool[25262]: MapControlPointsNV (dynamic) */
"iiiiiiiip\0"
"glMapControlPointsNV\0"
"\0"
- /* _mesa_function_pool[24425]: Vertex2i (offset 130) */
+ /* _mesa_function_pool[25294]: Vertex2i (offset 130) */
"ii\0"
"glVertex2i\0"
"\0"
- /* _mesa_function_pool[24440]: HintPGI (dynamic) */
+ /* _mesa_function_pool[25309]: HintPGI (dynamic) */
"ii\0"
"glHintPGI\0"
"\0"
- /* _mesa_function_pool[24454]: InterleavedArrays (offset 317) */
+ /* _mesa_function_pool[25323]: InterleavedArrays (offset 317) */
"iip\0"
"glInterleavedArrays\0"
"\0"
- /* _mesa_function_pool[24479]: RasterPos2fv (offset 65) */
+ /* _mesa_function_pool[25348]: RasterPos2fv (offset 65) */
"p\0"
"glRasterPos2fv\0"
"\0"
- /* _mesa_function_pool[24497]: TexCoord1fv (offset 97) */
+ /* _mesa_function_pool[25366]: TexCoord1fv (offset 97) */
"p\0"
"glTexCoord1fv\0"
"\0"
- /* _mesa_function_pool[24514]: PixelTransferf (offset 247) */
+ /* _mesa_function_pool[25383]: PixelTransferf (offset 247) */
"if\0"
"glPixelTransferf\0"
"\0"
- /* _mesa_function_pool[24535]: MultiTexCoord4dv (offset 401) */
+ /* _mesa_function_pool[25404]: MultiTexCoord4dv (offset 401) */
"ip\0"
"glMultiTexCoord4dv\0"
"glMultiTexCoord4dvARB\0"
"\0"
- /* _mesa_function_pool[24580]: ProgramEnvParameter4fvARB (will be remapped) */
+ /* _mesa_function_pool[25449]: ProgramEnvParameter4fvARB (will be remapped) */
"iip\0"
"glProgramEnvParameter4fvARB\0"
"glProgramParameter4fvNV\0"
"\0"
- /* _mesa_function_pool[24637]: RasterPos4fv (offset 81) */
+ /* _mesa_function_pool[25506]: RasterPos4fv (offset 81) */
"p\0"
"glRasterPos4fv\0"
"\0"
- /* _mesa_function_pool[24655]: FragmentLightModeliSGIX (dynamic) */
+ /* _mesa_function_pool[25524]: FragmentLightModeliSGIX (dynamic) */
"ii\0"
"glFragmentLightModeliSGIX\0"
"\0"
- /* _mesa_function_pool[24685]: PushMatrix (offset 298) */
+ /* _mesa_function_pool[25554]: PushMatrix (offset 298) */
"\0"
"glPushMatrix\0"
"\0"
- /* _mesa_function_pool[24700]: EndList (offset 1) */
+ /* _mesa_function_pool[25569]: EndList (offset 1) */
"\0"
"glEndList\0"
"\0"
- /* _mesa_function_pool[24712]: DrawRangeElements (offset 338) */
+ /* _mesa_function_pool[25581]: DrawRangeElements (offset 338) */
"iiiiip\0"
"glDrawRangeElements\0"
"glDrawRangeElementsEXT\0"
"\0"
- /* _mesa_function_pool[24763]: GetTexGenxvOES (will be remapped) */
+ /* _mesa_function_pool[25632]: GetTexGenxvOES (will be remapped) */
"iip\0"
"glGetTexGenxvOES\0"
"\0"
- /* _mesa_function_pool[24785]: GetHandleARB (will be remapped) */
- "i\0"
- "glGetHandleARB\0"
+ /* _mesa_function_pool[25654]: VertexAttribs4dvNV (will be remapped) */
+ "iip\0"
+ "glVertexAttribs4dvNV\0"
"\0"
- /* _mesa_function_pool[24803]: DrawTexfvOES (will be remapped) */
+ /* _mesa_function_pool[25680]: DrawTexfvOES (will be remapped) */
"p\0"
"glDrawTexfvOES\0"
"\0"
- /* _mesa_function_pool[24821]: BlendFunciARB (will be remapped) */
+ /* _mesa_function_pool[25698]: BlendFunciARB (will be remapped) */
"iii\0"
"glBlendFunciARB\0"
"glBlendFuncIndexedAMD\0"
"glBlendFunci\0"
"\0"
- /* _mesa_function_pool[24877]: GlobalAlphaFactorbSUN (dynamic) */
+ /* _mesa_function_pool[25754]: GlobalAlphaFactorbSUN (dynamic) */
"i\0"
"glGlobalAlphaFactorbSUN\0"
"\0"
- /* _mesa_function_pool[24904]: Uniform2ui (will be remapped) */
+ /* _mesa_function_pool[25781]: Uniform2ui (will be remapped) */
"iii\0"
"glUniform2uiEXT\0"
"glUniform2ui\0"
"\0"
- /* _mesa_function_pool[24938]: ScissorIndexed (will be remapped) */
+ /* _mesa_function_pool[25815]: ScissorIndexed (will be remapped) */
"iiiii\0"
"glScissorIndexed\0"
"\0"
- /* _mesa_function_pool[24962]: End (offset 43) */
+ /* _mesa_function_pool[25839]: End (offset 43) */
"\0"
"glEnd\0"
"\0"
- /* _mesa_function_pool[24970]: BindVertexBuffers (will be remapped) */
+ /* _mesa_function_pool[25847]: BindVertexBuffers (will be remapped) */
"iippp\0"
"glBindVertexBuffers\0"
"\0"
- /* _mesa_function_pool[24997]: GetSamplerParameteriv (will be remapped) */
+ /* _mesa_function_pool[25874]: GetSamplerParameteriv (will be remapped) */
"iip\0"
"glGetSamplerParameteriv\0"
"\0"
- /* _mesa_function_pool[25026]: GenProgramPipelines (will be remapped) */
+ /* _mesa_function_pool[25903]: GenProgramPipelines (will be remapped) */
"ip\0"
"glGenProgramPipelines\0"
"glGenProgramPipelinesEXT\0"
"\0"
- /* _mesa_function_pool[25077]: Enable (offset 215) */
+ /* _mesa_function_pool[25954]: Enable (offset 215) */
"i\0"
"glEnable\0"
"\0"
- /* _mesa_function_pool[25089]: IsProgramPipeline (will be remapped) */
+ /* _mesa_function_pool[25966]: IsProgramPipeline (will be remapped) */
"i\0"
"glIsProgramPipeline\0"
"glIsProgramPipelineEXT\0"
"\0"
- /* _mesa_function_pool[25135]: ShaderBinary (will be remapped) */
+ /* _mesa_function_pool[26012]: ShaderBinary (will be remapped) */
"ipipi\0"
"glShaderBinary\0"
"\0"
- /* _mesa_function_pool[25157]: GetFragmentMaterialivSGIX (dynamic) */
+ /* _mesa_function_pool[26034]: GetFragmentMaterialivSGIX (dynamic) */
"iip\0"
"glGetFragmentMaterialivSGIX\0"
"\0"
- /* _mesa_function_pool[25190]: WeightPointerARB (dynamic) */
+ /* _mesa_function_pool[26067]: WeightPointerARB (dynamic) */
"iiip\0"
"glWeightPointerARB\0"
"glWeightPointerOES\0"
"\0"
- /* _mesa_function_pool[25234]: Normal3x (will be remapped) */
+ /* _mesa_function_pool[26111]: TextureSubImage1D (will be remapped) */
+ "iiiiiip\0"
+ "glTextureSubImage1D\0"
+ "\0"
+ /* _mesa_function_pool[26140]: Normal3x (will be remapped) */
"iii\0"
"glNormal3xOES\0"
"glNormal3x\0"
"\0"
- /* _mesa_function_pool[25264]: VertexAttrib4fARB (will be remapped) */
+ /* _mesa_function_pool[26170]: VertexAttrib4fARB (will be remapped) */
"iffff\0"
"glVertexAttrib4f\0"
"glVertexAttrib4fARB\0"
"\0"
- /* _mesa_function_pool[25308]: ReadnPixelsARB (will be remapped) */
+ /* _mesa_function_pool[26214]: TexCoord4fv (offset 121) */
+ "p\0"
+ "glTexCoord4fv\0"
+ "\0"
+ /* _mesa_function_pool[26231]: ReadnPixelsARB (will be remapped) */
"iiiiiiip\0"
"glReadnPixelsARB\0"
"\0"
- /* _mesa_function_pool[25335]: InvalidateTexSubImage (will be remapped) */
+ /* _mesa_function_pool[26258]: InvalidateTexSubImage (will be remapped) */
"iiiiiiii\0"
"glInvalidateTexSubImage\0"
"\0"
- /* _mesa_function_pool[25369]: Normal3s (offset 60) */
+ /* _mesa_function_pool[26292]: Normal3s (offset 60) */
"iii\0"
"glNormal3s\0"
"\0"
- /* _mesa_function_pool[25385]: Materialxv (will be remapped) */
+ /* _mesa_function_pool[26308]: Materialxv (will be remapped) */
"iip\0"
"glMaterialxvOES\0"
"glMaterialxv\0"
"\0"
- /* _mesa_function_pool[25419]: Normal3i (offset 58) */
+ /* _mesa_function_pool[26342]: Normal3i (offset 58) */
"iii\0"
"glNormal3i\0"
"\0"
- /* _mesa_function_pool[25435]: ProgramNamedParameter4fvNV (will be remapped) */
+ /* _mesa_function_pool[26358]: ProgramNamedParameter4fvNV (will be remapped) */
"iipp\0"
"glProgramNamedParameter4fvNV\0"
"\0"
- /* _mesa_function_pool[25470]: Normal3b (offset 52) */
+ /* _mesa_function_pool[26393]: Normal3b (offset 52) */
"iii\0"
"glNormal3b\0"
"\0"
- /* _mesa_function_pool[25486]: Normal3d (offset 54) */
+ /* _mesa_function_pool[26409]: Normal3d (offset 54) */
"ddd\0"
"glNormal3d\0"
"\0"
- /* _mesa_function_pool[25502]: Normal3f (offset 56) */
+ /* _mesa_function_pool[26425]: Normal3f (offset 56) */
"fff\0"
"glNormal3f\0"
"\0"
- /* _mesa_function_pool[25518]: Indexi (offset 48) */
+ /* _mesa_function_pool[26441]: Indexi (offset 48) */
"i\0"
"glIndexi\0"
"\0"
- /* _mesa_function_pool[25530]: Uniform1uiv (will be remapped) */
+ /* _mesa_function_pool[26453]: Uniform1uiv (will be remapped) */
"iip\0"
"glUniform1uivEXT\0"
"glUniform1uiv\0"
"\0"
- /* _mesa_function_pool[25566]: VertexAttribI2uiEXT (will be remapped) */
+ /* _mesa_function_pool[26489]: VertexAttribI2uiEXT (will be remapped) */
"iii\0"
"glVertexAttribI2uiEXT\0"
"glVertexAttribI2ui\0"
"\0"
- /* _mesa_function_pool[25612]: IsRenderbuffer (will be remapped) */
+ /* _mesa_function_pool[26535]: IsRenderbuffer (will be remapped) */
"i\0"
"glIsRenderbuffer\0"
"glIsRenderbufferEXT\0"
"glIsRenderbufferOES\0"
"\0"
- /* _mesa_function_pool[25672]: NormalP3uiv (will be remapped) */
+ /* _mesa_function_pool[26595]: NormalP3uiv (will be remapped) */
"ip\0"
"glNormalP3uiv\0"
"\0"
- /* _mesa_function_pool[25690]: Indexf (offset 46) */
+ /* _mesa_function_pool[26613]: Indexf (offset 46) */
"f\0"
"glIndexf\0"
"\0"
- /* _mesa_function_pool[25702]: Indexd (offset 44) */
+ /* _mesa_function_pool[26625]: Indexd (offset 44) */
"d\0"
"glIndexd\0"
"\0"
- /* _mesa_function_pool[25714]: GetMaterialiv (offset 270) */
+ /* _mesa_function_pool[26637]: GetMaterialiv (offset 270) */
"iip\0"
"glGetMaterialiv\0"
"\0"
- /* _mesa_function_pool[25735]: Indexs (offset 50) */
+ /* _mesa_function_pool[26658]: Indexs (offset 50) */
"i\0"
"glIndexs\0"
"\0"
- /* _mesa_function_pool[25747]: MultiTexCoordP1uiv (will be remapped) */
+ /* _mesa_function_pool[26670]: MultiTexCoordP1uiv (will be remapped) */
"iip\0"
"glMultiTexCoordP1uiv\0"
"\0"
- /* _mesa_function_pool[25773]: ConvolutionFilter2D (offset 349) */
+ /* _mesa_function_pool[26696]: ConvolutionFilter2D (offset 349) */
"iiiiiip\0"
"glConvolutionFilter2D\0"
"glConvolutionFilter2DEXT\0"
"\0"
- /* _mesa_function_pool[25829]: Vertex2d (offset 126) */
+ /* _mesa_function_pool[26752]: Vertex2d (offset 126) */
"dd\0"
"glVertex2d\0"
"\0"
- /* _mesa_function_pool[25844]: Vertex2f (offset 128) */
+ /* _mesa_function_pool[26767]: Vertex2f (offset 128) */
"ff\0"
"glVertex2f\0"
"\0"
- /* _mesa_function_pool[25859]: Color4bv (offset 26) */
+ /* _mesa_function_pool[26782]: Color4bv (offset 26) */
"p\0"
"glColor4bv\0"
"\0"
- /* _mesa_function_pool[25873]: VertexAttrib2fvNV (will be remapped) */
+ /* _mesa_function_pool[26796]: ProgramUniformMatrix3x2dv (will be remapped) */
+ "iiiip\0"
+ "glProgramUniformMatrix3x2dv\0"
+ "\0"
+ /* _mesa_function_pool[26831]: VertexAttrib2fvNV (will be remapped) */
"ip\0"
"glVertexAttrib2fvNV\0"
"\0"
- /* _mesa_function_pool[25897]: Vertex2s (offset 132) */
+ /* _mesa_function_pool[26855]: Vertex2s (offset 132) */
"ii\0"
"glVertex2s\0"
"\0"
- /* _mesa_function_pool[25912]: ActiveTexture (offset 374) */
+ /* _mesa_function_pool[26870]: ActiveTexture (offset 374) */
"i\0"
"glActiveTexture\0"
"glActiveTextureARB\0"
"\0"
- /* _mesa_function_pool[25950]: GlobalAlphaFactorfSUN (dynamic) */
+ /* _mesa_function_pool[26908]: GlobalAlphaFactorfSUN (dynamic) */
"f\0"
"glGlobalAlphaFactorfSUN\0"
"\0"
- /* _mesa_function_pool[25977]: ColorP4uiv (will be remapped) */
+ /* _mesa_function_pool[26935]: ColorP4uiv (will be remapped) */
"ip\0"
"glColorP4uiv\0"
"\0"
- /* _mesa_function_pool[25994]: DrawTexxOES (will be remapped) */
+ /* _mesa_function_pool[26952]: DrawTexxOES (will be remapped) */
"iiiii\0"
"glDrawTexxOES\0"
"\0"
- /* _mesa_function_pool[26015]: SetFenceNV (dynamic) */
+ /* _mesa_function_pool[26973]: SetFenceNV (dynamic) */
"ii\0"
"glSetFenceNV\0"
"\0"
- /* _mesa_function_pool[26032]: PixelTexGenParameterivSGIS (dynamic) */
+ /* _mesa_function_pool[26990]: PixelTexGenParameterivSGIS (dynamic) */
"ip\0"
"glPixelTexGenParameterivSGIS\0"
"\0"
- /* _mesa_function_pool[26065]: MultiTexCoordP3ui (will be remapped) */
+ /* _mesa_function_pool[27023]: MultiTexCoordP3ui (will be remapped) */
"iii\0"
"glMultiTexCoordP3ui\0"
"\0"
- /* _mesa_function_pool[26090]: GetAttribLocation (will be remapped) */
+ /* _mesa_function_pool[27048]: GetAttribLocation (will be remapped) */
"ip\0"
"glGetAttribLocation\0"
"glGetAttribLocationARB\0"
"\0"
- /* _mesa_function_pool[26137]: GetCombinerStageParameterfvNV (dynamic) */
+ /* _mesa_function_pool[27095]: GetCombinerStageParameterfvNV (dynamic) */
"iip\0"
"glGetCombinerStageParameterfvNV\0"
"\0"
- /* _mesa_function_pool[26174]: DrawBuffer (offset 202) */
+ /* _mesa_function_pool[27132]: DrawBuffer (offset 202) */
"i\0"
"glDrawBuffer\0"
"\0"
- /* _mesa_function_pool[26190]: MultiTexCoord2dv (offset 385) */
+ /* _mesa_function_pool[27148]: MultiTexCoord2dv (offset 385) */
"ip\0"
"glMultiTexCoord2dv\0"
"glMultiTexCoord2dvARB\0"
"\0"
- /* _mesa_function_pool[26235]: IsSampler (will be remapped) */
+ /* _mesa_function_pool[27193]: IsSampler (will be remapped) */
"i\0"
"glIsSampler\0"
"\0"
- /* _mesa_function_pool[26250]: BlendFunc (offset 241) */
+ /* _mesa_function_pool[27208]: BlendFunc (offset 241) */
"ii\0"
"glBlendFunc\0"
"\0"
- /* _mesa_function_pool[26266]: LineStipple (offset 167) */
+ /* _mesa_function_pool[27224]: LineStipple (offset 167) */
"ii\0"
"glLineStipple\0"
"\0"
- /* _mesa_function_pool[26284]: Tangent3fvEXT (dynamic) */
+ /* _mesa_function_pool[27242]: Tangent3fvEXT (dynamic) */
"p\0"
"glTangent3fvEXT\0"
"\0"
- /* _mesa_function_pool[26303]: ColorMaterial (offset 151) */
+ /* _mesa_function_pool[27261]: ColorMaterial (offset 151) */
"ii\0"
"glColorMaterial\0"
"\0"
- /* _mesa_function_pool[26323]: RasterPos3sv (offset 77) */
+ /* _mesa_function_pool[27281]: RasterPos3sv (offset 77) */
"p\0"
"glRasterPos3sv\0"
"\0"
- /* _mesa_function_pool[26341]: TexCoordP2ui (will be remapped) */
+ /* _mesa_function_pool[27299]: TexCoordP2ui (will be remapped) */
"ii\0"
"glTexCoordP2ui\0"
"\0"
- /* _mesa_function_pool[26360]: TexParameteriv (offset 181) */
+ /* _mesa_function_pool[27318]: TexParameteriv (offset 181) */
"iip\0"
"glTexParameteriv\0"
"\0"
- /* _mesa_function_pool[26382]: VertexAttrib3fvARB (will be remapped) */
+ /* _mesa_function_pool[27340]: VertexAttrib3fvARB (will be remapped) */
"ip\0"
"glVertexAttrib3fv\0"
"glVertexAttrib3fvARB\0"
"\0"
- /* _mesa_function_pool[26425]: ProgramUniformMatrix3x4fv (will be remapped) */
+ /* _mesa_function_pool[27383]: ProgramUniformMatrix3x4fv (will be remapped) */
"iiiip\0"
"glProgramUniformMatrix3x4fv\0"
"glProgramUniformMatrix3x4fvEXT\0"
"\0"
- /* _mesa_function_pool[26491]: PixelTransformParameterfEXT (dynamic) */
+ /* _mesa_function_pool[27449]: PixelTransformParameterfEXT (dynamic) */
"iif\0"
"glPixelTransformParameterfEXT\0"
"\0"
- /* _mesa_function_pool[26526]: TextureColorMaskSGIS (dynamic) */
+ /* _mesa_function_pool[27484]: TextureColorMaskSGIS (dynamic) */
"iiii\0"
"glTextureColorMaskSGIS\0"
"\0"
- /* _mesa_function_pool[26555]: GetColorTable (offset 343) */
+ /* _mesa_function_pool[27513]: GetColorTable (offset 343) */
"iiip\0"
"glGetColorTable\0"
"glGetColorTableSGI\0"
"glGetColorTableEXT\0"
"\0"
- /* _mesa_function_pool[26615]: TexCoord3i (offset 114) */
+ /* _mesa_function_pool[27573]: TexCoord3i (offset 114) */
"iii\0"
"glTexCoord3i\0"
"\0"
- /* _mesa_function_pool[26633]: CopyColorTable (offset 342) */
+ /* _mesa_function_pool[27591]: CopyColorTable (offset 342) */
"iiiii\0"
"glCopyColorTable\0"
"glCopyColorTableSGI\0"
"\0"
- /* _mesa_function_pool[26677]: Frustum (offset 289) */
+ /* _mesa_function_pool[27635]: Frustum (offset 289) */
"dddddd\0"
"glFrustum\0"
"\0"
- /* _mesa_function_pool[26695]: TexCoord3d (offset 110) */
+ /* _mesa_function_pool[27653]: TexCoord3d (offset 110) */
"ddd\0"
"glTexCoord3d\0"
"\0"
- /* _mesa_function_pool[26713]: TexCoord3f (offset 112) */
+ /* _mesa_function_pool[27671]: GetTextureParameteriv (will be remapped) */
+ "iip\0"
+ "glGetTextureParameteriv\0"
+ "\0"
+ /* _mesa_function_pool[27700]: TexCoord3f (offset 112) */
"fff\0"
"glTexCoord3f\0"
"\0"
- /* _mesa_function_pool[26731]: DepthRangeArrayv (will be remapped) */
+ /* _mesa_function_pool[27718]: DepthRangeArrayv (will be remapped) */
"iip\0"
"glDepthRangeArrayv\0"
"\0"
- /* _mesa_function_pool[26755]: DeleteTextures (offset 327) */
+ /* _mesa_function_pool[27742]: DeleteTextures (offset 327) */
"ip\0"
"glDeleteTextures\0"
"glDeleteTexturesEXT\0"
"\0"
- /* _mesa_function_pool[26796]: TexCoordPointerEXT (will be remapped) */
+ /* _mesa_function_pool[27783]: TexCoordPointerEXT (will be remapped) */
"iiiip\0"
"glTexCoordPointerEXT\0"
"\0"
- /* _mesa_function_pool[26824]: TexCoord3s (offset 116) */
+ /* _mesa_function_pool[27811]: TexCoord3s (offset 116) */
"iii\0"
"glTexCoord3s\0"
"\0"
- /* _mesa_function_pool[26842]: TexCoord4fVertex4fSUN (dynamic) */
+ /* _mesa_function_pool[27829]: TexCoord4fVertex4fSUN (dynamic) */
"ffffffff\0"
"glTexCoord4fVertex4fSUN\0"
"\0"
- /* _mesa_function_pool[26876]: CombinerStageParameterfvNV (dynamic) */
+ /* _mesa_function_pool[27863]: TextureParameterIuiv (will be remapped) */
"iip\0"
- "glCombinerStageParameterfvNV\0"
+ "glTextureParameterIuiv\0"
"\0"
- /* _mesa_function_pool[26910]: GenPerfMonitorsAMD (will be remapped) */
- "ip\0"
- "glGenPerfMonitorsAMD\0"
+ /* _mesa_function_pool[27891]: CombinerStageParameterfvNV (dynamic) */
+ "iip\0"
+ "glCombinerStageParameterfvNV\0"
"\0"
- /* _mesa_function_pool[26935]: ClearAccum (offset 204) */
+ /* _mesa_function_pool[27925]: ClearAccum (offset 204) */
"ffff\0"
"glClearAccum\0"
"\0"
- /* _mesa_function_pool[26954]: DeformSGIX (dynamic) */
+ /* _mesa_function_pool[27944]: DeformSGIX (dynamic) */
"i\0"
"glDeformSGIX\0"
"\0"
- /* _mesa_function_pool[26970]: TexCoord4iv (offset 123) */
+ /* _mesa_function_pool[27960]: TexCoord4iv (offset 123) */
"p\0"
"glTexCoord4iv\0"
"\0"
- /* _mesa_function_pool[26987]: TexStorage3D (will be remapped) */
+ /* _mesa_function_pool[27977]: TexStorage3D (will be remapped) */
"iiiiii\0"
"glTexStorage3D\0"
"\0"
- /* _mesa_function_pool[27010]: FramebufferTexture3D (will be remapped) */
+ /* _mesa_function_pool[28000]: FramebufferTexture3D (will be remapped) */
"iiiiii\0"
"glFramebufferTexture3D\0"
"glFramebufferTexture3DEXT\0"
"glFramebufferTexture3DOES\0"
"\0"
- /* _mesa_function_pool[27093]: FragmentLightModelfvSGIX (dynamic) */
+ /* _mesa_function_pool[28083]: FragmentLightModelfvSGIX (dynamic) */
"ip\0"
"glFragmentLightModelfvSGIX\0"
"\0"
- /* _mesa_function_pool[27124]: GetBufferParameteriv (will be remapped) */
+ /* _mesa_function_pool[28114]: GetBufferParameteriv (will be remapped) */
"iip\0"
"glGetBufferParameteriv\0"
"glGetBufferParameterivARB\0"
"\0"
- /* _mesa_function_pool[27178]: VertexAttrib2fNV (will be remapped) */
+ /* _mesa_function_pool[28168]: VertexAttrib2fNV (will be remapped) */
"iff\0"
"glVertexAttrib2fNV\0"
"\0"
- /* _mesa_function_pool[27202]: GetFragmentLightfvSGIX (dynamic) */
+ /* _mesa_function_pool[28192]: GetFragmentLightfvSGIX (dynamic) */
"iip\0"
"glGetFragmentLightfvSGIX\0"
"\0"
- /* _mesa_function_pool[27232]: CopyTexImage2D (offset 324) */
+ /* _mesa_function_pool[28222]: CopyTexImage2D (offset 324) */
"iiiiiiii\0"
"glCopyTexImage2D\0"
"glCopyTexImage2DEXT\0"
"\0"
- /* _mesa_function_pool[27279]: Vertex3fv (offset 137) */
+ /* _mesa_function_pool[28269]: Vertex3fv (offset 137) */
"p\0"
"glVertex3fv\0"
"\0"
- /* _mesa_function_pool[27294]: WindowPos4dvMESA (will be remapped) */
+ /* _mesa_function_pool[28284]: WindowPos4dvMESA (will be remapped) */
"p\0"
"glWindowPos4dvMESA\0"
"\0"
- /* _mesa_function_pool[27316]: CreateShaderProgramEXT (will be remapped) */
+ /* _mesa_function_pool[28306]: CreateShaderProgramEXT (will be remapped) */
"ip\0"
"glCreateShaderProgramEXT\0"
"\0"
- /* _mesa_function_pool[27345]: VertexAttribs1dvNV (will be remapped) */
+ /* _mesa_function_pool[28335]: VertexAttribs1dvNV (will be remapped) */
"iip\0"
"glVertexAttribs1dvNV\0"
"\0"
- /* _mesa_function_pool[27371]: IsQuery (will be remapped) */
+ /* _mesa_function_pool[28361]: IsQuery (will be remapped) */
"i\0"
"glIsQuery\0"
"glIsQueryARB\0"
"\0"
- /* _mesa_function_pool[27397]: EdgeFlagPointerEXT (will be remapped) */
+ /* _mesa_function_pool[28387]: EdgeFlagPointerEXT (will be remapped) */
"iip\0"
"glEdgeFlagPointerEXT\0"
"\0"
- /* _mesa_function_pool[27423]: VertexAttribs2svNV (will be remapped) */
+ /* _mesa_function_pool[28413]: VertexAttribs2svNV (will be remapped) */
"iip\0"
"glVertexAttribs2svNV\0"
"\0"
- /* _mesa_function_pool[27449]: CreateShaderProgramv (will be remapped) */
+ /* _mesa_function_pool[28439]: CreateShaderProgramv (will be remapped) */
"iip\0"
"glCreateShaderProgramv\0"
"glCreateShaderProgramvEXT\0"
"\0"
- /* _mesa_function_pool[27503]: BlendEquationiARB (will be remapped) */
+ /* _mesa_function_pool[28493]: BlendEquationiARB (will be remapped) */
"ii\0"
"glBlendEquationiARB\0"
"glBlendEquationIndexedAMD\0"
"glBlendEquationi\0"
"\0"
- /* _mesa_function_pool[27570]: VertexAttribI4uivEXT (will be remapped) */
+ /* _mesa_function_pool[28560]: VertexAttribI4uivEXT (will be remapped) */
"ip\0"
"glVertexAttribI4uivEXT\0"
"glVertexAttribI4uiv\0"
"\0"
- /* _mesa_function_pool[27617]: PointSizex (will be remapped) */
+ /* _mesa_function_pool[28607]: PointSizex (will be remapped) */
"i\0"
"glPointSizexOES\0"
"glPointSizex\0"
"\0"
- /* _mesa_function_pool[27649]: PolygonMode (offset 174) */
+ /* _mesa_function_pool[28639]: PolygonMode (offset 174) */
"ii\0"
"glPolygonMode\0"
"\0"
- /* _mesa_function_pool[27667]: SecondaryColor3iv (will be remapped) */
+ /* _mesa_function_pool[28657]: SecondaryColor3iv (will be remapped) */
"p\0"
"glSecondaryColor3iv\0"
"glSecondaryColor3ivEXT\0"
"\0"
- /* _mesa_function_pool[27713]: VertexAttribI1iEXT (will be remapped) */
+ /* _mesa_function_pool[28703]: VertexAttribI1iEXT (will be remapped) */
"ii\0"
"glVertexAttribI1iEXT\0"
"glVertexAttribI1i\0"
"\0"
- /* _mesa_function_pool[27756]: VertexAttrib4Niv (will be remapped) */
+ /* _mesa_function_pool[28746]: VertexAttrib4Niv (will be remapped) */
"ip\0"
"glVertexAttrib4Niv\0"
"glVertexAttrib4NivARB\0"
"\0"
- /* _mesa_function_pool[27801]: GetMapAttribParameterivNV (dynamic) */
+ /* _mesa_function_pool[28791]: GetMapAttribParameterivNV (dynamic) */
"iiip\0"
"glGetMapAttribParameterivNV\0"
"\0"
- /* _mesa_function_pool[27835]: GetnUniformdvARB (will be remapped) */
+ /* _mesa_function_pool[28825]: GetnUniformdvARB (will be remapped) */
"iiip\0"
"glGetnUniformdvARB\0"
"\0"
- /* _mesa_function_pool[27860]: LinkProgram (will be remapped) */
+ /* _mesa_function_pool[28850]: LinkProgram (will be remapped) */
"i\0"
"glLinkProgram\0"
"glLinkProgramARB\0"
"\0"
- /* _mesa_function_pool[27894]: ProgramUniform4f (will be remapped) */
+ /* _mesa_function_pool[28884]: ProgramUniform4d (will be remapped) */
+ "iidddd\0"
+ "glProgramUniform4d\0"
+ "\0"
+ /* _mesa_function_pool[28911]: ProgramUniform4f (will be remapped) */
"iiffff\0"
"glProgramUniform4f\0"
"glProgramUniform4fEXT\0"
"\0"
- /* _mesa_function_pool[27943]: ProgramUniform4i (will be remapped) */
+ /* _mesa_function_pool[28960]: ProgramUniform4i (will be remapped) */
"iiiiii\0"
"glProgramUniform4i\0"
"glProgramUniform4iEXT\0"
"\0"
- /* _mesa_function_pool[27992]: ListParameterfvSGIX (dynamic) */
+ /* _mesa_function_pool[29009]: ListParameterfvSGIX (dynamic) */
"iip\0"
"glListParameterfvSGIX\0"
"\0"
- /* _mesa_function_pool[28019]: VertexAttrib4d (will be remapped) */
+ /* _mesa_function_pool[29036]: VertexAttrib4d (will be remapped) */
"idddd\0"
"glVertexAttrib4d\0"
"glVertexAttrib4dARB\0"
"\0"
- /* _mesa_function_pool[28063]: WindowPos4sMESA (will be remapped) */
+ /* _mesa_function_pool[29080]: WindowPos4sMESA (will be remapped) */
"iiii\0"
"glWindowPos4sMESA\0"
"\0"
- /* _mesa_function_pool[28087]: VertexAttrib4s (will be remapped) */
+ /* _mesa_function_pool[29104]: VertexAttrib4s (will be remapped) */
"iiiii\0"
"glVertexAttrib4s\0"
"glVertexAttrib4sARB\0"
"\0"
- /* _mesa_function_pool[28131]: VertexAttrib1dvNV (will be remapped) */
+ /* _mesa_function_pool[29148]: VertexAttrib1dvNV (will be remapped) */
"ip\0"
"glVertexAttrib1dvNV\0"
"\0"
- /* _mesa_function_pool[28155]: ReplacementCodePointerSUN (dynamic) */
+ /* _mesa_function_pool[29172]: ReplacementCodePointerSUN (dynamic) */
"iip\0"
"glReplacementCodePointerSUN\0"
"\0"
- /* _mesa_function_pool[28188]: TexStorage3DMultisample (will be remapped) */
+ /* _mesa_function_pool[29205]: TexStorage3DMultisample (will be remapped) */
"iiiiiii\0"
"glTexStorage3DMultisample\0"
"\0"
- /* _mesa_function_pool[28223]: Binormal3bvEXT (dynamic) */
+ /* _mesa_function_pool[29240]: Binormal3bvEXT (dynamic) */
"p\0"
"glBinormal3bvEXT\0"
"\0"
- /* _mesa_function_pool[28243]: SamplerParameteriv (will be remapped) */
+ /* _mesa_function_pool[29260]: SamplerParameteriv (will be remapped) */
"iip\0"
"glSamplerParameteriv\0"
"\0"
- /* _mesa_function_pool[28269]: VertexAttribP3uiv (will be remapped) */
+ /* _mesa_function_pool[29286]: VertexAttribP3uiv (will be remapped) */
"iiip\0"
"glVertexAttribP3uiv\0"
"\0"
- /* _mesa_function_pool[28295]: ScissorIndexedv (will be remapped) */
+ /* _mesa_function_pool[29312]: ScissorIndexedv (will be remapped) */
"ip\0"
"glScissorIndexedv\0"
"\0"
- /* _mesa_function_pool[28317]: Color4ubVertex2fSUN (dynamic) */
+ /* _mesa_function_pool[29334]: Color4ubVertex2fSUN (dynamic) */
"iiiiff\0"
"glColor4ubVertex2fSUN\0"
"\0"
- /* _mesa_function_pool[28347]: FragmentColorMaterialSGIX (dynamic) */
+ /* _mesa_function_pool[29364]: FragmentColorMaterialSGIX (dynamic) */
"ii\0"
"glFragmentColorMaterialSGIX\0"
"\0"
- /* _mesa_function_pool[28379]: GetStringi (will be remapped) */
+ /* _mesa_function_pool[29396]: GetStringi (will be remapped) */
"ii\0"
"glGetStringi\0"
"\0"
- /* _mesa_function_pool[28396]: VertexAttrib4dv (will be remapped) */
+ /* _mesa_function_pool[29413]: Uniform2dv (will be remapped) */
+ "iip\0"
+ "glUniform2dv\0"
+ "\0"
+ /* _mesa_function_pool[29431]: VertexAttrib4dv (will be remapped) */
"ip\0"
"glVertexAttrib4dv\0"
"glVertexAttrib4dvARB\0"
"\0"
- /* _mesa_function_pool[28439]: EvalCoord2dv (offset 233) */
+ /* _mesa_function_pool[29474]: CreateTextures (will be remapped) */
+ "iip\0"
+ "glCreateTextures\0"
+ "\0"
+ /* _mesa_function_pool[29496]: EvalCoord2dv (offset 233) */
"p\0"
"glEvalCoord2dv\0"
"\0"
- /* _mesa_function_pool[28457]: VertexAttrib1fNV (will be remapped) */
+ /* _mesa_function_pool[29514]: VertexAttrib1fNV (will be remapped) */
"if\0"
"glVertexAttrib1fNV\0"
"\0"
- /* _mesa_function_pool[28480]: CompressedTexSubImage1D (will be remapped) */
+ /* _mesa_function_pool[29537]: CompressedTexSubImage1D (will be remapped) */
"iiiiiip\0"
"glCompressedTexSubImage1D\0"
"glCompressedTexSubImage1DARB\0"
"\0"
- /* _mesa_function_pool[28544]: GetSeparableFilter (offset 359) */
+ /* _mesa_function_pool[29601]: GetSeparableFilter (offset 359) */
"iiippp\0"
"glGetSeparableFilter\0"
"glGetSeparableFilterEXT\0"
"\0"
- /* _mesa_function_pool[28597]: ReplacementCodeusSUN (dynamic) */
+ /* _mesa_function_pool[29654]: ReplacementCodeusSUN (dynamic) */
"i\0"
"glReplacementCodeusSUN\0"
"\0"
- /* _mesa_function_pool[28623]: FeedbackBuffer (offset 194) */
+ /* _mesa_function_pool[29680]: FeedbackBuffer (offset 194) */
"iip\0"
"glFeedbackBuffer\0"
"\0"
- /* _mesa_function_pool[28645]: RasterPos2iv (offset 67) */
+ /* _mesa_function_pool[29702]: RasterPos2iv (offset 67) */
"p\0"
"glRasterPos2iv\0"
"\0"
- /* _mesa_function_pool[28663]: TexImage1D (offset 182) */
+ /* _mesa_function_pool[29720]: TexImage1D (offset 182) */
"iiiiiiip\0"
"glTexImage1D\0"
"\0"
- /* _mesa_function_pool[28686]: MultiDrawElementsEXT (will be remapped) */
+ /* _mesa_function_pool[29743]: MultiDrawElementsEXT (will be remapped) */
"ipipi\0"
"glMultiDrawElements\0"
"glMultiDrawElementsEXT\0"
"\0"
- /* _mesa_function_pool[28736]: GetnSeparableFilterARB (will be remapped) */
+ /* _mesa_function_pool[29793]: GetnSeparableFilterARB (will be remapped) */
"iiiipipp\0"
"glGetnSeparableFilterARB\0"
"\0"
- /* _mesa_function_pool[28771]: FrontFace (offset 157) */
+ /* _mesa_function_pool[29828]: FrontFace (offset 157) */
"i\0"
"glFrontFace\0"
"\0"
- /* _mesa_function_pool[28786]: MultiModeDrawArraysIBM (will be remapped) */
+ /* _mesa_function_pool[29843]: MultiModeDrawArraysIBM (will be remapped) */
"pppii\0"
"glMultiModeDrawArraysIBM\0"
"\0"
- /* _mesa_function_pool[28818]: Tangent3ivEXT (dynamic) */
+ /* _mesa_function_pool[29875]: Tangent3ivEXT (dynamic) */
"p\0"
"glTangent3ivEXT\0"
"\0"
- /* _mesa_function_pool[28837]: LightEnviSGIX (dynamic) */
+ /* _mesa_function_pool[29894]: LightEnviSGIX (dynamic) */
"ii\0"
"glLightEnviSGIX\0"
"\0"
- /* _mesa_function_pool[28857]: Normal3dv (offset 55) */
+ /* _mesa_function_pool[29914]: Normal3dv (offset 55) */
"p\0"
"glNormal3dv\0"
"\0"
- /* _mesa_function_pool[28872]: Lightf (offset 159) */
+ /* _mesa_function_pool[29929]: Lightf (offset 159) */
"iif\0"
"glLightf\0"
"\0"
- /* _mesa_function_pool[28886]: MatrixMode (offset 293) */
+ /* _mesa_function_pool[29943]: MatrixMode (offset 293) */
"i\0"
"glMatrixMode\0"
"\0"
- /* _mesa_function_pool[28902]: GetPixelMapusv (offset 273) */
+ /* _mesa_function_pool[29959]: GetPixelMapusv (offset 273) */
"ip\0"
"glGetPixelMapusv\0"
"\0"
- /* _mesa_function_pool[28923]: Lighti (offset 161) */
+ /* _mesa_function_pool[29980]: Lighti (offset 161) */
"iii\0"
"glLighti\0"
"\0"
- /* _mesa_function_pool[28937]: VertexAttribPointerNV (will be remapped) */
+ /* _mesa_function_pool[29994]: VertexAttribPointerNV (will be remapped) */
"iiiip\0"
"glVertexAttribPointerNV\0"
"\0"
- /* _mesa_function_pool[28968]: GetFragDataIndex (will be remapped) */
+ /* _mesa_function_pool[30025]: GetFragDataIndex (will be remapped) */
"ip\0"
"glGetFragDataIndex\0"
"\0"
- /* _mesa_function_pool[28991]: Lightx (will be remapped) */
+ /* _mesa_function_pool[30048]: Lightx (will be remapped) */
"iii\0"
"glLightxOES\0"
"glLightx\0"
"\0"
- /* _mesa_function_pool[29017]: ProgramUniform3fv (will be remapped) */
+ /* _mesa_function_pool[30074]: ProgramUniform3fv (will be remapped) */
"iiip\0"
"glProgramUniform3fv\0"
"glProgramUniform3fvEXT\0"
"\0"
- /* _mesa_function_pool[29066]: MultMatrixd (offset 295) */
+ /* _mesa_function_pool[30123]: MultMatrixd (offset 295) */
"p\0"
"glMultMatrixd\0"
"\0"
- /* _mesa_function_pool[29083]: MultMatrixf (offset 294) */
+ /* _mesa_function_pool[30140]: MultMatrixf (offset 294) */
"p\0"
"glMultMatrixf\0"
"\0"
- /* _mesa_function_pool[29100]: MultiTexCoord4fvARB (offset 403) */
+ /* _mesa_function_pool[30157]: MultiTexCoord4fvARB (offset 403) */
"ip\0"
"glMultiTexCoord4fv\0"
"glMultiTexCoord4fvARB\0"
"\0"
- /* _mesa_function_pool[29145]: UniformMatrix2x3fv (will be remapped) */
+ /* _mesa_function_pool[30202]: UniformMatrix2x3fv (will be remapped) */
"iiip\0"
"glUniformMatrix2x3fv\0"
"\0"
- /* _mesa_function_pool[29172]: TrackMatrixNV (will be remapped) */
+ /* _mesa_function_pool[30229]: TrackMatrixNV (will be remapped) */
"iiii\0"
"glTrackMatrixNV\0"
"\0"
- /* _mesa_function_pool[29194]: MultMatrixx (will be remapped) */
- "p\0"
- "glMultMatrixxOES\0"
- "glMultMatrixx\0"
+ /* _mesa_function_pool[30251]: SamplerParameterf (will be remapped) */
+ "iif\0"
+ "glSamplerParameterf\0"
+ "\0"
+ /* _mesa_function_pool[30276]: UniformMatrix3dv (will be remapped) */
+ "iiip\0"
+ "glUniformMatrix3dv\0"
"\0"
- /* _mesa_function_pool[29228]: PointParameterx (will be remapped) */
+ /* _mesa_function_pool[30301]: PointParameterx (will be remapped) */
"ii\0"
"glPointParameterxOES\0"
"glPointParameterx\0"
"\0"
- /* _mesa_function_pool[29271]: DrawArrays (offset 310) */
+ /* _mesa_function_pool[30344]: DrawArrays (offset 310) */
"iii\0"
"glDrawArrays\0"
"glDrawArraysEXT\0"
"\0"
- /* _mesa_function_pool[29305]: PointParameteri (will be remapped) */
+ /* _mesa_function_pool[30378]: Uniform3dv (will be remapped) */
+ "iip\0"
+ "glUniform3dv\0"
+ "\0"
+ /* _mesa_function_pool[30396]: PointParameteri (will be remapped) */
"ii\0"
"glPointParameteri\0"
"glPointParameteriNV\0"
"\0"
- /* _mesa_function_pool[29347]: PointParameterf (will be remapped) */
+ /* _mesa_function_pool[30438]: PointParameterf (will be remapped) */
"if\0"
"glPointParameterf\0"
"glPointParameterfARB\0"
"glPointParameterfEXT\0"
"glPointParameterfSGIS\0"
"\0"
- /* _mesa_function_pool[29433]: GlobalAlphaFactorsSUN (dynamic) */
+ /* _mesa_function_pool[30524]: GlobalAlphaFactorsSUN (dynamic) */
"i\0"
"glGlobalAlphaFactorsSUN\0"
"\0"
- /* _mesa_function_pool[29460]: VertexAttribBinding (will be remapped) */
+ /* _mesa_function_pool[30551]: VertexAttribBinding (will be remapped) */
"ii\0"
"glVertexAttribBinding\0"
"\0"
- /* _mesa_function_pool[29486]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[30577]: TextureSubImage2D (will be remapped) */
+ "iiiiiiiip\0"
+ "glTextureSubImage2D\0"
+ "\0"
+ /* _mesa_function_pool[30608]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
"ppp\0"
"glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[29533]: CreateShader (will be remapped) */
+ /* _mesa_function_pool[30655]: CreateShader (will be remapped) */
"i\0"
"glCreateShader\0"
"\0"
- /* _mesa_function_pool[29551]: GetProgramParameterdvNV (will be remapped) */
+ /* _mesa_function_pool[30673]: GetProgramParameterdvNV (will be remapped) */
"iiip\0"
"glGetProgramParameterdvNV\0"
"\0"
- /* _mesa_function_pool[29583]: GetProgramEnvParameterfvARB (will be remapped) */
+ /* _mesa_function_pool[30705]: ProgramUniform1dv (will be remapped) */
+ "iiip\0"
+ "glProgramUniform1dv\0"
+ "\0"
+ /* _mesa_function_pool[30731]: GetProgramEnvParameterfvARB (will be remapped) */
"iip\0"
"glGetProgramEnvParameterfvARB\0"
"\0"
- /* _mesa_function_pool[29618]: DeleteBuffers (will be remapped) */
+ /* _mesa_function_pool[30766]: DeleteBuffers (will be remapped) */
"ip\0"
"glDeleteBuffers\0"
"glDeleteBuffersARB\0"
"\0"
- /* _mesa_function_pool[29657]: GetBufferSubData (will be remapped) */
+ /* _mesa_function_pool[30805]: GetBufferSubData (will be remapped) */
"iiip\0"
"glGetBufferSubData\0"
"glGetBufferSubDataARB\0"
"\0"
- /* _mesa_function_pool[29704]: GetPerfMonitorGroupsAMD (will be remapped) */
+ /* _mesa_function_pool[30852]: GetPerfMonitorGroupsAMD (will be remapped) */
"pip\0"
"glGetPerfMonitorGroupsAMD\0"
"\0"
- /* _mesa_function_pool[29735]: FlushRasterSGIX (dynamic) */
+ /* _mesa_function_pool[30883]: FlushRasterSGIX (dynamic) */
"\0"
"glFlushRasterSGIX\0"
"\0"
- /* _mesa_function_pool[29755]: VertexAttribP2ui (will be remapped) */
+ /* _mesa_function_pool[30903]: VertexAttribP2ui (will be remapped) */
"iiii\0"
"glVertexAttribP2ui\0"
"\0"
- /* _mesa_function_pool[29780]: GetMinmaxParameteriv (offset 366) */
+ /* _mesa_function_pool[30928]: ProgramUniform4dv (will be remapped) */
+ "iiip\0"
+ "glProgramUniform4dv\0"
+ "\0"
+ /* _mesa_function_pool[30954]: GetMinmaxParameteriv (offset 366) */
"iip\0"
"glGetMinmaxParameteriv\0"
"glGetMinmaxParameterivEXT\0"
"\0"
- /* _mesa_function_pool[29834]: DrawTexivOES (will be remapped) */
+ /* _mesa_function_pool[31008]: DrawTexivOES (will be remapped) */
"p\0"
"glDrawTexivOES\0"
"\0"
- /* _mesa_function_pool[29852]: CopyTexImage1D (offset 323) */
+ /* _mesa_function_pool[31026]: CopyTexImage1D (offset 323) */
"iiiiiii\0"
"glCopyTexImage1D\0"
"glCopyTexImage1DEXT\0"
"\0"
- /* _mesa_function_pool[29898]: GetnColorTableARB (will be remapped) */
+ /* _mesa_function_pool[31072]: GetnColorTableARB (will be remapped) */
"iiiip\0"
"glGetnColorTableARB\0"
"\0"
- /* _mesa_function_pool[29925]: VertexAttribFormat (will be remapped) */
+ /* _mesa_function_pool[31099]: VertexAttribFormat (will be remapped) */
"iiiii\0"
"glVertexAttribFormat\0"
"\0"
- /* _mesa_function_pool[29953]: Vertex3i (offset 138) */
+ /* _mesa_function_pool[31127]: Vertex3i (offset 138) */
"iii\0"
"glVertex3i\0"
"\0"
- /* _mesa_function_pool[29969]: Vertex3f (offset 136) */
+ /* _mesa_function_pool[31143]: Vertex3f (offset 136) */
"fff\0"
"glVertex3f\0"
"\0"
- /* _mesa_function_pool[29985]: Vertex3d (offset 134) */
+ /* _mesa_function_pool[31159]: Vertex3d (offset 134) */
"ddd\0"
"glVertex3d\0"
"\0"
- /* _mesa_function_pool[30001]: GetProgramPipelineiv (will be remapped) */
+ /* _mesa_function_pool[31175]: GetProgramPipelineiv (will be remapped) */
"iip\0"
"glGetProgramPipelineiv\0"
"glGetProgramPipelineivEXT\0"
"\0"
- /* _mesa_function_pool[30055]: ReadBuffer (offset 254) */
+ /* _mesa_function_pool[31229]: ReadBuffer (offset 254) */
"i\0"
"glReadBuffer\0"
"glReadBufferNV\0"
"\0"
- /* _mesa_function_pool[30086]: ConvolutionParameteri (offset 352) */
+ /* _mesa_function_pool[31260]: ConvolutionParameteri (offset 352) */
"iii\0"
"glConvolutionParameteri\0"
"glConvolutionParameteriEXT\0"
"\0"
- /* _mesa_function_pool[30142]: GetTexParameterIiv (will be remapped) */
+ /* _mesa_function_pool[31316]: GetTexParameterIiv (will be remapped) */
"iip\0"
"glGetTexParameterIivEXT\0"
"glGetTexParameterIiv\0"
"\0"
- /* _mesa_function_pool[30192]: Vertex3s (offset 140) */
+ /* _mesa_function_pool[31366]: Vertex3s (offset 140) */
"iii\0"
"glVertex3s\0"
"\0"
- /* _mesa_function_pool[30208]: ConvolutionParameterf (offset 350) */
+ /* _mesa_function_pool[31382]: ConvolutionParameterf (offset 350) */
"iif\0"
"glConvolutionParameterf\0"
"glConvolutionParameterfEXT\0"
"\0"
- /* _mesa_function_pool[30264]: GetColorTableParameteriv (offset 345) */
+ /* _mesa_function_pool[31438]: GetColorTableParameteriv (offset 345) */
"iip\0"
"glGetColorTableParameteriv\0"
"glGetColorTableParameterivSGI\0"
"glGetColorTableParameterivEXT\0"
"\0"
- /* _mesa_function_pool[30356]: GetTransformFeedbackVarying (will be remapped) */
+ /* _mesa_function_pool[31530]: GetTransformFeedbackVarying (will be remapped) */
"iiipppp\0"
"glGetTransformFeedbackVarying\0"
"glGetTransformFeedbackVaryingEXT\0"
"\0"
- /* _mesa_function_pool[30428]: GetNextPerfQueryIdINTEL (will be remapped) */
+ /* _mesa_function_pool[31602]: GetNextPerfQueryIdINTEL (will be remapped) */
"ip\0"
"glGetNextPerfQueryIdINTEL\0"
"\0"
- /* _mesa_function_pool[30458]: TexCoord3fv (offset 113) */
+ /* _mesa_function_pool[31632]: TexCoord3fv (offset 113) */
"p\0"
"glTexCoord3fv\0"
"\0"
- /* _mesa_function_pool[30475]: TextureBarrierNV (will be remapped) */
+ /* _mesa_function_pool[31649]: TextureBarrierNV (will be remapped) */
"\0"
"glTextureBarrier\0"
"glTextureBarrierNV\0"
"\0"
- /* _mesa_function_pool[30513]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[31687]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
"iffffffffff\0"
"glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[30572]: ProgramLocalParameter4fARB (will be remapped) */
+ /* _mesa_function_pool[31746]: ProgramLocalParameter4fARB (will be remapped) */
"iiffff\0"
"glProgramLocalParameter4fARB\0"
"\0"
- /* _mesa_function_pool[30609]: ObjectLabel (will be remapped) */
+ /* _mesa_function_pool[31783]: ObjectLabel (will be remapped) */
"iiip\0"
"glObjectLabel\0"
"\0"
- /* _mesa_function_pool[30629]: PauseTransformFeedback (will be remapped) */
+ /* _mesa_function_pool[31803]: PauseTransformFeedback (will be remapped) */
"\0"
"glPauseTransformFeedback\0"
"\0"
- /* _mesa_function_pool[30656]: DeleteShader (will be remapped) */
+ /* _mesa_function_pool[31830]: DeleteShader (will be remapped) */
"i\0"
"glDeleteShader\0"
"\0"
- /* _mesa_function_pool[30674]: CompileShader (will be remapped) */
+ /* _mesa_function_pool[31848]: CompileShader (will be remapped) */
"i\0"
"glCompileShader\0"
"glCompileShaderARB\0"
"\0"
- /* _mesa_function_pool[30712]: Vertex2iv (offset 131) */
+ /* _mesa_function_pool[31886]: Vertex2iv (offset 131) */
"p\0"
"glVertex2iv\0"
"\0"
- /* _mesa_function_pool[30727]: TexGendv (offset 189) */
+ /* _mesa_function_pool[31901]: TexGendv (offset 189) */
"iip\0"
"glTexGendv\0"
"\0"
- /* _mesa_function_pool[30743]: ProgramLocalParameters4fvEXT (will be remapped) */
+ /* _mesa_function_pool[31917]: ProgramLocalParameters4fvEXT (will be remapped) */
"iiip\0"
"glProgramLocalParameters4fvEXT\0"
"\0"
- /* _mesa_function_pool[30780]: ResetMinmax (offset 370) */
+ /* _mesa_function_pool[31954]: ResetMinmax (offset 370) */
"i\0"
"glResetMinmax\0"
"glResetMinmaxEXT\0"
"\0"
- /* _mesa_function_pool[30814]: SpriteParameterfSGIX (dynamic) */
+ /* _mesa_function_pool[31988]: SpriteParameterfSGIX (dynamic) */
"if\0"
"glSpriteParameterfSGIX\0"
"\0"
- /* _mesa_function_pool[30841]: DeleteProgramsARB (will be remapped) */
+ /* _mesa_function_pool[32015]: GenerateTextureMipmap (will be remapped) */
+ "i\0"
+ "glGenerateTextureMipmap\0"
+ "\0"
+ /* _mesa_function_pool[32042]: DeleteProgramsARB (will be remapped) */
"ip\0"
"glDeleteProgramsARB\0"
"glDeleteProgramsNV\0"
"\0"
- /* _mesa_function_pool[30884]: ShadeModel (offset 177) */
+ /* _mesa_function_pool[32085]: ShadeModel (offset 177) */
"i\0"
"glShadeModel\0"
"\0"
- /* _mesa_function_pool[30900]: VertexAttribs1fvNV (will be remapped) */
+ /* _mesa_function_pool[32101]: VertexAttribs1fvNV (will be remapped) */
"iip\0"
"glVertexAttribs1fvNV\0"
"\0"
- /* _mesa_function_pool[30926]: FogFuncSGIS (dynamic) */
+ /* _mesa_function_pool[32127]: FogFuncSGIS (dynamic) */
"ip\0"
"glFogFuncSGIS\0"
"\0"
- /* _mesa_function_pool[30944]: GetTexLevelParameteriv (offset 285) */
+ /* _mesa_function_pool[32145]: GetTexLevelParameteriv (offset 285) */
"iiip\0"
"glGetTexLevelParameteriv\0"
"\0"
- /* _mesa_function_pool[30975]: MultiDrawArrays (will be remapped) */
+ /* _mesa_function_pool[32176]: MultiDrawArrays (will be remapped) */
"ippi\0"
"glMultiDrawArrays\0"
"glMultiDrawArraysEXT\0"
"\0"
- /* _mesa_function_pool[31020]: GetProgramLocalParameterdvARB (will be remapped) */
+ /* _mesa_function_pool[32221]: GetProgramLocalParameterdvARB (will be remapped) */
"iip\0"
"glGetProgramLocalParameterdvARB\0"
"\0"
- /* _mesa_function_pool[31057]: MapBufferRange (will be remapped) */
+ /* _mesa_function_pool[32258]: BufferParameteriAPPLE (will be remapped) */
+ "iii\0"
+ "glBufferParameteriAPPLE\0"
+ "\0"
+ /* _mesa_function_pool[32287]: MapBufferRange (will be remapped) */
"iiii\0"
"glMapBufferRange\0"
"glMapBufferRangeEXT\0"
"\0"
- /* _mesa_function_pool[31100]: DispatchCompute (will be remapped) */
+ /* _mesa_function_pool[32330]: DispatchCompute (will be remapped) */
"iii\0"
"glDispatchCompute\0"
"\0"
- /* _mesa_function_pool[31123]: UseProgramStages (will be remapped) */
+ /* _mesa_function_pool[32353]: UseProgramStages (will be remapped) */
"iii\0"
"glUseProgramStages\0"
"glUseProgramStagesEXT\0"
"\0"
- /* _mesa_function_pool[31169]: ProgramUniformMatrix4fv (will be remapped) */
+ /* _mesa_function_pool[32399]: ProgramUniformMatrix4fv (will be remapped) */
"iiiip\0"
"glProgramUniformMatrix4fv\0"
"glProgramUniformMatrix4fvEXT\0"
"\0"
- /* _mesa_function_pool[31231]: FinishAsyncSGIX (dynamic) */
+ /* _mesa_function_pool[32461]: FinishAsyncSGIX (dynamic) */
"p\0"
"glFinishAsyncSGIX\0"
"\0"
- /* _mesa_function_pool[31252]: FramebufferRenderbuffer (will be remapped) */
+ /* _mesa_function_pool[32482]: FramebufferRenderbuffer (will be remapped) */
"iiii\0"
"glFramebufferRenderbuffer\0"
"glFramebufferRenderbufferEXT\0"
"glFramebufferRenderbufferOES\0"
"\0"
- /* _mesa_function_pool[31342]: IsProgramARB (will be remapped) */
+ /* _mesa_function_pool[32572]: IsProgramARB (will be remapped) */
"i\0"
"glIsProgramARB\0"
"glIsProgramNV\0"
"\0"
- /* _mesa_function_pool[31374]: Map2d (offset 222) */
+ /* _mesa_function_pool[32604]: Map2d (offset 222) */
"iddiiddiip\0"
"glMap2d\0"
"\0"
- /* _mesa_function_pool[31394]: Map2f (offset 223) */
+ /* _mesa_function_pool[32624]: Map2f (offset 223) */
"iffiiffiip\0"
"glMap2f\0"
"\0"
- /* _mesa_function_pool[31414]: ProgramStringARB (will be remapped) */
+ /* _mesa_function_pool[32644]: ProgramStringARB (will be remapped) */
"iiip\0"
"glProgramStringARB\0"
"\0"
- /* _mesa_function_pool[31439]: MultiTexCoord4x (will be remapped) */
- "iiiii\0"
- "glMultiTexCoord4xOES\0"
- "glMultiTexCoord4x\0"
+ /* _mesa_function_pool[32669]: CopyTextureSubImage2D (will be remapped) */
+ "iiiiiiii\0"
+ "glCopyTextureSubImage2D\0"
"\0"
- /* _mesa_function_pool[31485]: MultiTexCoord4s (offset 406) */
+ /* _mesa_function_pool[32703]: MultiTexCoord4s (offset 406) */
"iiiii\0"
"glMultiTexCoord4s\0"
"glMultiTexCoord4sARB\0"
"\0"
- /* _mesa_function_pool[31531]: ViewportIndexedf (will be remapped) */
+ /* _mesa_function_pool[32749]: ViewportIndexedf (will be remapped) */
"iffff\0"
"glViewportIndexedf\0"
"\0"
- /* _mesa_function_pool[31557]: MultiTexCoord4i (offset 404) */
+ /* _mesa_function_pool[32775]: MultiTexCoord4i (offset 404) */
"iiiii\0"
"glMultiTexCoord4i\0"
"glMultiTexCoord4iARB\0"
"\0"
- /* _mesa_function_pool[31603]: ApplyTextureEXT (dynamic) */
+ /* _mesa_function_pool[32821]: ApplyTextureEXT (dynamic) */
"i\0"
"glApplyTextureEXT\0"
"\0"
- /* _mesa_function_pool[31624]: DebugMessageControl (will be remapped) */
+ /* _mesa_function_pool[32842]: DebugMessageControl (will be remapped) */
"iiiipi\0"
"glDebugMessageControlARB\0"
"glDebugMessageControl\0"
"\0"
- /* _mesa_function_pool[31679]: MultiTexCoord4d (offset 400) */
+ /* _mesa_function_pool[32897]: MultiTexCoord4d (offset 400) */
"idddd\0"
"glMultiTexCoord4d\0"
"glMultiTexCoord4dARB\0"
"\0"
- /* _mesa_function_pool[31725]: GetHistogram (offset 361) */
+ /* _mesa_function_pool[32943]: GetHistogram (offset 361) */
"iiiip\0"
"glGetHistogram\0"
"glGetHistogramEXT\0"
"\0"
- /* _mesa_function_pool[31765]: Translatex (will be remapped) */
+ /* _mesa_function_pool[32983]: Translatex (will be remapped) */
"iii\0"
"glTranslatexOES\0"
"glTranslatex\0"
"\0"
- /* _mesa_function_pool[31799]: IglooInterfaceSGIX (dynamic) */
+ /* _mesa_function_pool[33017]: IglooInterfaceSGIX (dynamic) */
"ip\0"
"glIglooInterfaceSGIX\0"
"\0"
- /* _mesa_function_pool[31824]: Indexsv (offset 51) */
+ /* _mesa_function_pool[33042]: Indexsv (offset 51) */
"p\0"
"glIndexsv\0"
"\0"
- /* _mesa_function_pool[31837]: VertexAttrib1fvARB (will be remapped) */
+ /* _mesa_function_pool[33055]: VertexAttrib1fvARB (will be remapped) */
"ip\0"
"glVertexAttrib1fv\0"
"glVertexAttrib1fvARB\0"
"\0"
- /* _mesa_function_pool[31880]: TexCoord2dv (offset 103) */
+ /* _mesa_function_pool[33098]: TexCoord2dv (offset 103) */
"p\0"
"glTexCoord2dv\0"
"\0"
- /* _mesa_function_pool[31897]: Translated (offset 303) */
+ /* _mesa_function_pool[33115]: GetDetailTexFuncSGIS (dynamic) */
+ "ip\0"
+ "glGetDetailTexFuncSGIS\0"
+ "\0"
+ /* _mesa_function_pool[33142]: Translated (offset 303) */
"ddd\0"
"glTranslated\0"
"\0"
- /* _mesa_function_pool[31915]: Translatef (offset 304) */
+ /* _mesa_function_pool[33160]: Translatef (offset 304) */
"fff\0"
"glTranslatef\0"
"\0"
- /* _mesa_function_pool[31933]: MultTransposeMatrixd (will be remapped) */
+ /* _mesa_function_pool[33178]: MultTransposeMatrixd (will be remapped) */
"p\0"
"glMultTransposeMatrixd\0"
"glMultTransposeMatrixdARB\0"
"\0"
- /* _mesa_function_pool[31985]: ProgramUniform4uiv (will be remapped) */
+ /* _mesa_function_pool[33230]: ProgramUniform4uiv (will be remapped) */
"iiip\0"
"glProgramUniform4uiv\0"
"glProgramUniform4uivEXT\0"
"\0"
- /* _mesa_function_pool[32036]: GetPerfCounterInfoINTEL (will be remapped) */
+ /* _mesa_function_pool[33281]: GetPerfCounterInfoINTEL (will be remapped) */
"iiipipppppp\0"
"glGetPerfCounterInfoINTEL\0"
"\0"
- /* _mesa_function_pool[32075]: RenderMode (offset 196) */
+ /* _mesa_function_pool[33320]: RenderMode (offset 196) */
"i\0"
"glRenderMode\0"
"\0"
- /* _mesa_function_pool[32091]: MultiTexCoord1fARB (offset 378) */
+ /* _mesa_function_pool[33336]: MultiTexCoord1fARB (offset 378) */
"if\0"
"glMultiTexCoord1f\0"
"glMultiTexCoord1fARB\0"
"\0"
- /* _mesa_function_pool[32134]: SecondaryColor3d (will be remapped) */
+ /* _mesa_function_pool[33379]: SecondaryColor3d (will be remapped) */
"ddd\0"
"glSecondaryColor3d\0"
"glSecondaryColor3dEXT\0"
"\0"
- /* _mesa_function_pool[32180]: VertexAttribs4ubvNV (will be remapped) */
+ /* _mesa_function_pool[33425]: VertexAttribs4ubvNV (will be remapped) */
"iip\0"
"glVertexAttribs4ubvNV\0"
"\0"
- /* _mesa_function_pool[32207]: WeightsvARB (dynamic) */
+ /* _mesa_function_pool[33452]: WeightsvARB (dynamic) */
"ip\0"
"glWeightsvARB\0"
"\0"
- /* _mesa_function_pool[32225]: ProgramUniform4fv (will be remapped) */
+ /* _mesa_function_pool[33470]: ProgramUniform4fv (will be remapped) */
"iiip\0"
"glProgramUniform4fv\0"
"glProgramUniform4fvEXT\0"
"\0"
- /* _mesa_function_pool[32274]: LightModelxv (will be remapped) */
+ /* _mesa_function_pool[33519]: LightModelxv (will be remapped) */
"ip\0"
"glLightModelxvOES\0"
"glLightModelxv\0"
"\0"
- /* _mesa_function_pool[32311]: CopyTexSubImage1D (offset 325) */
+ /* _mesa_function_pool[33556]: CopyTexSubImage1D (offset 325) */
"iiiiii\0"
"glCopyTexSubImage1D\0"
"glCopyTexSubImage1DEXT\0"
"\0"
- /* _mesa_function_pool[32362]: PushDebugGroup (will be remapped) */
- "iiip\0"
- "glPushDebugGroup\0"
+ /* _mesa_function_pool[33607]: TextureSubImage3D (will be remapped) */
+ "iiiiiiiiiip\0"
+ "glTextureSubImage3D\0"
"\0"
- /* _mesa_function_pool[32385]: StencilFunc (offset 243) */
+ /* _mesa_function_pool[33640]: StencilFunc (offset 243) */
"iii\0"
"glStencilFunc\0"
"\0"
- /* _mesa_function_pool[32404]: CopyPixels (offset 255) */
+ /* _mesa_function_pool[33659]: CopyPixels (offset 255) */
"iiiii\0"
"glCopyPixels\0"
"\0"
- /* _mesa_function_pool[32424]: TexGenxvOES (will be remapped) */
+ /* _mesa_function_pool[33679]: TexGenxvOES (will be remapped) */
"iip\0"
"glTexGenxvOES\0"
"\0"
- /* _mesa_function_pool[32443]: VertexAttrib4Nubv (will be remapped) */
+ /* _mesa_function_pool[33698]: GetTextureLevelParameterfv (will be remapped) */
+ "iiip\0"
+ "glGetTextureLevelParameterfv\0"
+ "\0"
+ /* _mesa_function_pool[33733]: VertexAttrib4Nubv (will be remapped) */
"ip\0"
"glVertexAttrib4Nubv\0"
"glVertexAttrib4NubvARB\0"
"\0"
- /* _mesa_function_pool[32490]: GetFogFuncSGIS (dynamic) */
+ /* _mesa_function_pool[33780]: GetFogFuncSGIS (dynamic) */
"p\0"
"glGetFogFuncSGIS\0"
"\0"
- /* _mesa_function_pool[32510]: VertexP2uiv (will be remapped) */
- "ip\0"
- "glVertexP2uiv\0"
+ /* _mesa_function_pool[33800]: UniformMatrix4x2dv (will be remapped) */
+ "iiip\0"
+ "glUniformMatrix4x2dv\0"
"\0"
- /* _mesa_function_pool[32528]: VertexAttribPointer (will be remapped) */
+ /* _mesa_function_pool[33827]: VertexAttribPointer (will be remapped) */
"iiiiip\0"
"glVertexAttribPointer\0"
"glVertexAttribPointerARB\0"
"\0"
- /* _mesa_function_pool[32583]: IndexMask (offset 212) */
+ /* _mesa_function_pool[33882]: IndexMask (offset 212) */
"i\0"
"glIndexMask\0"
"\0"
- /* _mesa_function_pool[32598]: SharpenTexFuncSGIS (dynamic) */
+ /* _mesa_function_pool[33897]: SharpenTexFuncSGIS (dynamic) */
"iip\0"
"glSharpenTexFuncSGIS\0"
"\0"
- /* _mesa_function_pool[32624]: VertexAttribIFormat (will be remapped) */
+ /* _mesa_function_pool[33923]: VertexAttribIFormat (will be remapped) */
"iiii\0"
"glVertexAttribIFormat\0"
"\0"
- /* _mesa_function_pool[32652]: CombinerOutputNV (dynamic) */
+ /* _mesa_function_pool[33951]: CombinerOutputNV (dynamic) */
"iiiiiiiiii\0"
"glCombinerOutputNV\0"
"\0"
- /* _mesa_function_pool[32683]: DrawArraysInstancedBaseInstance (will be remapped) */
+ /* _mesa_function_pool[33982]: DrawArraysInstancedBaseInstance (will be remapped) */
"iiiii\0"
"glDrawArraysInstancedBaseInstance\0"
"\0"
- /* _mesa_function_pool[32724]: PopAttrib (offset 218) */
+ /* _mesa_function_pool[34023]: CompressedTextureSubImage3D (will be remapped) */
+ "iiiiiiiiiip\0"
+ "glCompressedTextureSubImage3D\0"
+ "\0"
+ /* _mesa_function_pool[34066]: PopAttrib (offset 218) */
"\0"
"glPopAttrib\0"
"\0"
- /* _mesa_function_pool[32738]: SamplePatternSGIS (will be remapped) */
+ /* _mesa_function_pool[34080]: SamplePatternSGIS (will be remapped) */
"i\0"
"glSamplePatternSGIS\0"
"glSamplePatternEXT\0"
"\0"
- /* _mesa_function_pool[32780]: Uniform3ui (will be remapped) */
+ /* _mesa_function_pool[34122]: Uniform3ui (will be remapped) */
"iiii\0"
"glUniform3uiEXT\0"
"glUniform3ui\0"
"\0"
- /* _mesa_function_pool[32815]: DeletePerfMonitorsAMD (will be remapped) */
+ /* _mesa_function_pool[34157]: DeletePerfMonitorsAMD (will be remapped) */
"ip\0"
"glDeletePerfMonitorsAMD\0"
"\0"
- /* _mesa_function_pool[32843]: Color4dv (offset 28) */
+ /* _mesa_function_pool[34185]: Color4dv (offset 28) */
"p\0"
"glColor4dv\0"
"\0"
- /* _mesa_function_pool[32857]: AreProgramsResidentNV (will be remapped) */
+ /* _mesa_function_pool[34199]: AreProgramsResidentNV (will be remapped) */
"ipp\0"
"glAreProgramsResidentNV\0"
"\0"
- /* _mesa_function_pool[32886]: DisableVertexAttribArray (will be remapped) */
+ /* _mesa_function_pool[34228]: DisableVertexAttribArray (will be remapped) */
"i\0"
"glDisableVertexAttribArray\0"
"glDisableVertexAttribArrayARB\0"
"\0"
- /* _mesa_function_pool[32946]: ProgramUniformMatrix3x2fv (will be remapped) */
+ /* _mesa_function_pool[34288]: ProgramUniformMatrix3x2fv (will be remapped) */
"iiiip\0"
"glProgramUniformMatrix3x2fv\0"
"glProgramUniformMatrix3x2fvEXT\0"
"\0"
- /* _mesa_function_pool[33012]: GetDoublei_v (will be remapped) */
+ /* _mesa_function_pool[34354]: GetDoublei_v (will be remapped) */
"iip\0"
"glGetDoublei_v\0"
"\0"
- /* _mesa_function_pool[33032]: IsTransformFeedback (will be remapped) */
+ /* _mesa_function_pool[34374]: IsTransformFeedback (will be remapped) */
"i\0"
"glIsTransformFeedback\0"
"\0"
- /* _mesa_function_pool[33057]: ClipPlanex (will be remapped) */
+ /* _mesa_function_pool[34399]: ClipPlanex (will be remapped) */
"ip\0"
"glClipPlanexOES\0"
"glClipPlanex\0"
"\0"
- /* _mesa_function_pool[33090]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[34432]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
"iffffff\0"
"glReplacementCodeuiColor3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[33137]: GetLightfv (offset 264) */
+ /* _mesa_function_pool[34479]: GetLightfv (offset 264) */
"iip\0"
"glGetLightfv\0"
"\0"
- /* _mesa_function_pool[33155]: ClipPlanef (will be remapped) */
+ /* _mesa_function_pool[34497]: ClipPlanef (will be remapped) */
"ip\0"
"glClipPlanefOES\0"
"glClipPlanef\0"
"\0"
- /* _mesa_function_pool[33188]: ProgramUniform1ui (will be remapped) */
+ /* _mesa_function_pool[34530]: ProgramUniform1ui (will be remapped) */
"iii\0"
"glProgramUniform1ui\0"
"glProgramUniform1uiEXT\0"
"\0"
- /* _mesa_function_pool[33236]: SecondaryColorPointer (will be remapped) */
+ /* _mesa_function_pool[34578]: SecondaryColorPointer (will be remapped) */
"iiip\0"
"glSecondaryColorPointer\0"
"glSecondaryColorPointerEXT\0"
"\0"
- /* _mesa_function_pool[33293]: Tangent3svEXT (dynamic) */
+ /* _mesa_function_pool[34635]: Tangent3svEXT (dynamic) */
"p\0"
"glTangent3svEXT\0"
"\0"
- /* _mesa_function_pool[33312]: Tangent3iEXT (dynamic) */
+ /* _mesa_function_pool[34654]: Tangent3iEXT (dynamic) */
"iii\0"
"glTangent3iEXT\0"
"\0"
- /* _mesa_function_pool[33332]: Indexub (offset 315) */
- "i\0"
- "glIndexub\0"
+ /* _mesa_function_pool[34674]: ClearBufferiv (will be remapped) */
+ "iip\0"
+ "glClearBufferiv\0"
"\0"
- /* _mesa_function_pool[33345]: FragmentLightfSGIX (dynamic) */
+ /* _mesa_function_pool[34695]: FragmentLightfSGIX (dynamic) */
"iif\0"
"glFragmentLightfSGIX\0"
"\0"
- /* _mesa_function_pool[33371]: BeginFragmentShaderATI (will be remapped) */
+ /* _mesa_function_pool[34721]: BeginFragmentShaderATI (will be remapped) */
"\0"
"glBeginFragmentShaderATI\0"
"\0"
- /* _mesa_function_pool[33398]: GenRenderbuffers (will be remapped) */
+ /* _mesa_function_pool[34748]: GenRenderbuffers (will be remapped) */
"ip\0"
"glGenRenderbuffers\0"
"glGenRenderbuffersEXT\0"
"glGenRenderbuffersOES\0"
"\0"
- /* _mesa_function_pool[33465]: GetMinmaxParameterfv (offset 365) */
+ /* _mesa_function_pool[34815]: GetMinmaxParameterfv (offset 365) */
"iip\0"
"glGetMinmaxParameterfv\0"
"glGetMinmaxParameterfvEXT\0"
"\0"
- /* _mesa_function_pool[33519]: IsEnabledi (will be remapped) */
+ /* _mesa_function_pool[34869]: IsEnabledi (will be remapped) */
"ii\0"
"glIsEnabledIndexedEXT\0"
"glIsEnabledi\0"
"\0"
- /* _mesa_function_pool[33558]: FragmentMaterialivSGIX (dynamic) */
+ /* _mesa_function_pool[34908]: FragmentMaterialivSGIX (dynamic) */
"iip\0"
"glFragmentMaterialivSGIX\0"
"\0"
- /* _mesa_function_pool[33588]: WaitSync (will be remapped) */
+ /* _mesa_function_pool[34938]: WaitSync (will be remapped) */
"iii\0"
"glWaitSync\0"
"\0"
- /* _mesa_function_pool[33604]: GetVertexAttribPointerv (will be remapped) */
+ /* _mesa_function_pool[34954]: GetVertexAttribPointerv (will be remapped) */
"iip\0"
"glGetVertexAttribPointerv\0"
"glGetVertexAttribPointervARB\0"
"glGetVertexAttribPointervNV\0"
"\0"
- /* _mesa_function_pool[33692]: CreatePerfQueryINTEL (will be remapped) */
+ /* _mesa_function_pool[35042]: CreatePerfQueryINTEL (will be remapped) */
"ip\0"
"glCreatePerfQueryINTEL\0"
"\0"
- /* _mesa_function_pool[33719]: NewList (dynamic) */
+ /* _mesa_function_pool[35069]: NewList (dynamic) */
"ii\0"
"glNewList\0"
"\0"
- /* _mesa_function_pool[33733]: TexBuffer (will be remapped) */
+ /* _mesa_function_pool[35083]: TexBuffer (will be remapped) */
"iii\0"
"glTexBufferARB\0"
"glTexBuffer\0"
"\0"
- /* _mesa_function_pool[33765]: TexCoord4sv (offset 125) */
+ /* _mesa_function_pool[35115]: TexCoord4sv (offset 125) */
"p\0"
"glTexCoord4sv\0"
"\0"
- /* _mesa_function_pool[33782]: TexCoord1f (offset 96) */
+ /* _mesa_function_pool[35132]: TexCoord1f (offset 96) */
"f\0"
"glTexCoord1f\0"
"\0"
- /* _mesa_function_pool[33798]: TexCoord1d (offset 94) */
+ /* _mesa_function_pool[35148]: TexCoord1d (offset 94) */
"d\0"
"glTexCoord1d\0"
"\0"
- /* _mesa_function_pool[33814]: TexCoord1i (offset 98) */
+ /* _mesa_function_pool[35164]: TexCoord1i (offset 98) */
"i\0"
"glTexCoord1i\0"
"\0"
- /* _mesa_function_pool[33830]: GetnUniformfvARB (will be remapped) */
+ /* _mesa_function_pool[35180]: GetnUniformfvARB (will be remapped) */
"iiip\0"
"glGetnUniformfvARB\0"
"\0"
- /* _mesa_function_pool[33855]: TexCoord1s (offset 100) */
+ /* _mesa_function_pool[35205]: TexCoord1s (offset 100) */
"i\0"
"glTexCoord1s\0"
"\0"
- /* _mesa_function_pool[33871]: GlobalAlphaFactoriSUN (dynamic) */
+ /* _mesa_function_pool[35221]: GlobalAlphaFactoriSUN (dynamic) */
"i\0"
"glGlobalAlphaFactoriSUN\0"
"\0"
- /* _mesa_function_pool[33898]: TexStorage1D (will be remapped) */
+ /* _mesa_function_pool[35248]: TexStorage1D (will be remapped) */
"iiii\0"
"glTexStorage1D\0"
"\0"
- /* _mesa_function_pool[33919]: BlitFramebuffer (will be remapped) */
+ /* _mesa_function_pool[35269]: BlitFramebuffer (will be remapped) */
"iiiiiiiiii\0"
"glBlitFramebuffer\0"
"glBlitFramebufferEXT\0"
"\0"
- /* _mesa_function_pool[33970]: FramebufferTexture1D (will be remapped) */
+ /* _mesa_function_pool[35320]: TextureParameterf (will be remapped) */
+ "iif\0"
+ "glTextureParameterf\0"
+ "\0"
+ /* _mesa_function_pool[35345]: FramebufferTexture1D (will be remapped) */
"iiiii\0"
"glFramebufferTexture1D\0"
"glFramebufferTexture1DEXT\0"
"\0"
- /* _mesa_function_pool[34026]: GetMapiv (offset 268) */
+ /* _mesa_function_pool[35401]: TextureParameteri (will be remapped) */
+ "iii\0"
+ "glTextureParameteri\0"
+ "\0"
+ /* _mesa_function_pool[35426]: GetMapiv (offset 268) */
"iip\0"
"glGetMapiv\0"
"\0"
- /* _mesa_function_pool[34042]: TexCoordP4ui (will be remapped) */
+ /* _mesa_function_pool[35442]: TexCoordP4ui (will be remapped) */
"ii\0"
"glTexCoordP4ui\0"
"\0"
- /* _mesa_function_pool[34061]: VertexAttrib1sv (will be remapped) */
+ /* _mesa_function_pool[35461]: VertexAttrib1sv (will be remapped) */
"ip\0"
"glVertexAttrib1sv\0"
"glVertexAttrib1svARB\0"
"\0"
- /* _mesa_function_pool[34104]: WindowPos4dMESA (will be remapped) */
+ /* _mesa_function_pool[35504]: WindowPos4dMESA (will be remapped) */
"dddd\0"
"glWindowPos4dMESA\0"
"\0"
- /* _mesa_function_pool[34128]: Vertex3dv (offset 135) */
+ /* _mesa_function_pool[35528]: Vertex3dv (offset 135) */
"p\0"
"glVertex3dv\0"
"\0"
- /* _mesa_function_pool[34143]: MultiTexCoordP2ui (will be remapped) */
+ /* _mesa_function_pool[35543]: MultiTexCoordP2ui (will be remapped) */
"iii\0"
"glMultiTexCoordP2ui\0"
"\0"
- /* _mesa_function_pool[34168]: GetnMapivARB (will be remapped) */
+ /* _mesa_function_pool[35568]: GetnMapivARB (will be remapped) */
"iiip\0"
"glGetnMapivARB\0"
"\0"
- /* _mesa_function_pool[34189]: MapParameterfvNV (dynamic) */
+ /* _mesa_function_pool[35589]: MapParameterfvNV (dynamic) */
"iip\0"
"glMapParameterfvNV\0"
"\0"
- /* _mesa_function_pool[34213]: GetVertexAttribfv (will be remapped) */
+ /* _mesa_function_pool[35613]: GetVertexAttribfv (will be remapped) */
"iip\0"
"glGetVertexAttribfv\0"
"glGetVertexAttribfvARB\0"
"\0"
- /* _mesa_function_pool[34261]: MultiTexCoordP4uiv (will be remapped) */
+ /* _mesa_function_pool[35661]: MultiTexCoordP4uiv (will be remapped) */
"iip\0"
"glMultiTexCoordP4uiv\0"
"\0"
- /* _mesa_function_pool[34287]: TexGeniv (offset 193) */
+ /* _mesa_function_pool[35687]: TexGeniv (offset 193) */
"iip\0"
"glTexGeniv\0"
"glTexGenivOES\0"
"\0"
- /* _mesa_function_pool[34317]: WeightubvARB (dynamic) */
+ /* _mesa_function_pool[35717]: WeightubvARB (dynamic) */
"ip\0"
"glWeightubvARB\0"
"\0"
- /* _mesa_function_pool[34336]: BlendColor (offset 336) */
+ /* _mesa_function_pool[35736]: BlendColor (offset 336) */
"ffff\0"
"glBlendColor\0"
"glBlendColorEXT\0"
"\0"
- /* _mesa_function_pool[34371]: Materiali (offset 171) */
+ /* _mesa_function_pool[35771]: Materiali (offset 171) */
"iii\0"
"glMateriali\0"
"\0"
- /* _mesa_function_pool[34388]: VertexAttrib2dvNV (will be remapped) */
+ /* _mesa_function_pool[35788]: VertexAttrib2dvNV (will be remapped) */
"ip\0"
"glVertexAttrib2dvNV\0"
"\0"
- /* _mesa_function_pool[34412]: ResetHistogram (offset 369) */
+ /* _mesa_function_pool[35812]: ResetHistogram (offset 369) */
"i\0"
"glResetHistogram\0"
"glResetHistogramEXT\0"
"\0"
- /* _mesa_function_pool[34452]: CompressedTexSubImage2D (will be remapped) */
+ /* _mesa_function_pool[35852]: CompressedTexSubImage2D (will be remapped) */
"iiiiiiiip\0"
"glCompressedTexSubImage2D\0"
"glCompressedTexSubImage2DARB\0"
"\0"
- /* _mesa_function_pool[34518]: TexCoord2sv (offset 109) */
+ /* _mesa_function_pool[35918]: TexCoord2sv (offset 109) */
"p\0"
"glTexCoord2sv\0"
"\0"
- /* _mesa_function_pool[34535]: StencilMaskSeparate (will be remapped) */
+ /* _mesa_function_pool[35935]: StencilMaskSeparate (will be remapped) */
"ii\0"
"glStencilMaskSeparate\0"
"\0"
- /* _mesa_function_pool[34561]: MultiTexCoord3sv (offset 399) */
+ /* _mesa_function_pool[35961]: MultiTexCoord3sv (offset 399) */
"ip\0"
"glMultiTexCoord3sv\0"
"glMultiTexCoord3svARB\0"
"\0"
- /* _mesa_function_pool[34606]: GetMapParameterfvNV (dynamic) */
+ /* _mesa_function_pool[36006]: GetMapParameterfvNV (dynamic) */
"iip\0"
"glGetMapParameterfvNV\0"
"\0"
- /* _mesa_function_pool[34633]: TexCoord3iv (offset 115) */
+ /* _mesa_function_pool[36033]: TexCoord3iv (offset 115) */
"p\0"
"glTexCoord3iv\0"
"\0"
- /* _mesa_function_pool[34650]: MultiTexCoord4sv (offset 407) */
+ /* _mesa_function_pool[36050]: MultiTexCoord4sv (offset 407) */
"ip\0"
"glMultiTexCoord4sv\0"
"glMultiTexCoord4svARB\0"
"\0"
- /* _mesa_function_pool[34695]: VertexBindingDivisor (will be remapped) */
+ /* _mesa_function_pool[36095]: VertexBindingDivisor (will be remapped) */
"ii\0"
"glVertexBindingDivisor\0"
"\0"
- /* _mesa_function_pool[34722]: GetPerfMonitorCounterInfoAMD (will be remapped) */
+ /* _mesa_function_pool[36122]: GetPerfMonitorCounterInfoAMD (will be remapped) */
"iiip\0"
"glGetPerfMonitorCounterInfoAMD\0"
"\0"
- /* _mesa_function_pool[34759]: UniformBlockBinding (will be remapped) */
+ /* _mesa_function_pool[36159]: UniformBlockBinding (will be remapped) */
"iii\0"
"glUniformBlockBinding\0"
"\0"
- /* _mesa_function_pool[34786]: FenceSync (will be remapped) */
+ /* _mesa_function_pool[36186]: FenceSync (will be remapped) */
"ii\0"
"glFenceSync\0"
"\0"
- /* _mesa_function_pool[34802]: VertexAttrib4Nusv (will be remapped) */
+ /* _mesa_function_pool[36202]: CompressedTextureSubImage2D (will be remapped) */
+ "iiiiiiiip\0"
+ "glCompressedTextureSubImage2D\0"
+ "\0"
+ /* _mesa_function_pool[36243]: VertexAttrib4Nusv (will be remapped) */
"ip\0"
"glVertexAttrib4Nusv\0"
"glVertexAttrib4NusvARB\0"
"\0"
- /* _mesa_function_pool[34849]: SetFragmentShaderConstantATI (will be remapped) */
+ /* _mesa_function_pool[36290]: SetFragmentShaderConstantATI (will be remapped) */
"ip\0"
"glSetFragmentShaderConstantATI\0"
"\0"
- /* _mesa_function_pool[34884]: VertexP2ui (will be remapped) */
+ /* _mesa_function_pool[36325]: VertexP2ui (will be remapped) */
"ii\0"
"glVertexP2ui\0"
"\0"
- /* _mesa_function_pool[34901]: GetTexEnvfv (offset 276) */
+ /* _mesa_function_pool[36342]: ProgramUniform2fv (will be remapped) */
+ "iiip\0"
+ "glProgramUniform2fv\0"
+ "glProgramUniform2fvEXT\0"
+ "\0"
+ /* _mesa_function_pool[36391]: GetTextureLevelParameteriv (will be remapped) */
+ "iiip\0"
+ "glGetTextureLevelParameteriv\0"
+ "\0"
+ /* _mesa_function_pool[36426]: GetTexEnvfv (offset 276) */
"iip\0"
"glGetTexEnvfv\0"
"\0"
- /* _mesa_function_pool[34920]: BindAttribLocation (will be remapped) */
+ /* _mesa_function_pool[36445]: BindAttribLocation (will be remapped) */
"iip\0"
"glBindAttribLocation\0"
"glBindAttribLocationARB\0"
"\0"
- /* _mesa_function_pool[34970]: TextureStorage2DEXT (will be remapped) */
+ /* _mesa_function_pool[36495]: TextureStorage2DEXT (will be remapped) */
"iiiiii\0"
"glTextureStorage2DEXT\0"
"\0"
- /* _mesa_function_pool[35000]: FragmentLightiSGIX (dynamic) */
+ /* _mesa_function_pool[36525]: TextureParameterIiv (will be remapped) */
+ "iip\0"
+ "glTextureParameterIiv\0"
+ "\0"
+ /* _mesa_function_pool[36552]: FragmentLightiSGIX (dynamic) */
"iii\0"
"glFragmentLightiSGIX\0"
"\0"
- /* _mesa_function_pool[35026]: DrawTransformFeedbackInstanced (will be remapped) */
+ /* _mesa_function_pool[36578]: DrawTransformFeedbackInstanced (will be remapped) */
"iii\0"
"glDrawTransformFeedbackInstanced\0"
"\0"
- /* _mesa_function_pool[35064]: PollAsyncSGIX (dynamic) */
+ /* _mesa_function_pool[36616]: CopyTextureSubImage1D (will be remapped) */
+ "iiiiii\0"
+ "glCopyTextureSubImage1D\0"
+ "\0"
+ /* _mesa_function_pool[36648]: PollAsyncSGIX (dynamic) */
"p\0"
"glPollAsyncSGIX\0"
"\0"
- /* _mesa_function_pool[35083]: ResumeTransformFeedback (will be remapped) */
+ /* _mesa_function_pool[36667]: ResumeTransformFeedback (will be remapped) */
"\0"
"glResumeTransformFeedback\0"
"\0"
- /* _mesa_function_pool[35111]: GetProgramNamedParameterdvNV (will be remapped) */
+ /* _mesa_function_pool[36695]: GetProgramNamedParameterdvNV (will be remapped) */
"iipp\0"
"glGetProgramNamedParameterdvNV\0"
"\0"
- /* _mesa_function_pool[35148]: VertexAttribI1iv (will be remapped) */
+ /* _mesa_function_pool[36732]: VertexAttribI1iv (will be remapped) */
"ip\0"
"glVertexAttribI1ivEXT\0"
"glVertexAttribI1iv\0"
"\0"
- /* _mesa_function_pool[35193]: Vertex2dv (offset 127) */
+ /* _mesa_function_pool[36777]: Vertex2dv (offset 127) */
"p\0"
"glVertex2dv\0"
"\0"
- /* _mesa_function_pool[35208]: VertexAttribI2uivEXT (will be remapped) */
+ /* _mesa_function_pool[36792]: VertexAttribI2uivEXT (will be remapped) */
"ip\0"
"glVertexAttribI2uivEXT\0"
"glVertexAttribI2uiv\0"
"\0"
- /* _mesa_function_pool[35255]: SampleMaski (will be remapped) */
+ /* _mesa_function_pool[36839]: SampleMaski (will be remapped) */
"ii\0"
"glSampleMaski\0"
"\0"
- /* _mesa_function_pool[35273]: GetFloati_v (will be remapped) */
+ /* _mesa_function_pool[36857]: GetFloati_v (will be remapped) */
"iip\0"
"glGetFloati_v\0"
"\0"
- /* _mesa_function_pool[35292]: MultiTexCoord2iv (offset 389) */
+ /* _mesa_function_pool[36876]: MultiTexCoord2iv (offset 389) */
"ip\0"
"glMultiTexCoord2iv\0"
"glMultiTexCoord2ivARB\0"
"\0"
- /* _mesa_function_pool[35337]: DrawPixels (offset 257) */
+ /* _mesa_function_pool[36921]: DrawPixels (offset 257) */
"iiiip\0"
"glDrawPixels\0"
"\0"
- /* _mesa_function_pool[35357]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[36941]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
"iffffffff\0"
"glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[35417]: DrawTransformFeedback (will be remapped) */
+ /* _mesa_function_pool[37001]: DrawTransformFeedback (will be remapped) */
"ii\0"
"glDrawTransformFeedback\0"
"\0"
- /* _mesa_function_pool[35445]: VertexAttribs3fvNV (will be remapped) */
+ /* _mesa_function_pool[37029]: VertexAttribs3fvNV (will be remapped) */
"iip\0"
"glVertexAttribs3fvNV\0"
"\0"
- /* _mesa_function_pool[35471]: GenLists (offset 5) */
+ /* _mesa_function_pool[37055]: GenLists (offset 5) */
"i\0"
"glGenLists\0"
"\0"
- /* _mesa_function_pool[35485]: MapGrid2d (offset 226) */
+ /* _mesa_function_pool[37069]: MapGrid2d (offset 226) */
"iddidd\0"
"glMapGrid2d\0"
"\0"
- /* _mesa_function_pool[35505]: MapGrid2f (offset 227) */
+ /* _mesa_function_pool[37089]: MapGrid2f (offset 227) */
"iffiff\0"
"glMapGrid2f\0"
"\0"
- /* _mesa_function_pool[35525]: SampleMapATI (will be remapped) */
+ /* _mesa_function_pool[37109]: SampleMapATI (will be remapped) */
"iii\0"
"glSampleMapATI\0"
"\0"
- /* _mesa_function_pool[35545]: TexBumpParameterfvATI (will be remapped) */
+ /* _mesa_function_pool[37129]: TexBumpParameterfvATI (will be remapped) */
"ip\0"
"glTexBumpParameterfvATI\0"
"\0"
- /* _mesa_function_pool[35573]: GetActiveAttrib (will be remapped) */
+ /* _mesa_function_pool[37157]: GetActiveAttrib (will be remapped) */
"iiipppp\0"
"glGetActiveAttrib\0"
"glGetActiveAttribARB\0"
"\0"
- /* _mesa_function_pool[35621]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[37205]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
"ppp\0"
"glTexCoord2fColor4ubVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[35659]: PixelMapfv (offset 251) */
+ /* _mesa_function_pool[37243]: PixelMapfv (offset 251) */
"iip\0"
"glPixelMapfv\0"
"\0"
- /* _mesa_function_pool[35677]: ClearBufferData (will be remapped) */
+ /* _mesa_function_pool[37261]: ClearBufferData (will be remapped) */
"iiiip\0"
"glClearBufferData\0"
"\0"
- /* _mesa_function_pool[35702]: Color3usv (offset 24) */
+ /* _mesa_function_pool[37286]: Color3usv (offset 24) */
"p\0"
"glColor3usv\0"
"\0"
- /* _mesa_function_pool[35717]: CopyImageSubData (will be remapped) */
+ /* _mesa_function_pool[37301]: CopyImageSubData (will be remapped) */
"iiiiiiiiiiiiiii\0"
"glCopyImageSubData\0"
"\0"
- /* _mesa_function_pool[35753]: StencilOpSeparate (will be remapped) */
+ /* _mesa_function_pool[37337]: StencilOpSeparate (will be remapped) */
"iiii\0"
"glStencilOpSeparate\0"
"glStencilOpSeparateATI\0"
"\0"
- /* _mesa_function_pool[35802]: GenSamplers (will be remapped) */
+ /* _mesa_function_pool[37386]: GenSamplers (will be remapped) */
"ip\0"
"glGenSamplers\0"
"\0"
- /* _mesa_function_pool[35820]: ClipControl (will be remapped) */
+ /* _mesa_function_pool[37404]: ClipControl (will be remapped) */
"ii\0"
"glClipControl\0"
"\0"
- /* _mesa_function_pool[35838]: DrawTexfOES (will be remapped) */
+ /* _mesa_function_pool[37422]: DrawTexfOES (will be remapped) */
"fffff\0"
"glDrawTexfOES\0"
"\0"
- /* _mesa_function_pool[35859]: AttachObjectARB (will be remapped) */
+ /* _mesa_function_pool[37443]: AttachObjectARB (will be remapped) */
"ii\0"
"glAttachObjectARB\0"
"\0"
- /* _mesa_function_pool[35881]: GetFragmentLightivSGIX (dynamic) */
+ /* _mesa_function_pool[37465]: GetFragmentLightivSGIX (dynamic) */
"iip\0"
"glGetFragmentLightivSGIX\0"
"\0"
- /* _mesa_function_pool[35911]: Accum (offset 213) */
+ /* _mesa_function_pool[37495]: Accum (offset 213) */
"if\0"
"glAccum\0"
"\0"
- /* _mesa_function_pool[35923]: GetTexImage (offset 281) */
+ /* _mesa_function_pool[37507]: GetTexImage (offset 281) */
"iiiip\0"
"glGetTexImage\0"
"\0"
- /* _mesa_function_pool[35944]: Color4x (will be remapped) */
+ /* _mesa_function_pool[37528]: Color4x (will be remapped) */
"iiii\0"
"glColor4xOES\0"
"glColor4x\0"
"\0"
- /* _mesa_function_pool[35973]: ConvolutionParameteriv (offset 353) */
+ /* _mesa_function_pool[37557]: ConvolutionParameteriv (offset 353) */
"iip\0"
"glConvolutionParameteriv\0"
"glConvolutionParameterivEXT\0"
"\0"
- /* _mesa_function_pool[36031]: Color4s (offset 33) */
+ /* _mesa_function_pool[37615]: Color4s (offset 33) */
"iiii\0"
"glColor4s\0"
"\0"
- /* _mesa_function_pool[36047]: CullParameterdvEXT (dynamic) */
+ /* _mesa_function_pool[37631]: CullParameterdvEXT (dynamic) */
"ip\0"
"glCullParameterdvEXT\0"
"\0"
- /* _mesa_function_pool[36072]: GetUniformuiv (will be remapped) */
+ /* _mesa_function_pool[37656]: GetUniformuiv (will be remapped) */
"iip\0"
"glGetUniformuivEXT\0"
"glGetUniformuiv\0"
"\0"
- /* _mesa_function_pool[36112]: Color4i (offset 31) */
+ /* _mesa_function_pool[37696]: Color4i (offset 31) */
"iiii\0"
"glColor4i\0"
"\0"
- /* _mesa_function_pool[36128]: Color4f (offset 29) */
+ /* _mesa_function_pool[37712]: Color4f (offset 29) */
"ffff\0"
"glColor4f\0"
"\0"
- /* _mesa_function_pool[36144]: Color4d (offset 27) */
+ /* _mesa_function_pool[37728]: Color4d (offset 27) */
"dddd\0"
"glColor4d\0"
"\0"
- /* _mesa_function_pool[36160]: Color4b (offset 25) */
+ /* _mesa_function_pool[37744]: Color4b (offset 25) */
"iiii\0"
"glColor4b\0"
"\0"
- /* _mesa_function_pool[36176]: LoadProgramNV (will be remapped) */
+ /* _mesa_function_pool[37760]: LoadProgramNV (will be remapped) */
"iiip\0"
"glLoadProgramNV\0"
"\0"
- /* _mesa_function_pool[36198]: GetAttachedObjectsARB (will be remapped) */
+ /* _mesa_function_pool[37782]: GetAttachedObjectsARB (will be remapped) */
"iipp\0"
"glGetAttachedObjectsARB\0"
"\0"
- /* _mesa_function_pool[36228]: EvalCoord1fv (offset 231) */
+ /* _mesa_function_pool[37812]: EvalCoord1fv (offset 231) */
"p\0"
"glEvalCoord1fv\0"
"\0"
- /* _mesa_function_pool[36246]: VertexAttribLFormat (will be remapped) */
+ /* _mesa_function_pool[37830]: VertexAttribLFormat (will be remapped) */
"iiii\0"
"glVertexAttribLFormat\0"
"\0"
- /* _mesa_function_pool[36274]: StencilFuncSeparate (will be remapped) */
+ /* _mesa_function_pool[37858]: StencilFuncSeparate (will be remapped) */
"iiii\0"
"glStencilFuncSeparate\0"
"\0"
- /* _mesa_function_pool[36302]: ShaderSource (will be remapped) */
+ /* _mesa_function_pool[37886]: ShaderSource (will be remapped) */
"iipp\0"
"glShaderSource\0"
"glShaderSourceARB\0"
"\0"
- /* _mesa_function_pool[36341]: Normal3fv (offset 57) */
+ /* _mesa_function_pool[37925]: Normal3fv (offset 57) */
"p\0"
"glNormal3fv\0"
"\0"
- /* _mesa_function_pool[36356]: ImageTransformParameterfvHP (dynamic) */
+ /* _mesa_function_pool[37940]: ImageTransformParameterfvHP (dynamic) */
"iip\0"
"glImageTransformParameterfvHP\0"
"\0"
- /* _mesa_function_pool[36391]: NormalP3ui (will be remapped) */
+ /* _mesa_function_pool[37975]: NormalP3ui (will be remapped) */
"ii\0"
"glNormalP3ui\0"
"\0"
- /* _mesa_function_pool[36408]: MultiTexCoord3fvARB (offset 395) */
+ /* _mesa_function_pool[37992]: MultiTexCoord3fvARB (offset 395) */
"ip\0"
"glMultiTexCoord3fv\0"
"glMultiTexCoord3fvARB\0"
"\0"
- /* _mesa_function_pool[36453]: GetProgramParameterfvNV (will be remapped) */
+ /* _mesa_function_pool[38037]: GetProgramParameterfvNV (will be remapped) */
"iiip\0"
"glGetProgramParameterfvNV\0"
"\0"
- /* _mesa_function_pool[36485]: BufferData (will be remapped) */
+ /* _mesa_function_pool[38069]: BufferData (will be remapped) */
"iipi\0"
"glBufferData\0"
"glBufferDataARB\0"
"\0"
- /* _mesa_function_pool[36520]: TexSubImage2D (offset 333) */
+ /* _mesa_function_pool[38104]: TexSubImage2D (offset 333) */
"iiiiiiiip\0"
"glTexSubImage2D\0"
"glTexSubImage2DEXT\0"
"\0"
- /* _mesa_function_pool[36566]: FragmentLightivSGIX (dynamic) */
+ /* _mesa_function_pool[38150]: FragmentLightivSGIX (dynamic) */
"iip\0"
"glFragmentLightivSGIX\0"
"\0"
- /* _mesa_function_pool[36593]: GetTexParameterPointervAPPLE (dynamic) */
+ /* _mesa_function_pool[38177]: GetTexParameterPointervAPPLE (dynamic) */
"iip\0"
"glGetTexParameterPointervAPPLE\0"
"\0"
- /* _mesa_function_pool[36629]: TexGenfv (offset 191) */
+ /* _mesa_function_pool[38213]: TexGenfv (offset 191) */
"iip\0"
"glTexGenfv\0"
"glTexGenfvOES\0"
"\0"
- /* _mesa_function_pool[36659]: GetVertexAttribiv (will be remapped) */
+ /* _mesa_function_pool[38243]: GetVertexAttribiv (will be remapped) */
"iip\0"
"glGetVertexAttribiv\0"
"glGetVertexAttribivARB\0"
"\0"
- /* _mesa_function_pool[36707]: TexCoordP2uiv (will be remapped) */
+ /* _mesa_function_pool[38291]: TexCoordP2uiv (will be remapped) */
"ip\0"
"glTexCoordP2uiv\0"
"\0"
- /* _mesa_function_pool[36727]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[38311]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
"ppp\0"
"glReplacementCodeuiColor3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[36771]: Uniform3fv (will be remapped) */
+ /* _mesa_function_pool[38355]: Uniform3fv (will be remapped) */
"iip\0"
"glUniform3fv\0"
"glUniform3fvARB\0"
"\0"
- /* _mesa_function_pool[36805]: BlendEquation (offset 337) */
+ /* _mesa_function_pool[38389]: BlendEquation (offset 337) */
"i\0"
"glBlendEquation\0"
"glBlendEquationEXT\0"
"glBlendEquationOES\0"
"\0"
- /* _mesa_function_pool[36862]: VertexAttrib3dNV (will be remapped) */
+ /* _mesa_function_pool[38446]: VertexAttrib3dNV (will be remapped) */
"iddd\0"
"glVertexAttrib3dNV\0"
"\0"
- /* _mesa_function_pool[36887]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[38471]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
"ppppp\0"
"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[36951]: IndexFuncEXT (dynamic) */
+ /* _mesa_function_pool[38535]: IndexFuncEXT (dynamic) */
"if\0"
"glIndexFuncEXT\0"
"\0"
- /* _mesa_function_pool[36970]: UseShaderProgramEXT (will be remapped) */
+ /* _mesa_function_pool[38554]: UseShaderProgramEXT (will be remapped) */
"ii\0"
"glUseShaderProgramEXT\0"
"\0"
- /* _mesa_function_pool[36996]: PushName (offset 201) */
+ /* _mesa_function_pool[38580]: PushName (offset 201) */
"i\0"
"glPushName\0"
"\0"
- /* _mesa_function_pool[37010]: GenFencesNV (dynamic) */
+ /* _mesa_function_pool[38594]: GenFencesNV (dynamic) */
"ip\0"
"glGenFencesNV\0"
"\0"
- /* _mesa_function_pool[37028]: CullParameterfvEXT (dynamic) */
+ /* _mesa_function_pool[38612]: CullParameterfvEXT (dynamic) */
"ip\0"
"glCullParameterfvEXT\0"
"\0"
- /* _mesa_function_pool[37053]: DeleteRenderbuffers (will be remapped) */
+ /* _mesa_function_pool[38637]: DeleteRenderbuffers (will be remapped) */
"ip\0"
"glDeleteRenderbuffers\0"
"glDeleteRenderbuffersEXT\0"
"glDeleteRenderbuffersOES\0"
"\0"
- /* _mesa_function_pool[37129]: VertexAttrib1dv (will be remapped) */
+ /* _mesa_function_pool[38713]: VertexAttrib1dv (will be remapped) */
"ip\0"
"glVertexAttrib1dv\0"
"glVertexAttrib1dvARB\0"
"\0"
- /* _mesa_function_pool[37172]: ImageTransformParameteriHP (dynamic) */
+ /* _mesa_function_pool[38756]: ImageTransformParameteriHP (dynamic) */
"iii\0"
"glImageTransformParameteriHP\0"
"\0"
- /* _mesa_function_pool[37206]: IsShader (will be remapped) */
+ /* _mesa_function_pool[38790]: IsShader (will be remapped) */
"i\0"
"glIsShader\0"
"\0"
- /* _mesa_function_pool[37220]: Rotated (offset 299) */
+ /* _mesa_function_pool[38804]: Rotated (offset 299) */
"dddd\0"
"glRotated\0"
"\0"
- /* _mesa_function_pool[37236]: Color4iv (offset 32) */
- "p\0"
- "glColor4iv\0"
+ /* _mesa_function_pool[38820]: GenPerfMonitorsAMD (will be remapped) */
+ "ip\0"
+ "glGenPerfMonitorsAMD\0"
"\0"
- /* _mesa_function_pool[37250]: PointParameterxv (will be remapped) */
+ /* _mesa_function_pool[38845]: PointParameterxv (will be remapped) */
"ip\0"
"glPointParameterxvOES\0"
"glPointParameterxv\0"
"\0"
- /* _mesa_function_pool[37295]: Rotatex (will be remapped) */
+ /* _mesa_function_pool[38890]: Rotatex (will be remapped) */
"iiii\0"
"glRotatexOES\0"
"glRotatex\0"
"\0"
- /* _mesa_function_pool[37324]: FramebufferTextureLayer (will be remapped) */
+ /* _mesa_function_pool[38919]: FramebufferTextureLayer (will be remapped) */
"iiiii\0"
"glFramebufferTextureLayer\0"
"glFramebufferTextureLayerARB\0"
"glFramebufferTextureLayerEXT\0"
"\0"
- /* _mesa_function_pool[37415]: TexEnvfv (offset 185) */
+ /* _mesa_function_pool[39010]: TexEnvfv (offset 185) */
"iip\0"
"glTexEnvfv\0"
"\0"
- /* _mesa_function_pool[37431]: ProgramUniformMatrix3fv (will be remapped) */
+ /* _mesa_function_pool[39026]: ProgramUniformMatrix3fv (will be remapped) */
"iiiip\0"
"glProgramUniformMatrix3fv\0"
"glProgramUniformMatrix3fvEXT\0"
"\0"
- /* _mesa_function_pool[37493]: LoadMatrixf (offset 291) */
+ /* _mesa_function_pool[39088]: LoadMatrixf (offset 291) */
"p\0"
"glLoadMatrixf\0"
"\0"
- /* _mesa_function_pool[37510]: GetProgramLocalParameterfvARB (will be remapped) */
+ /* _mesa_function_pool[39105]: GetProgramLocalParameterfvARB (will be remapped) */
"iip\0"
"glGetProgramLocalParameterfvARB\0"
"\0"
- /* _mesa_function_pool[37547]: LoadMatrixx (will be remapped) */
- "p\0"
- "glLoadMatrixxOES\0"
- "glLoadMatrixx\0"
+ /* _mesa_function_pool[39142]: MultiDrawArraysIndirect (will be remapped) */
+ "ipii\0"
+ "glMultiDrawArraysIndirect\0"
"\0"
- /* _mesa_function_pool[37581]: DrawRangeElementsBaseVertex (will be remapped) */
+ /* _mesa_function_pool[39174]: DrawRangeElementsBaseVertex (will be remapped) */
"iiiiipi\0"
"glDrawRangeElementsBaseVertex\0"
"\0"
- /* _mesa_function_pool[37620]: MatrixIndexuivARB (dynamic) */
+ /* _mesa_function_pool[39213]: ProgramUniformMatrix4dv (will be remapped) */
+ "iiiip\0"
+ "glProgramUniformMatrix4dv\0"
+ "\0"
+ /* _mesa_function_pool[39246]: MatrixIndexuivARB (dynamic) */
"ip\0"
"glMatrixIndexuivARB\0"
"\0"
- /* _mesa_function_pool[37644]: Tangent3sEXT (dynamic) */
+ /* _mesa_function_pool[39270]: Tangent3sEXT (dynamic) */
"iii\0"
"glTangent3sEXT\0"
"\0"
- /* _mesa_function_pool[37664]: SecondaryColor3bv (will be remapped) */
+ /* _mesa_function_pool[39290]: SecondaryColor3bv (will be remapped) */
"p\0"
"glSecondaryColor3bv\0"
"glSecondaryColor3bvEXT\0"
"\0"
- /* _mesa_function_pool[37710]: GlobalAlphaFactorusSUN (dynamic) */
+ /* _mesa_function_pool[39336]: GlobalAlphaFactorusSUN (dynamic) */
"i\0"
"glGlobalAlphaFactorusSUN\0"
"\0"
- /* _mesa_function_pool[37738]: GetCombinerOutputParameterivNV (dynamic) */
+ /* _mesa_function_pool[39364]: GetCombinerOutputParameterivNV (dynamic) */
"iiip\0"
"glGetCombinerOutputParameterivNV\0"
"\0"
- /* _mesa_function_pool[37777]: DrawTexxvOES (will be remapped) */
+ /* _mesa_function_pool[39403]: DrawTexxvOES (will be remapped) */
"p\0"
"glDrawTexxvOES\0"
"\0"
- /* _mesa_function_pool[37795]: TexParameterfv (offset 179) */
+ /* _mesa_function_pool[39421]: TexParameterfv (offset 179) */
"iip\0"
"glTexParameterfv\0"
"\0"
- /* _mesa_function_pool[37817]: Color4ubv (offset 36) */
+ /* _mesa_function_pool[39443]: Color4ubv (offset 36) */
"p\0"
"glColor4ubv\0"
"\0"
- /* _mesa_function_pool[37832]: TexCoord2fv (offset 105) */
+ /* _mesa_function_pool[39458]: TexCoord2fv (offset 105) */
"p\0"
"glTexCoord2fv\0"
"\0"
- /* _mesa_function_pool[37849]: FogCoorddv (will be remapped) */
+ /* _mesa_function_pool[39475]: FogCoorddv (will be remapped) */
"p\0"
"glFogCoorddv\0"
"glFogCoorddvEXT\0"
"\0"
- /* _mesa_function_pool[37881]: VDPAUUnregisterSurfaceNV (will be remapped) */
+ /* _mesa_function_pool[39507]: VDPAUUnregisterSurfaceNV (will be remapped) */
"i\0"
"glVDPAUUnregisterSurfaceNV\0"
"\0"
- /* _mesa_function_pool[37911]: ColorP3ui (will be remapped) */
+ /* _mesa_function_pool[39537]: ColorP3ui (will be remapped) */
"ii\0"
"glColorP3ui\0"
"\0"
- /* _mesa_function_pool[37927]: ClearBufferuiv (will be remapped) */
+ /* _mesa_function_pool[39553]: ClearBufferuiv (will be remapped) */
"iip\0"
"glClearBufferuiv\0"
"\0"
- /* _mesa_function_pool[37949]: GetShaderPrecisionFormat (will be remapped) */
+ /* _mesa_function_pool[39575]: GetShaderPrecisionFormat (will be remapped) */
"iipp\0"
"glGetShaderPrecisionFormat\0"
"\0"
- /* _mesa_function_pool[37982]: ProgramNamedParameter4dvNV (will be remapped) */
+ /* _mesa_function_pool[39608]: ProgramNamedParameter4dvNV (will be remapped) */
"iipp\0"
"glProgramNamedParameter4dvNV\0"
"\0"
- /* _mesa_function_pool[38017]: Flush (offset 217) */
+ /* _mesa_function_pool[39643]: Flush (offset 217) */
"\0"
"glFlush\0"
"\0"
- /* _mesa_function_pool[38027]: VertexAttribI4iEXT (will be remapped) */
+ /* _mesa_function_pool[39653]: VertexAttribI4iEXT (will be remapped) */
"iiiii\0"
"glVertexAttribI4iEXT\0"
"glVertexAttribI4i\0"
"\0"
- /* _mesa_function_pool[38073]: FogCoordd (will be remapped) */
+ /* _mesa_function_pool[39699]: FogCoordd (will be remapped) */
"d\0"
"glFogCoordd\0"
"glFogCoorddEXT\0"
"\0"
- /* _mesa_function_pool[38103]: Uniform3iv (will be remapped) */
+ /* _mesa_function_pool[39729]: Uniform3iv (will be remapped) */
"iip\0"
"glUniform3iv\0"
"glUniform3ivARB\0"
"\0"
- /* _mesa_function_pool[38137]: TexStorage2DMultisample (will be remapped) */
+ /* _mesa_function_pool[39763]: TexStorage2DMultisample (will be remapped) */
"iiiiii\0"
"glTexStorage2DMultisample\0"
"\0"
- /* _mesa_function_pool[38171]: UnlockArraysEXT (will be remapped) */
+ /* _mesa_function_pool[39797]: UnlockArraysEXT (will be remapped) */
"\0"
"glUnlockArraysEXT\0"
"\0"
- /* _mesa_function_pool[38191]: VertexAttrib1svNV (will be remapped) */
+ /* _mesa_function_pool[39817]: VertexAttrib1svNV (will be remapped) */
"ip\0"
"glVertexAttrib1svNV\0"
"\0"
- /* _mesa_function_pool[38215]: VertexAttrib4iv (will be remapped) */
+ /* _mesa_function_pool[39841]: VertexAttrib4iv (will be remapped) */
"ip\0"
"glVertexAttrib4iv\0"
"glVertexAttrib4ivARB\0"
"\0"
- /* _mesa_function_pool[38258]: CopyTexSubImage3D (offset 373) */
+ /* _mesa_function_pool[39884]: CopyTexSubImage3D (offset 373) */
"iiiiiiiii\0"
"glCopyTexSubImage3D\0"
"glCopyTexSubImage3DEXT\0"
"glCopyTexSubImage3DOES\0"
"\0"
- /* _mesa_function_pool[38335]: GetInteger64v (will be remapped) */
+ /* _mesa_function_pool[39961]: PolygonOffsetClampEXT (will be remapped) */
+ "fff\0"
+ "glPolygonOffsetClampEXT\0"
+ "\0"
+ /* _mesa_function_pool[39990]: GetInteger64v (will be remapped) */
"ip\0"
"glGetInteger64v\0"
"\0"
- /* _mesa_function_pool[38355]: DetachObjectARB (will be remapped) */
+ /* _mesa_function_pool[40010]: DetachObjectARB (will be remapped) */
"ii\0"
"glDetachObjectARB\0"
"\0"
- /* _mesa_function_pool[38377]: Indexiv (offset 49) */
+ /* _mesa_function_pool[40032]: Indexiv (offset 49) */
"p\0"
"glIndexiv\0"
"\0"
- /* _mesa_function_pool[38390]: TexEnvi (offset 186) */
+ /* _mesa_function_pool[40045]: TexEnvi (offset 186) */
"iii\0"
"glTexEnvi\0"
"\0"
- /* _mesa_function_pool[38405]: TexEnvf (offset 184) */
+ /* _mesa_function_pool[40060]: TexEnvf (offset 184) */
"iif\0"
"glTexEnvf\0"
"\0"
- /* _mesa_function_pool[38420]: TexEnvx (will be remapped) */
+ /* _mesa_function_pool[40075]: TexEnvx (will be remapped) */
"iii\0"
"glTexEnvxOES\0"
"glTexEnvx\0"
"\0"
- /* _mesa_function_pool[38448]: StopInstrumentsSGIX (dynamic) */
+ /* _mesa_function_pool[40103]: StopInstrumentsSGIX (dynamic) */
"i\0"
"glStopInstrumentsSGIX\0"
"\0"
- /* _mesa_function_pool[38473]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+ /* _mesa_function_pool[40128]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
"fffffffffffffff\0"
"glTexCoord4fColor4fNormal3fVertex4fSUN\0"
"\0"
- /* _mesa_function_pool[38529]: InvalidateBufferSubData (will be remapped) */
+ /* _mesa_function_pool[40184]: InvalidateBufferSubData (will be remapped) */
"iii\0"
"glInvalidateBufferSubData\0"
"\0"
- /* _mesa_function_pool[38560]: UniformMatrix4x2fv (will be remapped) */
+ /* _mesa_function_pool[40215]: UniformMatrix4x2fv (will be remapped) */
"iiip\0"
"glUniformMatrix4x2fv\0"
"\0"
- /* _mesa_function_pool[38587]: ClearTexImage (will be remapped) */
+ /* _mesa_function_pool[40242]: ClearTexImage (will be remapped) */
"iiiip\0"
"glClearTexImage\0"
"\0"
- /* _mesa_function_pool[38610]: PolygonOffset (offset 319) */
+ /* _mesa_function_pool[40265]: PolygonOffset (offset 319) */
"ff\0"
"glPolygonOffset\0"
"\0"
- /* _mesa_function_pool[38630]: BeginPerfQueryINTEL (will be remapped) */
+ /* _mesa_function_pool[40285]: BeginPerfQueryINTEL (will be remapped) */
"i\0"
"glBeginPerfQueryINTEL\0"
"\0"
- /* _mesa_function_pool[38655]: SamplerParameterfv (will be remapped) */
+ /* _mesa_function_pool[40310]: SamplerParameterfv (will be remapped) */
"iip\0"
"glSamplerParameterfv\0"
"\0"
- /* _mesa_function_pool[38681]: Normal3fVertex3fSUN (dynamic) */
- "ffffff\0"
- "glNormal3fVertex3fSUN\0"
+ /* _mesa_function_pool[40336]: CompressedTextureSubImage1D (will be remapped) */
+ "iiiiiip\0"
+ "glCompressedTextureSubImage1D\0"
+ "\0"
+ /* _mesa_function_pool[40375]: ProgramUniformMatrix4x2dv (will be remapped) */
+ "iiiip\0"
+ "glProgramUniformMatrix4x2dv\0"
"\0"
- /* _mesa_function_pool[38711]: ProgramEnvParameter4fARB (will be remapped) */
+ /* _mesa_function_pool[40410]: ProgramEnvParameter4fARB (will be remapped) */
"iiffff\0"
"glProgramEnvParameter4fARB\0"
"glProgramParameter4fNV\0"
"\0"
- /* _mesa_function_pool[38769]: ClearDepth (offset 208) */
+ /* _mesa_function_pool[40468]: ClearDepth (offset 208) */
"d\0"
"glClearDepth\0"
"\0"
- /* _mesa_function_pool[38785]: VertexAttrib3dvNV (will be remapped) */
+ /* _mesa_function_pool[40484]: VertexAttrib3dvNV (will be remapped) */
"ip\0"
"glVertexAttrib3dvNV\0"
"\0"
- /* _mesa_function_pool[38809]: Color4fv (offset 30) */
+ /* _mesa_function_pool[40508]: Color4fv (offset 30) */
"p\0"
"glColor4fv\0"
"\0"
- /* _mesa_function_pool[38823]: GetnMinmaxARB (will be remapped) */
+ /* _mesa_function_pool[40522]: GetnMinmaxARB (will be remapped) */
"iiiiip\0"
"glGetnMinmaxARB\0"
"\0"
- /* _mesa_function_pool[38847]: ColorPointer (offset 308) */
+ /* _mesa_function_pool[40546]: ColorPointer (offset 308) */
"iiip\0"
"glColorPointer\0"
"\0"
- /* _mesa_function_pool[38868]: GetPointerv (offset 329) */
+ /* _mesa_function_pool[40567]: GetPointerv (offset 329) */
"ip\0"
"glGetPointerv\0"
"glGetPointervEXT\0"
"\0"
- /* _mesa_function_pool[38903]: Lightiv (offset 162) */
+ /* _mesa_function_pool[40602]: Lightiv (offset 162) */
"iip\0"
"glLightiv\0"
"\0"
- /* _mesa_function_pool[38918]: GetTexParameteriv (offset 283) */
+ /* _mesa_function_pool[40617]: GetTexParameteriv (offset 283) */
"iip\0"
"glGetTexParameteriv\0"
"\0"
- /* _mesa_function_pool[38943]: TransformFeedbackVaryings (will be remapped) */
+ /* _mesa_function_pool[40642]: TransformFeedbackVaryings (will be remapped) */
"iipi\0"
"glTransformFeedbackVaryings\0"
"glTransformFeedbackVaryingsEXT\0"
"\0"
- /* _mesa_function_pool[39008]: VertexAttrib3sv (will be remapped) */
+ /* _mesa_function_pool[40707]: VertexAttrib3sv (will be remapped) */
"ip\0"
"glVertexAttrib3sv\0"
"glVertexAttrib3svARB\0"
"\0"
- /* _mesa_function_pool[39051]: IsVertexArray (will be remapped) */
+ /* _mesa_function_pool[40750]: IsVertexArray (will be remapped) */
"i\0"
"glIsVertexArray\0"
"glIsVertexArrayAPPLE\0"
"glIsVertexArrayOES\0"
"\0"
- /* _mesa_function_pool[39110]: PushClientAttrib (offset 335) */
+ /* _mesa_function_pool[40809]: PushClientAttrib (offset 335) */
"i\0"
"glPushClientAttrib\0"
"\0"
- /* _mesa_function_pool[39132]: ProgramUniform4ui (will be remapped) */
+ /* _mesa_function_pool[40831]: ProgramUniform4ui (will be remapped) */
"iiiiii\0"
"glProgramUniform4ui\0"
"glProgramUniform4uiEXT\0"
"\0"
- /* _mesa_function_pool[39183]: Uniform1f (will be remapped) */
+ /* _mesa_function_pool[40882]: Uniform1f (will be remapped) */
"if\0"
"glUniform1f\0"
"glUniform1fARB\0"
"\0"
- /* _mesa_function_pool[39214]: FragmentMaterialfSGIX (dynamic) */
+ /* _mesa_function_pool[40913]: Uniform1d (will be remapped) */
+ "id\0"
+ "glUniform1d\0"
+ "\0"
+ /* _mesa_function_pool[40929]: FragmentMaterialfSGIX (dynamic) */
"iif\0"
"glFragmentMaterialfSGIX\0"
"\0"
- /* _mesa_function_pool[39243]: Uniform1i (will be remapped) */
+ /* _mesa_function_pool[40958]: Uniform1i (will be remapped) */
"ii\0"
"glUniform1i\0"
"glUniform1iARB\0"
"\0"
- /* _mesa_function_pool[39274]: GetPolygonStipple (offset 274) */
+ /* _mesa_function_pool[40989]: GetPolygonStipple (offset 274) */
"p\0"
"glGetPolygonStipple\0"
"\0"
- /* _mesa_function_pool[39297]: PixelTexGenSGIX (dynamic) */
+ /* _mesa_function_pool[41012]: PixelTexGenSGIX (dynamic) */
"i\0"
"glPixelTexGenSGIX\0"
"\0"
- /* _mesa_function_pool[39318]: ReplacementCodeusvSUN (dynamic) */
+ /* _mesa_function_pool[41033]: ReplacementCodeusvSUN (dynamic) */
"p\0"
"glReplacementCodeusvSUN\0"
"\0"
- /* _mesa_function_pool[39345]: UseProgram (will be remapped) */
+ /* _mesa_function_pool[41060]: UseProgram (will be remapped) */
"i\0"
"glUseProgram\0"
"glUseProgramObjectARB\0"
"\0"
- /* _mesa_function_pool[39383]: StartInstrumentsSGIX (dynamic) */
+ /* _mesa_function_pool[41098]: StartInstrumentsSGIX (dynamic) */
"\0"
"glStartInstrumentsSGIX\0"
"\0"
- /* _mesa_function_pool[39408]: FlushMappedBufferRangeAPPLE (will be remapped) */
+ /* _mesa_function_pool[41123]: FlushMappedBufferRangeAPPLE (will be remapped) */
"iii\0"
"glFlushMappedBufferRangeAPPLE\0"
"\0"
- /* _mesa_function_pool[39443]: GetFragDataLocation (will be remapped) */
+ /* _mesa_function_pool[41158]: GetFragDataLocation (will be remapped) */
"ip\0"
"glGetFragDataLocationEXT\0"
"glGetFragDataLocation\0"
"\0"
- /* _mesa_function_pool[39494]: PixelMapuiv (offset 252) */
+ /* _mesa_function_pool[41209]: PixelMapuiv (offset 252) */
"iip\0"
"glPixelMapuiv\0"
"\0"
- /* _mesa_function_pool[39513]: VertexWeightfvEXT (dynamic) */
+ /* _mesa_function_pool[41228]: VertexWeightfvEXT (dynamic) */
"p\0"
"glVertexWeightfvEXT\0"
"\0"
- /* _mesa_function_pool[39536]: GetFenceivNV (dynamic) */
+ /* _mesa_function_pool[41251]: GetFenceivNV (dynamic) */
"iip\0"
"glGetFenceivNV\0"
"\0"
- /* _mesa_function_pool[39556]: CurrentPaletteMatrixARB (dynamic) */
+ /* _mesa_function_pool[41271]: CurrentPaletteMatrixARB (dynamic) */
"i\0"
"glCurrentPaletteMatrixARB\0"
"glCurrentPaletteMatrixOES\0"
"\0"
- /* _mesa_function_pool[39611]: GetInteger64i_v (will be remapped) */
- "iip\0"
- "glGetInteger64i_v\0"
+ /* _mesa_function_pool[41326]: GenVertexArrays (will be remapped) */
+ "ip\0"
+ "glGenVertexArrays\0"
+ "glGenVertexArraysOES\0"
"\0"
- /* _mesa_function_pool[39634]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[41369]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
"ffiiiifff\0"
"glTexCoord2fColor4ubVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[39677]: TagSampleBufferSGIX (dynamic) */
+ /* _mesa_function_pool[41412]: TagSampleBufferSGIX (dynamic) */
"\0"
"glTagSampleBufferSGIX\0"
"\0"
- /* _mesa_function_pool[39701]: Color3s (offset 17) */
+ /* _mesa_function_pool[41436]: Color3s (offset 17) */
"iii\0"
"glColor3s\0"
"\0"
- /* _mesa_function_pool[39716]: TexCoordPointer (offset 320) */
+ /* _mesa_function_pool[41451]: TextureStorage2DMultisample (will be remapped) */
+ "iiiiii\0"
+ "glTextureStorage2DMultisample\0"
+ "\0"
+ /* _mesa_function_pool[41489]: TexCoordPointer (offset 320) */
"iiip\0"
"glTexCoordPointer\0"
"\0"
- /* _mesa_function_pool[39740]: Color3i (offset 15) */
+ /* _mesa_function_pool[41513]: Color3i (offset 15) */
"iii\0"
"glColor3i\0"
"\0"
- /* _mesa_function_pool[39755]: EvalCoord2d (offset 232) */
+ /* _mesa_function_pool[41528]: EvalCoord2d (offset 232) */
"dd\0"
"glEvalCoord2d\0"
"\0"
- /* _mesa_function_pool[39773]: EvalCoord2f (offset 234) */
+ /* _mesa_function_pool[41546]: EvalCoord2f (offset 234) */
"ff\0"
"glEvalCoord2f\0"
"\0"
- /* _mesa_function_pool[39791]: Color3b (offset 9) */
+ /* _mesa_function_pool[41564]: Color3b (offset 9) */
"iii\0"
"glColor3b\0"
"\0"
- /* _mesa_function_pool[39806]: ExecuteProgramNV (will be remapped) */
+ /* _mesa_function_pool[41579]: ExecuteProgramNV (will be remapped) */
"iip\0"
"glExecuteProgramNV\0"
"\0"
- /* _mesa_function_pool[39830]: Color3f (offset 13) */
+ /* _mesa_function_pool[41603]: Color3f (offset 13) */
"fff\0"
"glColor3f\0"
"\0"
- /* _mesa_function_pool[39845]: Color3d (offset 11) */
+ /* _mesa_function_pool[41618]: Color3d (offset 11) */
"ddd\0"
"glColor3d\0"
"\0"
- /* _mesa_function_pool[39860]: GetVertexAttribdv (will be remapped) */
+ /* _mesa_function_pool[41633]: GetVertexAttribdv (will be remapped) */
"iip\0"
"glGetVertexAttribdv\0"
"glGetVertexAttribdvARB\0"
"\0"
- /* _mesa_function_pool[39908]: GetBufferPointerv (will be remapped) */
+ /* _mesa_function_pool[41681]: GetBufferPointerv (will be remapped) */
"iip\0"
"glGetBufferPointerv\0"
"glGetBufferPointervARB\0"
"glGetBufferPointervOES\0"
"\0"
- /* _mesa_function_pool[39979]: GenFramebuffers (will be remapped) */
+ /* _mesa_function_pool[41752]: GenFramebuffers (will be remapped) */
"ip\0"
"glGenFramebuffers\0"
"glGenFramebuffersEXT\0"
"glGenFramebuffersOES\0"
"\0"
- /* _mesa_function_pool[40043]: GenBuffers (will be remapped) */
+ /* _mesa_function_pool[41816]: GenBuffers (will be remapped) */
"ip\0"
"glGenBuffers\0"
"glGenBuffersARB\0"
"\0"
- /* _mesa_function_pool[40076]: ClearDepthx (will be remapped) */
+ /* _mesa_function_pool[41849]: ClearDepthx (will be remapped) */
"i\0"
"glClearDepthxOES\0"
"glClearDepthx\0"
"\0"
- /* _mesa_function_pool[40110]: BlendEquationSeparate (will be remapped) */
+ /* _mesa_function_pool[41883]: BlendEquationSeparate (will be remapped) */
"ii\0"
"glBlendEquationSeparate\0"
"glBlendEquationSeparateEXT\0"
"glBlendEquationSeparateATI\0"
"glBlendEquationSeparateOES\0"
"\0"
- /* _mesa_function_pool[40219]: PixelTransformParameteriEXT (dynamic) */
+ /* _mesa_function_pool[41992]: PixelTransformParameteriEXT (dynamic) */
"iii\0"
"glPixelTransformParameteriEXT\0"
"\0"
- /* _mesa_function_pool[40254]: MultiTexCoordP4ui (will be remapped) */
+ /* _mesa_function_pool[42027]: MultiTexCoordP4ui (will be remapped) */
"iii\0"
"glMultiTexCoordP4ui\0"
"\0"
- /* _mesa_function_pool[40279]: VertexAttribIPointer (will be remapped) */
+ /* _mesa_function_pool[42052]: VertexAttribIPointer (will be remapped) */
"iiiip\0"
"glVertexAttribIPointerEXT\0"
"glVertexAttribIPointer\0"
"\0"
- /* _mesa_function_pool[40335]: EnableVertexAttribArray (will be remapped) */
+ /* _mesa_function_pool[42108]: EnableVertexAttribArray (will be remapped) */
"i\0"
"glEnableVertexAttribArray\0"
"glEnableVertexAttribArrayARB\0"
"\0"
- /* _mesa_function_pool[40393]: FrameZoomSGIX (dynamic) */
+ /* _mesa_function_pool[42166]: FrameZoomSGIX (dynamic) */
"i\0"
"glFrameZoomSGIX\0"
"\0"
- /* _mesa_function_pool[40412]: RasterPos4sv (offset 85) */
+ /* _mesa_function_pool[42185]: RasterPos4sv (offset 85) */
"p\0"
"glRasterPos4sv\0"
"\0"
- /* _mesa_function_pool[40430]: SelectBuffer (offset 195) */
+ /* _mesa_function_pool[42203]: CopyTextureSubImage3D (will be remapped) */
+ "iiiiiiiii\0"
+ "glCopyTextureSubImage3D\0"
+ "\0"
+ /* _mesa_function_pool[42238]: SelectBuffer (offset 195) */
"ip\0"
"glSelectBuffer\0"
"\0"
- /* _mesa_function_pool[40449]: GetSynciv (will be remapped) */
+ /* _mesa_function_pool[42257]: GetSynciv (will be remapped) */
"iiipp\0"
"glGetSynciv\0"
"\0"
- /* _mesa_function_pool[40468]: TextureView (will be remapped) */
+ /* _mesa_function_pool[42276]: TextureView (will be remapped) */
"iiiiiiii\0"
"glTextureView\0"
"\0"
- /* _mesa_function_pool[40492]: TexEnviv (offset 187) */
+ /* _mesa_function_pool[42300]: TexEnviv (offset 187) */
"iip\0"
"glTexEnviv\0"
"\0"
- /* _mesa_function_pool[40508]: TexSubImage3D (offset 372) */
+ /* _mesa_function_pool[42316]: TexSubImage3D (offset 372) */
"iiiiiiiiiip\0"
"glTexSubImage3D\0"
"glTexSubImage3DEXT\0"
"glTexSubImage3DOES\0"
"\0"
- /* _mesa_function_pool[40575]: Bitmap (offset 8) */
+ /* _mesa_function_pool[42383]: Bitmap (offset 8) */
"iiffffp\0"
"glBitmap\0"
"\0"
- /* _mesa_function_pool[40593]: VertexAttribDivisor (will be remapped) */
+ /* _mesa_function_pool[42401]: VertexAttribDivisor (will be remapped) */
"ii\0"
"glVertexAttribDivisorARB\0"
"glVertexAttribDivisor\0"
"\0"
- /* _mesa_function_pool[40644]: DrawTransformFeedbackStream (will be remapped) */
+ /* _mesa_function_pool[42452]: DrawTransformFeedbackStream (will be remapped) */
"iii\0"
"glDrawTransformFeedbackStream\0"
"\0"
- /* _mesa_function_pool[40679]: GetIntegerv (offset 263) */
+ /* _mesa_function_pool[42487]: GetIntegerv (offset 263) */
"ip\0"
"glGetIntegerv\0"
"\0"
- /* _mesa_function_pool[40697]: EndPerfQueryINTEL (will be remapped) */
+ /* _mesa_function_pool[42505]: EndPerfQueryINTEL (will be remapped) */
"i\0"
"glEndPerfQueryINTEL\0"
"\0"
- /* _mesa_function_pool[40720]: FragmentLightfvSGIX (dynamic) */
+ /* _mesa_function_pool[42528]: FragmentLightfvSGIX (dynamic) */
"iip\0"
"glFragmentLightfvSGIX\0"
"\0"
- /* _mesa_function_pool[40747]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[42555]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
"ppp\0"
"glTexCoord2fColor3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[40784]: GetActiveUniform (will be remapped) */
+ /* _mesa_function_pool[42592]: GetActiveUniform (will be remapped) */
"iiipppp\0"
"glGetActiveUniform\0"
"glGetActiveUniformARB\0"
"\0"
- /* _mesa_function_pool[40834]: AlphaFuncx (will be remapped) */
+ /* _mesa_function_pool[42642]: AlphaFuncx (will be remapped) */
"ii\0"
"glAlphaFuncxOES\0"
"glAlphaFuncx\0"
"\0"
- /* _mesa_function_pool[40867]: VertexAttribI2ivEXT (will be remapped) */
+ /* _mesa_function_pool[42675]: VertexAttribI2ivEXT (will be remapped) */
"ip\0"
"glVertexAttribI2ivEXT\0"
"glVertexAttribI2iv\0"
"\0"
- /* _mesa_function_pool[40912]: VertexBlendARB (dynamic) */
+ /* _mesa_function_pool[42720]: VertexBlendARB (dynamic) */
"i\0"
"glVertexBlendARB\0"
"\0"
- /* _mesa_function_pool[40932]: Map1d (offset 220) */
+ /* _mesa_function_pool[42740]: Map1d (offset 220) */
"iddiip\0"
"glMap1d\0"
"\0"
- /* _mesa_function_pool[40948]: Map1f (offset 221) */
+ /* _mesa_function_pool[42756]: Map1f (offset 221) */
"iffiip\0"
"glMap1f\0"
"\0"
- /* _mesa_function_pool[40964]: AreTexturesResident (offset 322) */
+ /* _mesa_function_pool[42772]: AreTexturesResident (offset 322) */
"ipp\0"
"glAreTexturesResident\0"
"glAreTexturesResidentEXT\0"
"\0"
- /* _mesa_function_pool[41016]: ProgramNamedParameter4fNV (will be remapped) */
+ /* _mesa_function_pool[42824]: ProgramNamedParameter4fNV (will be remapped) */
"iipffff\0"
"glProgramNamedParameter4fNV\0"
"\0"
- /* _mesa_function_pool[41053]: PixelTransferi (offset 248) */
+ /* _mesa_function_pool[42861]: PixelTransferi (offset 248) */
"ii\0"
"glPixelTransferi\0"
"\0"
- /* _mesa_function_pool[41074]: VertexAttrib3fvNV (will be remapped) */
+ /* _mesa_function_pool[42882]: VertexAttrib3fvNV (will be remapped) */
"ip\0"
"glVertexAttrib3fvNV\0"
"\0"
- /* _mesa_function_pool[41098]: GetFinalCombinerInputParameterivNV (dynamic) */
+ /* _mesa_function_pool[42906]: Rotatef (offset 300) */
+ "ffff\0"
+ "glRotatef\0"
+ "\0"
+ /* _mesa_function_pool[42922]: GetFinalCombinerInputParameterivNV (dynamic) */
"iip\0"
"glGetFinalCombinerInputParameterivNV\0"
"\0"
- /* _mesa_function_pool[41140]: SecondaryColorP3ui (will be remapped) */
+ /* _mesa_function_pool[42964]: SecondaryColorP3ui (will be remapped) */
"ii\0"
"glSecondaryColorP3ui\0"
"\0"
- /* _mesa_function_pool[41165]: BindTextures (will be remapped) */
+ /* _mesa_function_pool[42989]: BindTextures (will be remapped) */
"iip\0"
"glBindTextures\0"
"\0"
- /* _mesa_function_pool[41185]: GetMapParameterivNV (dynamic) */
+ /* _mesa_function_pool[43009]: GetMapParameterivNV (dynamic) */
"iip\0"
"glGetMapParameterivNV\0"
"\0"
- /* _mesa_function_pool[41212]: VertexAttrib4fvNV (will be remapped) */
+ /* _mesa_function_pool[43036]: VertexAttrib4fvNV (will be remapped) */
"ip\0"
"glVertexAttrib4fvNV\0"
"\0"
- /* _mesa_function_pool[41236]: Rectiv (offset 91) */
+ /* _mesa_function_pool[43060]: Rectiv (offset 91) */
"pp\0"
"glRectiv\0"
"\0"
- /* _mesa_function_pool[41249]: MultiTexCoord1iv (offset 381) */
+ /* _mesa_function_pool[43073]: MultiTexCoord1iv (offset 381) */
"ip\0"
"glMultiTexCoord1iv\0"
"glMultiTexCoord1ivARB\0"
"\0"
- /* _mesa_function_pool[41294]: PassTexCoordATI (will be remapped) */
+ /* _mesa_function_pool[43118]: PassTexCoordATI (will be remapped) */
"iii\0"
"glPassTexCoordATI\0"
"\0"
- /* _mesa_function_pool[41317]: Tangent3dEXT (dynamic) */
+ /* _mesa_function_pool[43141]: Tangent3dEXT (dynamic) */
"ddd\0"
"glTangent3dEXT\0"
"\0"
- /* _mesa_function_pool[41337]: Vertex2fv (offset 129) */
+ /* _mesa_function_pool[43161]: Vertex2fv (offset 129) */
"p\0"
"glVertex2fv\0"
"\0"
- /* _mesa_function_pool[41352]: BindRenderbufferEXT (will be remapped) */
+ /* _mesa_function_pool[43176]: BindRenderbufferEXT (will be remapped) */
"ii\0"
"glBindRenderbufferEXT\0"
"\0"
- /* _mesa_function_pool[41378]: Vertex3sv (offset 141) */
+ /* _mesa_function_pool[43202]: Vertex3sv (offset 141) */
"p\0"
"glVertex3sv\0"
"\0"
- /* _mesa_function_pool[41393]: EvalMesh1 (offset 236) */
+ /* _mesa_function_pool[43217]: EvalMesh1 (offset 236) */
"iii\0"
"glEvalMesh1\0"
"\0"
- /* _mesa_function_pool[41410]: DiscardFramebufferEXT (will be remapped) */
+ /* _mesa_function_pool[43234]: DiscardFramebufferEXT (will be remapped) */
"iip\0"
"glDiscardFramebufferEXT\0"
"\0"
- /* _mesa_function_pool[41439]: Uniform2f (will be remapped) */
+ /* _mesa_function_pool[43263]: Uniform2f (will be remapped) */
"iff\0"
"glUniform2f\0"
"glUniform2fARB\0"
"\0"
- /* _mesa_function_pool[41471]: ColorPointerEXT (will be remapped) */
+ /* _mesa_function_pool[43295]: Uniform2d (will be remapped) */
+ "idd\0"
+ "glUniform2d\0"
+ "\0"
+ /* _mesa_function_pool[43312]: ColorPointerEXT (will be remapped) */
"iiiip\0"
"glColorPointerEXT\0"
"\0"
- /* _mesa_function_pool[41496]: LineWidth (offset 168) */
+ /* _mesa_function_pool[43337]: LineWidth (offset 168) */
"f\0"
"glLineWidth\0"
"\0"
- /* _mesa_function_pool[41511]: Uniform2i (will be remapped) */
+ /* _mesa_function_pool[43352]: Uniform2i (will be remapped) */
"iii\0"
"glUniform2i\0"
"glUniform2iARB\0"
"\0"
- /* _mesa_function_pool[41543]: MultiDrawElementsBaseVertex (will be remapped) */
+ /* _mesa_function_pool[43384]: MultiDrawElementsBaseVertex (will be remapped) */
"ipipip\0"
"glMultiDrawElementsBaseVertex\0"
"\0"
- /* _mesa_function_pool[41581]: Lightxv (will be remapped) */
+ /* _mesa_function_pool[43422]: Lightxv (will be remapped) */
"iip\0"
"glLightxvOES\0"
"glLightxv\0"
"\0"
- /* _mesa_function_pool[41609]: DepthRangeIndexed (will be remapped) */
+ /* _mesa_function_pool[43450]: DepthRangeIndexed (will be remapped) */
"idd\0"
"glDepthRangeIndexed\0"
"\0"
- /* _mesa_function_pool[41634]: GetConvolutionParameterfv (offset 357) */
+ /* _mesa_function_pool[43475]: GetConvolutionParameterfv (offset 357) */
"iip\0"
"glGetConvolutionParameterfv\0"
"glGetConvolutionParameterfvEXT\0"
"\0"
- /* _mesa_function_pool[41698]: GetTexBumpParameterfvATI (will be remapped) */
+ /* _mesa_function_pool[43539]: GetTexBumpParameterfvATI (will be remapped) */
"ip\0"
"glGetTexBumpParameterfvATI\0"
"\0"
- /* _mesa_function_pool[41729]: ProgramNamedParameter4dNV (will be remapped) */
+ /* _mesa_function_pool[43570]: ProgramNamedParameter4dNV (will be remapped) */
"iipdddd\0"
"glProgramNamedParameter4dNV\0"
"\0"
- /* _mesa_function_pool[41766]: GetMaterialfv (offset 269) */
+ /* _mesa_function_pool[43607]: GetMaterialfv (offset 269) */
"iip\0"
"glGetMaterialfv\0"
"\0"
- /* _mesa_function_pool[41787]: TexImage3DMultisample (will be remapped) */
+ /* _mesa_function_pool[43628]: TexImage3DMultisample (will be remapped) */
"iiiiiii\0"
"glTexImage3DMultisample\0"
"\0"
- /* _mesa_function_pool[41820]: VertexAttrib1fvNV (will be remapped) */
+ /* _mesa_function_pool[43661]: VertexAttrib1fvNV (will be remapped) */
"ip\0"
"glVertexAttrib1fvNV\0"
"\0"
- /* _mesa_function_pool[41844]: GetUniformBlockIndex (will be remapped) */
+ /* _mesa_function_pool[43685]: GetUniformBlockIndex (will be remapped) */
"ip\0"
"glGetUniformBlockIndex\0"
"\0"
- /* _mesa_function_pool[41871]: DetachShader (will be remapped) */
+ /* _mesa_function_pool[43712]: DetachShader (will be remapped) */
"ii\0"
"glDetachShader\0"
"\0"
- /* _mesa_function_pool[41890]: CopyTexSubImage2D (offset 326) */
+ /* _mesa_function_pool[43731]: CopyTexSubImage2D (offset 326) */
"iiiiiiii\0"
"glCopyTexSubImage2D\0"
"glCopyTexSubImage2DEXT\0"
"\0"
- /* _mesa_function_pool[41943]: SampleCoverage (will be remapped) */
+ /* _mesa_function_pool[43784]: SampleCoverage (will be remapped) */
"fi\0"
"glSampleCoverage\0"
"glSampleCoverageARB\0"
"\0"
- /* _mesa_function_pool[41984]: GetObjectParameterivARB (will be remapped) */
+ /* _mesa_function_pool[43825]: GetObjectParameterivARB (will be remapped) */
"iip\0"
"glGetObjectParameterivARB\0"
"\0"
- /* _mesa_function_pool[42015]: Color3iv (offset 16) */
+ /* _mesa_function_pool[43856]: Color3iv (offset 16) */
"p\0"
"glColor3iv\0"
"\0"
- /* _mesa_function_pool[42029]: DrawElements (offset 311) */
+ /* _mesa_function_pool[43870]: DrawElements (offset 311) */
"iiip\0"
"glDrawElements\0"
"\0"
- /* _mesa_function_pool[42050]: ScissorArrayv (will be remapped) */
+ /* _mesa_function_pool[43891]: ScissorArrayv (will be remapped) */
"iip\0"
"glScissorArrayv\0"
"\0"
- /* _mesa_function_pool[42071]: GetInternalformativ (will be remapped) */
+ /* _mesa_function_pool[43912]: GetInternalformativ (will be remapped) */
"iiiip\0"
"glGetInternalformativ\0"
"\0"
- /* _mesa_function_pool[42100]: EvalPoint2 (offset 239) */
+ /* _mesa_function_pool[43941]: EvalPoint2 (offset 239) */
"ii\0"
"glEvalPoint2\0"
"\0"
- /* _mesa_function_pool[42117]: EvalPoint1 (offset 237) */
+ /* _mesa_function_pool[43958]: EvalPoint1 (offset 237) */
"i\0"
"glEvalPoint1\0"
"\0"
- /* _mesa_function_pool[42133]: PopMatrix (offset 297) */
+ /* _mesa_function_pool[43974]: PopMatrix (offset 297) */
"\0"
"glPopMatrix\0"
"\0"
- /* _mesa_function_pool[42147]: FinishFenceNV (dynamic) */
+ /* _mesa_function_pool[43988]: FinishFenceNV (dynamic) */
"i\0"
"glFinishFenceNV\0"
"\0"
- /* _mesa_function_pool[42166]: Tangent3bvEXT (dynamic) */
+ /* _mesa_function_pool[44007]: Tangent3bvEXT (dynamic) */
"p\0"
"glTangent3bvEXT\0"
"\0"
- /* _mesa_function_pool[42185]: GetTexGeniv (offset 280) */
+ /* _mesa_function_pool[44026]: GetTexGeniv (offset 280) */
"iip\0"
"glGetTexGeniv\0"
"glGetTexGenivOES\0"
"\0"
- /* _mesa_function_pool[42221]: GetFirstPerfQueryIdINTEL (will be remapped) */
+ /* _mesa_function_pool[44062]: GetFirstPerfQueryIdINTEL (will be remapped) */
"p\0"
"glGetFirstPerfQueryIdINTEL\0"
"\0"
- /* _mesa_function_pool[42251]: ActiveProgramEXT (will be remapped) */
+ /* _mesa_function_pool[44092]: ActiveProgramEXT (will be remapped) */
"i\0"
"glActiveProgramEXT\0"
"\0"
- /* _mesa_function_pool[42273]: PixelTransformParameterivEXT (dynamic) */
+ /* _mesa_function_pool[44114]: PixelTransformParameterivEXT (dynamic) */
"iip\0"
"glPixelTransformParameterivEXT\0"
"\0"
- /* _mesa_function_pool[42309]: TexCoord4fVertex4fvSUN (dynamic) */
+ /* _mesa_function_pool[44150]: TexCoord4fVertex4fvSUN (dynamic) */
"pp\0"
"glTexCoord4fVertex4fvSUN\0"
"\0"
- /* _mesa_function_pool[42338]: UnmapBuffer (will be remapped) */
+ /* _mesa_function_pool[44179]: UnmapBuffer (will be remapped) */
"i\0"
"glUnmapBuffer\0"
"glUnmapBufferARB\0"
"glUnmapBufferOES\0"
"\0"
- /* _mesa_function_pool[42389]: EvalCoord1d (offset 228) */
+ /* _mesa_function_pool[44230]: EvalCoord1d (offset 228) */
"d\0"
"glEvalCoord1d\0"
"\0"
- /* _mesa_function_pool[42406]: EvalCoord1f (offset 230) */
+ /* _mesa_function_pool[44247]: EvalCoord1f (offset 230) */
"f\0"
"glEvalCoord1f\0"
"\0"
- /* _mesa_function_pool[42423]: IndexMaterialEXT (dynamic) */
+ /* _mesa_function_pool[44264]: IndexMaterialEXT (dynamic) */
"ii\0"
"glIndexMaterialEXT\0"
"\0"
- /* _mesa_function_pool[42446]: Materialf (offset 169) */
+ /* _mesa_function_pool[44287]: Materialf (offset 169) */
"iif\0"
"glMaterialf\0"
"\0"
- /* _mesa_function_pool[42463]: VertexAttribs2dvNV (will be remapped) */
+ /* _mesa_function_pool[44304]: VertexAttribs2dvNV (will be remapped) */
"iip\0"
"glVertexAttribs2dvNV\0"
"\0"
- /* _mesa_function_pool[42489]: ProgramUniform1uiv (will be remapped) */
+ /* _mesa_function_pool[44330]: ProgramUniform1uiv (will be remapped) */
"iiip\0"
"glProgramUniform1uiv\0"
"glProgramUniform1uivEXT\0"
"\0"
- /* _mesa_function_pool[42540]: EvalCoord1dv (offset 229) */
+ /* _mesa_function_pool[44381]: EvalCoord1dv (offset 229) */
"p\0"
"glEvalCoord1dv\0"
"\0"
- /* _mesa_function_pool[42558]: Materialx (will be remapped) */
+ /* _mesa_function_pool[44399]: Materialx (will be remapped) */
"iii\0"
"glMaterialxOES\0"
"glMaterialx\0"
"\0"
- /* _mesa_function_pool[42590]: GetLightiv (offset 265) */
+ /* _mesa_function_pool[44431]: GetLightiv (offset 265) */
"iip\0"
"glGetLightiv\0"
"\0"
- /* _mesa_function_pool[42608]: BindBuffer (will be remapped) */
+ /* _mesa_function_pool[44449]: BindBuffer (will be remapped) */
"ii\0"
"glBindBuffer\0"
"glBindBufferARB\0"
"\0"
- /* _mesa_function_pool[42641]: ProgramUniform1i (will be remapped) */
+ /* _mesa_function_pool[44482]: ProgramUniform1i (will be remapped) */
"iii\0"
"glProgramUniform1i\0"
"glProgramUniform1iEXT\0"
"\0"
- /* _mesa_function_pool[42687]: ProgramUniform1f (will be remapped) */
+ /* _mesa_function_pool[44528]: ProgramUniform1f (will be remapped) */
"iif\0"
"glProgramUniform1f\0"
"glProgramUniform1fEXT\0"
"\0"
- /* _mesa_function_pool[42733]: WindowPos3iv (will be remapped) */
+ /* _mesa_function_pool[44574]: ProgramUniform1d (will be remapped) */
+ "iid\0"
+ "glProgramUniform1d\0"
+ "\0"
+ /* _mesa_function_pool[44598]: WindowPos3iv (will be remapped) */
"p\0"
"glWindowPos3iv\0"
"glWindowPos3ivARB\0"
"glWindowPos3ivMESA\0"
"\0"
- /* _mesa_function_pool[42788]: CopyConvolutionFilter2D (offset 355) */
+ /* _mesa_function_pool[44653]: CopyConvolutionFilter2D (offset 355) */
"iiiiii\0"
"glCopyConvolutionFilter2D\0"
"glCopyConvolutionFilter2DEXT\0"
"\0"
- /* _mesa_function_pool[42851]: CopyBufferSubData (will be remapped) */
+ /* _mesa_function_pool[44716]: CopyBufferSubData (will be remapped) */
"iiiii\0"
"glCopyBufferSubData\0"
"\0"
- /* _mesa_function_pool[42878]: WeightfvARB (dynamic) */
+ /* _mesa_function_pool[44743]: WeightfvARB (dynamic) */
"ip\0"
"glWeightfvARB\0"
"\0"
- /* _mesa_function_pool[42896]: UniformMatrix3x4fv (will be remapped) */
+ /* _mesa_function_pool[44761]: UniformMatrix3x4fv (will be remapped) */
"iiip\0"
"glUniformMatrix3x4fv\0"
"\0"
- /* _mesa_function_pool[42923]: Recti (offset 90) */
+ /* _mesa_function_pool[44788]: Recti (offset 90) */
"iiii\0"
"glRecti\0"
"\0"
- /* _mesa_function_pool[42937]: VertexAttribI3ivEXT (will be remapped) */
+ /* _mesa_function_pool[44802]: VertexAttribI3ivEXT (will be remapped) */
"ip\0"
"glVertexAttribI3ivEXT\0"
"glVertexAttribI3iv\0"
"\0"
- /* _mesa_function_pool[42982]: DeleteSamplers (will be remapped) */
+ /* _mesa_function_pool[44847]: DeleteSamplers (will be remapped) */
"ip\0"
"glDeleteSamplers\0"
"\0"
- /* _mesa_function_pool[43003]: SamplerParameteri (will be remapped) */
+ /* _mesa_function_pool[44868]: SamplerParameteri (will be remapped) */
"iii\0"
"glSamplerParameteri\0"
"\0"
- /* _mesa_function_pool[43028]: Rectf (offset 88) */
+ /* _mesa_function_pool[44893]: Rectf (offset 88) */
"ffff\0"
"glRectf\0"
"\0"
- /* _mesa_function_pool[43042]: Rectd (offset 86) */
+ /* _mesa_function_pool[44907]: Rectd (offset 86) */
"dddd\0"
"glRectd\0"
"\0"
- /* _mesa_function_pool[43056]: SamplerParameterf (will be remapped) */
- "iif\0"
- "glSamplerParameterf\0"
+ /* _mesa_function_pool[44921]: MultMatrixx (will be remapped) */
+ "p\0"
+ "glMultMatrixxOES\0"
+ "glMultMatrixx\0"
"\0"
- /* _mesa_function_pool[43081]: Rects (offset 92) */
+ /* _mesa_function_pool[44955]: Rects (offset 92) */
"iiii\0"
"glRects\0"
"\0"
- /* _mesa_function_pool[43095]: CombinerParameterfNV (dynamic) */
+ /* _mesa_function_pool[44969]: CombinerParameterfNV (dynamic) */
"if\0"
"glCombinerParameterfNV\0"
"\0"
- /* _mesa_function_pool[43122]: GetVertexAttribIiv (will be remapped) */
+ /* _mesa_function_pool[44996]: GetVertexAttribIiv (will be remapped) */
"iip\0"
"glGetVertexAttribIivEXT\0"
"glGetVertexAttribIiv\0"
"\0"
- /* _mesa_function_pool[43172]: ClientWaitSync (will be remapped) */
+ /* _mesa_function_pool[45046]: ClientWaitSync (will be remapped) */
"iii\0"
"glClientWaitSync\0"
"\0"
- /* _mesa_function_pool[43194]: TexCoord4s (offset 124) */
+ /* _mesa_function_pool[45068]: TexCoord4s (offset 124) */
"iiii\0"
"glTexCoord4s\0"
"\0"
- /* _mesa_function_pool[43213]: TexEnvxv (will be remapped) */
+ /* _mesa_function_pool[45087]: TexEnvxv (will be remapped) */
"iip\0"
"glTexEnvxvOES\0"
"glTexEnvxv\0"
"\0"
- /* _mesa_function_pool[43243]: TexCoord4i (offset 122) */
+ /* _mesa_function_pool[45117]: TexCoord4i (offset 122) */
"iiii\0"
"glTexCoord4i\0"
"\0"
- /* _mesa_function_pool[43262]: ObjectPurgeableAPPLE (will be remapped) */
+ /* _mesa_function_pool[45136]: ObjectPurgeableAPPLE (will be remapped) */
"iii\0"
"glObjectPurgeableAPPLE\0"
"\0"
- /* _mesa_function_pool[43290]: TexCoord4d (offset 118) */
+ /* _mesa_function_pool[45164]: TexCoord4d (offset 118) */
"dddd\0"
"glTexCoord4d\0"
"\0"
- /* _mesa_function_pool[43309]: TexCoord4f (offset 120) */
+ /* _mesa_function_pool[45183]: TexCoord4f (offset 120) */
"ffff\0"
"glTexCoord4f\0"
"\0"
- /* _mesa_function_pool[43328]: GetBooleanv (offset 258) */
+ /* _mesa_function_pool[45202]: GetBooleanv (offset 258) */
"ip\0"
"glGetBooleanv\0"
"\0"
- /* _mesa_function_pool[43346]: IsAsyncMarkerSGIX (dynamic) */
+ /* _mesa_function_pool[45220]: IsAsyncMarkerSGIX (dynamic) */
"i\0"
"glIsAsyncMarkerSGIX\0"
"\0"
- /* _mesa_function_pool[43369]: LockArraysEXT (will be remapped) */
+ /* _mesa_function_pool[45243]: ProgramUniformMatrix3dv (will be remapped) */
+ "iiiip\0"
+ "glProgramUniformMatrix3dv\0"
+ "\0"
+ /* _mesa_function_pool[45276]: LockArraysEXT (will be remapped) */
"ii\0"
"glLockArraysEXT\0"
"\0"
- /* _mesa_function_pool[43389]: GetActiveUniformBlockiv (will be remapped) */
+ /* _mesa_function_pool[45296]: GetActiveUniformBlockiv (will be remapped) */
"iiip\0"
"glGetActiveUniformBlockiv\0"
"\0"
- /* _mesa_function_pool[43421]: GetPerfMonitorCountersAMD (will be remapped) */
+ /* _mesa_function_pool[45328]: GetPerfMonitorCountersAMD (will be remapped) */
"ippip\0"
"glGetPerfMonitorCountersAMD\0"
"\0"
- /* _mesa_function_pool[43456]: ObjectPtrLabel (will be remapped) */
+ /* _mesa_function_pool[45363]: ObjectPtrLabel (will be remapped) */
"pip\0"
"glObjectPtrLabel\0"
"\0"
- /* _mesa_function_pool[43478]: Rectfv (offset 89) */
+ /* _mesa_function_pool[45385]: Rectfv (offset 89) */
"pp\0"
"glRectfv\0"
"\0"
- /* _mesa_function_pool[43491]: BindImageTexture (will be remapped) */
+ /* _mesa_function_pool[45398]: BindImageTexture (will be remapped) */
"iiiiiii\0"
"glBindImageTexture\0"
"\0"
- /* _mesa_function_pool[43519]: ClearDepthf (will be remapped) */
+ /* _mesa_function_pool[45426]: ClearDepthf (will be remapped) */
"f\0"
"glClearDepthf\0"
"glClearDepthfOES\0"
"\0"
- /* _mesa_function_pool[43553]: VertexP4uiv (will be remapped) */
+ /* _mesa_function_pool[45460]: VertexP4uiv (will be remapped) */
"ip\0"
"glVertexP4uiv\0"
"\0"
- /* _mesa_function_pool[43571]: MinSampleShading (will be remapped) */
+ /* _mesa_function_pool[45478]: MinSampleShading (will be remapped) */
"f\0"
"glMinSampleShadingARB\0"
"glMinSampleShading\0"
"\0"
- /* _mesa_function_pool[43615]: GetRenderbufferParameteriv (will be remapped) */
+ /* _mesa_function_pool[45522]: GetRenderbufferParameteriv (will be remapped) */
"iip\0"
"glGetRenderbufferParameteriv\0"
"glGetRenderbufferParameterivEXT\0"
"glGetRenderbufferParameterivOES\0"
"\0"
- /* _mesa_function_pool[43713]: EdgeFlagPointerListIBM (dynamic) */
+ /* _mesa_function_pool[45620]: EdgeFlagPointerListIBM (dynamic) */
"ipi\0"
"glEdgeFlagPointerListIBM\0"
"\0"
- /* _mesa_function_pool[43743]: WindowPos2sv (will be remapped) */
+ /* _mesa_function_pool[45650]: VertexAttrib1dNV (will be remapped) */
+ "id\0"
+ "glVertexAttrib1dNV\0"
+ "\0"
+ /* _mesa_function_pool[45673]: WindowPos2sv (will be remapped) */
"p\0"
"glWindowPos2sv\0"
"glWindowPos2svARB\0"
"glWindowPos2svMESA\0"
"\0"
- /* _mesa_function_pool[43798]: VertexArrayRangeNV (dynamic) */
+ /* _mesa_function_pool[45728]: VertexArrayRangeNV (dynamic) */
"ip\0"
"glVertexArrayRangeNV\0"
"\0"
- /* _mesa_function_pool[43823]: GetPerfMonitorCounterStringAMD (will be remapped) */
+ /* _mesa_function_pool[45753]: GetPerfMonitorCounterStringAMD (will be remapped) */
"iiipp\0"
"glGetPerfMonitorCounterStringAMD\0"
"\0"
- /* _mesa_function_pool[43863]: EndFragmentShaderATI (will be remapped) */
+ /* _mesa_function_pool[45793]: EndFragmentShaderATI (will be remapped) */
"\0"
"glEndFragmentShaderATI\0"
"\0"
- /* _mesa_function_pool[43888]: Uniform4iv (will be remapped) */
+ /* _mesa_function_pool[45818]: Uniform4iv (will be remapped) */
"iip\0"
"glUniform4iv\0"
"glUniform4ivARB\0"
@@ -6105,844 +6378,912 @@ static const char _mesa_function_pool[] =
/* these functions need to be remapped */
static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
- { 17938, CompressedTexImage1D_remap_index },
- { 15428, CompressedTexImage2D_remap_index },
- { 11318, CompressedTexImage3D_remap_index },
- { 28480, CompressedTexSubImage1D_remap_index },
- { 34452, CompressedTexSubImage2D_remap_index },
- { 5829, CompressedTexSubImage3D_remap_index },
- { 3939, GetCompressedTexImage_remap_index },
- { 17147, LoadTransposeMatrixd_remap_index },
- { 17095, LoadTransposeMatrixf_remap_index },
- { 31933, MultTransposeMatrixd_remap_index },
- { 12625, MultTransposeMatrixf_remap_index },
- { 41943, SampleCoverage_remap_index },
- { 3187, BlendFuncSeparate_remap_index },
- { 20729, FogCoordPointer_remap_index },
- { 38073, FogCoordd_remap_index },
- { 37849, FogCoorddv_remap_index },
- { 30975, MultiDrawArrays_remap_index },
- { 29347, PointParameterf_remap_index },
- { 4549, PointParameterfv_remap_index },
- { 29305, PointParameteri_remap_index },
- { 8174, PointParameteriv_remap_index },
- { 4971, SecondaryColor3b_remap_index },
- { 37664, SecondaryColor3bv_remap_index },
- { 32134, SecondaryColor3d_remap_index },
- { 11451, SecondaryColor3dv_remap_index },
- { 5067, SecondaryColor3i_remap_index },
- { 27667, SecondaryColor3iv_remap_index },
- { 4847, SecondaryColor3s_remap_index },
- { 14714, SecondaryColor3sv_remap_index },
- { 20882, SecondaryColor3ub_remap_index },
- { 6722, SecondaryColor3ubv_remap_index },
- { 20930, SecondaryColor3ui_remap_index },
- { 22812, SecondaryColor3uiv_remap_index },
- { 20773, SecondaryColor3us_remap_index },
- { 9174, SecondaryColor3usv_remap_index },
- { 33236, SecondaryColorPointer_remap_index },
- { 11076, WindowPos2d_remap_index },
- { 16161, WindowPos2dv_remap_index },
- { 11023, WindowPos2f_remap_index },
- { 22166, WindowPos2fv_remap_index },
- { 11129, WindowPos2i_remap_index },
- { 6083, WindowPos2iv_remap_index },
- { 11182, WindowPos2s_remap_index },
- { 43743, WindowPos2sv_remap_index },
- { 14961, WindowPos3d_remap_index },
- { 14445, WindowPos3dv_remap_index },
- { 15048, WindowPos3f_remap_index },
- { 8033, WindowPos3fv_remap_index },
- { 15157, WindowPos3i_remap_index },
- { 42733, WindowPos3iv_remap_index },
- { 15273, WindowPos3s_remap_index },
- { 23560, WindowPos3sv_remap_index },
- { 5965, BeginQuery_remap_index },
- { 42608, BindBuffer_remap_index },
- { 36485, BufferData_remap_index },
- { 9671, BufferSubData_remap_index },
- { 29618, DeleteBuffers_remap_index },
- { 21176, DeleteQueries_remap_index },
- { 18761, EndQuery_remap_index },
- { 40043, GenBuffers_remap_index },
- { 1815, GenQueries_remap_index },
- { 27124, GetBufferParameteriv_remap_index },
- { 39908, GetBufferPointerv_remap_index },
- { 29657, GetBufferSubData_remap_index },
- { 7712, GetQueryObjectiv_remap_index },
- { 7381, GetQueryObjectuiv_remap_index },
- { 11644, GetQueryiv_remap_index },
- { 17628, IsBuffer_remap_index },
- { 27371, IsQuery_remap_index },
- { 11755, MapBuffer_remap_index },
- { 42338, UnmapBuffer_remap_index },
+ { 18555, CompressedTexImage1D_remap_index },
+ { 15956, CompressedTexImage2D_remap_index },
+ { 11669, CompressedTexImage3D_remap_index },
+ { 29537, CompressedTexSubImage1D_remap_index },
+ { 35852, CompressedTexSubImage2D_remap_index },
+ { 5966, CompressedTexSubImage3D_remap_index },
+ { 4025, GetCompressedTexImage_remap_index },
+ { 17780, LoadTransposeMatrixd_remap_index },
+ { 17728, LoadTransposeMatrixf_remap_index },
+ { 33178, MultTransposeMatrixd_remap_index },
+ { 12947, MultTransposeMatrixf_remap_index },
+ { 43784, SampleCoverage_remap_index },
+ { 3271, BlendFuncSeparate_remap_index },
+ { 21384, FogCoordPointer_remap_index },
+ { 39699, FogCoordd_remap_index },
+ { 39475, FogCoorddv_remap_index },
+ { 32176, MultiDrawArrays_remap_index },
+ { 30438, PointParameterf_remap_index },
+ { 4686, PointParameterfv_remap_index },
+ { 30396, PointParameteri_remap_index },
+ { 8398, PointParameteriv_remap_index },
+ { 5108, SecondaryColor3b_remap_index },
+ { 39290, SecondaryColor3bv_remap_index },
+ { 33379, SecondaryColor3d_remap_index },
+ { 11802, SecondaryColor3dv_remap_index },
+ { 5204, SecondaryColor3i_remap_index },
+ { 28657, SecondaryColor3iv_remap_index },
+ { 4984, SecondaryColor3s_remap_index },
+ { 15242, SecondaryColor3sv_remap_index },
+ { 21537, SecondaryColor3ub_remap_index },
+ { 6879, SecondaryColor3ubv_remap_index },
+ { 21615, SecondaryColor3ui_remap_index },
+ { 23654, SecondaryColor3uiv_remap_index },
+ { 21428, SecondaryColor3us_remap_index },
+ { 9398, SecondaryColor3usv_remap_index },
+ { 34578, SecondaryColorPointer_remap_index },
+ { 11427, WindowPos2d_remap_index },
+ { 16769, WindowPos2dv_remap_index },
+ { 11374, WindowPos2f_remap_index },
+ { 22955, WindowPos2fv_remap_index },
+ { 11480, WindowPos2i_remap_index },
+ { 6220, WindowPos2iv_remap_index },
+ { 11533, WindowPos2s_remap_index },
+ { 45673, WindowPos2sv_remap_index },
+ { 15489, WindowPos3d_remap_index },
+ { 14973, WindowPos3dv_remap_index },
+ { 15576, WindowPos3f_remap_index },
+ { 8257, WindowPos3fv_remap_index },
+ { 15685, WindowPos3i_remap_index },
+ { 44598, WindowPos3iv_remap_index },
+ { 15801, WindowPos3s_remap_index },
+ { 24402, WindowPos3sv_remap_index },
+ { 6102, BeginQuery_remap_index },
+ { 44449, BindBuffer_remap_index },
+ { 38069, BufferData_remap_index },
+ { 9921, BufferSubData_remap_index },
+ { 30766, DeleteBuffers_remap_index },
+ { 21882, DeleteQueries_remap_index },
+ { 19405, EndQuery_remap_index },
+ { 41816, GenBuffers_remap_index },
+ { 1877, GenQueries_remap_index },
+ { 28114, GetBufferParameteriv_remap_index },
+ { 41681, GetBufferPointerv_remap_index },
+ { 30805, GetBufferSubData_remap_index },
+ { 7911, GetQueryObjectiv_remap_index },
+ { 7538, GetQueryObjectuiv_remap_index },
+ { 11995, GetQueryiv_remap_index },
+ { 18218, IsBuffer_remap_index },
+ { 28361, IsQuery_remap_index },
+ { 12106, MapBuffer_remap_index },
+ { 44179, UnmapBuffer_remap_index },
{ 315, AttachShader_remap_index },
- { 34920, BindAttribLocation_remap_index },
- { 40110, BlendEquationSeparate_remap_index },
- { 30674, CompileShader_remap_index },
- { 13934, CreateProgram_remap_index },
- { 29533, CreateShader_remap_index },
- { 19587, DeleteProgram_remap_index },
- { 30656, DeleteShader_remap_index },
- { 41871, DetachShader_remap_index },
- { 32886, DisableVertexAttribArray_remap_index },
- { 21964, DrawBuffers_remap_index },
- { 40335, EnableVertexAttribArray_remap_index },
- { 35573, GetActiveAttrib_remap_index },
- { 40784, GetActiveUniform_remap_index },
- { 16734, GetAttachedShaders_remap_index },
- { 26090, GetAttribLocation_remap_index },
- { 10763, GetProgramInfoLog_remap_index },
- { 21734, GetProgramiv_remap_index },
- { 3680, GetShaderInfoLog_remap_index },
- { 7072, GetShaderSource_remap_index },
- { 16495, GetShaderiv_remap_index },
- { 6016, GetUniformLocation_remap_index },
- { 12778, GetUniformfv_remap_index },
- { 2074, GetUniformiv_remap_index },
- { 33604, GetVertexAttribPointerv_remap_index },
- { 39860, GetVertexAttribdv_remap_index },
- { 34213, GetVertexAttribfv_remap_index },
- { 36659, GetVertexAttribiv_remap_index },
- { 4125, IsProgram_remap_index },
- { 37206, IsShader_remap_index },
- { 27860, LinkProgram_remap_index },
- { 36302, ShaderSource_remap_index },
- { 36274, StencilFuncSeparate_remap_index },
- { 34535, StencilMaskSeparate_remap_index },
- { 35753, StencilOpSeparate_remap_index },
- { 39183, Uniform1f_remap_index },
- { 7888, Uniform1fv_remap_index },
- { 39243, Uniform1i_remap_index },
- { 17809, Uniform1iv_remap_index },
- { 41439, Uniform2f_remap_index },
- { 21900, Uniform2fv_remap_index },
- { 41511, Uniform2i_remap_index },
- { 19829, Uniform2iv_remap_index },
- { 889, Uniform3f_remap_index },
- { 36771, Uniform3fv_remap_index },
- { 802, Uniform3i_remap_index },
- { 38103, Uniform3iv_remap_index },
- { 4419, Uniform4f_remap_index },
- { 8585, Uniform4fv_remap_index },
- { 4356, Uniform4i_remap_index },
- { 43888, Uniform4iv_remap_index },
- { 9777, UniformMatrix2fv_remap_index },
- { 22546, UniformMatrix3fv_remap_index },
- { 10246, UniformMatrix4fv_remap_index },
- { 39345, UseProgram_remap_index },
- { 23991, ValidateProgram_remap_index },
- { 17897, VertexAttrib1d_remap_index },
- { 37129, VertexAttrib1dv_remap_index },
- { 18020, VertexAttrib1s_remap_index },
- { 34061, VertexAttrib1sv_remap_index },
- { 7846, VertexAttrib2d_remap_index },
- { 23311, VertexAttrib2dv_remap_index },
- { 7758, VertexAttrib2s_remap_index },
- { 14067, VertexAttrib2sv_remap_index },
- { 11678, VertexAttrib3d_remap_index },
- { 21824, VertexAttrib3dv_remap_index },
- { 11553, VertexAttrib3s_remap_index },
- { 39008, VertexAttrib3sv_remap_index },
- { 11801, VertexAttrib4Nbv_remap_index },
- { 27756, VertexAttrib4Niv_remap_index },
- { 20165, VertexAttrib4Nsv_remap_index },
- { 1439, VertexAttrib4Nub_remap_index },
- { 32443, VertexAttrib4Nubv_remap_index },
- { 10320, VertexAttrib4Nuiv_remap_index },
- { 34802, VertexAttrib4Nusv_remap_index },
- { 9104, VertexAttrib4bv_remap_index },
- { 28019, VertexAttrib4d_remap_index },
- { 28396, VertexAttrib4dv_remap_index },
- { 38215, VertexAttrib4iv_remap_index },
- { 28087, VertexAttrib4s_remap_index },
- { 18861, VertexAttrib4sv_remap_index },
- { 10006, VertexAttrib4ubv_remap_index },
- { 20120, VertexAttrib4uiv_remap_index },
- { 1365, VertexAttrib4usv_remap_index },
- { 32528, VertexAttribPointer_remap_index },
- { 29145, UniformMatrix2x3fv_remap_index },
- { 922, UniformMatrix2x4fv_remap_index },
- { 10293, UniformMatrix3x2fv_remap_index },
- { 42896, UniformMatrix3x4fv_remap_index },
- { 38560, UniformMatrix4x2fv_remap_index },
- { 11596, UniformMatrix4x3fv_remap_index },
- { 16401, BeginConditionalRender_remap_index },
- { 24075, BeginTransformFeedback_remap_index },
- { 12500, BindBufferBase_remap_index },
- { 7600, BindBufferRange_remap_index },
- { 22330, BindFragDataLocation_remap_index },
- { 23419, ClampColor_remap_index },
- { 16761, ClearBufferfi_remap_index },
- { 16610, ClearBufferfv_remap_index },
- { 20588, ClearBufferiv_remap_index },
- { 37927, ClearBufferuiv_remap_index },
- { 13135, ColorMaski_remap_index },
- { 5794, Disablei_remap_index },
- { 15015, Enablei_remap_index },
- { 22860, EndConditionalRender_remap_index },
- { 19406, EndTransformFeedback_remap_index },
- { 11989, GetBooleani_v_remap_index },
- { 39443, GetFragDataLocation_remap_index },
- { 20609, GetIntegeri_v_remap_index },
- { 28379, GetStringi_remap_index },
- { 30142, GetTexParameterIiv_remap_index },
- { 13331, GetTexParameterIuiv_remap_index },
- { 30356, GetTransformFeedbackVarying_remap_index },
- { 36072, GetUniformuiv_remap_index },
- { 43122, GetVertexAttribIiv_remap_index },
- { 20420, GetVertexAttribIuiv_remap_index },
- { 33519, IsEnabledi_remap_index },
- { 19645, TexParameterIiv_remap_index },
- { 16216, TexParameterIuiv_remap_index },
- { 38943, TransformFeedbackVaryings_remap_index },
- { 5462, Uniform1ui_remap_index },
- { 25530, Uniform1uiv_remap_index },
- { 24904, Uniform2ui_remap_index },
- { 13177, Uniform2uiv_remap_index },
- { 32780, Uniform3ui_remap_index },
- { 18920, Uniform3uiv_remap_index },
- { 11912, Uniform4ui_remap_index },
- { 17843, Uniform4uiv_remap_index },
- { 35148, VertexAttribI1iv_remap_index },
- { 11404, VertexAttribI1uiv_remap_index },
- { 7429, VertexAttribI4bv_remap_index },
- { 10157, VertexAttribI4sv_remap_index },
- { 8385, VertexAttribI4ubv_remap_index },
- { 6888, VertexAttribI4usv_remap_index },
- { 40279, VertexAttribIPointer_remap_index },
- { 8332, PrimitiveRestartIndex_remap_index },
- { 33733, TexBuffer_remap_index },
+ { 36445, BindAttribLocation_remap_index },
+ { 41883, BlendEquationSeparate_remap_index },
+ { 31848, CompileShader_remap_index },
+ { 14380, CreateProgram_remap_index },
+ { 30655, CreateShader_remap_index },
+ { 20263, DeleteProgram_remap_index },
+ { 31830, DeleteShader_remap_index },
+ { 43712, DetachShader_remap_index },
+ { 34228, DisableVertexAttribArray_remap_index },
+ { 22736, DrawBuffers_remap_index },
+ { 42108, EnableVertexAttribArray_remap_index },
+ { 37157, GetActiveAttrib_remap_index },
+ { 42592, GetActiveUniform_remap_index },
+ { 17367, GetAttachedShaders_remap_index },
+ { 27048, GetAttribLocation_remap_index },
+ { 11114, GetProgramInfoLog_remap_index },
+ { 22471, GetProgramiv_remap_index },
+ { 3766, GetShaderInfoLog_remap_index },
+ { 7229, GetShaderSource_remap_index },
+ { 17103, GetShaderiv_remap_index },
+ { 6153, GetUniformLocation_remap_index },
+ { 13100, GetUniformfv_remap_index },
+ { 2134, GetUniformiv_remap_index },
+ { 34954, GetVertexAttribPointerv_remap_index },
+ { 41633, GetVertexAttribdv_remap_index },
+ { 35613, GetVertexAttribfv_remap_index },
+ { 38243, GetVertexAttribiv_remap_index },
+ { 4219, IsProgram_remap_index },
+ { 38790, IsShader_remap_index },
+ { 28850, LinkProgram_remap_index },
+ { 37886, ShaderSource_remap_index },
+ { 37858, StencilFuncSeparate_remap_index },
+ { 35935, StencilMaskSeparate_remap_index },
+ { 37337, StencilOpSeparate_remap_index },
+ { 40882, Uniform1f_remap_index },
+ { 8087, Uniform1fv_remap_index },
+ { 40958, Uniform1i_remap_index },
+ { 18426, Uniform1iv_remap_index },
+ { 43263, Uniform2f_remap_index },
+ { 22637, Uniform2fv_remap_index },
+ { 43352, Uniform2i_remap_index },
+ { 20505, Uniform2iv_remap_index },
+ { 916, Uniform3f_remap_index },
+ { 38355, Uniform3fv_remap_index },
+ { 836, Uniform3i_remap_index },
+ { 39729, Uniform3iv_remap_index },
+ { 4530, Uniform4f_remap_index },
+ { 8809, Uniform4fv_remap_index },
+ { 4477, Uniform4i_remap_index },
+ { 45818, Uniform4iv_remap_index },
+ { 10057, UniformMatrix2fv_remap_index },
+ { 23388, UniformMatrix3fv_remap_index },
+ { 10597, UniformMatrix4fv_remap_index },
+ { 41060, UseProgram_remap_index },
+ { 24860, ValidateProgram_remap_index },
+ { 18514, VertexAttrib1d_remap_index },
+ { 38713, VertexAttrib1dv_remap_index },
+ { 18637, VertexAttrib1s_remap_index },
+ { 35461, VertexAttrib1sv_remap_index },
+ { 8045, VertexAttrib2d_remap_index },
+ { 24153, VertexAttrib2dv_remap_index },
+ { 7957, VertexAttrib2s_remap_index },
+ { 14513, VertexAttrib2sv_remap_index },
+ { 12029, VertexAttrib3d_remap_index },
+ { 22561, VertexAttrib3dv_remap_index },
+ { 11904, VertexAttrib3s_remap_index },
+ { 40707, VertexAttrib3sv_remap_index },
+ { 12152, VertexAttrib4Nbv_remap_index },
+ { 28746, VertexAttrib4Niv_remap_index },
+ { 20841, VertexAttrib4Nsv_remap_index },
+ { 1466, VertexAttrib4Nub_remap_index },
+ { 33733, VertexAttrib4Nubv_remap_index },
+ { 10671, VertexAttrib4Nuiv_remap_index },
+ { 36243, VertexAttrib4Nusv_remap_index },
+ { 9328, VertexAttrib4bv_remap_index },
+ { 29036, VertexAttrib4d_remap_index },
+ { 29431, VertexAttrib4dv_remap_index },
+ { 39841, VertexAttrib4iv_remap_index },
+ { 29104, VertexAttrib4s_remap_index },
+ { 19505, VertexAttrib4sv_remap_index },
+ { 10311, VertexAttrib4ubv_remap_index },
+ { 20796, VertexAttrib4uiv_remap_index },
+ { 1392, VertexAttrib4usv_remap_index },
+ { 33827, VertexAttribPointer_remap_index },
+ { 30202, UniformMatrix2x3fv_remap_index },
+ { 949, UniformMatrix2x4fv_remap_index },
+ { 10644, UniformMatrix3x2fv_remap_index },
+ { 44761, UniformMatrix3x4fv_remap_index },
+ { 40215, UniformMatrix4x2fv_remap_index },
+ { 11947, UniformMatrix4x3fv_remap_index },
+ { 17009, BeginConditionalRender_remap_index },
+ { 24944, BeginTransformFeedback_remap_index },
+ { 7869, BindBufferBase_remap_index },
+ { 7757, BindBufferRange_remap_index },
+ { 23119, BindFragDataLocation_remap_index },
+ { 24261, ClampColor_remap_index },
+ { 17394, ClearBufferfi_remap_index },
+ { 17218, ClearBufferfv_remap_index },
+ { 34674, ClearBufferiv_remap_index },
+ { 39553, ClearBufferuiv_remap_index },
+ { 13490, ColorMaski_remap_index },
+ { 5931, Disablei_remap_index },
+ { 15543, Enablei_remap_index },
+ { 23702, EndConditionalRender_remap_index },
+ { 20068, EndTransformFeedback_remap_index },
+ { 12340, GetBooleani_v_remap_index },
+ { 41158, GetFragDataLocation_remap_index },
+ { 21264, GetIntegeri_v_remap_index },
+ { 29396, GetStringi_remap_index },
+ { 31316, GetTexParameterIiv_remap_index },
+ { 13686, GetTexParameterIuiv_remap_index },
+ { 31530, GetTransformFeedbackVarying_remap_index },
+ { 37656, GetUniformuiv_remap_index },
+ { 44996, GetVertexAttribIiv_remap_index },
+ { 21096, GetVertexAttribIuiv_remap_index },
+ { 34869, IsEnabledi_remap_index },
+ { 20321, TexParameterIiv_remap_index },
+ { 16824, TexParameterIuiv_remap_index },
+ { 40642, TransformFeedbackVaryings_remap_index },
+ { 5599, Uniform1ui_remap_index },
+ { 26453, Uniform1uiv_remap_index },
+ { 25781, Uniform2ui_remap_index },
+ { 13532, Uniform2uiv_remap_index },
+ { 34122, Uniform3ui_remap_index },
+ { 19564, Uniform3uiv_remap_index },
+ { 12263, Uniform4ui_remap_index },
+ { 18460, Uniform4uiv_remap_index },
+ { 36732, VertexAttribI1iv_remap_index },
+ { 11755, VertexAttribI1uiv_remap_index },
+ { 7586, VertexAttribI4bv_remap_index },
+ { 10508, VertexAttribI4sv_remap_index },
+ { 8609, VertexAttribI4ubv_remap_index },
+ { 7045, VertexAttribI4usv_remap_index },
+ { 42052, VertexAttribIPointer_remap_index },
+ { 8556, PrimitiveRestartIndex_remap_index },
+ { 35083, TexBuffer_remap_index },
{ 111, FramebufferTexture_remap_index },
- { 23825, GetBufferParameteri64v_remap_index },
- { 39611, GetInteger64i_v_remap_index },
- { 40593, VertexAttribDivisor_remap_index },
- { 43571, MinSampleShading_remap_index },
- { 7117, BindProgramARB_remap_index },
- { 30841, DeleteProgramsARB_remap_index },
- { 15102, GenProgramsARB_remap_index },
- { 14110, GetProgramEnvParameterdvARB_remap_index },
- { 29583, GetProgramEnvParameterfvARB_remap_index },
- { 31020, GetProgramLocalParameterdvARB_remap_index },
- { 37510, GetProgramLocalParameterfvARB_remap_index },
- { 22475, GetProgramStringARB_remap_index },
- { 8218, GetProgramivARB_remap_index },
- { 31342, IsProgramARB_remap_index },
- { 17215, ProgramEnvParameter4dARB_remap_index },
- { 2660, ProgramEnvParameter4dvARB_remap_index },
- { 38711, ProgramEnvParameter4fARB_remap_index },
- { 24580, ProgramEnvParameter4fvARB_remap_index },
- { 22910, ProgramLocalParameter4dARB_remap_index },
- { 3995, ProgramLocalParameter4dvARB_remap_index },
- { 30572, ProgramLocalParameter4fARB_remap_index },
- { 19208, ProgramLocalParameter4fvARB_remap_index },
- { 31414, ProgramStringARB_remap_index },
- { 11948, VertexAttrib1fARB_remap_index },
- { 31837, VertexAttrib1fvARB_remap_index },
- { 22124, VertexAttrib2fARB_remap_index },
- { 13428, VertexAttrib2fvARB_remap_index },
+ { 24696, GetBufferParameteri64v_remap_index },
+ { 18146, GetInteger64i_v_remap_index },
+ { 42401, VertexAttribDivisor_remap_index },
+ { 45478, MinSampleShading_remap_index },
+ { 7274, BindProgramARB_remap_index },
+ { 32042, DeleteProgramsARB_remap_index },
+ { 15630, GenProgramsARB_remap_index },
+ { 14556, GetProgramEnvParameterdvARB_remap_index },
+ { 30731, GetProgramEnvParameterfvARB_remap_index },
+ { 32221, GetProgramLocalParameterdvARB_remap_index },
+ { 39105, GetProgramLocalParameterfvARB_remap_index },
+ { 23317, GetProgramStringARB_remap_index },
+ { 8442, GetProgramivARB_remap_index },
+ { 32572, IsProgramARB_remap_index },
+ { 17848, ProgramEnvParameter4dARB_remap_index },
+ { 2735, ProgramEnvParameter4dvARB_remap_index },
+ { 40410, ProgramEnvParameter4fARB_remap_index },
+ { 25449, ProgramEnvParameter4fvARB_remap_index },
+ { 23752, ProgramLocalParameter4dARB_remap_index },
+ { 4081, ProgramLocalParameter4dvARB_remap_index },
+ { 31746, ProgramLocalParameter4fARB_remap_index },
+ { 19852, ProgramLocalParameter4fvARB_remap_index },
+ { 32644, ProgramStringARB_remap_index },
+ { 12299, VertexAttrib1fARB_remap_index },
+ { 33055, VertexAttrib1fvARB_remap_index },
+ { 22913, VertexAttrib2fARB_remap_index },
+ { 13783, VertexAttrib2fvARB_remap_index },
{ 334, VertexAttrib3fARB_remap_index },
- { 26382, VertexAttrib3fvARB_remap_index },
- { 25264, VertexAttrib4fARB_remap_index },
- { 14402, VertexAttrib4fvARB_remap_index },
- { 35859, AttachObjectARB_remap_index },
- { 22519, CreateProgramObjectARB_remap_index },
- { 16659, CreateShaderObjectARB_remap_index },
- { 15487, DeleteObjectARB_remap_index },
- { 38355, DetachObjectARB_remap_index },
- { 36198, GetAttachedObjectsARB_remap_index },
- { 24785, GetHandleARB_remap_index },
- { 20537, GetInfoLogARB_remap_index },
- { 21342, GetObjectParameterfvARB_remap_index },
- { 41984, GetObjectParameterivARB_remap_index },
- { 5574, DrawArraysInstancedARB_remap_index },
- { 7296, DrawElementsInstancedARB_remap_index },
- { 13891, BindFramebuffer_remap_index },
- { 8241, BindRenderbuffer_remap_index },
- { 33919, BlitFramebuffer_remap_index },
- { 6287, CheckFramebufferStatus_remap_index },
- { 20021, DeleteFramebuffers_remap_index },
- { 37053, DeleteRenderbuffers_remap_index },
- { 31252, FramebufferRenderbuffer_remap_index },
- { 33970, FramebufferTexture1D_remap_index },
- { 23200, FramebufferTexture2D_remap_index },
- { 27010, FramebufferTexture3D_remap_index },
- { 37324, FramebufferTextureLayer_remap_index },
- { 39979, GenFramebuffers_remap_index },
- { 33398, GenRenderbuffers_remap_index },
- { 7540, GenerateMipmap_remap_index },
- { 5270, GetFramebufferAttachmentParameteriv_remap_index },
- { 43615, GetRenderbufferParameteriv_remap_index },
- { 6451, IsFramebuffer_remap_index },
- { 25612, IsRenderbuffer_remap_index },
- { 629, RenderbufferStorage_remap_index },
- { 14885, RenderbufferStorageMultisample_remap_index },
- { 19111, FramebufferTextureFaceARB_remap_index },
- { 5197, FlushMappedBufferRange_remap_index },
- { 31057, MapBufferRange_remap_index },
- { 13270, BindVertexArray_remap_index },
- { 1133, DeleteVertexArrays_remap_index },
- { 17536, GenVertexArrays_remap_index },
- { 39051, IsVertexArray_remap_index },
- { 13050, GetActiveUniformBlockName_remap_index },
- { 43389, GetActiveUniformBlockiv_remap_index },
- { 3106, GetActiveUniformName_remap_index },
- { 14038, GetActiveUniformsiv_remap_index },
- { 41844, GetUniformBlockIndex_remap_index },
- { 10417, GetUniformIndices_remap_index },
- { 34759, UniformBlockBinding_remap_index },
- { 42851, CopyBufferSubData_remap_index },
- { 43172, ClientWaitSync_remap_index },
- { 11280, DeleteSync_remap_index },
- { 34786, FenceSync_remap_index },
- { 38335, GetInteger64v_remap_index },
- { 40449, GetSynciv_remap_index },
- { 15508, IsSync_remap_index },
- { 33588, WaitSync_remap_index },
- { 13085, DrawElementsBaseVertex_remap_index },
- { 16849, DrawElementsInstancedBaseVertex_remap_index },
- { 37581, DrawRangeElementsBaseVertex_remap_index },
- { 41543, MultiDrawElementsBaseVertex_remap_index },
- { 24325, ProvokingVertex_remap_index },
- { 5519, GetMultisamplefv_remap_index },
- { 35255, SampleMaski_remap_index },
- { 1944, TexImage2DMultisample_remap_index },
- { 41787, TexImage3DMultisample_remap_index },
- { 22988, BlendEquationSeparateiARB_remap_index },
- { 27503, BlendEquationiARB_remap_index },
- { 3732, BlendFuncSeparateiARB_remap_index },
- { 24821, BlendFunciARB_remap_index },
- { 1686, BindFragDataLocationIndexed_remap_index },
- { 28968, GetFragDataIndex_remap_index },
- { 2827, BindSampler_remap_index },
- { 42982, DeleteSamplers_remap_index },
- { 35802, GenSamplers_remap_index },
- { 2527, GetSamplerParameterIiv_remap_index },
- { 5763, GetSamplerParameterIuiv_remap_index },
- { 23282, GetSamplerParameterfv_remap_index },
- { 24997, GetSamplerParameteriv_remap_index },
- { 26235, IsSampler_remap_index },
- { 8645, SamplerParameterIiv_remap_index },
- { 12339, SamplerParameterIuiv_remap_index },
- { 43056, SamplerParameterf_remap_index },
- { 38655, SamplerParameterfv_remap_index },
- { 43003, SamplerParameteri_remap_index },
- { 28243, SamplerParameteriv_remap_index },
- { 23369, GetQueryObjecti64v_remap_index },
- { 4047, GetQueryObjectui64v_remap_index },
- { 12925, QueryCounter_remap_index },
- { 37911, ColorP3ui_remap_index },
- { 6606, ColorP3uiv_remap_index },
- { 17656, ColorP4ui_remap_index },
- { 25977, ColorP4uiv_remap_index },
- { 13794, MultiTexCoordP1ui_remap_index },
- { 25747, MultiTexCoordP1uiv_remap_index },
- { 34143, MultiTexCoordP2ui_remap_index },
- { 8958, MultiTexCoordP2uiv_remap_index },
- { 26065, MultiTexCoordP3ui_remap_index },
- { 391, MultiTexCoordP3uiv_remap_index },
- { 40254, MultiTexCoordP4ui_remap_index },
- { 34261, MultiTexCoordP4uiv_remap_index },
- { 36391, NormalP3ui_remap_index },
- { 25672, NormalP3uiv_remap_index },
- { 41140, SecondaryColorP3ui_remap_index },
- { 5711, SecondaryColorP3uiv_remap_index },
+ { 27340, VertexAttrib3fvARB_remap_index },
+ { 26170, VertexAttrib4fARB_remap_index },
+ { 14930, VertexAttrib4fvARB_remap_index },
+ { 37443, AttachObjectARB_remap_index },
+ { 23361, CreateProgramObjectARB_remap_index },
+ { 17292, CreateShaderObjectARB_remap_index },
+ { 16015, DeleteObjectARB_remap_index },
+ { 40010, DetachObjectARB_remap_index },
+ { 37782, GetAttachedObjectsARB_remap_index },
+ { 20119, GetHandleARB_remap_index },
+ { 21213, GetInfoLogARB_remap_index },
+ { 22048, GetObjectParameterfvARB_remap_index },
+ { 43825, GetObjectParameterivARB_remap_index },
+ { 5711, DrawArraysInstancedARB_remap_index },
+ { 7453, DrawElementsInstancedARB_remap_index },
+ { 14337, BindFramebuffer_remap_index },
+ { 8465, BindRenderbuffer_remap_index },
+ { 35269, BlitFramebuffer_remap_index },
+ { 6424, CheckFramebufferStatus_remap_index },
+ { 20697, DeleteFramebuffers_remap_index },
+ { 38637, DeleteRenderbuffers_remap_index },
+ { 32482, FramebufferRenderbuffer_remap_index },
+ { 35345, FramebufferTexture1D_remap_index },
+ { 24042, FramebufferTexture2D_remap_index },
+ { 28000, FramebufferTexture3D_remap_index },
+ { 38919, FramebufferTextureLayer_remap_index },
+ { 41752, GenFramebuffers_remap_index },
+ { 34748, GenRenderbuffers_remap_index },
+ { 7697, GenerateMipmap_remap_index },
+ { 5407, GetFramebufferAttachmentParameteriv_remap_index },
+ { 45522, GetRenderbufferParameteriv_remap_index },
+ { 6608, IsFramebuffer_remap_index },
+ { 26535, IsRenderbuffer_remap_index },
+ { 663, RenderbufferStorage_remap_index },
+ { 15413, RenderbufferStorageMultisample_remap_index },
+ { 19755, FramebufferTextureFaceARB_remap_index },
+ { 5334, FlushMappedBufferRange_remap_index },
+ { 32287, MapBufferRange_remap_index },
+ { 13625, BindVertexArray_remap_index },
+ { 1160, DeleteVertexArrays_remap_index },
+ { 41326, GenVertexArrays_remap_index },
+ { 40750, IsVertexArray_remap_index },
+ { 13405, GetActiveUniformBlockName_remap_index },
+ { 45296, GetActiveUniformBlockiv_remap_index },
+ { 21585, GetActiveUniformName_remap_index },
+ { 14484, GetActiveUniformsiv_remap_index },
+ { 43685, GetUniformBlockIndex_remap_index },
+ { 10768, GetUniformIndices_remap_index },
+ { 36159, UniformBlockBinding_remap_index },
+ { 44716, CopyBufferSubData_remap_index },
+ { 45046, ClientWaitSync_remap_index },
+ { 11631, DeleteSync_remap_index },
+ { 36186, FenceSync_remap_index },
+ { 39990, GetInteger64v_remap_index },
+ { 42257, GetSynciv_remap_index },
+ { 16071, IsSync_remap_index },
+ { 34938, WaitSync_remap_index },
+ { 13440, DrawElementsBaseVertex_remap_index },
+ { 17482, DrawElementsInstancedBaseVertex_remap_index },
+ { 39174, DrawRangeElementsBaseVertex_remap_index },
+ { 43384, MultiDrawElementsBaseVertex_remap_index },
+ { 25194, ProvokingVertex_remap_index },
+ { 5656, GetMultisamplefv_remap_index },
+ { 36839, SampleMaski_remap_index },
+ { 2006, TexImage2DMultisample_remap_index },
+ { 43628, TexImage3DMultisample_remap_index },
+ { 23830, BlendEquationSeparateiARB_remap_index },
+ { 28493, BlendEquationiARB_remap_index },
+ { 3818, BlendFuncSeparateiARB_remap_index },
+ { 25698, BlendFunciARB_remap_index },
+ { 1713, BindFragDataLocationIndexed_remap_index },
+ { 30025, GetFragDataIndex_remap_index },
+ { 2902, BindSampler_remap_index },
+ { 44847, DeleteSamplers_remap_index },
+ { 37386, GenSamplers_remap_index },
+ { 2602, GetSamplerParameterIiv_remap_index },
+ { 5900, GetSamplerParameterIuiv_remap_index },
+ { 24124, GetSamplerParameterfv_remap_index },
+ { 25874, GetSamplerParameteriv_remap_index },
+ { 27193, IsSampler_remap_index },
+ { 8869, SamplerParameterIiv_remap_index },
+ { 12690, SamplerParameterIuiv_remap_index },
+ { 30251, SamplerParameterf_remap_index },
+ { 40310, SamplerParameterfv_remap_index },
+ { 44868, SamplerParameteri_remap_index },
+ { 29260, SamplerParameteriv_remap_index },
+ { 24211, GetQueryObjecti64v_remap_index },
+ { 4141, GetQueryObjectui64v_remap_index },
+ { 13247, QueryCounter_remap_index },
+ { 39537, ColorP3ui_remap_index },
+ { 6763, ColorP3uiv_remap_index },
+ { 18246, ColorP4ui_remap_index },
+ { 26935, ColorP4uiv_remap_index },
+ { 14184, MultiTexCoordP1ui_remap_index },
+ { 26670, MultiTexCoordP1uiv_remap_index },
+ { 35543, MultiTexCoordP2ui_remap_index },
+ { 9182, MultiTexCoordP2uiv_remap_index },
+ { 27023, MultiTexCoordP3ui_remap_index },
+ { 425, MultiTexCoordP3uiv_remap_index },
+ { 42027, MultiTexCoordP4ui_remap_index },
+ { 35661, MultiTexCoordP4uiv_remap_index },
+ { 37975, NormalP3ui_remap_index },
+ { 26595, NormalP3uiv_remap_index },
+ { 42964, SecondaryColorP3ui_remap_index },
+ { 5848, SecondaryColorP3uiv_remap_index },
{ 162, TexCoordP1ui_remap_index },
- { 609, TexCoordP1uiv_remap_index },
- { 26341, TexCoordP2ui_remap_index },
- { 36707, TexCoordP2uiv_remap_index },
- { 14760, TexCoordP3ui_remap_index },
- { 17699, TexCoordP3uiv_remap_index },
- { 34042, TexCoordP4ui_remap_index },
- { 1769, TexCoordP4uiv_remap_index },
- { 14829, VertexAttribP1ui_remap_index },
- { 4099, VertexAttribP1uiv_remap_index },
- { 29755, VertexAttribP2ui_remap_index },
- { 4893, VertexAttribP2uiv_remap_index },
- { 1487, VertexAttribP3ui_remap_index },
- { 28269, VertexAttribP3uiv_remap_index },
- { 4331, VertexAttribP4ui_remap_index },
- { 16039, VertexAttribP4uiv_remap_index },
- { 34884, VertexP2ui_remap_index },
- { 32510, VertexP2uiv_remap_index },
- { 22502, VertexP3ui_remap_index },
- { 5998, VertexP3uiv_remap_index },
- { 3061, VertexP4ui_remap_index },
- { 43553, VertexP4uiv_remap_index },
- { 777, DrawArraysIndirect_remap_index },
- { 23532, DrawElementsIndirect_remap_index },
- { 10789, BindTransformFeedback_remap_index },
- { 10661, DeleteTransformFeedbacks_remap_index },
- { 35417, DrawTransformFeedback_remap_index },
- { 3889, GenTransformFeedbacks_remap_index },
- { 33032, IsTransformFeedback_remap_index },
- { 30629, PauseTransformFeedback_remap_index },
- { 35083, ResumeTransformFeedback_remap_index },
- { 22418, BeginQueryIndexed_remap_index },
- { 40644, DrawTransformFeedbackStream_remap_index },
- { 19010, EndQueryIndexed_remap_index },
- { 21690, GetQueryIndexediv_remap_index },
- { 43519, ClearDepthf_remap_index },
- { 23891, DepthRangef_remap_index },
- { 37949, GetShaderPrecisionFormat_remap_index },
- { 3161, ReleaseShaderCompiler_remap_index },
- { 25135, ShaderBinary_remap_index },
- { 19483, GetProgramBinary_remap_index },
- { 11846, ProgramBinary_remap_index },
- { 12081, ProgramParameteri_remap_index },
- { 26731, DepthRangeArrayv_remap_index },
- { 41609, DepthRangeIndexed_remap_index },
- { 33012, GetDoublei_v_remap_index },
- { 35273, GetFloati_v_remap_index },
- { 42050, ScissorArrayv_remap_index },
- { 24938, ScissorIndexed_remap_index },
- { 28295, ScissorIndexedv_remap_index },
- { 18451, ViewportArrayv_remap_index },
- { 31531, ViewportIndexedf_remap_index },
- { 19531, ViewportIndexedfv_remap_index },
- { 8432, GetGraphicsResetStatusARB_remap_index },
- { 29898, GetnColorTableARB_remap_index },
- { 2793, GetnCompressedTexImageARB_remap_index },
- { 1233, GetnConvolutionFilterARB_remap_index },
- { 4767, GetnHistogramARB_remap_index },
- { 18336, GetnMapdvARB_remap_index },
- { 12230, GetnMapfvARB_remap_index },
- { 34168, GetnMapivARB_remap_index },
- { 38823, GetnMinmaxARB_remap_index },
- { 3585, GetnPixelMapfvARB_remap_index },
- { 5737, GetnPixelMapuivARB_remap_index },
- { 11527, GetnPixelMapusvARB_remap_index },
- { 22032, GetnPolygonStippleARB_remap_index },
- { 28736, GetnSeparableFilterARB_remap_index },
- { 10051, GetnTexImageARB_remap_index },
- { 27835, GetnUniformdvARB_remap_index },
- { 33830, GetnUniformfvARB_remap_index },
- { 3136, GetnUniformivARB_remap_index },
- { 13654, GetnUniformuivARB_remap_index },
- { 25308, ReadnPixelsARB_remap_index },
- { 32683, DrawArraysInstancedBaseInstance_remap_index },
- { 10202, DrawElementsInstancedBaseInstance_remap_index },
- { 2605, DrawElementsInstancedBaseVertexBaseInstance_remap_index },
- { 35026, DrawTransformFeedbackInstanced_remap_index },
- { 13383, DrawTransformFeedbackStreamInstanced_remap_index },
- { 42071, GetInternalformativ_remap_index },
- { 19606, GetActiveAtomicCounterBufferiv_remap_index },
- { 43491, BindImageTexture_remap_index },
- { 21255, MemoryBarrier_remap_index },
- { 33898, TexStorage1D_remap_index },
- { 23142, TexStorage2D_remap_index },
- { 26987, TexStorage3D_remap_index },
- { 1410, TextureStorage1DEXT_remap_index },
- { 34970, TextureStorage2DEXT_remap_index },
- { 22093, TextureStorage3DEXT_remap_index },
- { 35677, ClearBufferData_remap_index },
- { 2112, ClearBufferSubData_remap_index },
- { 31100, DispatchCompute_remap_index },
- { 6371, DispatchComputeIndirect_remap_index },
- { 35717, CopyImageSubData_remap_index },
- { 40468, TextureView_remap_index },
- { 21584, BindVertexBuffer_remap_index },
- { 29460, VertexAttribBinding_remap_index },
- { 29925, VertexAttribFormat_remap_index },
- { 32624, VertexAttribIFormat_remap_index },
- { 36246, VertexAttribLFormat_remap_index },
- { 34695, VertexBindingDivisor_remap_index },
- { 3299, MultiDrawArraysIndirect_remap_index },
- { 18061, MultiDrawElementsIndirect_remap_index },
- { 17996, TexBufferRange_remap_index },
- { 38137, TexStorage2DMultisample_remap_index },
- { 28188, TexStorage3DMultisample_remap_index },
- { 3331, BufferStorage_remap_index },
- { 38587, ClearTexImage_remap_index },
- { 13018, ClearTexSubImage_remap_index },
- { 4194, BindBuffersBase_remap_index },
- { 14375, BindBuffersRange_remap_index },
- { 10636, BindImageTextures_remap_index },
- { 2773, BindSamplers_remap_index },
- { 41165, BindTextures_remap_index },
- { 24970, BindVertexBuffers_remap_index },
- { 35820, ClipControl_remap_index },
- { 6400, InvalidateBufferData_remap_index },
- { 38529, InvalidateBufferSubData_remap_index },
- { 21215, InvalidateFramebuffer_remap_index },
- { 15776, InvalidateSubFramebuffer_remap_index },
- { 11887, InvalidateTexImage_remap_index },
- { 25335, InvalidateTexSubImage_remap_index },
- { 12677, PolygonOffsetEXT_remap_index },
- { 35838, DrawTexfOES_remap_index },
- { 24803, DrawTexfvOES_remap_index },
- { 986, DrawTexiOES_remap_index },
- { 29834, DrawTexivOES_remap_index },
- { 12034, DrawTexsOES_remap_index },
- { 21409, DrawTexsvOES_remap_index },
- { 25994, DrawTexxOES_remap_index },
- { 37777, DrawTexxvOES_remap_index },
- { 24216, PointSizePointerOES_remap_index },
- { 949, QueryMatrixxOES_remap_index },
- { 19074, SampleMaskSGIS_remap_index },
- { 32738, SamplePatternSGIS_remap_index },
- { 41471, ColorPointerEXT_remap_index },
- { 27397, EdgeFlagPointerEXT_remap_index },
- { 12754, IndexPointerEXT_remap_index },
- { 12944, NormalPointerEXT_remap_index },
- { 26796, TexCoordPointerEXT_remap_index },
- { 24033, VertexPointerEXT_remap_index },
- { 41410, DiscardFramebufferEXT_remap_index },
- { 10585, ActiveShaderProgram_remap_index },
- { 15989, BindProgramPipeline_remap_index },
- { 27449, CreateShaderProgramv_remap_index },
- { 3483, DeleteProgramPipelines_remap_index },
- { 25026, GenProgramPipelines_remap_index },
- { 7922, GetProgramPipelineInfoLog_remap_index },
- { 30001, GetProgramPipelineiv_remap_index },
- { 25089, IsProgramPipeline_remap_index },
- { 43369, LockArraysEXT_remap_index },
- { 42687, ProgramUniform1f_remap_index },
- { 9373, ProgramUniform1fv_remap_index },
- { 42641, ProgramUniform1i_remap_index },
- { 14615, ProgramUniform1iv_remap_index },
- { 33188, ProgramUniform1ui_remap_index },
- { 42489, ProgramUniform1uiv_remap_index },
- { 2251, ProgramUniform2f_remap_index },
- { 17410, ProgramUniform2fv_remap_index },
- { 2334, ProgramUniform2i_remap_index },
- { 20654, ProgramUniform2iv_remap_index },
- { 6967, ProgramUniform2ui_remap_index },
- { 8766, ProgramUniform2uiv_remap_index },
- { 4453, ProgramUniform3f_remap_index },
- { 29017, ProgramUniform3fv_remap_index },
- { 4501, ProgramUniform3i_remap_index },
- { 12969, ProgramUniform3iv_remap_index },
- { 14664, ProgramUniform3ui_remap_index },
- { 17359, ProgramUniform3uiv_remap_index },
- { 27894, ProgramUniform4f_remap_index },
- { 32225, ProgramUniform4fv_remap_index },
- { 27943, ProgramUniform4i_remap_index },
- { 1848, ProgramUniform4iv_remap_index },
- { 39132, ProgramUniform4ui_remap_index },
- { 31985, ProgramUniform4uiv_remap_index },
- { 19146, ProgramUniformMatrix2fv_remap_index },
- { 21518, ProgramUniformMatrix2x3fv_remap_index },
- { 7646, ProgramUniformMatrix2x4fv_remap_index },
- { 37431, ProgramUniformMatrix3fv_remap_index },
- { 32946, ProgramUniformMatrix3x2fv_remap_index },
- { 26425, ProgramUniformMatrix3x4fv_remap_index },
- { 31169, ProgramUniformMatrix4fv_remap_index },
- { 2185, ProgramUniformMatrix4x2fv_remap_index },
- { 7210, ProgramUniformMatrix4x3fv_remap_index },
- { 38171, UnlockArraysEXT_remap_index },
- { 31123, UseProgramStages_remap_index },
- { 1628, ValidateProgramPipeline_remap_index },
- { 16065, DebugMessageCallback_remap_index },
- { 31624, DebugMessageControl_remap_index },
- { 15346, DebugMessageInsert_remap_index },
- { 6770, GetDebugMessageLog_remap_index },
- { 6561, GetObjectLabel_remap_index },
- { 12055, GetObjectPtrLabel_remap_index },
- { 30609, ObjectLabel_remap_index },
- { 43456, ObjectPtrLabel_remap_index },
- { 17879, PopDebugGroup_remap_index },
- { 32362, PushDebugGroup_remap_index },
- { 8286, SecondaryColor3fEXT_remap_index },
- { 7800, SecondaryColor3fvEXT_remap_index },
- { 28686, MultiDrawElementsEXT_remap_index },
- { 10717, FogCoordfEXT_remap_index },
- { 18096, FogCoordfvEXT_remap_index },
- { 4172, ResizeBuffersMESA_remap_index },
- { 34104, WindowPos4dMESA_remap_index },
- { 27294, WindowPos4dvMESA_remap_index },
- { 4281, WindowPos4fMESA_remap_index },
- { 11296, WindowPos4fvMESA_remap_index },
- { 9056, WindowPos4iMESA_remap_index },
- { 3658, WindowPos4ivMESA_remap_index },
- { 28063, WindowPos4sMESA_remap_index },
- { 1080, WindowPos4svMESA_remap_index },
- { 28786, MultiModeDrawArraysIBM_remap_index },
- { 19794, MultiModeDrawElementsIBM_remap_index },
- { 32857, AreProgramsResidentNV_remap_index },
- { 39806, ExecuteProgramNV_remap_index },
- { 29551, GetProgramParameterdvNV_remap_index },
- { 36453, GetProgramParameterfvNV_remap_index },
- { 19243, GetProgramStringNV_remap_index },
- { 15700, GetProgramivNV_remap_index },
- { 18381, GetTrackMatrixivNV_remap_index },
- { 18823, GetVertexAttribdvNV_remap_index },
- { 16986, GetVertexAttribfvNV_remap_index },
- { 15882, GetVertexAttribivNV_remap_index },
- { 36176, LoadProgramNV_remap_index },
- { 19894, ProgramParameters4dvNV_remap_index },
- { 20506, ProgramParameters4fvNV_remap_index },
- { 6182, RequestResidentProgramsNV_remap_index },
- { 29172, TrackMatrixNV_remap_index },
- { 14145, VertexAttrib1dNV_remap_index },
- { 28131, VertexAttrib1dvNV_remap_index },
- { 28457, VertexAttrib1fNV_remap_index },
- { 41820, VertexAttrib1fvNV_remap_index },
- { 21074, VertexAttrib1sNV_remap_index },
- { 38191, VertexAttrib1svNV_remap_index },
- { 18357, VertexAttrib2dNV_remap_index },
- { 34388, VertexAttrib2dvNV_remap_index },
- { 27178, VertexAttrib2fNV_remap_index },
- { 25873, VertexAttrib2fvNV_remap_index },
- { 12850, VertexAttrib2sNV_remap_index },
- { 5687, VertexAttrib2svNV_remap_index },
- { 36862, VertexAttrib3dNV_remap_index },
- { 38785, VertexAttrib3dvNV_remap_index },
- { 4946, VertexAttrib3fNV_remap_index },
- { 41074, VertexAttrib3fvNV_remap_index },
- { 7154, VertexAttrib3sNV_remap_index },
- { 18408, VertexAttrib3svNV_remap_index },
- { 8488, VertexAttrib4dNV_remap_index },
- { 3408, VertexAttrib4dvNV_remap_index },
- { 8559, VertexAttrib4fNV_remap_index },
- { 41212, VertexAttrib4fvNV_remap_index },
- { 17494, VertexAttrib4sNV_remap_index },
- { 10901, VertexAttrib4svNV_remap_index },
- { 1601, VertexAttrib4ubNV_remap_index },
- { 10692, VertexAttrib4ubvNV_remap_index },
- { 28937, VertexAttribPointerNV_remap_index },
- { 27345, VertexAttribs1dvNV_remap_index },
- { 30900, VertexAttribs1fvNV_remap_index },
- { 6156, VertexAttribs1svNV_remap_index },
- { 42463, VertexAttribs2dvNV_remap_index },
- { 4305, VertexAttribs2fvNV_remap_index },
- { 27423, VertexAttribs2svNV_remap_index },
- { 1789, VertexAttribs3dvNV_remap_index },
- { 35445, VertexAttribs3fvNV_remap_index },
- { 14012, VertexAttribs3svNV_remap_index },
- { 19457, VertexAttribs4dvNV_remap_index },
- { 24367, VertexAttribs4fvNV_remap_index },
- { 20703, VertexAttribs4svNV_remap_index },
- { 32180, VertexAttribs4ubvNV_remap_index },
- { 41698, GetTexBumpParameterfvATI_remap_index },
- { 10443, GetTexBumpParameterivATI_remap_index },
- { 35545, TexBumpParameterfvATI_remap_index },
- { 8531, TexBumpParameterivATI_remap_index },
- { 9256, AlphaFragmentOp1ATI_remap_index },
- { 3432, AlphaFragmentOp2ATI_remap_index },
- { 9712, AlphaFragmentOp3ATI_remap_index },
- { 33371, BeginFragmentShaderATI_remap_index },
- { 3705, BindFragmentShaderATI_remap_index },
- { 7179, ColorFragmentOp1ATI_remap_index },
- { 12816, ColorFragmentOp2ATI_remap_index },
- { 23954, ColorFragmentOp3ATI_remap_index },
- { 16801, DeleteFragmentShaderATI_remap_index },
- { 43863, EndFragmentShaderATI_remap_index },
- { 22961, GenFragmentShadersATI_remap_index },
- { 41294, PassTexCoordATI_remap_index },
- { 35525, SampleMapATI_remap_index },
- { 34849, SetFragmentShaderConstantATI_remap_index },
- { 8462, ActiveStencilFaceEXT_remap_index },
- { 8088, BindVertexArrayAPPLE_remap_index },
- { 16331, GenVertexArraysAPPLE_remap_index },
- { 35111, GetProgramNamedParameterdvNV_remap_index },
- { 22711, GetProgramNamedParameterfvNV_remap_index },
- { 41729, ProgramNamedParameter4dNV_remap_index },
- { 37982, ProgramNamedParameter4dvNV_remap_index },
- { 41016, ProgramNamedParameter4fNV_remap_index },
- { 25435, ProgramNamedParameter4fvNV_remap_index },
- { 24274, PrimitiveRestartNV_remap_index },
- { 24763, GetTexGenxvOES_remap_index },
- { 14500, TexGenxOES_remap_index },
- { 32424, TexGenxvOES_remap_index },
- { 8012, DepthBoundsEXT_remap_index },
- { 5926, BindFramebufferEXT_remap_index },
- { 41352, BindRenderbufferEXT_remap_index },
- { 4390, BufferParameteriAPPLE_remap_index },
- { 39408, FlushMappedBufferRangeAPPLE_remap_index },
- { 27713, VertexAttribI1iEXT_remap_index },
- { 11235, VertexAttribI1uiEXT_remap_index },
- { 20227, VertexAttribI2iEXT_remap_index },
- { 40867, VertexAttribI2ivEXT_remap_index },
- { 25566, VertexAttribI2uiEXT_remap_index },
- { 35208, VertexAttribI2uivEXT_remap_index },
- { 19324, VertexAttribI3iEXT_remap_index },
- { 42937, VertexAttribI3ivEXT_remap_index },
- { 22643, VertexAttribI3uiEXT_remap_index },
- { 20978, VertexAttribI3uivEXT_remap_index },
- { 38027, VertexAttribI4iEXT_remap_index },
- { 6677, VertexAttribI4ivEXT_remap_index },
- { 2557, VertexAttribI4uiEXT_remap_index },
- { 27570, VertexAttribI4uivEXT_remap_index },
- { 2983, ClearColorIiEXT_remap_index },
- { 1208, ClearColorIuiEXT_remap_index },
- { 24297, BindBufferOffsetEXT_remap_index },
- { 18128, BeginPerfMonitorAMD_remap_index },
- { 32815, DeletePerfMonitorsAMD_remap_index },
- { 5439, EndPerfMonitorAMD_remap_index },
- { 26910, GenPerfMonitorsAMD_remap_index },
- { 12542, GetPerfMonitorCounterDataAMD_remap_index },
- { 34722, GetPerfMonitorCounterInfoAMD_remap_index },
- { 43823, GetPerfMonitorCounterStringAMD_remap_index },
- { 43421, GetPerfMonitorCountersAMD_remap_index },
- { 14216, GetPerfMonitorGroupStringAMD_remap_index },
- { 29704, GetPerfMonitorGroupsAMD_remap_index },
- { 13853, SelectPerfMonitorCountersAMD_remap_index },
- { 14313, GetObjectParameterivAPPLE_remap_index },
- { 43262, ObjectPurgeableAPPLE_remap_index },
- { 1897, ObjectUnpurgeableAPPLE_remap_index },
- { 42251, ActiveProgramEXT_remap_index },
- { 27316, CreateShaderProgramEXT_remap_index },
- { 36970, UseShaderProgramEXT_remap_index },
- { 30475, TextureBarrierNV_remap_index },
- { 2142, VDPAUFiniNV_remap_index },
- { 835, VDPAUGetSurfaceivNV_remap_index },
- { 23807, VDPAUInitNV_remap_index },
- { 21496, VDPAUIsSurfaceNV_remap_index },
- { 6426, VDPAUMapSurfacesNV_remap_index },
- { 3024, VDPAURegisterOutputSurfaceNV_remap_index },
- { 12411, VDPAURegisterVideoSurfaceNV_remap_index },
- { 10974, VDPAUSurfaceAccessNV_remap_index },
- { 4740, VDPAUUnmapSurfacesNV_remap_index },
- { 37881, VDPAUUnregisterSurfaceNV_remap_index },
- { 38630, BeginPerfQueryINTEL_remap_index },
- { 33692, CreatePerfQueryINTEL_remap_index },
- { 16262, DeletePerfQueryINTEL_remap_index },
- { 40697, EndPerfQueryINTEL_remap_index },
- { 42221, GetFirstPerfQueryIdINTEL_remap_index },
- { 30428, GetNextPerfQueryIdINTEL_remap_index },
- { 32036, GetPerfCounterInfoINTEL_remap_index },
- { 746, GetPerfQueryDataINTEL_remap_index },
- { 22298, GetPerfQueryIdByNameINTEL_remap_index },
- { 19988, GetPerfQueryInfoINTEL_remap_index },
- { 20389, StencilFuncSeparateATI_remap_index },
- { 5652, ProgramEnvParameters4fvEXT_remap_index },
- { 30743, ProgramLocalParameters4fvEXT_remap_index },
- { 3846, EGLImageTargetRenderbufferStorageOES_remap_index },
- { 3610, EGLImageTargetTexture2DOES_remap_index },
- { 40834, AlphaFuncx_remap_index },
- { 19369, ClearColorx_remap_index },
- { 40076, ClearDepthx_remap_index },
- { 35944, Color4x_remap_index },
- { 23745, DepthRangex_remap_index },
- { 2381, Fogx_remap_index },
- { 14779, Fogxv_remap_index },
- { 8733, Frustumf_remap_index },
- { 8830, Frustumx_remap_index },
- { 19289, LightModelx_remap_index },
- { 32274, LightModelxv_remap_index },
- { 28991, Lightx_remap_index },
- { 41581, Lightxv_remap_index },
- { 3540, LineWidthx_remap_index },
- { 37547, LoadMatrixx_remap_index },
- { 42558, Materialx_remap_index },
- { 25385, Materialxv_remap_index },
- { 29194, MultMatrixx_remap_index },
- { 31439, MultiTexCoord4x_remap_index },
- { 25234, Normal3x_remap_index },
- { 15399, Orthof_remap_index },
- { 15580, Orthox_remap_index },
- { 27617, PointSizex_remap_index },
+ { 643, TexCoordP1uiv_remap_index },
+ { 27299, TexCoordP2ui_remap_index },
+ { 38291, TexCoordP2uiv_remap_index },
+ { 15288, TexCoordP3ui_remap_index },
+ { 18316, TexCoordP3uiv_remap_index },
+ { 35442, TexCoordP4ui_remap_index },
+ { 1796, TexCoordP4uiv_remap_index },
+ { 15357, VertexAttribP1ui_remap_index },
+ { 4193, VertexAttribP1uiv_remap_index },
+ { 30903, VertexAttribP2ui_remap_index },
+ { 5030, VertexAttribP2uiv_remap_index },
+ { 1514, VertexAttribP3ui_remap_index },
+ { 29286, VertexAttribP3uiv_remap_index },
+ { 4452, VertexAttribP4ui_remap_index },
+ { 16647, VertexAttribP4uiv_remap_index },
+ { 36325, VertexP2ui_remap_index },
+ { 16437, VertexP2uiv_remap_index },
+ { 23344, VertexP3ui_remap_index },
+ { 6135, VertexP3uiv_remap_index },
+ { 3136, VertexP4ui_remap_index },
+ { 45460, VertexP4uiv_remap_index },
+ { 811, DrawArraysIndirect_remap_index },
+ { 24374, DrawElementsIndirect_remap_index },
+ { 6563, GetUniformdv_remap_index },
+ { 40913, Uniform1d_remap_index },
+ { 14619, Uniform1dv_remap_index },
+ { 43295, Uniform2d_remap_index },
+ { 29413, Uniform2dv_remap_index },
+ { 898, Uniform3d_remap_index },
+ { 30378, Uniform3dv_remap_index },
+ { 4511, Uniform4d_remap_index },
+ { 19933, Uniform4dv_remap_index },
+ { 4116, UniformMatrix2dv_remap_index },
+ { 23273, UniformMatrix2x3dv_remap_index },
+ { 16392, UniformMatrix2x4dv_remap_index },
+ { 30276, UniformMatrix3dv_remap_index },
+ { 4375, UniformMatrix3x2dv_remap_index },
+ { 5056, UniformMatrix3x4dv_remap_index },
+ { 17239, UniformMatrix4dv_remap_index },
+ { 33800, UniformMatrix4x2dv_remap_index },
+ { 18713, UniformMatrix4x3dv_remap_index },
+ { 11140, BindTransformFeedback_remap_index },
+ { 11012, DeleteTransformFeedbacks_remap_index },
+ { 37001, DrawTransformFeedback_remap_index },
+ { 3975, GenTransformFeedbacks_remap_index },
+ { 34374, IsTransformFeedback_remap_index },
+ { 31803, PauseTransformFeedback_remap_index },
+ { 36667, ResumeTransformFeedback_remap_index },
+ { 23207, BeginQueryIndexed_remap_index },
+ { 42452, DrawTransformFeedbackStream_remap_index },
+ { 19654, EndQueryIndexed_remap_index },
+ { 22427, GetQueryIndexediv_remap_index },
+ { 45426, ClearDepthf_remap_index },
+ { 24762, DepthRangef_remap_index },
+ { 39575, GetShaderPrecisionFormat_remap_index },
+ { 3245, ReleaseShaderCompiler_remap_index },
+ { 26012, ShaderBinary_remap_index },
+ { 20137, GetProgramBinary_remap_index },
+ { 12197, ProgramBinary_remap_index },
+ { 12432, ProgramParameteri_remap_index },
+ { 27718, DepthRangeArrayv_remap_index },
+ { 43450, DepthRangeIndexed_remap_index },
+ { 34354, GetDoublei_v_remap_index },
+ { 36857, GetFloati_v_remap_index },
+ { 43891, ScissorArrayv_remap_index },
+ { 25815, ScissorIndexed_remap_index },
+ { 29312, ScissorIndexedv_remap_index },
+ { 19095, ViewportArrayv_remap_index },
+ { 32749, ViewportIndexedf_remap_index },
+ { 20185, ViewportIndexedfv_remap_index },
+ { 8656, GetGraphicsResetStatusARB_remap_index },
+ { 31072, GetnColorTableARB_remap_index },
+ { 2868, GetnCompressedTexImageARB_remap_index },
+ { 1260, GetnConvolutionFilterARB_remap_index },
+ { 4904, GetnHistogramARB_remap_index },
+ { 18980, GetnMapdvARB_remap_index },
+ { 12581, GetnMapfvARB_remap_index },
+ { 35568, GetnMapivARB_remap_index },
+ { 40522, GetnMinmaxARB_remap_index },
+ { 3671, GetnPixelMapfvARB_remap_index },
+ { 5874, GetnPixelMapuivARB_remap_index },
+ { 11878, GetnPixelMapusvARB_remap_index },
+ { 22821, GetnPolygonStippleARB_remap_index },
+ { 29793, GetnSeparableFilterARB_remap_index },
+ { 10356, GetnTexImageARB_remap_index },
+ { 28825, GetnUniformdvARB_remap_index },
+ { 35180, GetnUniformfvARB_remap_index },
+ { 3220, GetnUniformivARB_remap_index },
+ { 14044, GetnUniformuivARB_remap_index },
+ { 26231, ReadnPixelsARB_remap_index },
+ { 33982, DrawArraysInstancedBaseInstance_remap_index },
+ { 10553, DrawElementsInstancedBaseInstance_remap_index },
+ { 2680, DrawElementsInstancedBaseVertexBaseInstance_remap_index },
+ { 36578, DrawTransformFeedbackInstanced_remap_index },
+ { 13738, DrawTransformFeedbackStreamInstanced_remap_index },
+ { 43912, GetInternalformativ_remap_index },
+ { 20282, GetActiveAtomicCounterBufferiv_remap_index },
+ { 45398, BindImageTexture_remap_index },
+ { 21961, MemoryBarrier_remap_index },
+ { 35248, TexStorage1D_remap_index },
+ { 23984, TexStorage2D_remap_index },
+ { 27977, TexStorage3D_remap_index },
+ { 1437, TextureStorage1DEXT_remap_index },
+ { 36495, TextureStorage2DEXT_remap_index },
+ { 22882, TextureStorage3DEXT_remap_index },
+ { 37261, ClearBufferData_remap_index },
+ { 2172, ClearBufferSubData_remap_index },
+ { 32330, DispatchCompute_remap_index },
+ { 6508, DispatchComputeIndirect_remap_index },
+ { 37301, CopyImageSubData_remap_index },
+ { 42276, TextureView_remap_index },
+ { 22321, BindVertexBuffer_remap_index },
+ { 30551, VertexAttribBinding_remap_index },
+ { 31099, VertexAttribFormat_remap_index },
+ { 33923, VertexAttribIFormat_remap_index },
+ { 37830, VertexAttribLFormat_remap_index },
+ { 36095, VertexBindingDivisor_remap_index },
+ { 39142, MultiDrawArraysIndirect_remap_index },
+ { 18678, MultiDrawElementsIndirect_remap_index },
+ { 18613, TexBufferRange_remap_index },
+ { 39763, TexStorage2DMultisample_remap_index },
+ { 29205, TexStorage3DMultisample_remap_index },
+ { 3417, BufferStorage_remap_index },
+ { 40242, ClearTexImage_remap_index },
+ { 13373, ClearTexSubImage_remap_index },
+ { 4288, BindBuffersBase_remap_index },
+ { 14903, BindBuffersRange_remap_index },
+ { 10987, BindImageTextures_remap_index },
+ { 2848, BindSamplers_remap_index },
+ { 42989, BindTextures_remap_index },
+ { 25847, BindVertexBuffers_remap_index },
+ { 37404, ClipControl_remap_index },
+ { 20209, BindTextureUnit_remap_index },
+ { 40336, CompressedTextureSubImage1D_remap_index },
+ { 36202, CompressedTextureSubImage2D_remap_index },
+ { 34023, CompressedTextureSubImage3D_remap_index },
+ { 36616, CopyTextureSubImage1D_remap_index },
+ { 32669, CopyTextureSubImage2D_remap_index },
+ { 42203, CopyTextureSubImage3D_remap_index },
+ { 29474, CreateTextures_remap_index },
+ { 32015, GenerateTextureMipmap_remap_index },
+ { 391, GetCompressedTextureImage_remap_index },
+ { 18043, GetTextureImage_remap_index },
+ { 33698, GetTextureLevelParameterfv_remap_index },
+ { 36391, GetTextureLevelParameteriv_remap_index },
+ { 14307, GetTextureParameterIiv_remap_index },
+ { 22184, GetTextureParameterIuiv_remap_index },
+ { 24520, GetTextureParameterfv_remap_index },
+ { 27671, GetTextureParameteriv_remap_index },
+ { 21802, TextureBuffer_remap_index },
+ { 36525, TextureParameterIiv_remap_index },
+ { 27863, TextureParameterIuiv_remap_index },
+ { 35320, TextureParameterf_remap_index },
+ { 2202, TextureParameterfv_remap_index },
+ { 35401, TextureParameteri_remap_index },
+ { 24797, TextureParameteriv_remap_index },
+ { 10147, TextureStorage1D_remap_index },
+ { 14281, TextureStorage2D_remap_index },
+ { 41451, TextureStorage2DMultisample_remap_index },
+ { 18262, TextureStorage3D_remap_index },
+ { 3181, TextureStorage3DMultisample_remap_index },
+ { 26111, TextureSubImage1D_remap_index },
+ { 30577, TextureSubImage2D_remap_index },
+ { 33607, TextureSubImage3D_remap_index },
+ { 6537, InvalidateBufferData_remap_index },
+ { 40184, InvalidateBufferSubData_remap_index },
+ { 21921, InvalidateFramebuffer_remap_index },
+ { 16339, InvalidateSubFramebuffer_remap_index },
+ { 12238, InvalidateTexImage_remap_index },
+ { 26258, InvalidateTexSubImage_remap_index },
+ { 12999, PolygonOffsetEXT_remap_index },
+ { 37422, DrawTexfOES_remap_index },
+ { 25680, DrawTexfvOES_remap_index },
+ { 1013, DrawTexiOES_remap_index },
+ { 31008, DrawTexivOES_remap_index },
+ { 12385, DrawTexsOES_remap_index },
+ { 22115, DrawTexsvOES_remap_index },
+ { 26952, DrawTexxOES_remap_index },
+ { 39403, DrawTexxvOES_remap_index },
+ { 25085, PointSizePointerOES_remap_index },
+ { 976, QueryMatrixxOES_remap_index },
+ { 19718, SampleMaskSGIS_remap_index },
+ { 34080, SamplePatternSGIS_remap_index },
+ { 43312, ColorPointerEXT_remap_index },
+ { 28387, EdgeFlagPointerEXT_remap_index },
+ { 13076, IndexPointerEXT_remap_index },
+ { 13266, NormalPointerEXT_remap_index },
+ { 27783, TexCoordPointerEXT_remap_index },
+ { 24902, VertexPointerEXT_remap_index },
+ { 43234, DiscardFramebufferEXT_remap_index },
+ { 10936, ActiveShaderProgram_remap_index },
+ { 16597, BindProgramPipeline_remap_index },
+ { 28439, CreateShaderProgramv_remap_index },
+ { 3569, DeleteProgramPipelines_remap_index },
+ { 25903, GenProgramPipelines_remap_index },
+ { 8121, GetProgramPipelineInfoLog_remap_index },
+ { 31175, GetProgramPipelineiv_remap_index },
+ { 25966, IsProgramPipeline_remap_index },
+ { 45276, LockArraysEXT_remap_index },
+ { 44574, ProgramUniform1d_remap_index },
+ { 30705, ProgramUniform1dv_remap_index },
+ { 44528, ProgramUniform1f_remap_index },
+ { 9623, ProgramUniform1fv_remap_index },
+ { 44482, ProgramUniform1i_remap_index },
+ { 15143, ProgramUniform1iv_remap_index },
+ { 34530, ProgramUniform1ui_remap_index },
+ { 44330, ProgramUniform1uiv_remap_index },
+ { 2384, ProgramUniform2d_remap_index },
+ { 9552, ProgramUniform2dv_remap_index },
+ { 2337, ProgramUniform2f_remap_index },
+ { 36342, ProgramUniform2fv_remap_index },
+ { 2409, ProgramUniform2i_remap_index },
+ { 21309, ProgramUniform2iv_remap_index },
+ { 7124, ProgramUniform2ui_remap_index },
+ { 8990, ProgramUniform2uiv_remap_index },
+ { 4564, ProgramUniform3d_remap_index },
+ { 23232, ProgramUniform3dv_remap_index },
+ { 4590, ProgramUniform3f_remap_index },
+ { 30074, ProgramUniform3fv_remap_index },
+ { 4638, ProgramUniform3i_remap_index },
+ { 13291, ProgramUniform3iv_remap_index },
+ { 15192, ProgramUniform3ui_remap_index },
+ { 17992, ProgramUniform3uiv_remap_index },
+ { 28884, ProgramUniform4d_remap_index },
+ { 30928, ProgramUniform4dv_remap_index },
+ { 28911, ProgramUniform4f_remap_index },
+ { 33470, ProgramUniform4fv_remap_index },
+ { 28960, ProgramUniform4i_remap_index },
+ { 1910, ProgramUniform4iv_remap_index },
+ { 40831, ProgramUniform4ui_remap_index },
+ { 33230, ProgramUniform4uiv_remap_index },
+ { 13340, ProgramUniformMatrix2dv_remap_index },
+ { 19790, ProgramUniformMatrix2fv_remap_index },
+ { 16036, ProgramUniformMatrix2x3dv_remap_index },
+ { 22255, ProgramUniformMatrix2x3fv_remap_index },
+ { 1842, ProgramUniformMatrix2x4dv_remap_index },
+ { 7803, ProgramUniformMatrix2x4fv_remap_index },
+ { 45243, ProgramUniformMatrix3dv_remap_index },
+ { 39026, ProgramUniformMatrix3fv_remap_index },
+ { 26796, ProgramUniformMatrix3x2dv_remap_index },
+ { 34288, ProgramUniformMatrix3x2fv_remap_index },
+ { 22701, ProgramUniformMatrix3x4dv_remap_index },
+ { 27383, ProgramUniformMatrix3x4fv_remap_index },
+ { 39213, ProgramUniformMatrix4dv_remap_index },
+ { 32399, ProgramUniformMatrix4fv_remap_index },
+ { 40375, ProgramUniformMatrix4x2dv_remap_index },
+ { 2271, ProgramUniformMatrix4x2fv_remap_index },
+ { 13898, ProgramUniformMatrix4x3dv_remap_index },
+ { 7367, ProgramUniformMatrix4x3fv_remap_index },
+ { 39797, UnlockArraysEXT_remap_index },
+ { 32353, UseProgramStages_remap_index },
+ { 1655, ValidateProgramPipeline_remap_index },
+ { 16673, DebugMessageCallback_remap_index },
+ { 32842, DebugMessageControl_remap_index },
+ { 15874, DebugMessageInsert_remap_index },
+ { 6927, GetDebugMessageLog_remap_index },
+ { 6718, GetObjectLabel_remap_index },
+ { 12406, GetObjectPtrLabel_remap_index },
+ { 31783, ObjectLabel_remap_index },
+ { 45363, ObjectPtrLabel_remap_index },
+ { 18496, PopDebugGroup_remap_index },
+ { 14673, PushDebugGroup_remap_index },
+ { 8510, SecondaryColor3fEXT_remap_index },
+ { 7999, SecondaryColor3fvEXT_remap_index },
+ { 29743, MultiDrawElementsEXT_remap_index },
+ { 11068, FogCoordfEXT_remap_index },
+ { 18740, FogCoordfvEXT_remap_index },
+ { 4266, ResizeBuffersMESA_remap_index },
+ { 35504, WindowPos4dMESA_remap_index },
+ { 28284, WindowPos4dvMESA_remap_index },
+ { 4402, WindowPos4fMESA_remap_index },
+ { 11647, WindowPos4fvMESA_remap_index },
+ { 9280, WindowPos4iMESA_remap_index },
+ { 3744, WindowPos4ivMESA_remap_index },
+ { 29080, WindowPos4sMESA_remap_index },
+ { 1107, WindowPos4svMESA_remap_index },
+ { 29843, MultiModeDrawArraysIBM_remap_index },
+ { 20470, MultiModeDrawElementsIBM_remap_index },
+ { 34199, AreProgramsResidentNV_remap_index },
+ { 41579, ExecuteProgramNV_remap_index },
+ { 30673, GetProgramParameterdvNV_remap_index },
+ { 38037, GetProgramParameterfvNV_remap_index },
+ { 19887, GetProgramStringNV_remap_index },
+ { 16263, GetProgramivNV_remap_index },
+ { 19025, GetTrackMatrixivNV_remap_index },
+ { 19467, GetVertexAttribdvNV_remap_index },
+ { 17619, GetVertexAttribfvNV_remap_index },
+ { 16490, GetVertexAttribivNV_remap_index },
+ { 37760, LoadProgramNV_remap_index },
+ { 20570, ProgramParameters4dvNV_remap_index },
+ { 21182, ProgramParameters4fvNV_remap_index },
+ { 6319, RequestResidentProgramsNV_remap_index },
+ { 30229, TrackMatrixNV_remap_index },
+ { 45650, VertexAttrib1dNV_remap_index },
+ { 29148, VertexAttrib1dvNV_remap_index },
+ { 29514, VertexAttrib1fNV_remap_index },
+ { 43661, VertexAttrib1fvNV_remap_index },
+ { 21759, VertexAttrib1sNV_remap_index },
+ { 39817, VertexAttrib1svNV_remap_index },
+ { 19001, VertexAttrib2dNV_remap_index },
+ { 35788, VertexAttrib2dvNV_remap_index },
+ { 28168, VertexAttrib2fNV_remap_index },
+ { 26831, VertexAttrib2fvNV_remap_index },
+ { 13172, VertexAttrib2sNV_remap_index },
+ { 5824, VertexAttrib2svNV_remap_index },
+ { 38446, VertexAttrib3dNV_remap_index },
+ { 40484, VertexAttrib3dvNV_remap_index },
+ { 5083, VertexAttrib3fNV_remap_index },
+ { 42882, VertexAttrib3fvNV_remap_index },
+ { 7311, VertexAttrib3sNV_remap_index },
+ { 19052, VertexAttrib3svNV_remap_index },
+ { 8712, VertexAttrib4dNV_remap_index },
+ { 3494, VertexAttrib4dvNV_remap_index },
+ { 8783, VertexAttrib4fNV_remap_index },
+ { 43036, VertexAttrib4fvNV_remap_index },
+ { 18104, VertexAttrib4sNV_remap_index },
+ { 11252, VertexAttrib4svNV_remap_index },
+ { 1628, VertexAttrib4ubNV_remap_index },
+ { 11043, VertexAttrib4ubvNV_remap_index },
+ { 29994, VertexAttribPointerNV_remap_index },
+ { 28335, VertexAttribs1dvNV_remap_index },
+ { 32101, VertexAttribs1fvNV_remap_index },
+ { 6293, VertexAttribs1svNV_remap_index },
+ { 44304, VertexAttribs2dvNV_remap_index },
+ { 4426, VertexAttribs2fvNV_remap_index },
+ { 28413, VertexAttribs2svNV_remap_index },
+ { 1816, VertexAttribs3dvNV_remap_index },
+ { 37029, VertexAttribs3fvNV_remap_index },
+ { 14458, VertexAttribs3svNV_remap_index },
+ { 25654, VertexAttribs4dvNV_remap_index },
+ { 25236, VertexAttribs4fvNV_remap_index },
+ { 21358, VertexAttribs4svNV_remap_index },
+ { 33425, VertexAttribs4ubvNV_remap_index },
+ { 43539, GetTexBumpParameterfvATI_remap_index },
+ { 10794, GetTexBumpParameterivATI_remap_index },
+ { 37129, TexBumpParameterfvATI_remap_index },
+ { 8755, TexBumpParameterivATI_remap_index },
+ { 9480, AlphaFragmentOp1ATI_remap_index },
+ { 3518, AlphaFragmentOp2ATI_remap_index },
+ { 9962, AlphaFragmentOp3ATI_remap_index },
+ { 34721, BeginFragmentShaderATI_remap_index },
+ { 3791, BindFragmentShaderATI_remap_index },
+ { 7336, ColorFragmentOp1ATI_remap_index },
+ { 13138, ColorFragmentOp2ATI_remap_index },
+ { 24823, ColorFragmentOp3ATI_remap_index },
+ { 17434, DeleteFragmentShaderATI_remap_index },
+ { 45793, EndFragmentShaderATI_remap_index },
+ { 23803, GenFragmentShadersATI_remap_index },
+ { 43118, PassTexCoordATI_remap_index },
+ { 37109, SampleMapATI_remap_index },
+ { 36290, SetFragmentShaderConstantATI_remap_index },
+ { 8686, ActiveStencilFaceEXT_remap_index },
+ { 8312, BindVertexArrayAPPLE_remap_index },
+ { 16939, GenVertexArraysAPPLE_remap_index },
+ { 36695, GetProgramNamedParameterdvNV_remap_index },
+ { 23553, GetProgramNamedParameterfvNV_remap_index },
+ { 43570, ProgramNamedParameter4dNV_remap_index },
+ { 39608, ProgramNamedParameter4dvNV_remap_index },
+ { 42824, ProgramNamedParameter4fNV_remap_index },
+ { 26358, ProgramNamedParameter4fvNV_remap_index },
+ { 25143, PrimitiveRestartNV_remap_index },
+ { 25632, GetTexGenxvOES_remap_index },
+ { 15028, TexGenxOES_remap_index },
+ { 33679, TexGenxvOES_remap_index },
+ { 8236, DepthBoundsEXT_remap_index },
+ { 6063, BindFramebufferEXT_remap_index },
+ { 43176, BindRenderbufferEXT_remap_index },
+ { 32258, BufferParameteriAPPLE_remap_index },
+ { 41123, FlushMappedBufferRangeAPPLE_remap_index },
+ { 28703, VertexAttribI1iEXT_remap_index },
+ { 11586, VertexAttribI1uiEXT_remap_index },
+ { 20903, VertexAttribI2iEXT_remap_index },
+ { 42675, VertexAttribI2ivEXT_remap_index },
+ { 26489, VertexAttribI2uiEXT_remap_index },
+ { 36792, VertexAttribI2uivEXT_remap_index },
+ { 19986, VertexAttribI3iEXT_remap_index },
+ { 44802, VertexAttribI3ivEXT_remap_index },
+ { 23485, VertexAttribI3uiEXT_remap_index },
+ { 21663, VertexAttribI3uivEXT_remap_index },
+ { 39653, VertexAttribI4iEXT_remap_index },
+ { 6834, VertexAttribI4ivEXT_remap_index },
+ { 2632, VertexAttribI4uiEXT_remap_index },
+ { 28560, VertexAttribI4uivEXT_remap_index },
+ { 3058, ClearColorIiEXT_remap_index },
+ { 1235, ClearColorIuiEXT_remap_index },
+ { 25166, BindBufferOffsetEXT_remap_index },
+ { 18772, BeginPerfMonitorAMD_remap_index },
+ { 34157, DeletePerfMonitorsAMD_remap_index },
+ { 5576, EndPerfMonitorAMD_remap_index },
+ { 38820, GenPerfMonitorsAMD_remap_index },
+ { 12864, GetPerfMonitorCounterDataAMD_remap_index },
+ { 36122, GetPerfMonitorCounterInfoAMD_remap_index },
+ { 45753, GetPerfMonitorCounterStringAMD_remap_index },
+ { 45328, GetPerfMonitorCountersAMD_remap_index },
+ { 14744, GetPerfMonitorGroupStringAMD_remap_index },
+ { 30852, GetPerfMonitorGroupsAMD_remap_index },
+ { 14243, SelectPerfMonitorCountersAMD_remap_index },
+ { 14841, GetObjectParameterivAPPLE_remap_index },
+ { 45136, ObjectPurgeableAPPLE_remap_index },
+ { 1959, ObjectUnpurgeableAPPLE_remap_index },
+ { 44092, ActiveProgramEXT_remap_index },
+ { 28306, CreateShaderProgramEXT_remap_index },
+ { 38554, UseShaderProgramEXT_remap_index },
+ { 31649, TextureBarrierNV_remap_index },
+ { 2228, VDPAUFiniNV_remap_index },
+ { 869, VDPAUGetSurfaceivNV_remap_index },
+ { 24678, VDPAUInitNV_remap_index },
+ { 22233, VDPAUIsSurfaceNV_remap_index },
+ { 6583, VDPAUMapSurfacesNV_remap_index },
+ { 3099, VDPAURegisterOutputSurfaceNV_remap_index },
+ { 12762, VDPAURegisterVideoSurfaceNV_remap_index },
+ { 11325, VDPAUSurfaceAccessNV_remap_index },
+ { 4877, VDPAUUnmapSurfacesNV_remap_index },
+ { 39507, VDPAUUnregisterSurfaceNV_remap_index },
+ { 40285, BeginPerfQueryINTEL_remap_index },
+ { 35042, CreatePerfQueryINTEL_remap_index },
+ { 16870, DeletePerfQueryINTEL_remap_index },
+ { 42505, EndPerfQueryINTEL_remap_index },
+ { 44062, GetFirstPerfQueryIdINTEL_remap_index },
+ { 31602, GetNextPerfQueryIdINTEL_remap_index },
+ { 33281, GetPerfCounterInfoINTEL_remap_index },
+ { 780, GetPerfQueryDataINTEL_remap_index },
+ { 23087, GetPerfQueryIdByNameINTEL_remap_index },
+ { 20664, GetPerfQueryInfoINTEL_remap_index },
+ { 39961, PolygonOffsetClampEXT_remap_index },
+ { 21065, StencilFuncSeparateATI_remap_index },
+ { 5789, ProgramEnvParameters4fvEXT_remap_index },
+ { 31917, ProgramLocalParameters4fvEXT_remap_index },
+ { 3932, EGLImageTargetRenderbufferStorageOES_remap_index },
+ { 3696, EGLImageTargetTexture2DOES_remap_index },
+ { 42642, AlphaFuncx_remap_index },
+ { 20031, ClearColorx_remap_index },
+ { 41849, ClearDepthx_remap_index },
+ { 37528, Color4x_remap_index },
+ { 24616, DepthRangex_remap_index },
+ { 2456, Fogx_remap_index },
+ { 15307, Fogxv_remap_index },
+ { 8957, Frustumf_remap_index },
+ { 9054, Frustumx_remap_index },
+ { 19951, LightModelx_remap_index },
+ { 33519, LightModelxv_remap_index },
+ { 30048, Lightx_remap_index },
+ { 43422, Lightxv_remap_index },
+ { 3626, LineWidthx_remap_index },
+ { 3383, LoadMatrixx_remap_index },
+ { 44399, Materialx_remap_index },
+ { 26308, Materialxv_remap_index },
+ { 44921, MultMatrixx_remap_index },
+ { 10425, MultiTexCoord4x_remap_index },
+ { 26140, Normal3x_remap_index },
+ { 15927, Orthof_remap_index },
+ { 16143, Orthox_remap_index },
+ { 28607, PointSizex_remap_index },
{ 70, PolygonOffsetx_remap_index },
- { 37295, Rotatex_remap_index },
- { 19945, SampleCoveragex_remap_index },
- { 12700, Scalex_remap_index },
- { 38420, TexEnvx_remap_index },
- { 43213, TexEnvxv_remap_index },
- { 1976, TexParameterx_remap_index },
- { 31765, Translatex_remap_index },
- { 33155, ClipPlanef_remap_index },
- { 33057, ClipPlanex_remap_index },
- { 707, GetClipPlanef_remap_index },
- { 570, GetClipPlanex_remap_index },
- { 19863, GetFixedv_remap_index },
- { 1267, GetLightxv_remap_index },
- { 22748, GetMaterialxv_remap_index },
- { 21373, GetTexEnvxv_remap_index },
- { 16686, GetTexParameterxv_remap_index },
- { 29228, PointParameterx_remap_index },
- { 37250, PointParameterxv_remap_index },
- { 19032, TexParameterxv_remap_index },
+ { 38890, Rotatex_remap_index },
+ { 20621, SampleCoveragex_remap_index },
+ { 13022, Scalex_remap_index },
+ { 40075, TexEnvx_remap_index },
+ { 45087, TexEnvxv_remap_index },
+ { 2038, TexParameterx_remap_index },
+ { 32983, Translatex_remap_index },
+ { 34497, ClipPlanef_remap_index },
+ { 34399, ClipPlanex_remap_index },
+ { 741, GetClipPlanef_remap_index },
+ { 604, GetClipPlanex_remap_index },
+ { 20539, GetFixedv_remap_index },
+ { 1294, GetLightxv_remap_index },
+ { 23590, GetMaterialxv_remap_index },
+ { 22079, GetTexEnvxv_remap_index },
+ { 17319, GetTexParameterxv_remap_index },
+ { 30301, PointParameterx_remap_index },
+ { 38845, PointParameterxv_remap_index },
+ { 19676, TexParameterxv_remap_index },
{ -1, -1 }
};
/* these functions are in the ABI, but have alternative names */
static const struct gl_function_remap MESA_alt_functions[] = {
/* from GL_EXT_blend_color */
- { 34336, _gloffset_BlendColor },
+ { 35736, _gloffset_BlendColor },
/* from GL_EXT_blend_minmax */
- { 36805, _gloffset_BlendEquation },
+ { 38389, _gloffset_BlendEquation },
/* from GL_EXT_color_subtable */
- { 5396, _gloffset_ColorSubTable },
- { 21274, _gloffset_CopyColorSubTable },
+ { 5533, _gloffset_ColorSubTable },
+ { 21980, _gloffset_CopyColorSubTable },
/* from GL_EXT_convolution */
- { 1301, _gloffset_GetConvolutionParameteriv },
- { 13696, _gloffset_ConvolutionParameterfv },
- { 16548, _gloffset_CopyConvolutionFilter1D },
- { 18544, _gloffset_SeparableFilter2D },
- { 19739, _gloffset_GetConvolutionFilter },
- { 23477, _gloffset_ConvolutionFilter1D },
- { 25773, _gloffset_ConvolutionFilter2D },
- { 28544, _gloffset_GetSeparableFilter },
- { 30086, _gloffset_ConvolutionParameteri },
- { 30208, _gloffset_ConvolutionParameterf },
- { 35973, _gloffset_ConvolutionParameteriv },
- { 41634, _gloffset_GetConvolutionParameterfv },
- { 42788, _gloffset_CopyConvolutionFilter2D },
+ { 1328, _gloffset_GetConvolutionParameteriv },
+ { 14086, _gloffset_ConvolutionParameterfv },
+ { 17156, _gloffset_CopyConvolutionFilter1D },
+ { 19188, _gloffset_SeparableFilter2D },
+ { 20415, _gloffset_GetConvolutionFilter },
+ { 24319, _gloffset_ConvolutionFilter1D },
+ { 26696, _gloffset_ConvolutionFilter2D },
+ { 29601, _gloffset_GetSeparableFilter },
+ { 31260, _gloffset_ConvolutionParameteri },
+ { 31382, _gloffset_ConvolutionParameterf },
+ { 37557, _gloffset_ConvolutionParameteriv },
+ { 43475, _gloffset_GetConvolutionParameterfv },
+ { 44653, _gloffset_CopyConvolutionFilter2D },
/* from GL_EXT_copy_texture */
- { 27232, _gloffset_CopyTexImage2D },
- { 29852, _gloffset_CopyTexImage1D },
- { 32311, _gloffset_CopyTexSubImage1D },
- { 38258, _gloffset_CopyTexSubImage3D },
- { 41890, _gloffset_CopyTexSubImage2D },
+ { 28222, _gloffset_CopyTexImage2D },
+ { 31026, _gloffset_CopyTexImage1D },
+ { 33556, _gloffset_CopyTexSubImage1D },
+ { 39884, _gloffset_CopyTexSubImage3D },
+ { 43731, _gloffset_CopyTexSubImage2D },
/* from GL_EXT_draw_range_elements */
- { 24712, _gloffset_DrawRangeElements },
+ { 25581, _gloffset_DrawRangeElements },
/* from GL_EXT_histogram */
- { 4639, _gloffset_GetHistogramParameterfv },
- { 8114, _gloffset_GetHistogramParameteriv },
- { 9496, _gloffset_Minmax },
- { 13952, _gloffset_GetMinmax },
- { 21867, _gloffset_Histogram },
- { 29780, _gloffset_GetMinmaxParameteriv },
- { 30780, _gloffset_ResetMinmax },
- { 31725, _gloffset_GetHistogram },
- { 33465, _gloffset_GetMinmaxParameterfv },
- { 34412, _gloffset_ResetHistogram },
+ { 4776, _gloffset_GetHistogramParameterfv },
+ { 8338, _gloffset_GetHistogramParameteriv },
+ { 9746, _gloffset_Minmax },
+ { 14398, _gloffset_GetMinmax },
+ { 22604, _gloffset_Histogram },
+ { 30954, _gloffset_GetMinmaxParameteriv },
+ { 31954, _gloffset_ResetMinmax },
+ { 32943, _gloffset_GetHistogram },
+ { 34815, _gloffset_GetMinmaxParameterfv },
+ { 35812, _gloffset_ResetHistogram },
/* from GL_EXT_paletted_texture */
- { 13558, _gloffset_ColorTable },
- { 18153, _gloffset_GetColorTableParameterfv },
- { 26555, _gloffset_GetColorTable },
- { 30264, _gloffset_GetColorTableParameteriv },
+ { 13948, _gloffset_ColorTable },
+ { 18797, _gloffset_GetColorTableParameterfv },
+ { 27513, _gloffset_GetColorTable },
+ { 31438, _gloffset_GetColorTableParameteriv },
/* from GL_EXT_subtexture */
- { 2413, _gloffset_TexSubImage1D },
- { 36520, _gloffset_TexSubImage2D },
+ { 2488, _gloffset_TexSubImage1D },
+ { 38104, _gloffset_TexSubImage2D },
/* from GL_EXT_texture3D */
- { 22241, _gloffset_TexImage3D },
- { 40508, _gloffset_TexSubImage3D },
+ { 23030, _gloffset_TexImage3D },
+ { 42316, _gloffset_TexSubImage3D },
/* from GL_EXT_texture_object */
- { 4218, _gloffset_GenTextures },
- { 8877, _gloffset_BindTexture },
- { 17329, _gloffset_IsTexture },
- { 22593, _gloffset_PrioritizeTextures },
- { 26755, _gloffset_DeleteTextures },
- { 40964, _gloffset_AreTexturesResident },
+ { 4312, _gloffset_GenTextures },
+ { 9101, _gloffset_BindTexture },
+ { 17962, _gloffset_IsTexture },
+ { 23435, _gloffset_PrioritizeTextures },
+ { 27742, _gloffset_DeleteTextures },
+ { 42772, _gloffset_AreTexturesResident },
/* from GL_EXT_vertex_array */
- { 18642, _gloffset_ArrayElement },
- { 29271, _gloffset_DrawArrays },
- { 38868, _gloffset_GetPointerv },
+ { 19286, _gloffset_ArrayElement },
+ { 30344, _gloffset_DrawArrays },
+ { 40567, _gloffset_GetPointerv },
/* from GL_NV_read_buffer */
- { 30055, _gloffset_ReadBuffer },
+ { 31229, _gloffset_ReadBuffer },
/* from GL_OES_blend_subtract */
- { 36805, _gloffset_BlendEquation },
+ { 38389, _gloffset_BlendEquation },
/* from GL_OES_texture_3D */
- { 22241, _gloffset_TexImage3D },
- { 38258, _gloffset_CopyTexSubImage3D },
- { 40508, _gloffset_TexSubImage3D },
+ { 23030, _gloffset_TexImage3D },
+ { 39884, _gloffset_CopyTexSubImage3D },
+ { 42316, _gloffset_TexSubImage3D },
/* from GL_OES_texture_cube_map */
- { 16915, _gloffset_TexGeni },
- { 16943, _gloffset_TexGenf },
- { 20305, _gloffset_GetTexGenfv },
- { 34287, _gloffset_TexGeniv },
- { 36629, _gloffset_TexGenfv },
- { 42185, _gloffset_GetTexGeniv },
+ { 17548, _gloffset_TexGeni },
+ { 17576, _gloffset_TexGenf },
+ { 20981, _gloffset_GetTexGenfv },
+ { 35687, _gloffset_TexGeniv },
+ { 38213, _gloffset_TexGenfv },
+ { 44026, _gloffset_GetTexGeniv },
/* from GL_SGI_color_table */
- { 2717, _gloffset_ColorTableParameteriv },
- { 13558, _gloffset_ColorTable },
- { 17273, _gloffset_ColorTableParameterfv },
- { 18153, _gloffset_GetColorTableParameterfv },
- { 26555, _gloffset_GetColorTable },
- { 26633, _gloffset_CopyColorTable },
- { 30264, _gloffset_GetColorTableParameteriv },
+ { 2792, _gloffset_ColorTableParameteriv },
+ { 13948, _gloffset_ColorTable },
+ { 17906, _gloffset_ColorTableParameterfv },
+ { 18797, _gloffset_GetColorTableParameterfv },
+ { 27513, _gloffset_GetColorTable },
+ { 27591, _gloffset_CopyColorTable },
+ { 31438, _gloffset_GetColorTableParameteriv },
{ -1, -1 }
};
diff --git a/xorg-server/glx/rensize.c b/xorg-server/glx/rensize.c
index 884369d8f..a9227b537 100644
--- a/xorg-server/glx/rensize.c
+++ b/xorg-server/glx/rensize.c
@@ -47,19 +47,11 @@
(((a & 0xff000000U)>>24) | ((a & 0xff0000U)>>8) | \
((a & 0xff00U)<<8) | ((a & 0xffU)<<24))
-static int
-Map1Size(GLint k, GLint order)
-{
- if (order <= 0 || k < 0)
- return -1;
- return k * order;
-}
-
int
-__glXMap1dReqSize(const GLbyte * pc, Bool swap)
+__glXMap1dReqSize(const GLbyte * pc, Bool swap, int reqlen)
{
GLenum target;
- GLint order, k;
+ GLint order;
target = *(GLenum *) (pc + 16);
order = *(GLint *) (pc + 20);
@@ -67,15 +59,16 @@ __glXMap1dReqSize(const GLbyte * pc, Bool swap)
target = SWAPL(target);
order = SWAPL(order);
}
- k = __glMap1d_size(target);
- return 8 * Map1Size(k, order);
+ if (order < 1)
+ return -1;
+ return safe_mul(8, safe_mul(__glMap1d_size(target), order));
}
int
-__glXMap1fReqSize(const GLbyte * pc, Bool swap)
+__glXMap1fReqSize(const GLbyte * pc, Bool swap, int reqlen)
{
GLenum target;
- GLint order, k;
+ GLint order;
target = *(GLenum *) (pc + 0);
order = *(GLint *) (pc + 12);
@@ -83,23 +76,24 @@ __glXMap1fReqSize(const GLbyte * pc, Bool swap)
target = SWAPL(target);
order = SWAPL(order);
}
- k = __glMap1f_size(target);
- return 4 * Map1Size(k, order);
+ if (order < 1)
+ return -1;
+ return safe_mul(4, safe_mul(__glMap1f_size(target), order));
}
static int
Map2Size(int k, int majorOrder, int minorOrder)
{
- if (majorOrder <= 0 || minorOrder <= 0 || k < 0)
+ if (majorOrder < 1 || minorOrder < 1)
return -1;
- return k * majorOrder * minorOrder;
+ return safe_mul(k, safe_mul(majorOrder, minorOrder));
}
int
-__glXMap2dReqSize(const GLbyte * pc, Bool swap)
+__glXMap2dReqSize(const GLbyte * pc, Bool swap, int reqlen)
{
GLenum target;
- GLint uorder, vorder, k;
+ GLint uorder, vorder;
target = *(GLenum *) (pc + 32);
uorder = *(GLint *) (pc + 36);
@@ -109,15 +103,14 @@ __glXMap2dReqSize(const GLbyte * pc, Bool swap)
uorder = SWAPL(uorder);
vorder = SWAPL(vorder);
}
- k = __glMap2d_size(target);
- return 8 * Map2Size(k, uorder, vorder);
+ return safe_mul(8, Map2Size(__glMap2d_size(target), uorder, vorder));
}
int
-__glXMap2fReqSize(const GLbyte * pc, Bool swap)
+__glXMap2fReqSize(const GLbyte * pc, Bool swap, int reqlen)
{
GLenum target;
- GLint uorder, vorder, k;
+ GLint uorder, vorder;
target = *(GLenum *) (pc + 0);
uorder = *(GLint *) (pc + 12);
@@ -127,8 +120,7 @@ __glXMap2fReqSize(const GLbyte * pc, Bool swap)
uorder = SWAPL(uorder);
vorder = SWAPL(vorder);
}
- k = __glMap2f_size(target);
- return 4 * Map2Size(k, uorder, vorder);
+ return safe_mul(4, Map2Size(__glMap2f_size(target), uorder, vorder));
}
/**
@@ -179,14 +171,16 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
GLint bytesPerElement, elementsPerGroup, groupsPerRow;
GLint groupSize, rowSize, padding, imageSize;
+ if (w == 0 || h == 0 || d == 0)
+ return 0;
+
if (w < 0 || h < 0 || d < 0 ||
(type == GL_BITMAP &&
(format != GL_COLOR_INDEX && format != GL_STENCIL_INDEX))) {
return -1;
}
- if (w == 0 || h == 0 || d == 0)
- return 0;
+ /* proxy targets have no data */
switch (target) {
case GL_PROXY_TEXTURE_1D:
case GL_PROXY_TEXTURE_2D:
@@ -203,6 +197,12 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
return 0;
}
+ /* real data has to have real sizes */
+ if (imageHeight < 0 || rowLength < 0 || skipImages < 0 || skipRows < 0)
+ return -1;
+ if (alignment != 1 && alignment != 2 && alignment != 4 && alignment != 8)
+ return -1;
+
if (type == GL_BITMAP) {
if (rowLength > 0) {
groupsPerRow = rowLength;
@@ -211,11 +211,14 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
groupsPerRow = w;
}
rowSize = bits_to_bytes(groupsPerRow);
+ if (rowSize < 0)
+ return -1;
padding = (rowSize % alignment);
if (padding) {
rowSize += alignment - padding;
}
- return ((h + skipRows) * rowSize);
+
+ return safe_mul(safe_add(h, skipRows), rowSize);
}
else {
switch (format) {
@@ -228,6 +231,11 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
case GL_ALPHA:
case GL_LUMINANCE:
case GL_INTENSITY:
+ case GL_RED_INTEGER_EXT:
+ case GL_GREEN_INTEGER_EXT:
+ case GL_BLUE_INTEGER_EXT:
+ case GL_ALPHA_INTEGER_EXT:
+ case GL_LUMINANCE_INTEGER_EXT:
elementsPerGroup = 1;
break;
case GL_422_EXT:
@@ -238,14 +246,19 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
case GL_DEPTH_STENCIL_MESA:
case GL_YCBCR_MESA:
case GL_LUMINANCE_ALPHA:
+ case GL_LUMINANCE_ALPHA_INTEGER_EXT:
elementsPerGroup = 2;
break;
case GL_RGB:
case GL_BGR:
+ case GL_RGB_INTEGER_EXT:
+ case GL_BGR_INTEGER_EXT:
elementsPerGroup = 3;
break;
case GL_RGBA:
case GL_BGRA:
+ case GL_RGBA_INTEGER_EXT:
+ case GL_BGRA_INTEGER_EXT:
case GL_ABGR_EXT:
elementsPerGroup = 4;
break;
@@ -297,6 +310,7 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
default:
return -1;
}
+ /* known safe by the switches above, not checked */
groupSize = bytesPerElement * elementsPerGroup;
if (rowLength > 0) {
groupsPerRow = rowLength;
@@ -304,18 +318,21 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
else {
groupsPerRow = w;
}
- rowSize = groupsPerRow * groupSize;
+
+ if ((rowSize = safe_mul(groupsPerRow, groupSize)) < 0)
+ return -1;
padding = (rowSize % alignment);
if (padding) {
rowSize += alignment - padding;
}
- if (imageHeight > 0) {
- imageSize = (imageHeight + skipRows) * rowSize;
- }
- else {
- imageSize = (h + skipRows) * rowSize;
- }
- return ((d + skipImages) * imageSize);
+
+ if (imageHeight > 0)
+ h = imageHeight;
+ h = safe_add(h, skipRows);
+
+ imageSize = safe_mul(h, rowSize);
+
+ return safe_mul(safe_add(d, skipImages), imageSize);
}
}
@@ -346,13 +363,14 @@ __glXTypeSize(GLenum enm)
}
int
-__glXDrawArraysReqSize(const GLbyte * pc, Bool swap)
+__glXDrawArraysReqSize(const GLbyte * pc, Bool swap, int reqlen)
{
__GLXdispatchDrawArraysHeader *hdr = (__GLXdispatchDrawArraysHeader *) pc;
__GLXdispatchDrawArraysComponentHeader *compHeader;
GLint numVertexes = hdr->numVertexes;
GLint numComponents = hdr->numComponents;
GLint arrayElementSize = 0;
+ GLint x, size;
int i;
if (swap) {
@@ -361,6 +379,13 @@ __glXDrawArraysReqSize(const GLbyte * pc, Bool swap)
}
pc += sizeof(__GLXdispatchDrawArraysHeader);
+ reqlen -= sizeof(__GLXdispatchDrawArraysHeader);
+
+ size = safe_mul(sizeof(__GLXdispatchDrawArraysComponentHeader),
+ numComponents);
+ if (size < 0 || reqlen < 0 || reqlen < size)
+ return -1;
+
compHeader = (__GLXdispatchDrawArraysComponentHeader *) pc;
for (i = 0; i < numComponents; i++) {
@@ -404,17 +429,18 @@ __glXDrawArraysReqSize(const GLbyte * pc, Bool swap)
return -1;
}
- arrayElementSize += __GLX_PAD(numVals * __glXTypeSize(datatype));
+ x = safe_pad(safe_mul(numVals, __glXTypeSize(datatype)));
+ if ((arrayElementSize = safe_add(arrayElementSize, x)) < 0)
+ return -1;
pc += sizeof(__GLXdispatchDrawArraysComponentHeader);
}
- return ((numComponents * sizeof(__GLXdispatchDrawArraysComponentHeader)) +
- (numVertexes * arrayElementSize));
+ return safe_add(size, safe_mul(numVertexes, arrayElementSize));
}
int
-__glXSeparableFilter2DReqSize(const GLbyte * pc, Bool swap)
+__glXSeparableFilter2DReqSize(const GLbyte * pc, Bool swap, int reqlen)
{
__GLXdispatchConvolutionFilterHeader *hdr =
(__GLXdispatchConvolutionFilterHeader *) pc;
@@ -439,9 +465,7 @@ __glXSeparableFilter2DReqSize(const GLbyte * pc, Bool swap)
/* XXX Should rowLength be used for either or both image? */
image1size = __glXImageSize(format, type, 0, w, 1, 1,
0, rowLength, 0, 0, alignment);
- image1size = __GLX_PAD(image1size);
image2size = __glXImageSize(format, type, 0, h, 1, 1,
0, rowLength, 0, 0, alignment);
- return image1size + image2size;
-
+ return safe_add(safe_pad(image1size), image2size);
}
diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c
index 8d4d1d061..cd3593295 100644
--- a/xorg-server/glx/single2.c
+++ b/xorg-server/glx/single2.c
@@ -48,11 +48,14 @@
int
__glXDisp_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
GLsizei size;
GLenum type;
__GLXcontext *cx;
int error;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
+
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
return error;
@@ -79,10 +82,13 @@ __glXDisp_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
int
__glXDisp_SelectBuffer(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
__GLXcontext *cx;
GLsizei size;
int error;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
+
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
return error;
@@ -107,7 +113,7 @@ __glXDisp_SelectBuffer(__GLXclientState * cl, GLbyte * pc)
int
__glXDisp_RenderMode(__GLXclientState * cl, GLbyte * pc)
{
- ClientPtr client;
+ ClientPtr client = cl->client;
xGLXRenderModeReply reply;
__GLXcontext *cx;
GLint nitems = 0, retBytes = 0, retval, newModeCheck;
@@ -115,6 +121,8 @@ __glXDisp_RenderMode(__GLXclientState * cl, GLbyte * pc)
GLenum newMode;
int error;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
+
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
return error;
@@ -191,7 +199,6 @@ __glXDisp_RenderMode(__GLXclientState * cl, GLbyte * pc)
** selection array, as per the API for glRenderMode itself.
*/
noChangeAllowed:;
- client = cl->client;
reply = (xGLXRenderModeReply) {
.type = X_Reply,
.sequenceNumber = client->sequence,
@@ -210,9 +217,12 @@ __glXDisp_RenderMode(__GLXclientState * cl, GLbyte * pc)
int
__glXDisp_Flush(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
__GLXcontext *cx;
int error;
+ REQUEST_SIZE_MATCH(xGLXSingleReq);
+
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
return error;
@@ -226,10 +236,12 @@ __glXDisp_Flush(__GLXclientState * cl, GLbyte * pc)
int
__glXDisp_Finish(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
__GLXcontext *cx;
- ClientPtr client;
int error;
+ REQUEST_SIZE_MATCH(xGLXSingleReq);
+
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
return error;
@@ -320,7 +332,7 @@ __glXcombine_strings(const char *cext_string, const char *sext_string)
int
DoGetString(__GLXclientState * cl, GLbyte * pc, GLboolean need_swap)
{
- ClientPtr client;
+ ClientPtr client = cl->client;
__GLXcontext *cx;
GLenum name;
const char *string;
@@ -330,6 +342,8 @@ DoGetString(__GLXclientState * cl, GLbyte * pc, GLboolean need_swap)
char *buf = NULL, *buf1 = NULL;
GLint length = 0;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
+
/* If the client has the opposite byte order, swap the contextTag and
* the name.
*/
@@ -346,7 +360,6 @@ DoGetString(__GLXclientState * cl, GLbyte * pc, GLboolean need_swap)
pc += __GLX_SINGLE_HDR_SIZE;
name = *(GLenum *) (pc + 0);
string = (const char *) glGetString(name);
- client = cl->client;
if (string == NULL)
string = "";
diff --git a/xorg-server/glx/single2swap.c b/xorg-server/glx/single2swap.c
index 90387a2e8..a35767f0d 100644
--- a/xorg-server/glx/single2swap.c
+++ b/xorg-server/glx/single2swap.c
@@ -44,6 +44,7 @@
int
__glXDispSwap_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
GLsizei size;
GLenum type;
@@ -51,6 +52,8 @@ __glXDispSwap_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
__GLXcontext *cx;
int error;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
+
__GLX_SWAP_INT(&((xGLXSingleReq *) pc)->contextTag);
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
@@ -80,12 +83,15 @@ __glXDispSwap_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
int
__glXDispSwap_SelectBuffer(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
__GLXcontext *cx;
GLsizei size;
__GLX_DECLARE_SWAP_VARIABLES;
int error;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
+
__GLX_SWAP_INT(&((xGLXSingleReq *) pc)->contextTag);
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
@@ -112,7 +118,7 @@ __glXDispSwap_SelectBuffer(__GLXclientState * cl, GLbyte * pc)
int
__glXDispSwap_RenderMode(__GLXclientState * cl, GLbyte * pc)
{
- ClientPtr client;
+ ClientPtr client = cl->client;
__GLXcontext *cx;
xGLXRenderModeReply reply;
GLint nitems = 0, retBytes = 0, retval, newModeCheck;
@@ -123,6 +129,8 @@ __glXDispSwap_RenderMode(__GLXclientState * cl, GLbyte * pc)
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
int error;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
+
__GLX_SWAP_INT(&((xGLXSingleReq *) pc)->contextTag);
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
@@ -203,7 +211,6 @@ __glXDispSwap_RenderMode(__GLXclientState * cl, GLbyte * pc)
** selection array, as per the API for glRenderMode itself.
*/
noChangeAllowed:;
- client = cl->client;
reply = (xGLXRenderModeReply) {
.type = X_Reply,
.sequenceNumber = client->sequence,
@@ -227,11 +234,14 @@ __glXDispSwap_RenderMode(__GLXclientState * cl, GLbyte * pc)
int
__glXDispSwap_Flush(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
__GLXcontext *cx;
int error;
__GLX_DECLARE_SWAP_VARIABLES;
+ REQUEST_SIZE_MATCH(xGLXSingleReq);
+
__GLX_SWAP_INT(&((xGLXSingleReq *) pc)->contextTag);
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
@@ -246,12 +256,14 @@ __glXDispSwap_Flush(__GLXclientState * cl, GLbyte * pc)
int
__glXDispSwap_Finish(__GLXclientState * cl, GLbyte * pc)
{
+ ClientPtr client = cl->client;
__GLXcontext *cx;
- ClientPtr client;
int error;
__GLX_DECLARE_SWAP_VARIABLES;
+ REQUEST_SIZE_MATCH(xGLXSingleReq);
+
__GLX_SWAP_INT(&((xGLXSingleReq *) pc)->contextTag);
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
@@ -263,7 +275,6 @@ __glXDispSwap_Finish(__GLXclientState * cl, GLbyte * pc)
cx->hasUnflushedCommands = GL_FALSE;
/* Send empty reply packet to indicate finish is finished */
- client = cl->client;
__GLX_BEGIN_REPLY(0);
__GLX_PUT_RETVAL(0);
__GLX_SWAP_REPLY_HEADER();
diff --git a/xorg-server/glx/singlepix.c b/xorg-server/glx/singlepix.c
index 06c0ad66f..96c0e9f30 100644
--- a/xorg-server/glx/singlepix.c
+++ b/xorg-server/glx/singlepix.c
@@ -54,6 +54,8 @@ __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc)
int error;
char *answer, answerBuffer[200];
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 28);
+
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
return error;
@@ -68,7 +70,7 @@ __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc)
lsbFirst = *(GLboolean *) (pc + 25);
compsize = __glReadPixels_size(format, type, width, height);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
@@ -103,6 +105,8 @@ __glXDisp_GetTexImage(__GLXclientState * cl, GLbyte * pc)
char *answer, answerBuffer[200];
GLint width = 0, height = 0, depth = 1;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 20);
+
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
return error;
@@ -127,7 +131,7 @@ __glXDisp_GetTexImage(__GLXclientState * cl, GLbyte * pc)
compsize =
__glGetTexImage_size(target, level, format, type, width, height, depth);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
@@ -160,6 +164,8 @@ __glXDisp_GetPolygonStipple(__GLXclientState * cl, GLbyte * pc)
GLubyte answerBuffer[200];
char *answer;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
+
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
return error;
@@ -220,15 +226,13 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1);
- if (compsize < 0)
- compsize = 0;
- if (compsize2 < 0)
- compsize2 = 0;
- compsize = __GLX_PAD(compsize);
- compsize2 = __GLX_PAD(compsize2);
+ if ((compsize = safe_pad(compsize)) < 0)
+ return BadLength;
+ if ((compsize2 = safe_pad(compsize2)) < 0)
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
- __GLX_GET_ANSWER_BUFFER(answer, cl, compsize + compsize2, 1);
+ __GLX_GET_ANSWER_BUFFER(answer, cl, safe_add(compsize, compsize2), 1);
__glXClearErrorOccured();
glGetSeparableFilter(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
*(GLenum *) (pc + 8), answer, answer + compsize, NULL);
@@ -252,7 +256,8 @@ int
__glXDisp_GetSeparableFilter(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
-
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
return GetSeparableFilter(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
}
@@ -260,7 +265,8 @@ int
__glXDisp_GetSeparableFilterEXT(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
-
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
return GetSeparableFilter(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
}
@@ -299,7 +305,7 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
*/
compsize = __glGetTexImage_size(target, 1, format, type, width, height, 1);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
@@ -326,7 +332,8 @@ int
__glXDisp_GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
-
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
return GetConvolutionFilter(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
}
@@ -334,7 +341,8 @@ int
__glXDisp_GetConvolutionFilterEXT(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
-
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
return GetConvolutionFilter(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
}
@@ -368,7 +376,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
*/
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
@@ -393,7 +401,8 @@ int
__glXDisp_GetHistogram(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
-
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
return GetHistogram(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
}
@@ -401,7 +410,8 @@ int
__glXDisp_GetHistogramEXT(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
-
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
return GetHistogram(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
}
@@ -429,7 +439,7 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
compsize = __glGetTexImage_size(target, 1, format, type, 2, 1, 1);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
@@ -453,7 +463,8 @@ int
__glXDisp_GetMinmax(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
-
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
return GetMinmax(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
}
@@ -461,7 +472,8 @@ int
__glXDisp_GetMinmaxEXT(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
-
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
return GetMinmax(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
}
@@ -494,7 +506,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
*/
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
@@ -520,7 +532,8 @@ int
__glXDisp_GetColorTable(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
-
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
return GetColorTable(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
}
@@ -528,6 +541,7 @@ int
__glXDisp_GetColorTableSGI(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
-
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
return GetColorTable(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
}
diff --git a/xorg-server/glx/singlepixswap.c b/xorg-server/glx/singlepixswap.c
index b1ed6cec7..fa373faad 100644
--- a/xorg-server/glx/singlepixswap.c
+++ b/xorg-server/glx/singlepixswap.c
@@ -56,6 +56,8 @@ __glXDispSwap_ReadPixels(__GLXclientState * cl, GLbyte * pc)
int error;
char *answer, answerBuffer[200];
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 28);
+
__GLX_SWAP_INT(&((xGLXSingleReq *) pc)->contextTag);
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
@@ -78,7 +80,7 @@ __glXDispSwap_ReadPixels(__GLXclientState * cl, GLbyte * pc)
lsbFirst = *(GLboolean *) (pc + 25);
compsize = __glReadPixels_size(format, type, width, height);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
@@ -117,6 +119,8 @@ __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc)
char *answer, answerBuffer[200];
GLint width = 0, height = 0, depth = 1;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 20);
+
__GLX_SWAP_INT(&((xGLXSingleReq *) pc)->contextTag);
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
@@ -147,7 +151,7 @@ __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc)
compsize =
__glGetTexImage_size(target, level, format, type, width, height, depth);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
@@ -187,6 +191,8 @@ __glXDispSwap_GetPolygonStipple(__GLXclientState * cl, GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
+
__GLX_SWAP_INT(&((xGLXSingleReq *) pc)->contextTag);
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
if (!cx) {
@@ -254,15 +260,13 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1);
- if (compsize < 0)
- compsize = 0;
- if (compsize2 < 0)
- compsize2 = 0;
- compsize = __GLX_PAD(compsize);
- compsize2 = __GLX_PAD(compsize2);
+ if ((compsize = safe_pad(compsize)) < 0)
+ return BadLength;
+ if ((compsize2 = safe_pad(compsize2)) < 0)
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
- __GLX_GET_ANSWER_BUFFER(answer, cl, compsize + compsize2, 1);
+ __GLX_GET_ANSWER_BUFFER(answer, cl, safe_add(compsize, compsize2), 1);
__glXClearErrorOccured();
glGetSeparableFilter(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
*(GLenum *) (pc + 8), answer, answer + compsize, NULL);
@@ -288,7 +292,9 @@ int
__glXDispSwap_GetSeparableFilter(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
return GetSeparableFilter(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
}
@@ -296,7 +302,9 @@ int
__glXDispSwap_GetSeparableFilterEXT(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
return GetSeparableFilter(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
}
@@ -341,7 +349,7 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
*/
compsize = __glGetTexImage_size(target, 1, format, type, width, height, 1);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
@@ -370,7 +378,9 @@ int
__glXDispSwap_GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
return GetConvolutionFilter(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
}
@@ -378,7 +388,9 @@ int
__glXDispSwap_GetConvolutionFilterEXT(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
return GetConvolutionFilter(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
}
@@ -418,7 +430,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
*/
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
@@ -444,7 +456,9 @@ int
__glXDispSwap_GetHistogram(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
return GetHistogram(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
}
@@ -452,7 +466,9 @@ int
__glXDispSwap_GetHistogramEXT(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
return GetHistogram(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
}
@@ -486,7 +502,7 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
compsize = __glGetTexImage_size(target, 1, format, type, 2, 1, 1);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
@@ -510,7 +526,9 @@ int
__glXDispSwap_GetMinmax(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
return GetMinmax(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
}
@@ -518,7 +536,9 @@ int
__glXDispSwap_GetMinmaxEXT(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
return GetMinmax(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
}
@@ -557,7 +577,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
*/
compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
if (compsize < 0)
- compsize = 0;
+ return BadLength;
glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
@@ -584,7 +604,9 @@ int
__glXDispSwap_GetColorTable(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
return GetColorTable(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
}
@@ -592,6 +614,8 @@ int
__glXDispSwap_GetColorTableSGI(__GLXclientState * cl, GLbyte * pc)
{
const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+ ClientPtr client = cl->client;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
return GetColorTable(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
}
diff --git a/xorg-server/glx/swap_interval.c b/xorg-server/glx/swap_interval.c
index 80d8b9436..d82e63ff0 100644
--- a/xorg-server/glx/swap_interval.c
+++ b/xorg-server/glx/swap_interval.c
@@ -47,6 +47,8 @@ DoSwapInterval(__GLXclientState * cl, GLbyte * pc, int do_swap)
__GLXcontext *cx;
GLint interval;
+ REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 4);
+
cx = __glXLookupContextByTag(cl, tag);
if ((cx == NULL) || (cx->pGlxScreen == NULL)) {
diff --git a/xorg-server/glx/unpack.h b/xorg-server/glx/unpack.h
index 52fba74e1..2b1ebcf02 100644
--- a/xorg-server/glx/unpack.h
+++ b/xorg-server/glx/unpack.h
@@ -83,7 +83,8 @@ extern xGLXSingleReply __glXReply;
** pointer.
*/
#define __GLX_GET_ANSWER_BUFFER(res,cl,size,align) \
- if ((size) > sizeof(answerBuffer)) { \
+ if (size < 0) return BadLength; \
+ else if ((size) > sizeof(answerBuffer)) { \
int bump; \
if ((cl)->returnBufSize < (size)+(align)) { \
(cl)->returnBuf = (GLbyte*)realloc((cl)->returnBuf, \
diff --git a/xorg-server/hw/dmx/config/dmxparse.h b/xorg-server/hw/dmx/config/dmxparse.h
index 7d31b6309..cc2f0eb71 100644
--- a/xorg-server/hw/dmx/config/dmxparse.h
+++ b/xorg-server/hw/dmx/config/dmxparse.h
@@ -38,6 +38,7 @@
#define _DMXPARSE_H_
#include <stdio.h> /* For FILE */
+#include <X11/Xfuncproto.h> /* For _X_ATTRIBUTE_PRINTF */
/** Stores tokens not stored in other structures (e.g., keywords and ;) */
typedef struct _DMXConfigToken {
@@ -203,7 +204,7 @@ extern int yylex(void);
extern int yydebug;
extern void yyerror(const char *message);
-extern void dmxConfigLog(const char *format, ...);
+extern void dmxConfigLog(const char *format, ...) _X_ATTRIBUTE_PRINTF(1,0);
extern void *dmxConfigAlloc(unsigned long bytes);
extern void *dmxConfigRealloc(void *orig,
unsigned long orig_bytes, unsigned long bytes);
diff --git a/xorg-server/hw/dmx/config/dmxprint.c b/xorg-server/hw/dmx/config/dmxprint.c
index 9dec52b5c..c80e830e4 100644
--- a/xorg-server/hw/dmx/config/dmxprint.c
+++ b/xorg-server/hw/dmx/config/dmxprint.c
@@ -130,7 +130,7 @@ dmxConfigPopState(void)
dmxConfigNewline();
}
-static void
+static void _X_ATTRIBUTE_PRINTF(4, 5)
dmxConfigOutput(int addSpace, int doNewline, const char *comment,
const char *format, ...)
{
@@ -261,32 +261,20 @@ dmxConfigPrintString(DMXConfigStringPtr p, int quote)
static int
dmxConfigPrintPair(DMXConfigPairPtr p, int addSpace)
{
- const char *format = NULL;
-
if (!p)
return 0;
- switch (p->token) {
- case T_ORIGIN:
- format = "@%dx%d";
- break;
- case T_DIMENSION:
- format = "%dx%d";
- break;
- case T_OFFSET:
- format = "%c%d%c%d";
- break;
- }
if (p->token == T_OFFSET) {
if (!p->comment && !p->x && !p->y && p->xsign >= 0 && p->ysign >= 0)
return 0;
- dmxConfigOutput(addSpace, 0, p->comment, format,
+ dmxConfigOutput(addSpace, 0, p->comment, "%c%d%c%d",
p->xsign < 0 ? '-' : '+', p->x,
p->ysign < 0 ? '-' : '+', p->y);
}
else {
if (!p->comment && !p->x && !p->y)
return 0;
- dmxConfigOutput(addSpace, 0, p->comment, format, p->x, p->y);
+ dmxConfigOutput(addSpace, 0, p->comment, "%s%dx%d",
+ (p->token == T_ORIGIN) ? "@" : "", p->x, p->y);
}
return 1;
}
diff --git a/xorg-server/hw/dmx/dmx.c b/xorg-server/hw/dmx/dmx.c
index 99e970cb9..2988df33a 100644
--- a/xorg-server/hw/dmx/dmx.c
+++ b/xorg-server/hw/dmx/dmx.c
@@ -55,6 +55,7 @@
#include "extinit.h"
#include "opaque.h"
+#include "dmx.h"
#include "dmxextension.h"
#include <X11/extensions/dmxproto.h>
#include <X11/extensions/dmx.h>
diff --git a/xorg-server/hw/dmx/dmxcb.c b/xorg-server/hw/dmx/dmxcb.c
index 86015f395..cca5702ee 100644
--- a/xorg-server/hw/dmx/dmxcb.c
+++ b/xorg-server/hw/dmx/dmxcb.c
@@ -47,9 +47,6 @@ extern int connBlockScreenStart;
#ifdef PANORAMIX
#include "panoramiXsrv.h"
-extern int PanoramiXPixWidth;
-extern int PanoramiXPixHeight;
-extern int PanoramiXNumScreens;
#endif
int dmxGlobalWidth, dmxGlobalHeight;
diff --git a/xorg-server/hw/dmx/dmxfont.h b/xorg-server/hw/dmx/dmxfont.h
index 8575ca953..66c663377 100644
--- a/xorg-server/hw/dmx/dmxfont.h
+++ b/xorg-server/hw/dmx/dmxfont.h
@@ -54,6 +54,4 @@ extern Bool dmxUnrealizeFont(ScreenPtr pScreen, FontPtr pFont);
extern Bool dmxBELoadFont(ScreenPtr pScreen, FontPtr pFont);
extern Bool dmxBEFreeFont(ScreenPtr pScreen, FontPtr pFont);
-extern int dmxFontPrivateIndex;
-
#endif /* DMXFONT_H */
diff --git a/xorg-server/hw/dmx/dmxgc.c b/xorg-server/hw/dmx/dmxgc.c
index 234316797..ec15d27aa 100644
--- a/xorg-server/hw/dmx/dmxgc.c
+++ b/xorg-server/hw/dmx/dmxgc.c
@@ -49,7 +49,7 @@
#include "pixmapstr.h"
#include "migc.h"
-static GCFuncs dmxGCFuncs = {
+static const GCFuncs dmxGCFuncs = {
dmxValidateGC,
dmxChangeGC,
dmxCopyGC,
@@ -59,7 +59,7 @@ static GCFuncs dmxGCFuncs = {
dmxCopyClip,
};
-static GCOps dmxGCOps = {
+static const GCOps dmxGCOps = {
dmxFillSpans,
dmxSetSpans,
dmxPutImage,
diff --git a/xorg-server/hw/dmx/dmxgc.h b/xorg-server/hw/dmx/dmxgc.h
index c8ecb53a0..c5c6b7732 100644
--- a/xorg-server/hw/dmx/dmxgc.h
+++ b/xorg-server/hw/dmx/dmxgc.h
@@ -41,8 +41,8 @@
/** GC private area. */
typedef struct _dmxGCPriv {
- GCOps *ops;
- GCFuncs *funcs;
+ const GCOps *ops;
+ const GCFuncs *funcs;
XlibGC gc;
Bool msc;
} dmxGCPrivRec, *dmxGCPrivPtr;
diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c
index c782a9bff..2d3b2e9e0 100644
--- a/xorg-server/hw/dmx/dmxinit.c
+++ b/xorg-server/hw/dmx/dmxinit.c
@@ -164,23 +164,23 @@ dmxErrorHandler(Display * dpy, XErrorEvent * ev)
switch (ev->error_code) {
case BadValue:
dmxLog(dmxWarning, " Value: 0x%x\n",
- ev->resourceid);
+ (unsigned int) ev->resourceid);
break;
case BadAtom:
dmxLog(dmxWarning, " AtomID: 0x%x\n",
- ev->resourceid);
+ (unsigned int) ev->resourceid);
break;
default:
dmxLog(dmxWarning, " ResourceID: 0x%x\n",
- ev->resourceid);
+ (unsigned int) ev->resourceid);
break;
}
/* Provide serial number information */
dmxLog(dmxWarning, " Failed serial number: %d\n",
- ev->serial);
+ (unsigned int) ev->serial);
dmxLog(dmxWarning, " Current serial number: %d\n",
- dpy->request);
+ (unsigned int) dpy->request);
return 0;
}
@@ -634,7 +634,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
if (major > 0 && minor > 0)
year += 2000;
- dmxLog(dmxInfo, "Generation: %d\n", dmxGeneration);
+ dmxLog(dmxInfo, "Generation: %lu\n", dmxGeneration);
dmxLog(dmxInfo, "DMX version: %d.%d.%02d%02d%02d (%s)\n",
major, minor, year, month, day, VENDOR_STRING);
@@ -762,7 +762,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
dmxGlxVisualPrivate **configprivs = NULL;
int nconfigs = 0;
int (*oldErrorHandler) (Display *, XErrorEvent *);
- int i;
/* Catch errors if when using an older GLX w/o FBconfigs */
oldErrorHandler = XSetErrorHandler(dmxNOPErrorHandler);
@@ -797,28 +796,29 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
configprivs = malloc(nconfigs * sizeof(dmxGlxVisualPrivate *));
if (configs != NULL && configprivs != NULL) {
+ int j;
/* Initialize our private info for each visual
* (currently only x_visual_depth and x_visual_class)
*/
- for (i = 0; i < nconfigs; i++) {
+ for (j = 0; j < nconfigs; j++) {
- configprivs[i] = (dmxGlxVisualPrivate *)
+ configprivs[j] = (dmxGlxVisualPrivate *)
malloc(sizeof(dmxGlxVisualPrivate));
- configprivs[i]->x_visual_depth = 0;
- configprivs[i]->x_visual_class = 0;
+ configprivs[j]->x_visual_depth = 0;
+ configprivs[j]->x_visual_class = 0;
/* Find the visual depth */
- if (configs[i].vid > 0) {
- int j;
-
- for (j = 0; j < dmxScreen->beNumVisuals; j++) {
- if (dmxScreen->beVisuals[j].visualid ==
- configs[i].vid) {
- configprivs[i]->x_visual_depth =
- dmxScreen->beVisuals[j].depth;
- configprivs[i]->x_visual_class =
- dmxScreen->beVisuals[j].class;
+ if (configs[j].vid > 0) {
+ int k;
+
+ for (k = 0; k < dmxScreen->beNumVisuals; k++) {
+ if (dmxScreen->beVisuals[k].visualid ==
+ configs[j].vid) {
+ configprivs[j]->x_visual_depth =
+ dmxScreen->beVisuals[k].depth;
+ configprivs[j]->x_visual_class =
+ dmxScreen->beVisuals[k].class;
break;
}
}
diff --git a/xorg-server/hw/dmx/dmxpict.c b/xorg-server/hw/dmx/dmxpict.c
index 64d0ae150..aaca178b9 100644
--- a/xorg-server/hw/dmx/dmxpict.c
+++ b/xorg-server/hw/dmx/dmxpict.c
@@ -57,7 +57,6 @@
#include "mipict.h"
#include "fbpict.h"
-extern int RenderErrBase;
extern int (*ProcRenderVector[RenderNumberRequests]) (ClientPtr);
static int (*dmxSaveRenderVector[RenderNumberRequests]) (ClientPtr);
diff --git a/xorg-server/hw/dmx/dmxprop.c b/xorg-server/hw/dmx/dmxprop.c
index 4be2dbd4c..5e306d286 100644
--- a/xorg-server/hw/dmx/dmxprop.c
+++ b/xorg-server/hw/dmx/dmxprop.c
@@ -220,7 +220,7 @@ dmxPropertyCheckOtherWindows(DMXScreenInfo * dmxScreen, Atom atom)
if (XGetTextProperty(dpy, win, &tp, atom) && tp.nitems) {
dmxLog(dmxDebug, "On %s/%lu: %s\n",
- dmxScreen->name, win, tp.value);
+ dmxScreen->name, (unsigned long) win, tp.value);
if (!strncmp((char *) tp.value, (char *) id,
strlen((char *) id))) {
int idx;
@@ -360,8 +360,8 @@ dmxPropertyWindow(DMXScreenInfo * dmxScreen)
dmxScreen->next = (other->next ? other->next : other);
other->next = (tmp ? tmp : dmxScreen);
dmxLog(dmxDebug, "%d/%s/%lu and %d/%s/%lu are on the same backend\n",
- dmxScreen->index, dmxScreen->name, dmxScreen->scrnWin,
- other->index, other->name, other->scrnWin);
+ dmxScreen->index, dmxScreen->name, (unsigned long) dmxScreen->scrnWin,
+ other->index, other->name, (unsigned long) other->scrnWin);
}
snprintf(buf, sizeof(buf), ".%d,%lu", dmxScreen->index,
diff --git a/xorg-server/hw/dmx/dmxscrinit.c b/xorg-server/hw/dmx/dmxscrinit.c
index 963d3a9de..097418d05 100644
--- a/xorg-server/hw/dmx/dmxscrinit.c
+++ b/xorg-server/hw/dmx/dmxscrinit.c
@@ -80,7 +80,6 @@ dmxBEScreenInit(ScreenPtr pScreen)
{
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
XSetWindowAttributes attribs;
- XGCValues gcvals;
unsigned long mask;
int i, j;
diff --git a/xorg-server/hw/dmx/dmxwindow.c b/xorg-server/hw/dmx/dmxwindow.c
index c75373534..c157e1099 100644
--- a/xorg-server/hw/dmx/dmxwindow.c
+++ b/xorg-server/hw/dmx/dmxwindow.c
@@ -857,13 +857,9 @@ dmxResizeWindow(WindowPtr pWindow, int x, int y,
ScreenPtr pScreen = pWindow->drawable.pScreen;
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
- dmxWinPrivPtr pSibPriv;
unsigned int m;
XWindowChanges c;
- if (pSib)
- pSibPriv = DMX_GET_WINDOW_PRIV(pSib);
-
DMX_UNWRAP(ResizeWindow, dmxScreen, pScreen);
#if 1
if (pScreen->ResizeWindow)
diff --git a/xorg-server/hw/dmx/glxProxy/compsize.h b/xorg-server/hw/dmx/glxProxy/compsize.h
index 360966233..5e759b0a0 100644
--- a/xorg-server/hw/dmx/glxProxy/compsize.h
+++ b/xorg-server/hw/dmx/glxProxy/compsize.h
@@ -48,4 +48,11 @@ extern GLint __glTexGeniv_size(GLenum e);
extern GLint __glTexParameterfv_size(GLenum e);
extern GLint __glTexParameteriv_size(GLenum e);
+extern GLint __glCallLists_size(GLsizei n, GLenum type);
+extern GLint __glDrawPixels_size(GLenum format, GLenum type, GLsizei w, GLsizei h);
+extern GLint __glBitmap_size(GLsizei w, GLsizei h);
+extern GLint __glTexImage1D_size(GLenum format, GLenum type, GLsizei w);
+extern GLint __glTexImage2D_size(GLenum format, GLenum type, GLsizei w, GLsizei h);
+extern GLint __glTexImage3D_size(GLenum format, GLenum type, GLsizei w, GLsizei h, GLsizei d);
+
#endif /* !__compsize_h__ */
diff --git a/xorg-server/hw/dmx/glxProxy/g_disptab.h b/xorg-server/hw/dmx/glxProxy/g_disptab.h
index 530338798..783f87a54 100644
--- a/xorg-server/hw/dmx/glxProxy/g_disptab.h
+++ b/xorg-server/hw/dmx/glxProxy/g_disptab.h
@@ -655,7 +655,6 @@ extern void __glXDispSwap_CopyConvolutionFilter2D(GLbyte *);
extern void __glXDispSwap_SeparableFilter2D(GLbyte *);
extern void __glXDispSwap_TexImage3D(GLbyte *);
extern void __glXDispSwap_TexSubImage3D(GLbyte *);
-extern void __glXDispSwap_DrawArrays(GLbyte *);
extern void __glXDispSwap_PrioritizeTextures(GLbyte *);
extern void __glXDispSwap_CopyTexImage1D(GLbyte *);
extern void __glXDispSwap_CopyTexImage2D(GLbyte *);
@@ -663,6 +662,26 @@ extern void __glXDispSwap_CopyTexSubImage1D(GLbyte *);
extern void __glXDispSwap_CopyTexSubImage2D(GLbyte *);
extern void __glXDispSwap_CopyTexSubImage3D(GLbyte *);
+extern void __glXDispSwap_BindTexture(GLbyte *);
+extern void __glXDispSwap_BlendColor(GLbyte *);
+extern void __glXDispSwap_BlendEquation(GLbyte *);
+extern void __glXDispSwap_ColorTable(GLbyte *);
+extern void __glXDispSwap_ColorTableParameterfv(GLbyte *);
+extern void __glXDispSwap_ColorTableParameteriv(GLbyte *);
+extern void __glXDispSwap_CopyColorTable(GLbyte *);
+extern void __glXDispSwap_ConvolutionParameterf(GLbyte *);
+extern void __glXDispSwap_ConvolutionParameteri(GLbyte *);
+extern void __glXDispSwap_Histogram(GLbyte *);
+extern void __glXDispSwap_Minmax(GLbyte *);
+extern void __glXDispSwap_ResetHistogram(GLbyte *);
+extern void __glXDispSwap_ResetMinmax(GLbyte *);
+
+extern int __glXSwapCreateContextWithConfigSGIX(__GLXclientState *, GLbyte *);
+extern int __glXSwapBindSwapBarrierSGIX(__GLXclientState *, GLbyte *);
+extern int __glXSwapJoinSwapGroupSGIX(__GLXclientState *, GLbyte *);
+extern int __glXSwapQueryMaxSwapBarriersSGIX(__GLXclientState *, GLbyte *);
+extern int __glXSwapMakeCurrentReadSGI(__GLXclientState *, GLbyte *);
+
#define __GLX_MIN_GLXCMD_OPCODE 1
#define __GLX_MAX_GLXCMD_OPCODE 20
#define __GLX_MIN_RENDER_OPCODE 1
diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index fb4d5acce..4c500c93d 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -61,7 +61,6 @@
extern __GLXFBConfig **__glXFBConfigs;
extern int __glXNumFBConfigs;
-extern int glxIsExtensionSupported(char *ext);
extern int __glXGetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc);
#define BE_TO_CLIENT_ERROR(x) \
@@ -3394,11 +3393,11 @@ __glXCreatePbuffer(__GLXclientState * cl, GLbyte * pc)
/* Send attributes */
if (attr != NULL) {
- CARD32 *pc = (CARD32 *) (be_req + 1);
+ CARD32 *pca = (CARD32 *) (be_req + 1);
while (numAttribs-- > 0) {
- *pc++ = *attr++; /* token */
- *pc++ = *attr++; /* value */
+ *pca++ = *attr++; /* token */
+ *pca++ = *attr++; /* value */
}
}
diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.h b/xorg-server/hw/dmx/glxProxy/glxcmds.h
index b0745927e..689e33485 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.h
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.h
@@ -33,5 +33,11 @@ extern int __glXCreateContextWithConfigSGIX(__GLXclientState * cl, GLbyte * pc);
extern int __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc);
extern int __glXMakeCurrentReadSGI(__GLXclientState * cl, GLbyte * pc);
extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState * cl, GLbyte * pc);
+extern int __glXDoSwapBuffers(__GLXclientState * cl, XID drawId,
+ GLXContextTag tag);
+
+extern Display *GetBackEndDisplay(__GLXclientState * cl, int s);
+extern int GetCurrentBackEndTag(__GLXclientState * cl, GLXContextTag tag,
+ int s);
#endif /* !__GLX_cmds_h__ */
diff --git a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
index ab3e7edc1..600a6e1cb 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
@@ -39,8 +39,6 @@
#include "glxext.h"
#include "glxvendor.h"
-extern int glxIsExtensionSupported(char *ext);
-
int __glXSwapGetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc);
/************************************************************************/
diff --git a/xorg-server/hw/dmx/glxProxy/glxext.h b/xorg-server/hw/dmx/glxProxy/glxext.h
index 47cec15cf..b96ebc1f4 100644
--- a/xorg-server/hw/dmx/glxProxy/glxext.h
+++ b/xorg-server/hw/dmx/glxProxy/glxext.h
@@ -53,6 +53,7 @@ extern void __glXFlushContextCache(void);
extern void __glXFreeGLXWindow(__glXWindow * pGlxWindow);
extern void __glXFreeGLXPixmap(__GLXpixmap * pGlxPixmap);
+extern void __glXFreeGLXPbuffer(__glXPbuffer * pGlxPbuffer);
extern void __glXNoSuchRenderOpcode(GLbyte *);
extern int __glXNoSuchSingleOpcode(__GLXclientState *, GLbyte *);
diff --git a/xorg-server/hw/dmx/glxProxy/glxscreens.c b/xorg-server/hw/dmx/glxProxy/glxscreens.c
index 138afedf2..15bb1e862 100644
--- a/xorg-server/hw/dmx/glxProxy/glxscreens.c
+++ b/xorg-server/hw/dmx/glxProxy/glxscreens.c
@@ -65,8 +65,6 @@ static void
CalcServerVersionAndExtensions(void)
{
int s;
- xGLXQueryVersionReq *req;
- xGLXQueryVersionReply reply;
char **be_extensions;
char *ext;
char *denied_extensions;
@@ -80,6 +78,8 @@ CalcServerVersionAndExtensions(void)
for (s = 0; s < __glXNumActiveScreens; s++) {
DMXScreenInfo *dmxScreen = &dmxScreens[s];
Display *dpy = dmxScreen->beDisplay;
+ xGLXQueryVersionReq *req;
+ xGLXQueryVersionReply reply;
/* Send the glXQueryVersion request */
LockDisplay(dpy);
@@ -335,7 +335,7 @@ __glXGetServerString(unsigned int name)
}
int
-glxIsExtensionSupported(char *ext)
+glxIsExtensionSupported(const char *ext)
{
return (strstr(ExtensionsString, ext) != NULL);
}
diff --git a/xorg-server/hw/dmx/glxProxy/glxscreens.h b/xorg-server/hw/dmx/glxProxy/glxscreens.h
index a9fe2a9db..bb7477bc7 100644
--- a/xorg-server/hw/dmx/glxProxy/glxscreens.h
+++ b/xorg-server/hw/dmx/glxProxy/glxscreens.h
@@ -50,4 +50,6 @@ extern void __glXScreenReset(void);
extern char *__glXGetServerString(unsigned int name);
+extern int glxIsExtensionSupported(const char *ext);
+
#endif /* !__GLX_screens_h__ */
diff --git a/xorg-server/hw/dmx/glxProxy/glxserver.h b/xorg-server/hw/dmx/glxProxy/glxserver.h
index 754ad30a0..7aa5ad2f2 100644
--- a/xorg-server/hw/dmx/glxProxy/glxserver.h
+++ b/xorg-server/hw/dmx/glxProxy/glxserver.h
@@ -149,9 +149,7 @@ extern __GLXclientState *__glXClients[];
typedef void (*__GLXdispatchRenderProcPtr) (GLbyte *);
typedef int (*__GLXdispatchSingleProcPtr) (__GLXclientState *, GLbyte *);
typedef int (*__GLXdispatchVendorPrivProcPtr) (__GLXclientState *, GLbyte *);
-extern __GLXdispatchSingleProcPtr __glXSingleTable[];
extern __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[];
-extern __GLXdispatchSingleProcPtr __glXSwapSingleTable[];
extern __GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[];
extern __GLXdispatchRenderProcPtr __glXSwapRenderTable[];
@@ -193,9 +191,6 @@ extern RESTYPE __glXPbufferRes;
extern char *__glXcombine_strings(const char *, const char *);
-extern void __glXDisp_DrawArrays(GLbyte *);
-extern void __glXDispSwap_DrawArrays(GLbyte *);
-
/*
** Routines for sending swapped replies.
*/
@@ -287,9 +282,6 @@ extern int __glXConvolutionParameterfvSize(GLenum pname);
extern int __glXColorTableParameterfvSize(GLenum pname);
extern int __glXColorTableParameterivSize(GLenum pname);
-extern void __glXFreeGLXWindow(__glXWindow * pGlxWindow);
-extern void __glXFreeGLXPbuffer(__glXPbuffer * pGlxPbuffer);
-
extern int __glXVersionMajor;
extern int __glXVersionMinor;
diff --git a/xorg-server/hw/dmx/glxProxy/glxsingle.c b/xorg-server/hw/dmx/glxProxy/glxsingle.c
index 034497315..79d426bbf 100644
--- a/xorg-server/hw/dmx/glxProxy/glxsingle.c
+++ b/xorg-server/hw/dmx/glxProxy/glxsingle.c
@@ -45,6 +45,8 @@
/* #include "g_disptab_EXT.h" */
#include "unpack.h"
#include "glxutil.h"
+#include "glxcmds.h"
+#include "glxsingle.h"
#include "GL/glxproto.h"
@@ -81,10 +83,6 @@
#define X_GLXSingle 0 /* needed by GetReqExtra */
-extern Display *GetBackEndDisplay(__GLXclientState * cl, int s);
-extern int GetCurrentBackEndTag(__GLXclientState * cl, GLXContextTag tag,
- int s);
-
static int swap_vec_element_size = 0;
static void
diff --git a/xorg-server/hw/dmx/glxProxy/glxsingle.h b/xorg-server/hw/dmx/glxProxy/glxsingle.h
index 32a9d4921..6126177fa 100644
--- a/xorg-server/hw/dmx/glxProxy/glxsingle.h
+++ b/xorg-server/hw/dmx/glxProxy/glxsingle.h
@@ -47,8 +47,4 @@ extern int __glXForwardAllWithReplySwapsv(__GLXclientState * cl, GLbyte * pc);
extern int __glXForwardAllWithReplySwapiv(__GLXclientState * cl, GLbyte * pc);
extern int __glXForwardAllWithReplySwapdv(__GLXclientState * cl, GLbyte * pc);
-extern int __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc);
-extern int __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc);
-extern int __glXDispSwap_GetColorTable(__GLXclientState * cl, GLbyte * pc);
-
#endif
diff --git a/xorg-server/hw/dmx/glxProxy/glxswap.c b/xorg-server/hw/dmx/glxProxy/glxswap.c
index 5f565010d..bc18e5518 100644
--- a/xorg-server/hw/dmx/glxProxy/glxswap.c
+++ b/xorg-server/hw/dmx/glxProxy/glxswap.c
@@ -39,9 +39,7 @@
#include "dmxwindow.h"
#include "glxserver.h"
#include "glxswap.h"
-
-extern int __glXDoSwapBuffers(__GLXclientState * cl, XID drawId,
- GLXContextTag tag);
+#include "glxcmds.h"
typedef struct _SwapGroup *SwapGroupPtr;
diff --git a/xorg-server/hw/dmx/glxProxy/glxvendor.c b/xorg-server/hw/dmx/glxProxy/glxvendor.c
index fc8aff0cc..52d70eb70 100644
--- a/xorg-server/hw/dmx/glxProxy/glxvendor.c
+++ b/xorg-server/hw/dmx/glxProxy/glxvendor.c
@@ -44,6 +44,8 @@
/* #include "g_disptab_EXT.h" */
#include "unpack.h"
#include "glxutil.h"
+#include "glxcmds.h"
+#include "glxvendor.h"
#include "GL/glxproto.h"
@@ -78,10 +80,6 @@
dpy->request++
#endif
-extern Display *GetBackEndDisplay(__GLXclientState * cl, int s);
-extern int GetCurrentBackEndTag(__GLXclientState * cl, GLXContextTag tag,
- int s);
-
static int swap_vec_element_size = 0;
static void
diff --git a/xorg-server/hw/dmx/input/dmxinputinit.c b/xorg-server/hw/dmx/input/dmxinputinit.c
index abb6a8551..56a39df8c 100644
--- a/xorg-server/hw/dmx/input/dmxinputinit.c
+++ b/xorg-server/hw/dmx/input/dmxinputinit.c
@@ -874,17 +874,17 @@ dmxInputScanForExtensions(DMXInputInfo * dmxInput, int doXI)
{
XExtensionVersion *ext;
XDeviceInfo *devices;
- Display *display;
+ Display *dsp;
int num;
int i, j;
XextErrorHandler handler;
- if (!(display = XOpenDisplay(dmxInput->name)))
+ if (!(dsp = XOpenDisplay(dmxInput->name)))
return;
/* Print out information about the XInput Extension. */
handler = XSetExtensionErrorHandler(dmxInputExtensionErrorHandler);
- ext = XGetExtensionVersion(display, INAME);
+ ext = XGetExtensionVersion(dsp, INAME);
XSetExtensionErrorHandler(handler);
if (!ext || ext == (XExtensionVersion *) NoSuchExtension) {
@@ -894,7 +894,7 @@ dmxInputScanForExtensions(DMXInputInfo * dmxInput, int doXI)
dmxLogInput(dmxInput, "Locating devices on %s (%s version %d.%d)\n",
dmxInput->name, INAME,
ext->major_version, ext->minor_version);
- devices = XListInputDevices(display, &num);
+ devices = XListInputDevices(dsp, &num);
XFree(ext);
ext = NULL;
@@ -956,7 +956,7 @@ dmxInputScanForExtensions(DMXInputInfo * dmxInput, int doXI)
}
XFreeDeviceList(devices);
}
- XCloseDisplay(display);
+ XCloseDisplay(dsp);
}
/** Re-initialize all the devices described in \a dmxInput. Called from
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c
index e879faff5..0be94b4d0 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.c
@@ -809,7 +809,11 @@ ephyrUpdateModifierState(unsigned int state)
for (key = 0; key < MAP_LENGTH; key++)
if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
- if (key_is_down(pDev, key, KEY_PROCESSED))
+ if (mask == XCB_MOD_MASK_LOCK) {
+ KdEnqueueKeyboardEvent(ephyrKbd, key, FALSE);
+ KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE);
+ }
+ else if (key_is_down(pDev, key, KEY_PROCESSED))
KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE);
if (--count == 0)
@@ -823,6 +827,8 @@ ephyrUpdateModifierState(unsigned int state)
for (key = 0; key < MAP_LENGTH; key++)
if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
KdEnqueueKeyboardEvent(ephyrKbd, key, FALSE);
+ if (mask == XCB_MOD_MASK_LOCK)
+ KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE);
break;
}
}
@@ -1303,7 +1309,7 @@ ephyrPutColors(ScreenPtr pScreen, int n, xColorItem * pdefs)
if (p > max)
max = p;
- hostx_set_cmap_entry(p,
+ hostx_set_cmap_entry(pScreen, p,
pdefs->red >> 8,
pdefs->green >> 8, pdefs->blue >> 8);
pdefs++;
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.h b/xorg-server/hw/kdrive/ephyr/ephyr.h
index 01045e104..9a9fe2a79 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.h
@@ -85,6 +85,7 @@ typedef struct _ephyrScrPriv {
KdScreenInfo *screen;
int mynum; /* Screen number */
+ unsigned long cmap[256];
/**
* Per-screen Xlib-using state for glamor (private to
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index 7a3338f11..0baf35929 100755
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -84,8 +84,6 @@ struct EphyrHostXVars {
KdScreenInfo **screens;
long damage_debug_msec;
-
- unsigned long cmap[256];
};
/* memset ( missing> ) instead of below */
@@ -761,9 +759,12 @@ hostx_calculate_color_shift(unsigned long mask)
}
void
-hostx_set_cmap_entry(unsigned char idx,
+hostx_set_cmap_entry(ScreenPtr pScreen, unsigned char idx,
unsigned char r, unsigned char g, unsigned char b)
{
+ KdScreenPriv(pScreen);
+ KdScreenInfo *screen = pScreenPriv->screen;
+ EphyrScrPriv *scrpriv = screen->driver;
/* need to calculate the shifts for RGB because server could be BGR. */
/* XXX Not sure if this is correct for 8 on 16, but this works for 8 on 24.*/
static int rshift, bshift, gshift = 0;
@@ -775,7 +776,7 @@ hostx_set_cmap_entry(unsigned char idx,
gshift = hostx_calculate_color_shift(HostX.visual->green_mask);
bshift = hostx_calculate_color_shift(HostX.visual->blue_mask);
}
- HostX.cmap[idx] = ((r << rshift) & HostX.visual->red_mask) |
+ scrpriv->cmap[idx] = ((r << rshift) & HostX.visual->red_mask) |
((g << gshift) & HostX.visual->green_mask) |
((b << bshift) & HostX.visual->blue_mask);
}
@@ -1035,7 +1036,7 @@ hostx_paint_rect(KdScreenInfo *screen,
unsigned char pixel =
*(unsigned char *) (scrpriv->fb_data + idx);
xcb_image_put_pixel(scrpriv->ximg, x, y,
- HostX.cmap[pixel]);
+ scrpriv->cmap[pixel]);
break;
}
default:
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.h b/xorg-server/hw/kdrive/ephyr/hostx.h
index 1e81747cc..679dfd3ad 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.h
+++ b/xorg-server/hw/kdrive/ephyr/hostx.h
@@ -145,7 +145,7 @@ hostx_get_visual_masks(KdScreenInfo *screen,
CARD32 *rmsk, CARD32 *gmsk, CARD32 *bmsk);
void
-hostx_set_cmap_entry(unsigned char idx,
+hostx_set_cmap_entry(ScreenPtr pScreen, unsigned char idx,
unsigned char r, unsigned char g, unsigned char b);
void *hostx_screen_init(KdScreenInfo *screen,
diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am
index d46bf0a86..27f2cc6cb 100644
--- a/xorg-server/hw/xfree86/Makefile.am
+++ b/xorg-server/hw/xfree86/Makefile.am
@@ -106,7 +106,7 @@ if INSTALL_SETUID
endif
if SUID_WRAPPER
$(MKDIR_P) $(DESTDIR)$(SUID_WRAPPER_DIR)
- mv $(DESTDIR)$(bindir)/Xorg $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.bin
+ mv $(DESTDIR)$(bindir)/Xorg $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg
${INSTALL} -m 755 Xorg.sh $(DESTDIR)$(bindir)/Xorg
-chown root $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap && chmod u+s $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap
endif
diff --git a/xorg-server/hw/xfree86/Xorg.sh.in b/xorg-server/hw/xfree86/Xorg.sh.in
index cef4859c8..481413523 100644
--- a/xorg-server/hw/xfree86/Xorg.sh.in
+++ b/xorg-server/hw/xfree86/Xorg.sh.in
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# Execute Xorg.wrap if it exists otherwise execute Xorg.bin directly.
+# Execute Xorg.wrap if it exists otherwise execute Xorg directly.
# This allows distros to put the suid wrapper in a separate package.
basedir=@SUID_WRAPPER_DIR@
if [ -x "$basedir"/Xorg.wrap ]; then
exec "$basedir"/Xorg.wrap "$@"
else
- exec "$basedir"/Xorg.bin "$@"
+ exec "$basedir"/Xorg "$@"
fi
diff --git a/xorg-server/hw/xfree86/common/xf86AutoConfig.c b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
index 03dad150a..1450afbfc 100644
--- a/xorg-server/hw/xfree86/common/xf86AutoConfig.c
+++ b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
@@ -208,7 +208,6 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
if (xf86Info.consoleFd >= 0 && (i < (nmatches - 1))) {
struct vis_identifier visid;
const char *cp;
- extern char xf86SolarisFbDev[PATH_MAX];
int iret;
SYSCALL(iret = ioctl(xf86Info.consoleFd, VIS_GETIDENTIFIER, &visid));
diff --git a/xorg-server/hw/xfree86/dri2/dri2.c b/xorg-server/hw/xfree86/dri2/dri2.c
index c8fcd6220..0c038b3d1 100644
--- a/xorg-server/hw/xfree86/dri2/dri2.c
+++ b/xorg-server/hw/xfree86/dri2/dri2.c
@@ -156,6 +156,9 @@ GetScreenPrime(ScreenPtr master, int prime_id)
DRI2ScreenPtr ds;
ds = DRI2GetScreen(slave);
+ if (ds == NULL)
+ continue;
+
if (ds->prime_id == prime_id)
return slave;
}
@@ -1573,15 +1576,15 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
if (info->version == 3 || info->numDrivers == 0) {
/* Driver too old: use the old-style driverName field */
- ds->numDrivers = 1;
- ds->driverNames = malloc(sizeof(*ds->driverNames));
+ ds->numDrivers = info->driverName ? 1 : 2;
+ ds->driverNames = malloc(ds->numDrivers * sizeof(*ds->driverNames));
if (!ds->driverNames)
goto err_out;
if (info->driverName) {
ds->driverNames[0] = info->driverName;
} else {
- ds->driverNames[0] = dri2_probe_driver_name(pScreen, info);
+ ds->driverNames[0] = ds->driverNames[1] = dri2_probe_driver_name(pScreen, info);
if (!ds->driverNames[0])
return FALSE;
}
diff --git a/xorg-server/hw/xfree86/dri2/dri2ext.c b/xorg-server/hw/xfree86/dri2/dri2ext.c
index ffd66fad6..221ec530b 100644
--- a/xorg-server/hw/xfree86/dri2/dri2ext.c
+++ b/xorg-server/hw/xfree86/dri2/dri2ext.c
@@ -270,6 +270,9 @@ ProcDRI2GetBuffers(ClientPtr client)
unsigned int *attachments;
REQUEST_FIXED_SIZE(xDRI2GetBuffersReq, stuff->count * 4);
+ if (stuff->count > (INT_MAX / 4))
+ return BadLength;
+
if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,
&pDrawable, &status))
return status;
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/Makefile.am b/xorg-server/hw/xfree86/drivers/modesetting/Makefile.am
index 5b08600c1..82c4f2f32 100644
--- a/xorg-server/hw/xfree86/drivers/modesetting/Makefile.am
+++ b/xorg-server/hw/xfree86/drivers/modesetting/Makefile.am
@@ -48,6 +48,9 @@ modesetting_drv_la_SOURCES = \
driver.h \
drmmode_display.c \
drmmode_display.h \
+ dumb_bo.c \
+ dumb_bo.h \
+ present.c \
vblank.c \
$(NULL)
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/dri2.c b/xorg-server/hw/xfree86/drivers/modesetting/dri2.c
index 6c88060b0..63cb0659d 100644
--- a/xorg-server/hw/xfree86/drivers/modesetting/dri2.c
+++ b/xorg-server/hw/xfree86/drivers/modesetting/dri2.c
@@ -43,8 +43,6 @@
#include "dri2.h"
#ifdef GLAMOR
-#define GLAMOR_FOR_XORG 1
-#include "glamor.h"
enum ms_dri2_frame_event_type {
MS_DRI2_QUEUE_SWAP,
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/driver.c b/xorg-server/hw/xfree86/drivers/modesetting/driver.c
index 592f2469b..d52517d1a 100644
--- a/xorg-server/hw/xfree86/drivers/modesetting/driver.c
+++ b/xorg-server/hw/xfree86/drivers/modesetting/driver.c
@@ -61,11 +61,6 @@
#include "driver.h"
-#ifdef GLAMOR
-#define GLAMOR_FOR_XORG 1
-#include "glamor.h"
-#endif
-
static void AdjustFrame(ScrnInfoPtr pScrn, int x, int y);
static Bool CloseScreen(ScreenPtr pScreen);
static Bool EnterVT(ScrnInfoPtr pScrn);
@@ -453,11 +448,12 @@ dispatch_dirty_region(ScrnInfoPtr scrn,
modesettingPtr ms = modesettingPTR(scrn);
RegionPtr dirty = DamageRegion(damage);
unsigned num_cliprects = REGION_NUM_RECTS(dirty);
+ int ret = 0;
if (num_cliprects) {
drmModeClip *clip = malloc(num_cliprects * sizeof(drmModeClip));
BoxPtr rect = REGION_RECTS(dirty);
- int i, ret;
+ int i;
if (!clip)
return -ENOMEM;
@@ -474,12 +470,8 @@ dispatch_dirty_region(ScrnInfoPtr scrn,
ret = drmModeDirtyFB(ms->fd, fb_id, clip, num_cliprects);
free(clip);
DamageEmpty(damage);
- if (ret) {
- if (ret == -EINVAL)
- return ret;
- }
}
- return 0;
+ return ret;
}
static void
@@ -546,6 +538,7 @@ msBlockHandler(ScreenPtr pScreen, void *pTimeout, void *pReadmask)
pScreen->BlockHandler = ms->BlockHandler;
pScreen->BlockHandler(pScreen, pTimeout, pReadmask);
+ ms->BlockHandler = pScreen->BlockHandler;
pScreen->BlockHandler = msBlockHandler;
if (pScreen->isGPU)
dispatch_slave_dirty(pScreen);
@@ -593,7 +586,7 @@ try_enable_glamor(ScrnInfoPtr pScrn)
Bool do_glamor = (!accel_method_str ||
strcmp(accel_method_str, "glamor") == 0);
- ms->glamor = FALSE;
+ ms->drmmode.glamor = FALSE;
#ifdef GLAMOR
if (!do_glamor) {
@@ -604,7 +597,7 @@ try_enable_glamor(ScrnInfoPtr pScrn)
if (xf86LoadSubModule(pScrn, GLAMOR_EGL_MODULE_NAME)) {
if (glamor_egl_init(pScrn, ms->fd)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "glamor initialized\n");
- ms->glamor = TRUE;
+ ms->drmmode.glamor = TRUE;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"glamor initialization failed\n");
@@ -788,7 +781,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
try_enable_glamor(pScrn);
- if (ms->glamor) {
+ if (ms->drmmode.glamor) {
xf86LoadSubModule(pScrn, "dri2");
} else {
Bool prefer_shadow = TRUE;
@@ -861,7 +854,7 @@ msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
*size = stride;
- return ((uint8_t *) ms->drmmode.front_bo->ptr + row * stride + offset);
+ return ((uint8_t *) ms->drmmode.front_bo.dumb->ptr + row * stride + offset);
}
static void
@@ -877,7 +870,8 @@ CreateScreenResources(ScreenPtr pScreen)
modesettingPtr ms = modesettingPTR(pScrn);
PixmapPtr rootPixmap;
Bool ret;
- void *pixels;
+ void *pixels = NULL;
+ int err;
pScreen->CreateScreenResources = ms->createScreenResources;
ret = pScreen->CreateScreenResources(pScreen);
@@ -886,27 +880,19 @@ CreateScreenResources(ScreenPtr pScreen)
if (!drmmode_set_desired_modes(pScrn, &ms->drmmode))
return FALSE;
-#ifdef GLAMOR
- if (ms->glamor) {
- if (!glamor_egl_create_textured_screen_ext(pScreen,
- ms->drmmode.front_bo->handle,
- pScrn->displayWidth *
- pScrn->bitsPerPixel / 8,
- NULL)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "glamor_egl_create_textured_screen_ext() failed\n");
- return FALSE;
- }
- }
-#endif
+ if (!drmmode_glamor_handle_new_screen_pixmap(&ms->drmmode))
+ return FALSE;
drmmode_uevent_init(pScrn, &ms->drmmode);
if (!ms->drmmode.sw_cursor)
drmmode_map_cursor_bos(pScrn, &ms->drmmode);
- pixels = drmmode_map_front_bo(&ms->drmmode);
- if (!pixels)
- return FALSE;
+
+ if (!ms->drmmode.gbm) {
+ pixels = drmmode_map_front_bo(&ms->drmmode);
+ if (!pixels)
+ return FALSE;
+ }
rootPixmap = pScreen->GetScreenPixmap(pScreen);
@@ -922,18 +908,22 @@ CreateScreenResources(ScreenPtr pScreen)
return FALSE;
}
- ms->damage = DamageCreate(NULL, NULL, DamageReportNone, TRUE,
- pScreen, rootPixmap);
+ err = drmModeDirtyFB(ms->fd, ms->drmmode.fb_id, NULL, 0);
- if (ms->damage) {
- DamageRegister(&rootPixmap->drawable, ms->damage);
- ms->dirty_enabled = TRUE;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Damage tracking initialized\n");
- }
- else {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Failed to create screen damage record\n");
- return FALSE;
+ if (err != -EINVAL && err != -ENOSYS) {
+ ms->damage = DamageCreate(NULL, NULL, DamageReportNone, TRUE,
+ pScreen, rootPixmap);
+
+ if (ms->damage) {
+ DamageRegister(&rootPixmap->drawable, ms->damage);
+ ms->dirty_enabled = TRUE;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Damage tracking initialized\n");
+ }
+ else {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to create screen damage record\n");
+ return FALSE;
+ }
}
return ret;
}
@@ -996,6 +986,11 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
if (!SetMaster(pScrn))
return FALSE;
+#ifdef GLAMOR_HAS_GBM
+ if (ms->drmmode.glamor)
+ ms->drmmode.gbm = glamor_egl_get_gbm_device(pScreen);
+#endif
+
/* HW dependent - FIXME */
pScrn->displayWidth = pScrn->virtualX;
if (!drmmode_create_initial_bos(pScrn, &ms->drmmode))
@@ -1053,7 +1048,7 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
fbPictureInit(pScreen, NULL, 0);
#ifdef GLAMOR
- if (ms->glamor) {
+ if (ms->drmmode.glamor) {
if (!glamor_init(pScreen,
GLAMOR_USE_EGL_SCREEN |
GLAMOR_USE_SCREEN |
@@ -1083,6 +1078,7 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
if (!ms->drmmode.sw_cursor)
xf86_cursors_init(pScreen, ms->cursor_width, ms->cursor_height,
HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 |
+ HARDWARE_CURSOR_UPDATE_UNHIDDEN |
HARDWARE_CURSOR_ARGB);
/* Must force it before EnterVT, so we are in control of VT and
@@ -1106,6 +1102,19 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
xf86DPMSInit(pScreen, xf86DPMSSet, 0);
+#ifdef GLAMOR
+ if (ms->drmmode.glamor) {
+ XF86VideoAdaptorPtr glamor_adaptor;
+
+ glamor_adaptor = glamor_xv_init(pScreen, 16);
+ if (glamor_adaptor != NULL)
+ xf86XVScreenInit(pScreen, &glamor_adaptor, 1);
+ else
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to initialize XV support.\n");
+ }
+#endif
+
if (serverGeneration == 1)
xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
@@ -1116,11 +1125,16 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
}
#ifdef GLAMOR
- if (ms->glamor) {
+ if (ms->drmmode.glamor) {
if (!ms_dri2_screen_init(pScreen)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Failed to initialize the DRI2 extension.\n");
}
+
+ if (!ms_present_screen_init(pScreen)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to initialize the Present extension.\n");
+ }
}
#endif
@@ -1190,7 +1204,7 @@ CloseScreen(ScreenPtr pScreen)
modesettingPtr ms = modesettingPTR(pScrn);
#ifdef GLAMOR
- if (ms->glamor) {
+ if (ms->drmmode.glamor) {
ms_dri2_close_screen(pScreen);
}
#endif
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/driver.h b/xorg-server/hw/xfree86/drivers/modesetting/driver.h
index 9eda1c4da..3decc3eea 100644
--- a/xorg-server/hw/xfree86/drivers/modesetting/driver.h
+++ b/xorg-server/hw/xfree86/drivers/modesetting/driver.h
@@ -33,6 +33,14 @@
#include <xf86Crtc.h>
#include <damage.h>
+#ifdef GLAMOR
+#define GLAMOR_FOR_XORG 1
+#include "glamor.h"
+#ifdef GLAMOR_HAS_GBM
+#include <gbm.h>
+#endif
+#endif
+
#include "drmmode_display.h"
#define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg);
@@ -97,7 +105,6 @@ typedef struct _modesettingRec {
Bool dirty_enabled;
uint32_t cursor_width, cursor_height;
- Bool glamor;
} modesettingRec, *modesettingPtr;
#define modesettingPTR(p) ((modesettingPtr)((p)->driverPrivate))
@@ -107,6 +114,10 @@ uint32_t ms_drm_queue_alloc(xf86CrtcPtr crtc,
ms_drm_handler_proc handler,
ms_drm_abort_proc abort);
+void ms_drm_abort(ScrnInfoPtr scrn,
+ Bool (*match)(void *data, void *match_data),
+ void *match_data);
+
xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw);
xf86CrtcPtr ms_covering_crtc(ScrnInfoPtr scrn, BoxPtr box,
xf86CrtcPtr desired, BoxPtr crtc_box_ret);
@@ -122,3 +133,5 @@ void ms_dri2_close_screen(ScreenPtr screen);
Bool ms_vblank_screen_init(ScreenPtr screen);
void ms_vblank_close_screen(ScreenPtr screen);
+
+Bool ms_present_screen_init(ScreenPtr screen);
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.c b/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.c
index ef9009e98..1ea799b3a 100644
--- a/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -33,6 +33,7 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <unistd.h>
+#include "dumb_bo.h"
#include "xf86str.h"
#include "X11/Xatom.h"
#include "micmap.h"
@@ -49,112 +50,95 @@
#include "driver.h"
-static struct dumb_bo *
-dumb_bo_create(int fd,
- const unsigned width, const unsigned height, const unsigned bpp)
-{
- struct drm_mode_create_dumb arg;
- struct dumb_bo *bo;
- int ret;
-
- bo = calloc(1, sizeof(*bo));
- if (!bo)
- return NULL;
-
- memset(&arg, 0, sizeof(arg));
- arg.width = width;
- arg.height = height;
- arg.bpp = bpp;
-
- ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg);
- if (ret)
- goto err_free;
-
- bo->handle = arg.handle;
- bo->size = arg.size;
- bo->pitch = arg.pitch;
-
- return bo;
- err_free:
- free(bo);
- return NULL;
-}
-
static int
-dumb_bo_map(int fd, struct dumb_bo *bo)
+drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo)
{
- struct drm_mode_map_dumb arg;
int ret;
- void *map;
- if (bo->ptr) {
- bo->map_count++;
- return 0;
+#ifdef GLAMOR_HAS_GBM
+ if (bo->gbm) {
+ gbm_bo_destroy(bo->gbm);
+ bo->gbm = NULL;
}
+#endif
- memset(&arg, 0, sizeof(arg));
- arg.handle = bo->handle;
-
- ret = drmIoctl(fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
- if (ret)
- return ret;
-
- map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, arg.offset);
- if (map == MAP_FAILED)
- return -errno;
+ if (bo->dumb) {
+ ret = dumb_bo_destroy(drmmode->fd, bo->dumb);
+ if (ret == 0)
+ bo->dumb = NULL;
+ }
- bo->ptr = map;
return 0;
}
-#if 0
-static int
-dumb_bo_unmap(int fd, struct dumb_bo *bo)
+static uint32_t
+drmmode_bo_get_pitch(drmmode_bo *bo)
{
- bo->map_count--;
- return 0;
-}
+#ifdef GLAMOR_HAS_GBM
+ if (bo->gbm)
+ return gbm_bo_get_stride(bo->gbm);
#endif
-int
-dumb_bo_destroy(int fd, struct dumb_bo *bo)
+ return bo->dumb->pitch;
+}
+
+static Bool
+drmmode_bo_has_bo(drmmode_bo *bo)
{
- struct drm_mode_destroy_dumb arg;
- int ret;
+#ifdef GLAMOR_HAS_GBM
+ if (bo->gbm)
+ return TRUE;
+#endif
- if (bo->ptr) {
- munmap(bo->ptr, bo->size);
- bo->ptr = NULL;
- }
+ return bo->dumb != NULL;
+}
- memset(&arg, 0, sizeof(arg));
- arg.handle = bo->handle;
- ret = drmIoctl(fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
- if (ret)
- return -errno;
+uint32_t
+drmmode_bo_get_handle(drmmode_bo *bo)
+{
+#ifdef GLAMOR_HAS_GBM
+ if (bo->gbm)
+ return gbm_bo_get_handle(bo->gbm).u32;
+#endif
- free(bo);
- return 0;
+ return bo->dumb->handle;
}
-struct dumb_bo *
-dumb_get_bo_from_fd(int fd, int handle, int pitch, int size)
+static void *
+drmmode_bo_map(drmmode_ptr drmmode, drmmode_bo *bo)
{
- struct dumb_bo *bo;
int ret;
- bo = calloc(1, sizeof(*bo));
- if (!bo)
+#ifdef GLAMOR_HAS_GBM
+ if (bo->gbm)
return NULL;
+#endif
- ret = drmPrimeFDToHandle(fd, handle, &bo->handle);
- if (ret) {
- free(bo);
+ if (bo->dumb->ptr)
+ return bo->dumb->ptr;
+
+ ret = dumb_bo_map(drmmode->fd, bo->dumb);
+ if (ret)
return NULL;
+
+ return bo->dumb->ptr;
+}
+
+static Bool
+drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
+ unsigned width, unsigned height, unsigned bpp)
+{
+#ifdef GLAMOR_HAS_GBM
+ if (drmmode->glamor) {
+ bo->gbm = gbm_bo_create(drmmode->gbm, width, height,
+ GBM_FORMAT_ARGB8888,
+ GBM_BO_USE_RENDERING | GBM_BO_USE_SCANOUT);
+ return bo->gbm != NULL;
}
- bo->pitch = pitch;
- bo->size = size;
- return bo;
+#endif
+
+ bo->dumb = dumb_bo_create(drmmode->fd, width, height, bpp);
+ return bo->dumb != NULL;
}
Bool
@@ -232,18 +216,8 @@ drmmode_ConvertToKMode(ScrnInfoPtr scrn,
static void
drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
{
-#if 0
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-
-// drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-// drmmode_ptr drmmode = drmmode_crtc->drmmode;
-
- /* bonghits in the randr 1.2 - uses dpms to disable crtc - bad buzz */
- if (mode == DPMSModeOff) {
-// drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
-// 0, 0, 0, NULL, 0, NULL);
- }
-#endif
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_crtc->dpms_mode = mode;
}
#if 0
@@ -315,8 +289,9 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
ret = drmModeAddFB(drmmode->fd,
pScrn->virtualX, height,
pScrn->depth, pScrn->bitsPerPixel,
- drmmode->front_bo->pitch,
- drmmode->front_bo->handle, &drmmode->fb_id);
+ drmmode_bo_get_pitch(&drmmode->front_bo),
+ drmmode_bo_get_handle(&drmmode->front_bo),
+ &drmmode->fb_id);
if (ret < 0) {
ErrorF("failed to add fb %d\n", ret);
return FALSE;
@@ -385,6 +360,9 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
if (crtc->scrn->pScreen)
xf86CrtcSetScreenSubpixelOrder(crtc->scrn->pScreen);
+
+ crtc->funcs->dpms(crtc, DPMSModeOn);
+
/* go through all the outputs and force DPMS them back on? */
for (i = 0; i < xf86_config->num_output; i++) {
xf86OutputPtr output = xf86_config->output[i];
@@ -432,25 +410,32 @@ drmmode_set_cursor_position(xf86CrtcPtr crtc, int x, int y)
}
static void
-drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
+drmmode_set_cursor(xf86CrtcPtr crtc)
{
- modesettingPtr ms = modesettingPTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- int i;
- uint32_t *ptr;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
uint32_t handle = drmmode_crtc->cursor_bo->handle;
+ modesettingPtr ms = modesettingPTR(crtc->scrn);
+ static Bool use_set_cursor2 = TRUE;
int ret;
- /* cursor should be mapped already */
- ptr = (uint32_t *) (drmmode_crtc->cursor_bo->ptr);
+ if (use_set_cursor2) {
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
+ CursorPtr cursor = xf86_config->cursor;
- for (i = 0; i < ms->cursor_width * ms->cursor_height; i++)
- ptr[i] = image[i]; // cpu_to_le32(image[i]);
+ ret =
+ drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
+ handle, ms->cursor_width, ms->cursor_height,
+ cursor->bits->xhot, cursor->bits->yhot);
+ if (ret == -EINVAL)
+ use_set_cursor2 = FALSE;
+ else
+ return;
+ }
+
+ ret = drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle,
+ ms->cursor_width, ms->cursor_height);
- ret =
- drmModeSetCursor(drmmode_crtc->drmmode->fd,
- drmmode_crtc->mode_crtc->crtc_id, handle,
- ms->cursor_width, ms->cursor_height);
if (ret) {
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
@@ -462,46 +447,44 @@ drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
}
static void
-drmmode_hide_cursor(xf86CrtcPtr crtc)
+drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
{
modesettingPtr ms = modesettingPTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ int i;
+ uint32_t *ptr;
- drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, 0,
- ms->cursor_width, ms->cursor_height);
+ /* cursor should be mapped already */
+ ptr = (uint32_t *) (drmmode_crtc->cursor_bo->ptr);
+
+ for (i = 0; i < ms->cursor_width * ms->cursor_height; i++)
+ ptr[i] = image[i]; // cpu_to_le32(image[i]);
+ if (drmmode_crtc->cursor_up)
+ drmmode_set_cursor(crtc);
}
static void
-drmmode_show_cursor(xf86CrtcPtr crtc)
+drmmode_hide_cursor(xf86CrtcPtr crtc)
{
modesettingPtr ms = modesettingPTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
- uint32_t handle = drmmode_crtc->cursor_bo->handle;
- static Bool use_set_cursor2 = TRUE;
-
- if (use_set_cursor2) {
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
- CursorPtr cursor = xf86_config->cursor;
- int ret;
-
- ret =
- drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
- handle, ms->cursor_width, ms->cursor_height,
- cursor->bits->xhot, cursor->bits->yhot);
- if (ret == -EINVAL)
- use_set_cursor2 = FALSE;
- else
- return;
- }
- drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle,
+ drmmode_crtc->cursor_up = FALSE;
+ drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, 0,
ms->cursor_width, ms->cursor_height);
}
static void
+drmmode_show_cursor(xf86CrtcPtr crtc)
+{
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_crtc->cursor_up = TRUE;
+ drmmode_set_cursor(crtc);
+}
+
+static void
drmmode_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t * red, uint16_t * green,
uint16_t * blue, int size)
{
@@ -557,13 +540,122 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
static void *
drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
{
- return NULL;
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ int ret;
+
+ if (!drmmode_create_bo(drmmode, &drmmode_crtc->rotate_bo,
+ width, height, crtc->scrn->bitsPerPixel)) {
+ xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
+ "Couldn't allocate shadow memory for rotated CRTC\n");
+ return NULL;
+ }
+
+ ret = drmModeAddFB(drmmode->fd, width, height, crtc->scrn->depth,
+ crtc->scrn->bitsPerPixel,
+ drmmode_bo_get_pitch(&drmmode_crtc->rotate_bo),
+ drmmode_bo_get_handle(&drmmode_crtc->rotate_bo),
+ &drmmode_crtc->rotate_fb_id);
+
+ if (ret) {
+ ErrorF("failed to add rotate fb\n");
+ drmmode_bo_destroy(drmmode, &drmmode_crtc->rotate_bo);
+ return NULL;
+ }
+
+#ifdef GLAMOR_HAS_GBM
+ if (drmmode->gbm)
+ return drmmode_crtc->rotate_bo.gbm;
+#endif
+ return drmmode_crtc->rotate_bo.dumb;
}
static PixmapPtr
+drmmode_create_pixmap_header(ScreenPtr pScreen, int width, int height,
+ int depth, int bitsPerPixel, int devKind,
+ void *pPixData)
+{
+ PixmapPtr pixmap;
+
+ /* width and height of 0 means don't allocate any pixmap data */
+ pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth, 0);
+
+ if (pixmap) {
+ if ((*pScreen->ModifyPixmapHeader)(pixmap, width, height, depth,
+ bitsPerPixel, devKind, pPixData))
+ return pixmap;
+ (*pScreen->DestroyPixmap)(pixmap);
+ }
+ return NullPixmap;
+}
+
+static Bool
+drmmode_set_pixmap_bo(drmmode_ptr drmmode, PixmapPtr pixmap, drmmode_bo *bo);
+
+static PixmapPtr
drmmode_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
{
- return NULL;
+ ScrnInfoPtr scrn = crtc->scrn;
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ uint32_t rotate_pitch;
+ PixmapPtr rotate_pixmap;
+ void *pPixData = NULL;
+
+ if (!data) {
+ data = drmmode_shadow_allocate(crtc, width, height);
+ if (!data) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+ "Couldn't allocate shadow pixmap for rotated CRTC\n");
+ return NULL;
+ }
+ }
+
+ if (!drmmode_bo_has_bo(&drmmode_crtc->rotate_bo)) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+ "Couldn't allocate shadow pixmap for rotated CRTC\n");
+ return NULL;
+ }
+
+ pPixData = drmmode_bo_map(drmmode, &drmmode_crtc->rotate_bo);
+ rotate_pitch = drmmode_bo_get_pitch(&drmmode_crtc->rotate_bo),
+
+ rotate_pixmap = drmmode_create_pixmap_header(scrn->pScreen,
+ width, height,
+ scrn->depth,
+ scrn->bitsPerPixel,
+ rotate_pitch,
+ pPixData);
+
+ if (rotate_pixmap == NULL) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+ "Couldn't allocate shadow pixmap for rotated CRTC\n");
+ return NULL;
+ }
+
+ drmmode_set_pixmap_bo(drmmode, rotate_pixmap, &drmmode_crtc->rotate_bo);
+
+ return rotate_pixmap;
+}
+
+static void
+drmmode_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data)
+{
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
+
+ if (rotate_pixmap) {
+ drmmode_set_pixmap_bo(drmmode, rotate_pixmap, NULL);
+ rotate_pixmap->drawable.pScreen->DestroyPixmap(rotate_pixmap);
+ }
+
+ if (data) {
+ drmModeRmFB(drmmode->fd, drmmode_crtc->rotate_fb_id);
+ drmmode_crtc->rotate_fb_id = 0;
+
+ drmmode_bo_destroy(drmmode, &drmmode_crtc->rotate_bo);
+ memset(&drmmode_crtc->rotate_bo, 0, sizeof drmmode_crtc->rotate_bo);
+ }
}
static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
@@ -580,6 +672,7 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
.set_scanout_pixmap = drmmode_set_scanout_pixmap,
.shadow_allocate = drmmode_shadow_allocate,
.shadow_create = drmmode_shadow_create,
+ .shadow_destroy = drmmode_shadow_destroy,
};
static uint32_t
@@ -1019,8 +1112,7 @@ static const char *const output_names[] = {
};
static void
-drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num,
- int *num_dvi, int *num_hdmi)
+drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
{
xf86OutputPtr output;
drmModeConnectorPtr koutput;
@@ -1173,6 +1265,57 @@ drmmode_clones_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
}
static Bool
+drmmode_set_pixmap_bo(drmmode_ptr drmmode, PixmapPtr pixmap, drmmode_bo *bo)
+{
+#ifdef GLAMOR
+ ScrnInfoPtr scrn = drmmode->scrn;
+
+ if (!drmmode->glamor)
+ return TRUE;
+
+ if (bo == NULL) {
+ glamor_egl_destroy_textured_pixmap(pixmap);
+ return TRUE;
+ }
+
+#ifdef GLAMOR_HAS_GBM
+ if (!glamor_egl_create_textured_pixmap_from_gbm_bo(pixmap, bo->gbm)) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR, "Failed");
+ return FALSE;
+ }
+#else
+ if (!glamor_egl_create_textured_pixmap(pixmap,
+ drmmode_bo_get_handle(&drmmode->front_bo),
+ scrn->displayWidth *
+ scrn->bitsPerPixel / 8)) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+ "glamor_egl_create_textured_pixmap() failed\n");
+ return FALSE;
+ }
+#endif
+#endif
+
+ return TRUE;
+}
+
+Bool
+drmmode_glamor_handle_new_screen_pixmap(drmmode_ptr drmmode)
+{
+ ScreenPtr screen = xf86ScrnToScreen(drmmode->scrn);
+ PixmapPtr screen_pixmap = screen->GetScreenPixmap(screen);
+
+ if (!drmmode_set_pixmap_bo(drmmode, screen_pixmap, &drmmode->front_bo))
+ return FALSE;
+
+#ifdef GLAMOR
+ if (drmmode->glamor)
+ glamor_set_screen_pixmap(screen_pixmap, NULL);
+#endif
+
+ return TRUE;
+}
+
+static Bool
drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
{
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -1180,14 +1323,14 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
drmmode_crtc_private_ptr
drmmode_crtc = xf86_config->crtc[0]->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
- struct dumb_bo *old_front = NULL;
+ drmmode_bo old_front;
Bool ret;
ScreenPtr screen = xf86ScrnToScreen(scrn);
uint32_t old_fb_id;
int i, pitch, old_width, old_height, old_pitch;
int cpp = (scrn->bitsPerPixel + 7) / 8;
PixmapPtr ppix = screen->GetScreenPixmap(screen);
- void *new_pixels;
+ void *new_pixels = NULL;
if (scrn->virtualX == width && scrn->virtualY == height)
return TRUE;
@@ -1202,16 +1345,15 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
old_width = scrn->virtualX;
old_height = scrn->virtualY;
- old_pitch = drmmode->front_bo->pitch;
+ old_pitch = drmmode_bo_get_pitch(&drmmode->front_bo);
old_fb_id = drmmode->fb_id;
old_front = drmmode->front_bo;
- drmmode->front_bo =
- dumb_bo_create(drmmode->fd, width, height, scrn->bitsPerPixel);
- if (!drmmode->front_bo)
+ if (!drmmode_create_bo(drmmode, &drmmode->front_bo,
+ width, height, scrn->bitsPerPixel))
goto fail;
- pitch = drmmode->front_bo->pitch;
+ pitch = drmmode_bo_get_pitch(&drmmode->front_bo);
scrn->virtualX = width;
scrn->virtualY = height;
@@ -1219,30 +1361,32 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
ret = drmModeAddFB(drmmode->fd, width, height, scrn->depth,
scrn->bitsPerPixel, pitch,
- drmmode->front_bo->handle, &drmmode->fb_id);
+ drmmode_bo_get_handle(&drmmode->front_bo),
+ &drmmode->fb_id);
if (ret)
goto fail;
- new_pixels = drmmode_map_front_bo(drmmode);
- if (!new_pixels)
- goto fail;
+ if (!drmmode->gbm) {
+ new_pixels = drmmode_map_front_bo(drmmode);
+ if (!new_pixels)
+ goto fail;
+ }
- if (!drmmode->shadow_enable)
- screen->ModifyPixmapHeader(ppix, width, height, -1, -1,
- pitch, new_pixels);
- else {
- void *new_shadow;
+ if (drmmode->shadow_enable) {
uint32_t size = scrn->displayWidth * scrn->virtualY *
((scrn->bitsPerPixel + 7) >> 3);
- new_shadow = calloc(1, size);
- if (new_shadow == NULL)
+ new_pixels = calloc(1, size);
+ if (new_pixels == NULL)
goto fail;
free(drmmode->shadow_fb);
- drmmode->shadow_fb = new_shadow;
- screen->ModifyPixmapHeader(ppix, width, height, -1, -1,
- pitch, drmmode->shadow_fb);
+ drmmode->shadow_fb = new_pixels;
}
+ screen->ModifyPixmapHeader(ppix, width, height, -1, -1, pitch, new_pixels);
+
+ if (!drmmode_glamor_handle_new_screen_pixmap(drmmode))
+ goto fail;
+
for (i = 0; i < xf86_config->num_crtc; i++) {
xf86CrtcPtr crtc = xf86_config->crtc[i];
@@ -1255,14 +1399,13 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
if (old_fb_id) {
drmModeRmFB(drmmode->fd, old_fb_id);
- dumb_bo_destroy(drmmode->fd, old_front);
+ drmmode_bo_destroy(drmmode, &old_front);
}
return TRUE;
fail:
- if (drmmode->front_bo)
- dumb_bo_destroy(drmmode->fd, drmmode->front_bo);
+ drmmode_bo_destroy(drmmode, &drmmode->front_bo);
drmmode->front_bo = old_front;
scrn->virtualX = old_width;
scrn->virtualY = old_height;
@@ -1279,7 +1422,7 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
Bool
drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
{
- int i, num_dvi = 0, num_hdmi = 0;
+ int i;
int ret;
uint64_t value = 0;
@@ -1307,7 +1450,7 @@ drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
drmmode_crtc_init(pScrn, drmmode, i);
for (i = 0; i < drmmode->mode_res->count_connectors; i++)
- drmmode_output_init(pScrn, drmmode, i, &num_dvi, &num_hdmi);
+ drmmode_output_init(pScrn, drmmode, i);
/* workout clones */
drmmode_clones_init(pScrn, drmmode);
@@ -1468,7 +1611,7 @@ drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn)
return TRUE;
}
-#ifdef HAVE_UDEV
+#ifdef CONFIG_UDEV_KMS
static void
drmmode_handle_uevents(int fd, void *closure)
{
@@ -1488,7 +1631,7 @@ drmmode_handle_uevents(int fd, void *closure)
void
drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
{
-#ifdef HAVE_UDEV
+#ifdef CONFIG_UDEV_KMS
struct udev *u;
struct udev_monitor *mon;
@@ -1521,7 +1664,7 @@ drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
void
drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode)
{
-#ifdef HAVE_UDEV
+#ifdef CONFIG_UDEV_KMS
if (drmmode->uevent_handler) {
struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor);
@@ -1548,10 +1691,9 @@ drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
width = pScrn->virtualX;
height = pScrn->virtualY;
- drmmode->front_bo = dumb_bo_create(drmmode->fd, width, height, bpp);
- if (!drmmode->front_bo)
+ if (!drmmode_create_bo(drmmode, &drmmode->front_bo, width, height, bpp))
return FALSE;
- pScrn->displayWidth = drmmode->front_bo->pitch / cpp;
+ pScrn->displayWidth = drmmode_bo_get_pitch(&drmmode->front_bo) / cpp;
width = ms->cursor_width;
height = ms->cursor_height;
@@ -1569,17 +1711,7 @@ drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
void *
drmmode_map_front_bo(drmmode_ptr drmmode)
{
- int ret;
-
- if (drmmode->front_bo->ptr)
- return drmmode->front_bo->ptr;
-
- ret = dumb_bo_map(drmmode->fd, drmmode->front_bo);
- if (ret)
- return NULL;
-
- return drmmode->front_bo->ptr;
-
+ return drmmode_bo_map(drmmode, &drmmode->front_bo);
}
void *
@@ -1625,8 +1757,7 @@ drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
drmmode->fb_id = 0;
}
- dumb_bo_destroy(drmmode->fd, drmmode->front_bo);
- drmmode->front_bo = NULL;
+ drmmode_bo_destroy(drmmode, &drmmode->front_bo);
for (i = 0; i < xf86_config->num_crtc; i++) {
xf86CrtcPtr crtc = xf86_config->crtc[i];
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.h b/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.h
index 987608c55..3a8959ac3 100644
--- a/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.h
+++ b/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.h
@@ -28,17 +28,20 @@
#define DRMMODE_DISPLAY_H
#include "xf86drmMode.h"
-#ifdef HAVE_UDEV
+#ifdef CONFIG_UDEV_KMS
#include "libudev.h"
#endif
-struct dumb_bo {
- uint32_t handle;
- uint32_t size;
- void *ptr;
- int map_count;
- uint32_t pitch;
-};
+#include "dumb_bo.h"
+
+struct gbm_device;
+
+typedef struct {
+ struct dumb_bo *dumb;
+#ifdef GLAMOR_HAS_GBM
+ struct gbm_bo *gbm;
+#endif
+} drmmode_bo;
typedef struct {
int fd;
@@ -48,14 +51,18 @@ typedef struct {
drmModeFBPtr mode_fb;
int cpp;
ScrnInfoPtr scrn;
-#ifdef HAVE_UDEV
+
+ struct gbm_device *gbm;
+
+#ifdef CONFIG_UDEV_KMS
struct udev_monitor *uevent_monitor;
InputHandlerProc uevent_handler;
#endif
drmEventContext event_context;
- struct dumb_bo *front_bo;
+ drmmode_bo front_bo;
Bool sw_cursor;
+ Bool glamor;
Bool shadow_enable;
void *shadow_fb;
@@ -79,11 +86,15 @@ typedef struct {
drmmode_ptr drmmode;
drmModeCrtcPtr mode_crtc;
uint32_t vblank_pipe;
+ int dpms_mode;
struct dumb_bo *cursor_bo;
- unsigned rotate_fb_id;
+ Bool cursor_up;
uint16_t lut_r[256], lut_g[256], lut_b[256];
DamagePtr slave_damage;
+ drmmode_bo rotate_bo;
+ unsigned rotate_fb_id;
+
/**
* @{ MSC (vblank count) handling for the PRESENT extension.
*
@@ -128,6 +139,8 @@ extern DevPrivateKeyRec msPixmapPrivateKeyRec;
#define msGetPixmapPriv(drmmode, p) ((msPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, &(drmmode)->pixmapPrivateKeyRec))
+uint32_t drmmode_bo_get_handle(drmmode_bo *bo);
+Bool drmmode_glamor_handle_new_screen_pixmap(drmmode_ptr drmmode);
void *drmmode_map_slave_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv);
Bool drmmode_SetSlaveBO(PixmapPtr ppix,
drmmode_ptr drmmode,
@@ -147,8 +160,6 @@ Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode,
int *depth, int *bpp);
-struct dumb_bo *dumb_get_bo_from_fd(int drm_fd, int fd, int pitch, int size);
-int dumb_bo_destroy(int fd, struct dumb_bo *bo);
#ifndef DRM_CAP_DUMB_PREFERRED_DEPTH
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/dumb_bo.c b/xorg-server/hw/xfree86/drivers/modesetting/dumb_bo.c
new file mode 100644
index 000000000..58d420e07
--- /dev/null
+++ b/xorg-server/hw/xfree86/drivers/modesetting/dumb_bo.c
@@ -0,0 +1,134 @@
+/*
+ * Copyright © 2007 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Authors:
+ * Dave Airlie <airlied@redhat.com>
+ *
+ */
+
+#include "dumb_bo.h"
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <xf86drm.h>
+
+struct dumb_bo *
+dumb_bo_create(int fd,
+ const unsigned width, const unsigned height, const unsigned bpp)
+{
+ struct drm_mode_create_dumb arg;
+ struct dumb_bo *bo;
+ int ret;
+
+ bo = calloc(1, sizeof(*bo));
+ if (!bo)
+ return NULL;
+
+ memset(&arg, 0, sizeof(arg));
+ arg.width = width;
+ arg.height = height;
+ arg.bpp = bpp;
+
+ ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg);
+ if (ret)
+ goto err_free;
+
+ bo->handle = arg.handle;
+ bo->size = arg.size;
+ bo->pitch = arg.pitch;
+
+ return bo;
+ err_free:
+ free(bo);
+ return NULL;
+}
+
+int
+dumb_bo_map(int fd, struct dumb_bo *bo)
+{
+ struct drm_mode_map_dumb arg;
+ int ret;
+ void *map;
+
+ if (bo->ptr) {
+ return 0;
+ }
+
+ memset(&arg, 0, sizeof(arg));
+ arg.handle = bo->handle;
+
+ ret = drmIoctl(fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
+ if (ret)
+ return ret;
+
+ map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, arg.offset);
+ if (map == MAP_FAILED)
+ return -errno;
+
+ bo->ptr = map;
+ return 0;
+}
+
+int
+dumb_bo_destroy(int fd, struct dumb_bo *bo)
+{
+ struct drm_mode_destroy_dumb arg;
+ int ret;
+
+ if (bo->ptr) {
+ munmap(bo->ptr, bo->size);
+ bo->ptr = NULL;
+ }
+
+ memset(&arg, 0, sizeof(arg));
+ arg.handle = bo->handle;
+ ret = drmIoctl(fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
+ if (ret)
+ return -errno;
+
+ free(bo);
+ return 0;
+}
+
+struct dumb_bo *
+dumb_get_bo_from_fd(int fd, int handle, int pitch, int size)
+{
+ struct dumb_bo *bo;
+ int ret;
+
+ bo = calloc(1, sizeof(*bo));
+ if (!bo)
+ return NULL;
+
+ ret = drmPrimeFDToHandle(fd, handle, &bo->handle);
+ if (ret) {
+ free(bo);
+ return NULL;
+ }
+ bo->pitch = pitch;
+ bo->size = size;
+ return bo;
+}
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/dumb_bo.h b/xorg-server/hw/xfree86/drivers/modesetting/dumb_bo.h
new file mode 100644
index 000000000..9235e61e2
--- /dev/null
+++ b/xorg-server/hw/xfree86/drivers/modesetting/dumb_bo.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2007 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Authors:
+ * Dave Airlie <airlied@redhat.com>
+ *
+ */
+#ifndef DUMB_BO_H
+#define DUMB_BO_H
+
+#include <stdint.h>
+
+struct dumb_bo {
+ uint32_t handle;
+ uint32_t size;
+ void *ptr;
+ uint32_t pitch;
+};
+
+struct dumb_bo *dumb_bo_create(int fd, const unsigned width,
+ const unsigned height, const unsigned bpp);
+int dumb_bo_map(int fd, struct dumb_bo *bo);
+int dumb_bo_destroy(int fd, struct dumb_bo *bo);
+struct dumb_bo *dumb_get_bo_from_fd(int fd, int handle, int pitch, int size);
+
+#endif
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/present.c b/xorg-server/hw/xfree86/drivers/modesetting/present.c
new file mode 100644
index 000000000..359e11316
--- /dev/null
+++ b/xorg-server/hw/xfree86/drivers/modesetting/present.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright © 2014 Intel Corporation
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the 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.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include "dix-config.h"
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <time.h>
+
+#include <xf86.h>
+#include <xf86Crtc.h>
+#include <xf86drm.h>
+#include <xf86str.h>
+#include <present.h>
+
+#include "driver.h"
+
+#if 0
+#define DebugPresent(x) ErrorF x
+#else
+#define DebugPresent(x)
+#endif
+
+struct ms_present_vblank_event {
+ uint64_t event_id;
+};
+
+static RRCrtcPtr
+ms_present_get_crtc(WindowPtr window)
+{
+ xf86CrtcPtr xf86_crtc = ms_dri2_crtc_covering_drawable(&window->drawable);
+ return xf86_crtc ? xf86_crtc->randr_crtc : NULL;
+}
+
+static int
+ms_present_get_ust_msc(RRCrtcPtr crtc, CARD64 *ust, CARD64 *msc)
+{
+ xf86CrtcPtr xf86_crtc = crtc->devPrivate;
+
+ return ms_get_crtc_ust_msc(xf86_crtc, ust, msc);
+}
+
+/*
+ * Flush the DRM event queue when full; makes space for new events.
+ */
+static Bool
+ms_flush_drm_events(ScreenPtr screen)
+{
+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ modesettingPtr ms = modesettingPTR(scrn);
+
+ struct pollfd p = { .fd = ms->fd, .events = POLLIN };
+ int r;
+
+ do {
+ r = poll(&p, 1, 0);
+ } while (r == -1 && (errno == EINTR || errno == EAGAIN));
+
+ if (r <= 0)
+ return TRUE;
+
+ return drmHandleEvent(ms->fd, &ms->event_context) >= 0;
+}
+
+/*
+ * Called when the queued vblank event has occurred
+ */
+static void
+ms_present_vblank_handler(uint64_t msc, uint64_t usec, void *data)
+{
+ struct ms_present_vblank_event *event = data;
+
+ DebugPresent(("\t\tmh %lld msc %llu\n",
+ (long long) event->event_id, (long long) msc));
+
+ present_event_notify(event->event_id, usec, msc);
+ free(event);
+}
+
+/*
+ * Called when the queued vblank is aborted
+ */
+static void
+ms_present_vblank_abort(void *data)
+{
+ struct ms_present_vblank_event *event = data;
+
+ DebugPresent(("\t\tma %lld\n", (long long) event->event_id));
+
+ free(event);
+}
+
+/*
+ * Queue an event to report back to the Present extension when the specified
+ * MSC has past
+ */
+static int
+ms_present_queue_vblank(RRCrtcPtr crtc,
+ uint64_t event_id,
+ uint64_t msc)
+{
+ xf86CrtcPtr xf86_crtc = crtc->devPrivate;
+ ScreenPtr screen = crtc->pScreen;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ modesettingPtr ms = modesettingPTR(scrn);
+ drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
+ struct ms_present_vblank_event *event;
+ drmVBlank vbl;
+ int ret;
+ uint32_t seq;
+
+ event = calloc(sizeof(struct ms_present_vblank_event), 1);
+ if (!event)
+ return BadAlloc;
+ event->event_id = event_id;
+ seq = ms_drm_queue_alloc(xf86_crtc, event,
+ ms_present_vblank_handler,
+ ms_present_vblank_abort);
+ if (!seq) {
+ free(event);
+ return BadAlloc;
+ }
+
+ vbl.request.type =
+ DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT | drmmode_crtc->vblank_pipe;
+ vbl.request.sequence = ms_crtc_msc_to_kernel_msc(xf86_crtc, msc);
+ vbl.request.signal = seq;
+ for (;;) {
+ ret = drmWaitVBlank(ms->fd, &vbl);
+ if (!ret)
+ break;
+ if (errno != EBUSY || !ms_flush_drm_events(screen))
+ return BadAlloc;
+ }
+ DebugPresent(("\t\tmq %lld seq %u msc %llu (hw msc %u)\n",
+ (long long) event_id, seq, (long long) msc,
+ vbl.request.sequence));
+ return Success;
+}
+
+static Bool
+ms_present_event_match(void *data, void *match_data)
+{
+ struct ms_present_vblank_event *event = data;
+ uint64_t *match = match_data;
+
+ return *match == event->event_id;
+}
+
+/*
+ * Remove a pending vblank event from the DRM queue so that it is not reported
+ * to the extension
+ */
+static void
+ms_present_abort_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc)
+{
+ ScreenPtr screen = crtc->pScreen;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+
+ ms_drm_abort(scrn, ms_present_event_match, &event_id);
+}
+
+/*
+ * Flush our batch buffer when requested by the Present extension.
+ */
+static void
+ms_present_flush(WindowPtr window)
+{
+#ifdef GLAMOR
+ ScreenPtr screen = window->drawable.pScreen;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ modesettingPtr ms = modesettingPTR(scrn);
+
+ if (ms->drmmode.glamor)
+ glamor_block_handler(screen);
+#endif
+}
+
+static present_screen_info_rec ms_present_screen_info = {
+ .version = PRESENT_SCREEN_INFO_VERSION,
+
+ .get_crtc = ms_present_get_crtc,
+ .get_ust_msc = ms_present_get_ust_msc,
+ .queue_vblank = ms_present_queue_vblank,
+ .abort_vblank = ms_present_abort_vblank,
+ .flush = ms_present_flush,
+
+ .capabilities = PresentCapabilityNone,
+ .check_flip = 0,
+ .flip = 0,
+ .unflip = 0,
+};
+
+Bool
+ms_present_screen_init(ScreenPtr screen)
+{
+ return present_screen_init(screen, &ms_present_screen_info);
+}
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/vblank.c b/xorg-server/hw/xfree86/drivers/modesetting/vblank.c
index 5031ef8ff..a342662a7 100644
--- a/xorg-server/hw/xfree86/drivers/modesetting/vblank.c
+++ b/xorg-server/hw/xfree86/drivers/modesetting/vblank.c
@@ -88,6 +88,14 @@ static int ms_box_area(BoxPtr box)
return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1);
}
+static Bool
+ms_crtc_on(xf86CrtcPtr crtc)
+{
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+
+ return crtc->enabled && drmmode_crtc->dpms_mode == DPMSModeOn;
+}
+
/*
* Return the crtc covering 'box'. If two crtcs cover a portion of
* 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
@@ -114,7 +122,7 @@ ms_covering_crtc(ScrnInfoPtr scrn,
crtc = xf86_config->crtc[c];
/* If the CRTC is off, treat it as not covering */
- if (!crtc->enabled)
+ if (!ms_crtc_on(crtc))
continue;
ms_crtc_box(crtc, &crtc_box);
@@ -139,20 +147,13 @@ ms_dri2_crtc_covering_drawable(DrawablePtr pDraw)
ScreenPtr pScreen = pDraw->pScreen;
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
BoxRec box, crtcbox;
- xf86CrtcPtr crtc;
box.x1 = pDraw->x;
box.y1 = pDraw->y;
box.x2 = box.x1 + pDraw->width;
box.y2 = box.y1 + pDraw->height;
- crtc = ms_covering_crtc(pScrn, &box, NULL, &crtcbox);
-
- /* Make sure the CRTC is valid and this is the real front buffer */
- if (crtc != NULL && !crtc->rotatedData)
- return crtc;
-
- return NULL;
+ return ms_covering_crtc(pScrn, &box, NULL, &crtcbox);
}
static Bool
@@ -323,6 +324,24 @@ ms_drm_abort_scrn(ScrnInfoPtr scrn)
}
/*
+ * Externally usable abort function that uses a callback to match a single
+ * queued entry to abort
+ */
+void
+ms_drm_abort(ScrnInfoPtr scrn, Bool (*match)(void *data, void *match_data),
+ void *match_data)
+{
+ struct ms_drm_queue *q;
+
+ xorg_list_for_each_entry(q, &ms_drm_queue, list) {
+ if (match(q->data, match_data)) {
+ ms_drm_abort_one(q);
+ break;
+ }
+ }
+}
+
+/*
* General DRM kernel handler. Looks for the matching sequence number in the
* drm event queue and calls the handler for it.
*/
diff --git a/xorg-server/hw/xfree86/man/Xorg.wrap.man b/xorg-server/hw/xfree86/man/Xorg.wrap.man
index 58937c74b..11090f1f4 100644
--- a/xorg-server/hw/xfree86/man/Xorg.wrap.man
+++ b/xorg-server/hw/xfree86/man/Xorg.wrap.man
@@ -33,7 +33,7 @@ Xorg.wrap \- Xorg X server binary wrapper
The Xorg X server may need root rights to function properly. To start the
Xorg X server with these rights your system is using a suid root wrapper
installed as __suid_wrapper_dir__/Xorg.wrap which will execute the real
-X server which is installed as __suid_wrapper_dir__/Xorg.bin .
+X server which is installed as __suid_wrapper_dir__/Xorg.
.PP
By default Xorg.wrap will autodetect if root rights are necessary, and
if not it will drop its elevated rights before starting the real X server.
diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
index 16fc1b739..cc50f36c4 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
@@ -46,15 +46,12 @@
#define SOL_CONSOLE_DEV "/dev/console"
static Bool KeepTty = FALSE;
-static Bool Protect0 = FALSE;
static Bool UseConsole = FALSE;
#ifdef HAS_USL_VTS
static int VTnum = -1;
static int xf86StartVT = -1;
static int vtEnabled = 0;
-extern void xf86VTAcquire(int);
-extern void xf86VTRelease(int);
#endif
/* Device to open as xf86Info.consoleFd */
@@ -97,27 +94,6 @@ xf86OpenConsole(void)
if (geteuid() != 0)
FatalError("xf86OpenConsole: Server must be suid root\n");
- /* Protect page 0 to help find NULL dereferencing */
- /* mprotect() doesn't seem to work */
- if (Protect0) {
- int fd = -1;
-
- if ((fd = open("/dev/zero", O_RDONLY, 0)) < 0) {
- xf86Msg(X_WARNING,
- "xf86OpenConsole: cannot open /dev/zero (%s)\n",
- strerror(errno));
- }
- else {
- if (mmap(0, 0x1000, PROT_NONE,
- MAP_FIXED | MAP_SHARED, fd, 0) == MAP_FAILED)
- xf86Msg(X_WARNING,
- "xf86OpenConsole: failed to protect page 0 (%s)\n",
- strerror(errno));
-
- close(fd);
- }
- }
-
#ifdef HAS_USL_VTS
/*
@@ -371,15 +347,6 @@ xf86ProcessArgument(int argc, char **argv, int i)
}
/*
- * Undocumented flag to protect page 0 from read/write to help catch NULL
- * pointer dereferences. This is purely a debugging flag.
- */
- if (!strcmp(argv[i], "-protect0")) {
- Protect0 = TRUE;
- return 1;
- }
-
- /*
* Use /dev/console as the console device.
*/
if (!strcmp(argv[i], "-C")) {
diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
index 3a83f348f..6190fe6a0 100644
--- a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
+++ b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
@@ -134,10 +134,15 @@
#endif
#include <sys/kd.h>
#include <sys/vt.h>
+
+extern _X_HIDDEN void xf86VTAcquire(int);
+extern _X_HIDDEN void xf86VTRelease(int);
#endif
#if defined(sun)
#include <sys/fbio.h>
+extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
+
#include <sys/kbd.h>
#include <sys/kbio.h>
diff --git a/xorg-server/hw/xfree86/xorg-wrapper.c b/xorg-server/hw/xfree86/xorg-wrapper.c
index 4ea47331b..22e97ad5d 100644
--- a/xorg-server/hw/xfree86/xorg-wrapper.c
+++ b/xorg-server/hw/xfree86/xorg-wrapper.c
@@ -255,18 +255,18 @@ int main(int argc, char *argv[])
}
}
- snprintf(buf, sizeof(buf), "%s/Xorg.bin", SUID_WRAPPER_DIR);
+ snprintf(buf, sizeof(buf), "%s/Xorg", SUID_WRAPPER_DIR);
/* Check if the server is executable by our real uid */
if (access(buf, X_OK) != 0) {
- fprintf(stderr, "%s: Missing execute permissions for %s/Xorg.bin: %s\n",
- progname, SUID_WRAPPER_DIR, strerror(errno));
+ fprintf(stderr, "%s: Missing execute permissions for %s: %s\n",
+ progname, buf, strerror(errno));
exit(1);
}
argv[0] = buf;
(void) execv(argv[0], argv);
- fprintf(stderr, "%s: Failed to execute %s/Xorg.bin: %s\n",
- progname, SUID_WRAPPER_DIR, strerror(errno));
+ fprintf(stderr, "%s: Failed to execute %s: %s\n",
+ progname, buf, strerror(errno));
exit(1);
}
diff --git a/xorg-server/hw/xnest/Keyboard.c b/xorg-server/hw/xnest/Keyboard.c
index 2cf16246b..ee3f68e3f 100644
--- a/xorg-server/hw/xnest/Keyboard.c
+++ b/xorg-server/hw/xnest/Keyboard.c
@@ -18,6 +18,7 @@ is" without express or implied warranty.
#include <X11/X.h>
#include <X11/Xproto.h>
+#include <xcb/xcb_keysyms.h>
#include <X11/keysym.h>
#include "screenint.h"
#include "inputstr.h"
@@ -247,7 +248,11 @@ xnestUpdateModifierState(unsigned int state)
for (key = 0; key < MAP_LENGTH; key++)
if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
- if (key_is_down(pDev, key, KEY_PROCESSED))
+ if (mask == XCB_MOD_MASK_LOCK) {
+ xnestQueueKeyEvent(KeyPress, key);
+ xnestQueueKeyEvent(KeyRelease, key);
+ }
+ else if (key_is_down(pDev, key, KEY_PROCESSED))
xnestQueueKeyEvent(KeyRelease, key);
if (--count == 0)
@@ -261,6 +266,8 @@ xnestUpdateModifierState(unsigned int state)
for (key = 0; key < MAP_LENGTH; key++)
if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
xnestQueueKeyEvent(KeyPress, key);
+ if (mask == XCB_MOD_MASK_LOCK)
+ xnestQueueKeyEvent(KeyRelease, key);
break;
}
}
diff --git a/xorg-server/hw/xwayland/Makefile.am b/xorg-server/hw/xwayland/Makefile.am
index 4e0e1bb00..994554088 100644
--- a/xorg-server/hw/xwayland/Makefile.am
+++ b/xorg-server/hw/xwayland/Makefile.am
@@ -26,7 +26,6 @@ Xwayland_LDADD = \
$(XWAYLAND_LIBS) \
$(XWAYLAND_SYS_LIBS) \
$(XSERVER_SYS_LIBS)
-Xwayland_DEPENDENCIES = $(XWAYLAND_LIBS)
Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
diff --git a/xorg-server/hw/xwayland/xwayland-glamor.c b/xorg-server/hw/xwayland/xwayland-glamor.c
index 4be883fa3..dd8551840 100644
--- a/xorg-server/hw/xwayland/xwayland-glamor.c
+++ b/xorg-server/hw/xwayland/xwayland-glamor.c
@@ -137,6 +137,9 @@ xwl_glamor_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo, int depth)
glGenTextures(1, &xwl_pixmap->texture);
glBindTexture(GL_TEXTURE_2D, xwl_pixmap->texture);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, xwl_pixmap->image);
glBindTexture(GL_TEXTURE_2D, 0);
@@ -398,9 +401,8 @@ xwl_screen_init_glamor(struct xwl_screen *xwl_screen,
}
void
-glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap)
+glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
{
- glamor_destroy_textured_pixmap(pixmap);
}
int
diff --git a/xorg-server/hw/xwayland/xwayland-input.c b/xorg-server/hw/xwayland/xwayland-input.c
index b8c543ce4..5e204189f 100644
--- a/xorg-server/hw/xwayland/xwayland-input.c
+++ b/xorg-server/hw/xwayland/xwayland-input.c
@@ -233,6 +233,9 @@ pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial,
xwl_seat->xwl_screen->serial = serial;
switch (button) {
+ case BTN_LEFT:
+ index = 1;
+ break;
case BTN_MIDDLE:
index = 2;
break;
@@ -240,7 +243,9 @@ pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial,
index = 3;
break;
default:
- index = button - BTN_LEFT + 1;
+ /* Skip indexes 4-7: they are used for vertical and horizontal scroll.
+ The rest of the buttons go in order: BTN_SIDE becomes 8, etc. */
+ index = 8 + button - BTN_SIDE;
break;
}
diff --git a/xorg-server/hw/xwayland/xwayland.c b/xorg-server/hw/xwayland/xwayland.c
index 37d6d8270..7e8d667d6 100644
--- a/xorg-server/hw/xwayland/xwayland.c
+++ b/xorg-server/hw/xwayland/xwayland.c
@@ -513,9 +513,9 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
int ret, bpc, green_bpc, i;
xwl_screen = calloc(sizeof *xwl_screen, 1);
- xwl_screen->wm_fd = -1;
if (xwl_screen == NULL)
return FALSE;
+ xwl_screen->wm_fd = -1;
if (!dixRegisterPrivateKey(&xwl_screen_private_key, PRIVATE_SCREEN, 0))
return FALSE;
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index 4e099d294..fe4755c03 100755
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -814,6 +814,10 @@ winUseMsg(void)
#ifdef XWIN_CLIPBOARD
ErrorF("-nounicodeclipboard\n"
"\tDo not use Unicode clipboard even if on a NT-based platform.\n");
+
+ ErrorF("-[no]primary\n"
+ "\tWhen clipboard integration is enabled, map the X11 PRIMARY selection\n"
+ "\tto the Windows clipboard. Default is enabled.\n");
#endif
ErrorF("-refresh rate_in_Hz\n"
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index f94f5f995..4ff795027 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -138,6 +138,7 @@ BEGIN
POPUP "TRAYICON_MENU"
BEGIN
MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT
+ MENUITEM "Clipboard may use &PRIMARY selection", ID_APP_MONITOR_PRIMARY
MENUITEM "&About...", ID_APP_ABOUT
MENUITEM SEPARATOR
MENUITEM "E&xit...", ID_APP_EXIT
diff --git a/xorg-server/hw/xwin/man/XWin.man b/xorg-server/hw/xwin/man/XWin.man
index a043ac281..15a57db02 100644
--- a/xorg-server/hw/xwin/man/XWin.man
+++ b/xorg-server/hw/xwin/man/XWin.man
@@ -174,7 +174,7 @@ on remote hosts, when that information is available and it's useful to do so.
.SH OPTIONS CONTROLLING WINDOWS INTEGRATION
.TP 8
.B \-[no]clipboard
-Enables [disables] the integration between the Cygwin/X clipboard and
+Enables [disables] the integration between the X11 clipboard and
\fIWindows\fP clipboard. The default is enabled.
.TP 8
.B "\-emulate3buttons [\fItimeout\fP]"
@@ -200,6 +200,10 @@ prevents the \fIWindows\fP mouse cursor from being drawn on top of the X
cursor.
This parameter has no effect unless \fB-swcursor\fP is also specified.
.TP 8
+.B \-[no]primary
+Clipboard integration may [will not] use the PRIMARY selection.
+The default is enabled.
+.TP 8
.B \-swcursor
Disable the usage of the \fIWindows\fP cursor and use the X11 software cursor instead.
.TP 8
diff --git a/xorg-server/hw/xwin/winclipboard/internal.h b/xorg-server/hw/xwin/winclipboard/internal.h
index 55c7771af..73a330fc6 100755
--- a/xorg-server/hw/xwin/winclipboard/internal.h
+++ b/xorg-server/hw/xwin/winclipboard/internal.h
@@ -62,11 +62,13 @@ typedef int pid_t;
#include "winmsg.h"
#define WIN_XEVENTS_SUCCESS 0
-#define WIN_XEVENTS_CONVERT 2
-#define WIN_XEVENTS_NOTIFY 3
+#define WIN_XEVENTS_FAILED 1
+#define WIN_XEVENTS_NOTIFY_DATA 3
+#define WIN_XEVENTS_NOTIFY_TARGETS 4
#define WIN_LOCAL_PROPERTY "CYGX_CUT_BUFFER"
#define WM_WM_REINIT (WM_USER + 200)
+#define WM_WM_QUIT (WM_USER + 201)
/*
* References to external symbols
@@ -95,6 +97,15 @@ void
*/
+typedef struct
+{
+ Atom atomClipboard;
+ Atom atomLocalProperty;
+ Atom atomUTF8String;
+ Atom atomCompoundText;
+ Atom atomTargets;
+} ClipboardAtoms;
+
/*
* winclipboardwndproc.c
*/
@@ -104,12 +115,33 @@ Bool winClipboardFlushWindowsMessageQueue(HWND hwnd);
LRESULT CALLBACK
winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
+typedef struct
+{
+ Display *pClipboardDisplay;
+ Window iClipboardWindow;
+ ClipboardAtoms *atoms;
+} ClipboardWindowCreationParams;
+
/*
* winclipboardxevents.c
*/
+typedef struct
+{
+ Bool fUseUnicode;
+ Atom *targetList;
+} ClipboardConversionData;
+
int
winClipboardFlushXEvents(HWND hwnd,
- int iWindow, Display * pDisplay, Bool fUnicodeSupport, Bool ClipboardOpened);
+ Window iWindow, Display * pDisplay, ClipboardConversionData *data, ClipboardAtoms *atom);
+
+
+Atom
+winClipboardGetLastOwnedSelectionAtom(ClipboardAtoms *atoms);
+
+void
+winClipboardInitMonitoredSelections(void);
+
#endif
diff --git a/xorg-server/hw/xwin/winclipboard/thread.c b/xorg-server/hw/xwin/winclipboard/thread.c
index 5dee3040e..42edad89c 100755
--- a/xorg-server/hw/xwin/winclipboard/thread.c
+++ b/xorg-server/hw/xwin/winclipboard/thread.c
@@ -35,16 +35,26 @@
#else
#define HAS_WINSOCK 1
#endif
+
+/*
+ * Including any server header might define the macro _XSERVER64 on 64 bit machines.
+ * That macro must _NOT_ be defined for Xlib client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
+
#include <sys/types.h>
#include <signal.h>
#include <pthread.h>
-#include "winclipboard.h"
#include "windisplay.h"
#ifdef __CYGWIN__
#include <errno.h>
#endif
#include "misc.h"
#include "winmsg.h"
+#include "winclipboard.h"
#include "internal.h"
/* Clipboard module constants */
@@ -90,7 +100,7 @@ Bool g_fUseUnicode = FALSE;
*/
static HWND
-winClipboardCreateMessagingWindow(void);
+winClipboardCreateMessagingWindow(Display *pDisplay, Window iWindow, ClipboardAtoms *atoms);
static int
winClipboardErrorHandler(Display * pDisplay, XErrorEvent * pErr);
@@ -107,7 +117,7 @@ winClipboardThreadExit(void *arg);
Bool
winClipboardProc(Bool fUseUnicode, char *szDisplay)
{
- Atom atomClipboard;
+ ClipboardAtoms atoms;
int iReturn;
HWND hwnd = NULL;
int iConnectionNumber = 0;
@@ -125,6 +135,7 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
int iSelectError;
pthread_cleanup_push(&winClipboardThreadExit, NULL);
+ ClipboardConversionData data;
winDebug ("winClipboardProc - Hello\n");
@@ -191,12 +202,15 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
iMaxDescriptor = iConnectionNumber + 1;
#endif
- /* Create atom */
- atomClipboard = XInternAtom(pDisplay, "CLIPBOARD", False);
- XInternAtom (pDisplay, WIN_LOCAL_PROPERTY, False);
- XInternAtom (pDisplay, "UTF8_STRING", False);
- XInternAtom (pDisplay, "COMPOUND_TEXT", False);
- XInternAtom (pDisplay, "TARGETS", False);
+ if (!XFixesQueryExtension(pDisplay, &xfixes_event_base, &xfixes_error_base))
+ ErrorF ("winClipboardProc - XFixes extension not present\n");
+
+ /* Create atoms */
+ atoms.atomClipboard = XInternAtom(pDisplay, "CLIPBOARD", False);
+ atoms.atomLocalProperty = XInternAtom (pDisplay, "CYGX_CUT_BUFFER", False);
+ atoms.atomUTF8String = XInternAtom (pDisplay, "UTF8_STRING", False);
+ atoms.atomCompoundText = XInternAtom (pDisplay, "COMPOUND_TEXT", False);
+ atoms.atomTargets = XInternAtom (pDisplay, "TARGETS", False);
/* Create a messaging window */
iWindow = XCreateSimpleWindow(pDisplay,
@@ -218,6 +232,20 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
ErrorF("winClipboardProc - XSelectInput generated BadWindow "
"on messaging window\n");
+ XFixesSelectSelectionInput (pDisplay,
+ iWindow,
+ XA_PRIMARY,
+ XFixesSetSelectionOwnerNotifyMask |
+ XFixesSelectionWindowDestroyNotifyMask |
+ XFixesSelectionClientCloseNotifyMask);
+
+ XFixesSelectSelectionInput (pDisplay,
+ iWindow,
+ atoms.atomClipboard,
+ XFixesSetSelectionOwnerNotifyMask |
+ XFixesSelectionWindowDestroyNotifyMask |
+ XFixesSelectionClientCloseNotifyMask);
+
/* Save the window in the screen privates */
g_iClipboardWindow = iWindow;
@@ -248,28 +276,28 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
}
}
- /* Pre-flush X events */
- /*
- * NOTE: Apparently you'll freeze if you don't do this,
- * because there may be events in local data structures
- * already.
- */
- //winClipboardFlushXEvents(hwnd, iWindow, pDisplay, fUseUnicode);
-
- /* Pre-flush Windows messages */
- winDebug ("Start flushing \n");
- if (!winClipboardFlushWindowsMessageQueue(hwnd))
- {
- ErrorF ("winClipboardFlushWindowsMessageQueue - returned 0\n");
- goto thread_errorexit;
- }
-
+ data.fUseUnicode = fUseUnicode;
winDebug ("winClipboardProc - Started\n");
/* Signal that the clipboard client has started */
g_fClipboardStarted = TRUE;
- /* Loop for X events */
+ /* Loop for events */
while (1) {
+
+ /* Process X events */
+ winClipboardFlushXEvents(hwnd,
+ iWindow, pDisplay, &data, &atoms);
+
+ /* Process Windows messages */
+ if (!winClipboardFlushWindowsMessageQueue(hwnd)) {
+ ErrorF("winClipboardProc - winClipboardFlushWindowsMessageQueue trapped "
+ "WM_QUIT message, exiting main loop.\n");
+ break;
+ }
+
+ /* We need to ensure that all pending requests are sent */
+ XFlush(pDisplay);
+
/* Setup the file descriptor set */
/*
* NOTE: You have to do this before every call to select
@@ -316,13 +344,10 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
break;
}
- /* Branch on which descriptor became active */
-// if (FD_ISSET (iConnectionNumber, &fdsRead)) {
-// Also do it when no read since winClipboardFlushXEvents
-// is sending the output.
- /* Process X events */
- winClipboardFlushXEvents(hwnd, iWindow, pDisplay, fUseUnicode, FALSE);
-// }
+ if (FD_ISSET(iConnectionNumber, &fdsRead)) {
+ winDebug
+ ("winClipboardProc - X connection ready, pumping X event queue\n");
+ }
#ifdef HAS_DEVWINDOWS
/* Check for Windows event ready */
@@ -331,14 +356,16 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
if (1)
#endif
{
- /* Process Windows messages */
- if (!winClipboardFlushWindowsMessageQueue(hwnd)) {
- ErrorF("winClipboardProc - "
- "winClipboardFlushWindowsMessageQueue trapped "
- "WM_QUIT message, exiting main loop.\n");
- break;
- }
+ winDebug
+ ("winClipboardProc - /dev/windows ready, pumping Windows message queue\n");
}
+
+#ifdef HAS_DEVWINDOWS
+ if (!(FD_ISSET(iConnectionNumber, &fdsRead)) &&
+ !(FD_ISSET(fdMessageQueue, &fdsRead))) {
+ winDebug("winClipboardProc - Spurious wake, select() returned %d\n", iReturn);
+ }
+#endif
}
/* Close our X window */
@@ -360,8 +387,11 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
#if 0
/*
- * FIXME: XCloseDisplay hangs if we call it, as of 2004/03/26. The
- * XSync and XSelectInput calls did not help.
+ * FIXME: XCloseDisplay hangs if we call it
+ *
+ * XCloseDisplay() calls XSync(), so any outstanding errors are reported.
+ * If we are built into the server, this can deadlock if the server is
+ * in the process of exiting and waiting for this thread to exit.
*/
/* Discard any remaining events */
@@ -407,9 +437,10 @@ commonexit:
*/
HWND
-winClipboardCreateMessagingWindow(void)
+winClipboardCreateMessagingWindow(Display *pDisplay, Window iWindow, ClipboardAtoms *atoms)
{
WNDCLASSEX wc;
+ ClipboardWindowCreationParams cwcp;
HWND hwnd;
/* Setup our window class */
@@ -427,6 +458,11 @@ winClipboardCreateMessagingWindow(void)
wc.hIconSm = 0;
RegisterClassEx(&wc);
+ /* Information to be passed to WM_CREATE */
+ cwcp.pClipboardDisplay = pDisplay;
+ cwcp.iClipboardWindow = iWindow;
+ cwcp.atoms = atoms;
+
/* Create the window */
hwnd = CreateWindowExA(0, /* Extended styles */
WIN_CLIPBOARD_WINDOW_CLASS, /* Class name */
@@ -439,7 +475,7 @@ winClipboardCreateMessagingWindow(void)
(HWND) NULL, /* No parent or owner window */
(HMENU) NULL, /* No menu */
GetModuleHandle(NULL), /* Instance handle */
- NULL); /* Creation data */
+ &cwcp); /* Creation data */
assert(hwnd != NULL);
/* I'm not sure, but we may need to call this to start message processing */
diff --git a/xorg-server/hw/xwin/winclipboard/winclipboard.h b/xorg-server/hw/xwin/winclipboard/winclipboard.h
index 7b172739a..d7d8efa15 100644
--- a/xorg-server/hw/xwin/winclipboard/winclipboard.h
+++ b/xorg-server/hw/xwin/winclipboard/winclipboard.h
@@ -27,6 +27,10 @@
#ifndef WINCLIPBOARD_H
#define WINCLIPBOARD_H
+#include <x11/Xdefs.h>
+
void winFixClipboardChain (int Removed);
+extern Bool fPrimarySelection;
+
#endif
diff --git a/xorg-server/hw/xwin/winclipboard/wndproc.c b/xorg-server/hw/xwin/winclipboard/wndproc.c
index f5f931f74..d522e1f30 100755
--- a/xorg-server/hw/xwin/winclipboard/wndproc.c
+++ b/xorg-server/hw/xwin/winclipboard/wndproc.c
@@ -45,6 +45,7 @@
#include <sys/types.h>
#include <sys/time.h>
+#include <limits.h>
#include "winclipboard.h"
#include "misc.h"
#include "winmsg.h"
@@ -76,24 +77,15 @@ extern Bool g_fClipboardPrimary;
static int
winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
- Bool fUseUnicode, int iTimeoutSec)
+ ClipboardConversionData *data, ClipboardAtoms *atoms, int iTimeoutSec)
{
int iConnNumber;
struct timeval tv;
int iReturn;
DWORD dwStopTime = GetTickCount() + iTimeoutSec * 1000;
- /* Make sure the output messages are sent before waiting on a response. */
- iReturn = winClipboardFlushXEvents (hwnd,
- iWindow,
- pDisplay,
- fUseUnicode,
- TRUE);
- if (WIN_XEVENTS_NOTIFY == iReturn)
- {
- /* Bail out if notify processed */
- return iReturn;
- }
+ winDebug("winProcessXEventsTimeout () - pumping X events for %d seconds\n",
+ iTimeoutSec);
/* Get our connection number */
iConnNumber = ConnectionNumber(pDisplay);
@@ -103,6 +95,19 @@ winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
fd_set fdsRead;
long remainingTime;
+ /* Process X events */
+ iReturn = winClipboardFlushXEvents(hwnd, iWindow, pDisplay, data, atoms);
+
+ winDebug("winProcessXEventsTimeout () - winClipboardFlushXEvents returned %d\n", iReturn);
+
+ if ((WIN_XEVENTS_NOTIFY_DATA == iReturn) || (WIN_XEVENTS_NOTIFY_TARGETS == iReturn) || (WIN_XEVENTS_FAILED == iReturn)) {
+ /* Bail out */
+ return iReturn;
+ }
+
+ /* We need to ensure that all pending requests are sent */
+ XFlush(pDisplay);
+
/* Setup the file descriptor set */
FD_ZERO(&fdsRead);
FD_SET(iConnNumber, &fdsRead);
@@ -130,24 +135,8 @@ winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
break;
}
- /* Branch on which descriptor became active */
- if (FD_ISSET(iConnNumber, &fdsRead)) {
- /* Process X events */
- /* Exit when we see that server is shutting down */
- iReturn = winClipboardFlushXEvents(hwnd,
- iWindow, pDisplay, fUseUnicode, TRUE);
-
- winDebug
- ("winProcessXEventsTimeout () - winClipboardFlushXEvents returned %d\n",
- iReturn);
-
- if (WIN_XEVENTS_NOTIFY == iReturn) {
- /* Bail out if notify processed */
- return iReturn;
- }
- }
- else {
- winDebug("winProcessXEventsTimeout - Spurious wake\n");
+ if (!FD_ISSET(iConnNumber, &fdsRead)) {
+ winDebug("winProcessXEventsTimeout - Spurious wake, select() returned %d\n", iReturn);
}
}
@@ -162,6 +151,7 @@ LRESULT CALLBACK
winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
static HWND s_hwndNextViewer;
+ static Bool fRunning;
/* Branch on message type */
switch (message) {
@@ -174,6 +164,13 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
s_hwndNextViewer = NULL;
g_hwndClipboard = NULL;
+ }
+ return 0;
+
+ case WM_WM_QUIT:
+ {
+ winDebug("winClipboardWindowProc - WM_WM_QUIT\n");
+ fRunning = FALSE;
PostQuitMessage(0);
}
return 0;
@@ -185,6 +182,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
winDebug("winClipboardWindowProc - WM_CREATE\n");
+ fRunning = TRUE;
/* Add ourselves to the clipboard viewer chain */
s_hwndNextViewer = SetClipboardViewer (hwnd);
#ifdef _DEBUG
@@ -300,6 +298,10 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
return 0;
}
+ /* Bail when shutting down */
+ if (!fRunning)
+ return 0;
+
/*
* Do not take ownership of the X11 selections when something
* other than CF_TEXT or CF_UNICODETEXT has been copied
@@ -406,92 +408,153 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
winDebug("winClipboardWindowProc - WM_DESTROYCLIPBOARD - Ignored.\n");
return 0;
- case WM_RENDERFORMAT:
case WM_RENDERALLFORMATS:
+ winDebug("winClipboardWindowProc - WM_RENDERALLFORMATS - Hello.\n");
+
+ /*
+ WM_RENDERALLFORMATS is sent as we are shutting down, to render the
+ clipboard so it's contents remains available to other applications.
+
+ Unfortunately, this can't work without major changes. The server is
+ already waiting for us to stop, so we can't ask for the rendering of
+ clipboard text now.
+ */
+
+ return 0;
+
+ case WM_RENDERFORMAT:
{
int iReturn;
Display *pDisplay = g_pClipboardDisplay;
Window iWindow = g_iClipboardWindow;
Bool fConvertToUnicode;
+ Bool pasted = FALSE;
+ Atom selection;
+ ClipboardConversionData data;
+ int best_target = 0;
- winDebug("winClipboardWindowProc - WM_RENDER*FORMAT - Hello.\n");
+ winDebug("winClipboardWindowProc - WM_RENDERFORMAT %d - Hello.\n",
+ wParam);
/* Flag whether to convert to Unicode or not */
- if (message == WM_RENDERALLFORMATS)
- fConvertToUnicode = FALSE;
- else
- fConvertToUnicode = (CF_UNICODETEXT == wParam);
+ fConvertToUnicode = (CF_UNICODETEXT == wParam);
- /* Request the selection contents */
- iReturn = XConvertSelection(pDisplay,
- g_atomLastOwnedSelection,
- XInternAtom(pDisplay,
- "COMPOUND_TEXT", False),
- XInternAtom(pDisplay,
- WIN_LOCAL_PROPERTY, False),
- iWindow, CurrentTime);
- if (iReturn == BadAtom || iReturn == BadWindow) {
- ErrorF ("winClipboardWindowProc - WM_RENDER*FORMAT - "
- "XConvertSelection () failed\n");
- break;
+ selection = winClipboardGetLastOwnedSelectionAtom(atoms);
+ if (selection == None) {
+ ErrorF("winClipboardWindowProc - no monitored selection is owned\n");
+ goto fake_paste;
}
- /* Special handling for WM_RENDERALLFORMATS */
- if (message == WM_RENDERALLFORMATS) {
- /* We must open and empty the clipboard */
- if (!OpenClipboard(hwnd)) {
- ErrorF ("winClipboardWindowProc - WM_RENDER*FORMATS - "
- "OpenClipboard () failed: %08x\n",
- GetLastError());
- break;
- }
+ winDebug("winClipboardWindowProc - requesting targets for selection from owner\n");
- if (!EmptyClipboard()) {
- ErrorF ("winClipboardWindowProc - WM_RENDER*FORMATS - "
- "EmptyClipboard () failed: %08x\n",
- GetLastError());
- CloseClipboard ();
- break;
- }
+ /* Request the selection's supported conversion targets */
+ XConvertSelection(pDisplay,
+ selection,
+ atoms->atomTargets,
+ atoms->atomLocalProperty,
+ iWindow, CurrentTime);
+
+ /* Process X events */
+ data.fUseUnicode = fConvertToUnicode;
+ iReturn = winProcessXEventsTimeout(hwnd,
+ iWindow,
+ pDisplay,
+ &data,
+ atoms,
+ WIN_POLL_TIMEOUT);
+
+ if (WIN_XEVENTS_NOTIFY_TARGETS != iReturn) {
+ ErrorF
+ ("winClipboardWindowProc - timed out waiting for WIN_XEVENTS_NOTIFY_TARGETS\n");
+ goto fake_paste;
+ }
+
+ /* Choose the most preferred target */
+ {
+ struct target_priority
+ {
+ Atom target;
+ unsigned int priority;
+ };
+
+ struct target_priority target_priority_table[] =
+ {
+ { atoms->atomCompoundText, 0 },
+#ifdef X_HAVE_UTF8_STRING
+ { atoms->atomUTF8String, 1 },
+#endif
+ { XA_STRING, 2 },
+ };
+
+ int best_priority = INT_MAX;
+
+ int i,j;
+ for (i = 0 ; data.targetList[i] != 0; i++)
+ {
+ for (j = 0; j < sizeof(target_priority_table)/sizeof(struct target_priority); j ++)
+ {
+ if ((data.targetList[i] == target_priority_table[j].target) &&
+ (target_priority_table[j].priority < best_priority))
+ {
+ best_target = target_priority_table[j].target;
+ best_priority = target_priority_table[j].priority;
+ }
+ }
+ }
}
- /* Process the SelectionNotify event */
+ free(data.targetList);
+ data.targetList = 0;
+
+ winDebug("winClipboardWindowProc - best target is %d\n", best_target);
+
+ /* No useful targets found */
+ if (best_target == 0)
+ goto fake_paste;
+
+ winDebug("winClipboardWindowProc - requesting selection from owner\n");
+
+ /* Request the selection contents */
+ XConvertSelection(pDisplay,
+ selection,
+ best_target,
+ atoms->atomLocalProperty,
+ iWindow, CurrentTime);
+
+ /* Process X events */
iReturn = winProcessXEventsTimeout(hwnd,
iWindow,
pDisplay,
- fConvertToUnicode, WIN_POLL_TIMEOUT);
+ &data,
+ atoms,
+ WIN_POLL_TIMEOUT);
/*
- * The last call to winProcessXEventsTimeout
- * from above had better have seen a notify event, or else we
- * are dealing with a buggy or old X11 app. In these cases we
- * have to paste some fake data to the Win32 clipboard to
- * satisfy the requirement that we write something to it.
+ * winProcessXEventsTimeout had better have seen a notify event,
+ * or else we are dealing with a buggy or old X11 app.
*/
- if (WIN_XEVENTS_NOTIFY != iReturn) {
- ErrorF("winClipboardWindowProc - winProcessXEventsTimeout should have returned WIN_XEVENTS_NOTIFY was %d\n",iReturn);
- /* Paste no data, to satisfy required call to SetClipboardData */
- SetClipboardData(CF_UNICODETEXT, NULL);
- SetClipboardData(CF_TEXT, NULL);
-
+ if (WIN_XEVENTS_NOTIFY_DATA != iReturn) {
ErrorF
- ("winClipboardWindowProc - timed out waiting for WIN_XEVENTS_NOTIFY\n");
+ ("winClipboardWindowProc - timed out waiting for WIN_XEVENTS_NOTIFY_DATA\n");
}
-
- /* Special handling for WM_RENDERALLFORMATS */
- if (message == WM_RENDERALLFORMATS) {
- /* We must close the clipboard */
-
- if (!CloseClipboard()) {
- ErrorF (
- "winClipboardWindowProc - WM_RENDERALLFORMATS - "
- "CloseClipboard () failed: %08x\n",
- GetLastError());
- break;
- }
+ else {
+ pasted = TRUE;
}
- winDebug("winClipboardWindowProc - WM_RENDER*FORMAT - Returning.\n");
+ /*
+ * If we couldn't get the data from the X clipboard, we
+ * have to paste some fake data to the Win32 clipboard to
+ * satisfy the requirement that we write something to it.
+ */
+ fake_paste:
+ if (!pasted)
+ {
+ /* Paste no data, to satisfy required call to SetClipboardData */
+ SetClipboardData(CF_UNICODETEXT, NULL);
+ SetClipboardData(CF_TEXT, NULL);
+ }
+
+ winDebug("winClipboardWindowProc - WM_RENDERFORMAT - Returning.\n");
return 0;
}
}
diff --git a/xorg-server/hw/xwin/winclipboard/xevents.c b/xorg-server/hw/xwin/winclipboard/xevents.c
index cfbf0121e..640efeb4e 100755
--- a/xorg-server/hw/xwin/winclipboard/xevents.c
+++ b/xorg-server/hw/xwin/winclipboard/xevents.c
@@ -36,10 +36,158 @@
#include "winclipboard.h"
#include "misc.h"
#include "winmsg.h"
-#include "internal.h"
+/*
+ * Including any server header might define the macro _XSERVER64 on 64 bit machines.
+ * That macro must _NOT_ be defined for Xlib client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
+
+#include <limits.h>
#include <unistd.h>
+#include <wchar.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+//#include <X11/extensions/Xfixes.h>
+
+#include "winclipboard.h"
+#include "internal.h"
+
+/*
+ * Constants
+ */
+
+#define CLIP_NUM_SELECTIONS 2
+#define CLIP_OWN_NONE -1
+#define CLIP_OWN_PRIMARY 0
+#define CLIP_OWN_CLIPBOARD 1
+
+/*
+ * Global variables
+ */
+
+extern int xfixes_event_base;
+Bool fPrimarySelection = TRUE;
+
+extern Bool g_fClipboardPrimary;
+
+/*
+ * Local variables
+ */
+
+static Window s_iOwners[CLIP_NUM_SELECTIONS] = { None, None };
+static const char *szSelectionNames[CLIP_NUM_SELECTIONS] =
+ { "PRIMARY", "CLIPBOARD" };
+
+static unsigned int lastOwnedSelectionIndex = CLIP_OWN_NONE;
+
+static void
+MonitorSelection(XFixesSelectionNotifyEvent * e, unsigned int i)
+{
+ /* Look for owned -> not owned transition */
+ if (None == e->owner && None != s_iOwners[i]) {
+ unsigned int other_index;
+
+ winDebug("MonitorSelection - %s - Going from owned to not owned.\n",
+ szSelectionNames[i]);
+
+ /* If this selection is not owned, the other monitored selection must be the most
+ recently owned, if it is owned at all */
+ if (i == CLIP_OWN_PRIMARY)
+ other_index = CLIP_OWN_CLIPBOARD;
+ if (i == CLIP_OWN_CLIPBOARD)
+ other_index = CLIP_OWN_PRIMARY;
+ if (None != s_iOwners[other_index])
+ lastOwnedSelectionIndex = other_index;
+ else
+ lastOwnedSelectionIndex = CLIP_OWN_NONE;
+ }
+
+ /* Save last owned selection */
+ if (None != e->owner) {
+ lastOwnedSelectionIndex = i;
+ }
-extern Bool g_fClipboardPrimary;
+ /* Save new selection owner or None */
+ s_iOwners[i] = e->owner;
+ winDebug("MonitorSelection - %s - Now owned by XID %x\n",
+ szSelectionNames[i], e->owner);
+}
+
+Atom
+winClipboardGetLastOwnedSelectionAtom(ClipboardAtoms *atoms)
+{
+ if (lastOwnedSelectionIndex == CLIP_OWN_NONE)
+ return None;
+
+ if (lastOwnedSelectionIndex == CLIP_OWN_PRIMARY)
+ return XA_PRIMARY;
+
+ if (lastOwnedSelectionIndex == CLIP_OWN_CLIPBOARD)
+ return atoms->atomClipboard;
+
+ return None;
+}
+
+
+void
+winClipboardInitMonitoredSelections(void)
+{
+ /* Initialize static variables */
+ int i;
+ for (i = 0; i < CLIP_NUM_SELECTIONS; ++i)
+ s_iOwners[i] = None;
+
+ lastOwnedSelectionIndex = CLIP_OWN_NONE;
+}
+
+static int
+winClipboardSelectionNotifyTargets(HWND hwnd, Window iWindow, Display *pDisplay, ClipboardConversionData *data, ClipboardAtoms *atoms)
+{
+ Atom type;
+ int format;
+ unsigned long nitems;
+ unsigned long after;
+ Atom *prop;
+
+ /* Retrieve the selection data and delete the property */
+ int iReturn = XGetWindowProperty(pDisplay,
+ iWindow,
+ atoms->atomLocalProperty,
+ 0,
+ INT_MAX,
+ True,
+ AnyPropertyType,
+ &type,
+ &format,
+ &nitems,
+ &after,
+ (unsigned char **)&prop);
+ if (iReturn != Success) {
+ ErrorF("winClipboardFlushXEvents - SelectionNotify - "
+ "XGetWindowProperty () failed, aborting: %d\n", iReturn);
+ } else {
+ int i;
+ data->targetList = malloc((nitems+1)*sizeof(Atom));
+
+ for (i = 0; i < nitems; i++)
+ {
+ Atom atom = prop[i];
+ char *pszAtomName = XGetAtomName(pDisplay, atom);
+ data->targetList[i] = atom;
+ winDebug("winClipboardFlushXEvents - SelectionNotify - target[%d] %d = %s\n", i, atom, pszAtomName);
+ XFree(pszAtomName);
+ }
+
+ data->targetList[nitems] = 0;
+
+ XFree(prop);
+ }
+
+ return WIN_XEVENTS_NOTIFY_TARGETS;
+}
/*
* Process any pending X events
@@ -47,21 +195,13 @@ extern Bool g_fClipboardPrimary;
int
winClipboardFlushXEvents(HWND hwnd,
- int iWindow, Display * pDisplay, Bool fUseUnicode, Bool ClipboardOpened)
+ Window iWindow, Display * pDisplay, ClipboardConversionData *data, ClipboardAtoms *atoms)
{
- static Atom atomLocalProperty;
- static Atom atomCompoundText;
- static Atom atomUTF8String;
- static Atom atomTargets;
- static int generation;
-
- if (generation != serverGeneration) {
- generation = serverGeneration;
- atomLocalProperty = XInternAtom(pDisplay, WIN_LOCAL_PROPERTY, False);
- atomUTF8String = XInternAtom(pDisplay, "UTF8_STRING", False);
- atomCompoundText = XInternAtom(pDisplay, "COMPOUND_TEXT", False);
- atomTargets = XInternAtom(pDisplay, "TARGETS", False);
- }
+ Atom atomClipboard = atoms->atomClipboard;
+ Atom atomLocalProperty = atoms->atomLocalProperty;
+ Atom atomUTF8String = atoms->atomUTF8String;
+ Atom atomCompoundText = atoms->atomCompoundText;
+ Atom atomTargets = atoms->atomTargets;
/* Process all pending events */
while (XPending(pDisplay)) {
@@ -74,15 +214,11 @@ winClipboardFlushXEvents(HWND hwnd,
int iReturn;
HGLOBAL hGlobal = NULL;
XICCEncodingStyle xiccesStyle;
- int iConvertDataLen = 0;
char *pszConvertData = NULL;
char *pszTextList[2] = { NULL };
int iCount;
char **ppszTextList = NULL;
wchar_t *pwszUnicodeStr = NULL;
- int iUnicodeLen = 0;
- int iReturnDataLen = 0;
- int i;
Bool fAbort = FALSE;
Bool fCloseClipboard = FALSE;
Bool fSetClipboardData = TRUE;
@@ -90,8 +226,6 @@ winClipboardFlushXEvents(HWND hwnd,
/* Get the next event - will not block because one is ready */
XNextEvent(pDisplay, &event);
- winDebug ("Received event type %d\n",event.type);
-
/* Branch on the event type */
switch (event.type) {
/*
@@ -111,8 +245,6 @@ winClipboardFlushXEvents(HWND hwnd,
winDebug("SelectionRequest - Target atom name %s\n", pszAtomName);
XFree(pszAtomName);
pszAtomName = NULL;
- winDebug ("SelectionRequest - owner %d\n", event.xselectionrequest.owner);
- winDebug ("SelectionRequest - requestor %d\n", event.xselectionrequest.requestor);
}
#endif
@@ -182,8 +314,7 @@ winClipboardFlushXEvents(HWND hwnd,
if (!OpenClipboard (hwnd))
{
ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
- "OpenClipboard () failed: %08lx\n",
- GetLastError ());
+ "OpenClipboard () failed: %08lx\n", GetLastError());
/* Abort */
fAbort = TRUE;
@@ -195,7 +326,7 @@ winClipboardFlushXEvents(HWND hwnd,
}
/* Check that clipboard format is available */
- if (fUseUnicode && !IsClipboardFormatAvailable(CF_UNICODETEXT)) {
+ if (data->fUseUnicode && !IsClipboardFormatAvailable(CF_UNICODETEXT)) {
static int count; /* Hack to stop acroread spamming the log */
static HWND lasthwnd; /* I've not seen any other client get here repeatedly? */
@@ -212,7 +343,7 @@ winClipboardFlushXEvents(HWND hwnd,
fAbort = TRUE;
goto winClipboardFlushXEvents_SelectionRequest_Done;
}
- else if (!fUseUnicode && !IsClipboardFormatAvailable(CF_TEXT)) {
+ else if (!data->fUseUnicode && !IsClipboardFormatAvailable(CF_TEXT)) {
ErrorF("winClipboardFlushXEvents - CF_TEXT is not "
"available from Win32 clipboard. Aborting.\n");
@@ -234,7 +365,7 @@ winClipboardFlushXEvents(HWND hwnd,
xiccesStyle = XStringStyle;
/* Get a pointer to the clipboard text, in desired format */
- if (fUseUnicode) {
+ if (data->fUseUnicode) {
/* Retrieve clipboard data */
hGlobal = GetClipboardData(CF_UNICODETEXT);
}
@@ -243,17 +374,17 @@ winClipboardFlushXEvents(HWND hwnd,
hGlobal = GetClipboardData(CF_TEXT);
}
if (!hGlobal) {
- if (GetLastError()==ERROR_CLIPBOARD_NOT_OPEN && ClipboardOpened)
- {
- ErrorF("We should not have received a SelectionRequest????\n"
- "The owner is the clipboard, but in reality it was"
- "an X window\n");
- /* Set the owner to None */
- if (g_fClipboardPrimary) XSetSelectionOwner (pDisplay, XA_PRIMARY, None, CurrentTime);
- XSetSelectionOwner (pDisplay, XInternAtom (pDisplay, "CLIPBOARD", False), None, CurrentTime);
- }
- ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
- "GetClipboardData () failed: %08lx\n", GetLastError());
+ if (GetLastError()==ERROR_CLIPBOARD_NOT_OPEN && ClipboardOpened)
+ {
+ ErrorF("We should not have received a SelectionRequest????\n"
+ "The owner is the clipboard, but in reality it was"
+ "an X window\n");
+ /* Set the owner to None */
+ if (g_fClipboardPrimary) XSetSelectionOwner (pDisplay, XA_PRIMARY, None, CurrentTime);
+ XSetSelectionOwner (pDisplay, XInternAtom (pDisplay, "CLIPBOARD", False), None, CurrentTime);
+ }
+ ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
+ "GetClipboardData () failed: %08lx\n", GetLastError());
/* Abort */
fAbort = TRUE;
@@ -262,8 +393,8 @@ winClipboardFlushXEvents(HWND hwnd,
pszGlobalData = (char *) GlobalLock(hGlobal);
/* Convert the Unicode string to UTF8 (MBCS) */
- if (fUseUnicode) {
- iConvertDataLen = WideCharToMultiByte(CP_UTF8,
+ if (data->fUseUnicode) {
+ int iConvertDataLen = WideCharToMultiByte(CP_UTF8,
0,
(LPCWSTR) pszGlobalData,
-1, NULL, 0, NULL, NULL);
@@ -278,7 +409,6 @@ winClipboardFlushXEvents(HWND hwnd,
}
else {
pszConvertData = strdup(pszGlobalData);
- iConvertDataLen = strlen(pszConvertData) + 1;
}
/* Convert DOS string to UNIX string */
@@ -293,7 +423,7 @@ winClipboardFlushXEvents(HWND hwnd,
xtpText.nitems = 0;
/* Create the text property from the text list */
- if (fUseUnicode) {
+ if (data->fUseUnicode) {
#ifdef X_HAVE_UTF8_STRING
iReturn = Xutf8TextListToTextProperty(pDisplay,
pszTextList,
@@ -340,11 +470,11 @@ winClipboardFlushXEvents(HWND hwnd,
/* Release the clipboard data */
GlobalUnlock(hGlobal);
pszGlobalData = NULL;
- if (fCloseClipboard)
- {
- fCloseClipboard = FALSE;
- CloseClipboard ();
- }
+ if (fCloseClipboard)
+ {
+ fCloseClipboard = FALSE;
+ CloseClipboard ();
+ }
/* Clean up */
XFree(xtpText.value);
xtpText.value = NULL;
@@ -423,6 +553,7 @@ winClipboardFlushXEvents(HWND hwnd,
/*
* SelectionNotify
*/
+
case SelectionNotify:
#ifdef _DEBUG
winDebug("winClipboardFlushXEvents - SelectionNotify\n");
@@ -435,82 +566,37 @@ winClipboardFlushXEvents(HWND hwnd,
winDebug
("winClipboardFlushXEvents - SelectionNotify - ATOM: %s\n",
pszAtomName);
- winDebug ("SelectionNotify - requestor %d\n", event.xselectionrequest.requestor);
XFree(pszAtomName);
}
#endif
/*
- * Request conversion of UTF8 and CompoundText targets.
- */
- if (event.xselection.property == None) {
- if (event.xselection.target == XA_STRING) {
- winDebug("winClipboardFlushXEvents - SelectionNotify - "
- "XA_STRING\n");
+ SelectionNotify with property of None indicates either:
- return WIN_XEVENTS_CONVERT;
- }
- else if (event.xselection.target == atomUTF8String) {
- winDebug("winClipboardFlushXEvents - SelectionNotify - "
- "Requesting conversion of UTF8 target.\n");
-
- XConvertSelection(pDisplay,
- event.xselection.selection,
- XA_STRING,
- atomLocalProperty, iWindow, CurrentTime);
-
- /* Process the ConvertSelection event */
- XFlush(pDisplay);
- return WIN_XEVENTS_CONVERT;
- }
-#ifdef X_HAVE_UTF8_STRING
- else if (event.xselection.target == atomCompoundText) {
- winDebug("winClipboardFlushXEvents - SelectionNotify - "
- "Requesting conversion of CompoundText target.\n");
-
- XConvertSelection(pDisplay,
- event.xselection.selection,
- atomUTF8String,
- atomLocalProperty, iWindow, CurrentTime);
-
- /* Process the ConvertSelection event */
- XFlush(pDisplay);
- return WIN_XEVENTS_CONVERT;
- }
-#endif
- else {
+ (i) Generated by the X server if no owner for the specified selection exists
+ (perhaps it's disappeared on us mid-transaction), or
+ (ii) Sent by the selection owner when the requested selection conversion could
+ not be performed or server errors prevented the conversion data being returned
+ */
+ if (event.xselection.property == None) {
ErrorF("winClipboardFlushXEvents - SelectionNotify - "
- "Unknown format. Cannot request conversion, "
- "aborting.\n");
- break;
+ "Conversion to format %d refused.\n",
+ event.xselection.target);
+ return WIN_XEVENTS_FAILED;
}
- }
- /* Retrieve the size of the stored data */
- iReturn = XGetWindowProperty(pDisplay, iWindow, atomLocalProperty, 0, 0, /* Don't get data, just size */
- False,
- AnyPropertyType,
- &xtpText.encoding,
- &xtpText.format,
- &xtpText.nitems,
- &ulReturnBytesLeft, &xtpText.value);
- if (iReturn != Success) {
- ErrorF("winClipboardFlushXEvents - SelectionNotify - "
- "XGetWindowProperty () failed, aborting: %d\n", iReturn);
- break;
+ if (event.xselection.target == atomTargets) {
+ return winClipboardSelectionNotifyTargets(hwnd, iWindow, pDisplay, data, atoms);
}
- winDebug("SelectionNotify - returned data %d left %d\n",
- xtpText.nitems, ulReturnBytesLeft);
-
- /* Request the selection data */
+ /* Retrieve the selection data and delete the property */
iReturn = XGetWindowProperty(pDisplay,
iWindow,
atomLocalProperty,
0,
- ulReturnBytesLeft,
- False,
+ INT_MAX,
+ True,
AnyPropertyType,
&xtpText.encoding,
&xtpText.format,
@@ -519,7 +605,7 @@ winClipboardFlushXEvents(HWND hwnd,
if (iReturn != Success) {
ErrorF("winClipboardFlushXEvents - SelectionNotify - "
"XGetWindowProperty () failed, aborting: %d\n", iReturn);
- break;
+ goto winClipboardFlushXEvents_SelectionNotify_Done;
}
#ifdef WINDBG
@@ -535,7 +621,7 @@ winClipboardFlushXEvents(HWND hwnd,
}
#endif
- if (fUseUnicode) {
+ if (data->fUseUnicode) {
#ifdef X_HAVE_UTF8_STRING
/* Convert the text property to a text list */
iReturn = Xutf8TextPropertyToTextList(pDisplay,
@@ -551,7 +637,8 @@ winClipboardFlushXEvents(HWND hwnd,
if (iReturn == Success || iReturn > 0) {
/* Conversion succeeded or some unconvertible characters */
if (ppszTextList != NULL) {
- iReturnDataLen = 0;
+ int i;
+ int iReturnDataLen = 0;
for (i = 0; i < iCount; i++) {
iReturnDataLen += strlen(ppszTextList[i]);
}
@@ -600,14 +687,14 @@ winClipboardFlushXEvents(HWND hwnd,
/* Convert the X clipboard string to DOS format */
winClipboardUNIXtoDOS((unsigned char **)&pszReturnData, strlen(pszReturnData));
- if (fUseUnicode) {
+ if (data->fUseUnicode) {
/* Find out how much space needed to convert MBCS to Unicode */
- iUnicodeLen = MultiByteToWideChar(CP_UTF8,
+ int iUnicodeLen = MultiByteToWideChar(CP_UTF8,
0,
pszReturnData, -1, NULL, 0);
- /* Allocate memory for the Unicode string */
- pwszUnicodeStr = malloc(sizeof(wchar_t) * (iUnicodeLen + 1));
+ /* NOTE: iUnicodeLen includes space for null terminator */
+ pwszUnicodeStr = malloc(sizeof(wchar_t) * iUnicodeLen);
if (!pwszUnicodeStr) {
ErrorF("winClipboardFlushXEvents - SelectionNotify "
"malloc failed for pwszUnicodeStr, aborting.\n");
@@ -625,9 +712,10 @@ winClipboardFlushXEvents(HWND hwnd,
/* Allocate global memory for the X clipboard data */
hGlobal = GlobalAlloc(GMEM_MOVEABLE,
- sizeof(wchar_t) * (iUnicodeLen + 1));
+ sizeof(wchar_t) * iUnicodeLen);
}
else {
+ int iConvertDataLen = 0;
pszConvertData = strdup(pszReturnData);
iConvertDataLen = strlen(pszConvertData) + 1;
@@ -659,9 +747,8 @@ winClipboardFlushXEvents(HWND hwnd,
}
/* Copy the returned string into the global memory */
- if (fUseUnicode) {
- memcpy(pszGlobalData,
- pwszUnicodeStr, sizeof(wchar_t) * (iUnicodeLen + 1));
+ if (data->fUseUnicode) {
+ wcscpy((wchar_t *)pszGlobalData, pwszUnicodeStr);
free(pwszUnicodeStr);
pwszUnicodeStr = NULL;
}
@@ -676,7 +763,7 @@ winClipboardFlushXEvents(HWND hwnd,
pszGlobalData = NULL;
/* Push the selection data to the Windows clipboard */
- if (fUseUnicode)
+ if (data->fUseUnicode)
SetClipboardData(CF_UNICODETEXT, hGlobal);
else
SetClipboardData(CF_TEXT, hGlobal);
@@ -706,39 +793,92 @@ winClipboardFlushXEvents(HWND hwnd,
SetClipboardData(CF_UNICODETEXT, NULL);
SetClipboardData(CF_TEXT, NULL);
}
- return WIN_XEVENTS_NOTIFY;
+ return WIN_XEVENTS_NOTIFY_DATA;
- /*
- * SelectionClear
- */
- case SelectionClear:
-#ifdef _DEBUG
+ case SelectionClear:
winDebug("SelectionClear - doing nothing\n");
- {
- char *pszAtomName;
-
- pszAtomName = XGetAtomName (pDisplay,
- event.xselection.selection);
-
- winDebug ("SelectionClear - ATOM: %s\n",
- pszAtomName);
- winDebug ("SelectionClear - owner %d\n", event.xselectionrequest.owner);
-
- XFree (pszAtomName);
- }
-#endif
break;
case PropertyNotify:
break;
-
+
case MappingNotify:
XRefreshKeyboardMapping((XMappingEvent *)&event);
break;
default:
- ErrorF("winClipboardFlushXEvents - unexpected event type %d\n",
- event.type);
+ if (event.type == XFixesSetSelectionOwnerNotify + xfixes_event_base) {
+ XFixesSelectionNotifyEvent *e =
+ (XFixesSelectionNotifyEvent *) & event;
+
+ winDebug("winClipboardFlushXEvents - XFixesSetSelectionOwnerNotify\n");
+
+ /* Save selection owners for monitored selections, ignore other selections */
+ if ((e->selection == XA_PRIMARY) && fPrimarySelection) {
+ MonitorSelection(e, CLIP_OWN_PRIMARY);
+ }
+ else if (e->selection == atomClipboard) {
+ MonitorSelection(e, CLIP_OWN_CLIPBOARD);
+ }
+ else
+ break;
+
+ /* Selection is being disowned */
+ if (e->owner == None) {
+ winDebug
+ ("winClipboardFlushXEvents - No window, returning.\n");
+ break;
+ }
+
+ /*
+ XXX: there are all kinds of wacky edge cases we might need here:
+ - we own windows clipboard, but neither PRIMARY nor CLIPBOARD have an owner, so we should disown it?
+ - root window is taking ownership?
+ */
+
+ /* If we are the owner of the most recently owned selection, don't go all recursive :) */
+ if ((lastOwnedSelectionIndex != CLIP_OWN_NONE) &&
+ (s_iOwners[lastOwnedSelectionIndex] == iWindow)) {
+ winDebug("winClipboardFlushXEvents - Ownership changed to us, aborting.\n");
+ break;
+ }
+
+ /* Close clipboard if we have it open already (possible? correct??) */
+ if (GetOpenClipboardWindow() == hwnd) {
+ CloseClipboard();
+ }
+
+ /* Access the Windows clipboard */
+ if (!OpenClipboard(hwnd)) {
+ ErrorF("winClipboardFlushXEvents - OpenClipboard () failed: %08x\n",
+ (int) GetLastError());
+ break;
+ }
+
+ /* Take ownership of the Windows clipboard */
+ if (!EmptyClipboard()) {
+ ErrorF("winClipboardFlushXEvents - EmptyClipboard () failed: %08x\n",
+ (int) GetLastError());
+ break;
+ }
+
+ /* Advertise regular text and unicode */
+ SetClipboardData(CF_UNICODETEXT, NULL);
+ SetClipboardData(CF_TEXT, NULL);
+
+ /* Release the clipboard */
+ if (!CloseClipboard()) {
+ ErrorF("winClipboardFlushXEvents - CloseClipboard () failed: %08x\n",
+ (int) GetLastError());
+ break;
+ }
+ }
+ /* XFixesSelectionWindowDestroyNotifyMask */
+ /* XFixesSelectionClientCloseNotifyMask */
+ else {
+ ErrorF("winClipboardFlushXEvents - unexpected event type %d\n",
+ event.type);
+ }
break;
}
}
diff --git a/xorg-server/hw/xwin/winclipboard/xwinclip.c b/xorg-server/hw/xwin/winclipboard/xwinclip.c
index 3677974c4..856c4dd54 100644
--- a/xorg-server/hw/xwin/winclipboard/xwinclip.c
+++ b/xorg-server/hw/xwin/winclipboard/xwinclip.c
@@ -92,6 +92,13 @@ main (int argc, char *argv[])
continue;
}
+ /* Look for -noprimary */
+ if (!strcmp (argv[i], "-noprimary"))
+ {
+ fPrimarySelection = False;
+ continue;
+ }
+
/* Yack when we find a parameter that we don't know about */
printf ("Unknown parameter: %s\nExiting.\n", argv[i]);
exit (1);
diff --git a/xorg-server/hw/xwin/winclipboard/xwinclip.man b/xorg-server/hw/xwin/winclipboard/xwinclip.man
index 822db91d4..a53dc3029 100644
--- a/xorg-server/hw/xwin/winclipboard/xwinclip.man
+++ b/xorg-server/hw/xwin/winclipboard/xwinclip.man
@@ -29,6 +29,9 @@ Specifies the X server display to connect to.
.TP 8
.B \-nounicodeclipboard
Do not use unicode text on the clipboard.
+.TP 8
+.B \-noprimary
+Do not monitor the PRIMARY selection.
.SH "SEE ALSO"
XWin(1)
diff --git a/xorg-server/hw/xwin/winclipboardwrappers.c b/xorg-server/hw/xwin/winclipboardwrappers.c
index 2671fc000..c0598f9b3 100644..100755
--- a/xorg-server/hw/xwin/winclipboardwrappers.c
+++ b/xorg-server/hw/xwin/winclipboardwrappers.c
@@ -33,6 +33,7 @@
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
+
#include "win.h"
#include "dixstruct.h"
#include <X11/Xatom.h>
@@ -52,19 +53,13 @@
DISPATCH_PROC(winProcEstablishConnection);
DISPATCH_PROC(winProcSetSelectionOwner);
-/*
- * References to external symbols
- */
-
extern Bool g_fClipboardLaunched;
extern Bool g_fClipboardStarted;
-extern Bool g_fClipboard;
extern Window g_iClipboardWindow;
extern Atom g_atomLastOwnedSelection;
extern HWND g_hwndClipboard;
extern Bool g_fClipboardPrimary;
-
/*
* Wrapper for internal EstablishConnection function.
* Initializes internal clients that must not be started until
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index ad0b5bbe9..29fcbc9ed 100644..100755
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -37,13 +37,8 @@ from The Open Group.
#include "winmsg.h"
#include "winmonitors.h"
-/*
- * References to external symbols
- */
-
#ifdef XWIN_CLIPBOARD
-extern Bool g_fUnicodeClipboard;
-extern Bool g_fClipboard;
+#include "winclipboard/winclipboard.h"
extern Bool g_fClipboardPrimary;
#endif
@@ -719,6 +714,26 @@ ddxProcessArgument(int argc, char *argv[], int i)
/* Indicate that we have processed this argument */
return 1;
}
+
+ /*
+ * Look for the '-primary' argument
+ */
+ if (IS_OPTION("-primary")) {
+ fPrimarySelection = TRUE;
+
+ /* Indicate that we have processed this argument */
+ return 1;
+ }
+
+ /*
+ * Look for the '-noprimary' argument
+ */
+ if (IS_OPTION("-noprimary")) {
+ fPrimarySelection = FALSE;
+
+ /* Indicate that we have processed this argument */
+ return 1;
+ }
/*
* Look for the '-clipboard' argument
diff --git a/xorg-server/hw/xwin/winresource.h b/xorg-server/hw/xwin/winresource.h
index 39b890c7c..b9f88c18f 100644
--- a/xorg-server/hw/xwin/winresource.h
+++ b/xorg-server/hw/xwin/winresource.h
@@ -43,6 +43,7 @@
#define ID_APP_HIDE_ROOT 201
#define ID_APP_ALWAYS_ON_TOP 202
#define ID_APP_ABOUT 203
+#define ID_APP_MONITOR_PRIMARY 204
#define ID_ABOUT_WEBSITE 303
diff --git a/xorg-server/hw/xwin/wintrayicon.c b/xorg-server/hw/xwin/wintrayicon.c
index 3c7820cf7..7df1594e6 100644
--- a/xorg-server/hw/xwin/wintrayicon.c
+++ b/xorg-server/hw/xwin/wintrayicon.c
@@ -32,9 +32,13 @@
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
+
#include "win.h"
#include <shellapi.h>
#include "winprefs.h"
+#ifdef XWIN_CLIPBOARD
+#include "winclipboard/winclipboard.h"
+#endif
static NOTIFYICONDATA nid;
/*
@@ -193,6 +197,21 @@ winHandleIconMessage(HWND hwnd, UINT message,
RemoveMenu(hmenuTray, ID_APP_HIDE_ROOT, MF_BYCOMMAND);
}
+#ifdef XWIN_CLIPBOARD
+ if (g_fClipboard) {
+ /* Set menu state to indicate if 'Monitor Primary' is enabled or not */
+ MENUITEMINFO mii = { 0 };
+ mii.cbSize = sizeof(MENUITEMINFO);
+ mii.fMask = MIIM_STATE;
+ mii.fState = fPrimarySelection ? MFS_CHECKED : MFS_UNCHECKED;
+ SetMenuItemInfo(hmenuTray, ID_APP_MONITOR_PRIMARY, FALSE, &mii);
+ }
+ else {
+ /* Remove 'Monitor Primary' menu item */
+ RemoveMenu(hmenuTray, ID_APP_MONITOR_PRIMARY, MF_BYCOMMAND);
+ }
+#endif
+
SetupRootMenu(hmenuTray);
/*
diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index 9a150d57b..a88f7c68d 100755
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -1189,6 +1189,12 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
return 0;
#endif
+#ifdef XWIN_CLIPBOARD
+ case ID_APP_MONITOR_PRIMARY:
+ fPrimarySelection = !fPrimarySelection;
+ return 0;
+#endif
+
case ID_APP_ABOUT:
/* Display the About box */
winDisplayAboutDialog(s_pScreenPriv);
diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am
index 6578038a5..168b00f70 100644
--- a/xorg-server/include/Makefile.am
+++ b/xorg-server/include/Makefile.am
@@ -71,6 +71,7 @@ EXTRA_DIST = \
busfault.h dbus-core.h \
dix-config-apple-verbatim.h \
dixfontstubs.h eventconvert.h eventstr.h inpututils.h \
+ probes.h \
protocol-versions.h \
systemd-logind.h \
xsha1.h
diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index 991a3ce88..921156b4c 100755
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -74,9 +74,14 @@ SOFTWARE.
if ((sizeof(req) >> 2) > client->req_len )\
return(BadLength)
+#define REQUEST_AT_LEAST_EXTRA_SIZE(req, extra) \
+ if (((sizeof(req) + ((uint64_t) extra)) >> 2) > client->req_len ) \
+ return(BadLength)
+
#define REQUEST_FIXED_SIZE(req, n)\
if (((sizeof(req) >> 2) > client->req_len) || \
- (((sizeof(req) + (n) + 3) >> 2) != client->req_len)) \
+ (((n) >> 2) >= client->req_len) || \
+ ((((uint64_t) sizeof(req) + (n) + 3) >> 2) != (uint64_t) client->req_len)) \
return(BadLength)
#define LEGAL_NEW_RESOURCE(id,client)\
diff --git a/xorg-server/include/probes.h b/xorg-server/include/probes.h
new file mode 100644
index 000000000..e9cdd3e8e
--- /dev/null
+++ b/xorg-server/include/probes.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef XORG_PROBES_H
+#define XORG_PROBES_H
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+/* definitions needed to include Dtrace probes in a source file */
+
+#if XSERVER_DTRACE
+#include <sys/types.h>
+typedef const char *string;
+typedef const uint8_t *const_uint8_p;
+typedef const double *const_double_p;
+#include "../dix/Xserver-dtrace.h"
+#endif
+
+#endif /* XORG_PROBES_H */
diff --git a/xorg-server/include/regionstr.h b/xorg-server/include/regionstr.h
index 515e93ffa..103235859 100644
--- a/xorg-server/include/regionstr.h
+++ b/xorg-server/include/regionstr.h
@@ -127,7 +127,10 @@ RegionEnd(RegionPtr reg)
static inline size_t
RegionSizeof(size_t n)
{
- return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)));
+ if (n < ((INT_MAX - sizeof(RegDataRec)) / sizeof(BoxRec)))
+ return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)));
+ else
+ return 0;
}
static inline void
@@ -138,9 +141,10 @@ RegionInit(RegionPtr _pReg, BoxPtr _rect, int _size)
(_pReg)->data = (RegDataPtr) NULL;
}
else {
+ size_t rgnSize;
(_pReg)->extents = RegionEmptyBox;
- if (((_size) > 1) && ((_pReg)->data =
- (RegDataPtr) malloc(RegionSizeof(_size)))) {
+ if (((_size) > 1) && ((rgnSize = RegionSizeof(_size)) > 0) &&
+ (((_pReg)->data = (RegDataPtr) malloc(rgnSize)) != NULL)) {
(_pReg)->data->size = (_size);
(_pReg)->data->numRects = 0;
}
diff --git a/xorg-server/man/Xserver.man b/xorg-server/man/Xserver.man
index c03830c15..3bf844f98 100644
--- a/xorg-server/man/Xserver.man
+++ b/xorg-server/man/Xserver.man
@@ -181,6 +181,16 @@ prints a usage message.
.B \-I
causes all remaining command line arguments to be ignored.
.TP 8
+.B \-iglx
+Prohibit creating indirect GLX contexts. Indirect GLX is of limited use,
+since it lacks support for many modern OpenGL features and extensions;
+it's slower than direct contexts; and it opens a large attack surface for
+protocol parsing errors.
+This is the default unless +iglx is specified.
+.TP 8
+.B +iglx
+Allow creating indirect GLX contexts.
+.TP 8
.B \-maxbigreqsize \fIsize\fP
sets the maximum big request to
.I size
diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c
index 2bdd6ca98..ada1ab570 100644
--- a/xorg-server/mi/mipointer.c
+++ b/xorg-server/mi/mipointer.c
@@ -598,8 +598,8 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx,
int constrained_x, constrained_y;
int current_x, current_y; /* current position in per-screen coord */
- current_x = MIPOINTER(pDev)->x - pScreen->y;
- current_y = MIPOINTER(pDev)->y - pScreen->x;
+ current_x = MIPOINTER(pDev)->x - pScreen->x;
+ current_y = MIPOINTER(pDev)->y - pScreen->y;
input_constrain_cursor(pDev, pScreen,
current_x, current_y, x, y,
diff --git a/xorg-server/os/WaitFor.c b/xorg-server/os/WaitFor.c
index 86c25e120..00bf5f2bb 100644
--- a/xorg-server/os/WaitFor.c
+++ b/xorg-server/os/WaitFor.c
@@ -121,9 +121,9 @@ struct _OsTimerRec {
void *arg;
};
-static void DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev);
+static void DoTimer(OsTimerPtr timer, CARD32 now, volatile OsTimerPtr *prev);
static void CheckAllTimers(void);
-static OsTimerPtr timers = NULL;
+static volatile OsTimerPtr timers = NULL;
/*****************
* WaitForSomething:
@@ -269,11 +269,14 @@ WaitForSomething(int *pClientsReady)
if ((int) (timers->expires - now) <= 0)
expired = 1;
- while (timers && (int) (timers->expires - now) <= 0)
- DoTimer(timers, now, &timers);
+ if (expired) {
+ OsBlockSignals();
+ while (timers && (int) (timers->expires - now) <= 0)
+ DoTimer(timers, now, &timers);
+ OsReleaseSignals();
- if (expired)
return 0;
+ }
}
}
else {
@@ -287,11 +290,14 @@ WaitForSomething(int *pClientsReady)
if ((int) (timers->expires - now) <= 0)
expired = 1;
- while (timers && (int) (timers->expires - now) <= 0)
- DoTimer(timers, now, &timers);
+ if (expired) {
+ OsBlockSignals();
+ while (timers && (int) (timers->expires - now) <= 0)
+ DoTimer(timers, now, &timers);
+ OsReleaseSignals();
- if (expired)
return 0;
+ }
}
}
if (someReady)
@@ -407,24 +413,25 @@ CheckAllTimers(void)
}
static void
-DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev)
+DoTimer(OsTimerPtr timer, CARD32 now, volatile OsTimerPtr *prev)
{
CARD32 newTime;
OsBlockSignals();
*prev = timer->next;
timer->next = NULL;
+ OsReleaseSignals();
+
newTime = (*timer->callback) (timer, now, timer->arg);
if (newTime)
TimerSet(timer, 0, newTime, timer->callback, timer->arg);
- OsReleaseSignals();
}
OsTimerPtr
TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
OsTimerCallback func, void *arg)
{
- register OsTimerPtr *prev;
+ volatile OsTimerPtr *prev;
CARD32 now = GetTimeInMillis();
if (!timer) {
@@ -476,7 +483,7 @@ Bool
TimerForce(OsTimerPtr timer)
{
int rc = FALSE;
- OsTimerPtr *prev;
+ volatile OsTimerPtr *prev;
OsBlockSignals();
for (prev = &timers; *prev; prev = &(*prev)->next) {
@@ -493,7 +500,7 @@ TimerForce(OsTimerPtr timer)
void
TimerCancel(OsTimerPtr timer)
{
- OsTimerPtr *prev;
+ volatile OsTimerPtr *prev;
if (!timer)
return;
@@ -521,8 +528,12 @@ TimerCheck(void)
{
CARD32 now = GetTimeInMillis();
- while (timers && (int) (timers->expires - now) <= 0)
- DoTimer(timers, now, &timers);
+ if (timers && (int) (timers->expires - now) <= 0) {
+ OsBlockSignals();
+ while (timers && (int) (timers->expires - now) <= 0)
+ DoTimer(timers, now, &timers);
+ OsReleaseSignals();
+ }
}
void
diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c
index 1644e9565..3ac3160b4 100644
--- a/xorg-server/os/access.c
+++ b/xorg-server/os/access.c
@@ -1473,6 +1473,10 @@ GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled)
for (host = validhosts; host; host = host->next) {
nHosts++;
n += pad_to_int32(host->len) + sizeof(xHostEntry);
+ /* Could check for INT_MAX, but in reality having more than 1mb of
+ hostnames in the access list is ridiculous */
+ if (n >= 1048576)
+ break;
}
if (n) {
*data = ptr = malloc(n);
@@ -1481,6 +1485,8 @@ GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled)
}
for (host = validhosts; host; host = host->next) {
len = host->len;
+ if ((ptr + sizeof(xHostEntry) + len) > ((unsigned char *) *data + n))
+ break;
((xHostEntry *) ptr)->family = host->family;
((xHostEntry *) ptr)->length = len;
ptr += sizeof(xHostEntry);
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c
index 2d9d74b66..6ebfa453b 100755
--- a/xorg-server/os/connection.c
+++ b/xorg-server/os/connection.c
@@ -120,17 +120,11 @@ typedef int pid_t;
#ifdef HAVE_GETPEERUCRED
#include <ucred.h>
#include <zone.h>
-#endif
-
-#ifdef XSERVER_DTRACE
-#include <sys/types.h>
-typedef const char *string;
-
-#ifndef HAVE_GETPEERUCRED
+#else
#define zoneid_t int
#endif
-#include "../dix/Xserver-dtrace.h"
-#endif
+
+#include "probes.h"
static int lastfdesc; /* maximum file descriptor */
diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c
index b95586be3..fcad9cacf 100644
--- a/xorg-server/os/io.c
+++ b/xorg-server/os/io.c
@@ -972,10 +972,11 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
}
if (notWritten > oco->size) {
- unsigned char *obuf;
+ unsigned char *obuf = NULL;
- obuf = (unsigned char *) realloc(oco->buf,
- notWritten + BUFSIZE);
+ if (notWritten + BUFSIZE <= INT_MAX) {
+ obuf = realloc(oco->buf, notWritten + BUFSIZE);
+ }
if (!obuf) {
_XSERVTransDisconnect(oc->trans_conn);
_XSERVTransClose(oc->trans_conn);
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index 1e7cd26b9..3af277b72 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -263,8 +263,11 @@ void
LogClose(enum ExitCode error)
{
if (logFile) {
- ErrorFSigSafe("Server terminated %s (%d). Closing log file.\n",
- (error == EXIT_NO_ERROR) ? "successfully" : "with error", error);
+ int msgtype = (error == EXIT_NO_ERROR) ? X_INFO : X_ERROR;
+ LogMessageVerbSigSafe(msgtype, -1,
+ "Server terminated %s (%d). Closing log file.\n",
+ (error == EXIT_NO_ERROR) ? "successfully" : "with error",
+ error);
fclose(logFile);
logFile = NULL;
logFileFd = -1;
diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c
index ff0979ac8..91e3e068c 100644
--- a/xorg-server/os/osinit.c
+++ b/xorg-server/os/osinit.c
@@ -208,9 +208,11 @@ OsInit(void)
* for failures to load libraries/modules at runtime so we can clean up
* after ourselves.
*/
- int failure_signal = SIGQUIT;
+ {
+ int failure_signal = SIGQUIT;
- dlinfo(RTLD_SELF, RTLD_DI_SETSIGNAL, &failure_signal);
+ dlinfo(RTLD_SELF, RTLD_DI_SETSIGNAL, &failure_signal);
+ }
#endif
#if !defined(XQUARTZ) /* STDIN is already /dev/null and STDOUT/STDERR is managed by console_redirect.c */
diff --git a/xorg-server/os/rpcauth.c b/xorg-server/os/rpcauth.c
index d60ea3518..413cc6118 100644
--- a/xorg-server/os/rpcauth.c
+++ b/xorg-server/os/rpcauth.c
@@ -66,6 +66,10 @@ authdes_ezdecode(const char *inmsg, int len)
SVCXPRT xprt;
temp_inmsg = malloc(len);
+ if (temp_inmsg == NULL) {
+ why = AUTH_FAILED; /* generic error, since there is no AUTH_BADALLOC */
+ return NULL;
+ }
memmove(temp_inmsg, inmsg, len);
memset((char *) &msg, 0, sizeof(msg));
diff --git a/xorg-server/os/xsha1.c b/xorg-server/os/xsha1.c
index 24c0aa284..c54e68c83 100644
--- a/xorg-server/os/xsha1.c
+++ b/xorg-server/os/xsha1.c
@@ -1,3 +1,28 @@
+/* Copyright © 2007 Carl Worth
+ * Copyright © 2009 Jeremy Huddleston, Julien Cristau, and Matthieu Herrb
+ * Copyright © 2009-2010 Mikhail Gusarov
+ * Copyright © 2012 Yaakov Selkowitz and Keith Packard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/xorg-server/present/present.c b/xorg-server/present/present.c
index a18300cb3..b1bb3d160 100644
--- a/xorg-server/present/present.c
+++ b/xorg-server/present/present.c
@@ -440,7 +440,7 @@ present_flip_notify(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
DebugPresent(("\tn %lld %p %8lld: %08lx -> %08lx\n",
vblank->event_id, vblank, vblank->target_msc,
vblank->pixmap ? vblank->pixmap->drawable.id : 0,
- vblank->window->drawable.id));
+ vblank->window ? vblank->window->drawable.id : 0));
assert (vblank == screen_priv->flip_pending);
@@ -834,10 +834,13 @@ present_pixmap(WindowPtr window,
vblank->notifies = notifies;
vblank->num_notifies = num_notifies;
- if (!screen_priv->info || !(screen_priv->info->capabilities & PresentCapabilityAsync))
+ if (!(options & PresentOptionAsync))
vblank->sync_flip = TRUE;
if (!(options & PresentOptionCopy) &&
+ !((options & PresentOptionAsync) &&
+ (!screen_priv->info ||
+ !(screen_priv->info->capabilities & PresentCapabilityAsync))) &&
pixmap != NULL &&
present_check_flip (target_crtc, window, pixmap, vblank->sync_flip, valid, x_off, y_off))
{
@@ -859,28 +862,27 @@ present_pixmap(WindowPtr window,
}
if (pixmap)
- DebugPresent(("q %lld %p %8lld: %08lx -> %08lx (crtc %p)\n",
+ DebugPresent(("q %lld %p %8lld: %08lx -> %08lx (crtc %p) flip %d vsync %d serial %d\n",
vblank->event_id, vblank, target_msc,
vblank->pixmap->drawable.id, vblank->window->drawable.id,
- target_crtc));
+ target_crtc, vblank->flip, vblank->sync_flip, vblank->serial));
xorg_list_add(&vblank->event_queue, &present_exec_queue);
vblank->queued = TRUE;
if ((pixmap && target_msc >= crtc_msc) || (!pixmap && target_msc > crtc_msc)) {
ret = present_queue_vblank(screen, target_crtc, vblank->event_id, target_msc);
- if (ret != Success) {
- xorg_list_del(&vblank->event_queue);
- vblank->queued = FALSE;
- goto failure;
- }
- } else
- present_execute(vblank, ust, crtc_msc);
+ if (ret == Success)
+ return Success;
+
+ DebugPresent(("present_queue_vblank failed\n"));
+ }
+
+ present_execute(vblank, ust, crtc_msc);
return Success;
no_mem:
ret = BadAlloc;
-failure:
vblank->notifies = NULL;
present_vblank_destroy(vblank);
return ret;
@@ -955,7 +957,7 @@ present_vblank_destroy(present_vblank_ptr vblank)
DebugPresent(("\td %lld %p %8lld: %08lx -> %08lx\n",
vblank->event_id, vblank, vblank->target_msc,
vblank->pixmap ? vblank->pixmap->drawable.id : 0,
- vblank->window->drawable.id));
+ vblank->window ? vblank->window->drawable.id : 0));
/* Drop pixmap reference */
if (vblank->pixmap)
diff --git a/xorg-server/present/present_request.c b/xorg-server/present/present_request.c
index c69e68309..68076edd7 100644
--- a/xorg-server/present/present_request.c
+++ b/xorg-server/present/present_request.c
@@ -210,6 +210,7 @@ proc_present_query_capabilities (ClientPtr client)
rep.sequenceNumber = client->sequence;
rep.length = 0;
+ REQUEST_SIZE_MATCH(xPresentQueryCapabilitiesReq);
r = dixLookupWindow(&window, stuff->target, client, DixGetAttrAccess);
switch (r) {
case Success:
@@ -254,6 +255,7 @@ static int
sproc_present_query_version(ClientPtr client)
{
REQUEST(xPresentQueryVersionReq);
+ REQUEST_SIZE_MATCH(xPresentQueryVersionReq);
swaps(&stuff->length);
swapl(&stuff->majorVersion);
@@ -265,6 +267,7 @@ static int
sproc_present_pixmap(ClientPtr client)
{
REQUEST(xPresentPixmapReq);
+ REQUEST_AT_LEAST_SIZE(xPresentPixmapReq);
swaps(&stuff->length);
swapl(&stuff->window);
@@ -284,6 +287,7 @@ static int
sproc_present_notify_msc(ClientPtr client)
{
REQUEST(xPresentNotifyMSCReq);
+ REQUEST_SIZE_MATCH(xPresentNotifyMSCReq);
swaps(&stuff->length);
swapl(&stuff->window);
@@ -297,6 +301,7 @@ static int
sproc_present_select_input (ClientPtr client)
{
REQUEST(xPresentSelectInputReq);
+ REQUEST_SIZE_MATCH(xPresentSelectInputReq);
swaps(&stuff->length);
swapl(&stuff->window);
@@ -308,6 +313,7 @@ static int
sproc_present_query_capabilities (ClientPtr client)
{
REQUEST(xPresentQueryCapabilitiesReq);
+ REQUEST_SIZE_MATCH(xPresentQueryCapabilitiesReq);
swaps(&stuff->length);
swapl(&stuff->target);
return (*proc_present_vector[stuff->presentReqType]) (client);
diff --git a/xorg-server/randr/rroutput.c b/xorg-server/randr/rroutput.c
index 13d047b06..5d45bfdc1 100644
--- a/xorg-server/randr/rroutput.c
+++ b/xorg-server/randr/rroutput.c
@@ -488,6 +488,7 @@ ProcRRGetOutputInfo(ClientPtr client)
swapl(&rep.mmHeight);
swaps(&rep.nCrtcs);
swaps(&rep.nModes);
+ swaps(&rep.nPreferred);
swaps(&rep.nClones);
swaps(&rep.nameLength);
}
@@ -541,7 +542,11 @@ ProcRRSetOutputPrimary(ClientPtr client)
if (stuff->output) {
VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
- if (output->pScreen != pWin->drawable.pScreen) {
+ if (!output->pScreen->isGPU && output->pScreen != pWin->drawable.pScreen) {
+ client->errorValue = stuff->window;
+ return BadMatch;
+ }
+ if (output->pScreen->isGPU && output->pScreen->current_master != pWin->drawable.pScreen) {
client->errorValue = stuff->window;
return BadMatch;
}
diff --git a/xorg-server/randr/rrscreen.c b/xorg-server/randr/rrscreen.c
index 22a7e984f..cf7369e00 100644
--- a/xorg-server/randr/rrscreen.c
+++ b/xorg-server/randr/rrscreen.c
@@ -321,8 +321,13 @@ static inline void swap_modeinfos(xRRModeInfo *modeinfos, int i)
swapl(&modeinfos[i].modeFlags);
}
-#define update_arrays(gpuscreen, pScrPriv) do { \
+#define update_arrays(gpuscreen, pScrPriv, primary_crtc, has_primary) do { \
for (j = 0; j < pScrPriv->numCrtcs; j++) { \
+ if (has_primary && \
+ primary_crtc == pScrPriv->crtcs[j]) { \
+ has_primary = 0; \
+ continue; \
+ }\
crtcs[crtc_count] = pScrPriv->crtcs[j]->id; \
if (client->swapped) \
swapl(&crtcs[crtc_count]); \
@@ -365,9 +370,11 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen)
unsigned long extraLen;
CARD8 *extra;
RRCrtc *crtcs;
+ RRCrtcPtr primary_crtc = NULL;
RROutput *outputs;
xRRModeInfo *modeinfos;
CARD8 *names;
+ int has_primary = 0;
/* we need to iterate all the GPU masters and all their output slaves */
total_crtcs = 0;
@@ -425,18 +432,25 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen)
modeinfos = (xRRModeInfo *)(outputs + total_outputs);
names = (CARD8 *)(modeinfos + total_modes);
- /* TODO primary */
crtc_count = 0;
output_count = 0;
mode_count = 0;
pScrPriv = rrGetScrPriv(pScreen);
- update_arrays(pScreen, pScrPriv);
+ if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc) {
+ has_primary = 1;
+ primary_crtc = pScrPriv->primaryOutput->crtc;
+ crtcs[0] = pScrPriv->primaryOutput->crtc->id;
+ if (client->swapped)
+ swapl(&crtcs[0]);
+ crtc_count = 1;
+ }
+ update_arrays(pScreen, pScrPriv, primary_crtc, has_primary);
xorg_list_for_each_entry(iter, &pScreen->output_slave_list, output_head) {
pScrPriv = rrGetScrPriv(iter);
- update_arrays(iter, pScrPriv);
+ update_arrays(iter, pScrPriv, primary_crtc, has_primary);
}
assert(bytes_to_int32((char *) names - (char *) extra) == rep.length);
diff --git a/xorg-server/randr/rrsdispatch.c b/xorg-server/randr/rrsdispatch.c
index 08c3b6abe..47558cf75 100644
--- a/xorg-server/randr/rrsdispatch.c
+++ b/xorg-server/randr/rrsdispatch.c
@@ -27,6 +27,7 @@ SProcRRQueryVersion(ClientPtr client)
{
REQUEST(xRRQueryVersionReq);
+ REQUEST_SIZE_MATCH(xRRQueryVersionReq);
swaps(&stuff->length);
swapl(&stuff->majorVersion);
swapl(&stuff->minorVersion);
@@ -38,6 +39,7 @@ SProcRRGetScreenInfo(ClientPtr client)
{
REQUEST(xRRGetScreenInfoReq);
+ REQUEST_SIZE_MATCH(xRRGetScreenInfoReq);
swaps(&stuff->length);
swapl(&stuff->window);
return (*ProcRandrVector[stuff->randrReqType]) (client);
@@ -69,6 +71,7 @@ SProcRRSelectInput(ClientPtr client)
{
REQUEST(xRRSelectInputReq);
+ REQUEST_SIZE_MATCH(xRRSelectInputReq);
swaps(&stuff->length);
swapl(&stuff->window);
swaps(&stuff->enable);
@@ -152,6 +155,7 @@ SProcRRConfigureOutputProperty(ClientPtr client)
{
REQUEST(xRRConfigureOutputPropertyReq);
+ REQUEST_AT_LEAST_SIZE(xRRConfigureOutputPropertyReq);
swaps(&stuff->length);
swapl(&stuff->output);
swapl(&stuff->property);
diff --git a/xorg-server/randr/rrxinerama.c b/xorg-server/randr/rrxinerama.c
index 9484b01e5..0b9dd8a0e 100644
--- a/xorg-server/randr/rrxinerama.c
+++ b/xorg-server/randr/rrxinerama.c
@@ -343,15 +343,17 @@ ProcRRXineramaQueryScreens(ClientPtr client)
ScreenPtr slave;
rrScrPriv(pScreen);
int has_primary = 0;
+ RRCrtcPtr primary_crtc = NULL;
if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc) {
has_primary = 1;
+ primary_crtc = pScrPriv->primaryOutput->crtc;
RRXineramaWriteCrtc(client, pScrPriv->primaryOutput->crtc);
}
for (i = 0; i < pScrPriv->numCrtcs; i++) {
if (has_primary &&
- pScrPriv->primaryOutput->crtc == pScrPriv->crtcs[i]) {
+ primary_crtc == pScrPriv->crtcs[i]) {
has_primary = 0;
continue;
}
@@ -361,8 +363,14 @@ ProcRRXineramaQueryScreens(ClientPtr client)
xorg_list_for_each_entry(slave, &pScreen->output_slave_list, output_head) {
rrScrPrivPtr pSlavePriv;
pSlavePriv = rrGetScrPriv(slave);
- for (i = 0; i < pSlavePriv->numCrtcs; i++)
+ for (i = 0; i < pSlavePriv->numCrtcs; i++) {
+ if (has_primary &&
+ primary_crtc == pSlavePriv->crtcs[i]) {
+ has_primary = 0;
+ continue;
+ }
RRXineramaWriteCrtc(client, pSlavePriv->crtcs[i]);
+ }
}
}
diff --git a/xorg-server/render/picture.c b/xorg-server/render/picture.c
index 711cbc7bb..6ff31ba02 100644
--- a/xorg-server/render/picture.c
+++ b/xorg-server/render/picture.c
@@ -41,6 +41,9 @@
#include "servermd.h"
#include "picturestr.h"
#include "xace.h"
+#ifdef PANORAMIX
+#include "panoramiXsrv.h"
+#endif
DevPrivateKeyRec PictureScreenPrivateKeyRec;
DevPrivateKeyRec PictureWindowPrivateKeyRec;
@@ -1007,6 +1010,38 @@ CreateConicalGradientPicture(Picture pid, xPointFixed * center, xFixed angle,
return pPicture;
}
+static int
+cpAlphaMap(void **result, XID id, ScreenPtr screen, ClientPtr client, Mask mode)
+{
+#ifdef PANORAMIX
+ if (!noPanoramiXExtension) {
+ PanoramiXRes *res;
+ int err = dixLookupResourceByType((void **)&res, id, XRT_PICTURE,
+ client, mode);
+ if (err != Success)
+ return err;
+ id = res->info[screen->myNum].id;
+ }
+#endif
+ return dixLookupResourceByType(result, id, PictureType, client, mode);
+}
+
+static int
+cpClipMask(void **result, XID id, ScreenPtr screen, ClientPtr client, Mask mode)
+{
+#ifdef PANORAMIX
+ if (!noPanoramiXExtension) {
+ PanoramiXRes *res;
+ int err = dixLookupResourceByType((void **)&res, id, XRT_PIXMAP,
+ client, mode);
+ if (err != Success)
+ return err;
+ id = res->info[screen->myNum].id;
+ }
+#endif
+ return dixLookupResourceByType(result, id, RT_PIXMAP, client, mode);
+}
+
#define NEXT_VAL(_type) (vlist ? (_type) *vlist++ : (_type) ulist++->val)
#define NEXT_PTR(_type) ((_type) ulist++->ptr)
@@ -1053,9 +1088,8 @@ ChangePicture(PicturePtr pPicture,
if (pid == None)
pAlpha = 0;
else {
- error = dixLookupResourceByType((void **) &pAlpha, pid,
- PictureType, client,
- DixReadAccess);
+ error = cpAlphaMap((void **) &pAlpha, pid, pScreen,
+ client, DixReadAccess);
if (error != Success) {
client->errorValue = pid;
break;
@@ -1112,9 +1146,8 @@ ChangePicture(PicturePtr pPicture,
}
else {
clipType = CT_PIXMAP;
- error = dixLookupResourceByType((void **) &pPixmap, pid,
- RT_PIXMAP, client,
- DixReadAccess);
+ error = cpClipMask((void **) &pPixmap, pid, pScreen,
+ client, DixReadAccess);
if (error != Success) {
client->errorValue = pid;
break;
diff --git a/xorg-server/render/render.c b/xorg-server/render/render.c
index a8218426c..68e79aa39 100644..100755
--- a/xorg-server/render/render.c
+++ b/xorg-server/render/render.c
@@ -272,15 +272,15 @@ ProcRenderQueryVersion(ClientPtr client)
REQUEST(xRenderQueryVersionReq);
+ REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
+
pRenderClient->major_version = stuff->majorVersion;
pRenderClient->minor_version = stuff->minorVersion;
- REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
memset(&rep, 0, sizeof(xRenderQueryVersionReply));
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
rep.length = 0;
-
if ((stuff->majorVersion * 1000 + stuff->minorVersion) <
(SERVER_RENDER_MAJOR_VERSION * 1000 + SERVER_RENDER_MINOR_VERSION)) {
rep.majorVersion = stuff->majorVersion;
@@ -1995,7 +1995,7 @@ static int
SProcRenderQueryVersion(ClientPtr client)
{
REQUEST(xRenderQueryVersionReq);
-
+ REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
swaps(&stuff->length);
swapl(&stuff->majorVersion);
swapl(&stuff->minorVersion);
@@ -2006,6 +2006,7 @@ static int
SProcRenderQueryPictFormats(ClientPtr client)
{
REQUEST(xRenderQueryPictFormatsReq);
+ REQUEST_SIZE_MATCH(xRenderQueryPictFormatsReq);
swaps(&stuff->length);
return (*ProcRenderVector[stuff->renderReqType]) (client);
}
@@ -2014,6 +2015,7 @@ static int
SProcRenderQueryPictIndexValues(ClientPtr client)
{
REQUEST(xRenderQueryPictIndexValuesReq);
+ REQUEST_AT_LEAST_SIZE(xRenderQueryPictIndexValuesReq);
swaps(&stuff->length);
swapl(&stuff->format);
return (*ProcRenderVector[stuff->renderReqType]) (client);
@@ -2029,6 +2031,7 @@ static int
SProcRenderCreatePicture(ClientPtr client)
{
REQUEST(xRenderCreatePictureReq);
+ REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq);
swaps(&stuff->length);
swapl(&stuff->pid);
swapl(&stuff->drawable);
@@ -2042,6 +2045,7 @@ static int
SProcRenderChangePicture(ClientPtr client)
{
REQUEST(xRenderChangePictureReq);
+ REQUEST_AT_LEAST_SIZE(xRenderChangePictureReq);
swaps(&stuff->length);
swapl(&stuff->picture);
swapl(&stuff->mask);
@@ -2053,6 +2057,7 @@ static int
SProcRenderSetPictureClipRectangles(ClientPtr client)
{
REQUEST(xRenderSetPictureClipRectanglesReq);
+ REQUEST_AT_LEAST_SIZE(xRenderSetPictureClipRectanglesReq);
swaps(&stuff->length);
swapl(&stuff->picture);
swaps(&stuff->xOrigin);
@@ -2065,6 +2070,7 @@ static int
SProcRenderFreePicture(ClientPtr client)
{
REQUEST(xRenderFreePictureReq);
+ REQUEST_SIZE_MATCH(xRenderFreePictureReq);
swaps(&stuff->length);
swapl(&stuff->picture);
return (*ProcRenderVector[stuff->renderReqType]) (client);
@@ -2074,6 +2080,7 @@ static int
SProcRenderComposite(ClientPtr client)
{
REQUEST(xRenderCompositeReq);
+ REQUEST_SIZE_MATCH(xRenderCompositeReq);
swaps(&stuff->length);
swapl(&stuff->src);
swapl(&stuff->mask);
@@ -2093,6 +2100,7 @@ static int
SProcRenderScale(ClientPtr client)
{
REQUEST(xRenderScaleReq);
+ REQUEST_SIZE_MATCH(xRenderScaleReq);
swaps(&stuff->length);
swapl(&stuff->src);
swapl(&stuff->dst);
@@ -2193,6 +2201,7 @@ static int
SProcRenderCreateGlyphSet(ClientPtr client)
{
REQUEST(xRenderCreateGlyphSetReq);
+ REQUEST_SIZE_MATCH(xRenderCreateGlyphSetReq);
swaps(&stuff->length);
swapl(&stuff->gsid);
swapl(&stuff->format);
@@ -2203,6 +2212,7 @@ static int
SProcRenderReferenceGlyphSet(ClientPtr client)
{
REQUEST(xRenderReferenceGlyphSetReq);
+ REQUEST_SIZE_MATCH(xRenderReferenceGlyphSetReq);
swaps(&stuff->length);
swapl(&stuff->gsid);
swapl(&stuff->existing);
@@ -2213,6 +2223,7 @@ static int
SProcRenderFreeGlyphSet(ClientPtr client)
{
REQUEST(xRenderFreeGlyphSetReq);
+ REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq);
swaps(&stuff->length);
swapl(&stuff->glyphset);
return (*ProcRenderVector[stuff->renderReqType]) (client);
@@ -2227,6 +2238,7 @@ SProcRenderAddGlyphs(ClientPtr client)
xGlyphInfo *gi;
REQUEST(xRenderAddGlyphsReq);
+ REQUEST_AT_LEAST_SIZE(xRenderAddGlyphsReq);
swaps(&stuff->length);
swapl(&stuff->glyphset);
swapl(&stuff->nglyphs);
@@ -2261,6 +2273,7 @@ static int
SProcRenderFreeGlyphs(ClientPtr client)
{
REQUEST(xRenderFreeGlyphsReq);
+ REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
swaps(&stuff->length);
swapl(&stuff->glyphset);
SwapRestL(stuff);
@@ -2278,6 +2291,7 @@ SProcRenderCompositeGlyphs(ClientPtr client)
int size;
REQUEST(xRenderCompositeGlyphsReq);
+ REQUEST_AT_LEAST_SIZE(xRenderCompositeGlyphsReq);
switch (stuff->renderReqType) {
default:
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am
index 83442767a..82578d977 100644
--- a/xorg-server/test/Makefile.am
+++ b/xorg-server/test/Makefile.am
@@ -4,7 +4,7 @@ noinst_PROGRAMS = list string
if XORG
# Tests that require at least some DDX functions in order to fully link
# For now, requires xf86 ddx, could be adjusted to use another
-SUBDIRS += xi2
+SUBDIRS += xi1 xi2
noinst_PROGRAMS += xkb input xtest misc fixes xfree86 os signal-logging touch
if RES
noinst_PROGRAMS += hashtabletest
diff --git a/xorg-server/test/misc.c b/xorg-server/test/misc.c
index dd792e692..66330a140 100644
--- a/xorg-server/test/misc.c
+++ b/xorg-server/test/misc.c
@@ -28,6 +28,8 @@
#include <stdint.h>
#include "misc.h"
#include "scrnintstr.h"
+#include "dix.h"
+#include "dixstruct.h"
ScreenInfo screenInfo;
@@ -155,11 +157,46 @@ dix_update_desktop_dimensions(void)
assert_dimensions(-w2, -h2, w2, h2);
}
+static int
+dix_request_fixed_size_overflow(ClientRec *client)
+{
+ xReq req = { 0 };
+
+ client->req_len = req.length = 1;
+ REQUEST_FIXED_SIZE(req, SIZE_MAX);
+ return Success;
+}
+
+static int
+dix_request_fixed_size_match(ClientRec *client)
+{
+ xReq req = { 0 };
+
+ client->req_len = req.length = 9;
+ REQUEST_FIXED_SIZE(req, 30);
+ return Success;
+}
+
+static void
+dix_request_size_checks(void)
+{
+ ClientRec client = { 0 };
+ int rc;
+
+ rc = dix_request_fixed_size_overflow(&client);
+ assert(rc == BadLength);
+
+ rc = dix_request_fixed_size_match(&client);
+ assert(rc == Success);
+}
+
+
int
main(int argc, char **argv)
{
dix_version_compare();
dix_update_desktop_dimensions();
+ dix_request_size_checks();
return 0;
}
diff --git a/xorg-server/test/xi1/Makefile.am b/xorg-server/test/xi1/Makefile.am
new file mode 100644
index 000000000..907fa7aea
--- /dev/null
+++ b/xorg-server/test/xi1/Makefile.am
@@ -0,0 +1,34 @@
+if ENABLE_UNIT_TESTS
+if HAVE_LD_WRAP
+noinst_PROGRAMS = \
+ protocol-xchangedevicecontrol
+
+TESTS=$(noinst_PROGRAMS)
+TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
+
+AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
+AM_CPPFLAGS = @XORG_INCS@ -I$(srcdir)/../xi2
+TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
+COMMON_SOURCES=$(srcdir)/../xi2/protocol-common.c
+
+if SPECIAL_DTRACE_OBJECTS
+TEST_LDADD += $(OS_LIB) $(DIX_LIB)
+endif
+
+protocol_xchangedevicecontrol_LDADD=$(TEST_LDADD)
+
+protocol_xchangedevicecontrol_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient
+
+protocol_xchangedevicecontrol_SOURCES=$(COMMON_SOURCES) protocol-xchangedevicecontrol.c
+
+else
+# Print that xi1-tests were skipped (exit code 77 for automake test harness)
+TESTS = xi1-tests
+CLEANFILES = $(TESTS)
+
+xi1-tests:
+ @echo 'echo "ld -wrap support required for xi1 unit tests, skipping"' > $@
+ @echo 'exit 77' >> $@
+ $(AM_V_GEN)chmod +x $@
+endif
+endif
diff --git a/xorg-server/test/xi1/protocol-xchangedevicecontrol.c b/xorg-server/test/xi1/protocol-xchangedevicecontrol.c
new file mode 100644
index 000000000..8e638b218
--- /dev/null
+++ b/xorg-server/test/xi1/protocol-xchangedevicecontrol.c
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+/*
+ * Protocol testing for ChangeDeviceControl request.
+ */
+#include <stdint.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/extensions/XIproto.h>
+#include "inputstr.h"
+#include "chgdctl.h"
+
+#include "protocol-common.h"
+
+static ClientRec client_request;
+
+static void
+reply_ChangeDeviceControl(ClientPtr client, int len, char *data, void *userdata)
+{
+ xChangeDeviceControlReply *rep = (xChangeDeviceControlReply *) data;
+
+ if (client->swapped) {
+ swapl(&rep->length);
+ swaps(&rep->sequenceNumber);
+ }
+
+ reply_check_defaults(rep, len, ChangeDeviceControl);
+
+ /* XXX: check status code in reply */
+}
+
+static void
+request_ChangeDeviceControl(ClientPtr client, xChangeDeviceControlReq * req,
+ xDeviceCtl *ctl, int error)
+{
+ int rc;
+
+ client_request.req_len = req->length;
+ rc = ProcXChangeDeviceControl(&client_request);
+ assert(rc == error);
+
+ /* XXX: ChangeDeviceControl doesn't seem to fill in errorValue to check */
+
+ client_request.swapped = TRUE;
+ swaps(&req->length);
+ swaps(&req->control);
+ swaps(&ctl->length);
+ swaps(&ctl->control);
+ /* XXX: swap other contents of ctl, depending on type */
+ rc = SProcXChangeDeviceControl(&client_request);
+ assert(rc == error);
+}
+
+static unsigned char *data[4096]; /* the request buffer */
+
+static void
+test_ChangeDeviceControl(void)
+{
+ xChangeDeviceControlReq *request = (xChangeDeviceControlReq *) data;
+ xDeviceCtl *control = (xDeviceCtl *) (&request[1]);
+
+ request_init(request, ChangeDeviceControl);
+
+ reply_handler = reply_ChangeDeviceControl;
+
+ client_request = init_client(request->length, request);
+
+ printf("Testing invalid lengths:\n");
+ printf(" -- no control struct\n");
+ request_ChangeDeviceControl(&client_request, request, control, BadLength);
+
+ printf(" -- xDeviceResolutionCtl\n");
+ request_init(request, ChangeDeviceControl);
+ request->control = DEVICE_RESOLUTION;
+ control->length = (sizeof(xDeviceResolutionCtl) >> 2);
+ request->length += control->length - 2;
+ request_ChangeDeviceControl(&client_request, request, control, BadLength);
+
+ printf(" -- xDeviceEnableCtl\n");
+ request_init(request, ChangeDeviceControl);
+ request->control = DEVICE_ENABLE;
+ control->length = (sizeof(xDeviceEnableCtl) >> 2);
+ request->length += control->length - 2;
+ request_ChangeDeviceControl(&client_request, request, control, BadLength);
+
+ /* XXX: Test functionality! */
+}
+
+int
+main(int argc, char **argv)
+{
+ init_simple();
+
+ test_ChangeDeviceControl();
+
+ return 0;
+}
diff --git a/xorg-server/test/xi2/protocol-xigetclientpointer.c b/xorg-server/test/xi2/protocol-xigetclientpointer.c
index 28eb8d32a..570c53e06 100644
--- a/xorg-server/test/xi2/protocol-xigetclientpointer.c
+++ b/xorg-server/test/xi2/protocol-xigetclientpointer.c
@@ -124,6 +124,11 @@ test_XIGetClientPointer(void)
request.win = INVALID_WINDOW_ID;
request_XIGetClientPointer(&client_request, &request, BadWindow);
+ printf("Testing invalid length\n");
+ client_request.req_len -= 4;
+ request_XIGetClientPointer(&client_request, &request, BadLength);
+ client_request.req_len += 4;
+
test_data.cp_is_set = FALSE;
printf("Testing window None, unset ClientPointer.\n");
diff --git a/xorg-server/test/xi2/protocol-xipassivegrabdevice.c b/xorg-server/test/xi2/protocol-xipassivegrabdevice.c
index c747ddf03..95d8ebf2b 100644
--- a/xorg-server/test/xi2/protocol-xipassivegrabdevice.c
+++ b/xorg-server/test/xi2/protocol-xipassivegrabdevice.c
@@ -139,6 +139,7 @@ request_XIPassiveGrabDevice(ClientPtr client, xXIPassiveGrabDeviceReq * req,
int local_modifiers;
int mask_len;
+ client_request.req_len = req->length;
rc = ProcXIPassiveGrabDevice(&client_request);
assert(rc == error);
@@ -190,6 +191,13 @@ test_XIPassiveGrabDevice(void)
request_XIPassiveGrabDevice(&client_request, request, BadDevice,
request->deviceid);
+ printf("Testing invalid length\n");
+ request->length -= 2;
+ request_XIPassiveGrabDevice(&client_request, request, BadLength,
+ client_request.errorValue);
+ /* re-init request since swapped length test leaves some values swapped */
+ request_init(request, XIPassiveGrabDevice);
+ request->grab_window = CLIENT_WINDOW_ID;
request->deviceid = XIAllMasterDevices;
printf("Testing invalid grab types\n");
diff --git a/xorg-server/test/xi2/protocol-xiquerypointer.c b/xorg-server/test/xi2/protocol-xiquerypointer.c
index fc66b6429..c0421f6dd 100644
--- a/xorg-server/test/xi2/protocol-xiquerypointer.c
+++ b/xorg-server/test/xi2/protocol-xiquerypointer.c
@@ -201,6 +201,10 @@ test_XIQueryPointer(void)
test_data.dev = devices.mouse;
request.deviceid = devices.mouse->id;
request_XIQueryPointer(&client_request, &request, Success);
+
+ /* test REQUEST_SIZE_MATCH */
+ client_request.req_len -= 4;
+ request_XIQueryPointer(&client_request, &request, BadLength);
}
int
diff --git a/xorg-server/test/xi2/protocol-xiwarppointer.c b/xorg-server/test/xi2/protocol-xiwarppointer.c
index f7986c1eb..3aaaae6f9 100644
--- a/xorg-server/test/xi2/protocol-xiwarppointer.c
+++ b/xorg-server/test/xi2/protocol-xiwarppointer.c
@@ -198,6 +198,9 @@ test_XIWarpPointer(void)
request_XIWarpPointer(&client_request, &request, Success);
/* FIXME: src_x/y checks */
+
+ client_request.req_len -= 2; /* invalid length */
+ request_XIWarpPointer(&client_request, &request, BadLength);
}
int
diff --git a/xorg-server/xfixes/select.c b/xorg-server/xfixes/select.c
index 5a6be7d57..8772b2c11 100644
--- a/xorg-server/xfixes/select.c
+++ b/xorg-server/xfixes/select.c
@@ -200,6 +200,7 @@ SProcXFixesSelectSelectionInput(ClientPtr client)
{
REQUEST(xXFixesSelectSelectionInputReq);
+ REQUEST_SIZE_MATCH(xXFixesSelectSelectionInputReq);
swaps(&stuff->length);
swapl(&stuff->window);
swapl(&stuff->selection);
diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c
index e0667c6ed..2b8abca6c 100644
--- a/xorg-server/xkb/xkb.c
+++ b/xorg-server/xkb/xkb.c
@@ -4952,26 +4952,29 @@ ProcXkbGetGeometry(ClientPtr client)
/***====================================================================***/
-static char *
-_GetCountedString(char **wire_inout, Bool swap)
+static Status
+_GetCountedString(char **wire_inout, ClientPtr client, char **str)
{
- char *wire, *str;
- CARD16 len, *plen;
+ char *wire, *next;
+ CARD16 len;
wire = *wire_inout;
- plen = (CARD16 *) wire;
- if (swap) {
- swaps(plen);
- }
- len = *plen;
- str = malloc(len + 1);
- if (str) {
- memcpy(str, &wire[2], len);
- str[len] = '\0';
+ len = *(CARD16 *) wire;
+ if (client->swapped) {
+ swaps(&len);
}
- wire += XkbPaddedSize(len + 2);
- *wire_inout = wire;
- return str;
+ next = wire + XkbPaddedSize(len + 2);
+ /* Check we're still within the size of the request */
+ if (client->req_len <
+ bytes_to_int32(next - (char *) client->requestBuffer))
+ return BadValue;
+ *str = malloc(len + 1);
+ if (!*str)
+ return BadAlloc;
+ memcpy(*str, &wire[2], len);
+ *(*str + len) = '\0';
+ *wire_inout = next;
+ return Success;
}
static Status
@@ -4980,25 +4983,29 @@ _CheckSetDoodad(char **wire_inout,
{
char *wire;
xkbDoodadWireDesc *dWire;
+ xkbAnyDoodadWireDesc any;
+ xkbTextDoodadWireDesc text;
XkbDoodadPtr doodad;
+ Status status;
dWire = (xkbDoodadWireDesc *) (*wire_inout);
+ any = dWire->any;
wire = (char *) &dWire[1];
if (client->swapped) {
- swapl(&dWire->any.name);
- swaps(&dWire->any.top);
- swaps(&dWire->any.left);
- swaps(&dWire->any.angle);
+ swapl(&any.name);
+ swaps(&any.top);
+ swaps(&any.left);
+ swaps(&any.angle);
}
CHK_ATOM_ONLY(dWire->any.name);
- doodad = XkbAddGeomDoodad(geom, section, dWire->any.name);
+ doodad = XkbAddGeomDoodad(geom, section, any.name);
if (!doodad)
return BadAlloc;
doodad->any.type = dWire->any.type;
doodad->any.priority = dWire->any.priority;
- doodad->any.top = dWire->any.top;
- doodad->any.left = dWire->any.left;
- doodad->any.angle = dWire->any.angle;
+ doodad->any.top = any.top;
+ doodad->any.left = any.left;
+ doodad->any.angle = any.angle;
switch (doodad->any.type) {
case XkbOutlineDoodad:
case XkbSolidDoodad:
@@ -5021,15 +5028,22 @@ _CheckSetDoodad(char **wire_inout,
dWire->text.colorNdx);
return BadMatch;
}
+ text = dWire->text;
if (client->swapped) {
- swaps(&dWire->text.width);
- swaps(&dWire->text.height);
+ swaps(&text.width);
+ swaps(&text.height);
}
- doodad->text.width = dWire->text.width;
- doodad->text.height = dWire->text.height;
+ doodad->text.width = text.width;
+ doodad->text.height = text.height;
doodad->text.color_ndx = dWire->text.colorNdx;
- doodad->text.text = _GetCountedString(&wire, client->swapped);
- doodad->text.font = _GetCountedString(&wire, client->swapped);
+ status = _GetCountedString(&wire, client, &doodad->text.text);
+ if (status != Success)
+ return status;
+ status = _GetCountedString(&wire, client, &doodad->text.font);
+ if (status != Success) {
+ free (doodad->text.text);
+ return status;
+ }
break;
case XkbIndicatorDoodad:
if (dWire->indicator.onColorNdx >= geom->num_colors) {
@@ -5064,7 +5078,9 @@ _CheckSetDoodad(char **wire_inout,
}
doodad->logo.color_ndx = dWire->logo.colorNdx;
doodad->logo.shape_ndx = dWire->logo.shapeNdx;
- doodad->logo.logo_name = _GetCountedString(&wire, client->swapped);
+ status = _GetCountedString(&wire, client, &doodad->logo.logo_name);
+ if (status != Success)
+ return status;
break;
default:
client->errorValue = _XkbErrCode2(0x4F, dWire->any.type);
@@ -5296,18 +5312,20 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client)
char *wire;
wire = (char *) &req[1];
- geom->label_font = _GetCountedString(&wire, client->swapped);
+ status = _GetCountedString(&wire, client, &geom->label_font);
+ if (status != Success)
+ return status;
for (i = 0; i < req->nProperties; i++) {
char *name, *val;
- name = _GetCountedString(&wire, client->swapped);
- if (!name)
- return BadAlloc;
- val = _GetCountedString(&wire, client->swapped);
- if (!val) {
+ status = _GetCountedString(&wire, client, &name);
+ if (status != Success)
+ return status;
+ status = _GetCountedString(&wire, client, &val);
+ if (status != Success) {
free(name);
- return BadAlloc;
+ return status;
}
if (XkbAddGeomProperty(geom, name, val) == NULL) {
free(name);
@@ -5341,9 +5359,9 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client)
for (i = 0; i < req->nColors; i++) {
char *name;
- name = _GetCountedString(&wire, client->swapped);
- if (!name)
- return BadAlloc;
+ status = _GetCountedString(&wire, client, &name);
+ if (status != Success)
+ return status;
if (!XkbAddGeomColor(geom, name, geom->num_colors)) {
free(name);
return BadAlloc;
diff --git a/xorg-server/xkeyboard-config/NEWS b/xorg-server/xkeyboard-config/NEWS
index 548baa58a..cef7453d2 100644
--- a/xorg-server/xkeyboard-config/NEWS
+++ b/xorg-server/xkeyboard-config/NEWS
@@ -1,3 +1,5 @@
+2.14 9 bugs fixed
+ Translations updated
2.13 7 bugs fixed
Translations updated
2.12 10 bugs fixed
diff --git a/xorg-server/xkeyboard-config/configure.ac b/xorg-server/xkeyboard-config/configure.ac
index 9cd302d55..28ac1703f 100644
--- a/xorg-server/xkeyboard-config/configure.ac
+++ b/xorg-server/xkeyboard-config/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 2.13)
+AC_INIT(xkeyboard-config, 2.14)
AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/xorg-server/xkeyboard-config/po/ca.po b/xorg-server/xkeyboard-config/po/ca.po
index 190148c07..af91f987e 100644
--- a/xorg-server/xkeyboard-config/po/ca.po
+++ b/xorg-server/xkeyboard-config/po/ca.po
@@ -1,14 +1,14 @@
# Translation of xkeyboard-config to Catalan
-# Copyright © 2007 Free Software Foundation, Inc.
+# Copyright © 2007-2015 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, 2013, 2014.
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config-2.12.99\n"
+"Project-Id-Version: xkeyboard-config-2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-09-18 23:46+0100\n"
-"PO-Revision-Date: 2014-09-19 18:25+0200\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-17 19:26+0100\n"
"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
"Language: ca\n"
@@ -755,11 +755,11 @@ msgid "Htc Dream phone"
msgstr "Telèfon HTC Dream"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "Anglès (EUA)"
@@ -817,7 +817,7 @@ msgid "English (programmer Dvorak)"
msgstr "Anglès (dvorak de programador)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -850,7 +850,7 @@ 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:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -889,11 +889,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Usbec (Afganistan, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Àrab"
@@ -935,11 +935,11 @@ msgid "Albanian (Plisi D1)"
msgstr "Albanès (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Armeni"
@@ -1015,11 +1015,11 @@ msgid "Belarusian (Latin)"
msgstr "Bielorús (llatí)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Belga"
@@ -1282,11 +1282,11 @@ msgid "Bosnian (US keyboard with Bosnian letters)"
msgstr "Bosnià (teclat EUA amb lletres bosnianes)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Portuguès (Brasil)"
@@ -1370,11 +1370,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Berber (Marroc, Tifinagh fonètic ampliat)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Anglès (Camerun)"
@@ -1495,11 +1495,11 @@ msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Croat (teclat EUA amb lletres croates)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "Txec"
@@ -1524,11 +1524,11 @@ 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:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Danès"
@@ -1553,11 +1553,11 @@ msgid "Danish (Dvorak)"
msgstr "Danès (dvorak)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Holandès"
@@ -1583,11 +1583,11 @@ msgid "Dzongkha"
msgstr "Dzongkha"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Estonià"
@@ -1603,7 +1603,7 @@ msgstr "Estonià (dvorak)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Estonià (teclat EUA amb lletres estonianes)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Persa"
@@ -1666,11 +1666,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "Feroès (elimina les tecles mortes)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Finès"
@@ -1694,7 +1694,7 @@ msgstr "Sami Nord (Finlàndia)"
msgid "Finnish (Macintosh)"
msgstr "Finès (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Francès"
@@ -1930,11 +1930,11 @@ msgid "German (legacy)"
msgstr "Alemany (antic)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Grec"
@@ -2069,11 +2069,11 @@ msgid "Icelandic (Dvorak)"
msgstr "Islandès (dvorak)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "Hebreu"
@@ -2090,11 +2090,11 @@ msgid "Hebrew (Biblical, Tiro)"
msgstr "Hebreu (bíblic, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Italià"
@@ -2123,11 +2123,11 @@ msgid "Italian (IBM 142)"
msgstr "Italià (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "Japonès"
@@ -2204,7 +2204,7 @@ msgid "Lao (STEA proposed standard layout)"
msgstr "Laosià (disposició estàndard proposada per STEA)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
@@ -2225,11 +2225,11 @@ msgid "Spanish (Latin American, Sun dead keys)"
msgstr "Espanyol (llatinoamericà, tecles mortes de Sun)"
#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Lituà"
@@ -2254,11 +2254,11 @@ msgid "Lithuanian (LEKPa)"
msgstr "Lituà (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Letó"
@@ -2296,7 +2296,7 @@ msgid "Maori"
msgstr "Maori"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
@@ -2368,11 +2368,11 @@ msgid "Mongolian"
msgstr "Mongol"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Noruec"
@@ -2409,11 +2409,11 @@ msgid "Norwegian (Colemak)"
msgstr "Noruec (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "Polonès"
@@ -2453,7 +2453,7 @@ msgstr "Rus (Polònia, fonètic dvorak)"
msgid "Polish (programmer Dvorak)"
msgstr "Polonès (dvorak de programador)"
-#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Portuguès"
@@ -2490,11 +2490,11 @@ msgid "Esperanto (Portugal, Nativo)"
msgstr "Esperanto (Portugal, natiu)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Romanès"
@@ -2514,7 +2514,7 @@ msgstr "Romanès (ce trencada estàndard)"
msgid "Romanian (WinKeys)"
msgstr "Romanès (tecles Win)"
-#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Rus"
@@ -2594,1391 +2594,1415 @@ msgstr "Baixkir"
msgid "Mari"
msgstr "Mari"
-#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Rus (fonètic azerty)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "Rus (fonètic francès)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "Serbi"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Serbi (ciríl·lic, ZE i ZHE intercanviades)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Serbi (llatí)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "Serbi (llatí Unicode)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "Serbi (llatí qwerty)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Serbi (llatí Unicode qwerty)"
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Serbi (ciríl·lic amb cometes angulars)"
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "Serbi (llatí amb cometes angulars)"
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Rutè Pannònic"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Eslovè"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "Eslovè (amb cometes angulars per les cometes)"
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:714
msgid "Slovenian (US keyboard with Slovenian letters)"
msgstr "Eslovè (teclat EUA amb lletres eslovenes)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "Eslovac"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "Eslovac (barra inversa ampliada)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "Eslovac (qwerty)"
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Eslovac (qwerty, barra inversa ampliada)"
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "Espanyol"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "Espanyol (elimina les tecles mortes)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Espanyol (tecles Win)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Espanyol (inclou la titlla morta)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Espanyol (tecles mortes de Sun)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Espanyol (dvorak)"
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:727
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:726
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Català (Espanya, L amb punt volat)"
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Espanyol (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Suec"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "Suec (elimina les tecles mortes)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Suec (dvorak)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "Rus (Suècia, fonètic)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Rus (Suècia, fonètic, elimina les tecles mortes)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Sami del nord (Suècia)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Suec (Macintosh)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Suec (Svdvorak)"
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "Idioma de signes suec"
-#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Alemany (Suïssa)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Alemany (Suïssa, antic)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Alemany (Suïssa, elimina les tecles mortes)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Alemany (Suïssa, tecles mortes de Sun)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Francès (Suïssa)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Francès (Suïssa, elimina les tecles mortes)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Francès (Suïssa, tecles mortes de Sun)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Francès (Suïssa, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Alemany (Suïssa, Macintosh)"
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Àrab (Síria)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Siri"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Siríac (fonètic)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kurd (Síria, llatí Q)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Kurd (Síria, F)"
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Kurd (Síria, llatí Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Tadjik"
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Tadjik (antic)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Singalès (fonètic)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tàmil (Sri Lanka, Unicode)"
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:766
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:766
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "Tai"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Tai (TIS-820.2538)"
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Tai (Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Turc"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Turc (F)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Turc (Alt-Q)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Turc (tecles mortes de Sun)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kurd (Turquia, llatí Q)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "Kurd (Turquia, F)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Kurd (Turquia, llatí Alt-Q)"
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:781
msgid "Turkish (international with dead keys)"
msgstr "Turc (internacional amb tecles mortes)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Tàtar de Crimea (Turc Q)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Tàtar de Crimea (Turc F)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Tàtar de Crimea (Turc Alt-Q)"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Taiwanès"
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Taiwanès (indígena)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Saisiyat (Taiwan)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "Ucraïnès"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "Ucraïnès (fonètic)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "Ucraïnès (màquina d'escriure)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "Ucraïnès (tecles Win)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "Ucraïnès (antic)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "Ucraïnès (estàndard RSTU)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Rus (Ucraïna, estàndard RSTU)"
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "Ucraïnès (homofònic)"
-#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Anglès (RU)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Anglès (RU, tecles Win ampliades)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "Anglès (RU, internacional amb tecles mortes)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Anglès (RU, dvorak)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Anglès (RU, dvorak amb puntuació RU)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Anglès (RU, Macintosh)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "Anglès (RU, Macintosh internacional)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "Anglès (RU, Colemak)"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Usbec"
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Usbec (llatí)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Vietnamita"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "Coreà"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "Coreà (compatible de 101/104 tecles)"
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Japonès (sèries PC-98xx)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Irlandès"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Irlandès (UnicodeExpert)"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Ogham (IS434)"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Urdú (Pakistan)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdú (Pakistan, CRULP)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdú (Pakistan, NLA)"
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Àrab (Pakistan)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Sindhi"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Diveí"
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Anglès (Sud-àfrica)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:841
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:841
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Nepalès"
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Anglès (Nigèria)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Igbo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Ioruba"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Amhàric"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "Wolof"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Braille"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Braille (ma esquerra)"
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Braille (ma dretà)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Turcman"
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Turcman (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Bambara"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Francès (Mali, alternatiu)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Anglès (Mali, Macintosh EUA)"
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Anglès (Mali, internacional EUA)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Suahili (Tanzània)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Suahili (Kenya)"
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Kikuyu"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Tswana"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Filipí"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Filipí (QWERTY Baybayin)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Filipí (Capewell-dvorak llatí)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Filipí (Capewell-dvorak Baybayin)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Filipí (Capewell-QWERF 2006 llatí)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Filipí (Capewell-QWERF 2006 Baybayin)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Filipí (Colemak llatí)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Filipí (Colemak Baybayin)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Filipí (dvorak llatí)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Filipí (dvorak Baybayin)"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Moldau"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Moldau (Gagauz)"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Canvi a una altra disposició"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Alt dreta (mentre està premuda)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Alt esquerra (mentre està premuda)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Win esquerra (mentre està premuda)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "Win dreta (mentre està premuda)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "Qualsevol tecla Win (mentre estan premudes)"
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:903
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:902
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Ctrl dreta (mentre està premuda)"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Alt dreta"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Alt esquerra"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "Bloq Majús"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Maj+Bloq Maj"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:909
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:908
+#: ../rules/base.xml.in.h:910
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:909
+#: ../rules/base.xml.in.h:911
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:910
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+Bloq Maj"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Les dues tecles Maj juntes"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Les dues tecles Alt juntes"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Les dues tecles Ctrl juntes"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl+Maj"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Ctrl esquerra+Maj esquerra"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Ctrl dreta+Maj dreta"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Maj"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Alt esquerra+Maj esquerra"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+Espai"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Menú"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Win esquerra"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "Tecla Win+Espai"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Win dreta"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Maj esquerra"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Maj dreta"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Ctrl esquerra"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Ctrl dreta"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Bloq Despl"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:932
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:931
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Tecla per a seleccionar el 3r nivell"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "Qualsevol tecla Win"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "Qualsevol tecla Alt"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Alt dreta, Maj+Alt dreta és la «Compose»"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "La tecla Alt dreta mai selecciona el 3r nivell"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Retorn en el teclat numèric"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Barra inversa"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Més petit/Més gran&gt;"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:941
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:940
+#: ../rules/base.xml.in.h:942
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:941
+#: ../rules/base.xml.in.h:943
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:942
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Posició de la tecla Ctrl"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "Bloq Majús com a Ctrl"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Ctrl esquerra com a Meta"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Intercanvia Ctrl i Bloq Maj"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "A l'esquerra d'«A»"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "A baix esquerra"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Ctrl dreta com a Alt dreta"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menú com a Ctrl dreta"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Alt dreta com a Ctrl dreta"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Intercanvia la tecla Alt esquerra per la tecla Ctrl esquerra"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Intercanvia la tecla Win esquerra per la tecla Ctrl esquerra"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:955
msgid "Swap Right Win key with Right Ctrl key"
msgstr "Intercanvia la tecla Win dreta per la tecla Ctrl dreta"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Alt esquerra com a Ctrl, Ctrl esquerra com a Win, Win esquerra com a Alt"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:957
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:956
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "Bloq Núm"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Disposició del teclat numèric"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Antic"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Addicions Unicode (fletxes i operadors matemàtics)"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:962
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:961
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Wang 724 antic"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:964
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:963
+#: ../rules/base.xml.in.h:965
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:964
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Hexadecimal"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "Estil ATM/telèfon"
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "Comportament de la tecla de supressió del teclat numèric"
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with dot"
msgstr "Tecla antiga amb punt"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Tecla antiga amb coma"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Tecla de quatre nivells amb punt"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Tecla de quatre nivells amb punt, només llatí-9"
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "Tecla de quatre nivells amb coma"
# Què collons és momayyez? jm
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:975
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:976
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Tecla de quatre nivells amb separadors abstractes"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Punt i coma al tercer nivell"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Comportament de la tecla Bloq Maj"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:981
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:980
+#: ../rules/base.xml.in.h:982
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:981
+#: ../rules/base.xml.in.h:983
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:982
+#: ../rules/base.xml.in.h:984
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:983
+#: ../rules/base.xml.in.h:985
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:984
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "Converteix Bloq Maj en un Bloq Núm addicional"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Intercanvia Esc i Bloq Maj"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "Converteix Bloq Maj en un Esc addicional"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "Converteix Bloq Maj en un Retrocés addicional"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "Converteix Bloq Maj en un Super addicional"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "Converteix Bloq Maj en un Hyper addicional"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "Bloq Maj commuta Maj (afecta a totes les tecles)"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "Bloq Maj està deshabilitat"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "Converteix Bloq Maj en un Ctrl addicional"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Comportament de la tecla Alt/Win"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "Afegeix el comportament estàndard a la tecla Menú"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt i Meta són a les tecles Alt"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt s'assigna a les tecles Win (i a les tecles Alt habituals)"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Ctrl s'assigna a les tecles Win (i a les tecles Ctrl habituals)"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Ctrl s'assigna a les tecles Alt, Alt s'assigna a les tecles Win"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "Meta s'assigna a les tecles Win"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "Meta s'assigna a la tecla Win esquerra"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper s'assigna a les tecles Win"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1004
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:1003
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Alt està intercanviada amb la tecla Win"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Posició de la tecla «Compose»"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "3r nivell de Win esquerra"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "3r nivell de Win dreta"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "3r nivell de Menú"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "3r nivell de Ctrl esquerra"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "3r nivell de Ctrl dreta"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "3r nivell de Bloq Maj"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "3r nivell de &lt;Més petit/Més gran&gt;"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pausa"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "ImprPant"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Opcions de compatibilitat diverses"
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Tecles del teclat numèric per defecte"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1018
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:1017
-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:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "BloqNúm actiu: dígits, Maj commuta a les tecles de cursor, BloqNúm inactiu: sempre les tecles de cursor (com en el MS Windows)"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1020
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:1019
+#: ../rules/base.xml.in.h:1021
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:1020
+#: ../rules/base.xml.in.h:1022
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:1021
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Maj cancel·la Bloq Maj"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Habilita els caràcters tipogràfics extres"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Les dues tecles Maj juntes commuten Bloq Maj"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1026
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:1025
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Les dues tecles Maj juntes commuten Bloq Maj"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Maj + BloqNúm commuta les tecles de cursor"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1029
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:1028
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "Permetre l'enregistrament de captura i de l'arbre de finestres"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "S'afegeix el signe de moneda a certes tecles"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Euro en la E "
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Euro en el 2"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Euro en el 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Euro en el 5"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Rupia en el 4"
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "Tecla per a seleccionar el 5è nivell"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1038
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:1037
+#: ../rules/base.xml.in.h:1039
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:1038
+#: ../rules/base.xml.in.h:1040
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:1039
+#: ../rules/base.xml.in.h:1041
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:1040
+#: ../rules/base.xml.in.h:1042
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:1041
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "Espai normal en qualsevol nivell"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1044
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:1043
+#: ../rules/base.xml.in.h:1045
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:1044
+#: ../rules/base.xml.in.h:1046
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:1045
+#: ../rules/base.xml.in.h:1047
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:1046
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Caràcter d'espai sense salt al nivell quart"
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1049
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:1048
+#: ../rules/base.xml.in.h:1050
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:1049
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level"
msgstr "Caràcter separador d'amplada zero al nivell segon"
-#: ../rules/base.xml.in.h:1050
+#: ../rules/base.xml.in.h:1052
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:1051
+#: ../rules/base.xml.in.h:1053
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:1052
+#: ../rules/base.xml.in.h:1054
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:1053
+#: ../rules/base.xml.in.h:1055
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:1054
+#: ../rules/base.xml.in.h:1056
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:1055
+#: ../rules/base.xml.in.h:1057
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:1056
+#: ../rules/base.xml.in.h:1058
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:1057
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Opcions del teclat japonès"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "La tecla de bloqueig Kana està blocant"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "Retrocés estil NICOLA-F"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Converteix Zenkaku Hankaku en un Esc addicional"
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Coreà tecles Hangul/Hanja"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Tecles Hangul/Hanja de maquinari"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Alt dreta com a Hangul, Ctrl dreta com a Hanja"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Ctrl dreta com a Hangul, Alt dreta com a Hanja"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "S'afegeix les lletres amb diacrític l'esperanto"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "A la tecla corresponent en una disposició qwerty"
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "A la tecla corresponent en una disposició dvorak"
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "A la tecla corresponent en una disposició Coleman"
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1071
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:1066
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Compatibilitat amb les tecles Sun"
-#: ../rules/base.xml.in.h:1067
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Seqüència de tecles per a matar el servidor X"
-#: ../rules/base.xml.in.h:1068
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + Retrocés"
@@ -4067,254 +4091,261 @@ msgid "German (with Hungarian letters and no dead keys)"
msgstr "Alemany (amb lletres hongareses i sense tecles mortes)"
#: ../rules/base.extras.xml.in.h:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Polonès (Alemanya, elimina les tecles mortes)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Alemany (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Alemany (Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "Avèstic"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Lituà (dvorak EUA amb lletres lituanes)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Lituà (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Letó (dvorak EUA)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Letó (dvorak EUA, variant Y)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Letó (dvorak EUA, variant menys)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Letó (dvorak de programador EUA)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Letó (dvorak de programador EUA, variant Y)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Letó (dvorak de programador EUA, variant menys)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Letó (Colemak EUA)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Letó (Colemak EUA, variant amb apòstrof)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Letó (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Anglès (EUA, combinació internacional Unicode AltGr)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Anglès (EUA, combinació internacional Unicode AltGr, alternativa)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "Atsina"
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Coeur d'Alene Salish"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "Txec Eslovac i Alemany (EUA)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Anglès (EUA, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Anglès (Normand)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Polonès (internacional amb tecles mortes)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Polonès (Colemak)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Polonès (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Tàtar de Crimea (Dobruja Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Romanès (ergonòmic Touchtype)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Romanès (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Serbi (combinació d'accents en lloc de tecles mortes)"
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Eslau eclesiàstic"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Rus (amb disposició ucraïnesa-bielorussa)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Rus (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Armeni (fonètic OLPC)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Hebreu (bíblic, SIL fonètic)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Àrab (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Belga (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Portuguès (Brasil, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "Txec (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Danès (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Holandès (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Estonià (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Finès (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Francès (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Grec (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Italià (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Japonès (Sun Type 6)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Japonès (Sun Type 7 - Compatible PC)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Japonès (Sun Type 7 - Compatible Sun)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Noruec (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Portuguès (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Eslovac (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Espanyol (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Suec (dvorak A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Suec (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Alemany (Suïssa, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Francès (Suïssa, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Turc (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Ucraïnès (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Anglès (RU, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "Coreà (Sun Type 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKEY (teclat de disposició EUA amb lletres europees)"
-#: ../rules/base.extras.xml.in.h:151
+#: ../rules/base.extras.xml.in.h:152
msgid "Mmuock"
msgstr "Mmuock"
+#~ msgid "Shift with numeric keypad keys works as in MS Windows"
+#~ msgstr "Maj amb el teclat numèric funciona com al MS Windows"
+
#~ msgid "Bengali"
#~ msgstr "Bengalí"
diff --git a/xorg-server/xkeyboard-config/po/cs.po b/xorg-server/xkeyboard-config/po/cs.po
index 59687c013..a5bb116ec 100644
--- a/xorg-server/xkeyboard-config/po/cs.po
+++ b/xorg-server/xkeyboard-config/po/cs.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the xkeyboard-config package.
# Michal Bukovjan <bukm@centrum.cz>, 2003.
# Petr Kovar <pknbe@volny.cz>, 2007, 2008, 2009, 2010, 2011.
-# Petr Pisar <petr.pisar@atlas.cz>, 2014.
+# Petr Pisar <petr.pisar@atlas.cz>, 2014, 2015.
#
# Přídavná jména (často názvy jazyků) rozvíjejí slova rozložení nebo varianta.
# Historicky se všude používá rod střední. Střední rod používá i ISO 15924
@@ -21,10 +21,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.12.99\n"
+"Project-Id-Version: xkeyboard-config 2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-09-18 23:46+0100\n"
-"PO-Revision-Date: 2014-09-19 15:32+0200\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-15 21:14+0100\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
"Language: cs\n"
@@ -770,11 +770,11 @@ msgid "Htc Dream phone"
msgstr "Telefon HTC Dream"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "Anglické (USA)"
@@ -832,7 +832,7 @@ msgid "English (programmer Dvorak)"
msgstr "Anglické (programátorské Dvorak)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -865,7 +865,7 @@ msgid "English (Workman, international with dead keys)"
msgstr "Anglické (Workman, mezinárodní s mrtvými klávesami)"
#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -904,11 +904,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Uzbecké (Afghánistán, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Arabské"
@@ -950,11 +950,11 @@ msgid "Albanian (Plisi D1)"
msgstr "Albánské (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Arménské"
@@ -1030,11 +1030,11 @@ msgid "Belarusian (Latin)"
msgstr "Běloruské (latinka)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Belgické"
@@ -1297,11 +1297,11 @@ msgid "Bosnian (US keyboard with Bosnian letters)"
msgstr "Bosenské (americká klávesnice s bosenskými písmeny)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Portugalské (Brazílie)"
@@ -1385,11 +1385,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Berberské (Maroko, Tifinagh rozšířené fonetické)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Anglické (Kamerun)"
@@ -1510,11 +1510,11 @@ msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Chorvatské (americká klávesnice s chorvatskými písmeny)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "České"
@@ -1539,11 +1539,11 @@ msgid "Czech (US Dvorak with CZ UCW support)"
msgstr "České (americké Dvorak s podporou CZ UCW)"
#. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Dánské"
@@ -1568,11 +1568,11 @@ msgid "Danish (Dvorak)"
msgstr "Dánské (Dvorak)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Nizozemské"
@@ -1598,11 +1598,11 @@ msgid "Dzongkha"
msgstr "Dzongkä"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Estonské"
@@ -1618,7 +1618,7 @@ msgstr "Estonské (Dvorak)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Estonské (americká klávesnice s estonskými písmeny)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Perské"
@@ -1681,11 +1681,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "Faerské (bez mrtvých kláves)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Finské"
@@ -1709,7 +1709,7 @@ msgstr "Severosámské (Finsko)"
msgid "Finnish (Macintosh)"
msgstr "Finské (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Francouzské"
@@ -1945,11 +1945,11 @@ msgid "German (legacy)"
msgstr "Německé (zděděné)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Řecké"
@@ -2084,11 +2084,11 @@ msgid "Icelandic (Dvorak)"
msgstr "Islandské (Dvorak)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "Hebrejské"
@@ -2105,11 +2105,11 @@ msgid "Hebrew (Biblical, Tiro)"
msgstr "Hebrejské (biblické, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Italské"
@@ -2138,11 +2138,11 @@ msgid "Italian (IBM 142)"
msgstr "Italské (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "Japonské"
@@ -2219,7 +2219,7 @@ msgid "Lao (STEA proposed standard layout)"
msgstr "Laoské (návrh standardního rozložení STEA)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
@@ -2240,11 +2240,11 @@ msgid "Spanish (Latin American, Sun dead keys)"
msgstr "Španělské (latinskoamerické, mrtvé klávesy Sun)"
#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Litevské"
@@ -2269,11 +2269,11 @@ msgid "Lithuanian (LEKPa)"
msgstr "Litevské (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Lotyšské"
@@ -2311,7 +2311,7 @@ msgid "Maori"
msgstr "Maorské"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
@@ -2383,11 +2383,11 @@ msgid "Mongolian"
msgstr "Mongolské"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Norské"
@@ -2424,11 +2424,11 @@ msgid "Norwegian (Colemak)"
msgstr "Norské (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "Polské"
@@ -2468,7 +2468,7 @@ msgstr "Ruské (Polsko, fonetické Dvorak)"
msgid "Polish (programmer Dvorak)"
msgstr "Polské (programátorské Dvorak)"
-#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Portugalské"
@@ -2505,11 +2505,11 @@ msgid "Esperanto (Portugal, Nativo)"
msgstr "Esperantské (Portugalsko, nativo)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Rumunské"
@@ -2529,7 +2529,7 @@ msgstr "Rumunské (standardní se cedillou)"
msgid "Romanian (WinKeys)"
msgstr "Rumunské (s klávesami Win)"
-#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Ruské"
@@ -2609,1390 +2609,1414 @@ msgstr "Baškirské"
msgid "Mari"
msgstr "Marijské"
-#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Ruské (fonetické AZERTY)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "Ruské (fonetické francouzské)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "Srbské"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Srbské (cyrilice, prohozené З a Ж)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Srbské (latinka)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "Srbské (latinka Unicode)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "Srbské (latinka QWERTY)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Srbské (latinka Unicode QWERTY)"
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Srbské (cyrilice s francouzskými uvozovkami)"
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "Srbské (latinka s francouzskými uvozovkami)"
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Panonsko-rusínské"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Slovinské"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "Slovinské (s francouzskými uvozovkami)"
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:714
msgid "Slovenian (US keyboard with Slovenian letters)"
msgstr "Slovinské (americká klávesnice se slovinskými písmeny)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "Slovenské"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "Slovenské (rozšířená klávesa zpětného lomítka)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "Slovenské (QWERTY)"
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Slovenské (QWERTY, rozšířená klávesa zpětného lomítka)"
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "Španělské"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "Španělské (vyloučit mrtvé klávesy)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Španělské (klávesy Win)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Španělské (zahrnout mrtvou klávesu vlnovky)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Španělské (mrtvé klávesy Sun)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Španělské (Dvorak)"
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:727
msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
msgstr "Asturské (Španělsko, s H s tečkou pod a L s tečkou pod)"
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Katalánské (Španělsko, s Ŀ)"
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Španělské (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Švédské"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "Švédské (bez mrtvých kláves)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Švédské (Dvorak)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "Ruské (Švédsko, fonetické)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Ruské (Švédsko, fonetické, vyloučit mrtvé klávesy)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Severosámské (Švédsko)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Švédské (Macintosh)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Švédské (Svdvorak)"
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "Švédský znakový jazyk"
-#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Německé (Švýcarsko)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Německé (Švýcarsko, zděděné)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Německé (Švýcarsko, vyloučit mrtvé klávesy)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Německé (Švýcarsko, mrtvé klávesy Sun)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Francouzské (Švýcarsko)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Francouzské (Švýcarsko, vyloučit mrtvé klávesy)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Francouzské (Švýcarsko, mrtvé klávesy Sun)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Francouzské (Švýcarsko, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Německé (Švýcarsko, Macintosh)"
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Arabské (Sýrie)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Syrské"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Syrské (fonetické)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kurdské (Sýrie, latinské Q)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Kurdské (Sýrie, F)"
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Kurdské (Sýrie, latinské Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Tádžické"
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Tádžické (zděděné)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Synhálské (fonetické)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tamilské (Šrí Lanka, Unicode)"
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Tamilské (Šrí Lanka, psací stroj TAB)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "Thajské"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Thajské (TIS-820.2538)"
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Thajské (Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Turecké"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Turecké (F)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Turecké (Alt-Q)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Turecké (s mrtvými klávesami Sun)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kurdské (Turecko, latinské Q)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "Kurdské (Turecko, F)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Kurdské (Turecko, latinské Alt-Q)"
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:781
msgid "Turkish (international with dead keys)"
msgstr "Turecké (mezinárodní s mrtvými klávesami)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Krymskotatarské (turecké Q)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Krymskotatarské (turecké F)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Krymskotatarské (turecké Alt-Q)"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Tchajwanské"
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Tchajwanské (domorodé)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Saisiyatské (Tchaj-wan)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "Ukrajinské"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "Ukrajinské (fonetické)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "Ukrajinské (psací stroj)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "Ukrajinské (klávesy Win)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "Ukrajinské (zděděné)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "Ukrajinské (standardní RSTU)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Ruské (Ukrajina, standardní RSTU)"
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "Ukrajinské (stejně znějící)"
-#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Anglické (Británie)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Anglické (Británie, rozšířené - klávesy Win)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "Anglické (Británie, mezinárodní s mrtvými klávesami)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Anglické (Británie, Dvorak)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Anglické (Británie, Dvorak s britskou interpunkcí)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Anglické (Británie, Macintosh)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "Anglické (Británie, mezinárodní Macintosh)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "Anglické (Británie, Colemak)"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Uzbecké"
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Uzbecké (latinka)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Vietnamské"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "Korejské"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "Korejské (kompatibilní se 101/104klávesovou klávesnicí)"
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Japonské (řada PC-98xx)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Irské"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "Gaelská latinka"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Irské (UnicodeExpert)"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Ogam"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Ogam (IS434)"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Urdské (Pákistán)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdské (Pákistán, CRULP)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdské (Pákistán, NLA)"
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Arabské (Pákistán)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Sindhské"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Divehi"
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Anglické (Jižní Afrika)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:841
msgid "Esperanto (displaced semicolon and quote, obsolete)"
msgstr "Esperanto (posunutý středník a uvozovka, zastaralé)"
#. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Nepálské"
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Anglické (Nigérie)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Igbo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Jorubské"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Amharské"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "Wolof"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Braillovo písmo"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Braillovo písmo (levoruké)"
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Braillovo písmo (pravoruké)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Turkménské"
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Turkménské (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Bambarské"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Francouzské (Mali, alternativní)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Anglické (Mali, americké Macintosh)"
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Anglické (Mali, americké mezinárodní)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Svahilské (Tanzanie)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Svahilské (Keňa)"
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Kikujské"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Setswana"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Filipínské"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Filipínské (baybayinské QWERTY)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Filipínské (latinské Capewell-Dvorak)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Filipínské (baybayinské Capewell-Dvorak)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Filipínské (latinské Capewell-QWERF 2006)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Filipínské (baybayinské Capewell-QWERF 2006)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Filipínské (latinské Colemak)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Filipínské (baybayinské Colemak)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Filipínské (latinské Dvorak)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Filipínské (baybayinské Dvorak)"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Moldavské"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Moldavské (Gagauzské)"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Přepínající do jiného rozložení"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Pravá klávesa Alt (při stisknutí)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Levá klávesa Alt (při stisknutí)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Levá klávesa Win (při stisknutí)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "Pravá klávesa Win (při stisknutí)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "Libovolná klávesa Win (při stisknutí)"
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:903
msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
msgstr "Caps Lock (při stisknutí), Alt+Caps Lock provádí původní akci Caps Lock"
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Pravá klávesa Ctrl (při stisknutí)"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Pravá klávesa Alt"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Levá klávesa Alt"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Shift+Caps Lock"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:909
msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
msgstr "Caps Lock (na první rozložení), Shift+Caps Lock (na poslední rozložení)"
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:910
msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
msgstr "Levá klávesa Win (na první rozložení), pravá klávesa Win/Menu (na poslední rozložení)"
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:911
msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
msgstr "Levá klávesa Ctrl (na první rozložení), pravá klávesa Ctrl (na poslední rozložení)"
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+Caps Lock"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Obě klávesy Shift dohromady"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Obě klávesy Alt dohromady"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Obě klávesy Ctrl dohromady"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Levá klávesa Ctrl + levá klávesa Shift"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Pravá klávesa Ctrl + pravá klávesa Shift"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Levý Alt + levý Shift"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+Mezerník"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Menu"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Levá klávesa Win"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "Klávesa Win + Mezerník"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Pravá klávesa Win"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Levá klávesa Shift"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Pravá klávesa Shift"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Levá klávesa Ctrl"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Pravá klávesa Ctrl"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Scroll Lock"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:932
msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
msgstr "Levý Ctrl + Levý Win (na první rozložení), pravý Ctrl + Menu (na druhém rozložení)"
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Klávesa umožňující výběr 3. úrovně"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "Libovolná klávesa Win"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "Libovolná klávesa Alt"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Pravý Alt, Shift a pravá klávesa Alt je Compose"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "Pravá klávesa Alt nikdy neumožní výběr 3. úrovně"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Enter na numerické klávesnici"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Zpětné lomítko"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Menší než/větší než&gt;"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:941
msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "Caps Lock vybírá 3. úroveň, jednorázově uzamyká při stisknutí společně s jinou výběrovou klávesou 3. úrovně"
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:942
msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "Zpětné lomítko vybírá 3. úroveň, jednorázově uzamyká při stisknutí společně s jinou výběrovou klávesou 3. úrovně"
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:943
msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "&lt;Menší než/Větší než&gt; vybírá 3. úroveň, jednorázově uzamyká při stisknutí společně s jinou výběrovou klávesou 3. úrovně"
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Umístění klávesy Ctrl"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "Caps Lock jako Ctrl"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Levý Ctrl jako Meta"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Zaměnit Ctrl a Caps Lock"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "Nalevo od „A“"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "Vlevo dole"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Pravá klávesa Ctrl funguje jako pravá klávesa Alt"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menu jako pravý Ctrl"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Pravý Alt jako pravý Ctrl"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Levá klávesa Alt je prohozena s levou klávesou Ctrl"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Levá klávesa Win je prohozena s levou klávesou Ctrl"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:955
msgid "Swap Right Win key with Right Ctrl key"
msgstr "Pravá klávesa Win je prohozena s pravou klávesou Ctrl"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Levý Alt jako Ctrl, Levý Ctrl jako Win, levý Win jako Alt"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:957
msgid "Use keyboard LED to show alternative layout"
msgstr "Použít LED klávesnice k zobrazení alternativního rozložení"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "Num Lock"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Rozložení numerické klávesnice"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Zděděné"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Doplňky Unicode (šipky a matematické operátory)"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:962
msgid "Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Doplňky Unicode (šipky a matematické operátory; matematické operátory na výchozí úrovni)"
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Zděděná Wang 724"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:964
msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
msgstr "Numerická klávesnice Wang 724 s doplňky Unicode (šipky a matematické operátory)"
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:965
msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Numerická klávesnice Wang 724 s doplňky Unicode (šipky a matematické operátory; matematické operátory na výchozí úrovni)"
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Hexadecimální"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "ATM/telefonní typ"
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "Chování klávesy Delete na numerické klávesnici"
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with dot"
msgstr "Zděděná klávesa s tečkou"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Zděděná klávesa s čárkou"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Klávesa čtvrté úrovně s tečkou"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Klávesa čtvrté úrovně s tečkou, pouze Latin-9"
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "Klávesa čtvrté úrovně s čárkou"
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:975
msgid "Four-level key with momayyez"
msgstr "Klávesa čtvrté úrovně se znakem momajjez"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Klávesa čtvrté úrovně s abstraktními oddělovači"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Středník na třetí úrovni"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Chování klávesy Caps Lock"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:981
msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
msgstr "Caps Lock používá vnitřní převod na verzálky, Shift přerušuje Caps Lock"
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:982
msgid "Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock"
msgstr "Caps Lock používá vnitřní převod na verzálky, Shift neovlivňuje Caps Lock"
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:983
msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
msgstr "Caps Lock funguje jako Shift s uzamčením, Shift přerušuje Caps Lock"
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:984
msgid "Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock"
msgstr "Caps Lock funguje jako Shift s uzamčením, Shift neovlivňuje Caps Lock"
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:985
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "Caps Lock přepne běžný převod abecedních znaků na verzálky"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "Vytvořit z klávesy Caps Lock další Num Lock"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Zaměnit Esc a Caps Lock"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "Vytvořit z klávesy Caps Lock další Esc"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "Vytvořit z klávesy Caps Lock další Backspace"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "Vytvořit z klávesy Caps Lock další Super"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "Vytvořit z klávesy Caps Lock další Hyper"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "Caps Lock přepne ShiftLock (ovlivňuje všechny klávesy)"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "Klávesa Caps Lock je vypnuta"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "Vytvořit z klávesy Caps Lock další Ctrl"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Chování klávesy Alt/Win"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "Přidá standardní chování ke klávese Menu"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt a Meta na klávesách Alt"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt je přiřazen ke klávesám Win (a obvyklým klávesám Alt)"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Ctrl je přiřazen ke klávesám Win (a obvyklým klávesám Ctrl)"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Ctrl je přiřazen ke klávesám Alt, Alt je přiřazen ke klávesám Win"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "Meta je přiřazena ke klávesám Win"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "Meta je přiřazena k levé klávese Win"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper je přiřazena ke klávesám Win"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1004
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Alt je přiřazena k pravé klávese Win a Super k Menu"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Alt je prohozen s klávesou Win"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Umístění klávesy Compose"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "3. úroveň levého Win"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "3. úroveň pravého Win"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "3. úroveň Menu"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "3. úroveň levého Ctrl"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "3. úroveň pravého Ctrl"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "3. úroveň klávesy Caps Lock"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "3. úroveň &lt;Menší než/větší než&gt;"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pause (Pauza)"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "PrtSc"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Dodatečné volby kompatibility"
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Výchozí numerická klávesnice"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1018
msgid "Numeric keypad keys always enter digits (as in Mac OS)"
msgstr "Klávesy numerické klávesnice vždy vrací číslice (jako u Mac OS)"
-#: ../rules/base.xml.in.h:1017
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift s numerickými klávesami funguje jako v MS Windows"
+#: ../rules/base.xml.in.h:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "Zapnutý Num Lock: číslice, Shift přepíná na šipky, vypnutý Num Lock: vždy šipky (jako v MS Windows)"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1020
msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
msgstr "Shift neruší Num Lock, namísto toho vybírá 3. úroveň"
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1021
msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
msgstr "Speciální klávesy (Ctrl+Alt+&lt;klávesa&gt;) zpracovány v serveru"
-#: ../rules/base.xml.in.h:1020
+#: ../rules/base.xml.in.h:1022
msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
msgstr "Apple Aluminium Keyboard: emulovat klávesy PC (Print, Scroll Lock, Pause, Num Lock)"
-#: ../rules/base.xml.in.h:1021
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Shift ruší Caps Lock"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Povolit přídavné znaky hladké sazby"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Obě klávesy Shift dohromady přepnou Caps Lock"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1026
msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
msgstr "Obě klávesy Shift dohromady zapnou Caps Lock, jediná klávesa Shift jej vypne"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Obě klávesy Shift dohromady přepnou ShiftLock"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Shift + Num Lock přepne PointerKeys (ovládání ukazatele)"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1029
msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
msgstr "Umožní porušit uzamčení vstupů pomocí akcí klávesnice (pozor: bezpečnostní riziko)"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "Umožní protokolování uzamčení vstupů a stromu oken"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "Přidává znaky měny k určitým klávesám"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Euro na E"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Euro na 2"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Euro na 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Euro na 5"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Rupie na 4"
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "Klávesa umožňující výběr 5. úrovně"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1038
msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "&lt;Menší než/Větší než&gt; vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
-#: ../rules/base.xml.in.h:1037
+#: ../rules/base.xml.in.h:1039
msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Pravá klávesa Alt vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
-#: ../rules/base.xml.in.h:1038
+#: ../rules/base.xml.in.h:1040
msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Levá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
-#: ../rules/base.xml.in.h:1039
+#: ../rules/base.xml.in.h:1041
msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Pravá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
-#: ../rules/base.xml.in.h:1040
+#: ../rules/base.xml.in.h:1042
msgid "Using space key to input non-breakable space character"
msgstr "Používání mezerníku k zadávání znaku nedělitelné mezery"
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "Na jakékoliv úrovni znak běžné mezery"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at second level"
msgstr "Na druhé úrovni znak nedělitelné mezery"
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "Na třetí úrovni znak nedělitelné mezery"
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1046
msgid "Non-breakable space character at third level, nothing at fourth level"
msgstr "Na třetí úrovni znak nedělitelné mezery, nic na úrovni čtvrté"
-#: ../rules/base.xml.in.h:1045
+#: ../rules/base.xml.in.h:1047
msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
msgstr "Na třetí úrovni znak nedělitelné mezery, tenká nedělitelná mezera na čtvrté úrovni"
-#: ../rules/base.xml.in.h:1046
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Na čtvrté úrovni znak nedělitelné mezery"
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1049
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
msgstr "Na čtvrté úrovni znak nedělitelné mezery, tenká nedělitelná mezera na šesté úrovni"
-#: ../rules/base.xml.in.h:1048
+#: ../rules/base.xml.in.h:1050
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
msgstr "Na čtvrté úrovni znak nedělitelné mezery, tenká nedělitelná mezera na šesté úrovni (přes Ctrl+Shift)"
-#: ../rules/base.xml.in.h:1049
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level"
msgstr "Na druhé úrovni znak nespojovače nulové šířky"
-#: ../rules/base.xml.in.h:1050
+#: ../rules/base.xml.in.h:1052
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
msgstr "Na druhé úrovni znak nespojovače nulové šířky, znak spojovače nulové šířky na třetí úrovni"
-#: ../rules/base.xml.in.h:1051
+#: ../rules/base.xml.in.h:1053
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
msgstr "Na druhé úrovni znak nespojovače nulové šířky, znak spojovače nulové šířky na třetí úrovni, nedělitelná mezera na čtvrté úrovni"
-#: ../rules/base.xml.in.h:1052
+#: ../rules/base.xml.in.h:1054
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
msgstr "Na druhé úrovni znak nespojovače nulové šířky, nedělitelná mezera na třetí úrovni"
-#: ../rules/base.xml.in.h:1053
+#: ../rules/base.xml.in.h:1055
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
msgstr "Na druhé úrovni znak nespojovače nulové šířky, na třetí úrovni nedělitelná mezera, nic na úrovni čtvrté"
-#: ../rules/base.xml.in.h:1054
+#: ../rules/base.xml.in.h:1056
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
msgstr "Na druhé úrovni znak nespojovače nulové šířky, nedělitelná mezera na třetí úrovni, spojovač nulové šířky na úrovni čtvrté"
-#: ../rules/base.xml.in.h:1055
+#: ../rules/base.xml.in.h:1057
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
msgstr "Na druhé úrovni znak nespojovače nulové šířky, nedělitelná mezera na třetí úrovni, tenká nedělitelná mezera na čtvrté úrovni"
-#: ../rules/base.xml.in.h:1056
+#: ../rules/base.xml.in.h:1058
msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
msgstr "Na třetí úrovni znak nespojovače nulové šířky, znak spojovače nulové šířky na úrovni čtvrté"
-#: ../rules/base.xml.in.h:1057
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Volby japonské klávesnice"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "Klávesa Kana Lock uzamyká"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "Backspace typu NICOLA-F"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Vytvoří z klávesy Zenkaku/Hankaku další Esc"
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Korejský hangul/klávesy handža"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Hardwarový hangul/klávesy handža"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Pravý Alt jako Hangul, pravý Ctrl jako Handža"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Pravá klávesa Ctrl jako Hangul, pravý Alt jako Handža"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "Přidává diakritiku jazyka esperanto"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "K odpovídající klávese na rozložení QWERTY"
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "K odpovídající klávese na rozložení Dvorak"
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "K odpovídající klávese na rozložení Colemak"
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1071
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Udržovat kompatibilitu kláves se starými kódy kláves Solarisu"
-#: ../rules/base.xml.in.h:1066
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Kompatibilita se Sun Key"
-#: ../rules/base.xml.in.h:1067
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Pořadí kláves zabíjející server X"
-#: ../rules/base.xml.in.h:1068
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + Backspace"
@@ -4081,254 +4105,261 @@ msgid "German (with Hungarian letters and no dead keys)"
msgstr "Německé (s maďarskými písmeny a bez mrtvých kláves)"
#: ../rules/base.extras.xml.in.h:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Polské (Německo, bez mrtvých kláves)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Německé (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Německé (Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "Avestské"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Litevské (americká klávesnice s litevskými písmeny)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Litevské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Lotyšské (americké Dvorak)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Lotyšské (americké Dvorak, varianta s Y)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Lotyšské (americké Dvorak, varianta s mínus)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Lotyšské (programátorské americké Dvorak)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Lotyšské (programátorské americké Dvorak, varianta s Y)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Lotyšské (programátorské americké Dvorak, varianta s mínus)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Lotyšské (americké Colemak)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Lotyšské (americké Colemak, varianta s apostrofem)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Lotyšské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Anglické (americké, mezinárodní kombinující Unicode přes AltGr)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Anglické (americké, mezinárodní kombinující Unicode přes AltGr, alternativní)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "Atsina"
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Sališské (Cœur d'Alène)"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "České, slovenské a německé (americké)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Anglické (americké, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Anglické (normanské)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Polské (mezinárodní s mrtvými klávesami)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Polské (Colemak)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Polské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Krymskotatarské (Dobrudža Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Rumunské (ergonomická Touchtype)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Rumunské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Srbské (místo mrtvých kláves kombinovaná diakritika)"
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Církevněslovanské"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Ruské (s ukrajinsko-běloruským rozložením)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Ruské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Arménské (fonetické OLPC)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Hebrejské (biblické, fonetický SIL)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Arabské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Belgické (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Portugalské (Brazílie, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "České (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Dánské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Nizozemské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Estonské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Finské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Francouzské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Řecké (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Italské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Japonské (Sun Type 6)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Japonské (Sun Type 7 – kompatibilní s PC)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Japonské (Sun Type 7 – kompatibilní se Sunem)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Norské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Portugalské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Slovenské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Španělské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Švédské (Dvorak A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Švédské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Německé (Švýcarsko, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Francouzské (Švýcarsko, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Turecké (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Ukrajinské (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Anglické (Británie, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "Korejské (Sun Type 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKEY (americká klávesnice s evropskými písmeny)"
-#: ../rules/base.extras.xml.in.h:151
+#: ../rules/base.extras.xml.in.h:152
msgid "Mmuock"
msgstr "Mmuock"
+#~ msgid "Shift with numeric keypad keys works as in MS Windows"
+#~ msgstr "Shift s numerickými klávesami funguje jako v MS Windows"
+
#~ 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;Menší než/Větší než&gt; vybírá 5. úroveň a uzamyká 5. úroveň při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
diff --git a/xorg-server/xkeyboard-config/po/da.po b/xorg-server/xkeyboard-config/po/da.po
index 3dbc2b885..d0d212891 100644
--- a/xorg-server/xkeyboard-config/po/da.po
+++ b/xorg-server/xkeyboard-config/po/da.po
@@ -31,10 +31,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config-2.11.99\n"
+"Project-Id-Version: xkeyboard-config-2.12.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-05-18 00:11+0100\n"
-"PO-Revision-Date: 2014-05-24 23:06+0100\n"
+"POT-Creation-Date: 2014-09-18 23:46+0100\n"
+"PO-Revision-Date: 2014-10-04 23:06+0100\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"Language: da\n"
@@ -492,8 +492,8 @@ msgid "Memorex MX2750"
msgstr "Memorex MX2750"
#: ../rules/base.xml.in.h:113
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgid "Microsoft Natural Ergonomic Keyboard 4000"
+msgstr "Microsoft Natural Ergonomic Keyboard 4000"
#: ../rules/base.xml.in.h:114
msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
@@ -1397,11 +1397,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Berbisk (Marokko, Tifinagh udvidet fonetisk)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
msgid "English (Cameroon)"
msgstr "Engelsk (camerounsk)"
@@ -2088,641 +2088,645 @@ msgid "Icelandic (eliminate dead keys)"
msgstr "Islandsk (slå døde taster fra)"
#: ../rules/base.xml.in.h:551
+msgid "Icelandic (Macintosh, legacy)"
+msgstr "Islandsk (Macintosh, forældet)"
+
+#: ../rules/base.xml.in.h:552
msgid "Icelandic (Macintosh)"
msgstr "Islandsk (Macintosh)"
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
msgid "Icelandic (Dvorak)"
msgstr "Islandsk (Dvorak)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:554 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
msgid "Hebrew"
msgstr "Hebraisk"
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
msgid "Hebrew (lyx)"
msgstr "Hebraisk (lyx)"
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
msgid "Hebrew (phonetic)"
msgstr "Hebraisk (fonetisk)"
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
msgid "Hebrew (Biblical, Tiro)"
msgstr "Hebraisk (bibelsk, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
msgid "Italian"
msgstr "Italiensk"
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
msgid "Italian (eliminate dead keys)"
msgstr "Italiensk (slå døde taster fra)"
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
msgid "Italian (Winkeys)"
msgstr "Italiensk (Wintaster)"
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
msgid "Italian (Macintosh)"
msgstr "Italiensk (Macintosh)"
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
msgid "Italian (US keyboard with Italian letters)"
msgstr "Italiensk (US-tastatur med italienske bogstaver)"
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
msgid "Georgian (Italy)"
msgstr "Georgisk (Italien)"
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
msgid "Italian (IBM 142)"
msgstr "Italiensk (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
msgid "Japanese"
msgstr "Japansk"
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
msgid "Japanese (Kana)"
msgstr "Japansk (Kana)"
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
msgid "Japanese (Kana 86)"
msgstr "Japansk (Kana 86)"
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:574
msgid "Japanese (OADG 109A)"
msgstr "Japansk (OADG 109A)"
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
msgid "Japanese (Macintosh)"
msgstr "Japansk (Macintosh)"
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
msgid "Japanese (Dvorak)"
msgstr "Japansk (dvorak)"
#. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
msgid "ki"
msgstr "ki"
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
msgid "Kyrgyz"
msgstr "Kirgisisk"
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
msgid "Kyrgyz (phonetic)"
msgstr "Kirgisisk (fonetisk)"
#. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:582
msgid "km"
msgstr "km"
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
msgid "Khmer (Cambodia)"
msgstr "Khmerisk (Cambodja)"
#. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
msgid "kk"
msgstr "kk"
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:586
msgid "Kazakh"
msgstr "Kasakhisk"
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
msgid "Russian (Kazakhstan, with Kazakh)"
msgstr "Russisk (Kasakhstan, med kazakhisk)"
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:588
msgid "Kazakh (with Russian)"
msgstr "Kasakhisk (med russisk)"
#. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
msgid "lo"
msgstr "lo"
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
msgid "Lao"
msgstr "Lao"
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
msgid "Lao (STEA proposed standard layout)"
msgstr "Lao (STEA-foreslået standardlayout)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
msgid "es"
msgstr "es"
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
msgid "Spanish (Latin American)"
msgstr "Spansk (latinamerikansk)"
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
msgid "Spanish (Latin American, eliminate dead keys)"
msgstr "Spansk (latinamerikansk, slå døde taster fra)"
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
msgid "Spanish (Latin American, include dead tilde)"
msgstr "Spansk (latinamerikansk, inkluder død tilde)"
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
msgid "Spanish (Latin American, Sun dead keys)"
msgstr "Spansk (latinamerikansk, Sun døde taster)"
#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:599 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:31
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
msgid "Lithuanian"
msgstr "Litauisk"
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
msgid "Lithuanian (standard)"
msgstr "Litauisk (standard)"
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
msgid "Lithuanian (US keyboard with Lithuanian letters)"
msgstr "Litauisk (US-tastatur med litauiske bogstaver)"
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
msgid "Lithuanian (IBM LST 1205-92)"
msgstr "Litauisk (IBM LST 1205-92)"
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
msgid "Lithuanian (LEKP)"
msgstr "Litauisk (LEKP)"
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
msgid "Lithuanian (LEKPa)"
msgstr "Litauisk (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:607 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
msgid "Latvian"
msgstr "Lettisk"
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
msgid "Latvian (apostrophe variant)"
msgstr "Lettisk (apostrofvariant)"
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
msgid "Latvian (tilde variant)"
msgstr "Lettisk (tildevariant)"
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
msgid "Latvian (F variant)"
msgstr "Lettisk (F-variant)"
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
msgid "Latvian (modern)"
msgstr "Lettisk (moderne)"
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
msgid "Latvian (ergonomic, ŪGJRMV)"
msgstr "Lettisk (ergonomisk, ŪGJRMV)"
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
msgid "Latvian (adapted)"
msgstr "Lettisk (adapteret)"
#. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
msgid "mi"
msgstr "mi"
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
msgid "Maori"
msgstr "Maori"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:619 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
msgid "sr"
msgstr "sr"
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
msgid "Montenegrin"
msgstr "Montenegrinsk"
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
msgid "Montenegrin (Cyrillic)"
msgstr "Montenegrinsk (kyrillisk)"
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
msgstr "Montenegrinsk (kyrillisk, ZE og ZHE ombyttet)"
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
msgid "Montenegrin (Latin Unicode)"
msgstr "Montenegrinsk (latin Unicode)"
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
msgid "Montenegrin (Latin qwerty)"
msgstr "Montenegrinsk (latin qwerty)"
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
msgid "Montenegrin (Latin Unicode qwerty)"
msgstr "Montenegrinsk (latin Unicode qwerty)"
# guillemets er dem her: »«
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
msgid "Montenegrin (Cyrillic with guillemets)"
msgstr "Montenegrinsk (kyrillisk med anførelsestegnene »«)"
# guillemets er dem her: »«
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
msgid "Montenegrin (Latin with guillemets)"
msgstr "Montenegrinsk (latin med anførelsestegnene »«)"
#. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
msgid "mk"
msgstr "mk"
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
msgid "Macedonian"
msgstr "Makedonsk"
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
msgid "Macedonian (eliminate dead keys)"
msgstr "Makedonsk (slå døde taster fra)"
#. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
msgid "mt"
msgstr "mt"
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
msgid "Maltese"
msgstr "Maltesisk"
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
msgid "Maltese (with US layout)"
msgstr "Maltesisk (med US-layout)"
#. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
msgid "mn"
msgstr "mn"
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:639
msgid "Mongolian"
msgstr "Mongolsk"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:640 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
msgid "Norwegian"
msgstr "Norsk"
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:643
msgid "Norwegian (eliminate dead keys)"
msgstr "Norsk (slå døde taster fra)"
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:644
msgid "Norwegian (Winkeys)"
msgstr "Norsk (Wintaster)"
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:645
msgid "Norwegian (Dvorak)"
msgstr "Norsk (dvorak)"
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:646
msgid "Northern Saami (Norway)"
msgstr "Nordligt samisk (Norge)"
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:647
msgid "Northern Saami (Norway, eliminate dead keys)"
msgstr "Nordligt samisk (Norge, slå døde taster fra)"
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:648
msgid "Norwegian (Macintosh)"
msgstr "Norsk (Macintosh)"
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:649
msgid "Norwegian (Macintosh, eliminate dead keys)"
msgstr "Norsk (Macintosh, slå døde taster fra)"
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:650
msgid "Norwegian (Colemak)"
msgstr "Norsk (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:651 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
msgid "Polish"
msgstr "Polsk"
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:654
msgid "Polish (legacy)"
msgstr "Polsk (forældet)"
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:655
msgid "Polish (qwertz)"
msgstr "Polsk (qwertz)"
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:656
msgid "Polish (Dvorak)"
msgstr "Polsk (dvorak)"
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:657
msgid "Polish (Dvorak, Polish quotes on quotemark key)"
msgstr "Polsk (dvorak, polske anførelsestegn på anførelsestast)"
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:658
msgid "Polish (Dvorak, Polish quotes on key 1)"
msgstr "Polsk (dvorak, polske anførelsestegn på tast 1)"
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:659
msgid "Kashubian"
msgstr "Kashubian"
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:660
msgid "Silesian"
msgstr "Schlesisk"
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:661
msgid "Russian (Poland, phonetic Dvorak)"
msgstr "Russisk (Polen, fonetisk dvorak)"
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:662
msgid "Polish (programmer Dvorak)"
msgstr "Polsk (programmørdvorak)"
-#: ../rules/base.xml.in.h:662 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
msgid "Portuguese"
msgstr "Portugisisk"
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:664
msgid "Portuguese (eliminate dead keys)"
msgstr "Portugisisk (slå døde taster fra)"
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:665
msgid "Portuguese (Sun dead keys)"
msgstr "Portugisisk (Sun døde taster)"
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:666
msgid "Portuguese (Macintosh)"
msgstr "Portugisisk (Macintosh)"
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:667
msgid "Portuguese (Macintosh, eliminate dead keys)"
msgstr "Portugisisk (Macintosh, slå døde taster fra)"
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:668
msgid "Portuguese (Macintosh, Sun dead keys)"
msgstr "Portugisisk (Macintosh, Sun døde taster)"
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:669
msgid "Portuguese (Nativo)"
msgstr "Portugisisk (nativo)"
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:670
msgid "Portuguese (Nativo for US keyboards)"
msgstr "Portugisisk (nativo for USA-tastaturer)"
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:671
msgid "Esperanto (Portugal, Nativo)"
msgstr "Esperanto (Portugal, Nativo)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:672 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
msgid "Romanian"
msgstr "Rumænsk"
# http://da.wikipedia.org/wiki/%C3%87
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:675
msgid "Romanian (cedilla)"
msgstr "Rumænsk (cedille)"
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:676
msgid "Romanian (standard)"
msgstr "Rumænsk (standard)"
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:677
msgid "Romanian (standard cedilla)"
msgstr "Rumænsk (standardcedille)"
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:678
msgid "Romanian (WinKeys)"
msgstr "Rumænsk (Wintaster)"
-#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
msgid "Russian"
msgstr "Russisk"
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:680
msgid "Russian (phonetic)"
msgstr "Russisk (fonetisk)"
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:681
msgid "Russian (phonetic WinKeys)"
msgstr "Russisk (fonetisk Wintaster)"
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:682
msgid "Russian (typewriter)"
msgstr "Russisk (skrivemaskine)"
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:683
msgid "Russian (legacy)"
msgstr "Russisk (forældet)"
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:684
msgid "Russian (typewriter, legacy)"
msgstr "Russisk (skrivemaskine, forældet)"
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:685
msgid "Tatar"
msgstr "Tatar"
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:686
msgid "Ossetian (legacy)"
msgstr "Occitansk (forældet)"
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:687
msgid "Ossetian (WinKeys)"
msgstr "Occitansk (Wintaster)"
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:688
msgid "Chuvash"
msgstr "Chuvash"
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:689
msgid "Chuvash (Latin)"
msgstr "Chuvash (latin)"
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:690
msgid "Udmurt"
msgstr "Udmurt"
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:691
msgid "Komi"
msgstr "Komi"
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:692
msgid "Yakut"
msgstr "Yakut"
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:693
msgid "Kalmyk"
msgstr "Kalmyk"
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:694
msgid "Russian (DOS)"
msgstr "Russisk (DOS)"
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:695
msgid "Russian (Macintosh)"
msgstr "Russisk (Macintosh)"
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:696
msgid "Serbian (Russia)"
msgstr "Serbisk (Rusland)"
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:697
msgid "Bashkirian"
msgstr "Bashkirisk"
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:698
msgid "Mari"
msgstr "Mari"
-#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
msgid "Serbian"
msgstr "Serbisk"
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:700
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Serbisk (kyrillisk, ZE og ZHE ombyttet)"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:701
msgid "Serbian (Latin)"
msgstr "Serbisk (latin)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Latin Unicode)"
msgstr "Serbisk (latin unicode)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin qwerty)"
msgstr "Serbisk (latin qwerty)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Serbisk (latin unicode qwerty)"
# guillemets er dem her: »«
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Serbisk (kyrillisk med anførelsestegnene »«)"
# guillemets er dem her: »«
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:706
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:706
+#: ../rules/base.xml.in.h:707
msgid "Pannonian Rusyn"
msgstr "Pannonisk rusyn"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:709
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:710
msgid "Slovenian"
msgstr "Slovensk"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:711
msgid "Slovenian (with guillemets for quotes)"
msgstr "Slovensk (med »« som anførelsestegn)"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:712
msgid "Slovenian (US keyboard with Slovenian letters)"
msgstr "Slovensk (US-tastatur med slovenske bogstaver)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:713 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:122
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
msgid "Slovak"
msgstr "Slovakisk"
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:716
msgid "Slovak (extended Backslash)"
msgstr "Slovakisk (udvidet omvendt skråstreg)"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:717
msgid "Slovak (qwerty)"
msgstr "Slovakisk (qwerty)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:718
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Slovakisk (qwerty, udvidet omvendt skråstreg)"
-#: ../rules/base.xml.in.h:718 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
msgid "Spanish"
msgstr "Spansk"
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:720
msgid "Spanish (eliminate dead keys)"
msgstr "Spansk (slå døde taster fra)"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:721
msgid "Spanish (Winkeys)"
msgstr "Spansk (Wintaster)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:722
msgid "Spanish (include dead tilde)"
msgstr "Spansk (inkluder død tilde)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Sun dead keys)"
msgstr "Spansk (Sun døde taster)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:724
msgid "Spanish (Dvorak)"
msgstr "Spansk (dvorak)"
@@ -2730,1143 +2734,1147 @@ msgstr "Spansk (dvorak)"
# 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:724
+#: ../rules/base.xml.in.h:725
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:725
+#: ../rules/base.xml.in.h:726
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Catalansk (Spanien, med midterpunktum L)"
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:727
msgid "Spanish (Macintosh)"
msgstr "Spansk (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:728 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
msgid "Swedish"
msgstr "Svensk"
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
msgid "Swedish (eliminate dead keys)"
msgstr "Svensk (slå døde taster fra)"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
msgid "Swedish (Dvorak)"
msgstr "Svensk (dvorak)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
msgid "Russian (Sweden, phonetic)"
msgstr "Russisk (Sverige, fonetisk)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Russisk (Sverige, fonetisk, slå døde taster fra)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
msgid "Northern Saami (Sweden)"
msgstr "Nordligt samisk (Sverige)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
msgid "Swedish (Macintosh)"
msgstr "Svensk (Macintosh)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
msgid "Swedish (Svdvorak)"
msgstr "Svensk (svdvorak)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
msgid "Swedish Sign Language"
msgstr "Svensk tegnsprog"
-#: ../rules/base.xml.in.h:738 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
msgid "German (Switzerland)"
msgstr "Tysk (Schweiz)"
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
msgid "German (Switzerland, legacy)"
msgstr "Tysk (Schweiz, forældet)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Tysk (Schweiz, slå døde taster fra)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, Sun dead keys)"
msgstr "Tysk (Schweiz, Sun døde taster)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:743
msgid "French (Switzerland)"
msgstr "Fransk (Schweiz)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:744
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Fransk (Schweiz, slå døde taster fra)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland, Sun dead keys)"
msgstr "Fransk (Schweiz, Sun døde taster)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, Macintosh)"
msgstr "Fransk (Schweiz, Macintosh)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:747
msgid "German (Switzerland, Macintosh)"
msgstr "Tysk (Schweiz, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:748
msgid "Arabic (Syria)"
msgstr "Arabisk (Syrien)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:750
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:751
msgid "Syriac"
msgstr "Syrisk"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:752
msgid "Syriac (phonetic)"
msgstr "Syrisk (fonetisk)"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:753
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kurdisk (Syrien, latin Q)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:754
msgid "Kurdish (Syria, F)"
msgstr "Kurdisk (Syrien, F)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Kurdisk (Syrien, latin Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:757
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:758
msgid "Tajik"
msgstr "Tadsjikisk"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:759
msgid "Tajik (legacy)"
msgstr "Tadsjikisk (forældet)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:761
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
msgid "Sinhala (phonetic)"
msgstr "Singalesisk (fonetisk)"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tamilsk (Sri Lanka, unicode)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Tamilsk (Sri Lanka, TAB-skrivemaskine)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:766
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:767
msgid "Thai"
msgstr "Thai"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:768
msgid "Thai (TIS-820.2538)"
msgstr "Thai (TIS-820.2538)"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:769
msgid "Thai (Pattachote)"
msgstr "Thai (pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
msgid "Turkish"
msgstr "Tyrkisk"
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:773
msgid "Turkish (F)"
msgstr "Tyrkisk (F)"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:774
msgid "Turkish (Alt-Q)"
msgstr "Tyrkisk (Alt-Q)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:775
msgid "Turkish (Sun dead keys)"
msgstr "Tyrkisk (Sun døde taster)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:776
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kurdisk (Tyrkiet, latin Q)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:777
msgid "Kurdish (Turkey, F)"
msgstr "Kurdisk (Tyrkiet, F)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Kurdisk (Tyrkiet, latin Alt-Q)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:779
msgid "Turkish (international with dead keys)"
msgstr "Tyrkisk (international med døde taster)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:780 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:62
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:782
msgid "Crimean Tatar (Turkish Q)"
msgstr "Krimtatarsk (tyrkisk Q)"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:783
msgid "Crimean Tatar (Turkish F)"
msgstr "Krimtatarsk (tyrkisk F)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Krimtatarsk (tyrkisk Alt-Q)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:785
msgid "Taiwanese"
msgstr "Taiwanesisk"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:786
msgid "Taiwanese (indigenous)"
msgstr "Taiwanesisk (indfødte)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:788
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:789
msgid "Saisiyat (Taiwan)"
msgstr "Saisiyat (Taiwan)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:790 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:793
msgid "Ukrainian (phonetic)"
msgstr "Ukrainsk (fonetisk)"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:794
msgid "Ukrainian (typewriter)"
msgstr "Ukrainsk (skrivemaskine)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (WinKeys)"
msgstr "Ukrainsk (Wintaster)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (legacy)"
msgstr "Ukrainsk (forældet)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (standard RSTU)"
msgstr "Ukrainsk (standard RSTU)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:798
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:798
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (homophonic)"
msgstr "Ukrainsk (homofonisk)"
-#: ../rules/base.xml.in.h:799 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
msgid "English (UK)"
msgstr "Engelsk (UK)"
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:801
msgid "English (UK, extended WinKeys)"
msgstr "Engelsk (UK, udvidede Wintaster)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:802
msgid "English (UK, international with dead keys)"
msgstr "Engelsk (UK, international med døde taster)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:803
msgid "English (UK, Dvorak)"
msgstr "Engelsk (UK, Dvorak)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:804
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Engelsk (UK, Dvorak med UK-tegnsætning)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Macintosh)"
msgstr "Engelsk (UK, Macintosh)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Macintosh international)"
msgstr "Engelsk (UK, Macintosh international)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Colemak)"
msgstr "Engelsk (UK, Colemak)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:808
msgid "Uzbek"
msgstr "Usbekisk"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:809
msgid "Uzbek (Latin)"
msgstr "Usbekisk (latin)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:811
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:812
msgid "Vietnamese"
msgstr "Vietnamesisk"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:813 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
msgid "Korean"
msgstr "Koreansk"
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:816
msgid "Korean (101/104 key compatible)"
msgstr "Koreansk (101/104 tastkompatibel)"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:817
msgid "Japanese (PC-98xx Series)"
msgstr "Japansk (pc-98xx-serie)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:819
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:820
msgid "Irish"
msgstr "Irsk"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:821
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:822
msgid "Irish (UnicodeExpert)"
msgstr "Irsk (UnicodeExpert)"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:823
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:824
msgid "Ogham (IS434)"
msgstr "Ogham (IS434)"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:825
msgid "Urdu (Pakistan)"
msgstr "Urdu (Pakistan)"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:826
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdu (Pakistan, CRULP)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdu (Pakistan, NLA)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:828
msgid "Arabic (Pakistan)"
msgstr "Arabisk (Pakistan)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:830
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:831
msgid "Sindhi"
msgstr "Sindhi"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:833
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:834
msgid "Dhivehi"
msgstr "Dhivehi"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:835
msgid "English (South Africa)"
msgstr "Engelsk (Sydafrika)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:837
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:838
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:839
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:840
+#: ../rules/base.xml.in.h:841
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:842
msgid "Nepali"
msgstr "Nepalesisk"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:843
msgid "English (Nigeria)"
msgstr "Engelsk (Nigeria)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:845
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:846
msgid "Igbo"
msgstr "Igbo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:848
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:849
msgid "Yoruba"
msgstr "Yoruba"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:851
msgid "am"
msgstr "am"
# http://da.wikipedia.org/wiki/Amharisk
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:852
msgid "Amharic"
msgstr "Amharisk"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:854
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:855
msgid "Wolof"
msgstr "Wolof"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:857
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:858
msgid "Braille"
msgstr "Blindeskrift"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:859
msgid "Braille (left hand)"
msgstr "Blindeskrift (venstre hånd)"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:860
msgid "Braille (right hand)"
msgstr "Blindeskrift (højre hånd)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:862
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:863
msgid "Turkmen"
msgstr "Turkmensk"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:864
msgid "Turkmen (Alt-Q)"
msgstr "Turkmensk (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:866
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:867
msgid "Bambara"
msgstr "Bambara"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:868
msgid "French (Mali, alternative)"
msgstr "Fransk (Mali, alternativ)"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:869
msgid "English (Mali, US Macintosh)"
msgstr "Engelsk (Mali, US Macintosh)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:870
msgid "English (Mali, US international)"
msgstr "Engelsk (Mali, US international)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:872
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:873
msgid "Swahili (Tanzania)"
msgstr "Swahili (Tanzania)"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:874
msgid "Swahili (Kenya)"
msgstr "Swahili (Kenya)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:875
msgid "Kikuyu"
msgstr "Kikuyu"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:877
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:878
msgid "Tswana"
msgstr "Tswana"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:880
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:881
msgid "Filipino"
msgstr "Filippinsk"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:882
msgid "Filipino (QWERTY Baybayin)"
msgstr "Filippinsk (QWERTY baybayin)"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:883
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Filippinsk (Capewell-dvorak latin)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:884
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Filippinsk (Capewell-dvorak baybayin)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Filippinsk (Capewell-QWERF 2006 latin)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Filippinsk (Capewell-QWERF 2006 baybayin)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Colemak Latin)"
msgstr "Filippinsk (Colemak latin)"
# http://en.wikipedia.org/wiki/Baybayin
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Colemak Baybayin)"
msgstr "Filippinsk (Colemak baybayin)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Dvorak Latin)"
msgstr "Filippinsk (Dvorak latin)"
# http://en.wikipedia.org/wiki/Baybayin
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Dvorak Baybayin)"
msgstr "Filippinsk (Dvorak baybayin)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:891
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:892
msgid "Moldavian"
msgstr "Moldavisk"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:893
msgid "gag"
msgstr "gag"
# http://www.denstoredanske.dk/Sprog,_religion_og_filosofi/Sprog/Alle_lande_-_sprogoversigt/Altaiske_sprog/gagausisk
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:894
msgid "Moldavian (Gagauz)"
msgstr "Moldavisk (gagausisk)"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:895
msgid "Switching to another layout"
msgstr "Skifter til et andet layout"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:896
msgid "Right Alt (while pressed)"
msgstr "Højre Alt (mens trykket ned)"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:897
msgid "Left Alt (while pressed)"
msgstr "Venstre Alt (mens trykket ned)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:898
msgid "Left Win (while pressed)"
msgstr "Venstre Win-tast (mens trykket ned)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:899
msgid "Right Win (while pressed)"
msgstr "Højre Win-tast (mens trykket ned)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:900
msgid "Any Win key (while pressed)"
msgstr "Enhver Win-tast (mens trykket ned)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:901
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:901
+#: ../rules/base.xml.in.h:902
msgid "Right Ctrl (while pressed)"
msgstr "Højre Ctrl-tast (mens trykket ned)"
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:903
msgid "Right Alt"
msgstr "Højre Alt"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:904
msgid "Left Alt"
msgstr "Venstre Alt"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:905
msgid "Caps Lock"
msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:906
msgid "Shift+Caps Lock"
msgstr "Skift+Caps Lock"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:907
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)"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:908
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:908
+#: ../rules/base.xml.in.h:909
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)"
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:910
msgid "Alt+Caps Lock"
msgstr "Alt+Caps Lock"
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:911
msgid "Both Shift keys together"
msgstr "Begge skift-taster sammen"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:912
msgid "Both Alt keys together"
msgstr "Begge Alt-taster sammen"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:913
msgid "Both Ctrl keys together"
msgstr "Begge Ctrl-taster sammen"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:914
msgid "Ctrl+Shift"
msgstr "Ctrl+Skift"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:915
msgid "Left Ctrl+Left Shift"
msgstr "Venstre Ctrl+Venstre Skift"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:916
msgid "Right Ctrl+Right Shift"
msgstr "Højre Ctrl+Højre Skift"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:917
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:918
msgid "Alt+Shift"
msgstr "Alt+Skift"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:919
msgid "Left Alt+Left Shift"
msgstr "Venstre Alt+Venstre Skift"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:920
msgid "Alt+Space"
msgstr "Alt+Mellemrum"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:921
msgid "Menu"
msgstr "Menu"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:922
msgid "Left Win"
msgstr "Venstre Win"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:923
msgid "Win Key+Space"
msgstr "Wintast+mellemrum"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:924
msgid "Right Win"
msgstr "Højre Win"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:925
msgid "Left Shift"
msgstr "Venstre Skift"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:926
msgid "Right Shift"
msgstr "Højre Skift"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:927
msgid "Left Ctrl"
msgstr "Venstre Ctrl"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:928
msgid "Right Ctrl"
msgstr "Højre Ctrl"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:929
msgid "Scroll Lock"
msgstr "Scroll Lock"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:930
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)"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:931
msgid "Key to choose 3rd level"
msgstr "Tast for at vælge tredje niveau"
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:932
msgid "Any Win key"
msgstr "Enhver Win-tast"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:933
msgid "Any Alt key"
msgstr "Enhver Alt-tast"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:934
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Højre Alt-tast, Skift+højre Alt-tast er sammensat (compose)"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:935
msgid "Right Alt key never chooses 3rd level"
msgstr "Højre Alt-tast vælger aldrig tredje niveau"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:936
msgid "Enter on keypad"
msgstr "Retur på numerisk tastatur"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:937
msgid "Backslash"
msgstr "Omvendt skråstreg"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:938
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Mindre end/Større end&gt;"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:939
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:939
+#: ../rules/base.xml.in.h:940
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"
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:941
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:941
+#: ../rules/base.xml.in.h:942
msgid "Ctrl key position"
msgstr "Ctrl-tast placering"
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:943
msgid "Caps Lock as Ctrl"
msgstr "Caps Lock som Ctrl"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:944
msgid "Left Ctrl as Meta"
msgstr "Venstre Ctrl som Meta"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:945
msgid "Swap Ctrl and Caps Lock"
msgstr "Ombyt Ctrl og Caps Lock"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:946
msgid "At left of 'A'"
msgstr "Til venstre for 'A'"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:947
msgid "At bottom left"
msgstr "Nederst til venstre"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:948
msgid "Right Ctrl as Right Alt"
msgstr "Højre Ctrl-tast virker som højre Alt"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:949
msgid "Menu as Right Ctrl"
msgstr "Menu som højre Ctrl"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:950
msgid "Right Alt as Right Ctrl"
msgstr "Højre Alt-tast virker som højre Ctrl"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:951
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Byt venstre Alt-tast om med venstre Ctrl-tast"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:952
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Byt venstre Win-tast om med venstre Ctrl-tast"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:953
+msgid "Swap Right Win key with Right Ctrl key"
+msgstr "Byt højre Win-tast om med højre Ctrl-tast"
+
+#: ../rules/base.xml.in.h:954
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Venstre Alt som Ctrl, venstre Ctrl som Win, venstre Win som Alt"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:955
msgid "Use keyboard LED to show alternative layout"
msgstr "Brug tastatur-LED til at vise alternativ layout"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:956
msgid "Num Lock"
msgstr "Num Lock"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:957
msgid "Layout of numeric keypad"
msgstr "Layout for numerisk tastatur"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:958
msgid "Legacy"
msgstr "Forældet"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:959
msgid "Unicode additions (arrows and math operators)"
msgstr "Unicode tilføjelser (pile og matematiske tegn)"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:960
msgid "Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Unicode-tilføjelser (pile og matematiske tegn; matematiske tegn på standardniveau)"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:961
msgid "Legacy Wang 724"
msgstr "Forældet Wang 724"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:962
msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
msgstr "Wang 724 numerisk tastatur med Unicode-tilføjelser (pile og matematiske tegn)"
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:963
msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Wang 724 numerisk tastatur med Unicode-tilføjelser (pile og matematiske tegn; matematiske tegn på standardniveau)"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:964
msgid "Hexadecimal"
msgstr "Sekstentals"
# ATM = hæveautomat, måske skal det oversættes.
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:965
msgid "ATM/phone-style"
msgstr "ATM/telefonstil"
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:966
msgid "Numeric keypad delete key behaviour"
msgstr "Numerisk tastatur slettetast opførsel"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:967
msgid "Legacy key with dot"
msgstr "Forældet tast med punktum"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with comma"
msgstr "Forældet tast med komma"
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:970
msgid "Four-level key with dot"
msgstr "Niveau fire tast med punktum"
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:971
msgid "Four-level key with dot, Latin-9 only"
msgstr "Niveau fire tast med punktum, latin-9 begrænsning"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with comma"
msgstr "Niveau fire tast med komma"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with momayyez"
msgstr "Niveau fire tast med momayyez"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:976
msgid "Four-level key with abstract separators"
msgstr "Niveau fire tast med abstrakt adskillelser"
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:977
msgid "Semicolon on third level"
msgstr "Semikolon på tredje niveau"
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:978
msgid "Caps Lock key behavior"
msgstr "Opførsel for Caps Lock-tast"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:979
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:978
+#: ../rules/base.xml.in.h:980
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"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:981
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:980
+#: ../rules/base.xml.in.h:982
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"
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:983
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "Caps Lock slår små/store bogstaver til/fra"
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:984
msgid "Make Caps Lock an additional Num Lock"
msgstr "Gør Caps Lock til en ekstra NumLock"
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:985
msgid "Swap ESC and Caps Lock"
msgstr "Ombyt ESC og Caps Lock"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional ESC"
msgstr "Gør Caps Lock til en ekstra Esc"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:987
msgid "Make Caps Lock an additional Backspace"
msgstr "Gør Caps Lock til en ekstra rettelsestast"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional Super"
msgstr "Gør Caps Lock til en ekstra Super"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Hyper"
msgstr "Gør Caps Lock til en ekstra Hyper"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:990
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "Caps Lock ændrer SkiftLock (påvirker alle taster)"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:991
msgid "Caps Lock is disabled"
msgstr "Caps Lock er slået fra"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:992
msgid "Make Caps Lock an additional Ctrl"
msgstr "Gør Caps Lock til en ekstra Ctrl"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:993
msgid "Alt/Win key behavior"
msgstr "Alt/Win-tasteopførsel"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:994
msgid "Add the standard behavior to Menu key"
msgstr "Tilføj standardopførslen til menutasten"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:995
msgid "Alt and Meta are on Alt keys"
msgstr "Alt og Meta er på Alt-tasterne"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:996
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt ligger på Win-tasterne (og de normale Alt-taster)"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:997
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Ctrl ligger på Win-tasterne (og de normale Ctrl-taster)"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:998
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Ctrl ligger på Alt-tasterne, Alt ligger på Win-tasterne"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:999
msgid "Meta is mapped to Win keys"
msgstr "Meta ligger på Win-tasterne"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1000
msgid "Meta is mapped to Left Win"
msgstr "Meta ligger på venstre Win-tast"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1001
msgid "Hyper is mapped to Win keys"
msgstr "Hyper ligger på Win-tasterne"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1002
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:1001
+#: ../rules/base.xml.in.h:1003
msgid "Alt is swapped with Win"
msgstr "Alt-tast ombyttes med Win-tast"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1004
msgid "Position of Compose key"
msgstr "Position for sammensat (compose) tast"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1005
msgid "3rd level of Left Win"
msgstr "Tredje niveau for venstre Win"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1006
msgid "3rd level of Right Win"
msgstr "Tredje niveau for højre Win"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Menu"
msgstr "Tredje niveau for Menu"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Left Ctrl"
msgstr "Tredje niveau for venstre Ctrl"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Right Ctrl"
msgstr "Tredje niveau for højre Ctrl"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Caps Lock"
msgstr "Tredje niveau for Caps Lock (lås skift)"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "Tredje niveau for &lt;Mindre end/Større end&gt;"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1012
msgid "Pause"
msgstr "Pause"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1013
msgid "PrtSc"
msgstr "Prtsc"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1014
msgid "Miscellaneous compatibility options"
msgstr "Diverse kompatibilitetsvalg"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1015
msgid "Default numeric keypad keys"
msgstr "Standard numerisk tastatur taster"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1016
msgid "Numeric keypad keys always enter digits (as in Mac OS)"
msgstr "Numerisk tastatur indtaster altid tal (som på Mac OS)"
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1017
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:1016
+#: ../rules/base.xml.in.h:1018
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:1017
+#: ../rules/base.xml.in.h:1019
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:1018
+#: ../rules/base.xml.in.h:1020
msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
msgstr "Apples aluminiumstastatur: Emuler PC-taster (Udskriv, Scroll Lock, Pause, NumLock)"
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1021
msgid "Shift cancels Caps Lock"
msgstr "Skift afbryder Caps Lock"
-#: ../rules/base.xml.in.h:1020
+#: ../rules/base.xml.in.h:1022
msgid "Enable extra typographic characters"
msgstr "Slå ekstra typografiske karakterer til"
-#: ../rules/base.xml.in.h:1021
+#: ../rules/base.xml.in.h:1023
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Begge skift-taster sammen skifter Caps Lock"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1024
msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
msgstr "Begge skift-taster sammen aktiverer Caps Lock, en Skift-tast deaktiverer"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Begge skift-taster sammen skifter SkiftLock"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1026
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Skift + NumLock skifter PointerKeys"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1027
msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
msgstr "Tillader afbrydelsesgreb med tastaturhandlinger (advarsel: sikkerhedsrisiko)"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1028
msgid "Allow grab and window tree logging"
msgstr "Tillader afbrydelsesgreb med vinduestrælogning"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1029
msgid "Adding currency signs to certain keys"
msgstr "Tilføjelse af valutategn til bestemte taster"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1030
msgid "Euro on E"
msgstr "Euro på E"
@@ -3875,75 +3883,75 @@ msgstr "Euro på E"
# 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:1029
+#: ../rules/base.xml.in.h:1031
msgid "Euro on 2"
msgstr "Euro på 2"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1032
msgid "Euro on 4"
msgstr "Euro på 4"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 5"
msgstr "Euro på 5"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1034
msgid "Rupee on 4"
msgstr "Rupee på 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1035
msgid "Key to choose 5th level"
msgstr "Tast for at vælge femte niveau"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1036
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:1035
+#: ../rules/base.xml.in.h:1037
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"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1038
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:1037
+#: ../rules/base.xml.in.h:1039
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:1038
+#: ../rules/base.xml.in.h:1040
msgid "Using space key to input non-breakable space character"
msgstr "Brug mellemrum for at indtaste ubrydelig mellemrumskarakter"
-#: ../rules/base.xml.in.h:1039
+#: ../rules/base.xml.in.h:1041
msgid "Usual space at any level"
msgstr "Normal mellemrum på alle niveauer"
-#: ../rules/base.xml.in.h:1040
+#: ../rules/base.xml.in.h:1042
msgid "Non-breakable space character at second level"
msgstr "Ubrydelig mellemrumskarakter på andet niveau"
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1043
msgid "Non-breakable space character at third level"
msgstr "Ubrydelig mellemrumskarakter på tredje niveau"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1044
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:1043
+#: ../rules/base.xml.in.h:1045
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:1044
+#: ../rules/base.xml.in.h:1046
msgid "Non-breakable space character at fourth level"
msgstr "Ubrydelig mellemrumskarakter på fjerde niveau"
-#: ../rules/base.xml.in.h:1045
+#: ../rules/base.xml.in.h:1047
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
msgstr "Ubrydelig mellemrumskarakter på fjerde niveau, tynd ubrydelige mellemrumskarakter på sjette niveau"
-#: ../rules/base.xml.in.h:1046
+#: ../rules/base.xml.in.h:1048
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)"
@@ -3955,84 +3963,84 @@ msgstr "Ubrydelig mellemrumskarakter på fjerde niveau, tynd ubrydelige mellemru
# 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:1047
+#: ../rules/base.xml.in.h:1049
msgid "Zero-width non-joiner character at second level"
msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau"
-#: ../rules/base.xml.in.h:1048
+#: ../rules/base.xml.in.h:1050
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.xml.in.h:1049
+#: ../rules/base.xml.in.h:1051
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.xml.in.h:1050
+#: ../rules/base.xml.in.h:1052
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.xml.in.h:1051
+#: ../rules/base.xml.in.h:1053
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:1052
+#: ../rules/base.xml.in.h:1054
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:1053
+#: ../rules/base.xml.in.h:1055
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:1054
+#: ../rules/base.xml.in.h:1056
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:1055
+#: ../rules/base.xml.in.h:1057
msgid "Japanese keyboard options"
msgstr "Japanske tastaturvalg"
-#: ../rules/base.xml.in.h:1056
+#: ../rules/base.xml.in.h:1058
msgid "Kana Lock key is locking"
msgstr "Kana låsetast låser"
-#: ../rules/base.xml.in.h:1057
+#: ../rules/base.xml.in.h:1059
msgid "NICOLA-F style Backspace"
msgstr "NICOLA-F-stil rettelsestast"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1060
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Gør Zenkaku Hankaku til en ekstra Esc"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1061
msgid "Adding Esperanto supersigned letters"
msgstr "Tilføjelse af esperanto supersigned bogstaver"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1062
msgid "To the corresponding key in a Qwerty layout"
msgstr "Til den tilsvarende tast på et Qwertytastatur"
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1063
msgid "To the corresponding key in a Dvorak layout"
msgstr "Til den tilsvarende tast i et Dvoraktastatur"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1064
msgid "To the corresponding key in a Colemak layout"
msgstr "Til den tilsvarende tast i et Colemaktastatur"
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1065
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Vedligehold tastkompatibilitet med gamle tastkoder for Solaris"
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1066
msgid "Sun Key compatibility"
msgstr "Kompatibilitet med Suntast"
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1067
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:1066
+#: ../rules/base.xml.in.h:1068
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + Rettelsestast"
@@ -4369,3 +4377,7 @@ msgstr "eu"
#: ../rules/base.extras.xml.in.h:148
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKEY (US-baseret tastatur med europæiske bogstaver)"
+
+#: ../rules/base.extras.xml.in.h:151
+msgid "Mmuock"
+msgstr "Mmuock"
diff --git a/xorg-server/xkeyboard-config/po/de.po b/xorg-server/xkeyboard-config/po/de.po
index 3ef1974bd..1225c965c 100644
--- a/xorg-server/xkeyboard-config/po/de.po
+++ b/xorg-server/xkeyboard-config/po/de.po
@@ -1,21 +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, 2013, 2014.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config-2.12.99\n"
+"Project-Id-Version: xkeyboard-config-2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-09-18 23:46+0100\n"
-"PO-Revision-Date: 2014-09-19 10:14+0100\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-15 20:23+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-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.3\n"
#: ../rules/base.xml.in.h:1
msgid "Generic 101-key PC"
@@ -754,11 +754,11 @@ msgid "Htc Dream phone"
msgstr "HTC Dream Mobiltelefon"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "English (USA)"
@@ -816,7 +816,7 @@ msgid "English (programmer Dvorak)"
msgstr "Englisch (Dvorak für Programmierer)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -849,7 +849,7 @@ msgid "English (Workman, international with dead keys)"
msgstr "Englisch (Workman International, mit Akzenttasten)"
#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -888,11 +888,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Usbekisch (Afghanistan, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Arabisch"
@@ -934,11 +934,11 @@ msgid "Albanian (Plisi D1)"
msgstr "Albanisch (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Armenisch"
@@ -1014,11 +1014,11 @@ msgid "Belarusian (Latin)"
msgstr "Weißrussisch (Lateinisch)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Belgisch"
@@ -1281,11 +1281,11 @@ msgid "Bosnian (US keyboard with Bosnian letters)"
msgstr "Bosnisch (US-Tastatur mit bosnischen Buchstaben)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Portugiesisch (Brasilien)"
@@ -1369,11 +1369,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Berber (Marokko, Tifinagh erweitert, phonetisch)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Englisch (Kamerun)"
@@ -1494,11 +1494,11 @@ msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Kroatisch (US-Tastatur mit kroatischen Buchstaben)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "Tschechisch"
@@ -1523,11 +1523,11 @@ 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:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Dänisch"
@@ -1552,11 +1552,11 @@ msgid "Danish (Dvorak)"
msgstr "Dänisch (Dvorak)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Niederländisch"
@@ -1582,11 +1582,11 @@ msgid "Dzongkha"
msgstr "Dzongkha"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Estnisch"
@@ -1602,7 +1602,7 @@ msgstr "Estnisch (Dvorak)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Estnisch (US-Tastatur mit estnischen Buchstaben)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Persisch"
@@ -1665,11 +1665,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "Färöisch (ohne Akzenttasten)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Finnisch"
@@ -1693,7 +1693,7 @@ msgstr "Nördliches Saami (Finnland)"
msgid "Finnish (Macintosh)"
msgstr "Finnisch (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Französisch"
@@ -1929,11 +1929,11 @@ msgid "German (legacy)"
msgstr "Deutsch (veraltet)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Griechisch"
@@ -2068,11 +2068,11 @@ msgid "Icelandic (Dvorak)"
msgstr "Isländisch (Dvorak)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "Hebräisch"
@@ -2089,11 +2089,11 @@ msgid "Hebrew (Biblical, Tiro)"
msgstr "Hebräisch (Biblisch, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Italienisch"
@@ -2122,11 +2122,11 @@ msgid "Italian (IBM 142)"
msgstr "Italienisch (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "Japanisch"
@@ -2203,7 +2203,7 @@ msgid "Lao (STEA proposed standard layout)"
msgstr "Laotisch (durch STEA vorgeschlagene Standardbelegung)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
@@ -2224,11 +2224,11 @@ msgid "Spanish (Latin American, Sun dead keys)"
msgstr "Spanisch (Lateinamerikanisch, Sun-Akzenttasten)"
#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Litauisch"
@@ -2253,11 +2253,11 @@ msgid "Lithuanian (LEKPa)"
msgstr "Litauisch (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Lettisch"
@@ -2295,7 +2295,7 @@ msgid "Maori"
msgstr "Maori"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
@@ -2367,11 +2367,11 @@ msgid "Mongolian"
msgstr "Mongolisch"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Norwegisch"
@@ -2408,11 +2408,11 @@ msgid "Norwegian (Colemak)"
msgstr "Norwegisch (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "Polnisch"
@@ -2452,7 +2452,7 @@ msgstr "Russisch (Polen, phonetisch, Dvorak)"
msgid "Polish (programmer Dvorak)"
msgstr "Polnisch (Dvorak für Programmierer)"
-#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Portugiesisch"
@@ -2489,11 +2489,11 @@ msgid "Esperanto (Portugal, Nativo)"
msgstr "Esperanto (Portugal, Nativo)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Rumänisch"
@@ -2513,7 +2513,7 @@ msgstr "Rumänisch (Standard Cedilla)"
msgid "Romanian (WinKeys)"
msgstr "Rumänisch (Windows-Tasten)"
-#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Russisch"
@@ -2593,1391 +2593,1415 @@ msgstr "Baschkirisch"
msgid "Mari"
msgstr "Mari"
-#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Russisch (AZERTY, phonetisch)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "Russisch (Französisch, phonetisch)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "Serbisch"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Serbisch (Kyrillisch, »З« und »Ж« vertauscht)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Serbisch (Lateinisch)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "Serbisch (Lateinisch Unicode)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "Serbisch (Lateinische qwerty-Tastatur)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Serbisch (lateinische qwerty-Tastatur, Unicode)"
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Serbisch (Kyrillisch mit Anführungszeichen)"
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "Serbisch (Lateinisch mit Anführungszeichen)"
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Pannonisches Russinisch"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Slowenisch"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "Slowenisch (mit Anführungszeichen für Zitate)"
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:714
msgid "Slovenian (US keyboard with Slovenian letters)"
msgstr "Slowenisch (US-Tastatur mit slowenischen Buchstaben)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "Slowakisch"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "Slowakisch (erweiterter Backslash)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "Slowakisch (qwerty)"
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Slowakisch (qwerty, erweiterter Backslash)"
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "Spanisch"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "Spanisch (ohne Akzenttasten)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Spanisch (Windows-Tasten)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Spanisch (Akzent-Tilde einschließen)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Spanisch (Sun-Akzenttasten)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Spanisch (Dvorak)"
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:727
msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
msgstr "Asturisch (Spanien, mit unterpunktetem L und H)"
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Katalanisch (Spanische Variante mit mittelpunktiertem L)"
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Spanisch (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Schwedisch"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "Schwedisch (ohne Akzenttasten)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Schwedisch (Dvorak)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "Russisch (Schweden, phonetisch)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Russisch (Schweden, phonetisch, ohne Akzenttasten)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Nördliches Saami (Schweden)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Schwedisch (Macintosh)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Schwedisch (Svdvorak)"
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "Schwedische Gebärdensprache"
-#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Deutsch (Schweiz)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Deutsch (Schweiz, veraltet)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Deutsch (Schweiz, ohne Akzenttasten)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Deutsch (Schweiz, Sun-Akzenttasten)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Französisch (Schweiz)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Französisch (Schweiz, ohne Akzenttasten)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Französisch (Schweiz, Sun-Akzenttasten)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Französisch (Schweiz, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Deutsch (Schweiz, Macintosh)"
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Arabisch (Syrien)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Syrisch"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Syrisch (phonetisch)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kurdisch (Syrien, lateinisches Q)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Kurdisch (Syrien, F)"
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Kurdisch (Syrien, lateinisches Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Tadschikisch"
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Tadschikisch (veraltet)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Sinhala (phonetisch)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tamilisch (Sri Lanka, Unicode)"
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Tamilisch (Sri Lanka, TAB Schreibmaschine)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "Thailändisch"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Thailändisch (TIS-820.2538)"
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Thailändisch (Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Türkisch"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Türkisch, (F)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Türkisch (Alt-Q)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Türkisch (Sun-Akzenttasten)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kurdisch (Türkei, lateinisches Q)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "Kurdisch (Türkei, F)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Kurdisch (Türkei, lateinisches Alt-Q)"
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:781
msgid "Turkish (international with dead keys)"
msgstr "Türkisch (International, mit Akzenttasten)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Krimtatarisch (Türkisch Q)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Krimtatarisch (Türkisch F)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Krimtatarisch (Türkisch Alt-Q)"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Taiwanesisch"
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Taiwanesisch (indigen)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Saisiyat (Taiwan)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "Ukrainisch"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "Ukrainisch (phonetisch)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "Ukrainisch (Schreibmaschine)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "Ukrainisch (Windows-Tasten)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "Ukrainisch (veraltet)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "Ukrainisch (Standard-RSTU)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Russisch (Ukraine, Standard-RSTU)"
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "Ukrainisch (homophon)"
-#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Englisch (Britisch)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Englisch (Britisch erweitert, Windows-Tasten)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "Englisch (Britisch international, mit Akzenttasten)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Englisch (Britisch, Dvorak)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Englisch (Dvorak mit britischer Punktierung)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Englisch (Britisch, Macintosh)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "Englisch (Britisch, Macintosh international)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "English (Britisch, Colemak)"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Usbekisch"
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Usbekisch (lateinische Schrift)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Vietnamesisch"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "Koreanisch"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "Koreanisch (101/104-Tasten kompatibel)"
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Japanisch (PC-98xx-Serie)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Irisch"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Irisch (UnicodeExpert)"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Ogham (IS434)"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Urdu (Pakistan)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdu (Pakistan, CRULP)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdu (Pakistan, NLA)"
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Arabisch (Pakistan)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Sindhi"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Dhivehi"
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Englisch (Südafrika)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:841
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:841
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Nepalesisch"
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Englisch (Nigeria)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Igbo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Joruba"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Amharisch"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "Wolof"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Braille"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Braille (linkshändig)"
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Braille (rechtshändig)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Turkmenisch"
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Turkmenisch (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Bambara"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Französisch (Mali, Alternative)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Englisch (Mali, USA Macintosh)"
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Englisch (Mali, USA International)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Swahili (Tansania)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Swahili (Kenia)"
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Kikuyu"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Tswana"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Philippinisch"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Philippinisch (QWERTY, Baybayin)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Philippinisch (Capewell-Dvorak, Lateinisch)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Philippinisch (Capewell-Dvorak, Baybayin)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Philippinisch (Capewell-QWERF 2006, lateinisch)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Philippinisch (Capewell-QWERF 2006, Baybayin)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Philippinisch (Colemak, lateinisch)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Philippinisch (Colemak, Baybayin)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Philippinisch (Dvorak, lateinisch)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Philippinisch (Dvorak, Baybayin)"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Moldawisch"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Moldauisch (Gagauz)"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Wechseln in eine andere Belegung"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Rechte Alt-Taste (gedrückt halten)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Linke Alt-Taste (gedrückt halten)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Linke Windows-Taste (gedrückt halten)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "Rechte Windows-Taste (gedrückt halten)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "Beliebige Windows-Taste (gedrückt halten)"
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:903
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:902
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Rechte Strg-Taste (gedrückt halten)"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Rechte Alt-Taste"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Linke Alt-Taste"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "Feststelltaste"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Umschalt-+Feststelltaste"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:909
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:908
+#: ../rules/base.xml.in.h:910
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:909
+#: ../rules/base.xml.in.h:911
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:910
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+Feststelltaste"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Beide Umschalttasten gleichzeitig"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Beide Alt-Tasten gleichzeitig"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Beide Steuerungstasten gleichzeitig"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Strg+Umschalttaste"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Linke Strg-Taste+Linke Umschalttaste"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Rechte Strg-Taste und rechte Umschalttaste"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Strg"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Umschalttaste"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Linke Alt-Taste+Linke Umschalttaste"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+Leertaste"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Menü"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Linke Windows-Taste"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "Windows-Taste + Leertaste"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Rechte Windows-Taste"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Linke Umschalttaste"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Rechte Umschalttaste"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Linke Strg-Taste"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Rechte Strg-Taste"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Rollen"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:932
msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
msgstr "Linke Strg-Taste und linke Windows-Taste (zur ersten Belegung), rechte Strg-Taste und Menütaste (zur zweiten Belegung)"
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Taste zum Wechsel in die dritte Tastaturebene"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "Beliebige Windows-Taste"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "Beliebige Alt-Taste"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Rechte Alt-Taste, Umschalttaste + rechte Alt-Taste ist Compose-Taste"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "Rechte Alt-Taste wählt niemals die dritte Tastaturebene."
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Eingabetaste im Nummernblock"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Backslash"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Kleiner als/größer als&gt;"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:941
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:940
+#: ../rules/base.xml.in.h:942
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:941
+#: ../rules/base.xml.in.h:943
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:942
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Position der Strg-Taste"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "Feststelltaste als Strg-Taste"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Linke Strg-Taste als Meta"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Strg-Taste und Feststelltaste vertauschen"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "Links von »A«"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "Unten links"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Rechte Strg-Taste wie rechte Alt-Taste"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menü als rechte Strg-Taste"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Rechte Alt-Taste als rechte Strg-Taste"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Linke Alt-Taste und linke Strg-Taste vertauschen"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Linke Win-Taste und linke Strg-Taste vertauschen"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:955
msgid "Swap Right Win key with Right Ctrl key"
msgstr "Rechte Win-Taste und rechte Strg-Taste vertauschen"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Linke Alt als Strg, linke Strg als Win, linke Win als Alt"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:957
msgid "Use keyboard LED to show alternative layout"
msgstr "Tastatur-LED zur Anzeige der alternativen Belegung verwenden"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "NumLock"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Belegung des Nummernblocks"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Veraltet"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Unicode-Ergänzungen (Pfeile und mathematische Operatoren)"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:962
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:961
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Wang 724 (veraltet)"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:964
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:963
+#: ../rules/base.xml.in.h:965
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:964
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Hexadezimal"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "ATM/Telefonstil"
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "Verhalten der Löschtaste des Nummernblocks"
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with dot"
msgstr "Veraltete Taste mit Punkt"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Veraltete Taste mit Komma"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Taste der vierten Ebene mit Punkt"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Taste der vierten Ebene mit Punkt, Latin-9-Einschränkung"
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "Taste der vierten Ebene mit Komma"
# momayyez? Was ist das?
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:975
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:976
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Taste der vierten Ebene mit abstrakten Trennern"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Semikolon in der dritten Tastaturebene"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Verhalten der Feststelltaste"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:981
msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
msgstr "Feststelltaste verwendet interne Großschreibung. Umschalttaste »unterbricht« Feststelltaste"
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:982
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:981
+#: ../rules/base.xml.in.h:983
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:982
+#: ../rules/base.xml.in.h:984
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:983
+#: ../rules/base.xml.in.h:985
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "Feststelltaste kehrt die normale Großschreibung alphabetischer Zeichen um"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "Feststelltaste als zusätzliche NumLock-Taste verwenden"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Esc und Feststelltaste vertauschen"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "Feststelltaste als zusätzliche Esc-Taste verwenden"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "Feststelltaste als zusätzliche Löschtaste verwenden"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "Feststelltaste als zusätzliche Super-Taste verwenden"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "Feststelltaste als zusätzliche Hyper-Taste verwenden"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "Feststelltaste kehrt Umschalttaste um, so dass alle Tasten beeinflusst werden"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "Feststelltaste ist deaktiviert"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "Feststelltaste als zusätzliche Strg-Taste verwenden"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Verhalten der Alt/Windows-Tasten"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "Standardverhalten zur Menütaste hinzufügen"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt und Meta befinden sich auf den Alt-Tasten."
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt ist den Windows-Tasten zugeordnet (und den üblichen Alt-Tasten)"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Strg ist den Windows-Tasten zugeordnet (und den üblichen Strg-Tasten)"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl 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:999
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "Meta ist den Windows-Tasten zugeordnet"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "Meta ist der linken Windows-Taste zugeordnet"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper ist den Windows-Tasten zugeordnet"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1004
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Alt ist der rechten Windows-Taste zugeordnet und Super der Menü-Taste."
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Alt-Taste ist gegen Windows-Taste vertauscht"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Position der Compose-Taste"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "Dritte Ebene der linken Windows-Taste"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "Dritte Ebene der rechten Windows-Taste"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "Dritte Ebene der Menü-Taste"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "Dritte Ebene der linken Strg-Taste"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "Dritte Ebene der rechten Strg-Taste"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "Dritte Ebene der Feststelltaste"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "Dritte Ebene von &lt;Kleiner als/größer als&gt;"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pause"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "Druck"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Verschiedene Optionen zur Kompatibilität"
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Vorgegebene Nummernblocktasten"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1018
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:1017
-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:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "NumLock an: Ziffern, Umschalttaste wechselt zu Pfeiltasten, Numlock aus: immer Pfeiltasten (wie in MS Windows)"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1020
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:1019
+#: ../rules/base.xml.in.h:1021
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:1020
+#: ../rules/base.xml.in.h:1022
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:1021
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Umschalttaste deaktiviert Feststelltaste"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Typographische Sonderzeichen aktivieren"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Beide Umschalttasten gleichzeitig schalten CapsLock ein und aus"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1026
msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
msgstr "Beide Umschalttasten gleichzeitig schalten CapsLock ein, eine Umschalttaste deaktiviert"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Beide Umschalttasten gleichzeitig schalten ShiftLock ein und aus"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Umschalttaste + NumLock schaltet Tastaturmaus ein und aus"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1029
msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
msgstr "Erlauben, Grabs mit Tastaturaktionen abzubrechen (Achtung: Sicherheitsrisiko)"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "Protokollieren von Grabs und Baumansichtsaktionen erlauben"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "Währungssymbole zu verschiedenen Tasten hinzufügen"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Euro auf E"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Euro auf 2"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Euro auf 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Euro auf 5"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Rupie-Symbol auf 4"
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "Taste zum Wechsel in die fünfte Tastaturebene"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1038
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:1037
+#: ../rules/base.xml.in.h:1039
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:1038
+#: ../rules/base.xml.in.h:1040
msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Linke Windows-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:1039
+#: ../rules/base.xml.in.h:1041
msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Rechte Windows-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:1040
+#: ../rules/base.xml.in.h:1042
msgid "Using space key to input non-breakable space character"
msgstr "Leertaste zur Eingabe nicht umbrechbarer Zeichen verwenden"
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "Leertaste gibt in jeder Ebene stets Leerzeichen aus"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at second level"
msgstr "Nicht umbrechbares Leerzeichen in der zweiten Tastaturebene"
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene"
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1046
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:1045
+#: ../rules/base.xml.in.h:1047
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:1046
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene"
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1049
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:1048
+#: ../rules/base.xml.in.h:1050
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:1049
+#: ../rules/base.xml.in.h:1051
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:1050
+#: ../rules/base.xml.in.h:1052
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:1051
+#: ../rules/base.xml.in.h:1053
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:1052
+#: ../rules/base.xml.in.h:1054
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:1053
+#: ../rules/base.xml.in.h:1055
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:1054
+#: ../rules/base.xml.in.h:1056
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:1055
+#: ../rules/base.xml.in.h:1057
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:1056
+#: ../rules/base.xml.in.h:1058
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:1057
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Japanische Tastaturoptionen"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "Kana-Sperrtaste ist gesperrt"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "Löschtaste wie NICOLA-F"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Zenkaku Hankaku als zusätzliche Esc-Taste verwenden"
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Koreanische Hangul/Hanja-Tasten"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Hardware-Hangul/Hanja-Tasten"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Rechte Alt-Taste als Hangul, rechte Strg-Taste als Hanja"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Rechte Strg-Taste als Hangul, rechte Alt-Taste als Hanja"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "Zeichen mit Esperanto-Circumflex hinzufügen"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "Zur entsprechenden Taste einer Qwerty-Belegung."
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "Zur entsprechenden Taste einer Dvorak-Belegung."
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "Zur entsprechenden Taste einer Colemak-Belegung."
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1071
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Tastenkompatibilität mit veralteten Solaris-Tastencodes sicher stellen"
-#: ../rules/base.xml.in.h:1066
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Sun-Tastenkompatibilität"
-#: ../rules/base.xml.in.h:1067
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Tastenkombination zum erzwungenen Beenden des X-Servers"
-#: ../rules/base.xml.in.h:1068
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Strg + Alt + Löschtaste"
@@ -4068,251 +4092,258 @@ msgid "German (with Hungarian letters and no dead keys)"
msgstr "Deutsch (mit ungarischen Buchstaben, ohne Akzenttasten)"
#: ../rules/base.extras.xml.in.h:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Polnisch (Deutschland, ohne Akzenttasten)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Deutsch (Sun Typ 6/7)"
# http://www.adnw.de/
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Deutsch (Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "Avestisch"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Litauisch (US-Tastatur mit litauischen Buchstaben)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Litauisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Lettisch (US-Dvorak)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Lettisch (US-Dvorak, Y-Variante)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Lettisch (US-Dvorak, Minus-Variante)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Lettisch (Dvorak für Programmierer)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Lettisch (US-Dvorak für Programmierer, Y-Variante)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Lettisch (US-Dvorak für Programmierer, Minus-Variante)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Lettisch (US-Colemak)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Lettisch (US-Colemak, Apostroph-Variante)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Lettisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Englisch (USA international, AltGr-Unicode-Kombination)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Englisch (USA international, AltGr-Unicode-Kombination, alternativ)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "Atsina"
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Couer D'alene Salish"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "Tschechoslowakisch und Deutsch (US)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Englisch (USA, Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Englisch (Normannisch)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Polnisch (International, mit Akzenttasten)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Polnisch (Colemak)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Polnisch (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Krimtatarisch (Dobruja Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Rumänisch (ergonomische Bedienung)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Rumänisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Serbisch (Akzente kombinieren anstelle von Akzenttasten)"
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Kirchenslawisch"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Russisch (mit ukrainisch-weißrussischer Belegung)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Russische (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Armenisch (OLPC-phonetisch)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Hebräisch (Biblisch, SIL phonetisch)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Arabisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Belgisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Portugiesisch (Brasilien, Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "Tschechisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Dänisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Niederländisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Estnisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Finnisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Französisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Griechisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Italienisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Japanisch (Sun Typ 6)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Japanisch (Sun Typ 7 - PC-kompatibel)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Japanisch (Sun Typ 7 - Sun-kompatibel)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Norwegisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Portugiesisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Slowakisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Spanisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Schwedisch (Dvorak A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Schwedisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Deutsch (Schweiz, Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Französisch (Schweiz, Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Türkisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Ukrainisch (Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Englisch (Großbritannien, Sun Typ 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "Koreanisch (Sun Typ 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKEY (US-Tastaturbelegung mit europäischen Buchstaben)"
-#: ../rules/base.extras.xml.in.h:151
+#: ../rules/base.extras.xml.in.h:152
msgid "Mmuock"
msgstr "Mmuock"
+
+#~ msgid "Shift with numeric keypad keys works as in MS Windows"
+#~ msgstr "Umschalttaste funktioniert mit den Tasten des Nummernblocks wie in MS Windows"
diff --git a/xorg-server/xkeyboard-config/po/eo.po b/xorg-server/xkeyboard-config/po/eo.po
index ee7752d4f..3918f0f9b 100644
--- a/xorg-server/xkeyboard-config/po/eo.po
+++ b/xorg-server/xkeyboard-config/po/eo.po
@@ -1,21 +1,21 @@
# Esperanta traduko por 'xkeyboard-config'
-# Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 The Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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, 2013, 2014.
+# Felipe Castro <fefcas@gmail.com>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.11.99\n"
+"Project-Id-Version: xkeyboard-config 2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-05-18 00:11+0100\n"
-"PO-Revision-Date: 2014-06-03 11:56-0300\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-16 14:01-0300\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
"Language: eo\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.10\n"
#: ../rules/base.xml.in.h:1
msgid "Generic 101-key PC"
@@ -466,8 +466,8 @@ msgid "Memorex MX2750"
msgstr "Memorex MX2750"
#: ../rules/base.xml.in.h:113
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgid "Microsoft Natural Ergonomic Keyboard 4000"
+msgstr "Microsoft Natural Ergonomic Keyboard 4000"
#: ../rules/base.xml.in.h:114
msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
@@ -754,11 +754,11 @@ msgid "Htc Dream phone"
msgstr "Htc Dream - telefono"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "Angla (US)"
@@ -816,7 +816,7 @@ msgid "English (programmer Dvorak)"
msgstr "Angla (Dvorako por programistoj)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -849,7 +849,7 @@ 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:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -888,11 +888,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Uzbeka (Afganujo, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Araba"
@@ -934,11 +934,11 @@ msgid "Albanian (Plisi D1)"
msgstr "Albana (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Armena"
@@ -1014,11 +1014,11 @@ msgid "Belarusian (Latin)"
msgstr "Belorusa (Latina)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Belga"
@@ -1281,11 +1281,11 @@ msgid "Bosnian (US keyboard with Bosnian letters)"
msgstr "Bosna (usona klavaro kun bosnaj literoj)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Portugala (Brazilo)"
@@ -1369,11 +1369,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Berbera (Maroko, Tifinagh etendita fonetika)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Angla (Kameruno)"
@@ -1494,11 +1494,11 @@ msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Kroata (Usona klavaro kun kroataj literoj)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "Ĉeĥa"
@@ -1523,11 +1523,11 @@ 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:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Dana"
@@ -1552,11 +1552,11 @@ msgid "Danish (Dvorak)"
msgstr "Dana (Dvorako)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Nederlanda"
@@ -1582,11 +1582,11 @@ msgid "Dzongkha"
msgstr "Dzonka"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Estona"
@@ -1602,7 +1602,7 @@ msgstr "Estona (Dvorako)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Estona (Usona klavaro kun estonaj literoj)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Persa"
@@ -1665,11 +1665,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "Feroa (forigi senpaŝajn klavojn)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Finna"
@@ -1693,7 +1693,7 @@ msgstr "Norda Samea (Finlando)"
msgid "Finnish (Macintosh)"
msgstr "Finna (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Franca"
@@ -1929,11 +1929,11 @@ msgid "German (legacy)"
msgstr "Germana (malmoderna)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Greka"
@@ -2056,1920 +2056,1952 @@ msgid "Icelandic (eliminate dead keys)"
msgstr "Islanda (forigi senpaŝajn klavojn)"
#: ../rules/base.xml.in.h:551
+msgid "Icelandic (Macintosh, legacy)"
+msgstr "Islanda (Macintosh, malmoderna)"
+
+#: ../rules/base.xml.in.h:552
msgid "Icelandic (Macintosh)"
msgstr "Islanda (Macintosh)"
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
msgid "Icelandic (Dvorak)"
msgstr "Islanda (Dvorako)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:554 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "Hebrea"
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
msgid "Hebrew (lyx)"
msgstr "Hebrea (lyx)"
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
msgid "Hebrew (phonetic)"
msgstr "Hebrea (fonetika)"
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
msgid "Hebrew (Biblical, Tiro)"
msgstr "Hebrea (Biblia, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Itala"
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
msgid "Italian (eliminate dead keys)"
msgstr "Itala (forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
msgid "Italian (Winkeys)"
msgstr "Itala (WinKeys)"
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
msgid "Italian (Macintosh)"
msgstr "Itala (Macintosh)"
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
msgid "Italian (US keyboard with Italian letters)"
msgstr "Itala (usona klavaro kun italaj literoj)"
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
msgid "Georgian (Italy)"
msgstr "Kartvela (Italujo)"
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
msgid "Italian (IBM 142)"
msgstr "Itala (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "Japana"
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
msgid "Japanese (Kana)"
msgstr "Japana (Kanao)"
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
msgid "Japanese (Kana 86)"
msgstr "Japana (Kanao 86)"
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:574
msgid "Japanese (OADG 109A)"
msgstr "Japana (OADG 109A)"
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
msgid "Japanese (Macintosh)"
msgstr "Japana (Macintosh)"
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
msgid "Japanese (Dvorak)"
msgstr "Japana (Dvorako)"
#. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
msgid "ki"
msgstr "ki"
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
msgid "Kyrgyz"
msgstr "Kirgiza"
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
msgid "Kyrgyz (phonetic)"
msgstr "Kirgiza (fonetika)"
#. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:582
msgid "km"
msgstr "km"
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
msgid "Khmer (Cambodia)"
msgstr "Kmera (Kamboĝo)"
#. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
msgid "kk"
msgstr "kk"
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:586
msgid "Kazakh"
msgstr "Kazaĥa"
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
msgid "Russian (Kazakhstan, with Kazakh)"
msgstr "Rusa (Kazaĥujo, kun Kazaĥa)"
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:588
msgid "Kazakh (with Russian)"
msgstr "Kazaĥa (kun Rusa)"
#. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
msgid "lo"
msgstr "lo"
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
msgid "Lao"
msgstr "Lao"
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
msgid "Lao (STEA proposed standard layout)"
msgstr "Lao (norma aranĝo proponita de STEA)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
msgid "Spanish (Latin American)"
msgstr "Hispana (Latin-amerika)"
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
msgid "Spanish (Latin American, eliminate dead keys)"
msgstr "Hispana (Latin-amerika, forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
msgid "Spanish (Latin American, include dead tilde)"
msgstr "Hispana (Latin-amerika, inkluzive senpaŝa tildo)"
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
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:599 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Litova"
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
msgid "Lithuanian (standard)"
msgstr "Litova (norma)"
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
msgid "Lithuanian (US keyboard with Lithuanian letters)"
msgstr "Litova (Usona klavaro kun litovaj literoj)"
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
msgid "Lithuanian (IBM LST 1205-92)"
msgstr "Litova (IBM LST 1205-92)"
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
msgid "Lithuanian (LEKP)"
msgstr "Litova (LEKP)"
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
msgid "Lithuanian (LEKPa)"
msgstr "Litova (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:607 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Latva"
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
msgid "Latvian (apostrophe variant)"
msgstr "Latva (citila variaĵo)"
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
msgid "Latvian (tilde variant)"
msgstr "Latva (tilda variaĵo)"
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
msgid "Latvian (F variant)"
msgstr "Latva (variaĵo F)"
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
msgid "Latvian (modern)"
msgstr "Latva (moderna)"
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
msgid "Latvian (ergonomic, ŪGJRMV)"
msgstr "Latva (komforteca, ŪGJRMV)"
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
msgid "Latvian (adapted)"
msgstr "Latva (adaptita)"
#. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
msgid "mi"
msgstr "mi"
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
msgid "Maori"
msgstr "Maoria"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:619 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
msgid "Montenegrin"
msgstr "Montenegra"
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
msgid "Montenegrin (Cyrillic)"
msgstr "Montenegra (Cirila)"
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
msgstr "Montenegra (Cirila, ZE kaj ZHE interŝanĝitaj)"
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
msgid "Montenegrin (Latin Unicode)"
msgstr "Montenegra (Latina Unikodo)"
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
msgid "Montenegrin (Latin qwerty)"
msgstr "Montenegra (Latina qwerty)"
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
msgid "Montenegrin (Latin Unicode qwerty)"
msgstr "Montenegra (Latina Unikodo qwerty)"
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
msgid "Montenegrin (Cyrillic with guillemets)"
msgstr "Montenegra (Cirila kun angul-citiloj)"
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
msgid "Montenegrin (Latin with guillemets)"
msgstr "Montenegra (Latina kun angul-citiloj)"
#. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
msgid "mk"
msgstr "mk"
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
msgid "Macedonian"
msgstr "Makedona"
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
msgid "Macedonian (eliminate dead keys)"
msgstr "Makedona (forigi senpaŝajn klavojn)"
#. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
msgid "mt"
msgstr "mt"
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
msgid "Maltese"
msgstr "Malta"
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
msgid "Maltese (with US layout)"
msgstr "Malta (kun usona aranĝo)"
#. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
msgid "mn"
msgstr "mn"
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:639
msgid "Mongolian"
msgstr "Mongola"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:640 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Norvega"
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:643
msgid "Norwegian (eliminate dead keys)"
msgstr "Norvega (forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:644
msgid "Norwegian (Winkeys)"
msgstr "Norvega (Winkeys)"
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:645
msgid "Norwegian (Dvorak)"
msgstr "Norvega (Dvorako)"
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:646
msgid "Northern Saami (Norway)"
msgstr "Norda Samea (Norvegujo)"
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:647
msgid "Northern Saami (Norway, eliminate dead keys)"
msgstr "Norda Samea (Norvegujo, forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:648
msgid "Norwegian (Macintosh)"
msgstr "Norvega (Macintosh)"
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:649
msgid "Norwegian (Macintosh, eliminate dead keys)"
msgstr "Norvega (Macintosh, forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:650
msgid "Norwegian (Colemak)"
msgstr "Norvega (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:651 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "Pola"
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:654
msgid "Polish (legacy)"
msgstr "Pola (malmoderna)"
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:655
msgid "Polish (qwertz)"
msgstr "Pola (qwertz)"
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:656
msgid "Polish (Dvorak)"
msgstr "Pola (Dvorako)"
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:657
msgid "Polish (Dvorak, Polish quotes on quotemark key)"
msgstr "Pola (Dvorako, polaj citiloj ĉe citila klavo)"
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:658
msgid "Polish (Dvorak, Polish quotes on key 1)"
msgstr "Pola (Dvorako, polaj citiloj ĉe klavo 1)"
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:659
msgid "Kashubian"
msgstr "Kaŝuba"
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:660
msgid "Silesian"
msgstr "Silezia"
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:661
msgid "Russian (Poland, phonetic Dvorak)"
msgstr "Rusa (Polujo, fonetika Dvorako)"
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:662
msgid "Polish (programmer Dvorak)"
msgstr "Pola (Dvorako por programistoj)"
-#: ../rules/base.xml.in.h:662 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Portugala"
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:664
msgid "Portuguese (eliminate dead keys)"
msgstr "Portugala (forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:665
msgid "Portuguese (Sun dead keys)"
msgstr "Portugala (senpaŝaj klavoj de Sun)"
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:666
msgid "Portuguese (Macintosh)"
msgstr "Portugala (Macintosh)"
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:667
msgid "Portuguese (Macintosh, eliminate dead keys)"
msgstr "Portugala (Macintosh, forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:668
msgid "Portuguese (Macintosh, Sun dead keys)"
msgstr "Portugala (Macintosh, senpaŝaj klavoj de Sun)"
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:669
msgid "Portuguese (Nativo)"
msgstr "Portugala (Nativo)"
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:670
msgid "Portuguese (Nativo for US keyboards)"
msgstr "Portugala (Nativo por usonaj klavaroj)"
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:671
msgid "Esperanto (Portugal, Nativo)"
msgstr "Esperanto (Portugalujo, Nativo)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:672 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Rumana"
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:675
msgid "Romanian (cedilla)"
msgstr "Rumana (subhoko)"
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:676
msgid "Romanian (standard)"
msgstr "Rumana (norma)"
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:677
msgid "Romanian (standard cedilla)"
msgstr "Rumana (norma subhoko)"
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:678
msgid "Romanian (WinKeys)"
msgstr "Rumana (WinKeys)"
-#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Rusa"
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:680
msgid "Russian (phonetic)"
msgstr "Rusa (fonetika)"
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:681
msgid "Russian (phonetic WinKeys)"
msgstr "Rusa (fonetika WinKeys)"
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:682
msgid "Russian (typewriter)"
msgstr "Rusa (skribmaŝina)"
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:683
msgid "Russian (legacy)"
msgstr "Rusa (malmoderna)"
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:684
msgid "Russian (typewriter, legacy)"
msgstr "Rusa (skribmaŝina, malmoderna)"
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:685
msgid "Tatar"
msgstr "Tatara"
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:686
msgid "Ossetian (legacy)"
msgstr "Oseta (malmoderna)"
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:687
msgid "Ossetian (WinKeys)"
msgstr "Oseta (WinKeys)"
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:688
msgid "Chuvash"
msgstr "Ĉuvaŝa"
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:689
msgid "Chuvash (Latin)"
msgstr "Ĉuvaŝa (Latina)"
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:690
msgid "Udmurt"
msgstr "Udmurta"
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:691
msgid "Komi"
msgstr "Komia"
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:692
msgid "Yakut"
msgstr "Jakuta"
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:693
msgid "Kalmyk"
msgstr "Kalmyk"
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:694
msgid "Russian (DOS)"
msgstr "Rusa (DOS)"
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:695
msgid "Russian (Macintosh)"
msgstr "Rusa (Macintosh)"
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:696
msgid "Serbian (Russia)"
msgstr "Serba (Rusujo)"
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:697
msgid "Bashkirian"
msgstr "Baŝkira"
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:698
msgid "Mari"
msgstr "Maria"
-#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Rusa (fonetika azerty)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "Rusa (fonetika franca)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "Serba"
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Serba (Cirila, ZE kaj ZHE interŝanĝitaj)"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Serba (Latina)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "Serba (Latina Unikoda)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "Serba (Latina qwerty)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Serba (Latina Unikoda qwerty)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Serba (Cirila kun angul-citiloj)"
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "Serba (Latina kun angul-citiloj)"
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Panona Rusina"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Slovena"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "Slovena (kun angul-citiloj por citoj)"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
msgid "Slovenian (US keyboard with Slovenian letters)"
msgstr "Slovena (Usona klavaro kun slovenaj literoj)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:713 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "Slovaka"
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "Slovaka (etendita Retroklino)"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "Slovaka (qwerty)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Slovaka (qwerty, etendita Retroklino)"
-#: ../rules/base.xml.in.h:718 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "Hispana"
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "Hispana (forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Hispana (Winkeys)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Hispana (inkluzive senpaŝa tildo)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Hispana (senpaŝaj klavoj de Sun)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Hispana (Dvorako)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
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:725
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Kataluna (Hispanujo, kun centro-punktita L)"
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Hispana (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:728 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Sveda"
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "Sveda (forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Sveda (Dvorako)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "Rusa (Svedujo, fonetika)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Rusa (Svedujo, fonetika, forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Norda Samea (Svedujo)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Sveda (Macintosh)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Sveda (Svdvorak)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "Sveda gestlingvo"
-#: ../rules/base.xml.in.h:738 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Germana (Svislando)"
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Germana (Svislando, malmoderna)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Germana (Svislando, forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Germana (Svislando, senpaŝaj klavoj de Sun)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Franca (Svislando)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Franca (Svislando, forigi senpaŝajn klavojn)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Franca (Svislando, senpaŝaj klavoj de Sun)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Franca (Svislando, Macintosh)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Germana (Svislando, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Araba (Sirio)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Siria"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Siria (fonetika)"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kurda, (Sirio, Latina Q)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Kurda (Sirio, F)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Kurda (Sirio, Latina Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Taĝika"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Taĝika (malmoderna)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Sinhala (fonetika)"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tamila (Sri-lanko, Unikodo)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Tamila (Sri-lanko, Skribmaŝino TAB)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "Taja"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Taja (TIS-820.2538)"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Taja (Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Turka"
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Turka (F)"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Turka (Alt-Q)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Turka (senpaŝaj klavoj de Sun)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kurda (Turkujo, Latina Q)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "Kurda, (Turkujo, F)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Kurda (Turkujo, Latina Alt-Q)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
msgid "Turkish (international with dead keys)"
msgstr "Turka (internacia kun senpaŝaj klavoj)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:780 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Krime-tatara (Turka Q)"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Krime-tatara (Turka F)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Krime-tatara (Turka Alt-Q)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Tajvana"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Tajvana (indiĝena)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Saisiyat (Tajvano)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:790 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "Ukrajna"
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "Ukrajna (fonetika)"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "Ukrajna (skribmaŝino)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "Ukrajna (WinKeys)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "Ukrajna (malmoderna)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "Ukrajna (norma RSTU)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Rusa (Ukrajnujo, norma RSTU)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "Ukrajna (homofonia)"
-#: ../rules/base.xml.in.h:799 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Angla (UK)"
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Angla (UK, etenditaj WinKeys)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "Angla (UK, internacia kun senpaŝaj klavoj)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Angla (UK, Dvorako)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Angla (UK, Dvorako kun interpunkcio de UK)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Angla (UK, Macintosh)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "Angla (UK, internacia Macintosh)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "Angla (UK, Colemak)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Uzbeka"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Uzbeka (Latina)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Vjetnama"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:813 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "Korea"
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "Korea (kongrua al 101/104 klavoj)"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Japana (Serio PC-98xx)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Irlanda"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Irlanda (UnicodeExpert)"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Ogamo"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Ogamo (IS434)"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Urdua (Pakistano)"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdua (Pakistano, CRULP)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdua (Pakistano, NLA)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Araba (Pakistano)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Sinda"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Mahla"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Angla (Sud-Afriko)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
msgid "Esperanto (displaced semicolon and quote, obsolete)"
msgstr "Esperanto (translokitaj punktokomo kaj citilo, malaktuale)"
#. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Nepala"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Angla (Niĝerio)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Igbo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Joruba"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Amhara"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "Volofa"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Brajla"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Brajla (maldekstra mano)"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Brajla (dekstra mano)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Turkmena"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Turkmena (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Bambara"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Franca (Malio, alternativa)"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Angla (Malio , usona Macintosh)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Angla (Malio, usona internacia)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Svahila (Tanzanio)"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Svahila (Kenjo)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Kikuyu"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Cvana"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Filipina"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Filipina (QWERTY, Baybayin)"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Filipina (Capewell-Dvorako, Latina)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Filipina (Capewell-Dvorako, Baybayin)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Filipina (Capewell-QWERF 2006, Latina)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Filipina (Capewell-QWERF 2006, Baybayin)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Filipina (Colemak, latina)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Filipina (Colemak, Baybayin)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Filipina (Dvorako, latina)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Filipina (Dvorako Baybayin)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Moldava"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Moldava (Gagauz)"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Ni alternigas al alia aranĝo."
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Dekstra Alt (dum premata)"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Maldekstra Alt (dum premata)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Maldekstra Win (dum premata)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "Dekstra Win (dum premata)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "Iu ajn Win-klavo (dum premata)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
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:901
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Dekstra Ctrl (dum premata)"
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Dekstra Alt"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Maldekstra Alt"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Shift+Caps Lock"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
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:907
+#: ../rules/base.xml.in.h:910
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:908
+#: ../rules/base.xml.in.h:911
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:909
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+Caps Lock"
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Ambaŭ klavoj Shift kune"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Ambaŭ klavoj Alt kune"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Ambaŭ klavoj Ctrl kune"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Maldekstra Ctrl+maldekstra Shift"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Dekstra Ctrl+dekstra Shift"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Maldekstra Alt+maldekstra Shift"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+Space"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Menu"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Maldekstra Win"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "WinKey+Space"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Dekstra Win"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Maldekstra Shift"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Dekstra Shift"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Maldekstra Ctrl"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Dekstra Ctrl"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Ruluma Baskulo"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:932
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:930
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Klavo por elekti 3-an nivelon"
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "Iu ajn Win-klavo"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "Iu ajn klavo Alt"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Dekstra Alt, Shift+dekstra Alt estas Compose"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "Dekstra Alt neniam elektas la 3-an nivelon"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Enen-klavo en ciferklavaro"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Retroklino"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Malpli-signo/Pli-signo&gt;"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:941
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:939
+#: ../rules/base.xml.in.h:942
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:940
+#: ../rules/base.xml.in.h:943
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:941
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Pozicio de la klavo Ctrl"
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "Caps Lock kiel Ctrl"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Maldekstra Ctrl kiel Meta"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Permuti Ctrl kaj Caps Lock"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "Maldekstre de 'A'"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "Malsupre maldekstre"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Dekstra Ctrl kiel dekstran Alt"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menu kiel dekstran Ctrl"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Dekstra Alt kiel dekstran Ctrl"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Interŝanĝi la maldekstrajn klavojn Alt kun Ctrl"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Interŝanĝi la maldekstrajn klavojn Win kun Ctrl"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:955
+msgid "Swap Right Win key with Right Ctrl key"
+msgstr "Interŝanĝi la dekstrajn klavojn Win kun Ctrl"
+
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Maldekstra Alt kiel Ctrl, maldekstra Ctrl kiel Win, maldekstra Win kiel Alt"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:957
msgid "Use keyboard LED to show alternative layout"
msgstr "Uzi la LED de klavaro por indiki alternativan aranĝon"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "Num Lock"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Aranĝo de ciferklavaro"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Malmoderna"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Unikodaj aldonoj (sagoj kaj operaci-simboloj)"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:962
msgid "Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Unikodaj aldonoj (sagoj kaj operaci-simboloj; operaci-simboloj en la apriora nivelo)"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Malmoderna Wang 724"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:964
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:961
+#: ../rules/base.xml.in.h:965
msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Ciferklavaro Wang 724 kun Unikodaj aldonoj (sagoj kaj operaci-simboloj; operaci-simboloj en la apriora nivelo)"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Deksesume"
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "ATM/telefon-stilo"
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "Funkciado de la forig-klavo de la ciferklavaro"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with dot"
msgstr "Malmoderna klavo kun punkto"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Malmoderna klavo kun komo"
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Kvar-nivela klavo kun punkto"
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Kvar-nivela klavo kun punkto, limigite al Latin-9"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "Kvar-nivela klavo kun komo"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:975
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:974
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Kvar-nivela klavo kun abstraktaj apartigiloj"
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Punktokomo ĉe la 3-a nivelo"
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Funkciado de la klavo Caps Lock"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:981
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:978
+#: ../rules/base.xml.in.h:982
msgid "Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock"
msgstr "Caps Lock uzas internan uskligon; Shift ne influas Caps Lock"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:983
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:980
+#: ../rules/base.xml.in.h:984
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:981
+#: ../rules/base.xml.in.h:985
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "Caps Lock alternigas la ordinaran uskligon de alfabetaj signoj"
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "Igi Caps Lock kroman Num Lock"
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Permuti ESC kaj Caps Lock"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "Igi Caps Lock kroman ESC"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "Igi Caps Lock kroman Retroklavon"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "Igi Caps Lock kroman Super"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "Igi Caps Lock kroman Hyper"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "Caps Lock alternigas Shift (influante ĉiujn klavojn)"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "Caps Lock estas malebligita"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "Igi Caps Lock kroman Ctrl"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Alt/Win, klava funkciado"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "Aldoni laŭnorman funkciadon al la klavo Menu"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt kaj Meta estas ĉe la klavoj Alt"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt estas mapita al Win-klavoj (kaj al la kutimaj klavoj Alt)"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Ctrl estas mapita al Win-klavoj (kaj al la kutimaj klavoj Ctrl)"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Ctrl estas mapita al klavoj Alt, Alt estas mapita al Win-klavoj"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "Meta estas mapita al la Win-klavoj"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "Meta estas mapita al la maldekstra Win"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper estas mapita al Win-klavoj"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1004
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Alt estas mapita al la dekstra Win-klavo kaj Super al Menu"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Alt estas permutita kun Win"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Pozicio de la klavo Compose"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "3-a nivelo de maldekstra Win"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "3-a nivelo de dekstra Win"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "3-a nivelo de Menu"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "3-a nivelo de maldekstra Ctrl"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "3-a nivelo de dekstra Ctrl"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "3-a nivelo de Caps Lock"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "3-a nivelo de &lt;Malpli/Pli-signo&gt;"
# La klavo plej ofte estas markita "Pause".
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pause"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "PrtSc"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Ceteraj kongruaj opcioj"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Aprioraj klavoj en ciferklavaro"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1018
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:1015
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift funkcias kun la ciferklavaro same kiel en MS Windows"
+#: ../rules/base.xml.in.h:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "NumLock aktiva: ciferoj, Shift ŝanĝas al sag-klavoj, Numlock malaktiva: ĉiam sag-klavoj (kiel en MS Windows)"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1020
msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
msgstr "Shift ne nuligas Num Lock, sed elektas 3-an nivelon"
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1021
msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
msgstr "Specialaj klavoj (Ctrl+Alt+&lt;klavo&gt;) traktotas en servilo"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1022
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:1019
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Shift nuligas Caps Lock"
-#: ../rules/base.xml.in.h:1020
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Ebligi kromajn tipografiajn signojn"
-#: ../rules/base.xml.in.h:1021
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Ambaŭ klavoj Shift kune alternigas Caps Lock"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1026
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:1023
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Ambaŭ klavoj Shift kune alternigas ShiftLock"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Shift + NumLock alternigas PointerKeys"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1029
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:1026
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "Ebligi registradon de ŝlosoj kaj fenestro-arboj"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "Aldono de valut-signoj al iuj klavoj"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Eŭro-signo ĉe E"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Eŭro-signo ĉe 2"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Eŭro-signo ĉe 4"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Eŭro-signo ĉe 5"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Rupio ĉe 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "Klavo por elekti 5-an nivelon"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1038
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:1035
+#: ../rules/base.xml.in.h:1039
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:1036
+#: ../rules/base.xml.in.h:1040
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:1037
+#: ../rules/base.xml.in.h:1041
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:1038
+#: ../rules/base.xml.in.h:1042
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:1039
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "Kutima spaco-signo ĉe iu ajn nivelo"
-#: ../rules/base.xml.in.h:1040
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at second level"
msgstr "Ne-rompebla spaco-signo ĉe la 2-a nivelo"
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "Ne-rompebla spaco-signo ĉe la 3-a nivelo"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1046
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:1043
+#: ../rules/base.xml.in.h:1047
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:1044
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Ne-rompebla spaco-signo ĉe la 4-a nivelo"
-#: ../rules/base.xml.in.h:1045
+#: ../rules/base.xml.in.h:1049
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:1046
+#: ../rules/base.xml.in.h:1050
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:1047
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level"
msgstr "Nul-larĝa ne-kuniga signo ĉe dua nivelo"
-#: ../rules/base.xml.in.h:1048
+#: ../rules/base.xml.in.h:1052
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:1049
+#: ../rules/base.xml.in.h:1053
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:1050
+#: ../rules/base.xml.in.h:1054
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:1051
+#: ../rules/base.xml.in.h:1055
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:1052
+#: ../rules/base.xml.in.h:1056
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:1053
+#: ../rules/base.xml.in.h:1057
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:1054
+#: ../rules/base.xml.in.h:1058
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:1055
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Elektebloj de japana klavaro"
-#: ../rules/base.xml.in.h:1056
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "Kanaa klavo Lock ŝlosigas"
-#: ../rules/base.xml.in.h:1057
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "Retropaŝo laŭ estilo NICOLA-F"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Igi Zenkaku Hankaku kroman ESC"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Koreaj klavoj Hangul/Hanja"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Aparatara klavoj Hangul/Hanja"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Dekstra Alt kiel Hangul, dekstra Ctrl kiel Hanja"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Dekstra Ctrl kiel Hangul, dekstra Alt kiel Hanja"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "Aldono de Esperantaj literoj kun supersignoj"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "Al la ekvivalenta klavo en aranĝo Qwerty."
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "Al la ekvivalenta klavo en dvoraka aranĝo."
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "Al la ekvivalenta klavo en dvoraka aranĝo."
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1071
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Teni klav-kongrueco kun malnovaj klavkodoj de Solaris"
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Kongrueco kun klavoj de Sun"
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Klav-sekvo por formortigi la X-servilon"
-#: ../rules/base.xml.in.h:1066
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + Backspace"
@@ -4058,250 +4090,261 @@ 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:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Pola (Germanujo, forigi senpaŝajn klavojn)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Germana (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Germana (Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "Avesta"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Litova (usona Dvorako kun litovaj literoj)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Litova (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Latva (usona Dvorako)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Latva (usona Dvorako, variaĵo Y)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Latva (usona Dvorako, variaĵo minusa)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Latva (usona Dvorako por programistoj)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Latva (usona Dvorako por programistoj, variaĵo Y)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Latva (usona Dvorako por programistoj, variaĵo minusa)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Latva (usona Colemak)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Latva (usona Colemak, citila variaĵo)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Latva (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Angla (Usono, internacia AltGr-Unikoda kunmiksado)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Angla (Usono, internacia AltGr-Unikoda kunmiksado, alternativa)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "Atsina"
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Couer d'Alene Salish"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "Ĉeĥa slovaka kaj germana (US)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Angla (US, Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Angla (Norman)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Pola (internacia kun senpaŝaj klavoj)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Pola (Colemak)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Pola (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Krime-tatara (Dobruja Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Rumana (komforteca Touchtype)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Rumana (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Serba (kunmiksado de diakritaĵoj anstataŭ senpaŝaj klavoj)"
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Preĝeja slava"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Rusa (kun aranĝo ukrainia-belorusa)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Rusa (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Armena (fonetika OLPC)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Hebrea (Biblia, fonetika SIL)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Araba (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Belga (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Portugala (Brazilo, Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "Ĉeĥa (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Dana (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Nederlanda (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Estona (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Fina (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Franca (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Greka (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Itala (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Japana (Sun Tipo 6)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Japana (Sun Tipo 7 - kongrua kun pc)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Japana (Sun Tipo 7 - kongrua kun Sun)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Norvega (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Portugala (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Slovaka (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Hispana (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Sveda (Dvorako A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Sveda (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Germana (Svislando, Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Franca (Svislando, Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Turka (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Ukrajna (Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Angla (UK, Sun Tipo 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "Kore (Sun Tipo 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKEY (klavaro surbazita en Usono kun eŭropaj literoj)"
+#: ../rules/base.extras.xml.in.h:152
+msgid "Mmuock"
+msgstr "Mmuock"
+
+#~ msgid "Shift with numeric keypad keys works as in MS Windows"
+#~ msgstr "Shift funkcias kun la ciferklavaro same kiel en MS Windows"
+
#~ msgid "Bengali"
#~ msgstr "Bengala"
diff --git a/xorg-server/xkeyboard-config/po/fr.po b/xorg-server/xkeyboard-config/po/fr.po
index 2a5028281..10345ee27 100644
--- a/xorg-server/xkeyboard-config/po/fr.po
+++ b/xorg-server/xkeyboard-config/po/fr.po
@@ -5,21 +5,21 @@
# 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-2013
+# Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2011-2015
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.12.99\n"
+"Project-Id-Version: xkeyboard-config 2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-09-18 23:46+0100\n"
-"PO-Revision-Date: 2014-09-19 20:59+0200\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-18 21:29+0100\n"
"Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n>=2);\n"
#: ../rules/base.xml.in.h:1
msgid "Generic 101-key PC"
@@ -760,11 +760,11 @@ msgid "Htc Dream phone"
msgstr "Htc Dream"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "Anglais (US)"
@@ -826,7 +826,7 @@ msgid "English (programmer Dvorak)"
msgstr "Anglais (Dvorak pour programmeur)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -862,7 +862,7 @@ msgid "English (Workman, international with dead keys)"
msgstr "Anglais (Workman, international avec touches mortes)"
#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -902,11 +902,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Ouzbek (Afghanistan, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Arabe"
@@ -949,11 +949,11 @@ msgid "Albanian (Plisi D1)"
msgstr "Albanais (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Arménien"
@@ -1029,11 +1029,11 @@ msgid "Belarusian (Latin)"
msgstr "Biélorusse (latin)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Belge"
@@ -1309,11 +1309,11 @@ msgid "Bosnian (US keyboard with Bosnian letters)"
msgstr "Bosniaque (clavier US avec lettres bosniaques)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Portugais (Brésil)"
@@ -1399,12 +1399,12 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Berbère (Maroc, Tifinagh étendu phonétique)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
-#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Anglais (Cameroun)"
@@ -1527,11 +1527,11 @@ msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Croate (clavier US avec lettres croates)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "Tchèque"
@@ -1560,11 +1560,11 @@ 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:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Danois"
@@ -1589,11 +1589,11 @@ msgid "Danish (Dvorak)"
msgstr "Danois (Dvorak)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Néerlandais"
@@ -1619,11 +1619,11 @@ msgid "Dzongkha"
msgstr "Dzongkha"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Estonien"
@@ -1640,7 +1640,7 @@ 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:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Persan"
@@ -1703,11 +1703,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "Féroïen (sans touche morte)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Finnois"
@@ -1731,7 +1731,7 @@ msgstr "Sami du Nord (Finlande)"
msgid "Finnish (Macintosh)"
msgstr "Finnois (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Français"
@@ -1979,11 +1979,11 @@ msgid "German (legacy)"
msgstr "Allemand (obsolète)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Grec"
@@ -2121,11 +2121,11 @@ msgid "Icelandic (Dvorak)"
msgstr "Islandais (Dvorak)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "Hébreu"
@@ -2143,11 +2143,11 @@ msgid "Hebrew (Biblical, Tiro)"
msgstr "Hébreu (biblique, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Italien"
@@ -2177,11 +2177,11 @@ msgid "Italian (IBM 142)"
msgstr "Italien (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "Japonais"
@@ -2266,7 +2266,7 @@ msgid "Lao (STEA proposed standard layout)"
msgstr "Lao (disposition proposée par la STEA)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
@@ -2287,12 +2287,12 @@ 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:600 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Lituanien
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Lituanien"
@@ -2318,11 +2318,11 @@ msgid "Lithuanian (LEKPa)"
msgstr "Lituanien (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Letton"
@@ -2360,7 +2360,7 @@ msgid "Maori"
msgstr "Maori"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
@@ -2436,12 +2436,12 @@ msgid "Mongolian"
msgstr "Mongol"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Norv%C3%A9gien
-#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Norvégien"
@@ -2478,12 +2478,12 @@ msgid "Norwegian (Colemak)"
msgstr "Norvégien (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Polonais
-#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "Polonais"
@@ -2528,7 +2528,7 @@ msgstr "Russe (Pologne, Dvorak phonétique)"
msgid "Polish (programmer Dvorak)"
msgstr "Polonais (Dvorak pour le programmeur)"
-#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Portugais"
@@ -2566,12 +2566,12 @@ msgid "Esperanto (Portugal, Nativo)"
msgstr "Espéranto (Portugal, PT-Nativo)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Roumain
-#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Roumain"
@@ -2591,7 +2591,7 @@ msgstr "Roumain (standard, cédille)"
msgid "Romanian (WinKeys)"
msgstr "Roumain (touche Windows)"
-#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Russe"
@@ -2677,1422 +2677,1446 @@ msgstr "Bachkir"
msgid "Mari"
msgstr "Mari"
-#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Russe (azerty phonétique)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "Russe (français phonétique)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "Serbe"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Serbe (cyrillique, ZE et ZHE intervertis)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Serbe (Latin)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "Serbe (latin, Unicode)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "Serbe (latin, qwerty)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Serbe (latin, Unicode, qwerty)"
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Serbe (cyrillique avec guillemets)"
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "Serbe (Latin avec guillemets)"
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Ruthène pannonien"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Slov%C3%A8ne
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Slovène"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "Slovène (guillemets typographiques à la place des guillemets simples)"
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:714
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:714 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Slovaque
-#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "Slovaque"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "Slovaque (barre oblique inverse étendue)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "Slovaque (qwerty)"
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Slovaque (qwerty, barre oblique inverse étendue)"
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "Espagnol"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "Espagnol (sans touche morte)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Espagnol (touches Windows)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Espagnol (y compris la touche morte tilde)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Espagnol (touches mortes Sun)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Espagnol (Dvorak)"
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:727
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:726
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Catalan (Espagne, avec L point médian)"
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Espagnol (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Su%C3%A9dois
-#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Suédois"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "Suédois (sans touche morte)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Suédois (Dvorak)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "Russe (Suède, phonétique)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Russe (Suède, phonétique, sans touche morte)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Sami du Nord (Suède)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Suédois (Macintosh)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Suédois (Svdvorak)"
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "Langue des signes suédoise"
-#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Allemand (Suisse)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Allemand (Suisse, obsolète)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Allemand (Suisse, sans touche morte)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Allemand (Suisse, touches mortes Sun)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Français (Suisse)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Français (Suisse, sans touche morte)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Français (Suisse, touches mortes Sun)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Français (Suisse, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Allemand (Suisse, Macintosh)"
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Arabe (Syrie)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Syriaque
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Syriaque"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Syriaque (phonétique)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kurde (Syrie, Q latin)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Kurde (Syrie, F)"
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Kurde (Syrie, Alt-Q latin)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Tadjik
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Tadjik"
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Tadjik (obsolète)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Cingalais (phonétique)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tamoul (Sri Lanka, Unicode)"
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Tamoul (Sri Lanka, machine à écrire, TAB)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Tha%C3%AF_%28langue%29
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "Thaï"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Thaï (TIS-820.2538)"
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Thaï (Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Turc
-#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Turc"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Turc (F)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Turc (Alt-Q)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Turc (touches mortes Sun)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kurde (Turquie, Q latin)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "Kurde (Turquie, F)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Kurde (Turquie, Alt-Q latin)"
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:781
msgid "Turkish (international with dead keys)"
msgstr "Turc (international avec touches mortes)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Tatar de Crimée (Q turc)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Tatar de Crimée (F turc)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Tatar de Crimée (Alt-Q turc)"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Taïwanais"
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Taïwanais (indigène)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Saisiyat (Taïwan)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Ukrainien
-#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "Ukrainien"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "Ukrainien (phonétique)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "Ukrainien (machine à écrire)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "Ukrainien (touches Windows)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "Ukrainien (obsolète)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "Ukrainien (RSTU standard)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Russe (Ukraine, RSTU standard)"
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "Ukrainien (homophonique)"
-#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Anglais (Royaume-Uni)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Anglais (Royaume-Uni, touche Windows étendue)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "Anglais (Royaume-Uni, international, avec touches mortes)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Anglais (Royaume-Uni, Dvorak)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Anglais (Royaume-Uni, Dvorak, ponctuation britannique)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Anglais (Royaume-Uni, Macintosh)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "Anglais (Royaume-Uni, Macintosh international)"
# http://colemak.com/
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "Anglais (Royaume-Uni, Colemak)"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Ouzbek
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Ouzbek"
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Ouzbek (latin)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Vietnamien"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "Coréen"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "Coréen (compatible 101/104 touches)"
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Japonais (PC-98xx)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Irlandais"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "Cló Gaelach"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Irlandais (UnicodeExpert)"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Ogham (IS434)"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Ourdou
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Ourdou (Pakistan)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "Ourdou (Pakistan, CRULP)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "Ourdou (Pakistan, NLA)"
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Arabe (Pakistan)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Sindhi
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Sindhî"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Divehi"
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Anglais (Afrique du Sud)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Espéranto"
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:841
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:841
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
# https://secure.wikimedia.org/wikipedia/fr/wiki/N%C3%A9palais
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Népalais"
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Anglais (Nigeria)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Igbo
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Igbo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Yoruba
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Yoruba"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Amharique"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Wolof_%28langue%29
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "Wolof"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Braille"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Braille (main gauche)"
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Braille (main droite)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Turkm%C3%A8ne
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Turkmène"
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Turkmène (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Bambara"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Français (Mali, variante)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Anglais (Mali, Macintosh US)"
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Anglais (Mali, US international)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Swahili (Tanzanie)"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Swahili
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Swahili (Kenya)"
# Langue bantoue.
# https://secure.wikimedia.org/wikipedia/fr/wiki/Kikuyu_%28langue%29
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Kikuyu"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Tswana
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Tswana"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Filipino"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Filipino (baybayin, qwerty)"
# http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:885
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:884
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Filipino (Capewell-Dvorak, baybayin)"
# http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:887
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:886
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Filipino (Capewell-QWERF 2006, baybayin)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Filipino (Colemak, latin)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Filipino (Colemak, baybayin)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Filipino (Dvorak, latin)"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Baybayin
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Filipino (Dvorak, baybayin)"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Moldave"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
# https://fr.wikipedia.org/wiki/Gagaouze
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Moldave (Gagaouze)"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Passage à une autre disposition"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Alt droite (si enfoncé)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Alt gauche (si enfoncé)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Windows gauche (si enfoncé)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "Windows droite (si enfoncé)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "N'importe quelle touche Windows (enfoncée)"
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:903
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:902
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Ctrl droite (si enfoncé)"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Alt droite"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Alt gauche"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "Verr. maj."
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Maj.+ Verr. maj."
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:909
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:908
+#: ../rules/base.xml.in.h:910
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:909
+#: ../rules/base.xml.in.h:911
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:910
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+Verr. maj."
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Les deux Maj. ensemble"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Les deux Alt ensemble"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Les deux Ctrl ensemble"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl+Maj."
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Ctrl gauche+Maj. gauche"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Ctrl droite + Maj. droite"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Maj."
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Alt gauche+Maj. gauche"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+Espace"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Menu"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Touche Windows gauche"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "Windows+Espace"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Windows droite"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Maj. gauche"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Maj. droite"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Ctrl gauche"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Ctrl droite"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Arrêt défilement"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:932
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:931
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Touche sélectionnant le niveau 3"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "N'importe quelle touche Windows"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "N'importe quelle touche Alt"
# https://secure.wikimedia.org/wikipedia/fr/wiki/Touche_compose
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Alt droite, Maj. + Alt droite est la touche compose"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "Alt droite ne sélectionne jamais le niveau 3"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Entrée sur le pavé numérique"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Barre oblique inverse"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Plus petit/Plus grand&gt;"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:941
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:940
+#: ../rules/base.xml.in.h:942
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:941
+#: ../rules/base.xml.in.h:943
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:942
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Position de la touche Ctrl"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "Verr. maj. comme Ctrl"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Ctrl gauche comme Méta"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Intervertir Ctrl et Verr. maj."
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "À gauche du « A »"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "En bas à gauche"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Ctrl droite comme Alt droite"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menu comme Ctrl droite"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Alt droite comme Ctrl droite"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Échange Alt. gauche et Ctrl gauche"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Échange Win gauche et Ctrl gauche"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:955
msgid "Swap Right Win key with Right Ctrl key"
msgstr "Échange Win droite et Ctrl droite"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Alt. gauche pour Ctrl, Ctrl pour Win, Win gauche pour Alt."
# https://bugzilla.gnome.org/show_bug.cgi?id=518156
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:957
msgid "Use keyboard LED to show alternative layout"
msgstr "Utiliser les voyants du clavier pour indiquer une disposition alternative"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "Verr. Num."
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Disposition du pavé numérique"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Obsolète"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Ajouts Unicode (opérateurs mathématiques et flèches)"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:962
msgid "Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Ajouts Unicode (opérateurs mathématiques et flèches ; opérateurs mathématiques au niveau par défaut)"
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Wang 724 (clavier obsolète)"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:964
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:963
+#: ../rules/base.xml.in.h:965
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 ; opérateurs mathématiques au niveau par défaut)"
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Hexadécimal"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "Clavier de type téléphonique"
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "Comportement de la touche de Suppr. du pavé numérique"
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:969
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:969
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Touche obsolète avec virgule"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Touche à quatre niveaux avec point"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Touche à quatre niveaux avec point, Latin-9 uniquement"
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:974
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:973
+#: ../rules/base.xml.in.h:975
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:976
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Touche à quatre niveaux avec le séparateur décimal abstrait"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Point-virgule au niveau 3"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Comportement de la touche Verr. maj."
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:981
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:980
+#: ../rules/base.xml.in.h:982
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:981
+#: ../rules/base.xml.in.h:983
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:982
+#: ../rules/base.xml.in.h:984
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:983
+#: ../rules/base.xml.in.h:985
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:984
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "Faire de Verr. maj. un Verr. Num. supplémentaire"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Intervertir Échap. et Verr. maj."
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "Faire de Verr. maj. un Échap. supplémentaire."
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "Faire de Verr. maj. un Effacement. arriière supplémentaire."
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "Faire de Verr. maj. un Super supplémentaire."
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "Faire de Verr. maj. un Hyper supplémentaire"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "Verr. maj. bascule le blocage majuscule (affecte toutes les touches)"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "Verr. maj. est désactivé"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "Faire de Verr. maj. un Ctrl supplémentaire."
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Comportement des touches Alt et Windows"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "Ajouter du comportement standard à la touche Menu"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt et Meta sont sur les touches Alt"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt est placé sur les touches Windows (et les touches Alt habituelles)"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:999
msgid "Ctrl 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:998
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Ctrl est placé sur les touches Alt, Alt sur les touches Windows"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "Méta est placé sur les touches Windows"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "Méta est placé sur Windows gauche"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper est placé sur les touches Windows"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1004
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Alt est placé sur Windows droite, Super sur Menu"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Alt échangé avec Windows"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Position de la touche Compose"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "Niveau 3 de la touche Windows de gauche"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "Niveau 3 de la touche Windows de droite"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "Niveau 3 de menu"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "Niveau 3 de la touche Ctrl de gauche"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "Niveau 3 de la touche Ctrl de droite"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "Niveau 3 de Verr. Maj."
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "Niveau 3 de &lt;Plus petit/Plus grand&gt;"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pause"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "Impr. Écr."
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Diverses options de compatibilité"
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Touches du pavé numérique par défaut"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1018
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:1017
-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:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "Verr. maj. activé : chiffres ; maj. pour les flèches. Verr. maj. désactivé : flèches (comme Windows)"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1020
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:1019
+#: ../rules/base.xml.in.h:1021
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:1020
+#: ../rules/base.xml.in.h:1022
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:1021
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Maj. annule Verr. maj."
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Active des caractères typographiques supplémentaires"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Les deux touches Maj. activent ou désactivent Verr. maj."
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1026
msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
msgstr "Les deux touches Maj. activent le verrouillage majuscule, une le désactive"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Les deux touches Maj. activent ou désactivent le blocage majuscule"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Maj. + VerrNum bascule le contrôle souris au clavier (PointerKeys) "
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1029
msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
msgstr "Autorise des actions clavier à casser les captures (attention : faille de sécurité)"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "Autorise l'enregistrement des captures et arborescences de fenêtres"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "Ajout des signes monétaires sur certaines touches"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Euro sur le E"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Euro sur le 2"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Euro sur le 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Euro sur le 5"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Roupie sur le 4"
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "Touche sélectionnant le niveau 5"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1038
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:1037
+#: ../rules/base.xml.in.h:1039
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"
-#: ../rules/base.xml.in.h:1038
+#: ../rules/base.xml.in.h:1040
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:1039
+#: ../rules/base.xml.in.h:1041
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:1040
+#: ../rules/base.xml.in.h:1042
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:1041
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "L'espace habituelle quelque-soit le niveau"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at second level"
msgstr "Espace insécable au niveau 2"
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "Espace insécable au niveau 3"
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1046
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:1045
+#: ../rules/base.xml.in.h:1047
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:1046
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Espace insécable au niveau 4"
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1049
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:1048
+#: ../rules/base.xml.in.h:1050
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:1049
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level"
msgstr "Antiliant à chasse nulle au niveau 2"
-#: ../rules/base.xml.in.h:1050
+#: ../rules/base.xml.in.h:1052
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:1051
+#: ../rules/base.xml.in.h:1053
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:1052
+#: ../rules/base.xml.in.h:1054
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:1053
+#: ../rules/base.xml.in.h:1055
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:1054
+#: ../rules/base.xml.in.h:1056
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:1055
+#: ../rules/base.xml.in.h:1057
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:1056
+#: ../rules/base.xml.in.h:1058
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:1057
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Options des claviers japonais"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "La touche « verrouillage Kana » verrouille"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "Eff. Arr. du type NICOLA-F"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Faire du Zenkaku Hankaku un Échap. supplémentaire."
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Touches Hangeul/Hanja coréennes"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Touches Hangeul/Hanja matérielles"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Alt droite pour le Hangeul, Ctrl droite pour le Hanja"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Ctrl droite pour le Hangeul, Alt droite pour le Hanja"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "Ajout des lettres accentuées Espéranto"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "Vers la touche correspondante sur une disposition Qwerty."
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "Vers la touche correspondante sur une disposition Dvorak."
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "Vers la touche correspondante sur une disposition Dvorak."
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1071
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Rester compatible avec les anciens code clavier Solaris"
-#: ../rules/base.xml.in.h:1066
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Compatibilité avec les touches Sun"
-#: ../rules/base.xml.in.h:1067
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Séquence de touches pour tuer le serveur X"
-#: ../rules/base.xml.in.h:1068
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + Eff. arrière"
@@ -4186,263 +4210,270 @@ msgid "German (with Hungarian letters and no dead keys)"
msgstr "Allemand (avec les lettres hongroises, sans touche mortes)"
#: ../rules/base.extras.xml.in.h:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Polonais (Allemagne, sans touche morte)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Allemand (Sun type 6/7)"
# http://www.adnw.de/
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Allemand (Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "Avestique"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Lituanien (Dvorak US avec lettres lituaniennes)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Lituanien (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Letton (Dvorak US)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Letton (Dvorak US, variante Y)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Letton (Dvorak US, variante moins)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Letton (Dvorak pour le programmeur US)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Letton (Dvorak pour le programmeur US, variante Y)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Letton (Dvorak pour le programmeur US, variante moins)"
# http://colemak.com/
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Letton (Colemak US)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Letton (Colemak US, variante apostrophe)"
# http://colemak.com/
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Letton (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Anglais (US, international, AltGr combinatoire Unicode)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Anglais (US, international, AltGr combinatoire Unicode, variante)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
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:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Salish Cœur d'Alène"
# https://bugs.freedesktop.org/show_bug.cgi?id=47536
# https://fr.wikipedia.org/wiki/Tch%C3%A8que
# https://fr.wikipedia.org/wiki/Slovaque
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "Tchèque, slovaque et allemand (US)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Anglais (US, Sun type 6/7)"
# https://normanlayout.info/
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Anglais (Norman)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Polonais (international avec touches mortes)"
# http://colemak.com/
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Polonais (Colemak)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Polonais (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Tatar de Crimée (Q dobroudja)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Roumain (ergonomique dactylographique)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Roumain (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Serbe (accents combinatoires à la place des touches mortes)"
# https://fr.wikipedia.org/wiki/Langue_liturgique_slave
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Liturgique slave"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Russe (Ukrainien-Biélorusse)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Russe (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Arménien (phonétique OLPC)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Hébreu (biblique, SIL, phonétique)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Arabe (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Belge (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Portugais (Brésil, Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "Tchèque (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Danois (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Danois (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Estonien (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Finnois (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Français (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Grec (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Italien (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Japonais (Sun type 6)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Japonais (Sun type 7 - compatible PC)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Japonais (Sun type 7 - compatible Sun)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Norvégien (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Portugais (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Slovaque (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Espagnol (Sun type 6/7)"
# https://bugs.freedesktop.org/show_bug.cgi?id=71852
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Suédois (Dvorak A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Suédois (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Allemand (Suisse, Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Français (Suisse, Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Turc (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Ukrainien (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Anglais (Royaume-Uni, Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "Coréen (Sun type 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
# https://bugs.freedesktop.org/show_bug.cgi?id=31658
# http://eurkey.steffen.bruentjen.eu/
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKEY (clavier US avec lettres européennes)"
-#: ../rules/base.extras.xml.in.h:151
+#: ../rules/base.extras.xml.in.h:152
msgid "Mmuock"
msgstr "M'mock"
+
+#~ msgid "Shift with numeric keypad keys works as in MS Windows"
+#~ msgstr "Maj. avec le pavé numérique se comporte comme dans Windows"
diff --git a/xorg-server/xkeyboard-config/po/gl.po b/xorg-server/xkeyboard-config/po/gl.po
index f63977653..a038779d2 100644
--- a/xorg-server/xkeyboard-config/po/gl.po
+++ b/xorg-server/xkeyboard-config/po/gl.po
@@ -4,14 +4,13 @@
# Fran Diéguez <frandieguez@ubuntu.com>, 2010.
# Fran Dieguez <frandieguez@gnome.org>, 2012.
# Francisco Diéguez <frandieguez@ubuntu.com>, 2012.
-# Marcos Lans <marcoslansgarza@gmail.com>, 2014.
-#
+# Marcos Lans <marcoslansgarza@gmail.com>, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.11.99\n"
+"Project-Id-Version: xkeyboard-config 2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-05-18 00:11+0100\n"
-"PO-Revision-Date: 2014-05-29 21:42+0100\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-24 12:10+0100\n"
"Last-Translator: Marcos Lans <marcoslansgarza@gmail.com>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
"Language: gl\n"
@@ -19,9 +18,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
"X-Launchpad-Export-Date: 2014-04-23 20:24+0000\n"
-"X-Generator: Virtaal 0.7.0\n"
-"X-Poedit-Language: Galician\n"
#: ../rules/base.xml.in.h:1
msgid "Generic 101-key PC"
@@ -472,8 +470,8 @@ msgid "Memorex MX2750"
msgstr "Memorex MX2750"
#: ../rules/base.xml.in.h:113
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgid "Microsoft Natural Ergonomic Keyboard 4000"
+msgstr "Teclado 4000 ergonómico natural de Microsoft"
#: ../rules/base.xml.in.h:114
msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
@@ -760,11 +758,11 @@ msgid "Htc Dream phone"
msgstr "Teléfono Htc Dream"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "Inglés (EE. UU.)"
@@ -822,7 +820,7 @@ msgid "English (programmer Dvorak)"
msgstr "Inglés (Dvorak de programador)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -855,7 +853,7 @@ msgid "English (Workman, international with dead keys)"
msgstr "Inglés (Workman internacional con teclas mortas)"
#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -894,11 +892,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Uzbeco (Afganistán, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Árabe"
@@ -940,11 +938,11 @@ msgid "Albanian (Plisi D1)"
msgstr "Albanés (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Armenio"
@@ -1020,11 +1018,11 @@ msgid "Belarusian (Latin)"
msgstr "Bielorruso (latino)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Belga"
@@ -1287,11 +1285,11 @@ msgid "Bosnian (US keyboard with Bosnian letters)"
msgstr "Bosnio (teclado de EE. UU. con letras bosnias)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Portugués (Brasil)"
@@ -1375,11 +1373,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Bereber (Marrocos, tifinagh fonético estendido)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Inglés (Camerún)"
@@ -1500,11 +1498,11 @@ msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Croata (teclado de EE. UU. con letras croatas)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "Checo"
@@ -1529,11 +1527,11 @@ msgid "Czech (US Dvorak with CZ UCW support)"
msgstr "Checo (teclado Dvorak EE. UU. con soporte para UCW checo)"
#. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Danés"
@@ -1558,11 +1556,11 @@ msgid "Danish (Dvorak)"
msgstr "Danés (Dvorak)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Holandés"
@@ -1588,11 +1586,11 @@ msgid "Dzongkha"
msgstr "Dzongkha"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Estoniano"
@@ -1608,7 +1606,7 @@ msgstr "Estoniano (Dvorak)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Estonio (teclado EE. UU. con letras estonianas)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Persa"
@@ -1671,11 +1669,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "Faroés (eliminar teclas mortas)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Finlandés"
@@ -1699,7 +1697,7 @@ msgstr "Lapón do norte (Finlandia)"
msgid "Finnish (Macintosh)"
msgstr "Finlandés (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Francés"
@@ -1935,11 +1933,11 @@ msgid "German (legacy)"
msgstr "Alemán (herdado)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Grego"
@@ -2062,1919 +2060,1951 @@ msgid "Icelandic (eliminate dead keys)"
msgstr "Islandés (eliminar teclas mortas)"
#: ../rules/base.xml.in.h:551
+msgid "Icelandic (Macintosh, legacy)"
+msgstr "Islandés (Macintosh, herdado)"
+
+#: ../rules/base.xml.in.h:552
msgid "Icelandic (Macintosh)"
msgstr "Islandés (Macintosh)"
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
msgid "Icelandic (Dvorak)"
msgstr "Islandés (Dvorak)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:554 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "Hebreo"
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
msgid "Hebrew (lyx)"
msgstr "Hebreo (lyx)"
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
msgid "Hebrew (phonetic)"
msgstr "Hebreo (fonético)"
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
msgid "Hebrew (Biblical, Tiro)"
msgstr "Hebreo (bíblico, tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Italiano"
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
msgid "Italian (eliminate dead keys)"
msgstr "Italiano (eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
msgid "Italian (Winkeys)"
msgstr "Italiano (teclas Windows)"
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
msgid "Italian (Macintosh)"
msgstr "Italiano (Macintosh)"
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
msgid "Italian (US keyboard with Italian letters)"
msgstr "Italiano (teclado EE. UU. con letras italianas)"
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
msgid "Georgian (Italy)"
msgstr "Georgiano (Italia)"
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
msgid "Italian (IBM 142)"
msgstr "Italiano (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "Xaponés"
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
msgid "Japanese (Kana)"
msgstr "Xaponés (Kana)"
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
msgid "Japanese (Kana 86)"
msgstr "Xaponés (Kana 86)"
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:574
msgid "Japanese (OADG 109A)"
msgstr "Xaponés (OADG 109A)"
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
msgid "Japanese (Macintosh)"
msgstr "Xaponés (Macintosh)"
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
msgid "Japanese (Dvorak)"
msgstr "Xaponés (Dvorak)"
#. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
msgid "ki"
msgstr "ki"
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
msgid "Kyrgyz"
msgstr "Kirguí"
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
msgid "Kyrgyz (phonetic)"
msgstr "Kirguí (fonético)"
#. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:582
msgid "km"
msgstr "km"
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
msgid "Khmer (Cambodia)"
msgstr "Khmer (Camboia)"
#. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
msgid "kk"
msgstr "kk"
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:586
msgid "Kazakh"
msgstr "Kazajo"
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
msgid "Russian (Kazakhstan, with Kazakh)"
msgstr "Ruso (Kazajstán, con kazajo)"
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:588
msgid "Kazakh (with Russian)"
msgstr "Kazajo (con ruso)"
#. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
msgid "lo"
msgstr "lo"
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
msgid "Lao"
msgstr "Lao"
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
msgid "Lao (STEA proposed standard layout)"
msgstr "Lao (distribución proposta STEA estándar)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
msgid "Spanish (Latin American)"
msgstr "Español (latinoamericano)"
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
msgid "Spanish (Latin American, eliminate dead keys)"
msgstr "Español (latinoamericano, eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
msgid "Spanish (Latin American, include dead tilde)"
msgstr "Español (latinoamericano, incluír til morta)"
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
msgid "Spanish (Latin American, Sun dead keys)"
msgstr "Español (latinoamericano, teclas mortas de Sun)"
#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:599 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Lituano"
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
msgid "Lithuanian (standard)"
msgstr "Lituano (estándar)"
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
msgid "Lithuanian (US keyboard with Lithuanian letters)"
msgstr "Lituano (teclado de EE. UU. con letras lituanas)"
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
msgid "Lithuanian (IBM LST 1205-92)"
msgstr "Lituano (IBM LST 1205-92)"
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
msgid "Lithuanian (LEKP)"
msgstr "Lituano (LEKP)"
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
msgid "Lithuanian (LEKPa)"
msgstr "Lituano (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:607 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Letón"
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
msgid "Latvian (apostrophe variant)"
msgstr "Letón (variante con apóstrofo)"
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
msgid "Latvian (tilde variant)"
msgstr "Letón (variante virguliña)"
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
msgid "Latvian (F variant)"
msgstr "Letón (variante de letra F)"
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
msgid "Latvian (modern)"
msgstr "Letón (moderno)"
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
msgid "Latvian (ergonomic, ŪGJRMV)"
msgstr "Letón (ergonómico, ŪGJRMV)"
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
msgid "Latvian (adapted)"
msgstr "Letón (adaptado)"
#. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
msgid "mi"
msgstr "mi"
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
msgid "Maori"
msgstr "Maorí"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:619 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
msgid "Montenegrin"
msgstr "Montenegrino"
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
msgid "Montenegrin (Cyrillic)"
msgstr "Montenegrino (cirílico)"
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
msgstr "Montenegrino (cirílico, Z e ZHE trocados)"
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
msgid "Montenegrin (Latin Unicode)"
msgstr "Montenegrino (latino Unicode)"
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
msgid "Montenegrin (Latin qwerty)"
msgstr "Montenegrino (latino qwerty)"
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
msgid "Montenegrin (Latin Unicode qwerty)"
msgstr "Montenegrino (latino Unicode qwerty)"
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
msgid "Montenegrin (Cyrillic with guillemets)"
msgstr "Montenegrino (cirílico con guillemots)"
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
msgid "Montenegrin (Latin with guillemets)"
msgstr "Montenegrino (latino con guillemots)"
#. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
msgid "mk"
msgstr "mk"
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
msgid "Macedonian"
msgstr "Macedonio"
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
msgid "Macedonian (eliminate dead keys)"
msgstr "Macedonio (eliminar teclas mortas)"
#. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
msgid "mt"
msgstr "mt"
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
msgid "Maltese"
msgstr "Maltés"
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
msgid "Maltese (with US layout)"
msgstr "Maltés (con distribución para EE. UU.)"
#. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
msgid "mn"
msgstr "mn"
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:639
msgid "Mongolian"
msgstr "Mongol"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:640 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Noruego"
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:643
msgid "Norwegian (eliminate dead keys)"
msgstr "Noruego (eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:644
msgid "Norwegian (Winkeys)"
msgstr "Noruegués (teclas Windows)"
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:645
msgid "Norwegian (Dvorak)"
msgstr "Noruego (Dvorak)"
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:646
msgid "Northern Saami (Norway)"
msgstr "Lapón do norte (Noruega)"
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:647
msgid "Northern Saami (Norway, eliminate dead keys)"
msgstr "Lapón do norte (Noruego, eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:648
msgid "Norwegian (Macintosh)"
msgstr "Noruego (Macintosh)"
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:649
msgid "Norwegian (Macintosh, eliminate dead keys)"
msgstr "Noruego (Macintosh, eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:650
msgid "Norwegian (Colemak)"
msgstr "Noruegués (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:651 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "Polaco"
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:654
msgid "Polish (legacy)"
msgstr "Polaco (herdado)"
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:655
msgid "Polish (qwertz)"
msgstr "Polaco (qwertz)"
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:656
msgid "Polish (Dvorak)"
msgstr "Polaco (Dvorak)"
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:657
msgid "Polish (Dvorak, Polish quotes on quotemark key)"
msgstr "Polaco (Dvorak, comillas polacas na tecla de comillas)"
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:658
msgid "Polish (Dvorak, Polish quotes on key 1)"
msgstr "Polaco (Dvorak, comillas polacas na tecla 1)"
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:659
msgid "Kashubian"
msgstr "Casubio"
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:660
msgid "Silesian"
msgstr "Silesio"
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:661
msgid "Russian (Poland, phonetic Dvorak)"
msgstr "Ruso (Polonia, Dvorak fonético)"
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:662
msgid "Polish (programmer Dvorak)"
msgstr "Polaco (Dvorak de programador)"
-#: ../rules/base.xml.in.h:662 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Portugués"
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:664
msgid "Portuguese (eliminate dead keys)"
msgstr "Portugués (eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:665
msgid "Portuguese (Sun dead keys)"
msgstr "Portugués (teclas mortas de Sun)"
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:666
msgid "Portuguese (Macintosh)"
msgstr "Portugués (Macintosh)"
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:667
msgid "Portuguese (Macintosh, eliminate dead keys)"
msgstr "Portugués (Macintosh, eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:668
msgid "Portuguese (Macintosh, Sun dead keys)"
msgstr "Portugués (Macintosh, teclas mortas de Sun)"
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:669
msgid "Portuguese (Nativo)"
msgstr "Portugués (nativo)"
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:670
msgid "Portuguese (Nativo for US keyboards)"
msgstr "Portugués (nativo para teclados de EE. UU.)"
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:671
msgid "Esperanto (Portugal, Nativo)"
msgstr "Esperanto (Portugal, Nativo)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:672 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Rumano"
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:675
msgid "Romanian (cedilla)"
msgstr "Rumano (cedilla)"
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:676
msgid "Romanian (standard)"
msgstr "Rumano (estándar)"
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:677
msgid "Romanian (standard cedilla)"
msgstr "Rumano (cedilla estándar)"
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:678
msgid "Romanian (WinKeys)"
msgstr "Rumano (teclas Windows)"
-#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Ruso"
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:680
msgid "Russian (phonetic)"
msgstr "Ruso (fonético)"
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:681
msgid "Russian (phonetic WinKeys)"
msgstr "Ruso (fonético con teclas Windows)"
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:682
msgid "Russian (typewriter)"
msgstr "Ruso (máquina de escribir)"
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:683
msgid "Russian (legacy)"
msgstr "Ruso (herdado)"
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:684
msgid "Russian (typewriter, legacy)"
msgstr "Ruso (máquina de escribir, heredado)"
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:685
msgid "Tatar"
msgstr "Tatar"
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:686
msgid "Ossetian (legacy)"
msgstr "Osetio (herdado)"
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:687
msgid "Ossetian (WinKeys)"
msgstr "Osetio (teclas Windows)"
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:688
msgid "Chuvash"
msgstr "Chuvash"
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:689
msgid "Chuvash (Latin)"
msgstr "Cuvash (latino)"
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:690
msgid "Udmurt"
msgstr "Udmurto"
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:691
msgid "Komi"
msgstr "Komi"
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:692
msgid "Yakut"
msgstr "Yakuto"
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:693
msgid "Kalmyk"
msgstr "Calmuco"
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:694
msgid "Russian (DOS)"
msgstr "Ruso (DOS)"
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:695
msgid "Russian (Macintosh)"
msgstr "Ruso (Macintosh)"
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:696
msgid "Serbian (Russia)"
msgstr "Serbio (Rusia)"
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:697
msgid "Bashkirian"
msgstr "Bashkiriano"
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:698
msgid "Mari"
msgstr "Mari"
-#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Ruso (azerty fonético)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "Ruso (francés fonético)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "Serbio"
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Serbio (cirílico, Z e ZHE trocados)"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Serbio (latino)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "Serbio (latino Unicode)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "Serbio (latino qwerty)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Serbio (latino Unicode qwerty)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Montenegrino (cirílico con guillemots)"
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "Serbio (latino con guillemots)"
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Rusino de Panonia"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Esloveno"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "Esloveno (con comiñas para citas)"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
msgid "Slovenian (US keyboard with Slovenian letters)"
msgstr "Esloveno (teclado EE. UU. con letras eslovenas)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:713 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "Eslovaco"
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "Eslovaco (contrabarra estendida)"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "Eslovaco (qwerty)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Eslovaco (qwerty, contrabarra estendida)"
-#: ../rules/base.xml.in.h:718 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "Español"
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "Español (eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Español (tecla Windows)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Español (incluír til morta)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Español (teclas mortas de Sun)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Español (Dvorak)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
msgstr "Asturiano (español, con H de medio punto e L de medio punto)"
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Catalán (español, con L de medio punto)"
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Español (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:728 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Sueco"
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "Sueco (eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Sueco (Dvorak)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "Ruso (sueco, fonético)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Ruso (sueco, fonético, eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Lapón do norte (Suecia)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Sueco (Macintosh)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Sueco (Svdvorak)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "Lingua de signos sueco"
-#: ../rules/base.xml.in.h:738 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Alemán (Suíza)"
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Alemán (Suíza, herdado)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Alemán (Suíza, eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Alemán (Suíza, teclas mortas de Sun)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Francés (Suíza)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Francés (Suíza, eliminar teclas mortas)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Francés (Suíza, teclas mortas de Sun)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Francés (Suíza, Macintosh)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Alemán (Suíza, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Árabe (Siria)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Sirio"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Sirio (fonético)"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kurdo (Siria, latino Q)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Kurdo (Siria, F)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Kurdo (Siria, latino Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Taxico"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Taxico (herdado)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Cingalés (fonético)"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tamil (Sri Lanka, Unicode)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Tamil (Sri Lanka, máquina de escribir TAB)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "Tailandés"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Tailandés (TIS-820.2538)"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Tailandés (Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Turco"
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Turco (F)"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Turco (Alt-Q)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Turco (teclas mortas de Sun)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kurdo (Turquía, latino Q)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "Kurdo (Turquía, F)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Kurdo (Turquía, latino Alt-Q)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
msgid "Turkish (international with dead keys)"
msgstr "Turco (internacional con teclas mortas)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:780 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Tártaro de Crimea (turco Q)"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Tártaro de Crimea (turco F)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Tártaro de Crimea (turco Alt-Q)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Taiwanés"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Taiwanés (autóctono)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Saisiyat (Taiwán)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:790 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "Ucraíno"
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "Ucraíno (fonético)"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "Ucraíno (máquina de escribir)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "Ucraíno (teclas Windows)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "Ucraíno (herdado)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "Ucraíno (estándar RSTU)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Ruso (Ucraíno estándar RSTU)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "Ucraíno (homofónico)"
-#: ../rules/base.xml.in.h:799 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Inglés (RU)"
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Inglés (UK, estendido con teclas Windows)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "Inglés (RU, internacional con teclas mortas)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Inglés (RU, Dvorak)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Inglés (RU, Dvorak con puntuación para RU)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Inglés (RU, Macintosh)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "Inglés (RU, Macintosh internacional)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "Inglés (RU, Colemark)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Uzbeco"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Uzbeco (latino)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Vietnamita"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:813 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "Coreano"
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "Coreano (101/104 teclas compatíbeis)"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Xaponés (PC-98xx Series)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Irlandés"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Irlandés (UnicodeExperto)"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Ogam (IS434)"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Urdú (Paquistán)"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdú (Paquistán, CRULP)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdú (Paquistán, NLA)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Árabe (Paquistán)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Sindhi"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Dhivehi"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Inglés (Sudáfrica)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
msgid "Esperanto (displaced semicolon and quote, obsolete)"
msgstr "Estoniano (punto e coma e comiña desprazadas, obsoleto)"
#. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Nepalí"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Inglés (Nixeria)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Igbo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Yoruba"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Amharico"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "Wolof"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Braille"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Braille (zurdo)"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Braille (destro)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Turkmenistano"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Turkmenistano (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Bambara"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Francés (Malí, alternativa)"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Inglés (Malí, Macintosh de EE. UU.)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Inglés (Malí, EE. UU. internacional)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Swahili (Tanzania)"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Swahili (Kenia)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Kikuyu"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Tswana"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Filipino"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Filipino (QWERTY baybayin)"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Filipino (Capewell-Dvorak latino)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Filipino (Capewell-Dvorak baybayin)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Filipino (Capewell-QWERF 2006 latino)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Filipino (Capewell-QWERF 2006 baybayin)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Filipino (Colemak latino)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Filipino (Colemak baybayin)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Filipino (Dvorak latino)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Filipino (Dvorak baybayin)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Moldavo"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Moldavo (Gagauz)"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Cambiando a outra disposición"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Alt dereito (mentres está premido)"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Alt esquerda (mentres está premida)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Tecla Windows esquerda (ao premela)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "A tecla Windows (mentres está premida)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "Calquera tecla Windows (ao pulsala)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
msgstr "Bloqueo de maiúsculas (ao pulsarse), Alt+Bloq Maiús realiza a acción orixinal de bloqueo de maiúsculas"
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Ctrl dereito (mentres está premido)"
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Alt dereito"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Alt esquerda"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "Bloqueo de maiúsculas"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Maiús+BloqMaiús"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
msgstr "Bloqueo de maiúsculas (á primeira disposición), Maiús+Bloq Maiús (á última disposición)"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
msgstr "Win esquerda (á primeira disposición), Win/Menu dereita (á última disposición)"
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
msgstr "Ctrl esquerda (á primeira disposición), Ctrl dereita (á última disposición)"
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+Bloq Maiús"
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Ámbalas teclas «Maiús» xuntas"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Ámbalas teclas Alt xuntas"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Ámbalas teclas Ctrl xuntas"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl+Maiús"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Ctrl esquerda + Maiús esquerda"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Ctrl dereito + Maiús dereito"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Maiús"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Alt esquerda + Maiús. esquerda"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+Espazo"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Menu"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Win esquerda"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "Tecla Win+Espazo"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Windows dereito"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Maiús esquerda"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Maiús dereito"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Ctrl esquerda"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Ctrl dereito"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Bloq Despl"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:932
msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
msgstr "Ctrl esquerda + Ctrl dereito (á primeira disposición), Ctrl dereita + Menú(á última disposición)"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Tecla para seleccionar o 3º nivel"
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "Calquera tecla Windows"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "Calquera tecla Alt"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "A tecla Alt dereita, Maiús+Alt dereita e tecla Compose"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "A tecla Alt dereita nunca elixe o 3º nivel"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Intro no teclado numérico"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Contrabarra"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Menor que/Maior que&gt;"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:941
msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "Bloq Maiús escolle o 3º nivel, actúa como un bloqueo dunha vez ao premelo xunto con outro selector de 3º nivel"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:942
msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "Contra barra selecciona o 3º nivel, bloquea ao premerse xunto con outro selector de 3º nivel"
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:943
msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "&lt;Menor que/Maior que&gt; elixe o 3º nivel, actúa como un bloqueo unitario ao premerse xunto con outro selector de 3º nivel"
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Posición da tecla Ctrl"
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "Bloq Maiús como Ctrl"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Ctrl esquerdo como Meta"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Intercambiar Ctrl e Bloq Maiús"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "Á esquerda do «A»"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "Na parte inferior esquerda"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Ctrl dereito como Alt dereito"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menú como Ctrl dereito"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Alt dereito como Ctrl dereito"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Trocar Alt esquerda con Ctrl esquerda"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Trocar Win esquerda con Ctrl esquerda"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:955
+msgid "Swap Right Win key with Right Ctrl key"
+msgstr "Trocar tecla Win dereita por tecla Ctrl dereita"
+
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Alt esquerda como Ctrl, Ctrl esquerda com Win, Win esquerda como ALt"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:957
msgid "Use keyboard LED to show alternative layout"
msgstr "Usar o LED do teclado para mostrar a disposición alternativa"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "Bloq Num"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Disposición do teclado numérico"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Herdado"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Adicións unicode (frechas e operadores matemáticos)"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:962
msgid "Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Adicións unicode (frechas e operadores matemáticos); operadores matemáticos no nivel predeterminado"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Wang 724 herdado"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:964
msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
msgstr "Teclado numérico Wang 724 con adicións Unicode (frechas e operadores matemáticos)"
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:965
msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Teclado numérico Wang 724 con adicións Unicode (frechas e operadores matemáticos); operadores matemáticos no nivel predeterminado"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Hexadecimal"
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "Caixeiro automático/estilo teléfono"
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "Comportamento da tecla Supr do teclado numérico"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with dot"
msgstr "Tecla herdada con punto"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Tecla herdada con coma"
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Tecla de cuarto nivel con punto"
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Tecla de cuarto nivel con punto, restrición latin-9"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "Tecla de cuarto nivel con coma"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:975
msgid "Four-level key with momayyez"
msgstr "Tecla de cuarto nivel con momayyez"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Tecla de cuarto nivel con separadores abstractos"
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Punto e coma no terceiro nivel"
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Comportamento da tecla Bloq. Maiús."
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:981
msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
msgstr "Bloq Maiús usa a capitalización interna; Maiús «suspende» o Bloq Maiús"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:982
msgid "Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock"
msgstr "Bloq Maiús usa a capitalización interna; Maiús non afecta a Bloq Maiús"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:983
msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
msgstr "Bloq Maiús actúa como Maiús con bloqueo; Maiús «suspende» Bloq Maiús"
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:984
msgid "Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock"
msgstr "Bloq Maiús actúa como Maiús con bloqueo; Maiús non afecta ao Bloq Maiús"
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:985
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "Bloq Maiús cambia a capitalización normal dos caracteres alfabéticos"
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "Facer de Bloq Maiús un Bloq Num adicional"
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Intercambiar ESC e Bloq Maiús"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "Facer de Bloq Maiús un Esc adicional"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "Facer de Bloq Maiús un Retroceso adicional"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "Facer de Bloq Maiús un Super adicional"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "Facer de Bloq Maiús un Hyper adicional"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "Bloq Maiús cambia a Maiús con bloqueo (afecta a todas as teclas)"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "Bloq Maiús está desactivado"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "Facer de Bloq Maiús un Ctrl adicional"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Comportamento da tecla Alt/Windows"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "Engadir o comportamiento estándar á tecla Menú."
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt e Meta están nas teclas Alt"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt asígnase ás teclas Win (e as teclas Alt usuais)"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Control asígnase ás teclas Win (e as teclas Ctrl usuais)"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Control está asignada ás teclas Alt, Alt está asingado ás teclas Win"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "Meta está asignada ás teclas Windows"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "Meta está asignada á tecla Windows esquerda"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper está asignada ás teclas Windows"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1004
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Alt está asignada á tecla Windows dereita e Super a tecla Menú"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Alt está cambiada con Win"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Posición da tecla Compose"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "3º nivel da Win esquerda"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "3º nivel da Win dereita"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "3º nivel do menú"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "3º nivel da Ctrl esquerda"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "3º nivel da Ctrl dereita"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "3º nivel do Bloq Maiús"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "3º nivel do &lt;Menor/Maior&gt;"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pausa"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "PrtSc"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Opcións varias de compatiblidade"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Teclas do teclado numérico por omisión"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1018
msgid "Numeric keypad keys always enter digits (as in Mac OS)"
msgstr "As teclas do teclado numérico sempre escriben díxitos (como en Mac OS)"
-#: ../rules/base.xml.in.h:1015
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Maiús coas teclas do teclado numérico funcionan como en MS Windows"
+#: ../rules/base.xml.in.h:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "Bloq. Num. activo: díxitos, Maiús. cambia a teclas de frechas, Bloq. Num. inactivo: sempre teclas de frechas (como en MS Windows)"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1020
msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
msgstr "Maiús non cancela Bloq Num, no seu lugar elixe o 3er nivel"
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1021
msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
msgstr "Teclas especiais (Ctrl+Alt+«tecla») manipuladas nun servidor"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1022
msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
msgstr "Teclado de aluminio de Apple: emular teclas PC (Imprimir, Bloq Despl, Pausa, Bloq Núm)"
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Maiús cancela BloqMaiús"
-#: ../rules/base.xml.in.h:1020
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Activar caracteres tipográficos adicionais"
-#: ../rules/base.xml.in.h:1021
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Ambas as teclas «Maiús» xuntas cambian o Bloqueo de maiúsculas"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1026
msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
msgstr "Ambas as teclas Maiús xuntas activan o Bloq Maiús, unha tecla Maiús desactívao"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Ambas as teclas Maiús xuntas activan Maiús con bloqueo"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Maiús + Bloqueo numérico cambia a teclas do punteiro"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1029
msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
msgstr "Permitir que accións do teclado liberen as capturas (aviso: risco de seguranza)"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "Permitir captura e rexistro da árbore de xanelas"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "Engadir o símbolo de divisa a certas teclas"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Euro no E"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Euro no 2"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Euro no 4"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Euro no 5"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Rupia no 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "Tecla para seleccionar o 5º nivel"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1038
msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "&lt;Menor que/Maior que&gt; elixe o 5º nivel, actúa como un bloqueo unitario ao premerse xunto con outro selector de 5º nivel"
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1039
msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Alt dereita elixe o 5º nivel, bloquea ao premerse xunto con outro selector de 5º nivel"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1040
msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Win esquerda elixe o 5º nivel, bloquea ao premerse xunto con outro selector de 5º nivel"
-#: ../rules/base.xml.in.h:1037
+#: ../rules/base.xml.in.h:1041
msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Win dereita elixe o 5º nivel, bloquea ao premerse xunto con outro selector de 5º nivel"
-#: ../rules/base.xml.in.h:1038
+#: ../rules/base.xml.in.h:1042
msgid "Using space key to input non-breakable space character"
msgstr "Usando a tecla espazo para introducir un carácter de espazo non separábel"
-#: ../rules/base.xml.in.h:1039
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "Espacio usual en calquera nivel"
-#: ../rules/base.xml.in.h:1040
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at second level"
msgstr "Carácter de espazo non separábel no segundo nivel"
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "Carácter de espazo non separábel no terceiro nivel"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1046
msgid "Non-breakable space character at third level, nothing at fourth level"
msgstr "Carácter de espazo non separábel no terceiro nivel, nada no cuarto nivel"
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1047
msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
msgstr "Carácter de espazo non separábel no terceiro nivel, carácter de espazo estreito non separábel no cuarto nivel"
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Carácter de espazo non separábel no cuarto nivel"
-#: ../rules/base.xml.in.h:1045
+#: ../rules/base.xml.in.h:1049
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
msgstr "Carácter de espazo non separábel no cuarto nivel, carácter de espacio estreito non separábel no sexto nivel"
-#: ../rules/base.xml.in.h:1046
+#: ../rules/base.xml.in.h:1050
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
msgstr "Carácter de espazo non separábel no cuarto nivel, carácter de espazo estreito non separábel o sexto nivel (a través de Ctrl+Maiús)"
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level"
msgstr "Carácer de espazo irrompíbel de anchura cero («ZWNJ») no segundo nivel"
-#: ../rules/base.xml.in.h:1048
+#: ../rules/base.xml.in.h:1052
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
msgstr "Carácer de espazo irrompíbel de anchura cero («ZWNJ») no segundo nivel, carácter de espazo de anchura cero rompíbel («ZWJ») no terceiro nivel"
-#: ../rules/base.xml.in.h:1049
+#: ../rules/base.xml.in.h:1053
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ácer de espazo irrompíbel de anchura cero («ZWNJ») no segundo nivel, carácter de espazo de anchura cero rompíbel («ZWJ») no terceiro nivel, caracter de espazo non separábel no cuarto nivel"
-#: ../rules/base.xml.in.h:1050
+#: ../rules/base.xml.in.h:1054
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
msgstr "Carácer de espazo irrompíbel de anchura cero («ZWNJ») no segundo nivel, carácter de espazo non separábel no terceiro nivel"
-#: ../rules/base.xml.in.h:1051
+#: ../rules/base.xml.in.h:1055
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
msgstr "Carácer de espazo irrompíbel de anchura cero («ZWNJ») no segundo nivel, carácter de espazo non separábel no terceiro nivel, nada no cuarto nivel"
-#: ../rules/base.xml.in.h:1052
+#: ../rules/base.xml.in.h:1056
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 de espazo irrompíbel de anchura cero («ZWNJ») no segundo nivel, carácter de espazo non separábel no terceiro nivel, espazo de anchura cero rompíbel («ZWJ») no cuarto nivel"
-#: ../rules/base.xml.in.h:1053
+#: ../rules/base.xml.in.h:1057
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ácer de espazo irrompíbel de anchura cero («ZWNJ») no segundo nivel, carácter de espazo non separábel no terceiro nivel, espazo estreito non separábel no cuarto nivel"
-#: ../rules/base.xml.in.h:1054
+#: ../rules/base.xml.in.h:1058
msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
msgstr "Carácer de espazo irrompíbel de anchura cero («ZWNJ») no terceiro nivel, carácter de anchura cero rompíbel («ZWJ») no cuarto nivel"
-#: ../rules/base.xml.in.h:1055
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Opcións de teclado xaponés"
-#: ../rules/base.xml.in.h:1056
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "A tecla Bloq Kana está bloqueando"
-#: ../rules/base.xml.in.h:1057
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "Retroceso estilo NICOLA-F"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Facer Zenkaku Hankaku un ESC adicional"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Coreano teclas Hangul/Hania"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Hardware teclas Hangul/Hania"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Alt dereito como Hangul, Ctrl dereito como Hania"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Ctrl dereito como Hangul, Alt dereito como Hania"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "Engadir as letras acentuadas do esperanto"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "Á tecla correspondente nunha disposición Qwerty."
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "Á tecla correspondente nunha disposición Dvorak."
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "Á tecla correspondente nunha disposición Colemak."
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1071
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Manter a compatibilidade das teclas cos códigos de teclas antigos de Solaris"
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Compatibilidade coas teclas de Sun"
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Secuencia de teclas para matar o servidor X"
-#: ../rules/base.xml.in.h:1066
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Control + Alt + Retroceso"
@@ -4063,250 +4093,261 @@ msgid "German (with Hungarian letters and no dead keys)"
msgstr "Alemán (con letras húngaras e sen teclas mortas)"
#: ../rules/base.extras.xml.in.h:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Polaco (Alemaña, eliminar teclas mortas)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Alemán (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Alemán (Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "Avestán"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Lituano (Dvorak de EE. UU. con letras lituanas)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Lituano (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Letón (Dvorak de EE. UU.)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Letón (Dvorak de EE. UU., variante Y)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Letón (Dvorak de EE. UU., variante menos)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Letón (programador, Dvorak de EE. UU.)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Letón (programador, Dvorak de EE. UU., variante Y)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Letón (programador, Dvorak de EE. UU., variante menos)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Letón (Colemark RU)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Letón (Colemark de RU, variante con apóstrofo)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Letón (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Inglés (EE. UU., internacional combinando AltGr Unicode)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Inglés (EE. UU., internacional combinando AltGr Unicode, alternativa)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "Atsina"
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Coeur d’Alene salish"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "Checo Eslovaco e Alemán (US)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Inglés (USA, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Inglés (Norman)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Polaco (internacional con teclas mortas)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Polaco (Colemark)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Polaco (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Tártaro de Crimea (Dobruca Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Rumanía (tipo de pulsación ergonómica)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Romanés (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Serbio (combinar tiles no lugar de teclas mortas)"
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Idioma da Igrexa eslavona"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Ruso (con distribución ucraína e bielorrusa)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Ruso (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Armenio (OLPC fonético)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Hebreo (bíblico, SIL fonético)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Árabe (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Belga (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Portugués (Brasil, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "Checo (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Danés (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Holandés (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Estoniano (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Finés (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Francés (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Grego (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Italiano (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Xaponés (Sun Type 6)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Xaponés (Sun Type 7 - pc compatíbel)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Xaponés (Sun Type 7 - sun compatíbel)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Noruegués (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Portugués (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Eslovaco (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Español (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Sueco (Dvorak A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Sueco (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Alemán (Suíza, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Francés (Suíza, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Turco (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Ucraíno (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Inglés (R.U, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "Coreano (Sun Type 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKEY (disposición tipo US con letras europeas)"
+#: ../rules/base.extras.xml.in.h:152
+msgid "Mmuock"
+msgstr "Mmuock"
+
+#~ msgid "Shift with numeric keypad keys works as in MS Windows"
+#~ msgstr "Maiús coas teclas do teclado numérico funcionan como en MS Windows"
+
#~ msgid "Bengali"
#~ msgstr "Bengalí"
diff --git a/xorg-server/xkeyboard-config/po/hu.po b/xorg-server/xkeyboard-config/po/hu.po
index c84ca9725..6b5f47b14 100644
--- a/xorg-server/xkeyboard-config/po/hu.po
+++ b/xorg-server/xkeyboard-config/po/hu.po
@@ -1,17 +1,17 @@
# Hungarian translation for xkeyboard-config
-# Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. Free Software Foundation, Inc.
# This file is distributed under the same license as the xkeyboard-config package.
#
# Andras Timar <timar@fsf.hu>, 2004.
-# Szilveszter Farkas <Szilveszter.Farkas@gmail.com>, 2006.
+# Szilveszter Farkas <szilveszter.farkas@gmail.com>, 2006.
# Gabor Kelemen <kelemeng@gnome.hu>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
-# Balázs Úr <urbalazs@gmail.com>, 2014.
+# Balázs Úr <urbalazs@gmail.com>, 2014, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.12.99\n"
+"Project-Id-Version: xkeyboard-config 2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-09-18 23:46+0100\n"
-"PO-Revision-Date: 2014-09-22 20:53+0200\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-18 20:15+0100\n"
"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
"Language: hu\n"
@@ -19,7 +19,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: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.2\n"
#: ../rules/base.xml.in.h:1
msgid "Generic 101-key PC"
@@ -758,11 +758,11 @@ msgid "Htc Dream phone"
msgstr "Htc Dream telefon"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "Angol (US)"
@@ -820,7 +820,7 @@ msgid "English (programmer Dvorak)"
msgstr "Angol (programozói Dvorak)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -853,7 +853,7 @@ 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:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -892,11 +892,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Üzbég (Afganisztán, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Arab"
@@ -938,11 +938,11 @@ msgid "Albanian (Plisi D1)"
msgstr "Albán (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Örmény"
@@ -1018,11 +1018,11 @@ msgid "Belarusian (Latin)"
msgstr "Belorusz (Latin)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Belga"
@@ -1285,11 +1285,11 @@ 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:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Portugál (brazil)"
@@ -1373,11 +1373,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Berber (Marokkó, kibővített fonetikus Tifinagh)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Angol (Kamerun)"
@@ -1498,11 +1498,11 @@ 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:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "Cseh"
@@ -1527,11 +1527,11 @@ 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:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Dán"
@@ -1556,11 +1556,11 @@ msgid "Danish (Dvorak)"
msgstr "Dán (Dvorak)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Holland"
@@ -1586,11 +1586,11 @@ msgid "Dzongkha"
msgstr "Dzongkha"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Észt"
@@ -1606,7 +1606,7 @@ msgstr "Észt (Dvorak)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Észt (US billentyűzet észt betűkkel)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Perzsa"
@@ -1669,11 +1669,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "Feröeri (halott billentyűk tiltása)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Finn"
@@ -1697,7 +1697,7 @@ msgstr "Északi szami (Finnország)"
msgid "Finnish (Macintosh)"
msgstr "Finn (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Francia"
@@ -1739,11 +1739,11 @@ msgstr "Francia (hagyományos, alternatív, Sun halott billentyűk)"
#: ../rules/base.xml.in.h:463
msgid "French (Bepo, ergonomic, Dvorak way)"
-msgstr "Finn (Bepo, ergonomikus, Dvorak kiosztás)"
+msgstr "Francia (Bepo, ergonomikus, Dvorak kiosztás)"
#: ../rules/base.xml.in.h:464
msgid "French (Bepo, ergonomic, Dvorak way, Latin-9 only)"
-msgstr "Finn (Bepo, ergonomikus, Dvorak kiosztás, csak Latin-9)"
+msgstr "Francia (Bepo, ergonomikus, Dvorak kiosztás, csak Latin-9)"
#: ../rules/base.xml.in.h:465
msgid "French (Dvorak)"
@@ -1933,11 +1933,11 @@ msgid "German (legacy)"
msgstr "Német (hagyományos)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Görög"
@@ -2072,11 +2072,11 @@ msgid "Icelandic (Dvorak)"
msgstr "Izlandi (Dvorak)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "Héber"
@@ -2093,11 +2093,11 @@ msgid "Hebrew (Biblical, Tiro)"
msgstr "Héber (Bibliai, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Olasz"
@@ -2126,11 +2126,11 @@ msgid "Italian (IBM 142)"
msgstr "Olasz (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "Japán"
@@ -2207,7 +2207,7 @@ msgid "Lao (STEA proposed standard layout)"
msgstr "Lao (STEA által javasolt szabványos)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
@@ -2228,11 +2228,11 @@ 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:600 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Litván"
@@ -2257,11 +2257,11 @@ msgid "Lithuanian (LEKPa)"
msgstr "Litván (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Lett"
@@ -2299,7 +2299,7 @@ msgid "Maori"
msgstr "Maori"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
@@ -2371,11 +2371,11 @@ msgid "Mongolian"
msgstr "Mongol"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Norvég"
@@ -2412,11 +2412,11 @@ msgid "Norwegian (Colemak)"
msgstr "Norvég (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "Lengyel"
@@ -2456,7 +2456,7 @@ msgstr "Orosz (Lengyelország, fonetikus Dvorak)"
msgid "Polish (programmer Dvorak)"
msgstr "Lengyel (programozói Dvorak)"
-#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Portugál"
@@ -2493,11 +2493,11 @@ msgid "Esperanto (Portugal, Nativo)"
msgstr "Eszperantó (Portugália, Nativo)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Román"
@@ -2517,7 +2517,7 @@ msgstr "Román (szabványos cédille)"
msgid "Romanian (WinKeys)"
msgstr "Román (Win billentyűk)"
-#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Orosz"
@@ -2597,1390 +2597,1414 @@ msgstr "Baskír"
msgid "Mari"
msgstr "Mari"
-#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Orosz (fonetikus azerty)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "Orosz (fonetikus francia)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "Szerb"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Szerb (Cirill, a ZE és a ZHE felcserélve)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Szerb (latin)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "Szerb (latin Unicode)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "Szerb (latin qwerty)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Szerb (latin Unicode qwerty)"
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Szerb (cirill, »csúcsos« idézőjelekkel)"
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "Szerb (latin, »csúcsos« idézőjelekkel)"
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Pannon ruszin"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Szlovén"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "Szlovén (»csúcsos« idézőjelekkel az idézetekhez)"
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:714
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:714 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "Szlovák"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "Szlovák (kibővített fordított törtvonal)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "Szlovák (qwerty)"
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Szlovák (qwerty, kibővített fordított törtvonal)"
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "Spanyol"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "Spanyol (halott billentyűk tiltása)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Spanyol (Win billentyűk)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Spanyol (halott tilde felvétele)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Spanyol (Sun halott billentyűk)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Spanyol (Dvorak)"
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:727
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:726
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Katalán (Spanyolország, középső pontos L karakterrel)"
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Spanyol (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Svéd"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "Svéd (halott billentyűk tiltása)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Svéd (Dvorak)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "Orosz (Svédország, fonetikus)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Orosz (Svédország, fonetikus, halott billentyűk tiltása)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Északi szami (Svédország)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Svéd (Macintosh)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Svéd (Svdvorak)"
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "Svéd jelnyelv"
-#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Német (Svájc)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Német (Svájc, hagyományos)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Német (Svájc, halott billentyűk tiltása)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Német (Svájc, Sun halott billentyűk)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Francia (Svájc)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Francia (Svájc, halott billentyűk tiltása)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Francia (Svájc, Sun halott billentyűk)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Francia (Svájc, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Német (Svájc, Macintosh)"
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Arab (Szíria)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Szír"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Szír (fonetikus)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kurd (Szíria, latin Q)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Kurd (Szíria, F)"
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Kurd (Szíria, latin Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Tádzsik"
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Tádzsik (hagyományos)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Szingaléz (fonetikus)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tamil (Sri Lanka, Unicode)"
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Tamil (Sri Lanka, TAB írógép)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "Thai"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Thai (TIS-820.2538)"
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Thai (Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Török"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Török (F)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Török (Alt-Q)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Török (Sun halott billentyűk)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kurd (Törökország, latin Q)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "Kurd (Törökország, F)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Kurd (Törökország, latin Alt-Q)"
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:781
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:781 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Krími tatár (török Q)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Krími tatár (török F)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Krími tatár (török Alt-Q)"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Tajvani"
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Tajvani (őslakos)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Saisiyat (Tajvan)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "Ukrán"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "Ukrán (fonetikus)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "Ukrán (írógép)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "Ukrán (Win billentyűk)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "Ukrán (hagyományos)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "Ukrán (szabványos RSTU)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Orosz (Ukrajna, szabványos RSTU)"
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "Ukrán (homofon)"
-#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Angol (UK)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Angol (UK, kibővített Win billentyűk)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "Angol (UK, nemzetközi, halott billentyűkkel)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Angol (USA, Dvorak)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Angol (UK, Dvorak UK központozással)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Angol (UK, Macintosh)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "Angol (UK, Macintosh nemzetközi)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "Angol (UK, Colemak)"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Üzbég"
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Üzbég (latin)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Vietnami"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "Koreai"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "Koreai (101/104 gomb kompatibilis)"
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Japán (PC-98xx sorozat)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Ír"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Ír (UnicodeExpert)"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Ogham (IS434)"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Urdu (Pakisztán)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdu (Pakisztán, CRULP)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdu (Pakisztán, NLA)"
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Arab (Pakisztán)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Szindhi"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Dhivehi"
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Angol (Dél-Afrika)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Eszperantó"
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:841
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:841
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Nepáli"
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Angol (Nigéria)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Igbo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Joruba"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Amhara"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "Wolof"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Braille"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Braille (balkezes)"
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Braille (jobbkezes)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Türkmén"
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Türkmén (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Bambara"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Francia (Mali, alternatív)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Angol (Mali, USA Macintosh)"
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Angol (Mali, USA nemzetközi)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Szuahéli (Tanzánia)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Szuahéli (Kenya)"
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Kikuju"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Csvana"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Filippínó"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Filippínó (QWERTY Baybayin)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Filippínó (Capewell-Dvorak Latin)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Filippínó (Capewell-Dvorak Baybayin)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Filippínó (Capewell-QWERF 2006 Latin)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Filippínó (Capewell-QWERF 2006 Baybayin)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Filippínó (Colemak Latin)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Filippínó (Colemak Baybayin)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Filippínó (Dvorak Latin)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Filippínó (Dvorak Baybayin)"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Moldáv"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Moldáv (Gagauz)"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Váltás másik kiosztásra"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Jobb Alt (lenyomva tartva)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Bal Alt (lenyomva tartva)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Bal Win (lenyomva tartva)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "Jobb Win (lenyomva tartva)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "Bármely Win billentyű (lenyomva tartva)"
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:903
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:902
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Jobb Ctrl (lenyomva tartva)"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Jobb Alt"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Bal Alt"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Shift+Caps Lock"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:909
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:908
+#: ../rules/base.xml.in.h:910
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:909
+#: ../rules/base.xml.in.h:911
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:910
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+Caps Lock"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "A két Shift billentyű együtt"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "A két Alt billentyű együtt"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "A két Ctrl billentyű együtt"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Bal Ctrl+Bal Shift"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Jobb Ctrl + jobb Shift"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Bal Alt+Bal Shift"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+Szóköz"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Menü"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Bal Win"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "Win billentyű+Space"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Jobb Win"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Bal Shift"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Jobb Shift"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Bal Ctrl"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Jobb Ctrl"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Scroll Lock"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:932
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:931
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Billentyű a harmadik szint választásához"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "Bármely Win billentyű"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "Bármely Alt billentyű"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Jobb Alt, a Shift+jobb Alt a kombináló"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "A jobb Alt billentyű sohasem választ harmadik szintet"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Enter a számbillentyűzeten"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Fordított törtvonal"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Kisebb/nagyobb&gt;"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:941
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:940
+#: ../rules/base.xml.in.h:942
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:941
+#: ../rules/base.xml.in.h:943
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:942
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Ctrl billentyű helyzete"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "Caps Lock mint Ctrl"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Bal Ctrl mint Meta"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Ctrl és Caps Lock felcserélése"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "Az „A”-tól balra"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "Bal oldalt, alul"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Jobb Ctrl használata jobb Alt-ként"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menü mint jobb Ctrl"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Jobb Alt jobb Ctrl-ként"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Bal Alt és bal Ctrl felcserélése"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Bal Win és bal Ctrl felcserélése"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:955
msgid "Swap Right Win key with Right Ctrl key"
msgstr "Jobb Win és jobb Ctrl felcserélése"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Bal Alt mint Ctrl, bal Ctrl mint Win, bal Win mint Alt"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:957
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:956
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "Num Lock"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Numerikus billentyűzet kiosztása"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Örökölt"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Unicode kiegészítések (nyilak és műveleti jelek)"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:962
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:961
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Hagyományos Wang 724"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:964
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:963
+#: ../rules/base.xml.in.h:965
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:964
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Hexadecimális"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "ATM/telefon stílusú"
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "Számbillentyűzet Delete billentyűjének viselkedése"
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:969
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:969
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Hagyományos számbillentyűzet vesszővel"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Negyedik szintű billentyű ponttal"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Negyedik szintű billentyű ponttal, csak Latin-9"
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "Negyedik szintű billentyű vesszővel"
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:975
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:976
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Negyedik szintű billentyű absztrakt elválasztókkal"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Pontosvessző a harmadik szinten"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "A Caps Lock billentyű viselkedése"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:981
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:980
+#: ../rules/base.xml.in.h:982
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:981
+#: ../rules/base.xml.in.h:983
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:982
+#: ../rules/base.xml.in.h:984
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:983
+#: ../rules/base.xml.in.h:985
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:984
+#: ../rules/base.xml.in.h:986
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:985
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Esc és Caps Lock felcserélése"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "A Caps Lock használata másik Esc-ként"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "A Caps Lock használata másik Backspace-ként"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "A Caps Lock használata másik Super-ként"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "A Caps Lock használata másik Hyper-ként"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "A Caps Lock átváltja a Shiftet (minden billentyűt érinti)"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "A Caps Lock letiltva"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "A Caps Lock használata másik Ctrl-ként"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Az Alt/Win billentyűk viselkedése"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:996
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:995
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Az Alt és Meta az Alt billentyűkön"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Az Alt a Win billentyűkhöz van rendelve (és a szokásos Alt billentyűkhöz)"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "A Ctrl a Win billentyűkhöz van rendelve (és a szokásos Ctrl billentyűkhöz)"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "A Ctrl az Alt billentyűkhöz, az Alt a Win billentyűkhöz van rendelve"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "A Meta a Win billentyűkhöz van rendelve"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "A Meta a bal Win billentyűhöz van rendelve"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "A Hyper a Win billentyűkhöz van rendelve"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1004
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:1003
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Az Alt fel van cserélve a Win billentyűvel"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "A kombináló billentyű helye"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "3. szintű bal Win"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "3. szintű jobb Win"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "3. szintű Menü"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "3. szintű bal Ctrl"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "3. szintű jobb Ctrl"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "3. szintű jobb Caps Lock"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "3. szintű &lt;kisebb/nagyobb&gt;"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pause"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "PrtSc"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Egyéb kompatibilitási beállítások"
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Alapértelmezett számbillentyűk"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1018
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:1017
-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:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "NumLock bekapcsolva: számjegyek, a Shift vált a nyíl billentyűkre, NumLock kikapcsolva: mindig nyílbillentyűk (mint az MS Windowsban)"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1020
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:1019
+#: ../rules/base.xml.in.h:1021
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:1020
+#: ../rules/base.xml.in.h:1022
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:1021
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "A Shift megszakítja a Caps Lockot"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Extra tipográfiai karakterek engedélyezése"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1025
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:1024
+#: ../rules/base.xml.in.h:1026
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:1025
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "A két Shift billentyű együtt váltja a ShiftLockot"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Mutatóbillentyűk átváltása a Shift + NumLock használatával"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1029
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:1028
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "Megragadás és ablakfa naplózásának engedélyezése"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "Pénznem jelek hozzáadása bizonyos billentyűkhöz"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Euro jel az E billentyűn"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Euro jel a 2-es billentyűn"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Euro jel a 4-es billentyűn"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Euro jel az 5-ös billentyűn"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Rúpia jel a 4-es billentyűn"
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "Billentyű az ötödik szint választásához"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1038
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:1037
+#: ../rules/base.xml.in.h:1039
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:1038
+#: ../rules/base.xml.in.h:1040
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:1039
+#: ../rules/base.xml.in.h:1041
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:1040
+#: ../rules/base.xml.in.h:1042
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:1041
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "Hagyományos szóköz bármely szinten"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1044
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:1043
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "Nem törhető szóköz karakter a harmadik szinten"
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1046
msgid "Non-breakable space character at third level, nothing at fourth level"
msgstr "Nem törhető szóköz karakter a harmadik szinten és semmi a negyediken"
-#: ../rules/base.xml.in.h:1045
+#: ../rules/base.xml.in.h:1047
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:1046
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Nem törhető szóköz karakter a negyedik szinten"
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1049
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:1048
+#: ../rules/base.xml.in.h:1050
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:1049
+#: ../rules/base.xml.in.h:1051
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:1050
+#: ../rules/base.xml.in.h:1052
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:1051
+#: ../rules/base.xml.in.h:1053
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:1052
+#: ../rules/base.xml.in.h:1054
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:1053
+#: ../rules/base.xml.in.h:1055
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:1054
+#: ../rules/base.xml.in.h:1056
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:1055
+#: ../rules/base.xml.in.h:1057
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:1056
+#: ../rules/base.xml.in.h:1058
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:1057
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Japán billentyűzet-beállítások"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "A Kana zárolásbillentyű zárol"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "NICOLA-F stílusú backspace"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "A Zenkaku Hankaku használata másik Esc-ként"
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Koreai hangul/handzsa billentyűk"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Hardveres hangul/handzsa billentyűk"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Jobb Alt hangulként, jobb Ctrl Handzsaként"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Jobb Ctrl hangulként, jobb Alt Handzsaként"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "Eszperantó mellékjeles betűk hozzáadása"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "A Qwerty kiosztáson megfelelő billentyűre."
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "A Dvorak kiosztáson megfelelő billentyűre."
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "A Colemak kiosztáson megfelelő billentyűre."
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1071
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:1066
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Sun billentyűzetkompatibilitás"
-#: ../rules/base.xml.in.h:1067
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Billentyűsorozat az X kiszolgáló kilövéséhez"
-#: ../rules/base.xml.in.h:1068
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + Backspace"
@@ -4069,254 +4093,261 @@ 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:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Lengyel (Németország, halott billentyűk tiltása)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Német (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Német (Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "Avesztán"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Litván (US Dvorak litván betűkkel)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Litván (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Lett (US Dvorak)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Lett (US Dvorak, Y-változat)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Lett (US Dvorak, mínusz változat)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Lett (programozói US Dvorak)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Lett (programozói US Dvorak, Y-változat)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Lett (programozói US Dvorak, mínusz változat)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Lett (US Colemak)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Lett (US Colemak, aposztróf változat)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Lett (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Angol (USA, nemzetközi AltGr Unicode kombinálással)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
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:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "Atsina"
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Coeur d'Alene Salish"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "Csehszlovák és német (US)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Angol (US, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Angol (Norman)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Lengyel (nemzetközi, halott billentyűkkel)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Lengyel (Colemak)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Lengyel (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Krími tatár (Dobrudzsa Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Román (ergonomikus Touchtype)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Román (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
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:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Egyházi szláv"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Orosz (Ukrán-fehérorosz kiosztással)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Orosz (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Örmény (OLPC fonetikus)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Héber (bibliai, SIL fonetikus)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Arab (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Belga (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Portugál (brazil, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "Cseh (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Dán (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Holland (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Észt (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Finn (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Francia (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Görög (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Olasz (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Japán (Sun Type 6)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Japán (Sun Type 7 - PC kompatibilis)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Japán (Sun Type 7 - sun kompatibilis)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Norvég (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Portugál (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Szlovák (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Spanyol (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Svéd (Dvorak A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Svéd (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Német (Svájc, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Francia (Svájc, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Török (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Ukrán (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Angol (UK, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "Koreai (Sun Type 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKEY (US alapú kiosztás európai betűkkel)"
-#: ../rules/base.extras.xml.in.h:151
+#: ../rules/base.extras.xml.in.h:152
msgid "Mmuock"
msgstr "Mmuock"
+#~ 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"
+
#~ msgid "Bengali"
#~ msgstr "Bengáli"
diff --git a/xorg-server/xkeyboard-config/po/ko.po b/xorg-server/xkeyboard-config/po/ko.po
index 355a921fa..85799a0e4 100644
--- a/xorg-server/xkeyboard-config/po/ko.po
+++ b/xorg-server/xkeyboard-config/po/ko.po
@@ -1,6 +1,6 @@
# xkeyboard-config Korean translation
# This file is distributed under the same license as the xkeyboard-config package.
-# Changwoo Ryu <cwryu@debian.org>, 2007-2014.
+# Changwoo Ryu <cwryu@debian.org>, 2007-2015.
#
# - 주의
# - 한국에 수입해 판매되는 제품은 광고할 때 사용하는 표기를 그대로 사용
@@ -10,10 +10,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.12.99\n"
+"Project-Id-Version: xkeyboard-config 2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-09-18 23:46+0100\n"
-"PO-Revision-Date: 2014-09-20 07:19+0900\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-21 13:01+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
"Language: ko\n"
@@ -785,11 +785,11 @@ msgid "Htc Dream phone"
msgstr "HTC 드림 휴대전화"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "영어(미국)"
@@ -848,7 +848,7 @@ msgid "English (programmer Dvorak)"
msgstr "영어(프로그래머 드보락)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -881,7 +881,7 @@ msgid "English (Workman, international with dead keys)"
msgstr "영어(워크맨, 드보락 국제 버전, 데드키 포함)"
#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -921,11 +921,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "우즈베크어(아프가니스탄, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "아랍어"
@@ -969,11 +969,11 @@ msgid "Albanian (Plisi D1)"
msgstr "알바니아(Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "아르메니아"
@@ -1049,11 +1049,11 @@ msgid "Belarusian (Latin)"
msgstr "벨라루스어(라틴)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "벨기에어"
@@ -1323,11 +1323,11 @@ msgid "Bosnian (US keyboard with Bosnian letters)"
msgstr "보스니아어(미국식 키보드, 보스니아 문자 포함)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "포르투갈어(브라질)"
@@ -1420,11 +1420,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "베르베르어(모로코, 티피나그 확장 음성 기호)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "영어(카메룬)"
@@ -1545,11 +1545,11 @@ msgid "Croatian (US keyboard with Croatian letters)"
msgstr "크로아티아어(미국식 키보드, 크로아티아 문자 포함)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "체코어"
@@ -1574,11 +1574,11 @@ msgid "Czech (US Dvorak with CZ UCW support)"
msgstr "체코어(US 드보락, CZ UCW 지원)"
#. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "덴마크어"
@@ -1603,11 +1603,11 @@ msgid "Danish (Dvorak)"
msgstr "덴마크어(드보락)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "네덜란드어"
@@ -1633,11 +1633,11 @@ msgid "Dzongkha"
msgstr "종카어"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "에스토니아어"
@@ -1653,7 +1653,7 @@ msgstr "에스토니아어(드보락)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "에스토니아어(미국식 키보드, 에스토니아 문자 포함)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "페르시아어"
@@ -1716,11 +1716,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "페로어(데드키 없음)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "핀란드어"
@@ -1744,7 +1744,7 @@ msgstr "북 사오미(핀란드)"
msgid "Finnish (Macintosh)"
msgstr "핀란드어(매킨토시)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "프랑스어"
@@ -1987,11 +1987,11 @@ msgid "German (legacy)"
msgstr "독일어(구형)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "그리스어"
@@ -2127,11 +2127,11 @@ msgid "Icelandic (Dvorak)"
msgstr "아이슬란드어(드보락)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "히브리어"
@@ -2148,11 +2148,11 @@ msgid "Hebrew (Biblical, Tiro)"
msgstr "히브리어(성서 방식, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "이탈리아어"
@@ -2182,11 +2182,11 @@ msgid "Italian (IBM 142)"
msgstr "이탈리아어(IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "일본어"
@@ -2263,7 +2263,7 @@ msgid "Lao (STEA proposed standard layout)"
msgstr "라오어(STEA 제안 표준 키 배치)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
@@ -2284,11 +2284,11 @@ msgid "Spanish (Latin American, Sun dead keys)"
msgstr "스페인어(라틴 아메리카, 썬 데드키)"
#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "리투아니아어"
@@ -2313,11 +2313,11 @@ msgid "Lithuanian (LEKPa)"
msgstr "리투아니아어(LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "라트비아어"
@@ -2355,7 +2355,7 @@ msgid "Maori"
msgstr "마오리어"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
@@ -2427,11 +2427,11 @@ msgid "Mongolian"
msgstr "몽골어"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "노르웨이어"
@@ -2468,11 +2468,11 @@ msgid "Norwegian (Colemak)"
msgstr "노르웨이어(콜맥)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "폴란드어"
@@ -2512,7 +2512,7 @@ msgstr "러시아어(폴란드, 음성 표기 드보락)"
msgid "Polish (programmer Dvorak)"
msgstr "폴란드어(프로그래머 드보락)"
-#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "포르투갈어"
@@ -2551,11 +2551,11 @@ msgid "Esperanto (Portugal, Nativo)"
msgstr "에스페란토(포르투갈, 네이티브)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "루마니아어"
@@ -2575,7 +2575,7 @@ msgstr "루마니아어(표준 세디유)"
msgid "Romanian (WinKeys)"
msgstr "루마니아어(윈도우 키)"
-#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "러시아어"
@@ -2656,1406 +2656,1430 @@ msgstr "바시키르어"
msgid "Mari"
msgstr "마리어"
-#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "러시아어(음성 표기 AZERTY)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "러시아어(음성 표기 프랑스식)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "세르비아어"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "세르비아어(키릴 문자, ZE와 ZHE 뒤바꾸기)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "세르비아어(라틴)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "세르비아어(라틴 유니코드)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "세르비아어(라틴 QWERTY)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "세르비아어(라틴 유니코드 QWERTY)"
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "세르비아어(키릴 문자, 각괄호 포함)"
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "세르비아어(라틴, 각괄호 포함)"
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "판노니아 루테니아"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "슬로베니아어"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "슬로베니아어(따옴표에 각괄호 포함)"
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:714
msgid "Slovenian (US keyboard with Slovenian letters)"
msgstr "슬로베니아어(미국식 키보드, 슬로베니아 문자 포함)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "슬로바키아어"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "슬로바키아어(확장 백슬래시)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "슬로바키아어(QWERTY)"
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "슬로바키아어(QWERTY, 백슬래시 확장)"
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "스페인어"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "스페인어(데드키 없음)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "스페인어(윈도우 키)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "스페인어(물결 데드키 포함)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "스페인어(썬 데드키)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "스페인어(드보락)"
# 아스투리아스 - 스페인 지역
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:727
msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
msgstr "아스투리아스어(스페인, 가운데점 H 및 가운데점 L 포함)"
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "카탈로니아어(스페인, 가운데점 L 포함)"
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "스페인어(매킨토시)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "스웨덴어"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "스웨덴어(데드키 없음)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "스웨덴어(드보락)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "러시아어(스웨덴, 음성 표기)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "러시아어(스웨덴, 음성 표기, 데드키 없음)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "북 사오미(스웨덴)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "스웨덴어(매킨토시)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "스웨덴어(SV 드보락)"
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "스웨덴 기호 언어"
-#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "독일어(스위스)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "독일어(스위스, 구형)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "독일어(스위스, 데드키 없음)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "독일어(스위스, 썬 데드키)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "프랑스어(스위스)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "프랑스어(스위스, 데드키 없음)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "프랑스어(스위스, 썬 데드키)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "프랑스어(스위스, 매킨토시)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "독일어(스위스, 매킨토시)"
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "아랍어(시리아)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "시리아어"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "시리아어(음성 기호)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "쿠르드어(시리아, 라틴 Q)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "쿠르드어(시리아, F)"
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "쿠르드어(시리아, 라틴 Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "타지키스탄"
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "타지키스탄(구형)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "싱할라어(음성 기호)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "타밀어(스리랑카, 유니코드)"
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "타밀어(스리랑카, TAB 타자기)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "타이어"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "타이어(TIS-820.2538)"
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "타이어(Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "터키어"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "터키어(F)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "터키어(Alt-Q)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "터키어(썬 데드키)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "쿠르드어(터키, 라틴 Q)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "쿠르드어(터키, F)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "쿠르드어(터키, 라틴 Alt-Q)"
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:781
msgid "Turkish (international with dead keys)"
msgstr "터키어(국제 버전, 데드키 포함)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "크림타타르(터키어 Q)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "크림타타르(터키어 F)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "크림타타르(터키어 Alt-Q)"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "타이완"
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "타이완(원주민)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
# 사이시얏트(賽夏族) - 타이완 원주민
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "사이시얏트(타이완)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "우크라이나어"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "우크라이나어(음성 기호)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "우크라이나어(타자기)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "우크라이나어(윈도우 키)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "우크라이나어(구형)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "우크라이나어(표준 RSTU)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "러시아어(우크라이나, 표준 RSTU)"
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "우크라이나어(homophonic)"
-#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "영어(영국)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "영어(영국, 확장 윈도우 키)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "영어(영국, 국제 버전, 데드키 포함)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "영어(영국, 드보락)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "영어(영국, 영국 문장 부호 포함 드보락)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "영어(영국, 매킨토시)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "영어(영국, 매킨토시 국제 버전)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "영어(영국, 콜맥)"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "우즈베크어"
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "우즈베크어(라틴)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "베트남어"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "한국어"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "한국어(101/104키 호환)"
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "일본어(PC-98xx 시리즈)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "아일랜드"
# 아일랜드 변종
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "클로개라치어"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "아일랜드(UnicodeExpert)"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "오검 문자"
# 아일랜드 변종
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "오검 문자(IS434)"
# Urdu - 인도 방언
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "우르두어(파키스탄)"
# Urdu - 인도 방언
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "우르두어(파키스탄, CRULP)"
# Urdu - 인도 방언
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "우르두어(파키스탄, NLA)"
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "아랍어(파키스탄)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
# 인도
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "신디어"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
# 몰디브 공용어
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "디베히어"
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "영어(남아공)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "에스페란토"
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:841
msgid "Esperanto (displaced semicolon and quote, obsolete)"
msgstr "에스페란토(세미콜론과 따옴표 없애기, 없어진 기능)"
#. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "네팔어"
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "영어(나이지리아)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
# 나이지리아 변종
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "이그보어"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
# 나이지리아 변종
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "요루바어"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "암하라어"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
# 월로프어 - 세네갈, 감비아, 모리타니에서 쓰이는 아프리카 언어
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "월로프어"
# Braille
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "점자"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "점자(왼손잡이)"
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "점자(오른손잡이)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "투르크멘어"
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "투르크멘어(Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "밤바라어"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "프랑스어(말리, 다른 버전)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "영어(말리, 미국 매킨토시)"
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "영어(말리, 미국 국제 버전)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "스와힐리어(탄자니아)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "스와힐리어(케냐)"
# http://en.wikipedia.org/wiki/Kikuyu#Language
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "키쿠유어"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "츠와나어"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "필리핀어"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "필리핀어(QWERTY 베이베이인)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "필리핀어(케이프웰 드보락 라틴)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "필리핀어(케이프웰 드보락 베이베이인)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "필리핀어(케이프웰 QWERF 2006 라틴)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "필리핀어(케이프웰 QWERF 2006 베이베이인)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "필리핀어(콜맥 라틴)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "필리핀어(콜맥 베이베이인)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "필리핀어(드보락 라틴)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "필리핀어(드보락 베이베이인)"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "몰디브어"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
# 가가우지아 지역의 몰디브어
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "몰티브어(가가우지아)"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "다른 키 배치로 전환"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "오른쪽 Alt(누르고 있는 동안)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "왼쪽 Alt(누르고 있는 동안)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "왼쪽 윈도우(누르고 있는 동안)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "오른쪽 윈도우(누르고 있는 동안)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "모든 윈도우 키(누르고 있는 동안)"
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:903
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:902
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "오른쪽 Ctrl(누르고 있는 동안)"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "오른쪽 Alt"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "왼쪽 Alt"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Shift+Caps Lock"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:909
msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
msgstr "Caps Lock(1번으로), Shift+Caps Lock(마지막으로)"
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:910
msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
msgstr "왼쪽 윈도우(1번으로), 오른쪽 윈도우/메뉴(마지막으로)"
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:911
msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
msgstr "왼쪽 Ctrl(1번 키보드 배치로), 오른쪽 Ctrl (마지막 키보드 배치로)"
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+Caps Lock"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Shift 키 2개 동시 누름"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Alt 키 2개 동시 누름"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Ctrl 키 2개 동시 누름"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "왼쪽 Ctrl+왼쪽 Shift"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "오른쪽 Ctrl+오른쪽 Alt"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "왼쪽 Alt+왼쪽 Shift"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+스페이스"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "메뉴"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "왼쪽 윈도우"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "윈도우 키+스페이스"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "오른쪽 윈도우"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "왼쪽 Shift"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "오른쪽 Shift"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "왼쪽 Ctrl"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "오른쪽 Ctrl"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Scroll Lock"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:932
msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
msgstr "왼쪽 Ctrl+왼쪽 윈도우(1번 키보드 배치로), 오른쪽 Ctrl+Menu (2번째 키보드 배치로)"
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "3번째 단계를 선택하는 키"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "모든 윈도우 키"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "모든 Alt 키"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "오른쪽 Alt, Shift+오른쪽 Alt가 Compose"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "오른쪽 Alt는 3번째 단계를 선택하지 않음"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "키패드에 Enter"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "백슬래시"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt; 및 &gt;"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:941
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:940
+#: ../rules/base.xml.in.h:942
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:941
+#: ../rules/base.xml.in.h:943
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:942
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Ctrl 키 위치"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "Caps Lock 키를 Ctrl 키로"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "왼쪽 Ctrl 키를 Meta 키로"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Ctrl과 Caps Lock 뒤바꾸기"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "'A' 왼쪽에"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "맨 아래 왼쪽에"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "오른쪽 Ctrl 키를 오른쪽 Alt 키로"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menu 키를 오른쪽 Ctrl 키로"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "오른쪽 Alt 키를 오른쪽 Ctrl 키로"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "왼쪽 Alt와 왼쪽 Ctrl 뒤바꾸기"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "왼쪽 윈도우와 왼쪽 Ctrl 뒤바꾸기"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:955
msgid "Swap Right Win key with Right Ctrl key"
msgstr "오른쪽 윈도우와 오른쪽 Ctrl 뒤바꾸기"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "왼쪽 Alt를 Ctrl, 왼쪽 Ctrl을 윈도우, 왼쪽 윈도우를 Alt"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:957
msgid "Use keyboard LED to show alternative layout"
msgstr "키보드 LED에서 다른 키보드 배치 사용 표시"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "Num Lock"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "숫자 키패드의 키 배치"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "구형 방식"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "유니코드 추가(화살표 및 수학 기호)"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:962
msgid "Unicode additions (arrows and math operators; math operators on default level)"
msgstr "유니코드 추가(화살표 및 수학 기호, 수학 기호를 기본 단계에)"
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "구형 방식 Wang 724 키패드"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:964
msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
msgstr "Wang 724 키패드, 유니코드 추가(화살표 및 수학 기호)"
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:965
msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Wang 724 키패드, 유니코드 추가(화살표 및 수학 기호, 수학 기호를 기본 단계에)"
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "십육진법"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "ATM/전화기형태"
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "숫자 키패드의 Delete 키 동작"
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with dot"
msgstr "구형 방식 키, 점 포함"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "구형 방식 키, 쉼표 포함"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "네번째 단계, 점 사용"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "네번째 단계, 점 사용, Latin-9 전용"
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "네번째 단계, 쉼표 사용"
# momayyez: http://en.wikipedia.org/wiki/Momayyez
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:975
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:976
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "네번째 단계, 가상 구분 문자 사용"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "3번째 단계에서 세미콜론"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Caps Lock 키 동작"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:981
msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
msgstr "Caps Lock이 내부 대문자 기능 사용, Shift가 Caps Lock을 \"일시 중지\""
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:982
msgid "Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock"
msgstr "Caps Lock이 내부 대문자 기능 사용, Shift가 Caps Lock 상태에 영향 없음"
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:983
msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
msgstr "Caps Lock이 Shift처럼 동작하고 상태 고정, Shift가 Caps Lock을 \"일시 중지\""
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:984
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:983
+#: ../rules/base.xml.in.h:985
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "Caps Lock이 일반적인 알파벳 대문자 상태를 토글"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "Caps Lock을 추가 Num Lock으로 사용"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "ESC와 Caps Lock 뒤바꾸기"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "Caps Lock을 추가 ESC로 사용"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "Caps Lock을 추가 백스페이스로 사용"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "Caps Lock을 추가 Super로 사용"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "Caps Lock을 추가 Hyper로 사용"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "Caps Lock이 Shift 상태를 토글(모든 키가 영향을 받음)"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "Caps Lock 사용 안 함"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "Caps Lock을 추가 Ctrl로 사용"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Alt/Win 키 동작"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "메뉴 키에 기본 동작 추가"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt와 Meta를 Alt 키에"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt 키를 윈도우 키로 매핑(일반 Alt 키로도 동작)"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Ctrl 키를 윈도우 키로 매핑(일반 Ctrl 키로도 동작)"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Ctrl 키를 윈도우 키로 매핑, Alt 키를 윈도우 키로 매핑"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "메타 키를 윈도우 키로 매핑"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "메타 키를 왼쪽 윈도우 키로 매핑"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper 키를 윈도우 키로 매핑"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1004
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Alt 키를 오른쪽 윈도우 키로 매핑, Super 키를 메뉴 키로 매핑"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Alt와 윈도우 키 뒤바꾸기"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Compose 키의 위치"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "3번째 단계에서 왼쪽 윈도우"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "3번째 단계에서 오른쪽 윈도우"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "3번째 단계에서 메뉴"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "3번째 단계에서 왼쪽 Ctrl"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "3번째 단계에서 오른쪽 Ctrl"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "3번째 단계에서 Caps Lock"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "3번째 단계에서 &lt;Less/Greater&gt;"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pause"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "PrtSc"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "기타 호환성 옵션"
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "기본 숫자 키패드 키"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1018
msgid "Numeric keypad keys always enter digits (as in Mac OS)"
msgstr "숫자 키패드 키가 항상 숫자를 입력(맥 OS처럼 동작)"
-#: ../rules/base.xml.in.h:1017
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift와 동시에 숫자 키패드 키를 누르면 MS 윈도우와 동일하게 동작"
+#: ../rules/base.xml.in.h:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "NumLock 켜면: 숫자, Shift 누르면 화살표 키, NumLock 끔: 항상 화살표 키 (MS 윈도우 방식)"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1020
msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
msgstr "Shift를 누르면 Num Lock을 끄지 않고, 3번째 단계를 선택"
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1021
msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
msgstr "특수 키는(Ctrl+Alt+&lt;키&gt;) 서버에서 처리"
-#: ../rules/base.xml.in.h:1020
+#: ../rules/base.xml.in.h:1022
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:1021
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Shift를 누르면 Caps Lock 끄기"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "추가 타이포그라피 문자 사용"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Shift 키 동시 눌러 Caps Lock 토글"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1026
msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
msgstr "Shift 키 동시 눌러 Caps Lock 켜기, Shift 키 한 개로 해제"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Shift 키 동시 눌러 ShiftLock 토글"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Shift + NumLock으로 PointerKeys 토글"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1029
msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
msgstr "키보드 동작으로 키 잡기 해제 허용(경고: 보안 위험)"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "키 잡기 및 창 단계 기록 허용"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "화폐 기호를 특정 키에 추가"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "유로를 E 키에"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "유로를 2 키에"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "유로를 4 키에"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "유로를 5 키에"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "루피를 4 키에"
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "5번째 단계를 선택하는 키"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1038
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:1037
+#: ../rules/base.xml.in.h:1039
msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "오른쪽 Alt로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
-#: ../rules/base.xml.in.h:1038
+#: ../rules/base.xml.in.h:1040
msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "왼쪽 윈도우로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
-#: ../rules/base.xml.in.h:1039
+#: ../rules/base.xml.in.h:1041
msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "오른쪽 윈도우로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
-#: ../rules/base.xml.in.h:1040
+#: ../rules/base.xml.in.h:1042
msgid "Using space key to input non-breakable space character"
msgstr "스페이스 키가 강제 공백 출력."
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "모든 단계에서 일반 공백 문자"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at second level"
msgstr "2번째 단계에서 강제 공백 문자"
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "3번째 단계에서 강제 공백 문자"
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1046
msgid "Non-breakable space character at third level, nothing at fourth level"
msgstr "3번째 단계에서 강제 공백 문자, 4번째에서는 출력 없음."
-#: ../rules/base.xml.in.h:1045
+#: ../rules/base.xml.in.h:1047
msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
msgstr "3번째 단계에서 강제 공백 문자, 4번째에서는 얇은 강제 공백 문자."
-#: ../rules/base.xml.in.h:1046
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "4번째 단계에서 강제 공백 문자"
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1049
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
msgstr "4번째 단계에서 강제 공백 문자, 6번째 단계에서 얇은 강제 공백 문자"
-#: ../rules/base.xml.in.h:1048
+#: ../rules/base.xml.in.h:1050
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:1049
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level"
msgstr "2번째 단계에서 폭 없는 연결 금지 문자"
-#: ../rules/base.xml.in.h:1050
+#: ../rules/base.xml.in.h:1052
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 폭 없는 연결 문자"
-#: ../rules/base.xml.in.h:1051
+#: ../rules/base.xml.in.h:1053
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.xml.in.h:1052
+#: ../rules/base.xml.in.h:1054
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
msgstr "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자"
-#: ../rules/base.xml.in.h:1053
+#: ../rules/base.xml.in.h:1055
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:1054
+#: ../rules/base.xml.in.h:1056
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:1055
+#: ../rules/base.xml.in.h:1057
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:1056
+#: ../rules/base.xml.in.h:1058
msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
msgstr "3번째 단계에서 폭 없는 연결 금지 문자, 4번째에서는 폭 없는 연결 문자"
-#: ../rules/base.xml.in.h:1057
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "일본어 키보드 옵션"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "Kana Lock 키 상태 고정"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "NICOLA-F 방식 백스페이스"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Zenkaku Hankaku를 추가 ESC로 사용"
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "한국어 한/영, 한자 키"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "하드웨어 한/영, 한자 키"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "오른쪽 Alt 키를 한/영, 오른쪽 Ctrl 키를 한자 키로"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "오른쪽 Ctrl 키를 한/영, 오른쪽 Alt 키를 한자 키로"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "에스페란토 수퍼사인 문자 추가"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "QWERTY 키 배치에서 해당하는 키로"
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "드보락 키 배치에서 해당하는 키로"
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "콜맥 키 배치에서 해당하는 키로"
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1071
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "과거 솔라리스 키코드와 키 호환성 유지"
-#: ../rules/base.xml.in.h:1066
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "썬 키 호환성"
-#: ../rules/base.xml.in.h:1067
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "X 서버를 멈추는 키 조합"
-#: ../rules/base.xml.in.h:1068
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + 백스페이스"
@@ -4146,253 +4170,257 @@ msgid "German (with Hungarian letters and no dead keys)"
msgstr "독일어(헝가리어 문자 포함, 데드키 없음)"
#: ../rules/base.extras.xml.in.h:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "폴란드어(독일, 데드키 없음)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "독일어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "독일어(Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "아베스탄"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "리투아니아어(미국식 드보락, 리투아니아 문자 포함)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "리투아니아어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "라트비아어(미국 드보락)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "라트비아어(미국 드보락, Y 변종)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "라트비아어(미국 드보락, 빼기 기호 변종)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "라트비아어(프로그래머 미국식 드보락)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "라트비아어(프로그래머 미국식 드보락, Y 변종)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "라트비아어(프로그래머 미국식 드보락, 빼기 기호 변종)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "라트비아어(미국 콜맥)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "라트비아어(미국 콜맥, 아포스트로피 변종)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "라트비아어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "영어(미국, 국제 버전 AltGr 유니코드 조합)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "영어(미국, 국제 버전 AltGr 유니코드 조합, 다른 버전)"
# 아스시나 - 미국 원주민 부족
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "아트시나"
# 쾨르디알렌 - 미국 원주민 부족
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "쾨르디알렌 살리시어"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "체코어, 슬로바키아어 및 독일어(미국)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "영어(미국, 썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "영어(노르만)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "폴란드어(국제 버전, 데드키 포함)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "폴란드어(콜맥)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "폴란드어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "크림타타르(Dobruca-1 Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "루마니아어(어고노믹 터치 방식)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "루마니아어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "세르비아어(데드키 대신 조합으로 액센트 입력)"
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "교회 슬라브어"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "러시아어(우크라니아어 벨라루스어 키보드 배치)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "러시아어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "아르메니아(OLPC 음성 기호)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "히브리어(성서, SIL 음성 기호)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "아랍어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "벨기에어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "포르투갈어(브라질, 썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "체코어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "덴마크어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "네덜란드어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "에스토니아어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "핀란드어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "프랑스어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "그리스어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "이탈리아어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "일본어(썬 타입 6)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "일본어(썬 타입 7 - PC 호환)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "일본어(썬 타입 7 - 썬 호환)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "노르웨이어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "포르투갈어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "슬로바키아어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "스페인어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "스웨덴어(드보락 A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "스웨덴어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "독일어(스위스, 썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "프랑스어(스위스, 썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "터키어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "우크라이나어(썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "영어(영국, 썬 타입 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "한국어(썬 타입 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "유럽 키(미국식 기반 키 배치, 유럽 문자 포함)"
# 카메룬 지방 언어
-#: ../rules/base.extras.xml.in.h:151
+#: ../rules/base.extras.xml.in.h:152
msgid "Mmuock"
msgstr "무오크"
diff --git a/xorg-server/xkeyboard-config/po/lt.po b/xorg-server/xkeyboard-config/po/lt.po
index 1f3bdb6b4..74923a479 100644
--- a/xorg-server/xkeyboard-config/po/lt.po
+++ b/xorg-server/xkeyboard-config/po/lt.po
@@ -4,10 +4,10 @@
# Rimas Kudelis <rq@akl.lt>, 2009, 2010, 2011, 2013, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.10.99\n"
+"Project-Id-Version: xkeyboard-config 2.12.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-01-15 01:12+0000\n"
-"PO-Revision-Date: 2014-02-02 16:05+0300\n"
+"POT-Creation-Date: 2014-09-18 23:46+0100\n"
+"PO-Revision-Date: 2014-12-16 20:53+0300\n"
"Last-Translator: Rimas Kudelis <rq@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
"Language: lt\n"
@@ -55,7 +55,7 @@ msgstr "„Keytronic FlexPro“"
#: ../rules/base.xml.in.h:10
msgid "Microsoft Natural"
-msgstr "„Microsoft Natural Keyboard“"
+msgstr "„Microsoft Natural“"
#: ../rules/base.xml.in.h:11
msgid "Northgate OmniKey 101"
@@ -466,8 +466,8 @@ msgid "Memorex MX2750"
msgstr "„Memorex MX2750“"
#: ../rules/base.xml.in.h:113
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "„Microsoft Natural Wireless Ergonomic Keyboard 4000“"
+msgid "Microsoft Natural Ergonomic Keyboard 4000"
+msgstr "„Microsoft Natural Ergonomic Keyboard 4000“"
#: ../rules/base.xml.in.h:114
msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
@@ -483,11 +483,11 @@ msgstr "„Microsoft Natural Keyboard Pro“ / „Microsoft Internet Keyboard Pr
#: ../rules/base.xml.in.h:117
msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "„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 "Microsoft Natural Keyboard Pro OEM"
-msgstr "„Microsoft Natural Keyboard Pro“ OEM"
+msgstr "„Microsoft Natural Keyboard Pro OEM“"
#: ../rules/base.xml.in.h:119
msgid "ViewSonic KU-306 Internet Keyboard"
@@ -754,11 +754,11 @@ msgid "Htc Dream phone"
msgstr "„HTC Dream“ telefonas"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
msgid "English (US)"
msgstr "Anglų (JAV)"
@@ -816,7 +816,7 @@ msgid "English (programmer Dvorak)"
msgstr "Anglų (programuotojų Dvorako)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
msgid "ru"
msgstr "ru"
@@ -849,7 +849,7 @@ msgid "English (Workman, international with dead keys)"
msgstr "Anglų („Workman“, tarptautinis, su tęsties klavišais)"
#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
msgid "fa"
msgstr "fa"
@@ -888,11 +888,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Uzbekų (Afganistanas, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:65
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
msgid "Arabic"
msgstr "Arabų"
@@ -929,3006 +929,3054 @@ msgstr "sq"
msgid "Albanian"
msgstr "Albanų"
+#: ../rules/base.xml.in.h:235
+msgid "Albanian (Plisi D1)"
+msgstr "Albanų („Plisi D1“)"
+
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:59
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
msgid "Armenian"
msgstr "Armėnų"
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:239
msgid "Armenian (phonetic)"
msgstr "Armėnų (fonetinis)"
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:240
msgid "Armenian (alternative phonetic)"
msgstr "Armenų (alternatyvusis fonetinis)"
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:241
msgid "Armenian (eastern)"
msgstr "Armėnų (Rytų)"
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:242
msgid "Armenian (western)"
msgstr "Armėnų (Vakarų)"
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:243
msgid "Armenian (alternative eastern)"
msgstr "Armėnų (Rytų alternatyvusis)"
#. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:245 ../rules/base.extras.xml.in.h:22
msgid "de"
msgstr "de"
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:246
msgid "German (Austria)"
msgstr "Vokiečių (Austrija)"
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:247
msgid "German (Austria, eliminate dead keys)"
msgstr "Vokiečių (Austrija, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:248
msgid "German (Austria, Sun dead keys)"
msgstr "Vokiečių (Austrija, su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:249
msgid "German (Austria, Macintosh)"
msgstr "Vokiečių (Austrija, „Macintosh“)"
#. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:251
msgid "az"
msgstr "az"
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:252
msgid "Azerbaijani"
msgstr "Azerbaidžaniečių"
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:253
msgid "Azerbaijani (Cyrillic)"
msgstr "Azerbaidžaniečių (kirilica)"
#. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:255
msgid "by"
msgstr "by"
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:256
msgid "Belarusian"
msgstr "Baltarusių"
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:257
msgid "Belarusian (legacy)"
msgstr "Baltarusių (senasis)"
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:258
msgid "Belarusian (Latin)"
msgstr "Baltarusių (lotyniški rašmenys)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:259 ../rules/base.extras.xml.in.h:68
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
msgid "Belgian"
msgstr "Belgų"
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:262
msgid "Belgian (alternative)"
msgstr "Belgų (alternatyvus)"
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:263
msgid "Belgian (alternative, Latin-9 only)"
msgstr "Belgų (alternatyvus, tik „Latin-9“ simboliai)"
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:264
msgid "Belgian (alternative, Sun dead keys)"
msgstr "Belgų (alternatyvus, su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:265
msgid "Belgian (ISO alternate)"
msgstr "Belgų (ISO alternatyvus)"
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:266
msgid "Belgian (eliminate dead keys)"
msgstr "Belgų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:267
msgid "Belgian (Sun dead keys)"
msgstr "Belgų (su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:268
msgid "Belgian (Wang model 724 azerty)"
msgstr "Belgų („Wang 724“, AZERTY variantas)"
#. Keyboard indicator for Bangla layouts
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:270
msgid "bn"
msgstr "bn"
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:271
msgid "Bangla"
msgstr "Bengalų"
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:272
msgid "Bangla (Probhat)"
msgstr "Bengalų (Probhat)"
#. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:274
msgid "in"
msgstr "in"
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:275
msgid "Indian"
msgstr "Indų"
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:276
msgid "Bangla (India)"
msgstr "Bengalų (Indija)"
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:277
msgid "Bangla (India, Probhat)"
msgstr "Bengalų (Indija, Probhat)"
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:278
msgid "Bangla (India, Baishakhi)"
msgstr "Bengalų (Indija, Baishakhi)"
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:279
msgid "Bangla (India, Bornona)"
msgstr "Bengalų (Indija, Bornona)"
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:280
msgid "Bangla (India, Uni Gitanjali)"
msgstr "Bengalų (Indija, Uni Gitanjali)"
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:281
msgid "Bangla (India, Baishakhi Inscript)"
msgstr "Bengalų (Indija, Baishakhi Inscript)"
-#. Keyboard indicator for Gujarati layouts
#: ../rules/base.xml.in.h:282
+msgid "Manipuri (Eeyek)"
+msgstr "Manipuriečių („Eeyek“)"
+
+#. Keyboard indicator for Gujarati layouts
+#: ../rules/base.xml.in.h:284
msgid "gu"
msgstr "gu"
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:285
msgid "Gujarati"
msgstr "Gudžaratų"
#. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:287
msgid "pa"
msgstr "pa"
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:288
msgid "Punjabi (Gurmukhi)"
msgstr "Pendžabų (Gurmukhi)"
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:289
msgid "Punjabi (Gurmukhi Jhelum)"
msgstr "Pendžabų (Gurmukhi Jhelum)"
#. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:291
msgid "kn"
msgstr "kn"
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:292
msgid "Kannada"
msgstr "Kanadų"
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:293
msgid "Kannada (KaGaPa phonetic)"
msgstr "Kanadų („KaGaPa“ fonetinis)"
#. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:295
msgid "ml"
msgstr "ml"
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:296
msgid "Malayalam"
msgstr "Malajalių"
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:297
msgid "Malayalam (Lalitha)"
msgstr "Malajalių (Lalitha)"
-#: ../rules/base.xml.in.h:296
-msgid "Malayalam (enhanced Inscript with Rupee Sign)"
-msgstr "Malajalių (papildytas „Inscript“ su rupijos ženklu)"
+#: ../rules/base.xml.in.h:298
+msgid "Malayalam (enhanced Inscript, with rupee sign)"
+msgstr "Malajalių (papildytas „Inscript“ su Rupijos ženklu)"
#. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:300
msgid "or"
msgstr "or"
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:301
msgid "Oriya"
msgstr "Orijų"
#. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:303
msgid "ta"
msgstr "ta"
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:304
msgid "Tamil (Unicode)"
msgstr "Tamilų (unikodas)"
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:305
msgid "Tamil (keyboard with numerals)"
msgstr "Tamilų (klaviatūra su tamilų skaitmenimis)"
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:306
msgid "Tamil (TAB typewriter)"
msgstr "Tamilų (TAB rašomosios mašinėlės išdėstymas)"
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:307
msgid "Tamil (TSCII typewriter)"
msgstr "Tamilų (TSCII rašomosios mašinėlės išdėstymas)"
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:308
msgid "Tamil"
msgstr "Tamilų"
#. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:310
msgid "te"
msgstr "te"
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:311
msgid "Telugu"
msgstr "Telugų"
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:312
msgid "Telugu (KaGaPa phonetic)"
msgstr "Telugų („KaGaPa“ fonetinis)"
#. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:314
msgid "ur"
msgstr "ur"
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:315
msgid "Urdu (phonetic)"
msgstr "Urdu (fonetinis)"
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:316
msgid "Urdu (alternative phonetic)"
msgstr "Urdu (alternatyvus fonetinis)"
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:317
msgid "Urdu (WinKeys)"
-msgstr "Urdu („Windows“ išdėstymas)"
+msgstr "Urdu („Windows“)"
#. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:319
msgid "hi"
msgstr "hi"
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:320
msgid "Hindi (Bolnagri)"
msgstr "Hindi (Bolnagri)"
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:321
msgid "Hindi (Wx)"
msgstr "Hindi (Wx)"
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:322
msgid "Hindi (KaGaPa phonetic)"
msgstr "Hindi („KaGaPa“ fonetinis)"
#. Keyboard indicator for Sanskrit layouts
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:324
msgid "sa"
msgstr "sa"
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:325
msgid "Sanskrit (KaGaPa phonetic)"
msgstr "Sanskritas („KaGaPa“ fonetinis)"
#. Keyboard indicator for Marathi layouts
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:327
msgid "mr"
msgstr "mr"
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:328
msgid "Marathi (KaGaPa phonetic)"
msgstr "Marathų („KaGaPa“ fonetinis)"
-#: ../rules/base.xml.in.h:327
-msgid "English (India, with RupeeSign)"
+#: ../rules/base.xml.in.h:329
+msgid "English (India, with rupee sign)"
msgstr "Anglų (Indija, su Rupijos ženklu)"
#. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:331
msgid "bs"
msgstr "bs"
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:332
msgid "Bosnian"
msgstr "Bosnių"
-#: ../rules/base.xml.in.h:331
-msgid "Bosnian (use guillemets for quotes)"
+#: ../rules/base.xml.in.h:333
+msgid "Bosnian (with guillemets for quotes)"
msgstr "Bosnių (su kampinėmis kabutėmis)"
-#: ../rules/base.xml.in.h:332
-msgid "Bosnian (use Bosnian digraphs)"
+#: ../rules/base.xml.in.h:334
+msgid "Bosnian (with Bosnian digraphs)"
msgstr "Bosnių (su bosniškais dviraidžiais)"
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:335
msgid "Bosnian (US keyboard with Bosnian digraphs)"
msgstr "Bosnių (JAV klaviatūra su bosniškais dviraidžiais)"
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:336
msgid "Bosnian (US keyboard with Bosnian letters)"
msgstr "Bosnių (JAV klaviatūra su bosniškais rašmenimis)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:336 ../rules/base.extras.xml.in.h:71
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:337 ../rules/base.extras.xml.in.h:72
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
msgid "Portuguese (Brazil)"
msgstr "Portugalų (Brazilija)"
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:340
msgid "Portuguese (Brazil, eliminate dead keys)"
msgstr "Portugalų (Brazilija, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:341
msgid "Portuguese (Brazil, Dvorak)"
msgstr "Portugalų (Brazilija, Dvorako)"
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:342
msgid "Portuguese (Brazil, Nativo)"
msgstr "Portugalų (Brazilija, „Nativo“)"
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:343
msgid "Portuguese (Brazil, Nativo for US keyboards)"
msgstr "Portugalų (Brazilija, „Nativo“ JAV klaviatūroms)"
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:344
msgid "Esperanto (Brazil, Nativo)"
msgstr "Esperanto (Brazilija, „Nativo“)"
#. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:346
msgid "bg"
msgstr "bg"
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:347
msgid "Bulgarian"
msgstr "Bulgarų"
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:348
msgid "Bulgarian (traditional phonetic)"
msgstr "Bulgarų (tradicinis fonetinis)"
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:349
msgid "Bulgarian (new phonetic)"
msgstr "Bulgarų (naujasis fonetinis)"
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:350
msgid "Arabic (Morocco)"
msgstr "Arabų (Marokas)"
#. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:350 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:352 ../rules/base.extras.xml.in.h:15
msgid "fr"
msgstr "fr"
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:353
msgid "French (Morocco)"
msgstr "Prancūzų (Marokas)"
#. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:355
msgid "ber"
msgstr "ber"
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:356
msgid "Berber (Morocco, Tifinagh)"
msgstr "Berberų (Marokas, tifinagas)"
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:357
msgid "Berber (Morocco, Tifinagh alternative)"
msgstr "Berberų (Marokas, tifinago alternatyvusis)"
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:358
msgid "Berber (Morocco, Tifinagh alternative phonetic)"
msgstr "Berberų (Marokas, tifinago alternatyvusis fonetinis)"
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:359
msgid "Berber (Morocco, Tifinagh extended)"
msgstr "Berberų (Marokas, tifinago išplėstasis)"
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:360
msgid "Berber (Morocco, Tifinagh phonetic)"
msgstr "Berberų (Marokas, tifinago fonetinis)"
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:361
msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Berberų (Marokas, tifinago išplėstasis fonetinis)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
msgid "English (Cameroon)"
msgstr "Anglų (Kamerūnas)"
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:365
msgid "French (Cameroon)"
msgstr "Prancūzų (Kamerūnas)"
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:366
msgid "Cameroon Multilingual (qwerty)"
msgstr "Kamerūno daugiakalbis (QWERTY)"
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:367
msgid "Cameroon Multilingual (azerty)"
msgstr "Kamerūno daugiakalbis (AZERTY)"
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:368
msgid "Cameroon Multilingual (Dvorak)"
msgstr "Kamerūno daugiakalbis (Dvorako)"
#. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:370
msgid "my"
msgstr "my"
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:371
msgid "Burmese"
msgstr "Birmiečių"
-#: ../rules/base.xml.in.h:370 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:372 ../rules/base.extras.xml.in.h:16
msgid "French (Canada)"
msgstr "Prancūzų (Kanada)"
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:373
msgid "French (Canada, Dvorak)"
msgstr "Prancūzų (Kanada, Dvorako)"
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:374
msgid "French (Canada, legacy)"
msgstr "Prancūzų (Kanada, senasis)"
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:375
msgid "Canadian Multilingual"
msgstr "Kanadiečių daugiakalbis"
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:376
msgid "Canadian Multilingual (first part)"
msgstr "Kanadiečių daugiakalbis (pirmoji dalis)"
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:377
msgid "Canadian Multilingual (second part)"
msgstr "Kanadiečių daugiakalbis (antroji dalis)"
#. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:379
msgid "ike"
msgstr "ike"
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:380
msgid "Inuktitut"
msgstr "Inuktitutas"
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:381
msgid "English (Canada)"
msgstr "Anglų (Kanada)"
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:382
msgid "French (Democratic Republic of the Congo)"
msgstr "Prancūzų (Kongo Demokratinė Respublika)"
#. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:384
msgid "zh"
msgstr "zh"
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:385
msgid "Chinese"
msgstr "Kinų"
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:386
msgid "Tibetan"
msgstr "Tibetiečių"
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:387
msgid "Tibetan (with ASCII numerals)"
msgstr "Tibetiečių (su ASCII skaitmenimis)"
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:388
msgid "ug"
msgstr "ug"
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:389
msgid "Uyghur"
msgstr "Uigūrų"
#. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:391
msgid "hr"
msgstr "hr"
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:392
msgid "Croatian"
msgstr "Kroatų"
-#: ../rules/base.xml.in.h:391
-msgid "Croatian (use guillemets for quotes)"
+#: ../rules/base.xml.in.h:393
+msgid "Croatian (with guillemets for quotes)"
msgstr "Kroatų (su kampinėmis kabutėmis)"
-#: ../rules/base.xml.in.h:392
-msgid "Croatian (use Croatian digraphs)"
+#: ../rules/base.xml.in.h:394
+msgid "Croatian (with Croatian digraphs)"
msgstr "Kroatų (su kroatiškais dviraidžiais)"
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:395
msgid "Croatian (US keyboard with Croatian digraphs)"
msgstr "Kroatų (JAV klaviatūra su kroatiškais dviraidžiais)"
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:396
msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Kroatų (JAV klaviatūra su kroatiškais rašmenimis)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:397 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
msgid "Czech"
msgstr "Čekų"
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:400
msgid "Czech (with &lt;\\|&gt; key)"
msgstr "Čekų (Su &lt;\\|&gt; klavišu)"
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:401
msgid "Czech (qwerty)"
msgstr "Čekų (QWERTY)"
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:402
msgid "Czech (qwerty, extended Backslash)"
msgstr "Čekų (QWERTY, išplėstas kairinis brūkšnys)"
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:403
msgid "Czech (UCW layout, accented letters only)"
msgstr "Čekų (UCW išdėstymas, tik raidės su diakritikais)"
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:404
msgid "Czech (US Dvorak with CZ UCW support)"
msgstr "Čekų (JAV Dvorako išdėstymas su CZ UCW palaikymu)"
#. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:404 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:92
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:405 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
msgid "Danish"
msgstr "Danų"
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:408
msgid "Danish (eliminate dead keys)"
msgstr "Danų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:409
+msgid "Danish (Winkeys)"
+msgstr "Danų („Windows“)"
+
+#: ../rules/base.xml.in.h:410
msgid "Danish (Macintosh)"
msgstr "Danų („Macintosh“)"
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
msgid "Danish (Macintosh, eliminate dead keys)"
msgstr "Danų („Macintosh“, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
msgid "Danish (Dvorak)"
msgstr "Danų (Dvorako)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:412 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
msgid "Dutch"
msgstr "Olandų"
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
msgid "Dutch (Sun dead keys)"
msgstr "Olandų (su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
msgid "Dutch (Macintosh)"
msgstr "Olandų („Macintosh“)"
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
msgid "Dutch (standard)"
msgstr "Olandų (standartinis)"
#. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
msgid "dz"
msgstr "dz"
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
msgid "Dzongkha"
msgstr "Botijų"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:420 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:421 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
msgid "Estonian"
msgstr "Estų"
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
msgid "Estonian (eliminate dead keys)"
msgstr "Estų (be tęsties ženklų)"
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
msgid "Estonian (Dvorak)"
msgstr "Estų (Dvorako)"
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Estų (JAV klaviatūra su estiškais rašmenimis)"
-#: ../rules/base.xml.in.h:425 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
msgid "Persian"
msgstr "Persų"
-#: ../rules/base.xml.in.h:426
-msgid "Persian (with Persian Keypad)"
+#: ../rules/base.xml.in.h:429
+msgid "Persian (with Persian keypad)"
msgstr "Persų (su persiška skaitmenų sritimi)"
#. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
msgid "ku"
msgstr "ku"
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
msgid "Kurdish (Iran, Latin Q)"
msgstr "Kurdų (Iranas, lotyniški rašmenys, Q)"
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
msgid "Kurdish (Iran, F)"
msgstr "Kurdų (Iranas, F)"
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
msgid "Kurdish (Iran, Latin Alt-Q)"
msgstr "Kurdų (Iranas, lotyniški rašmenys, Alt-Q)"
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
msgid "Kurdish (Iran, Arabic-Latin)"
msgstr "Kurdų (Iranas, arabiški ir lotyniški rašmenys)"
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
msgid "Iraqi"
msgstr "Irakiečių"
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
msgid "Kurdish (Iraq, Latin Q)"
msgstr "Kurdų (Irakas, lotyniški rašmenys, Q)"
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
msgid "Kurdish (Iraq, F)"
msgstr "Kurdų (Irakas, F)"
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
msgid "Kurdish (Iraq, Latin Alt-Q)"
msgstr "Kurdų (Irakas, lotyniški rašmenys, Alt-Q)"
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
msgid "Kurdish (Iraq, Arabic-Latin)"
msgstr "Kurdų (Irakas, arabiški ir lotyniški rašmenys)"
#. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
msgid "fo"
msgstr "fo"
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
msgid "Faroese"
msgstr "Fareriečių"
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
msgid "Faroese (eliminate dead keys)"
msgstr "Fareriečių (be tęsties klavišų)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:443 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:444 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
msgid "Finnish"
msgstr "Suomių"
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
msgid "Finnish (classic)"
msgstr "Suomių (klasikinis)"
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
msgid "Finnish (classic, eliminate dead keys)"
msgstr "Suomių (klasikinis, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
+msgid "Finnish (Winkeys)"
+msgstr "Suomių („Windows“)"
+
+#: ../rules/base.xml.in.h:451
msgid "Northern Saami (Finland)"
msgstr "Šiaurės samių (Suomija)"
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:452
msgid "Finnish (Macintosh)"
msgstr "Suomių („Macintosh“)"
-#: ../rules/base.xml.in.h:449 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
msgid "French"
msgstr "Prancūzų"
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:454
msgid "French (eliminate dead keys)"
msgstr "Prancūzų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:455
msgid "French (Sun dead keys)"
msgstr "Prancūzų (su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:456
msgid "French (alternative)"
msgstr "Prancūzų (alternatyvus)"
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:457
msgid "French (alternative, Latin-9 only)"
msgstr "Prancūzų (alternatyvus, tik „Latin-9“ simboliai)"
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:458
msgid "French (alternative, eliminate dead keys)"
msgstr "Prancūzų (alternatyvus, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:459
msgid "French (alternative, Sun dead keys)"
msgstr "Prancūzų (alternatyvus, su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:460
msgid "French (legacy, alternative)"
msgstr "Prancūzų (senasis, alternatyvus)"
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:461
msgid "French (legacy, alternative, eliminate dead keys)"
msgstr "Prancūzų (senasis, alternatyvus, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:462
msgid "French (legacy, alternative, Sun dead keys)"
msgstr "Prancūzų (senasis, alternatyvus, su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:463
msgid "French (Bepo, ergonomic, Dvorak way)"
msgstr "Prancūzų (Bepo, ergonominis pagal Dvoraką)"
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:464
msgid "French (Bepo, ergonomic, Dvorak way, Latin-9 only)"
msgstr "Prancūzų (Bepo, ergonominis pagal Dvoraką, tik „Latin-9“ simboliai)"
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:465
msgid "French (Dvorak)"
msgstr "Prancūzų (Dvorako)"
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:466
msgid "French (Macintosh)"
msgstr "Prancūzų („Macintosh“)"
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:467
msgid "French (Breton)"
msgstr "Prancūzų (bretonų)"
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:468
msgid "Occitan"
msgstr "Očitarų"
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:469
msgid "Georgian (France, AZERTY Tskapo)"
msgstr "Gruzinų (Prancūzija, AZERTY Tskapo)"
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:470
msgid "English (Ghana)"
msgstr "Anglų (Gana)"
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:471
msgid "English (Ghana, multilingual)"
msgstr "Anglų (Gana, daugiakalbis)"
#. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:473
msgid "ak"
msgstr "ak"
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:474
msgid "Akan"
msgstr "Akan"
#. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
msgid "ee"
msgstr "ee"
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
msgid "Ewe"
msgstr "Ewe"
#. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
msgid "ff"
msgstr "ff"
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:480
msgid "Fula"
msgstr "Fula"
#. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
msgid "gaa"
msgstr "gaa"
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
msgid "Ga"
msgstr "Ga"
#. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:485
msgid "ha"
msgstr "ha"
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
msgid "Hausa"
msgstr "Hausa"
#. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:488
msgid "avn"
msgstr "avn"
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
msgid "Avatime"
msgstr "Avatime"
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
msgid "English (Ghana, GILLBT)"
msgstr "Anglų (Gana, GILLBT)"
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
msgid "French (Guinea)"
msgstr "Prancūzų (Gvinėja)"
#. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
msgid "ka"
msgstr "ka"
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
msgid "Georgian"
msgstr "Gruzinų"
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
msgid "Georgian (ergonomic)"
msgstr "Gruzinų (ergonominis)"
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
msgid "Georgian (MESS)"
msgstr "Gruzinų (MESS)"
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
msgid "Russian (Georgia)"
msgstr "Rusų (Gruzija)"
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
msgid "Ossetian (Georgia)"
msgstr "Osetinų (Gruzija)"
-#: ../rules/base.xml.in.h:495 ../rules/base.extras.xml.in.h:11
+#: ../rules/base.xml.in.h:499 ../rules/base.extras.xml.in.h:23
msgid "German"
msgstr "Vokiečių"
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
msgid "German (dead acute)"
msgstr "Vokiečių (tęsties klavišas – dešininis kirtis)"
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
msgid "German (dead grave acute)"
msgstr "Vokiečių (tęsties klavišai – kairinis ir dešininis kirčiai)"
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
msgid "German (eliminate dead keys)"
msgstr "Vokiečių (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
msgid "German (T3)"
msgstr "Vokiečių (T3)"
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
msgid "Romanian (Germany)"
msgstr "Rumunų (Vokietija)"
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
msgid "Romanian (Germany, eliminate dead keys)"
msgstr "Rumunų (Vokietija, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
msgid "German (Dvorak)"
msgstr "Vokiečių (Dvorako)"
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
msgid "German (Sun dead keys)"
msgstr "Vokiečių (su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
msgid "German (Neo 2)"
msgstr "Vokiečių („Neo 2“)"
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
msgid "German (Macintosh)"
msgstr "Vokiečių („Macintosh“)"
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
msgid "German (Macintosh, eliminate dead keys)"
msgstr "Vokiečių („Macintosh“, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
msgid "Lower Sorbian"
msgstr "Žemutinių sorbų"
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
msgid "Lower Sorbian (qwertz)"
msgstr "Žemutinių sorbų (QWERTZ)"
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
msgid "German (qwerty)"
msgstr "Vokiečių (QWERTY)"
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
+msgid "Turkish (Germany)"
+msgstr "Turkų (Vokietija)"
+
+#: ../rules/base.xml.in.h:515
msgid "Russian (Germany, phonetic)"
msgstr "Rusų (Vokietija, fonetinis)"
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:516
msgid "German (legacy)"
msgstr "Vokiečių (senasis)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:513 ../rules/base.extras.xml.in.h:91
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:514 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
msgid "Greek"
msgstr "Graikų"
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:520
msgid "Greek (simple)"
msgstr "Graikų (paprastas)"
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:521
msgid "Greek (extended)"
msgstr "Graikų (išplėstasis)"
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:522
msgid "Greek (eliminate dead keys)"
msgstr "Graikų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:523
msgid "Greek (polytonic)"
msgstr "Graikų (politoninis)"
#. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:525
msgid "hu"
msgstr "hu"
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:526
msgid "Hungarian"
msgstr "Vengrų"
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:527
msgid "Hungarian (standard)"
msgstr "Vengrų (standartinis)"
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:528
msgid "Hungarian (eliminate dead keys)"
msgstr "Vengrų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:529
msgid "Hungarian (qwerty)"
msgstr "Vengrų (QWERTY)"
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:530
msgid "Hungarian (101/qwertz/comma/dead keys)"
msgstr "Vengrų (101 klavišo, QWERTZ, dešimtainis kablelis, su tęsties klavišais)"
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:531
msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
msgstr "Vengrų (101 klavišo, QWERTZ, dešimtainis kablelis, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:532
msgid "Hungarian (101/qwertz/dot/dead keys)"
msgstr "Vengrų (101 klavišo, QWERTZ, dešimtainis taškas, su tęsties klavišais)"
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:533
msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
msgstr "Vengrų (101 klavišo, QWERTZ, dešimtainis taškas, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:534
msgid "Hungarian (101/qwerty/comma/dead keys)"
msgstr "Vengrų (101 klavišo, QWERTY, dešimtainis kablelis, su tęsties klavišais)"
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:535
msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
msgstr "Vengrų (101 klavišo, QWERTY, dešimtainis kablelis, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:536
msgid "Hungarian (101/qwerty/dot/dead keys)"
msgstr "Vengrų (101 klavišo, QWERTY, dešimtainis taškas, su tęsties klavišais)"
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:537
msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
msgstr "Vengrų (101 klavišo, QWERTY, dešimtainis taškas, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:538
msgid "Hungarian (102/qwertz/comma/dead keys)"
msgstr "Vengrų (102 klavišų, QWERTZ, dešimtainis kablelis, su tęsties klavišais)"
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:539
msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
msgstr "Vengrų (102 klavišų, QWERTZ, dešimtainis kablelis, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:540
msgid "Hungarian (102/qwertz/dot/dead keys)"
msgstr "Vengrų (102 klavišų, QWERTZ, dešimtainis taškas, su tęsties klavišais)"
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:541
msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
msgstr "Vengrų (102 klavišų, QWERTZ, dešimtainis taškas, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:542
msgid "Hungarian (102/qwerty/comma/dead keys)"
msgstr "Vengrų (102 klavišų, QWERTY, dešimtainis kablelis, su tęsties klavišais)"
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:543
msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
msgstr "Vengrų (102 klavišų, QWERTY, dešimtainis kablelis, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:544
msgid "Hungarian (102/qwerty/dot/dead keys)"
msgstr "Vengrų (102 klavišų, QWERTY, dešimtainis taškas, su tęsties klavišais)"
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:545
msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
msgstr "Vengrų (102 klavišų, QWERTY, dešimtainis taškas, be tęsties klavišų)"
#. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:547
msgid "is"
msgstr "is"
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:548
msgid "Icelandic"
msgstr "Islandų"
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:549
msgid "Icelandic (Sun dead keys)"
msgstr "Islandų (su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:550
msgid "Icelandic (eliminate dead keys)"
msgstr "Islandų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:551
+msgid "Icelandic (Macintosh, legacy)"
+msgstr "Islandų („Macintosh“, senasis)"
+
+#: ../rules/base.xml.in.h:552
msgid "Icelandic (Macintosh)"
msgstr "Islandų („Macintosh“)"
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:553
msgid "Icelandic (Dvorak)"
msgstr "Islandų (Dvorako)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:549 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:550 ../rules/base.extras.xml.in.h:63
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
msgid "Hebrew"
msgstr "Hebrajų"
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:557
msgid "Hebrew (lyx)"
msgstr "Hebrajų (lyx)"
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:558
msgid "Hebrew (phonetic)"
msgstr "Hebrajų (fonetinis)"
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:559
msgid "Hebrew (Biblical, Tiro)"
msgstr "Hebrajų (biblinė, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:94
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
msgid "Italian"
msgstr "Italų"
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:563
msgid "Italian (eliminate dead keys)"
msgstr "Italų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:564
+msgid "Italian (Winkeys)"
+msgstr "Italų („Windows“)"
+
+#: ../rules/base.xml.in.h:565
msgid "Italian (Macintosh)"
msgstr "Italų („Macintosh“)"
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:566
msgid "Italian (US keyboard with Italian letters)"
msgstr "Italų (JAV klaviatūra su itališkais rašmenimis)"
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:567
msgid "Georgian (Italy)"
msgstr "Gruzinų (Italija)"
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:568
msgid "Italian (IBM 142)"
msgstr "Italų (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:563 ../rules/base.extras.xml.in.h:97
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:564 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
msgid "Japanese"
msgstr "Japonų"
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:572
msgid "Japanese (Kana)"
msgstr "Japonų (Kana)"
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:573
msgid "Japanese (Kana 86)"
msgstr "Japonų (Kana 86)"
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:574
msgid "Japanese (OADG 109A)"
msgstr "Japonų (OADG 109A)"
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:575
msgid "Japanese (Macintosh)"
msgstr "Japonų („Macintosh“)"
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:576
msgid "Japanese (Dvorak)"
msgstr "Japonų (Dvorako)"
#. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:578
msgid "ki"
msgstr "ki"
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:579
msgid "Kyrgyz"
msgstr "Kirgizų"
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:580
msgid "Kyrgyz (phonetic)"
msgstr "Kirgizų (fonetinis)"
#. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:582
msgid "km"
msgstr "km"
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:583
msgid "Khmer (Cambodia)"
msgstr "Khmerų (Kambodža)"
#. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:585
msgid "kk"
msgstr "kk"
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:586
msgid "Kazakh"
msgstr "Kazachų"
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:587
msgid "Russian (Kazakhstan, with Kazakh)"
msgstr "Rusų (Kazachstanas, su kazachų rašmenimis)"
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:588
msgid "Kazakh (with Russian)"
msgstr "Kazachų (su rusiškais rašmenimis)"
#. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:590
msgid "lo"
msgstr "lo"
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:591
msgid "Lao"
msgstr "Laosiečių"
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:592
msgid "Lao (STEA proposed standard layout)"
msgstr "Laosiečių (STEA siūlomas standartinis išdėstymas)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:587 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
msgid "es"
msgstr "es"
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:595
msgid "Spanish (Latin American)"
msgstr "Ispanų (Lotynų Amerika)"
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:596
msgid "Spanish (Latin American, eliminate dead keys)"
msgstr "Ispanų (Lotynų Amerika, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:597
msgid "Spanish (Latin American, include dead tilde)"
msgstr "Ispanų (Lotynų Amerika, tildė veikia tęsties klavišas)"
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:598
msgid "Spanish (Latin American, Sun dead keys)"
msgstr "Ispanų (Lotynų Amerika, su „Sun“ tęsties klavišais)"
#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:18
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:31
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
msgid "Lithuanian"
msgstr "Lietuvių"
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:602
msgid "Lithuanian (standard)"
msgstr "Lietuvių (standartinis)"
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:603
msgid "Lithuanian (US keyboard with Lithuanian letters)"
msgstr "Lietuvių (JAV klaviatūra su lietuviškais rašmenimis)"
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:604
msgid "Lithuanian (IBM LST 1205-92)"
msgstr "Lietuvių (IBM, LST 1205-92)"
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:605
msgid "Lithuanian (LEKP)"
msgstr "Lietuvių (LEKP)"
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:606
msgid "Lithuanian (LEKPa)"
msgstr "Lietuvių (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:22
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
msgid "Latvian"
msgstr "Latvių"
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:610
msgid "Latvian (apostrophe variant)"
msgstr "Latvių (apostrofo variantas)"
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:611
msgid "Latvian (tilde variant)"
msgstr "Latvių (tildės variantas)"
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:612
msgid "Latvian (F variant)"
msgstr "Latvių (F raidės variantas)"
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:613
msgid "Latvian (modern)"
msgstr "Latvių (šiuolaikinis)"
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:614
msgid "Latvian (ergonomic, ŪGJRMV)"
msgstr "Latvių (ergonominis, ŪGJRMV)"
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:615
msgid "Latvian (adapted)"
msgstr "Latvių (pritaikytas)"
#. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:617
msgid "mi"
msgstr "mi"
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:618
msgid "Maori"
msgstr "Maorių"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:613 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
msgid "sr"
msgstr "sr"
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:621
msgid "Montenegrin"
msgstr "Juodkalniečių"
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:622
msgid "Montenegrin (Cyrillic)"
msgstr "Juodkalniečių (kirilica)"
-#: ../rules/base.xml.in.h:616
-msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+#: ../rules/base.xml.in.h:623
+msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
msgstr "Juodkalniečių (kirilica, raidės Z ir Ž sukeistos)"
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:624
msgid "Montenegrin (Latin Unicode)"
msgstr "Juodkalniečių (lotyniški rašmenys, unikodas)"
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:625
msgid "Montenegrin (Latin qwerty)"
msgstr "Juodkalniečių (lotyniški rašmenys, QWERTY)"
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:626
msgid "Montenegrin (Latin Unicode qwerty)"
msgstr "Juodkalniečių (lotyniški rašmenys, unikodas, QWERTY)"
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:627
msgid "Montenegrin (Cyrillic with guillemets)"
msgstr "Juodkalniečių (kirilica, su kampinėmis kabutėmis)"
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:628
msgid "Montenegrin (Latin with guillemets)"
msgstr "Juodkalniečių (lotyniški rašmenys, su kampinėmis kabutėmis)"
#. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:630
msgid "mk"
msgstr "mk"
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:631
msgid "Macedonian"
msgstr "Makedonų"
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:632
msgid "Macedonian (eliminate dead keys)"
msgstr "Makedonų (be tęsties klavišų)"
#. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:634
msgid "mt"
msgstr "mt"
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:635
msgid "Maltese"
msgstr "Maltiečių"
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:636
msgid "Maltese (with US layout)"
msgstr "Maltiečių (su JAV išdėstymu)"
#. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:638
msgid "mn"
msgstr "mn"
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:639
msgid "Mongolian"
msgstr "Mongolų"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:635 ../rules/base.extras.xml.in.h:103
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
msgid "Norwegian"
msgstr "Norvegų"
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:643
msgid "Norwegian (eliminate dead keys)"
msgstr "Norvegų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:644
+msgid "Norwegian (Winkeys)"
+msgstr "Norvegų („Windows“)"
+
+#: ../rules/base.xml.in.h:645
msgid "Norwegian (Dvorak)"
msgstr "Norvegų (Dvorako)"
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:646
msgid "Northern Saami (Norway)"
msgstr "Šiaurės samių (Norvegija)"
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:647
msgid "Northern Saami (Norway, eliminate dead keys)"
msgstr "Šiaurės samių (Norvegija, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:648
msgid "Norwegian (Macintosh)"
msgstr "Norvegų („Macintosh“)"
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:649
msgid "Norwegian (Macintosh, eliminate dead keys)"
msgstr "Norvegų („Macintosh“, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:650
msgid "Norwegian (Colemak)"
msgstr "Norvegų („Colemak“)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:645 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
msgid "Polish"
msgstr "Lenkų"
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:654
msgid "Polish (legacy)"
msgstr "Lenkų (senasis)"
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:655
msgid "Polish (qwertz)"
msgstr "Lenkų (QWERTZ)"
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:656
msgid "Polish (Dvorak)"
msgstr "Lenkų (Dvorako)"
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:657
msgid "Polish (Dvorak, Polish quotes on quotemark key)"
msgstr "Lenkų (Dvorako, lenkiškos kabutės ant kabučių klavišo)"
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:658
msgid "Polish (Dvorak, Polish quotes on key 1)"
msgstr "Lenkų (Dvorako, lenkiškos kabutės ant klavišo „1“)"
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:659
msgid "Kashubian"
msgstr "Kašubų"
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:660
+msgid "Silesian"
+msgstr "Sileziečių"
+
+#: ../rules/base.xml.in.h:661
msgid "Russian (Poland, phonetic Dvorak)"
msgstr "Rusų (Lenkija, fonetinis Dvorako)"
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:662
msgid "Polish (programmer Dvorak)"
msgstr "Lenkų (programuotojų Dvorako)"
-#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:105
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
msgid "Portuguese"
msgstr "Portugalų"
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:664
msgid "Portuguese (eliminate dead keys)"
msgstr "Portugalų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:665
msgid "Portuguese (Sun dead keys)"
msgstr "Portugalų (su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:666
msgid "Portuguese (Macintosh)"
msgstr "Portugalų („Macintosh“)"
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:667
msgid "Portuguese (Macintosh, eliminate dead keys)"
msgstr "Portugalų („Macintosh“, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:668
msgid "Portuguese (Macintosh, Sun dead keys)"
msgstr "Portugalų („Macintosh“, su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:669
msgid "Portuguese (Nativo)"
msgstr "Portugalų („Nativo“)"
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:670
msgid "Portuguese (Nativo for US keyboards)"
msgstr "Portugalų („Nativo“ JAV klaviatūroms)"
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:671
msgid "Esperanto (Portugal, Nativo)"
msgstr "Esperanto (Portugalija, „Nativo“)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:664 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:665 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
msgid "Romanian"
msgstr "Rumunų"
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:675
msgid "Romanian (cedilla)"
msgstr "Rumunų (su cedila)"
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:676
msgid "Romanian (standard)"
msgstr "Rumunų (standartinis)"
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:677
msgid "Romanian (standard cedilla)"
msgstr "Rumunų (standartinis su cedila)"
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:678
msgid "Romanian (WinKeys)"
-msgstr "Rumunų („Windows“ išdėstymas)"
+msgstr "Rumunų („Windows“)"
-#: ../rules/base.xml.in.h:670 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
msgid "Russian"
msgstr "Rusų"
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:680
msgid "Russian (phonetic)"
msgstr "Rusų (fonetinis)"
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:681
msgid "Russian (phonetic WinKeys)"
msgstr "Rusų („Windows“ fonetinis)"
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:682
msgid "Russian (typewriter)"
msgstr "Rusų (rašomosios mašinėlės išdėstymas)"
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:683
msgid "Russian (legacy)"
msgstr "Rusų (senasis)"
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:684
msgid "Russian (typewriter, legacy)"
msgstr "Rusų (rašomosios mašinėlės išdėstymas, senasis)"
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:685
msgid "Tatar"
msgstr "Totorių"
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:686
msgid "Ossetian (legacy)"
msgstr "Osetinų (senasis)"
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:687
msgid "Ossetian (WinKeys)"
-msgstr "Osetinų („Windows“ išdėstymas)"
+msgstr "Osetinų („Windows“)"
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:688
msgid "Chuvash"
msgstr "Čiuvašų"
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:689
msgid "Chuvash (Latin)"
msgstr "Čiuvašų (lotyniški rašmenys)"
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:690
msgid "Udmurt"
msgstr "Udmurtų"
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:691
msgid "Komi"
msgstr "Komija"
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:692
msgid "Yakut"
msgstr "Jakutų"
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:693
msgid "Kalmyk"
msgstr "Kalmukų"
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:694
msgid "Russian (DOS)"
msgstr "Rusų (DOS)"
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:695
msgid "Russian (Macintosh)"
msgstr "Rusų („Macintosh“)"
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:696
msgid "Serbian (Russia)"
msgstr "Serbų (Rusija)"
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:697
msgid "Bashkirian"
msgstr "Baškirų"
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:698
msgid "Mari"
msgstr "Marių"
-#: ../rules/base.xml.in.h:690 ../rules/base.extras.xml.in.h:53
+#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
msgid "Serbian"
msgstr "Serbų"
-#: ../rules/base.xml.in.h:691
-msgid "Serbian (Cyrillic, Z and ZHE swapped)"
+#: ../rules/base.xml.in.h:700
+msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Serbų (kirilica, raidės Z ir Ž sukeistos)"
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:701
msgid "Serbian (Latin)"
msgstr "Serbų (lotyniški rašmenys)"
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Latin Unicode)"
msgstr "Serbų (lotyniški rašmenys, unikodas)"
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin qwerty)"
msgstr "Serbų (lotyniški rašmenys, QWERTY)"
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Serbų (lotyniški rašmenys, unikodas, QWERTY)"
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Serbų (kirilica, su kampinėmis kabutėmis)"
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin with guillemets)"
msgstr "Serbų (lotyniški rašmenys, su kampinėmis kabutėmis)"
-#: ../rules/base.xml.in.h:698
+#: ../rules/base.xml.in.h:707
msgid "Pannonian Rusyn"
msgstr "Panonijos rusinų"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:709
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:710
msgid "Slovenian"
msgstr "Slovėnų"
-#: ../rules/base.xml.in.h:702
-msgid "Slovenian (use guillemets for quotes)"
-msgstr "Slovėnų (kampinės kabutės)"
+#: ../rules/base.xml.in.h:711
+msgid "Slovenian (with guillemets for quotes)"
+msgstr "Slovėnų (su kampinėmis kabutėmis)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:712
msgid "Slovenian (US keyboard with Slovenian letters)"
msgstr "Slovėnų (JAV klaviatūra su slovėniškais rašmenimis)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:705 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:122
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:706 ../rules/base.extras.xml.in.h:108
+#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
msgid "Slovak"
msgstr "Slovakų"
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:716
msgid "Slovak (extended Backslash)"
msgstr "Slovakų (išplėstasis kairinis brūkšnys)"
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:717
msgid "Slovak (qwerty)"
msgstr "Slovakų (QWERTY)"
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:718
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Slovakų (QWERTY, išplėstas kairinis brūkšnys)"
-#: ../rules/base.xml.in.h:710 ../rules/base.extras.xml.in.h:111
+#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
msgid "Spanish"
msgstr "Ispanų"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:720
msgid "Spanish (eliminate dead keys)"
msgstr "Ispanų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:721
+msgid "Spanish (Winkeys)"
+msgstr "Ispanų („Windows“)"
+
+#: ../rules/base.xml.in.h:722
msgid "Spanish (include dead tilde)"
msgstr "Ispanų (tildė veikia kaip tęsties klavišas)"
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Sun dead keys)"
msgstr "Ispanų (su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:724
msgid "Spanish (Dvorak)"
msgstr "Ispanų (Dvorako)"
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:725
msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
msgstr "Asturų (Ispanija, su H ir L raidėmis su taškais apačioje)"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:726
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Katalonų (Ispanija, su L raide su tašku per vidurį)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:727
msgid "Spanish (Macintosh)"
msgstr "Ispanų („Macintosh“)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:720 ../rules/base.extras.xml.in.h:114
+#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
msgid "Swedish"
msgstr "Švedų"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:731
msgid "Swedish (eliminate dead keys)"
msgstr "Švedų (be tęsties klavišų)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:732
msgid "Swedish (Dvorak)"
msgstr "Švedų (Dvorako)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:733
msgid "Russian (Sweden, phonetic)"
msgstr "Rusų (Švedija, fonetinis)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:734
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Rusų (Švedija, fonetinis, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:735
msgid "Northern Saami (Sweden)"
msgstr "Šiaurės samių (Švedija)"
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:736
msgid "Swedish (Macintosh)"
msgstr "Švedų („Macintosh“)"
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:737
msgid "Swedish (Svdvorak)"
msgstr "Švedų („Svdvorak“)"
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:738
msgid "Swedish Sign Language"
msgstr "Švedų gestų kalba"
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:116
+#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
msgid "German (Switzerland)"
msgstr "Vokiečių (Šveicarija)"
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:740
msgid "German (Switzerland, legacy)"
msgstr "Vokiečių (Šveicarija, senasis)"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:741
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Vokiečių (Šveicarija, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, Sun dead keys)"
msgstr "Vokiečių (Šveicarija, su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:743
msgid "French (Switzerland)"
msgstr "Prancūzų (Šveicarija)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:744
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Prancūzų (Šveicarija, be tęsties klavišų)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland, Sun dead keys)"
msgstr "Prancūzų (Šveicarija, su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, Macintosh)"
msgstr "Prancūzų (Šveicacija, „Macintosh“)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:747
msgid "German (Switzerland, Macintosh)"
msgstr "Vokiečių (Šveicarija, „Macintosh“)"
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:748
msgid "Arabic (Syria)"
msgstr "Arabų (Sirija)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:750
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:751
msgid "Syriac"
msgstr "Sirijos"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:752
msgid "Syriac (phonetic)"
msgstr "Sirų (fonetinis)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:753
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kurdų (Sirija, lotyniški rašmenys, Q)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:754
msgid "Kurdish (Syria, F)"
msgstr "Kurdų (Sirija, F)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Kurdų (Sirija, lotyniški rašmenys, Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:757
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:758
msgid "Tajik"
msgstr "Tadžikų"
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:759
msgid "Tajik (legacy)"
msgstr "Tadžikų (senasis)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:761
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:762
msgid "Sinhala (phonetic)"
msgstr "Sinhalų (fonetinis)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:763
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tamilų (Šri Lanka, unikodas)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:764
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Tamilų (Šri lanka, TAB rašomosios mašinėlės išdėstymas)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:766
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:767
msgid "Thai"
msgstr "Tajų"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:768
msgid "Thai (TIS-820.2538)"
msgstr "Tajų (TIS-820.2538)"
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:769
msgid "Thai (Pattachote)"
msgstr "Tajų („Pattachote“)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:761 ../rules/base.extras.xml.in.h:119
+#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:762 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
msgid "Turkish"
msgstr "Turkų"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:773
msgid "Turkish (F)"
msgstr "Turkų (F)"
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:774
msgid "Turkish (Alt-Q)"
msgstr "Turkų (Alt-Q)"
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:775
msgid "Turkish (Sun dead keys)"
msgstr "Turkų (su „Sun“ tęsties klavišais)"
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:776
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kurdų (Turkija, lotyniški rašmenys, Q)"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:777
msgid "Kurdish (Turkey, F)"
msgstr "Kurdų (Turkija, F)"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Kurdų (Turkija, lotyniški rašmenys, Alt-Q)"
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:779
msgid "Turkish (international with dead keys)"
msgstr "Turkų (tarptautinis, su tęsties ženklais)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:48
+#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:62
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:782
msgid "Crimean Tatar (Turkish Q)"
msgstr "Krymo totorių (turkiškas Q)"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:783
msgid "Crimean Tatar (Turkish F)"
msgstr "Krymo totorių (turkiškas F)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Krymo totorių (turkiškas Alt-Q)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:785
msgid "Taiwanese"
msgstr "Taivaniečių"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:786
msgid "Taiwanese (indigenous)"
msgstr "Taivano (čiabuvių)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:788
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:789
msgid "Saisiyat (Taiwan)"
msgstr "Siaisijatų (Taivanas)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:782 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
msgid "Ukrainian"
msgstr "Ukrainiečių"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:793
msgid "Ukrainian (phonetic)"
msgstr "Ukrainiečių (fonetinis)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:794
msgid "Ukrainian (typewriter)"
msgstr "Ukrainiečių (rašomosios mašinėlės išdėstymas)"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (WinKeys)"
-msgstr "Ukrainiečių („Windows“ išdėstymas)"
+msgstr "Ukrainiečių („Windows“)"
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (legacy)"
msgstr "Ukrainiečių (senasis)"
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (standard RSTU)"
msgstr "Ukrainiečių (standartinis RSTU)"
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:798
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Rusų (Ukraina, standartinis RSTU)"
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (homophonic)"
msgstr "Ukrainiečių (homofoninis)"
-#: ../rules/base.xml.in.h:790 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
msgid "English (UK)"
msgstr "Anglų (JK)"
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:801
msgid "English (UK, extended WinKeys)"
msgstr "Anglų (JK, „Windows“ išplėstasis)"
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:802
msgid "English (UK, international with dead keys)"
msgstr "Anglų (JK, tarptautinis su tęsties klavišais)"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:803
msgid "English (UK, Dvorak)"
msgstr "Anglų (JK, Dvorako)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:804
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Anglų (JK, Dvorako su JK skyrybos ženklais)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Macintosh)"
msgstr "Anglų (JK, „Macintosh“)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Macintosh international)"
msgstr "Anglų (JK, „Macintosh“ tarptautinis)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Colemak)"
msgstr "Anglų (JK, „Colemak“)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:808
msgid "Uzbek"
msgstr "Uzbekų"
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:809
msgid "Uzbek (Latin)"
msgstr "Uzbekų (lotyniški rašmenys)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:811
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:812
msgid "Vietnamese"
msgstr "Vietnamiečių"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:804 ../rules/base.extras.xml.in.h:127
+#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:805 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
msgid "Korean"
msgstr "Korėjiečių"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:816
msgid "Korean (101/104 key compatible)"
msgstr "Korėjiečių (suderinamas su 101/104 klavišų klaviatūra)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:817
msgid "Japanese (PC-98xx Series)"
msgstr "Japonų (PC-98xx serijos)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:819
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:820
msgid "Irish"
msgstr "Airių"
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:821
msgid "CloGaelach"
msgstr "„CloGaelach“"
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:822
msgid "Irish (UnicodeExpert)"
msgstr "Airių („UnicodeExpert“)"
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:823
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:824
msgid "Ogham (IS434)"
msgstr "Ogham (IS434)"
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:825
msgid "Urdu (Pakistan)"
msgstr "Urdu (Pakistanas)"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:826
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdu (Pakistanas, CRULP)"
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdu (Pakistanas, NLA)"
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:828
msgid "Arabic (Pakistan)"
msgstr "Arabų (Pakistanas)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:830
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:831
msgid "Sindhi"
msgstr "Sindų"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:833
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:834
msgid "Dhivehi"
msgstr "Maldyviečių"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:835
msgid "English (South Africa)"
msgstr "Anglų (Pietų Afrika)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:837
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:838
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:839
msgid "Esperanto (displaced semicolon and quote, obsolete)"
msgstr "Esperanto (perkeltas kabliataškis ir kabutė, nenaudotinas)"
#. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:841
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:842
msgid "Nepali"
msgstr "Nepaliečių"
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:843
msgid "English (Nigeria)"
msgstr "Anglų (Nigerija)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:845
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:846
msgid "Igbo"
msgstr "Igbo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:848
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:849
msgid "Yoruba"
msgstr "Jorubų"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:851
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:852
msgid "Amharic"
msgstr "Amharų"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:854
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:855
msgid "Wolof"
msgstr "Volofų"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:857
msgid "brl"
msgstr "Brl"
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:858
msgid "Braille"
msgstr "Brailio terminalas"
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:859
msgid "Braille (left hand)"
msgstr "Brailio terminalas (kairei rankai)"
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:860
msgid "Braille (right hand)"
msgstr "Brailio terminalas (dešinei rankai)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:862
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:863
msgid "Turkmen"
msgstr "Turkmėnų"
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:864
msgid "Turkmen (Alt-Q)"
msgstr "Turkmėnų (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:866
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:867
msgid "Bambara"
msgstr "Bambarų"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:868
msgid "French (Mali, alternative)"
msgstr "Prancūzų (Malis, alternatyvus)"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:869
msgid "English (Mali, US Macintosh)"
msgstr "Anglų (Malis, JAV „Macintosh“)"
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:870
msgid "English (Mali, US international)"
msgstr "Anglų (Malis, JAV tarptautinis)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:872
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:873
msgid "Swahili (Tanzania)"
msgstr "Svahilių (Tanzanija)"
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:874
msgid "Swahili (Kenya)"
msgstr "Svahilių (Kenija)"
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:875
msgid "Kikuyu"
msgstr "Kikuyu"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:877
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:878
msgid "Tswana"
msgstr "Tsvanų"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:880
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:881
msgid "Filipino"
msgstr "Filipiniečių"
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:882
msgid "Filipino (QWERTY Baybayin)"
msgstr "Filipiniečių (QWERTY, baibajinas)"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:883
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Filipiniečių (Keipvelo-Dvorako, lotyniški rašmenys)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:884
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Filipiniečių (Keipvelo-Dvorako, baibajinas)"
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Filipiniečių (Keipvelo QWERF 2006, lotyniški rašmenys)"
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Filipiniečių (Keipvelo QWERF 2006, baibajinas)"
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Colemak Latin)"
msgstr "Filipiniečių („Colemak“, lotyniški rašmenys)"
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Colemak Baybayin)"
msgstr "Filipiniečių („Colemak“, baibajinas)"
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Dvorak Latin)"
msgstr "Filipiniečių (Dvorako, lotyniški rašmenys)"
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Dvorak Baybayin)"
msgstr "Filipiniečių (Dvorako, baibajinas)"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:891
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:892
msgid "Moldavian"
msgstr "Moldavų"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:893
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:894
msgid "Moldavian (Gagauz)"
msgstr "Moldavų (gagaūzų)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:895
msgid "Switching to another layout"
msgstr "Perjungimas į kitą išdėstymą"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:896
msgid "Right Alt (while pressed)"
msgstr "Dešinysis Alt (kol nuspaustas)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:897
msgid "Left Alt (while pressed)"
msgstr "Kairysis Alt (kol nuspaustas)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:898
msgid "Left Win (while pressed)"
msgstr "Kairysis Win (kol nuspaustas)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:899
msgid "Right Win (while pressed)"
msgstr "Dešinysis Win (kol nuspaustas)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:900
msgid "Any Win key (while pressed)"
msgstr "Bet kuris Win klavišas (kol paspaustas)"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:901
msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
msgstr "Didž (kol nuspaustas); Alt+Didž atlieka pirminę Didž klavišo funkciją"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:902
msgid "Right Ctrl (while pressed)"
msgstr "Dešinysis Vald (kol nuspaustas)"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:903
msgid "Right Alt"
msgstr "Dešinysis Alt"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:904
msgid "Left Alt"
msgstr "Kairysis Alt"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:905
msgid "Caps Lock"
msgstr "Didžiosios raidės"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:906
msgid "Shift+Caps Lock"
msgstr "Lyg2+Didž"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
msgstr "Didž (į pirmąjį išdėstymą), Lyg2+Didž (į paskutinį išdėstymą)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:908
msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
msgstr "Kairysis Win (į pirmąjį išdėstymą), dešinysis Win/Meniu (į paskutinį išdėstymą)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:909
msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
msgstr "Kairysis Vald (į pirmąjį išdėstymą), dešinysis Vald (į paskutinį išdėstymą)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:910
msgid "Alt+Caps Lock"
msgstr "Alt+Didž"
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:911
msgid "Both Shift keys together"
msgstr "Vienu metu nuspausti abu Lyg2 klavišai"
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:912
msgid "Both Alt keys together"
msgstr "Vienu metu nuspausti abu Alt klavišai"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:913
msgid "Both Ctrl keys together"
msgstr "Vienu metu nuspausti abu Vald klavišai"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:914
msgid "Ctrl+Shift"
msgstr "Vald+Lyg2"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:915
msgid "Left Ctrl+Left Shift"
msgstr "Kairysis Vald+kairysis Lyg2"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:916
msgid "Right Ctrl+Right Shift"
msgstr "Dešinysis Vald+dešinysis Lyg2"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:917
msgid "Alt+Ctrl"
msgstr "Alt+Vald"
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:918
msgid "Alt+Shift"
msgstr "Alt+Lyg2"
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:919
msgid "Left Alt+Left Shift"
msgstr "Kairysis Alt+kairysis Lyg2"
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:920
msgid "Alt+Space"
msgstr "Alt+Tarpas"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:921
msgid "Menu"
msgstr "Meniu"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:922
msgid "Left Win"
msgstr "Kairysis Win"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:923
+msgid "Win Key+Space"
+msgstr "Win+Tarpas"
+
+#: ../rules/base.xml.in.h:924
msgid "Right Win"
msgstr "Dešinysis Win"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:925
msgid "Left Shift"
msgstr "Kairysis Lyg2"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:926
msgid "Right Shift"
msgstr "Dešinysis Lyg2"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:927
msgid "Left Ctrl"
msgstr "Kairysis Vald"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:928
msgid "Right Ctrl"
msgstr "Dešinysis Vald"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:929
msgid "Scroll Lock"
msgstr "Ekrano slinkimas"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:930
msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
msgstr "Kairysis Vald+Kairysis Win (į pirmąjį išdėstymą), Dešinysis Vald+Meniu (į antrąjį išdėstymą)"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:931
msgid "Key to choose 3rd level"
msgstr "Klavišai trečiajam lygiui pasirinkti"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:932
msgid "Any Win key"
msgstr "Bet kuris Win klavišas"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:933
msgid "Any Alt key"
msgstr "Bet kuris Alt klavišas"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:934
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Dešinysis Alt; Lyg2+dešinysis Alt atlieka Komponavimo klavišo funkciją"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:935
msgid "Right Alt key never chooses 3rd level"
msgstr "Dešinysis Alt niekada neįjungia trečiojo lygio"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:936
msgid "Enter on keypad"
msgstr "Įvedimo klavišas skaitmenų srityje"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:937
msgid "Backslash"
msgstr "Kairinis brūkšnys"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:938
msgid "&lt;Less/Greater&gt;"
msgstr "Mažiau/Daugiau"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:939
msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "Didž klavišas įjungia trečiąjį lygį; veikia kaip tęsties klavišas, kai naudojamas kartu su kitu trečiojo lygio parinkimo klavišu"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:940
msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "Kairinio brūkšnio klavišas įjungia trečiąjį lygį; veikia kaip tęsties klavišas, kai naudojamas kartu su kitu trečiojo lygio parinkimo klavišu"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:941
msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "Klavišas „Mažiau/Daugiau“ įjungia trečiąjį lygį; veikia kaip tęsties klavišas, kai naudojamas kartu su kitu trečiojo lygio parinkimo klavišu"
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:942
msgid "Ctrl key position"
msgstr "Vald klavišo pozicija"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:943
msgid "Caps Lock as Ctrl"
msgstr "Didž klavišui priskirti Vald funkciją"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:944
msgid "Left Ctrl as Meta"
msgstr "Kairiajam Vald klavišui priskirti Meta funkciją"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:945
msgid "Swap Ctrl and Caps Lock"
msgstr "Sukeisti Vald ir Didž klavišus"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:946
msgid "At left of 'A'"
msgstr "Kairėje nuo klavišo „A“"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:947
msgid "At bottom left"
msgstr "Apačioje kairėje"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:948
msgid "Right Ctrl as Right Alt"
msgstr "Dešiniajam Vald klavišui priskirti dešiniojo Alt funkciją"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:949
msgid "Menu as Right Ctrl"
msgstr "Meniu klavišas veikia kaip Dešinysis Vald"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:950
msgid "Right Alt as Right Ctrl"
msgstr "Dešiniajam Alt klavišui priskirti dešiniojo Vald funkciją"
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:951
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Sukeisti kairįjį Alt klavišą su kairiuoju Vald klavišu"
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:952
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Sukeisti kairįjį Win klavišą su kairiuoju Vald klavišu"
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:953
+msgid "Swap Right Win key with Right Ctrl key"
+msgstr "Sukeisti dešinįjį Win klavišą su dešiniuoju Vald klavišu"
+
+#: ../rules/base.xml.in.h:954
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Kairiajam Alt suteikti Vald funkciją, kairiajam Vald – Win f-ją, kairiajam Win – Alt f-ją."
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:955
msgid "Use keyboard LED to show alternative layout"
msgstr "Klaviatūros diodu indikuoti nepagrindinius išdėstymus"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:956
msgid "Num Lock"
msgstr "Skaitmenys"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:957
msgid "Layout of numeric keypad"
msgstr "Skaitmenų srities išdėstymas"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:958
msgid "Legacy"
msgstr "Senasis"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:959
msgid "Unicode additions (arrows and math operators)"
msgstr "Unikodiniai priedai (rodyklės ir matematiniai operatoriai)"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:960
msgid "Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Unikodiniai priedai (rodyklės ir matematiniai operatoriai; matematiniai operatoriai numatytame lygyje)"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:961
msgid "Legacy Wang 724"
msgstr "Senasis „Wang 724“"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:962
msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
msgstr "„Wang 724“ skaitmenų sritis su unikodiniais priedais (rodyklėmis ir matematiniais operatoriais)"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:963
msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
msgstr "„Wang 724“ skaitmenų sritis su unikodiniais priedais (rodyklėmis ir matematiniais operatoriais; matematiniai operatoriai pagrindiniame lygyje)"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:964
msgid "Hexadecimal"
msgstr "Šešioliktainė"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:965
msgid "ATM/phone-style"
msgstr "Bankomato/telefono tipo"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:966
msgid "Numeric keypad delete key behaviour"
msgstr "Skaitmenų srities Šalinimo klavišo veiksena"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:967
msgid "Legacy key with dot"
msgstr "Senojo tipo klavišas su tašku"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with comma"
msgstr "Senojo tipo klavišas su kableliu"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:970
msgid "Four-level key with dot"
msgstr "Keturių lygių, pirmajame taškas"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:971
msgid "Four-level key with dot, Latin-9 only"
msgstr "Keturių lygių, pirmajame taškas, Latin-9 ribojimas"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with comma"
msgstr "Keturių lygių, pirmajame kablelis"
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with momayyez"
msgstr "Keturių lygių, pirmajame persiškas skyriklis (momayyez)"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:976
msgid "Four-level key with abstract separators"
msgstr "Keturių lygių, su abstrakčiais skyrikliais"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:977
msgid "Semicolon on third level"
msgstr "Kabliataškis trečiajame lygyje"
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:978
msgid "Caps Lock key behavior"
msgstr "Didžiųjų raidžių klavišo veiksena"
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:979
msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
msgstr "Didž įjungia įtaisytąjį raidžių vertimą didžiosiomis; Lyg2 pristabdo Didž klavišo veikimą"
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock"
msgstr "Didž įjungia įtaisytąjį raidžių vertimą didžiosiomis; Lyg2 neįtakoja Didž klavišo veikimo"
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:981
msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
msgstr "Didž klavišas veikia Lyg2 su fiksavimu; Lyg2 pristabdo Didž veikimą"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:982
msgid "Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock"
msgstr "Didž klavišas veikia kaip Lyg2 su fiksavimu; Lyg2 neįtakoja Didž veikimo"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:983
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "Didž klavišas įjungia įprastą raidžių vertimą didžiosiomis"
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:984
msgid "Make Caps Lock an additional Num Lock"
msgstr "Didž klavišą paversti papildomu Skaitm klavišu"
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:985
msgid "Swap ESC and Caps Lock"
msgstr "Sukeisti Gr ir Didž klavišus"
-#: ../rules/base.xml.in.h:974
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional ESC"
msgstr "Didž klavišą paversti papildomu Gr klavišu"
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:987
msgid "Make Caps Lock an additional Backspace"
msgstr "Didž klavišą paversti papildomu Naikinimo kairėn klavišu"
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional Super"
msgstr "Didž klavišą paversti papildomu Super klavišu"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Hyper"
msgstr "Didž klavišą paversti papildomu Hyper klavišu"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:990
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "Didž klavišas veikia kaip nuolat nuspaustas Lyg2 (įtakoja visus klavišus)"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:991
msgid "Caps Lock is disabled"
msgstr "Didž klavišas nenaudojamas"
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:992
msgid "Make Caps Lock an additional Ctrl"
msgstr "Didž klavišą paversti papildomu Vald klavišu"
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:993
msgid "Alt/Win key behavior"
msgstr "Alt ir Win klavišų elgsena"
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:994
msgid "Add the standard behavior to Menu key"
msgstr "Meniu klavišui priskirti standartinę veikseną"
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:995
msgid "Alt and Meta are on Alt keys"
msgstr "Alt ir Meta funkcijos priskirtos Alt klavišams"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:996
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt funkciją priskirti Win klavišams bei įprastiems Alt klavišams"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:997
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Vald funkciją priskirti Win klavišams ir įprastiems Vald klavišams"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:998
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Vald funkciją priskirti Alt klavišams, o Alt funkciją – Win klavišams"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:999
msgid "Meta is mapped to Win keys"
msgstr "Win klavišams priskirti Meta funkciją"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:1000
msgid "Meta is mapped to Left Win"
msgstr "Kairiajam Win klavišui priskirti Meta funkciją"
-#: ../rules/base.xml.in.h:989
-msgid "Hyper is mapped to Win-keys"
+#: ../rules/base.xml.in.h:1001
+msgid "Hyper is mapped to Win keys"
msgstr "Win klavišams priskirti Hyper funkciją"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:1002
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Dešiniajam Win klavišui priskirti Alt funkciją, o Meniu klavišui – Super funkciją"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:1003
msgid "Alt is swapped with Win"
msgstr "Sukeisti Alt ir Win klavišų funkcijas vietomis"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:1004
msgid "Position of Compose key"
msgstr "Komponavimo klavišo pozicija"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:1005
msgid "3rd level of Left Win"
msgstr "Trečiasis kairiojo Win klavišo lygis"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:1006
msgid "3rd level of Right Win"
msgstr "Trečiasis dešiniojo Win klavišo lygis"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Menu"
msgstr "Trečiasis Meniu klavišo lygis"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Left Ctrl"
msgstr "Trečiasis kairiojo Vald klavišo lygis"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Right Ctrl"
msgstr "Trečiasis dešiniojo Vald klavišo lygis"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Caps Lock"
msgstr "Trečiasis Didž klavišo lygis"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "Trečiasis „Mažiau/Daugiau“ klavišo lygis"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1012
msgid "Pause"
msgstr "Pauzė"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1013
msgid "PrtSc"
msgstr "Sp"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1014
msgid "Miscellaneous compatibility options"
msgstr "Įvairios suderinamumo nuostatos"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1015
msgid "Default numeric keypad keys"
msgstr "Numatytieji skaitmenų srities klavišai"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1016
msgid "Numeric keypad keys always enter digits (as in Mac OS)"
msgstr "Skaitmenų srities klavišais visuomet įvedami skaitmenys (kaip „Mac OS“)"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1017
msgid "Shift with numeric keypad keys works as in MS Windows"
msgstr "Lyg2 su skaitmenų srities klavišais veikia kaip MS Windows sistemoje"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1018
msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
msgstr "Lyg2 nepristabdo Skaitm veikimo, bet įjungia trečiąjį lygį"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1019
msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
msgstr "Specialiosios sekos (Vald+Alt+&lt;klavišas&gt;) apdorojamos serveryje"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1020
msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
msgstr "Apple aliumininė klaviatūra: emuliuoti PC klavišus (Sp, Slinkti, Pauzė, Skaitm)"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1021
msgid "Shift cancels Caps Lock"
msgstr "Lyg2 nutraukia Didž veikimą"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1022
msgid "Enable extra typographic characters"
msgstr "Įjungti papildomus tipografinius simbolius"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1023
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Vienu metu nuspausti abu Lyg2 klavišai įjungia / išjungia didžiąsias raides"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1024
msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
msgstr "Vienu metu nuspausti abu Lyg2 klavišai įjungia didžiąsias raides, nuspaustas vienas Lyg2 jas išjungia"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Vienu metu nuspausti abu Lyg2 klavišai įjungia / išjungia antrąjį lygį"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1026
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Lyg2+Skaitm įjungia / išjungia pelės žymeklio valdymą skaitmenų srities klavišais."
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1027
msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
msgstr "Leisti klaviatūros veiksmais nutraukti jos užvaldymą (įspėjame: saugumo spraga)"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1028
msgid "Allow grab and window tree logging"
msgstr "Leisti klaviatūros užvaldymo ir langų medžio įrašymą"
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1029
msgid "Adding currency signs to certain keys"
msgstr "Valiutų simbolių įvedimas pasirinktais klavišais"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1030
msgid "Euro on E"
msgstr "Euro ženklas klavišo E trečiajame lygyje"
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1031
msgid "Euro on 2"
msgstr "Euro ženklas klavišo 2 trečiajame lygyje"
-#: ../rules/base.xml.in.h:1020
+#: ../rules/base.xml.in.h:1032
msgid "Euro on 4"
msgstr "Euro ženklas klavišo 4 trečiajame lygyje"
-#: ../rules/base.xml.in.h:1021
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 5"
msgstr "Euro ženklas klavišo 5 trečiajame lygyje"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1034
msgid "Rupee on 4"
msgstr "Rupijos ženklas klavišo 4 trečiajame lygyje"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1035
msgid "Key to choose 5th level"
msgstr "Klavišai penktajam lygiui pasirinkti"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1036
msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Klavišas „Mažiau/Daugiau“ įjungia penktąjį lygį, arba jį užfiksuoja, jeigu naudojamas kartu su kitu penktojo lygio parinkimo klavišu"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1037
msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Dešinysis Alt įjungia penktąjį lygį, arba jį užfiksuoja, jeigu naudojamas kartu su kitu penktojo lygio parinkimo klavišu"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1038
msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Kairysis Win įjungia penktąjį lygį, arba jį užfiksuoja, jeigu naudojamas kartu su kitu penktojo lygio parinkimo klavišu"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1039
msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Dešinysis Win įjungia penktąjį lygį, arba jį užfiksuoja, jeigu naudojamas kartu su kitu penktojo lygio parinkimo klavišu"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1040
msgid "Using space key to input non-breakable space character"
msgstr "Tarpo klavišo naudojimas jungiamajam tarpui įvesti"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1041
msgid "Usual space at any level"
msgstr "Įprastas tarpas visuose lygiuose"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1042
msgid "Non-breakable space character at second level"
msgstr "Jungiamasis tarpas antrajame lygyje"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1043
msgid "Non-breakable space character at third level"
msgstr "Jungiamasis tarpas trečiajame lygyje"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at third level, nothing at fourth level"
msgstr "Jungiamasis tarpas trečiajame lygyje, ketvirtajame lygyje nieko"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
msgstr "Jungiamasis tarpas trečiajame lygyje, siauras jungiamasis tarpas ketvirtajame lygyje"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1046
msgid "Non-breakable space character at fourth level"
msgstr "Jungiamasis tarpas ketvirtajame lygyje"
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1047
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
msgstr "Jungiamasis tarpas ketvirtajame lygyje, siauras jungiamasis tarpas šeštajame lygyje"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
msgstr "Jungiamasis tarpas ketvirtajame lygyje, siauras jungiamasis tarpas šeštajame lygyje (Vald+Lyg2)"
-#: ../rules/base.xml.in.h:1037
+#: ../rules/base.xml.in.h:1049
msgid "Zero-width non-joiner character at second level"
msgstr "Nulinio pločio skirtukas antrajame lygyje"
-#: ../rules/base.xml.in.h:1038
+#: ../rules/base.xml.in.h:1050
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
msgstr "Nulinio pločio skirtukas antrajame lygyje, nulinio pločio jungtukas trečiajame lygyje"
-#: ../rules/base.xml.in.h:1039
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
msgstr "Nulinio pločio skirtukas antrajame lygyje, nulinio pločio jungtukas trečiajame lygyje, jungiamasis tarpas ketvirtajame lygyje"
-#: ../rules/base.xml.in.h:1040
+#: ../rules/base.xml.in.h:1052
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
msgstr "Nulinio pločio skirtukas antrajame lygyje, jungiamasis tarpas trečiajame lygyje"
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1053
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
msgstr "Nulinio pločio skirtukas antrajame lygyje, jungiamasis tarpas trečiajame lygyje, ketvirtajame lygyje nieko"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1054
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
msgstr "Nulinio pločio skirtukas antrajame lygyje, jungiamasis tarpas trečiajame lygyje, nulinio pločio jungtukas ketvirtajame lygyje"
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1055
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
msgstr "Nulinio pločio skirtukas antrajame lygyje, jungiamasis tarpas trečiajame lygyje, siauras jungiamasis tarpas ketvirtajame lygyje"
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1056
msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
msgstr "Nulinio pločio skirtukas trečiajame lygyje, nulinio pločio jungtukas ketvirtajame lygyje"
-#: ../rules/base.xml.in.h:1045
+#: ../rules/base.xml.in.h:1057
msgid "Japanese keyboard options"
msgstr "Nuostatos japoninei klaviatūrai"
-#: ../rules/base.xml.in.h:1046
+#: ../rules/base.xml.in.h:1058
msgid "Kana Lock key is locking"
msgstr "Kana Lock klavišas fiksuojantis"
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1059
msgid "NICOLA-F style Backspace"
msgstr "NICOLA-F tipo naikinimas kairėn"
-#: ../rules/base.xml.in.h:1048
+#: ../rules/base.xml.in.h:1060
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "„Zenkaku Hankaku“ klavišą paversti papildomu Gr klavišu"
-#: ../rules/base.xml.in.h:1049
+#: ../rules/base.xml.in.h:1061
msgid "Adding Esperanto supersigned letters"
msgstr "Esperanto raidžių su diakritikais įvedimas"
-#: ../rules/base.xml.in.h:1050
+#: ../rules/base.xml.in.h:1062
msgid "To the corresponding key in a Qwerty layout"
msgstr "Atitinkamais QWERTY išdėstymo klavišais"
-#: ../rules/base.xml.in.h:1051
+#: ../rules/base.xml.in.h:1063
msgid "To the corresponding key in a Dvorak layout"
msgstr "Atitinkamais Dvorako išdėstymo klavišais"
-#: ../rules/base.xml.in.h:1052
+#: ../rules/base.xml.in.h:1064
msgid "To the corresponding key in a Colemak layout"
msgstr "Atitinkamais „Colemak“ išdėstymo klavišais"
-#: ../rules/base.xml.in.h:1053
+#: ../rules/base.xml.in.h:1065
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Išlaikyti klavišų suderinamumą su senais „Solaris“ klavišų kodais"
-#: ../rules/base.xml.in.h:1054
+#: ../rules/base.xml.in.h:1066
msgid "Sun Key compatibility"
msgstr "Suderinamumas su „Sun“ klavišais"
-#: ../rules/base.xml.in.h:1055
+#: ../rules/base.xml.in.h:1067
msgid "Key sequence to kill the X server"
msgstr "Klavišų seka X serverio darbui nutraukti"
-#: ../rules/base.xml.in.h:1056
+#: ../rules/base.xml.in.h:1068
msgid "Ctrl + Alt + Backspace"
msgstr "Vald+Alt+Naikinimas iš kairės"
@@ -3940,254 +3988,331 @@ msgstr "apl"
msgid "APL keyboard symbols"
msgstr "APL klaviatūros simboliai"
+#: ../rules/base.extras.xml.in.h:3
+msgid "dlg"
+msgstr "dlg"
+
+#: ../rules/base.extras.xml.in.h:4
+msgid "APL keyboard symbols (Dyalog)"
+msgstr "APL klaviatūros simboliai („Dyalog“)"
+
#: ../rules/base.extras.xml.in.h:5
+msgid "sax"
+msgstr "sax"
+
+#: ../rules/base.extras.xml.in.h:6
+msgid "APL keyboard symbols (sax)"
+msgstr "APL klaviatūros simboliai („sax“)"
+
+#: ../rules/base.extras.xml.in.h:7
+msgid "ufd"
+msgstr "ufd"
+
+#: ../rules/base.extras.xml.in.h:8
+msgid "APL keyboard symbols (unified)"
+msgstr "APL klaviatūros simboliai (unifikuotieji)"
+
+#: ../rules/base.extras.xml.in.h:9
+msgid "apl2"
+msgstr "apl2"
+
+#: ../rules/base.extras.xml.in.h:10
+msgid "APL keyboard symbols (IBM APL2)"
+msgstr "APL klaviatūros simboliai (IBM APL2)"
+
+#: ../rules/base.extras.xml.in.h:11
+msgid "aplII"
+msgstr "aplII"
+
+#: ../rules/base.extras.xml.in.h:12
+msgid "APL keyboard symbols (Manugistics APL*PLUS II)"
+msgstr "APL klaviatūros simboliai („Manugistics APL*PLUS II“)"
+
+#: ../rules/base.extras.xml.in.h:13
+msgid "aplx"
+msgstr "aplx"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "APL keyboard symbols (APLX unified)"
+msgstr "APL klaviatūros simboliai (APLX unifikuotieji)"
+
+#: ../rules/base.extras.xml.in.h:17
msgid "kut"
msgstr "kut"
-#: ../rules/base.extras.xml.in.h:6
+#: ../rules/base.extras.xml.in.h:18
msgid "Kutenai"
msgstr "Kutenai"
-#: ../rules/base.extras.xml.in.h:7
+#: ../rules/base.extras.xml.in.h:19
msgid "shs"
msgstr "shs"
-#: ../rules/base.extras.xml.in.h:8
+#: ../rules/base.extras.xml.in.h:20
msgid "Secwepemctsin"
msgstr "Šušvapų"
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:21
msgid "Multilingual (Canada, Sun Type 6/7)"
msgstr "Daugiakalbis (Kanada, „Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:24
msgid "German (US keyboard with German letters)"
msgstr "Vokiečių (JAV klaviatūra su vokiškomis raidėmis)"
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:25
msgid "German (with Hungarian letters and no dead keys)"
msgstr "Vokiečių (su vengriškais rašmenimis, be tęsties klavišų)"
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:26
msgid "German (Sun Type 6/7)"
msgstr "Vokiečių („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:27
+msgid "German (Aus der Neo-Welt)"
+msgstr "Vokiečių („Aus der Neo-Welt“)"
+
+#: ../rules/base.extras.xml.in.h:30
msgid "Avestan"
msgstr "Avestos"
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:33
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Lietuvių (JAV Dvorako klaviatūra su lietuviškais rašmenimis)"
-#: ../rules/base.extras.xml.in.h:21
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Lietuvių („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:37
msgid "Latvian (US Dvorak)"
msgstr "Latvių (JAV Dvorako)"
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Latvių (JAV Dvorako, Y variantas)"
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Latvių (JAV Dvorako, minuso variantas)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (programmer US Dvorak)"
msgstr "Latvių (programuotojų JAV Dvorako)"
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Latvių (programuotojų JAV Dvorako, Y variantas)"
-#: ../rules/base.extras.xml.in.h:29
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Latvių (programuotojų JAV Dvorako, minuso variantas)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (US Colemak)"
msgstr "Latvių (JAV „Colemak“)"
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Latvių (JAV „Colemak“, apostrofo variantas)"
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (Sun Type 6/7)"
msgstr "Latvių („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:35
+#: ../rules/base.extras.xml.in.h:48
msgid "English (US, international AltGr Unicode combining)"
msgstr "Anglų (JAV, tarptautinis, unikodo ženklai kombinuojami Lyg3 klavišu)"
-#: ../rules/base.extras.xml.in.h:36
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Anglų (JAV, tarptautinis, unikodo ženklai kombinuojami Lyg3 klavišu, alternatyvus)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:50
msgid "Atsina"
msgstr "Atsinų"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:51
msgid "Coeur d'Alene Salish"
msgstr "Sališų (Coeur D'Alene)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:52
+msgid "Czech Slovak and German (US)"
+msgstr "Čekų, slovakų ir vokiečių (JAV)"
+
+#: ../rules/base.extras.xml.in.h:53
msgid "English (US, Sun Type 6/7)"
msgstr "Anglų (JAV, „Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:54
msgid "English (Norman)"
msgstr "Anglų („Norman“)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:57
msgid "Polish (international with dead keys)"
msgstr "Lenkų (tarptautinis, su tęsties klavišais)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (Colemak)"
msgstr "Lenkų („Colemak“)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Sun Type 6/7)"
msgstr "Lenkų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:63
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Krymo totorių (Dobrudža Q)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:64
msgid "Romanian (ergonomic Touchtype)"
msgstr "Rumunų (ergonominis, aklojo rašymo)"
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (Sun Type 6/7)"
msgstr "Rumunų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:68
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Serbų (kombinaciniai diakritikai vietoje tęsties klavišų)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:71
+msgid "Church Slavonic"
+msgstr "Bažnytinė slavų"
+
+#: ../rules/base.extras.xml.in.h:72
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Rusų (su ukrainietiškais ir baltarusiškais rašmenimis)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (Sun Type 6/7)"
msgstr "Rusų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:61
+#: ../rules/base.extras.xml.in.h:76
msgid "Armenian (OLPC phonetic)"
msgstr "Armėnų (OLPC fonetinis)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:79
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Hebrajų (biblinė, SIL fonetinis)"
-#: ../rules/base.extras.xml.in.h:67
+#: ../rules/base.extras.xml.in.h:82
msgid "Arabic (Sun Type 6/7)"
msgstr "Arabų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:70
+#: ../rules/base.extras.xml.in.h:85
msgid "Belgian (Sun Type 6/7)"
msgstr "Belgų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Portugalų (Brazilija, „Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:91
msgid "Czech (Sun Type 6/7)"
msgstr "Čekų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:94
msgid "Danish (Sun Type 6/7)"
msgstr "Ispanų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:97
msgid "Dutch (Sun Type 6/7)"
msgstr "Olandų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:100
msgid "Estonian (Sun Type 6/7)"
msgstr "Estų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:103
msgid "Finnish (Sun Type 6/7)"
msgstr "Suomių („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:90
+#: ../rules/base.extras.xml.in.h:105
msgid "French (Sun Type 6/7)"
msgstr "Prancūzų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:93
+#: ../rules/base.extras.xml.in.h:108
msgid "Greek (Sun Type 6/7)"
msgstr "Graikų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:96
+#: ../rules/base.extras.xml.in.h:111
msgid "Italian (Sun Type 6/7)"
msgstr "Italų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:99
+#: ../rules/base.extras.xml.in.h:114
msgid "Japanese (Sun Type 6)"
msgstr "Japonų („Sun Type 6“)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Japonų („Sun Type 7“, suderinamas su PC)"
-#: ../rules/base.extras.xml.in.h:101
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Japonų („Sun Type 7“, suderinamas su „Sun“)"
-#: ../rules/base.extras.xml.in.h:104
+#: ../rules/base.extras.xml.in.h:119
msgid "Norwegian (Sun Type 6/7)"
msgstr "Norvegų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:106
+#: ../rules/base.extras.xml.in.h:121
msgid "Portuguese (Sun Type 6/7)"
msgstr "Portugalų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:109
+#: ../rules/base.extras.xml.in.h:124
msgid "Slovak (Sun Type 6/7)"
msgstr "Slovakų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:112
+#: ../rules/base.extras.xml.in.h:127
msgid "Spanish (Sun Type 6/7)"
msgstr "Ispanų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:130
+msgid "Swedish (Dvorak A5)"
+msgstr "Švedų (Dvorako A5)"
+
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Sun Type 6/7)"
msgstr "Švedų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:117
+#: ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Vokiečių (Šveicarija, „Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:118
+#: ../rules/base.extras.xml.in.h:134
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Prancūzų (Šveicarija, „Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:137
msgid "Turkish (Sun Type 6/7)"
msgstr "Turkų („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:140
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Ukrainiečių („Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:126
+#: ../rules/base.extras.xml.in.h:142
msgid "English (UK, Sun Type 6/7)"
msgstr "Anglų (JK, „Sun Type 6/7“)"
-#: ../rules/base.extras.xml.in.h:129
+#: ../rules/base.extras.xml.in.h:145
msgid "Korean (Sun Type 6/7)"
msgstr "Korėjiečių („Sun Type 6/7“)"
+#. Keyboard indicator for European layouts
+#: ../rules/base.extras.xml.in.h:147
+msgid "eu"
+msgstr "eu"
+
+#: ../rules/base.extras.xml.in.h:148
+msgid "EurKEY (US based layout with european letters)"
+msgstr "„EurKEY“ (JAV klaviatūra su Europos kalbų raidėmis)"
+
+#: ../rules/base.extras.xml.in.h:151
+msgid "Mmuock"
+msgstr "Mmuock"
+
#~ msgid "English (layout toggle on multiply/divide key)"
#~ msgstr "Anglų (išdėstymas perjungiamas daugybos/dalybos klavišu)"
@@ -4359,9 +4484,6 @@ msgstr "Korėjiečių („Sun Type 6/7“)"
#~ msgid "Denmark"
#~ msgstr "Danija"
-#~ msgid "Deu"
-#~ msgstr "Deu"
-
#~ msgid "Dnk"
#~ msgstr "Dnk"
diff --git a/xorg-server/xkeyboard-config/po/nl.po b/xorg-server/xkeyboard-config/po/nl.po
index 0865851b9..b3f512406 100644
--- a/xorg-server/xkeyboard-config/po/nl.po
+++ b/xorg-server/xkeyboard-config/po/nl.po
@@ -1,9 +1,8 @@
# Dutch translations for xkeyboard-config.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2015 Free Software Foundation, Inc.
# This file is distributed under the same license as the xkeyboard-config package.
#
-# "Voor een speler die structureel iets te dik was,
-# heb je het best redelijk gedaan."
+# »Eine schöne, leichte Schwere.«
#
# ------------------------------------------------------------------------------
# *** Vocabulair ***
@@ -29,13 +28,13 @@
# ------------------------------------------------------------------------------
# Taco Witte <tcwitte@cs.uu.nl>, 2003, 2004, 2005, 2006.
# Tino Meinen <tino.meinen@gmail.com>, 2007, 2008, 2009, 2011, 2012.
-# Benno Schulenberg <benno@vertaalt.nl>, 2013, 2014.
+# Benno Schulenberg <benno@vertaalt.nl>, 2013, 2014, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config-2.12.99\n"
+"Project-Id-Version: xkeyboard-config-2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-09-18 23:46+0100\n"
-"PO-Revision-Date: 2014-09-20 11:27+0200\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-17 17:21+0100\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
"Language: nl\n"
@@ -779,16 +778,17 @@ msgstr "FL90"
msgid "Creative Desktop Wireless 7000"
msgstr "Creative Desktop Wireless 7000"
+# FIXME: uppercase; and maybe is a duplicate?
#: ../rules/base.xml.in.h:184
msgid "Htc Dream phone"
-msgstr "Htc Dream phone"
+msgstr "HTC Dream phone"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "Engels (VS)"
@@ -846,7 +846,7 @@ msgid "English (programmer Dvorak)"
msgstr "Engels (programmeer-Dvorak)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -880,7 +880,7 @@ msgid "English (Workman, international with dead keys)"
msgstr "Engels (Workman, internationaal, met dode toetsen)"
#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -919,11 +919,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Oezbeeks (Afghanistan, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Arabisch"
@@ -965,11 +965,11 @@ msgid "Albanian (Plisi D1)"
msgstr "Albanees (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Armeens"
@@ -1045,11 +1045,11 @@ msgid "Belarusian (Latin)"
msgstr "Wit-Russisch (Latijns)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Belgisch"
@@ -1318,11 +1318,11 @@ msgid "Bosnian (US keyboard with Bosnian letters)"
msgstr "Bosnisch (VS-toetsenbord met Bosnische lettertekens)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Portugees (Brazilië)"
@@ -1407,11 +1407,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Berbers (Marokko, Tifinagh fonetisch uitgebreid)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Engels (Kameroen)"
@@ -1534,11 +1534,11 @@ msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Kroatisch (VS-toetsenbord met Kroatische lettertekens)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "Tsjechisch"
@@ -1550,7 +1550,7 @@ msgstr "Tsjechisch (met &lt;\\|&gt;-toets)"
msgid "Czech (qwerty)"
msgstr "Tsjechisch (qwerty)"
-# XXX brede backslash/uitgebreide backslash -- wat is dit?
+# XXX: brede backslash/uitgebreide backslash -- wat is dit?
#: ../rules/base.xml.in.h:402
msgid "Czech (qwerty, extended Backslash)"
msgstr "Tsjechisch (qwerty, brede backslash-toets)"
@@ -1559,17 +1559,17 @@ msgstr "Tsjechisch (qwerty, brede backslash-toets)"
msgid "Czech (UCW layout, accented letters only)"
msgstr "Tsjechisch (UCW-indeling, alleen lettertekens met accenten)"
-# XXX CZ?
+# XXX: CZ?
#: ../rules/base.xml.in.h:404
msgid "Czech (US Dvorak with CZ UCW support)"
msgstr "Tsjechisch (VS, Dvorak met Tsjechische UCW-ondersteuning)"
#. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Deens"
@@ -1594,11 +1594,11 @@ msgid "Danish (Dvorak)"
msgstr "Deens (Dvorak)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Nederlands"
@@ -1625,13 +1625,13 @@ msgid "Dzongkha"
msgstr "Dzongkha"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
# Estisch, de taal die ook Estlands of Ests wordt genoemd,
# heeft ongeveer 1 miljoen sprekers.
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Estisch"
@@ -1647,7 +1647,7 @@ msgstr "Estisch (Dvorak)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Estisch (VS-toetsenbord met Estische lettertekens)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Perzisch"
@@ -1710,11 +1710,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "Faeröers (zonder dode toetsen)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Fins"
@@ -1738,7 +1738,7 @@ msgstr "Noord-Samisch (Finland)"
msgid "Finnish (Macintosh)"
msgstr "Fins (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Frans"
@@ -1984,11 +1984,11 @@ msgid "German (legacy)"
msgstr "Duits (historisch)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Grieks"
@@ -2123,11 +2123,11 @@ msgid "Icelandic (Dvorak)"
msgstr "IJslands (Dvorak)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "Hebreeuws"
@@ -2144,11 +2144,11 @@ msgid "Hebrew (Biblical, Tiro)"
msgstr "Hebreeuws (Bijbels, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Italiaans"
@@ -2177,11 +2177,11 @@ msgid "Italian (IBM 142)"
msgstr "Italiaans (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "Japans"
@@ -2238,7 +2238,7 @@ msgstr "Kazachstaans"
#: ../rules/base.xml.in.h:587
msgid "Russian (Kazakhstan, with Kazakh)"
-msgstr "Russisch (Kazachstans, met Kazachstaans)"
+msgstr "Russisch (Kazachstan, met Kazachstaans)"
#: ../rules/base.xml.in.h:588
msgid "Kazakh (with Russian)"
@@ -2258,7 +2258,7 @@ msgid "Lao (STEA proposed standard layout)"
msgstr "Lao (STEA voorgestelde standaard indeling)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
@@ -2279,11 +2279,11 @@ msgid "Spanish (Latin American, Sun dead keys)"
msgstr "Spaans (Latijns-Amerika, Sun dode toetsen)"
#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Litouws"
@@ -2308,11 +2308,11 @@ msgid "Lithuanian (LEKPa)"
msgstr "Litouws (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Lets"
@@ -2350,7 +2350,7 @@ msgid "Maori"
msgstr "Maori"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
@@ -2427,11 +2427,11 @@ msgid "Mongolian"
msgstr "Mongools"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Noors"
@@ -2468,11 +2468,11 @@ msgid "Norwegian (Colemak)"
msgstr "Noors (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "Pools"
@@ -2512,7 +2512,7 @@ msgstr "Russisch (Polen, fonetisch Dvorak)"
msgid "Polish (programmer Dvorak)"
msgstr "Pools (programmeer-Dvorak)"
-#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Portugees"
@@ -2550,11 +2550,11 @@ msgid "Esperanto (Portugal, Nativo)"
msgstr "Esperanto (Portugal, Nativo)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Roemeens"
@@ -2574,7 +2574,7 @@ msgstr "Roemeens (standaard cedilla)"
msgid "Romanian (WinKeys)"
msgstr "Roemeens (Windows-toetsen)"
-#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Russisch"
@@ -2656,40 +2656,48 @@ msgstr "Basjkiers"
msgid "Mari"
msgstr "Mari"
-#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Russisch (fonetisch, azerty)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "Russisch (fonetisch, Frans)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "Servisch"
# verwisseld/gewisseld/omgewisseld
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Servisch (Cyrillisch, ZE en ZHE omgewisseld)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Servisch (Latijns)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "Servisch (Latijns Unicode)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "Servisch (Latijns qwerty)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Servisch (Latijns Unicode qwerty)"
# Guillemets of ook quillemets zijn Franse aanhalingstekens.
# Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Servisch (Cyrillisch met Franse aanhalingstekens)"
# Guillemets of ook quillemets zijn Franse aanhalingstekens.
# Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "Servisch (Latijns met Franse aanhalingstekens)"
@@ -2698,768 +2706,768 @@ msgstr "Servisch (Latijns met Franse aanhalingstekens)"
# north-western Serbia (Bačka region) and eastern Croatia
# (therefore also called Yugoslavo-Ruthenian, Vojvodina-Ruthenian
# or Bačka-Ruthenian).
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Pannonisch Rusyn"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Sloveens"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "Sloveens (met Franse aanhalingstekens)"
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:714
msgid "Slovenian (US keyboard with Slovenian letters)"
msgstr "Sloveens (VS-toetsenbord met Sloveense lettertekens)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "Slowaaks"
-# XXX brede backslash/uitgebreide backslash
-#: ../rules/base.xml.in.h:716
+# XXX: brede backslash/uitgebreide backslash
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "Slowaaks (brede backslash-toets)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "Slowaaks (qwerty)"
-# XXX brede backslash/uitgebreide backslash
-#: ../rules/base.xml.in.h:718
+# XXX: brede backslash/uitgebreide backslash
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Slowaaks (qwerty, brede backslash-toets)"
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "Spaans"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "Spaans (zonder dode toetsen)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Spaans (Windows-toetsen)"
# inactieve/dode/latente
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Spaans (met dode tilde)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Spaans (Sun dode toetsen)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Spaans (Dvorak)"
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:727
msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
msgstr "Asturisch (Spanje, met onderpunts H en onderpunts L)"
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Catalaans (Spanje, met middenpunts L)"
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Spaans (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Zweeds"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "Zweeds (zonder dode toetsen)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Zweeds (Dvorak)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "Russisch (Zweden, fonetisch)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Russisch (Zweden, fonetisch, zonder dode toetsen)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Noord-Samisch (Zweden)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Zweeds (Macintosh)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Zweeds (Svdvorak)"
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "Zweedse gebarentaal"
-#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Duits (Zwitserland)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Duits (Zwitserland, historisch)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Duits (Zwitserland, zonder dode toetsen)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Duits (Zwitserland, Sun dode toetsen)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Frans (Zwitserland)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Frans (Zwitserland, zonder dode toetsen)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Frans (Zwitserland, Sun dode toetsen)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Frans (Zwitserland, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Duits (Zwitserland, Macintosh)"
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Arabisch (Syrië)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Syrisch"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Syrisch (fonetisch)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Koerdisch (Syrië, Latijns Q)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Koerdisch (Syrië, F)"
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Koerdisch (Syrië, Latijns Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
# Het Tadzjieks of Tajiki.
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Tadzjieks"
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Tadzjieks (historisch)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Singalees (fonetisch)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tamil (Sri Lanka, Unicode)"
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Tamil (Sri Lanka, TAB-typmachine)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
# Het Thai is de officiële taal van Thailand.
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "Thai"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Thai (TIS-820.2538)"
# Pattachote en Kedmanee zijn de twee toetsenbordindelingen voor Thai.
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Thai (Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Turks"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Turks (F)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Turks (Alt-Q)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Turks (Sun dode toetsen)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Koerdisch (Turks, Latijns Q)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "Koerdisch (Turks, F)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Koerdisch (Turks, Latijns Alt-Q)"
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:781
msgid "Turkish (international with dead keys)"
msgstr "Turks (internationaal, met dode toetsen)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Krim-Tataars (Turks Q)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Krim-Tataars (Turks F)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Krim-Tataars (Turks Alt-Q)"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Taiwanees"
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Taiwanees (oorspronkelijk)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
# Saisiyat, ook Saiset, Seisirat, Saisett, Saisiat, Saisiett, Saisirat,
# Saisyet, Saisyett, Amutoura of Bouiok.
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Saisiyat (Taiwan)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "Oekraïens"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "Oekraïens (fonetisch)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "Oekraïens (typmachine)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "Oekraïens (Windows-toetsen)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "Oekraïens (historisch)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "Oekraïens (standaard RSTU)"
# Oekraïens (standaard RSTU).
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Russisch (Oekraïne, standaard RSTU)"
# Pannonian Rusyn (руска бешеда) or simply Rusyn (or Ruthenian) is a Slavic language
# or dialect spoken by Pannonian Rusyns in north-western Serbia (Bačka region) and eastern
# Croatia (therefore also called Yugoslavo-Ruthenian, Vojvodina-Ruthenian or Bačka-Ruthenian).
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "Oekraïens (homophonisch)"
-#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Engels (GB)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Engels (GB, uitgebreid, Windows-toetsen)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "Engels (GB, internationaal, met dode toetsen)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Engels (GB, Dvorak)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Engels (GB, Dvorak met Britse leestekens)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Engels (GB, Macintosh)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "Engels (GB, Macintosh internationaal)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "Engels (GB, Colemak)"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Oezbeeks"
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Oezbeeks (Latijns)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Viëtnamees"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "Koreaans"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "Koreaans (101/104-toetsen compatibel)"
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Japans (PC-98xx serie)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Iers"
# Iers.
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Iers (UnicodeExpert)"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Ogham"
# Iers (Ogham IS434).
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Ogham (IS434)"
# Het Urdu, vroeger door Westerse taalkundigen vaak Hindoestani genoemd,
# is de officiële taal van Pakistan.
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Urdu (Pakistan)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdu (Pakistan, CRULP)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdu (Pakistan, NLA)"
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Arabisch (Pakistan)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Sindhi"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Dhivehi"
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Engels (Zuid-Afrika)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:841
msgid "Esperanto (displaced semicolon and quote, obsolete)"
msgstr "Esperanto (puntkomma en aanhalingsteken op afwijkende plek, historisch)"
#. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Nepalees"
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Engels (Nigeria)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Igbo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
# Het Yoruba is een Afrikaanse taal. Het is de taal van de Yoruba
# en wordt gesproken in Nigeria, Benin en Togo.
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Yoruba"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
# Het Amhaars is een Semitische taal die in Ethiopië gesproken wordt.
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Amhaars"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "Wolof"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Braille"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Braille (linkerhand)"
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Braille (rechterhand)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Turkmeens"
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Turkmeens (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
# Bambara, ook bekend onder de naam Bamanankan, is een Mande-taal die door meer
# dan zes miljoen mensen gesproken wordt, voornamelijk in Mali.
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Bambara"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Frans (Mali, alternatief)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Engels (Mali, US Macintosh)"
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Engels (Mali, US internationaal)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Swahili (Tanzania)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Swahili (Kenia)"
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Kikuyu"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
# Tswana of Setswana is een Bantoetaal die wordt gesproken in Botswana.
# Andere benamingen voor Tswana zijn onder meer Sechuana en Beetjuans.
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Tswana"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
# Het Filipijns (Filipino of Pilipino).
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Filipijns"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Filipijns (QWERTY Baybayin)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Filipijns (Capewell-Dvorak, Latijns)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Filipijns (Capewell-Dvorak, Baybayin)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Filipijns (Capewell-QWERF 2006 Latijns)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Filipijns (Capewell-QWERF 2006 Baybayin)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Filipijns (Colemak, Latijns)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Filipijns (Colemak, Baybayin)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Filipijns (Dvorak, Latijns)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Filipijns (Dvorak, Baybayin)"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Moldavisch"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Moldavisch (Gagauz)"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Overschakelen naar een andere indeling"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Rechter Alt-toets (ingedrukt gehouden)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Linker Alt-toets (ingedrukt gehouden)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Linker Windows-toets (ingedrukt gehouden)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "Rechter Windows-toets (ingedrukt gehouden)"
# Beide Win-toetsen wisselen de indeling gedurende het indrukken.
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "Elke Windows-toets (ingedrukt gehouden)"
-# XXX -- what IS original capslock action?
-#: ../rules/base.xml.in.h:901
+# XXX: what IS original capslock action?
+#: ../rules/base.xml.in.h:903
msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
msgstr "CapsLock (ingedrukt gehouden); Alt+CapsLock geeft de oorspronkelijke caps-lock actie"
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Rechter Ctrl-toets (ingedrukt gehouden)"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Rechter Alt-toets"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Linker Alt-toets"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "CapsLock"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Shift + CapsLock"
# CapsLock wisselt naar de eerste indeling, Shift+CapsLock wisselt naar de laatste indeling.
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:909
msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
msgstr "CapsLock (naar eerste indeling), Shift+CapsLock (naar laatste indeling)"
# Linker Win-toets wisselt naar de eerste indeling, rechter Win/Menu-toets wisselt naar de laatste indeling.
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:910
msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
msgstr "Linker Windows-toets (naar eerste indeling), rechter Windows/Menu-toets (naar laatste indeling)"
# Linker Win-toets wisselt naar de eerste indeling, rechter Win/Menu-toets wisselt naar de laatste indeling.
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:911
msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
msgstr "Linker Ctrl-toets (naar eerste indeling), rechter Ctrl-toets (naar laatste indeling)"
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt + CapsLock"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Beide Shift-toetsen samen"
@@ -3467,581 +3475,581 @@ msgstr "Beide Shift-toetsen samen"
# "Beide Alt-toetsen samen verandert de groep."
#
# tezamen/samen/tegelijk
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Beide Alt-toetsen samen"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Beide Ctrl-toetsen samen"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl + Shift"
# Linker Ctrl + Shift-toets
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Linker Ctrl + linker Shift-toets"
# Rechter Ctrl + Shift-toets
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Rechter Ctrl + rechter Shift-toets"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt + Ctrl"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt + Shift"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Linker Alt + linker Shift-toets"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt + Spatie"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Menu"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Linker Windows-toets"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "Windows-toets + Spatie"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Rechter Windows-toets"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Linker Shift-toets"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Rechter Shift-toets"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Linker Ctrl-toets"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Rechter Ctrl-toets"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Scroll-Lock"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:932
msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
msgstr "Linker Ctrl + linker Windows-toets (naar eerste indeling), rechter Ctrl + Menu-toets (naar tweede indeling)"
# aan te zetten/te kiezen/te selecteren/te krijgen/te bereiken
# 'to choose' is hier een slechte woordkeuze IMO
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Toegang tot het derde niveau"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "Elke Windows-toets"
# Beide/Willekeurige/Een van de/Een/Elke
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "Elke Alt-toets"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Rechter Alt-toets (Shift + rechter Alt-toets is samensteltoets)"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "Rechter Alt-toets geeft nooit het derde niveau"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Enter op cijferblok"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Backslash"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Kleiner dan/Groter dan&gt;"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:941
msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "CapsLock, vergrendelt eenmalig samen met andere derdeniveaukiezer"
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:942
msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "Backslash, vergrendelt eenmalig samen met andere derdeniveaukiezer"
# locks - op slot gezet/blijvend/in stand houden
# latches - vergrendelt
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:943
msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "&lt;Kleiner dan/Groter dan&gt;, vergrendelt eenmalig samen met andere derdeniveaukiezer"
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Positie van Ctrl-toets"
# Ctrl-toets is hier duidelijker
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "CapsLock is Ctrl-toets"
# fungeert als/werkt als/is
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Linker Ctrl is Meta-toets"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Ctrl en CapsLock omwisselen"
# Ctrl-toets links van ‘A’
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "Links van de A"
# "Ctrl-toets zit linksonder"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "Linksonder"
# fungeert als/werkt als/is
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Rechter Ctrl is rechter Alt-toets"
# fungeert als/werkt als/is
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menu is rechter Ctrl-toets"
# fungeert als/werkt als/is
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Rechter Alt is rechter Ctrl-toets"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Linker Alt- en linker Ctrl-toets omwisselen"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Linker Windows- en linker Ctrl-toets omwisselen"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:955
msgid "Swap Right Win key with Right Ctrl key"
msgstr "Rechter Windows- en rechter Ctrl-toets omwisselen"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Linker Alt is Ctrl, linker Ctrl is Windows-toets, linker Windows-toets is Alt"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:957
msgid "Use keyboard LED to show alternative layout"
msgstr "Toetsenbord-LED gebruiken om alternatieve indeling te tonen"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "NumLock"
# dubbelop numeriek/cijfer
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Indeling van het cijferblok"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Historisch"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Unicode-aanvullingen (pijlen en wiskundige operatoren)"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:962
msgid "Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Unicode-aanvullingen (pijlen en wiskundige operatoren; de laatste op standaardniveau)"
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Historisch Wang 724"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:964
msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
msgstr "Wang 724 cijferblok met Unicode-aanvullingen (pijlen en wiskundige operatoren)"
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:965
msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Wang 724 cijferblok met Unicode aanvullingen (pijlen en wiskundige operatoren; de laatste op standaardniveau)"
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Hexadecimaal"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "ATM/telefoonstijl"
# Op het cijferblok is de delete toets aangegeven met "Del", maar
# voor de duidelijkheid maar "Delete-toetsgedrag" van gemaakt.
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "Gedrag van Delete-toets op cijferblok"
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with dot"
msgstr "Historisch met punt"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Historisch met komma"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Vierniveaus-toets met punt"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Vierniveaus-toets met punt, beperkt tot Latin-9"
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "Vierniveaus-toets met komma"
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:975
msgid "Four-level key with momayyez"
msgstr "Vierniveaus-toets met momayyez"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Vierniveaus-toets met abstracte scheidingstekens"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Puntkomma op derde niveau"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Gedrag van CapsLock-toets"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:981
msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
msgstr "CapsLock gebruikt interne conversie naar hoofdletters; Shift heft CapsLock tijdelijk op"
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:982
msgid "Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock"
msgstr "CapsLock gebruikt interne conversie naar hoofdletters; Shift heft CapsLock niet op"
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:983
msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
msgstr "CapsLock werkt als Shift met vergrendeling; Shift heft CapsLock tijdelijk op"
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:984
msgid "Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock"
msgstr "CapsLock werkt als Shift met vergrendeling; Shift heft CapsLock niet op"
# heeft alleen effect op/werkt alleen op/beïnvloedt alleen ~
# de alfabetische toetsen/
# bepaalt hoofdletters/kleine letters bij alfabetische tekens.<
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:985
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "CapsLock beïnvloedt alleen alfabetische tekens"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "Van CapsLock een extra NumLock maken"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Esc en CapsLock omwisselen"
# ESC-toets.
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "Van CapsLock een extra Esc maken"
# Backspace-toets.
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "Van CapsLock een extra Backspace maken"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "Van CapsLock een extra Super maken"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "Van CapsLock een extra Hyper maken"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "CapsLock schakelt Shift-vergrendeling aan/uit (beïnvloedt alle toetsen)"
# heeft geen functie/geen effect
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "CapsLock is uitgeschakeld"
# Ctrl-toets
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "Van CapsLock een extra Ctrl maken"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Gedrag van Alt/Windows-toetsen"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "Het standaardgedrag toevoegen aan de Menu-toets"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt en Meta zitten op de Alt-toetsen"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt zit op de Windows-toetsen (én op de gebruikelijke Alt-toetsen)"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Ctrl zit op de Windows-toetsen (én op de gebruikelijke Ctrl-toetsen)"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Ctrl zit op de Alt-toetsen, Alt zit op de Windows-toetsen"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "Meta zit op de Windows-toetsen"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "Meta zit op de linker Windows-toets"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper zit op de Windows-toetsen"
# wordt afgebeeld op/zit op
# zit op is veel korter en is ook duidelijker
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1004
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Alt zit op de rechter Windows-toets, Super op de Menu-toets"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Alt- en Windows-toetsen omwisselen"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Positie van samensteltoets"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "derde niveau van linker Windows-toets"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "derde niveau van rechter Windows-toets"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "derde niveau van Menu"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "derde niveau van linker Ctrl-toets"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "derde niveau van rechter Ctrl-toets"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "derde niveau van CapsLock"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "derde niveau van &lt;Kleiner dan/Groter dan&gt;"
# De tekst op de Pause-toets is meestal "Pause".
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pause"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "PrtSc"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Overige compatibiliteitsopties"
# dubbelop numeriek/cijfer
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Standaard cijferblok-toetsen"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1018
msgid "Numeric keypad keys always enter digits (as in Mac OS)"
msgstr "Cijferblok-toetsen geven altijd cijfers (net als bij Mac OS)"
-#: ../rules/base.xml.in.h:1017
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift met cijferblok-toetsen werkt zoals in MS Windows"
+#: ../rules/base.xml.in.h:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "NumLock aan geeft cijfers, en Shift schakelt naar cursortoetsen; Numlock uit geeft altijd cursortoetsen (zoals in MS Windows)"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1020
msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
msgstr "Shift heft NumLock niet op, maar geeft juist het derde niveau"
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1021
msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
msgstr "Speciale toetsen (Ctrl+Alt+&lt;toets&gt;) afgehandeld in een server"
-#: ../rules/base.xml.in.h:1020
+#: ../rules/base.xml.in.h:1022
msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
msgstr "Apple Aluminium-toetsenbord: PC-toetsen emuleren (Print, Scroll-Lock, Pause, NumLock)"
-#: ../rules/base.xml.in.h:1021
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Shift schakelt CapsLock uit"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Extra typografische tekens aanzetten"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Beide Shift-toetsen samen schakelen CapsLock aan/uit"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1026
msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
msgstr "Beide Shift-toetsen samen zetten CapsLock aan, één Shift-toets zet uit"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Beide Shift-toetsen samen schakelen ShiftLock aan/uit"
# PointerKeys are the mouse emulation that XKB provides on the press of a key.
# (Test with Shift+NumLock, then the keypad will move the mouse around.)
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Shift + NumLock schakelen 'muistoetsen' aan/uit"
-# XXX -- what does "grab" mean?
-#: ../rules/base.xml.in.h:1027
+# XXX: what does "grab" mean?
+#: ../rules/base.xml.in.h:1029
msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
msgstr "Het verbreken van 'grabs' via toetsenbord toestaan (veiligheidsrisico)"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "Het loggen van 'grabs' en 'window trees' toestaan"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "Valutatekens aan bepaalde toetsen toevoegen"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Euroteken op E"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Euroteken op 2"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Euroteken op 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Euroteken op 5"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Roepie op 4"
# aan te zetten/te kiezen/te selecteren/te krijgen
# 'to choose' is hier een slechte woordkeuze IMO
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "De toets om het vijde niveau te krijgen"
# locks - op slot gezet/blijvend/in stand houden
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1038
msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "&lt;Kleiner dan/Groter dan&gt; geeft vijfde niveau, en vergrendelt wanneer ingedrukt samen met andere vijfdeniveau-kiezer"
-#: ../rules/base.xml.in.h:1037
+#: ../rules/base.xml.in.h:1039
msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Rechter Alt-toets geeft vijfde niveau, en vergrendelt wanneer ingedrukt samen met andere vijfdeniveau-kiezer"
-#: ../rules/base.xml.in.h:1038
+#: ../rules/base.xml.in.h:1040
msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Linker Windows-toets geeft vijfde niveau, en vergrendelt wanneer ingedrukt samen met andere vijfdeniveau-kiezer"
-#: ../rules/base.xml.in.h:1039
+#: ../rules/base.xml.in.h:1041
msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "Rechter Windows-toets geeft vijfde niveau, en vergrendelt wanneer ingedrukt samen met andere vijfdeniveau-kiezer"
-#: ../rules/base.xml.in.h:1040
+#: ../rules/base.xml.in.h:1042
msgid "Using space key to input non-breakable space character"
msgstr "Gebruik van spatiebalk voor het invoeren van harde (niet-afbrekende) spaties"
# Spatiebalk geeft de gebruikelijke spatie op elk niveau.
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "Gewone spatie op elk niveau"
# http://en.wikipedia.org/wiki/Non-breaking_space
# niet-afbreekbaar spatieteken/nietafbrekendespatie/
# niet-afbrekende spatie/harde spatie/ vaste spatie
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at second level"
msgstr "Harde spatie op het tweede niveau"
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "Harde spatie op het derde niveau"
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1046
msgid "Non-breakable space character at third level, nothing at fourth level"
msgstr "Harde spatie op het derde niveau, niets op het vierde niveau"
-#: ../rules/base.xml.in.h:1045
+#: ../rules/base.xml.in.h:1047
msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
msgstr "Harde spatie op het derde niveau, smalle harde spatie op het vierde niveau"
# Spatiebalk geeft harde spatie op het vierde niveau.
-#: ../rules/base.xml.in.h:1046
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Harde spatie op het vierde niveau"
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1049
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
msgstr "Harde spatie op het vierde niveau, smalle harde spatie op het zesde niveau"
-#: ../rules/base.xml.in.h:1048
+#: ../rules/base.xml.in.h:1050
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
msgstr "Harde spatie op het vierde niveau, smalle harde spatie op het zesde niveau (via Ctrl+Shift)"
@@ -4055,85 +4063,103 @@ msgstr "Harde spatie op het vierde niveau, smalle harde spatie op het zesde nive
# Nulbreedte-losmaker/non-verbinder/non-verbindingsteken --
# losmaker is het duidelijkst, het maakt twee tekens los die
# anders verbonden zouden worden. (Tino)
-#: ../rules/base.xml.in.h:1049
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level"
msgstr "Nulbreedte-losmaker op het tweede niveau"
-#: ../rules/base.xml.in.h:1050
+#: ../rules/base.xml.in.h:1052
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
msgstr "Nulbreedte-losmaker op het tweede niveau, nulbreedte-verbinder op het derde niveau"
-#: ../rules/base.xml.in.h:1051
+#: ../rules/base.xml.in.h:1053
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
msgstr "Nulbreedte-losmaker op het tweede niveau, nulbreedte-verbinder op het derde niveau, harde spatie op het vierde niveau"
-#: ../rules/base.xml.in.h:1052
+#: ../rules/base.xml.in.h:1054
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
msgstr "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau"
-#: ../rules/base.xml.in.h:1053
+#: ../rules/base.xml.in.h:1055
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
msgstr "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau, niets op het vierde niveau"
-#: ../rules/base.xml.in.h:1054
+#: ../rules/base.xml.in.h:1056
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
msgstr "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau, nulbreedte-verbinder op het vierde niveau"
-#: ../rules/base.xml.in.h:1055
+#: ../rules/base.xml.in.h:1057
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
msgstr "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau, smalle harde spatie op het vierde niveau"
-#: ../rules/base.xml.in.h:1056
+#: ../rules/base.xml.in.h:1058
msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
msgstr "Nulbreedte-losmaker op het derde niveau, nulbreedte-verbinder op het vierde niveau"
-#: ../rules/base.xml.in.h:1057
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Japanse toetsenbordopties"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "Kana Lock-toets is vergrendelend"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "NICOLA-F-stijl backspace"
# De Zenkaku Hankaku toets converteert tussen volle breedte en half breedte karakters.
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Van de Zenkaku Hankaku-toets een extra Esc-toets maken"
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Koreaanse Hangul-/Hanja-toetsen"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Fysieke Hangul-/Hanja-toetsen"
+
+# fungeert als/werkt als/is
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Rechter Alt is Hangul, rechter Ctrl is Hanja"
+
+# fungeert als/werkt als/is
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Rechter Ctrl is Hangul, rechter Alt is Hanja"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "Esperanto-letters met accenten toevoegen"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "Aan de gerelateerde toets in een Qwerty-indeling"
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "Aan de gerelateerde toets in een Dvorak-indeling"
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "Aan de gerelateerde toets in een Colemak-indeling"
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1071
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Toetscompatibiliteit behouden met oude Solaris-toetscodes"
-#: ../rules/base.xml.in.h:1066
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Sun-toetsen-compatibiliteit"
# om zeep te helpen/af te breken/te stoppen/
-#: ../rules/base.xml.in.h:1067
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Toetscombinatie om de X-server af te breken"
-#: ../rules/base.xml.in.h:1068
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + Backspace"
@@ -4231,263 +4257,270 @@ msgid "German (with Hungarian letters and no dead keys)"
msgstr "Duits (met Hongaarse lettertekens en zonder dode toetsen)"
#: ../rules/base.extras.xml.in.h:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Pools (Duitsland, zonder dode toetsen)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Duits (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Duits (uit de Neo-wereld)"
# Het Avestisch is de taal van de Avesta in Iran: religieuze literatuur van
# de Parsi's, volgelingen van Zoroaster of Zarathustra (heilsprofeet).
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "Avestisch"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Litouws (VS, Dvorak met Litouwse lettertekens)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Litouws (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Lets (VS, Dvorak)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Lets (VS, Dvorak, Y-variant)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Lets (VS, Dvorak, min-variant)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Lets (VS, programmeer-Dvorak)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Lets (VS, programmeer-Dvorak, Y-variant)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Lets (VS, programmeer-Dvorak, min-variant)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Lets (VS, Colemak)"
-# XXX -- comma for consistency?
-#: ../rules/base.extras.xml.in.h:44
+# XXX: comma for consistency?
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Lets (VS, Colemak, apostrof-variant)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Lets (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Engels (VS, internationaal, Unicode-combinerend via AltGr)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Engels (VS, internationaal, Unicode-combinerend via AltGr, alternatief)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "Atsina"
# Coeur d'Alene is a Salishan language spoken by only five of the 800 individuals in the
# Coeur d'Alene Tribe on the Coeur d'Alene Reservation in northern Idaho, United States.
# http://en.wikipedia.org/wiki/Coeur_d'Alene_language
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Cœur d'Alène Salish"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "Tsjechisch, Slowaaks en Duits (VS)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Engels (VS, Sun type 6/7)"
# "Norman" is een toetsenbordindeling.
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Engels (Norman)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Pools (internationaal, met dode toetsen)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Pools (Colemak)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Pools (Sun type 6/7)"
# Krim-Tataars of Krim-Turks.
# http://nl.wikipedia.org/wiki/Krim-Tataars
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Krim-Tataars (Dobruja Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Roemeens (ergonomisch Touchtype)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Roemeens (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Servisch (Combinerende accenten in plaats van dode toetsen)"
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Kerkslavisch"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Russisch (met Oekraïens-Wit-Russische indeling)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Russisch (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Armeens (OLPC, fonetisch)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Hebreeuws (Bijbels, SIL-fonetisch)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Arabisch (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Belgisch (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Portugees (Brazilië, Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "Tsjechisch (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Deens (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Nederlands (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Estisch (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Fins (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Frans (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Grieks (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Italiaans (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Japans (Sun type 6/)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Japans (Sun type 7 - PC-compatibel)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Japans (Sun type 7 - Sun-compatibel)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Noors (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Portugees (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Slowaaks (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Spaans (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Zweeds (Dvorak A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Zweeds (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Duits (Zwitserland, Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Frans (Zwitserland, Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Turks (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Oekraïens (Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Engels (GB, Sun type 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "Koreaans (Sun type 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKEY (VS-toetsenbord met Europese lettertekens)"
-#: ../rules/base.extras.xml.in.h:151
+#: ../rules/base.extras.xml.in.h:152
msgid "Mmuock"
msgstr "Mmuock"
+#~ msgid "Shift with numeric keypad keys works as in MS Windows"
+#~ msgstr "Shift met cijferblok-toetsen werkt zoals in MS Windows"
+
#~ msgid "English (layout toggle on multiply/divide key)"
#~ msgstr "Engels (indeling wisselen met de toetsen delen/vermenigvuldigen)"
diff --git a/xorg-server/xkeyboard-config/po/pl.po b/xorg-server/xkeyboard-config/po/pl.po
index 7024b5e62..b60e09d36 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-2014.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2009-2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.12.99\n"
+"Project-Id-Version: xkeyboard-config 2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-09-18 23:46+0100\n"
-"PO-Revision-Date: 2014-09-19 16:33+0200\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-15 20:16+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"Language: pl\n"
@@ -752,11 +752,11 @@ msgid "Htc Dream phone"
msgstr "Telefon HTC Dream"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "Angielski (USA)"
@@ -814,7 +814,7 @@ msgid "English (programmer Dvorak)"
msgstr "Angielski (Dvoraka programisty)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -847,7 +847,7 @@ 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:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -886,11 +886,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Uzbecki (Afganistan, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Arabski"
@@ -932,11 +932,11 @@ msgid "Albanian (Plisi D1)"
msgstr "Albański (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Armeński"
@@ -1012,11 +1012,11 @@ msgid "Belarusian (Latin)"
msgstr "Białoruski (łaciński)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Belgijski"
@@ -1279,11 +1279,11 @@ 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:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Portugalski (Brazylia)"
@@ -1367,11 +1367,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Berberyjski (Maroko, rozszerzony fonetyczny tifinagh)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Angielski (Kamerun)"
@@ -1492,11 +1492,11 @@ msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Chorwacki (klawiatura US z literami chorwackimi)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "Czeski"
@@ -1521,11 +1521,11 @@ 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:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Duński"
@@ -1550,11 +1550,11 @@ msgid "Danish (Dvorak)"
msgstr "Duński (Dvoraka)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Holenderski"
@@ -1580,11 +1580,11 @@ msgid "Dzongkha"
msgstr "Dzongka"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Estoński"
@@ -1600,7 +1600,7 @@ msgstr "Estoński (Dvoraka)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Estoński (klawiatura US z literami estońskimi)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Perski"
@@ -1663,11 +1663,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "Farerski (bez klawiszy akcentów)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Fiński"
@@ -1691,7 +1691,7 @@ msgstr "Północnolapoński (Finlandia)"
msgid "Finnish (Macintosh)"
msgstr "Fiński (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Francuski"
@@ -1927,11 +1927,11 @@ msgid "German (legacy)"
msgstr "Niemiecki (stary)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Grecki"
@@ -2066,11 +2066,11 @@ msgid "Icelandic (Dvorak)"
msgstr "Islandzki (Dvoraka)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "Hebrajski"
@@ -2087,11 +2087,11 @@ msgid "Hebrew (Biblical, Tiro)"
msgstr "Hebrajski (biblijny, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Włoski"
@@ -2120,11 +2120,11 @@ msgid "Italian (IBM 142)"
msgstr "Włoski (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "Japoński"
@@ -2201,7 +2201,7 @@ msgid "Lao (STEA proposed standard layout)"
msgstr "Laotański (proponowany układ standardowy STEA)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
@@ -2222,11 +2222,11 @@ 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:600 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Litewski"
@@ -2251,11 +2251,11 @@ msgid "Lithuanian (LEKPa)"
msgstr "Litewski (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Łotewski"
@@ -2293,7 +2293,7 @@ msgid "Maori"
msgstr "Maoryski"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
@@ -2365,11 +2365,11 @@ msgid "Mongolian"
msgstr "Mongolski"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Norweski"
@@ -2406,11 +2406,11 @@ msgid "Norwegian (Colemak)"
msgstr "Norweski (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "Polski"
@@ -2450,7 +2450,7 @@ msgstr "Rosyjski (Polska, fonetyczny Dvoraka)"
msgid "Polish (programmer Dvorak)"
msgstr "Polski (Dvoraka programisty)"
-#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Portugalski"
@@ -2487,11 +2487,11 @@ msgid "Esperanto (Portugal, Nativo)"
msgstr "Esperanto (Portugalia, Nativo)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Rumuński"
@@ -2511,7 +2511,7 @@ msgstr "Rumuński (standardowy cedilla)"
msgid "Romanian (WinKeys)"
msgstr "Rumuński (klawisze Win)"
-#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Rosyjski"
@@ -2591,1390 +2591,1414 @@ msgstr "Baszkirski"
msgid "Mari"
msgstr "Maryjski"
-#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Rosyjski (fonetyczny azerty)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "Rosyjski (fonetyczny francuski)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "Serbski"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Serbski (cyrylicki, zamienione ZE i ŻE)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Serbski (łaciński)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "Serbski (łaciński unikodowy)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "Serbski (łaciński QWERTY)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Serbski (łaciński unikodowy QWERTY)"
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Serbski (cyrylicki z cudzysłowami)"
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "Serbski (łaciński z cudzysłowami)"
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Pannońskorusiński"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Słoweński"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "Słoweński (z cudzysłowami do cytowania)"
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:714
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:714 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "Słowacki"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "Słowacki (rozszerzony backslash)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "Słowacki (QWERTY)"
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Słowacki (QWERTY, rozszerzony Backslash)"
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "Hiszpański"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "Hiszpański (bez klawiszy akcentów)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Hiszpański (klawisze Win)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Hiszpański (ze znakiem tyldy)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Hiszpański (klawisze akcentów Suna)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Hiszpański (Dvoraka)"
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:727
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:726
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Kataloński (hiszpański, z L ze środkową kropką)"
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Hiszpański (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Szwedzki"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "Szwedzki (bez klawiszy akcentów)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Szwedzki (Dvoraka)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "Rosyjski (Szwecja, fonetyczny)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Rosyjski (Szwecja, fonetyczny, bez klawiszy akcentów)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Północnolapoński (Szwecja)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Szwedzki (Macintosh)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Szwedzki (Svdvorak)"
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "Szwedzki migowy"
-#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Niemiecki (Szwajcaria)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Niemiecki (Szwajcaria, stary)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Niemiecki (Szwajcaria, bez klawiszy akcentów)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Niemiecki (Szwajcaria, klawisze akcentów Suna)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Francuski (Szwajcaria)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Francuski (Szwajcaria, bez klawiszy akcentów)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Francuski (Szwajcaria, klawisze akcentów Suna)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Francuski (Szwajcaria, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Niemiecki (Szwajcaria, Macintosh)"
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Arabski (syryjski)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Syryjski"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Syryjski (fonetyczny)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kurdyjski (Syria, łaciński Q)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Kurdyjski (Syria, F)"
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Kurdyjski (Syria, łaciński Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Tadżycki"
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Tadżycki (stary)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Syngaleski (fonetyczny)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Tamilski (Sri Lanka, unikodowy)"
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Tamilski (Sri Lanka, maszynistki TAB)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "Tajski"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Tajski (TIS-820.2538)"
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Tajski (Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Turecki"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Turecki (F)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Turecki (Alt-Q)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Turecki (klawisze akcentów Suna)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kurdyjski (Turcja, łaciński Q)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "Kurdyjski (Turcja, F)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Kurdyjski (Turcja, łaciński Alt-Q)"
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:781
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:781 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Krymskotatarski (turecki Q)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Krymskotatarski (turecki F)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Krymskotatarski (turecki Alt-Q)"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Tajwański"
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Tajwański (autochtoniczny)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Saisiyat (Tajwan)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "Ukraiński"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "Ukraiński (fonetyczny)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "Ukraiński (maszynistki)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "Ukraiński (klawisze Win)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "Ukraiński (stary)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "Ukraiński (standardowy RSTU)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Rosyjski (Ukraina, standardowy RSTU)"
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "Ukraiński (homofoniczny)"
-#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Angielski (Wielka Brytania)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Angielski (Wielka Brytania, rozszerzone klawisze Win)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "Angielski (Wielka Brytania, międzynarodowy z klawiszami akcentów)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Angielski (Wielka Brytania, Dvoraka)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Angielski (Wielka Brytania, Dvoraka z brytyjskimi znakami przestankowymi)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Angielski (Wielka Brytania, Macintosh)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "Angielski (Wielka Brytania, międzynarodowy Macintosh)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "Angielski (Wielka Brytania, Colemak)"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Uzbecki"
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Uzbecki (łaciński)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Wietnamski"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "Koreański"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "Koreański (kompatybilny ze 101/104 klawiszami)"
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Japoński (serie PC-98xx)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Irlandzki"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "Irlandzki gaelicki"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Irlandzki (UnicodeExpert)"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Ogamiczny"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Ogamiczny (IS434)"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Urdu (Pakistan)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "Urdu (Pakistan, CRULP)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "Urdu (Pakistan, NLA)"
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Arabski (pakistański)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Sindhi"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Malediwski"
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Angielski (Afryka Południowa)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Esperancki"
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:841
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:841
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Nepalski"
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Angielski (Nigeria)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Ibo"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Joruba"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Amharski"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "Wolof"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Braille'a"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Braille (leworęczny)"
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Braille (praworęczny)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Turkmeński"
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Turkmeński (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Bambara"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Francuski (Mali, alternatywny)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Angielski (Mali, USA - Macintosh)"
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Angielski (Mali, międzynarodowy USA)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Suahili (Tanzania)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Suahili (Kenia)"
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Kikiju"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Tswana"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Filipiński"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Filipino (baybain QWERTY)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Filipiński (łaciński Capewella-Dvoraka)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Filipiński (baybayin Capewella-Dvoraka)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Filipiński (łaciński Capewella-QWERF 2006)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Filipiński (baybayin Capewella-QWERF 2006)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Filipiński (łaciński Colemak)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Filipiński (baybain Colemak)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Filipiński (łaciński Dvoraka)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Filipiński (baybain Dvoraka)"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Mołdawski"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Mołdawski (gagauski)"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Przełączenie na inny układ"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Prawy Alt (wciśnięty)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Lewy Alt (wciśnięty)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Lewy Win (wciśnięty)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "Prawy Win (wciśnięty)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "Dowolny klawisz Win (wciśnięty)"
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:903
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:902
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Prawy Ctrl (wciśnięty)"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Prawy Alt"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Lewy Alt"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "CapsLock"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Shift+CapsLock"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:909
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:908
+#: ../rules/base.xml.in.h:910
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:909
+#: ../rules/base.xml.in.h:911
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:910
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+CapsLock"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Oba klawisze Shift naraz"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Oba klawisze Alt naraz"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Oba klawisze Ctrl naraz"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Lewy Ctrl+lewy Shift"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Prawy Ctrl+prawy Shift"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Lewy Alt+lewy Shift"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+Spacja"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Menu"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Lewy Win"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "Win+Spacja"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Prawy Win"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Lewy Shift"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Prawy Shift"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Lewy Ctrl"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Prawy Ctrl"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "ScrollLock"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:932
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:931
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Klawisz wybierający poziom 3."
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "Dowolny klawisz Win"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "Dowolny klawisz Alt"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Prawy Alt, Shift+prawy Alt jako Compose"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "Prawy Alt nigdy nie wybierający poziomu 3."
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Enter na klawiaturze numerycznej"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Backslash"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Mniejsze/Większe&gt;"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:941
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:940
+#: ../rules/base.xml.in.h:942
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:941
+#: ../rules/base.xml.in.h:943
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:942
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Położenie klawisza Ctrl"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "CapsLock jako Ctrl"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Lewy Ctrl jako Meta"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Zamiana Ctrl i CapsLocka"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "Z lewej 'A'"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "W lewym dolnym rogu"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Prawy Ctrl jako prawy Alt"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menu jako prawy Ctrl"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Prawy Alt jako prawy Ctrl"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Zamiana lewego Alta z lewym Ctrl"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Zamiana lewego Win z lewym Ctrl"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:955
msgid "Swap Right Win key with Right Ctrl key"
msgstr "Zamiana prawego Win z prawym Ctrl"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Lewy Alt jako Ctrl, lewy Ctrl jako Win, lewy Win jako Alt"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:957
msgid "Use keyboard LED to show alternative layout"
msgstr "Używanie diody na klawiaturze do sygnalizacji układu alternatywnego"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "NumLock"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Układ klawiatury numerycznej"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Stary"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Dodatki Unicode (strzałki i symbole matematyczne)"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:962
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:961
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Legacy Wang 724"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:964
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:963
+#: ../rules/base.xml.in.h:965
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:964
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Szesnastkowy"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "ATM/telefoniczna"
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "Zachowanie klawisza Delete na klawiaturze numerycznej"
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with dot"
msgstr "Klawisz tradycyjny z kropką"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Klawisz tradycyjny z przecinkiem"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Klawisz czterofunkcyjny z kropką"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Klawisz czterofunkcyjny z kropką, tylko Latin-9"
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "Klawisz czterofunkcyjny z przecinkiem"
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:975
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:976
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Klawisz czterofunkcyjny z abstrakcyjnymi separatorami"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Średnik na poziomie 3."
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Zachowanie klawisza CapsLock"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:981
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:980
+#: ../rules/base.xml.in.h:982
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:981
+#: ../rules/base.xml.in.h:983
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:982
+#: ../rules/base.xml.in.h:984
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:983
+#: ../rules/base.xml.in.h:985
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "CapsLock przełącza wielkość znaków alfabetycznych"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "CapsLock jako dodatkowy NumLock"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Zamiana Esc i CapsLocka"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "CapsLock jako dodatkowy Esc"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "CapsLock jako dodatkowy Backspace"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "CapsLock jako dodatkowy Super"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "CapsLock jako dodatkowy Hyper"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "CapsLock przełącza ShiftLock (wpływając na wszystkie klawisze)"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "CapsLock wyłączony"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "CapsLock jako dodatkowy Ctrl"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Zachowanie klawiszy Alt/Win"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "Dodanie standardowego działania klawisza Menu"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt i Meta pod klawiszami Alt"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt pod klawiszami Win (oraz zwykłymi klawiszami Alt)"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Ctrl pod klawiszami Win (oraz zwykłymi klawiszami Ctrl)"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Ctrl pod klawiszami Alt, Alt pod klawiszami Win"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "Meta pod klawiszami Win"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "Meta pod lewym Win"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper pod klawiszami Win"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1004
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Alt pod prawym Win, Super pod Menu"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Lewy zamieniony z Win"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Położenie klawisza Compose"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "Pozion 3. lewego klawisza Win"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "Pozion 3. prawego klawisza Win"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "Poziom 3. klawisza Menu"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "Poziom 3. lewego klawisza Ctrl"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "Poziom 3. prawego klawisza Ctrl"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "Poziom 3. klawisza Caps Lock"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "Poziom 3. klawisza &lt;Mniejsze/Większe&gt;"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pauza"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "PrtSc"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Różne opcje kompatybilności"
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Domyślne klawisze klawiatury numerycznej"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1018
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:1017
-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:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "NumLock włączony: cyfry, Shift przełącza na strzałki; NumLock wyłączonty: zawsze strzałki (jak w MS Windows)"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1020
msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
msgstr "Shift nie anuluje NumLocka, wybiera poziom 3."
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1021
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:1020
+#: ../rules/base.xml.in.h:1022
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:1021
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Shift anuluje CapsLock"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Włączenie dodatkowych znaków typograficznych"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Oba klawisze Shift naraz przełączają CapsLock"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1026
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:1025
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Oba klawisze Shift naraz przełączają ShiftLock"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Shift + NumLock przełącza klawisze kursorów"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1029
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:1028
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "Możliwe przechwytywanie i logowanie drzewa okien"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "Dodanie znaków walut do pewnych klawiszy"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Euro pod E"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Euro pod 2"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Euro pod 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Euro pod 5"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Rupia pod 4"
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "Klawisz wybierający poziom 5."
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1038
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:1037
+#: ../rules/base.xml.in.h:1039
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:1038
+#: ../rules/base.xml.in.h:1040
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:1039
+#: ../rules/base.xml.in.h:1041
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:1040
+#: ../rules/base.xml.in.h:1042
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:1041
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "Zwykła spacja na dowolnym poziomie"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at second level"
msgstr "Znak niełamliwej spacji na poziomie 2."
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "Znak niełamliwej spacji na poziomie 3."
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1046
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:1045
+#: ../rules/base.xml.in.h:1047
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:1046
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Znak niełamliwej spacji na poziomie 4."
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1049
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:1048
+#: ../rules/base.xml.in.h:1050
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:1049
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level"
msgstr "Znak rozdzielający zerowej szerokości na poziomie 2."
-#: ../rules/base.xml.in.h:1050
+#: ../rules/base.xml.in.h:1052
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:1051
+#: ../rules/base.xml.in.h:1053
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:1052
+#: ../rules/base.xml.in.h:1054
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:1053
+#: ../rules/base.xml.in.h:1055
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:1054
+#: ../rules/base.xml.in.h:1056
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:1055
+#: ../rules/base.xml.in.h:1057
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:1056
+#: ../rules/base.xml.in.h:1058
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:1057
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Opcje klawiatury japońskiej"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "Blokujący klawisz Kana Lock"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "Backspace w stylu NICOLA-F"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Zenkaku Hankaku jako dodatkowy Esc"
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Koreańskie klawisze Hangul/Hanja"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Sprzętowe klawisze Hangul/Hanja"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Prawy Alt jako Hangul, prawy Ctrl jako Hanja"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Prawy Ctrl jako Hangul, prawy Alt jako Hanja"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "Dodanie akcentów Esperanto (supersigno)"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "Pod odpowiednimi klawiszami wg układu QWERTY"
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "Pod odpowiednimi klawiszami wg układu Dvoraka"
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "Pod odpowiednimi klawiszami wg układu Colemak"
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1071
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Zachowanie zgodności klawiszy ze starymi kodami Solarisa"
-#: ../rules/base.xml.in.h:1066
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Zgodność klawiszy z Sunem"
-#: ../rules/base.xml.in.h:1067
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Sekwencja klawiszy zabijająca serwer X"
-#: ../rules/base.xml.in.h:1068
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + Backspace"
@@ -4063,250 +4087,254 @@ 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:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Polski (Niemcy, bez klawiszy akcentów)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Niemiecki (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Niemiecki (Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "Awestyjski"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Litewski (USA, Dvoraka z literami litewskimi)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Litewski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Łotewski (USA, Dvoraka)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Łotewski (USA, Dvoraka, wariant Y)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Łotewski (USA, Dvoraka, wariant minus)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Łotewski (USA, Dvoraka programisty)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Łotewski (USA, Dvoraka programisty, wariant Y)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Łotewski (USA, Dvoraka programisty, wariant minus)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Łotewski (USA, Colemak)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Łotewski (USA, Colemak, wariant z apostrofem)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Łotewski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Angielski (USA, międzynarodowy, łączenie unikodu z AltGr)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Angielski (USA, międzynarodowy, łączenie unikodu z AltGr, alternatywny)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "Atsina"
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Coeur d'Alene Salish"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "Czeski, słowacki i niemiecki (US)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Angielski (USA, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Angielski (Normana)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Polski (międzynarodowy z klawiszami akcentów)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Polski (Colemak)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Polski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Krymskotatarski (Dobruja Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Rumuński (ergonomiczny Touchtype)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Rumuński (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Serbski (łączenie akcentów zamiast klawiszy akcentów)"
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Cerkiewnosłowiański"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Rosyjski (z układem ukraińsko-białoruskim)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Rosyjski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Armeński (fonetyczny OLPC)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Hebrajski (biblijny, fonetyczny SIL)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Arabski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Belgijski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Portugalski (Brazylia, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "Czeski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Duński (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Holenderski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Estoński (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Fiński (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Francuski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Grecki (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Włoski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Japoński (Sun Type 6)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Japoński (Sun Type 7 - kompatybilny z PC)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Japoński (Sun Type 7 - kompatybilny z Sunem)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Norweski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Portugalski (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Słowacki (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Hiszpański (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Szwedzki (Dvoraka A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Szwedzki (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Niemiecki (Szwajcaria, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Francuski (Szwajcaria, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Turecki (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Ukraiński (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Angielski (USA, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "Koreański (Sun Type 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKey (klawiatura US z literami niemieckimi)"
-#: ../rules/base.extras.xml.in.h:151
+#: ../rules/base.extras.xml.in.h:152
msgid "Mmuock"
msgstr "Mmuock"
diff --git a/xorg-server/xkeyboard-config/po/ru.po b/xorg-server/xkeyboard-config/po/ru.po
index c7d113d9b..33adae14b 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, 2013, 2014.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
# Pavel Maryanov <acid@jack.kiev.ua>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.11.99\n"
+"Project-Id-Version: xkeyboard-config 2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-05-18 00:11+0100\n"
-"PO-Revision-Date: 2014-05-22 19:42+0400\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-16 17:34+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
"Language: ru\n"
@@ -473,8 +473,8 @@ msgid "Memorex MX2750"
msgstr "Memorex MX2750"
#: ../rules/base.xml.in.h:113
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgid "Microsoft Natural Ergonomic Keyboard 4000"
+msgstr "Microsoft Natural Ergonomic Keyboard 4000"
#: ../rules/base.xml.in.h:114
msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
@@ -761,11 +761,11 @@ msgid "Htc Dream phone"
msgstr "телефон Htc Dream"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "Английская (США)"
@@ -823,7 +823,7 @@ msgid "English (programmer Dvorak)"
msgstr "Английская (дворак для программистов)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -856,7 +856,7 @@ msgid "English (Workman, international with dead keys)"
msgstr "Английская (Воркман, международная с спец. клавишами)"
#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -895,11 +895,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Узбекская (Афганистан, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Арабская"
@@ -941,11 +941,11 @@ msgid "Albanian (Plisi D1)"
msgstr "Албанская (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Армянская"
@@ -1021,11 +1021,11 @@ msgid "Belarusian (Latin)"
msgstr "Белорусская (латиница)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Бельгийская"
@@ -1288,11 +1288,11 @@ msgid "Bosnian (US keyboard with Bosnian letters)"
msgstr "Боснийская (клавиатура США с боснийскими буквами)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Португальская (Бразилия)"
@@ -1376,11 +1376,11 @@ msgid "Berber (Morocco, Tifinagh extended phonetic)"
msgstr "Берберская (Марокко, тифинагская расширенная фонетическая)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Английская (Камерун)"
@@ -1501,11 +1501,11 @@ msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Хорватская (клавиатура США с хорватскими буквами)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "Чешская"
@@ -1530,11 +1530,11 @@ msgid "Czech (US Dvorak with CZ UCW support)"
msgstr "Чешская (дворак США с поддержкой CZ UCW)"
#. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Датская"
@@ -1559,11 +1559,11 @@ msgid "Danish (Dvorak)"
msgstr "Датская (дворак)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Голландская"
@@ -1589,11 +1589,11 @@ msgid "Dzongkha"
msgstr "Дзонг-кэ (dz"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Эстонская"
@@ -1609,7 +1609,7 @@ msgstr "Эстонская (дворак)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Эстонская (клавиатура США с эстонскими буквами)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Персидская"
@@ -1672,11 +1672,11 @@ msgid "Faroese (eliminate dead keys)"
msgstr "Фарерская (без спец. клавиш (dead keys))"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Финская"
@@ -1700,7 +1700,7 @@ msgstr "Северная Саамская (Финляндия)"
msgid "Finnish (Macintosh)"
msgstr "Финская (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Французская"
@@ -1936,11 +1936,11 @@ msgid "German (legacy)"
msgstr "Немецкая (устаревшая)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Греческая"
@@ -2063,1919 +2063,1951 @@ msgid "Icelandic (eliminate dead keys)"
msgstr "Исландская (без спец. клавиш (dead keys))"
#: ../rules/base.xml.in.h:551
+msgid "Icelandic (Macintosh, legacy)"
+msgstr "Исландская (Macintosh, устаревшая)"
+
+#: ../rules/base.xml.in.h:552
msgid "Icelandic (Macintosh)"
msgstr "Исландская (Macintosh)"
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
msgid "Icelandic (Dvorak)"
msgstr "Исландская (дворак)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:554 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
msgstr "Иврит"
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
msgid "Hebrew (lyx)"
msgstr "Иврит (lyx)"
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
msgid "Hebrew (phonetic)"
msgstr "Иврит (фонетическая)"
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
msgid "Hebrew (Biblical, Tiro)"
msgstr "Иврит (библейский, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Итальянская"
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
msgid "Italian (eliminate dead keys)"
msgstr "Итальянская (без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
msgid "Italian (Winkeys)"
msgstr "Итальянская (с клавишами Win)"
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
msgid "Italian (Macintosh)"
msgstr "Итальянская (Macintosh)"
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
msgid "Italian (US keyboard with Italian letters)"
msgstr "Итальянская (клавиатура США с итальянскими буквами)"
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
msgid "Georgian (Italy)"
msgstr "Грузинская (Италия)"
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
msgid "Italian (IBM 142)"
msgstr "Итальянская (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
msgstr "Японская"
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
msgid "Japanese (Kana)"
msgstr "Японская (Кана)"
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
msgid "Japanese (Kana 86)"
msgstr "Японская (Кана 86)"
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:574
msgid "Japanese (OADG 109A)"
msgstr "Японская (OADG 109A)"
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
msgid "Japanese (Macintosh)"
msgstr "Японская (Macintosh)"
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
msgid "Japanese (Dvorak)"
msgstr "Японская (дворак)"
#. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
msgid "ki"
msgstr "ki"
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
msgid "Kyrgyz"
msgstr "Киргизская"
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
msgid "Kyrgyz (phonetic)"
msgstr "Киргизская (фонетическая)"
#. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:582
msgid "km"
msgstr "km"
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
msgid "Khmer (Cambodia)"
msgstr "Кхмерская (Камбоджа)"
#. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
msgid "kk"
msgstr "kk"
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:586
msgid "Kazakh"
msgstr "Казахская"
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
msgid "Russian (Kazakhstan, with Kazakh)"
msgstr "Русская (Казахстан, с казахской)"
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:588
msgid "Kazakh (with Russian)"
msgstr "Казахская (с русским)"
#. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
msgid "lo"
msgstr "lo"
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
msgid "Lao"
msgstr "Лаосская"
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
msgid "Lao (STEA proposed standard layout)"
msgstr "Лаосская (стандартная раскладка, предложенная STEA)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
msgid "Spanish (Latin American)"
msgstr "Испанская (латиноамериканская)"
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
msgid "Spanish (Latin American, eliminate dead keys)"
msgstr "Испанская (латиноамериканская, без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
msgid "Spanish (Latin American, include dead tilde)"
msgstr "Испанская (латиноамериканская, с dead tilde)"
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
msgid "Spanish (Latin American, Sun dead keys)"
msgstr "Испанская (латиноамериканская, с спец. клавишами (dead keys) Sun)"
#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:599 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Литовская"
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
msgid "Lithuanian (standard)"
msgstr "Литовская (стандартная)"
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
msgid "Lithuanian (US keyboard with Lithuanian letters)"
msgstr "Литовская (клавиатура США с литовскими буквами)"
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
msgid "Lithuanian (IBM LST 1205-92)"
msgstr "Литовская (IBM LST 1205-92)"
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
msgid "Lithuanian (LEKP)"
msgstr "Литовская (LEKP)"
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
msgid "Lithuanian (LEKPa)"
msgstr "Литовская (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:607 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Латышская"
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
msgid "Latvian (apostrophe variant)"
msgstr "Латышская (вариант с апострофом)"
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
msgid "Latvian (tilde variant)"
msgstr "Латышская (вариант с тильдой)"
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
msgid "Latvian (F variant)"
msgstr "Латышская (вариант с F)"
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
msgid "Latvian (modern)"
msgstr "Латышская (современная)"
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
msgid "Latvian (ergonomic, ŪGJRMV)"
msgstr "Латышская (эргономичная, ŪGJRMV)"
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
msgid "Latvian (adapted)"
msgstr "Латышская (адаптированная)"
#. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
msgid "mi"
msgstr "mi"
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
msgid "Maori"
msgstr "Маори"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:619 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
msgid "Montenegrin"
msgstr "Черногорская"
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
msgid "Montenegrin (Cyrillic)"
msgstr "Черногорская (кириллица)"
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
msgstr "Черногорская (кириллица, З и Ж переставлены местами)"
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
msgid "Montenegrin (Latin Unicode)"
msgstr "Черногорская (латинская юникодная)"
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
msgid "Montenegrin (Latin qwerty)"
msgstr "Черногорская (латинская qwerty)"
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
msgid "Montenegrin (Latin Unicode qwerty)"
msgstr "Черногорская (латинская юникодная qwerty)"
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
msgid "Montenegrin (Cyrillic with guillemets)"
msgstr "Черногорская (кириллица с кавычками ёлочками)"
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
msgid "Montenegrin (Latin with guillemets)"
msgstr "Черногорская (латинская с кавычками ёлочками)"
#. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
msgid "mk"
msgstr "mk"
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
msgid "Macedonian"
msgstr "Македонская"
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
msgid "Macedonian (eliminate dead keys)"
msgstr "Македонская (без спец. клавиш (dead keys))"
#. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
msgid "mt"
msgstr "mt"
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
msgid "Maltese"
msgstr "Мальтийская"
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
msgid "Maltese (with US layout)"
msgstr "Мальтийская (с раскладкой США)"
#. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
msgid "mn"
msgstr "mn"
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:639
msgid "Mongolian"
msgstr "Монгольская"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:640 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Норвежская"
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:643
msgid "Norwegian (eliminate dead keys)"
msgstr "Норвежская (без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:644
msgid "Norwegian (Winkeys)"
msgstr "Норвежская (с клавишами Win)"
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:645
msgid "Norwegian (Dvorak)"
msgstr "Норвежская (дворак)"
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:646
msgid "Northern Saami (Norway)"
msgstr "Северная Саамская (Норвегия)"
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:647
msgid "Northern Saami (Norway, eliminate dead keys)"
msgstr "Северная Саамская (Норвегия, без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:648
msgid "Norwegian (Macintosh)"
msgstr "Норвежская (Macintosh)"
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:649
msgid "Norwegian (Macintosh, eliminate dead keys)"
msgstr "Норвежская (Macintosh, без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:650
msgid "Norwegian (Colemak)"
msgstr "Норвежская (Коулмак)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:651 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
msgstr "Польская"
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:654
msgid "Polish (legacy)"
msgstr "Польская (устаревшая)"
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:655
msgid "Polish (qwertz)"
msgstr "Польская (qwertz)"
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:656
msgid "Polish (Dvorak)"
msgstr "Польская (дворак)"
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:657
msgid "Polish (Dvorak, Polish quotes on quotemark key)"
msgstr "Польская (дворак, польские кавычки на клавишах с кавычками)"
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:658
msgid "Polish (Dvorak, Polish quotes on key 1)"
msgstr "Польская (дворак, польские кавычки на клавише 1)"
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:659
msgid "Kashubian"
msgstr "Кашубская"
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:660
msgid "Silesian"
msgstr "Силезская"
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:661
msgid "Russian (Poland, phonetic Dvorak)"
msgstr "Русская (Польша, фонетический дворак)"
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:662
msgid "Polish (programmer Dvorak)"
msgstr "Польская (дворак для программистов)"
-#: ../rules/base.xml.in.h:662 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Португальская"
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:664
msgid "Portuguese (eliminate dead keys)"
msgstr "Португальская (без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:665
msgid "Portuguese (Sun dead keys)"
msgstr "Португальская (спец. клавиши (dead keys) Sun)"
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:666
msgid "Portuguese (Macintosh)"
msgstr "Португальская (Macintosh)"
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:667
msgid "Portuguese (Macintosh, eliminate dead keys)"
msgstr "Португальская (Macintosh, без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:668
msgid "Portuguese (Macintosh, Sun dead keys)"
msgstr "Португальская (Macintosh, спец. клавиши (dead keys) Sun)"
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:669
msgid "Portuguese (Nativo)"
msgstr "Португальская (Nativo)"
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:670
msgid "Portuguese (Nativo for US keyboards)"
msgstr "Португальская (Nativo для клавиатур US)"
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:671
msgid "Esperanto (Portugal, Nativo)"
msgstr "Эсперанто (Португалия, Nativo)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:672 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Румынская"
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:675
msgid "Romanian (cedilla)"
msgstr "Румынская (седиль)"
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:676
msgid "Romanian (standard)"
msgstr "Румынская (стандартная)"
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:677
msgid "Romanian (standard cedilla)"
msgstr "Румынская (стандартная седиль)"
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:678
msgid "Romanian (WinKeys)"
msgstr "Румынская (клавиши Win)"
-#: ../rules/base.xml.in.h:678 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Русская"
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:680
msgid "Russian (phonetic)"
msgstr "Русская (фонетическая)"
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:681
msgid "Russian (phonetic WinKeys)"
msgstr "Русская (фонетическая с клавишами Win)"
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:682
msgid "Russian (typewriter)"
msgstr "Русская (печатная машинка)"
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:683
msgid "Russian (legacy)"
msgstr "Русская (устаревшая)"
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:684
msgid "Russian (typewriter, legacy)"
msgstr "Русская (печатная машинка, устаревшая)"
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:685
msgid "Tatar"
msgstr "Татарская"
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:686
msgid "Ossetian (legacy)"
msgstr "Осетинская (устаревшая)"
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:687
msgid "Ossetian (WinKeys)"
msgstr "Осетинская (с клавишами Win)"
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:688
msgid "Chuvash"
msgstr "Чувашия"
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:689
msgid "Chuvash (Latin)"
msgstr "Чувашская (латиница)"
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:690
msgid "Udmurt"
msgstr "Удмуртская"
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:691
msgid "Komi"
msgstr "Коми"
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:692
msgid "Yakut"
msgstr "Якутская"
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:693
msgid "Kalmyk"
msgstr "Калмыцкая"
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:694
msgid "Russian (DOS)"
msgstr "Русская (DOS)"
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:695
msgid "Russian (Macintosh)"
msgstr "Русская (Macintosh)"
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:696
msgid "Serbian (Russia)"
msgstr "Сербская (Россия)"
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:697
msgid "Bashkirian"
msgstr "Башкирская"
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:698
msgid "Mari"
msgstr "Марийская"
-#: ../rules/base.xml.in.h:698 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Русская (фонетическая azerty)"
+
+#: ../rules/base.xml.in.h:700
+msgid "Russian (phonetic French)"
+msgstr "Русская (французская фонетическая)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
msgid "Serbian"
msgstr "Сербская"
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
msgstr "Сербская (кириллица, З и Ж переставлены местами)"
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Сербская (латинская)"
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
msgstr "Сербская (латинская юникодная)"
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
msgstr "Сербская (латинская qwerty)"
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
msgstr "Сербская (латинская юникодная qwerty)"
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
msgstr "Сербская (кириллица с кавычками ёлочками)"
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
msgstr "Сербская (латинская с кавычками ёлочками)"
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Паннонская русинская"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Словенская"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
msgstr "Словенская (с кавычками ёлочками для кавычек)"
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
msgid "Slovenian (US keyboard with Slovenian letters)"
msgstr "Словенская (клавиатура США с словенскими буквами)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:713 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
msgstr "Словацкая"
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
msgstr "Словацкая (расширенные функции Backslash)"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
msgstr "Словацкая (qwerty)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
msgstr "Словацкая (qwerty, расширенные функции Backslash)"
-#: ../rules/base.xml.in.h:718 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
msgstr "Испанская"
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
msgstr "Испанская (без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Испанская (с клавишами Win)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Испанская (с dead tilde)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Испанская (с спец. клавишами (dead keys) Sun)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Испанская (дворак)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
msgstr "Астурлеонская (испанский вариант с нижними точками у H и L)"
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Каталонская (испанский вариант с точкой в L посередине)"
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Испанская (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:728 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Шведская"
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
msgstr "Шведская (без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Шведская (дворак)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
msgstr "Русская (Швеция, фонетическая)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
msgstr "Русская (Швеция, фонетическая, без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Северная Саамская (Швеция)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Шведская (Macintosh)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Шведская (Svdvorak)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
msgstr "Шведский язык жестов"
-#: ../rules/base.xml.in.h:738 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Немецкая (Швейцария)"
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Немецкая (Швейцария, устаревшая)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
msgstr "Немецкая (Швейцария, без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Немецкая (Швейцария, с спец. клавишами (dead keys) Sun)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Французская (Швейцария)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
msgstr "Французская (Швейцария, без спец. клавиш (dead keys))"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Французская (Швейцария, спец. клавиши (dead keys) Sun)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Французская (Швейцария, Macintosh)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Немецкая (Швейцария, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Арабская (Сирия)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Сирийская"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Сирийская (фонетическая)"
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Курдская (Сирия, латинская Q)"
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Курдская (Сирия, F)"
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Курдская (Сирия, латинская Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Таджикская"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Таджикская (устаревшая)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Сингальская (фонетическая)"
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Тамильская (Шри-Ланка, юникодная)"
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Тамильская (Шри-Ланка, печатная машинка TAB)"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
msgid "Thai"
msgstr "Тайская"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Тайская (TIS-820.2538)"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Тайская (паттачотская)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Турецкая"
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Турецкая (F)"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Турецкая (Alt-Q)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Турецкая (со спец. клавишами (dead keys) Sun)"
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Курдская (Турция, латинская Q)"
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
msgstr "Курдская (Турция, F)"
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Курдская (Турция, латинская Alt-Q)"
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
msgid "Turkish (international with dead keys)"
msgstr "Турецкая (международная со спец. клавишами)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:780 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Крымско-татарская (турецкая Q)"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Крымско-татарская (турецкая F)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Крымско-татарская (турецкая Alt-Q)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Тайваньская"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Тайваньская (туземная)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Сайсьят (Тайвань)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:790 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
msgstr "Украинская"
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
msgstr "Украинская (фонетическая)"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
msgstr "Украинская (печатная машинка)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
msgstr "Украинская (с клавишами Win)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
msgstr "Украинская (устаревшая)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
msgstr "Украинская (стандартная RSTU)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
msgstr "Русская (Украина, стандартная RSTU)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
msgstr "Украинская (омофоническая)"
-#: ../rules/base.xml.in.h:799 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Английская (Великобритания)"
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Английская (Великобритания, расширенная клавишами Win)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
msgstr "Английская (Великобритания, международная с спец. клавишами (dead keys))"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Английская (Великобритания, дворак)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
msgstr "Английская (Великобритания, дворак с английской пунктуацией)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Английская (Великобритания, Macintosh)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
msgstr "Английская (Великобритания, Macintosh международная)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
msgstr "Английская (Великобритания, Коулмак)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Узбекская"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Узбекская (латинская)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Вьетнамская"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:813 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
msgstr "Корейская"
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
msgstr "Корейская (совместимая c 101/104 кнопочной)"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Японская (PC-98xx Series)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Ирландская"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Ирландская (UnicodeExpert)"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Огхам"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Огхам (IS434)"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Урдская (Пакистан)"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
msgstr "Урдская (Пакистан, CRULP)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
msgstr "Урдская (Пакистан, NLA)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Арабская (Пакистан)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Синдхи"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Дивехи"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Английская (Южная Африка)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Эсперанто"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
msgid "Esperanto (displaced semicolon and quote, obsolete)"
msgstr "Эсперанто (смещённые точка с запятой и кавычка, устарела)"
#. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Непальская"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Английская (Нигерия)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Игбо"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Йорубская"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Амхарская"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
msgstr "Волофская"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Брайля"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Брайля (под левую руку)"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Брайля (под правую руку)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Туркменская"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Туркменская (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Баманская"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Французская (Мали, альтернативная)"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Английская (Мали, Macintosh США)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Английская (Мали, международная США)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Суахильская (Танзания)"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Суахильская (Кения)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Кикуйу"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Тсванская"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Филиппинская"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Филиппинская (QWERTY байбайинская)"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Филиппинская (кэйпвелл-дворак латиница)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Филиппинская (кэйпвелл-дворак байбайинcкая)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Филиппинская (Кэйпвелл-QWERF 2006 латиница)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Филиппинская (Кэйпвелл-QWERF 2006 байбайинская)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Филиппинская (Коулмак латиница)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Филиппинская (Коулмак байбайинская)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Филиппинская (дворак латиница)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Филиппинская (дворак байбайинcкая)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Молдавская"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Молдавская (гагаузская)"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Переключение на другую раскладку"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Правая клавиша Alt (пока нажата)"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Левая клавиша Alt (пока нажата)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Левая клавиша Win (пока нажата)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "Правая клавиша Win (пока нажата)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "Любая клавиша Win (на время нажатия)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
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:901
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Правая клавиша Ctrl (пока нажата)"
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Правая клавиша Alt"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Левая клавиша Alt"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Shift+Caps Lock"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
msgstr "Caps Lock (на первую раскладку), Shift+Caps Lock (на последнюю раскладку)"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
msgstr "Левая Win (на первую раскладку), Правая Win/Menu (на последнюю раскладку)"
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
msgstr "Левая Ctrl (на первую раскладку), Правая Ctrl (на последнюю раскладку)"
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+Caps Lock"
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Обе клавиши Shift, нажатые вместе"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Обе клавиши Alt, нажатые вместе"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Обе клавиши Ctrl, нажатые вместе"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Левая Ctrl+Левая Shift"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Правая Ctrl+Правая Shift"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Левая Alt+Левая Shift"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+Пробел"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Menu"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Левая клавиша Win"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "Клавиша Win+Пробел"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Правая клавиша Win"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Левая клавиша Shift"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Правая клавиша Shift"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Левая клавиша Ctrl"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Правая клавиша Ctrl"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Scroll Lock"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:932
msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
msgstr "Левая-Ctrl+Левая-Win (на первую раскладку), Правая-Ctrl+Menu (на вторую раскладку)"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Клавиша для выбора 3-го ряда"
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "Любая клавиша Win"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "Любая клавиша Alt"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Правая клавиша Alt, Shift и правая Alt вместе работают как Compose"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "По правой клавише Alt никогда не выбирается третий ряд"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Enter на цифровой клавиатуре"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Backslash"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Меньше чем/Больше чем&gt;"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:941
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:939
+#: ../rules/base.xml.in.h:942
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:940
+#: ../rules/base.xml.in.h:943
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:941
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Положение клавиши Ctrl"
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "Caps Lock как Ctrl"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Левая клавиша Ctrl как Meta"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Поменять местами клавиши Ctrl и Caps Lock"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "Слева от 'A'"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "Снизу слева"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Правая клавиша Ctrl работает как правая клавиша Alt"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Menu как правая клавиша Ctrl"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Правая клавиша Alt как правая клавиша Ctrl"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Левая клавиша Alt поменяна местами с левой клавишей Ctrl"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Левая клавиша Win поменяна местами с левой клавишей Ctrl"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:955
+msgid "Swap Right Win key with Right Ctrl key"
+msgstr "Правая клавиша Win поменяна местами с правой клавишей Ctrl"
+
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Левая клавиша Alt как Ctrl, левая клавиша Ctrl как Win, левая клавиша Win как Alt"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:957
msgid "Use keyboard LED to show alternative layout"
msgstr "Использовать клавиатурные индикаторы для отображения дополнительных раскладок"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "Num Lock"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Раскладка цифровой клавиатуры"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Legacy"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Дополнения юникода (стрелки и математические операторы)"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:962
msgid "Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Дополнения юникода (стрелки и математические операторы; математические операторы в ряду по умолчанию)"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Старая Wang 724"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:964
msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
msgstr "Цифровая клавиатура Wang 724 с дополнениями юникода (стрелки и математические операторы)"
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:965
msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Цифровая клавиатура Wang 724 с дополнениями юникода (стрелки и математические операторы; математические операторы в ряду по умолчанию)"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Шестнадцатеричная"
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "В стиле банкоматной/телефонной"
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
msgstr "Функция клавиши Delete на цифровой клавиатуре"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with dot"
msgstr "Клавиша Legacy с точкой"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Клавиша Legacy с запятой"
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Четырёх-рядная клавиша с точкой"
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Четырёх-рядная клавиша с точкой, только Latin-9"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "Четырёх-рядная клавиша с запятой"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:975
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:974
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Четырёх-рядная клавиша с абстрактными разделителями"
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Точка с запятой в третьем ряду"
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Поведение клавиши Caps Lock"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:981
msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
msgstr "Caps Lock включает внутреннюю капитализацию; Shift «приостанавливает» действие Caps Lock"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:982
msgid "Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock"
msgstr "Caps Lock включает внутреннюю капитализацию; Shift не влияет на Caps Lock"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:983
msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
msgstr "Caps Lock действует как Shift с блокировкой; Shift «приостанавливает» действие Caps Lock"
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:984
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:981
+#: ../rules/base.xml.in.h:985
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "Caps Lock переключает обычную капитализацию символов алфавита"
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "Использовать Caps Lock как дополнительную клавишу Num Lock"
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Поменять местами клавиши ESC и Caps Lock"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "Использовать Caps Lock как дополнительную клавишу ESC"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
msgstr "Использовать Caps Lock как дополнительную клавишу Backspace"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "Использовать Caps Lock как дополнительную клавишу Super"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "Использовать Caps Lock как дополнительную клавишу Hyper"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "Caps Lock переключает ShiftLock (действует сразу на все клавиши)"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "Caps Lock отключён"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "Использовать Caps Lock как дополнительную клавишу Ctrl"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Поведение клавиши Alt/Win"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "Добавить обыкновенное поведение на клавишу Menu"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt и Meta на клавишах Alt"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt используется в качестве клавиш Win (и как обычный Alt)"
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Ctrl используется в качестве клавиш Win (и как обычные клавиши Ctrl)"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Ctrl используется в качестве клавиш Alt; Alt используется в качестве клавиш Win"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "Meta соответствует клавишам Win"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "Meta соответствует левой клавише Win"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper соответствует клавишам Win"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1004
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Alt соответствует правой клавише Win, а Super — Menu"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Клавиша Alt поменяна местами с клавишей Win"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Положение клавиши Compose"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "3-й ряд левой Win"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "3-й ряд правой Win"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "3-й ряд Menu"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "3-й ряд левой Ctrl"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "3-й ряд правой Ctrl"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "3-й ряд Caps Lock"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "3-й ряд &lt;Меньше чем/Больше чем&gt;"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pause"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "PrtSc"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Разные параметры совместимости"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Клавиши цифровой клавиатуры по умолчанию"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1018
msgid "Numeric keypad keys always enter digits (as in Mac OS)"
msgstr "С клавиш цифровой клавиатуры всегда вводятся цифры (как в Mac OS)"
-#: ../rules/base.xml.in.h:1015
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Клавиша Shift с клавишами цифровой клавиатуры работают также как в MS Windows"
+#: ../rules/base.xml.in.h:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "NumLock включен: цифры, Shift переключает на клавиши-стрелки, Numlock выключен: всегда клавиши-стрелки (как в MS Windows)"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1020
msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
msgstr "Shift не отменяет Num Lock, а выбирает третий ряд"
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:1021
msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
msgstr "Специальные клавиши (Ctrl+Alt+&lt;клв&gt;) обрабатываются сервером"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1022
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:1019
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Shift отменяет Caps Lock"
-#: ../rules/base.xml.in.h:1020
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Включить дополнительные типографские символы"
-#: ../rules/base.xml.in.h:1021
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Обе клавиши Shift, нажатые вместе, переключают Caps Lock"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1026
msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
msgstr "Обе клавиши Shift, нажатые вместе, включают Caps Lock, одна клавиша Shift выключает"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Обе клавиши Shift, нажатые вместе, переключают ShiftLock"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Shift + NumLock переключают PointerKeys"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1029
msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
msgstr "Позволить прерывать захват с помощью клавиатуры (предупреждение: угроза безопасности)"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
msgstr "Позволить захват и протоколирование дерева окон"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "Добавление знаков валют к некоторым клавишам"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Символ евро на клавише E"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Символ евро на клавише 2"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Символ евро на клавише 4"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Символ евро на клавише 5"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Символ рупии на клавише 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "Клавиша для выбора 5-го ряда"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1038
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:1035
+#: ../rules/base.xml.in.h:1039
msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "По правой клавише Alt выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1040
msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "По левой клавише Win выбирается 5-й ряд, блокирует, блокирует при нажатии вместе с другим выборщиком-5-го-ряда"
-#: ../rules/base.xml.in.h:1037
+#: ../rules/base.xml.in.h:1041
msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
msgstr "По правой клавише Win выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда"
-#: ../rules/base.xml.in.h:1038
+#: ../rules/base.xml.in.h:1042
msgid "Using space key to input non-breakable space character"
msgstr "Клавиша пробела используется для ввода символа неразрывного пробела"
-#: ../rules/base.xml.in.h:1039
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "Обычный пробел в любом ряду"
-#: ../rules/base.xml.in.h:1040
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at second level"
msgstr "Символ неразрывного пробела во втором ряду"
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "Символ неразрывного пробела в третьем ряду"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1046
msgid "Non-breakable space character at third level, nothing at fourth level"
msgstr "Символ неразрывного пробела в третьем ряду, ничего на четвёртом"
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1047
msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
msgstr "Символ неразрывного пробела в третьем ряду, символ тонкого неразрывного пробела в четвёртом ряду"
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Символ неразрывного пробела в четвёртом ряду"
-#: ../rules/base.xml.in.h:1045
+#: ../rules/base.xml.in.h:1049
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
msgstr "Символ неразрывного пробела в четвёртом ряду, символ тонкого неразрывного пробела в шестом ряду"
-#: ../rules/base.xml.in.h:1046
+#: ../rules/base.xml.in.h:1050
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:1047
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level"
msgstr "Несвязывающий символ нулевой ширины во втором ряду"
-#: ../rules/base.xml.in.h:1048
+#: ../rules/base.xml.in.h:1052
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
msgstr "Несвязывающий символ нулевой ширины во втором ряду, связывающий символ нулевой ширины в третьем ряду"
-#: ../rules/base.xml.in.h:1049
+#: ../rules/base.xml.in.h:1053
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:1050
+#: ../rules/base.xml.in.h:1054
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
msgstr "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду"
-#: ../rules/base.xml.in.h:1051
+#: ../rules/base.xml.in.h:1055
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:1052
+#: ../rules/base.xml.in.h:1056
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:1053
+#: ../rules/base.xml.in.h:1057
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:1054
+#: ../rules/base.xml.in.h:1058
msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
msgstr "Несвязывающий символ нулевой ширины в третьем ряду, связывающий символ нулевой ширины в четвёртом ряду"
-#: ../rules/base.xml.in.h:1055
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Настройки японской клавиатуры"
-#: ../rules/base.xml.in.h:1056
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
msgstr "Кана блокируется клавишей Lock"
-#: ../rules/base.xml.in.h:1057
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
msgstr "Backspace в стиле NICOLA-F"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Использовать Zenkaku Hankaku как дополнительную клавишу ESC"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Корейские клавиши хангыль/ханча"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Аппаратные клавиши хангыль/ханча"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Правая клавиша Alt для хангыли, правая клавиша Ctrl для ханчи"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Правая клавиша Ctrl для хангыли, правая клавиша Alt для ханчи"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "Добавление букв эсперанто с надстрочными знаками"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "На соответствующую клавишу в раскладке Qwerty"
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "На соответствующую клавишу в раскладке дворак"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "На соответствующую клавишу в раскладке Коулмак"
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1071
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Сохранить совместимость со старыми кодами клавиш Solaris"
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Совместимость с клавишами Sun"
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Комбинация клавиш для прерывания работы X-сервера"
-#: ../rules/base.xml.in.h:1066
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + Backspace"
@@ -4064,250 +4096,261 @@ msgid "German (with Hungarian letters and no dead keys)"
msgstr "Немецкая (с венгерскими буквами и без спец. клавиш (dead keys))"
#: ../rules/base.extras.xml.in.h:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Польская (Германия, без спец. клавиш (dead keys))"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Немецкая (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Немецкая (Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "Авестийская"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Литовская (дворак США с литовскими буквами)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Литовская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Латышская (дворак США)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Латышская (дворак США, вариант с Y)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Латышская (дворак США, вариант с минусом)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Латышская (дворак США для программистов)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Латышская (дворак США для программистов, вариант с Y)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Латышская (дворак США для программистов, вариант с минусом)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Латышская (Коулмак США)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Латышская (Коулмак США, вариант с апострофом)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Латышская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Английская (США, международная, объединённая с юникодным AltGr)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Английская (США, международная, объединённая с юникодным AltGr, альтернативная)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "Атсинская"
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Салишская Кёр-д’Ален"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
msgstr "Чехословацкая и немецкая (США)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Английская (США, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Английская (нормандская)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Польская (международная со спец. клавишами)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Польская (Коулмак)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Польская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Крымско-татарская (Dobruja Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Румынская (эргономичная для слепой печати)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Румынская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Сербская (объединённые надбуквенные знаки вместе спец. клавиш (dead keys))"
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Старославянская"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Русская (с украинско-белорусской раскладкой)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Русская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Армянская (фонетическая на OLPC)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Иврит (Библейская, фонетическая SIL)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Арабская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Бельгийская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Португальская (Бразилия, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "Чешская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Датская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Голландская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Эстонская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Финская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Французская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Греческая (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Итальянская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Японская (Sun Type 6)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Японская (Sun Type 7, совместимая с pc)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Японская (Sun Type 7, совместимая с sun)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Норвежская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Португальская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Словацкая (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Испанская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Шведская (дворак A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Шведская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Немецкая (Швейцария, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Французская (Швейцария, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Турецкая (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "Украинская (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Английская (Великобритания, Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
msgstr "Корейская (Sun Type 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
msgstr "EurKEY (раскладка на основе США с европейскими буквами)"
+#: ../rules/base.extras.xml.in.h:152
+msgid "Mmuock"
+msgstr "Mmuock"
+
+#~ msgid "Shift with numeric keypad keys works as in MS Windows"
+#~ msgstr "Клавиша Shift с клавишами цифровой клавиатуры работают также как в MS Windows"
+
#~ msgid "Bengali"
#~ msgstr "Бенгальская"
diff --git a/xorg-server/xkeyboard-config/po/sv.po b/xorg-server/xkeyboard-config/po/sv.po
index 4de4ce8e4..8954a4c2f 100644
--- a/xorg-server/xkeyboard-config/po/sv.po
+++ b/xorg-server/xkeyboard-config/po/sv.po
@@ -1,3877 +1,4385 @@
# Swedish messages for xkeyboard-config.
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
# This file is distributed under the same license as the xkeyboard-config package.
# Christian Rose <menthos@menthos.com>, 2004.
# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2014, 2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.4.99\n"
+"Project-Id-Version: xkeyboard-config 2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-01-17 20:46+0000\n"
-"PO-Revision-Date: 2012-01-23 09:01+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-25 20:50+0100\n"
+"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.3\n"
#: ../rules/base.xml.in.h:1
-msgid "&lt;Less/Greater&gt;"
-msgstr "&lt;Mindre än/Större än&gt;"
+msgid "Generic 101-key PC"
+msgstr "Allmän 101-tangenters 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 än/Större än&gt; väljer tredje nivån, låses när nedtryckt tillsammans med annan tredjenivåväljare"
+msgid "Generic 102-key (Intl) PC"
+msgstr "Allmän 102-tangenters (internationell) 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 än/Större än&gt; väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
+msgid "Generic 104-key PC"
+msgstr "Allmän 104-tangenters PC"
#: ../rules/base.xml.in.h:4
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Generic 105-key (Intl) PC"
+msgstr "Allmän 105-tangenters (internationell) PC"
#: ../rules/base.xml.in.h:5
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Dell 101-key PC"
+msgstr "Dell 101-tangenters 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 "Bärbar Dell Latitude-serien"
#: ../rules/base.xml.in.h:7
-msgid "ATM/phone-style"
-msgstr "Knappsats/telefonliknande"
+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 "Bärbar Acer-dator"
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
#: ../rules/base.xml.in.h:12
-msgid "Add the standard behavior to Menu key"
-msgstr "Lägg till standardbeteendet till Meny-tangenten"
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
#: ../rules/base.xml.in.h:13
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr "Lägger till Esperanto-circumflex (supersigno)"
+msgid "PC-98xx Series"
+msgstr "PC-98xx-serien"
#: ../rules/base.xml.in.h:14
-msgid "Adding currency signs to certain keys"
-msgstr "Lägger till valutatecken till vissa tangenter"
+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 "Afganska"
+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 "Albanska"
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 trådlöst internettangentbord"
#: ../rules/base.xml.in.h:19
-msgid "Alt and Meta are on Alt keys"
-msgstr "Alt och Meta finns på Alt-tangenterna"
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
#: ../rules/base.xml.in.h:20
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Alt är mappad till högra Win-tangenten och Super till Meny"
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internettangentbord"
#: ../rules/base.xml.in.h:21
-msgid "Alt+Caps Lock"
-msgstr "Alt+Caps Lock"
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
#: ../rules/base.xml.in.h:22
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
#: ../rules/base.xml.in.h:23
-msgid "Alt+Shift"
-msgstr "Alt+Skift"
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
#: ../rules/base.xml.in.h:24
-msgid "Alt+Space"
-msgstr "Alt+Blanksteg"
+msgid "BTC 9000"
+msgstr "BTC 9000"
#: ../rules/base.xml.in.h:25
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win-tangentbeteende"
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
#: ../rules/base.xml.in.h:26
-msgid "Amharic"
-msgstr "Amhariska"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
#: ../rules/base.xml.in.h:27
-msgid "Any Alt key"
-msgstr "Valfri Alt-tangent"
+msgid "BTC 5090"
+msgstr "BTC 5090"
#: ../rules/base.xml.in.h:28
-msgid "Any Win key"
-msgstr "Valfri Win-tangent"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
#: ../rules/base.xml.in.h:29
-msgid "Any Win key (while pressed)"
-msgstr "Valfri Win-tangent (då den trycks ned)"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Mini Wireless Internet and Gaming"
#: ../rules/base.xml.in.h:30
-msgid "Apple"
-msgstr "Apple"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
#: ../rules/base.xml.in.h:31
-msgid "Apple Aluminium Keyboard (ANSI)"
-msgstr "Apple aluminiumtangentbord (ANSI)"
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
#: ../rules/base.xml.in.h:32
-msgid "Apple Aluminium Keyboard (ISO)"
-msgstr "Apple aluminiumtangentbord (ISO)"
+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 (JIS)"
-msgstr "Apple aluminiumtangentbord (JIS)"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-hubb"
#: ../rules/base.xml.in.h:34
-msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
-msgstr "Apple aluminiumtangentbord: emulera PC-tangenter (Print, Scroll Lock, Pause, Num Lock)"
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
#: ../rules/base.xml.in.h:35
-msgid "Apple Laptop"
-msgstr "Bärbar Apple-dator"
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
#: ../rules/base.xml.in.h:36
-msgid "Arabic"
-msgstr "Arabiska"
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internettangentbord"
#: ../rules/base.xml.in.h:37
-msgid "Arabic (Buckwalter)"
-msgstr "Arabiska (Buckwalter)"
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
#: ../rules/base.xml.in.h:38
-msgid "Arabic (Morocco)"
-msgstr "Arabiska (Marocko)"
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
#: ../rules/base.xml.in.h:39
-msgid "Arabic (Pakistan)"
-msgstr "Arabiska (Pakistan)"
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
#: ../rules/base.xml.in.h:40
-msgid "Arabic (Syria)"
-msgstr "Arabiska (Syrien)"
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access-tangentbord"
#: ../rules/base.xml.in.h:41
-msgid "Arabic (azerty)"
-msgstr "Arabiska (azerty)"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internettangentbord (7 tangenter)"
#: ../rules/base.xml.in.h:42
-msgid "Arabic (azerty/digits)"
-msgstr "Arabiska (azerty/siffror)"
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internettangentbord (13 tangenter)"
#: ../rules/base.xml.in.h:43
-msgid "Arabic (digits)"
-msgstr "Arabiska (siffror)"
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internettangentbord (18 tangenter)"
#: ../rules/base.xml.in.h:44
-msgid "Arabic (qwerty)"
-msgstr "Arabiska (qwerty)"
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
#: ../rules/base.xml.in.h:45
-msgid "Arabic (qwerty/digits)"
-msgstr "Arabiska (qwerty/siffror)"
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop-tangentbord för bärbar Compaq-dator (t.ex. Armada)"
-#: ../rules/base.xml.in.h:46 ../rules/base.extras.xml.in.h:2
-msgid "Armenian"
-msgstr "Armeniska"
+#: ../rules/base.xml.in.h:46
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Internettangentbord för bärbar Compaq-dator (t.ex. Presario)"
#: ../rules/base.xml.in.h:47
-msgid "Armenian (alternative eastern)"
-msgstr "Armeniska (Alternativ östlig)"
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq-tangentbord"
#: ../rules/base.xml.in.h:48
-msgid "Armenian (alternative phonetic)"
-msgstr "Armeniska (Alternativ fonetisk)"
+msgid "Dell"
+msgstr "Dell"
#: ../rules/base.xml.in.h:49
-msgid "Armenian (eastern)"
-msgstr "Armeniska (östlig)"
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
#: ../rules/base.xml.in.h:50
-msgid "Armenian (phonetic)"
-msgstr "Armeniska (fonetisk)"
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
#: ../rules/base.xml.in.h:51
-msgid "Armenian (western)"
-msgstr "Armeniska (västlig)"
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB-multimediatangentbord"
#: ../rules/base.xml.in.h:52
-msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
-msgstr "Asturiska (Spanien, med nederpunkts H och nederpunkts L)"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Bärbar Dell Inspiron 6xxx/8xxx"
#: ../rules/base.xml.in.h:53
-msgid "Asus Laptop"
-msgstr "Bärbar Asus-dator"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Bärbar Dell Precision M series"
#: ../rules/base.xml.in.h:54
-msgid "At bottom left"
-msgstr "Nere till vänster"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa trådlöst skrivbordstangentbord"
#: ../rules/base.xml.in.h:55
-msgid "At left of 'A'"
-msgstr "Till vänster om \"A\""
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801/9802-serien"
#: ../rules/base.xml.in.h:56
-msgid "Avatime"
-msgstr "Avatime"
+msgid "DTK2000"
+msgstr "DTK2000"
#: ../rules/base.xml.in.h:57
-msgid "Azerbaijani"
-msgstr "Azerbajdzjanska"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
#: ../rules/base.xml.in.h:58
-msgid "Azerbaijani (Cyrillic)"
-msgstr "Azerbajdzjanska (Kyrillisk)"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO bärbar dator"
#: ../rules/base.xml.in.h:59
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 trådlöst internettangentbord"
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM-tangentbord KWD-910"
#: ../rules/base.xml.in.h:60
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
#: ../rules/base.xml.in.h:61
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
#: ../rules/base.xml.in.h:62
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
#: ../rules/base.xml.in.h:63
-msgid "BTC 6301URF"
-msgstr "BTC 6301URF"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
#: ../rules/base.xml.in.h:64
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "Gyration"
+msgstr "Gyration"
#: ../rules/base.xml.in.h:65
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "HTC Dream"
+msgstr "HTC Dream"
#: ../rules/base.xml.in.h:66
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Kinesis"
+msgstr "Kinesis"
#: ../rules/base.xml.in.h:67
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard"
#: ../rules/base.xml.in.h:68
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr "BTC 9116U Mini Wireless Internet and Gaming"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extratangenter via G15daemon"
#: ../rules/base.xml.in.h:69
-msgid "Backslash"
-msgstr "Omvänt snedstreck"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internettangentbord"
#: ../rules/base.xml.in.h:70
-msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
-msgstr "Omvänt snedstreck väljer tredje nivån, låses när nedtryckt tillsammans med en annan tredjenivåväljare"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
#: ../rules/base.xml.in.h:71
-msgid "Bambara"
-msgstr "Bambara"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
#: ../rules/base.xml.in.h:72
-msgid "Bashkirian"
-msgstr "Basjkiriska"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
#: ../rules/base.xml.in.h:73
-msgid "Belarusian"
-msgstr "Vitryska"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
#: ../rules/base.xml.in.h:74
-msgid "Belarusian (Latin)"
-msgstr "Vitryska (latin)"
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
#: ../rules/base.xml.in.h:75
-msgid "Belarusian (legacy)"
-msgstr "Vitryska (äldre)"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
#: ../rules/base.xml.in.h:76
-msgid "Belgian"
-msgstr "Belgisk"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
#: ../rules/base.xml.in.h:77
-msgid "Belgian (ISO alternate)"
-msgstr "Belgisk (ISO-alternativ)"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
#: ../rules/base.xml.in.h:78
-msgid "Belgian (Sun dead keys)"
-msgstr "Belgisk (Sun stumma tangenter)"
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
#: ../rules/base.xml.in.h:79
-msgid "Belgian (Wang model 724 azerty)"
-msgstr "Belgisk (Wang modell 724 azerty)"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
#: ../rules/base.xml.in.h:80
-msgid "Belgian (alternative)"
-msgstr "Belgisk (alternativ)"
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
#: ../rules/base.xml.in.h:81
-msgid "Belgian (alternative, Sun dead keys)"
-msgstr "Belgisk (alternativ, Sun stumma tangenter)"
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Bärbar Hewlett-Packard Mini 110"
#: ../rules/base.xml.in.h:82
-msgid "Belgian (alternative, latin-9 only)"
-msgstr "Belgisk (alternativ, endast latin-9)"
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
#: ../rules/base.xml.in.h:83
-msgid "Belgian (eliminate dead keys)"
-msgstr "Belgisk (eliminera stumma tangenter)"
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
#: ../rules/base.xml.in.h:84
-msgid "BenQ X-Touch"
-msgstr "BenQ X-Touch"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
#: ../rules/base.xml.in.h:85
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
#: ../rules/base.xml.in.h:86
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
#: ../rules/base.xml.in.h:87
-msgid "Bengali"
-msgstr "Bengalisk"
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
#: ../rules/base.xml.in.h:88
-msgid "Bengali (India)"
-msgstr "Bengali (Indien)"
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
#: ../rules/base.xml.in.h:89
-msgid "Bengali (India, Baishakhi Inscript)"
-msgstr "Bengali (Indien, Baishakhi Inscript)"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
#: ../rules/base.xml.in.h:90
-msgid "Bengali (India, Baishakhi)"
-msgstr "Bengali (Indien, Baishakhi)"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
#: ../rules/base.xml.in.h:91
-msgid "Bengali (India, Bornona)"
-msgstr "Bengali (Indien, Bornona)"
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
#: ../rules/base.xml.in.h:92
-msgid "Bengali (India, Probhat)"
-msgstr "Bengali (Indien, Probhat)"
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
#: ../rules/base.xml.in.h:93
-msgid "Bengali (India, Uni Gitanjali)"
-msgstr "Bengali (Indien, Uni Gitanjali)"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
#: ../rules/base.xml.in.h:94
-msgid "Bengali (Probhat)"
-msgstr "Bengali (Probhat)"
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
#: ../rules/base.xml.in.h:95
-msgid "Berber (Morocco, Tifinagh alternative phonetic)"
-msgstr "Berberisk (Marocko, Tifinagh alternativ fonetisk)"
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
#: ../rules/base.xml.in.h:96
-msgid "Berber (Morocco, Tifinagh alternative)"
-msgstr "Berberisk (Marocko, Tifinagh alternativ)"
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternativ)"
#: ../rules/base.xml.in.h:97
-msgid "Berber (Morocco, Tifinagh extended phonetic)"
-msgstr "Berberisk (Marocko, Tifinagh utökad fonetisk)"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (alternativt val 2)"
#: ../rules/base.xml.in.h:98
-msgid "Berber (Morocco, Tifinagh extended)"
-msgstr "Berberisk (Marocko, Tifinagh utökad)"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
#: ../rules/base.xml.in.h:99
-msgid "Berber (Morocco, Tifinagh phonetic)"
-msgstr "Berberisk (Marocko, Tifinagh fonetisk)"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (modell Y-RB6)"
#: ../rules/base.xml.in.h:100
-msgid "Berber (Morocco, Tifinagh)"
-msgstr "Berberisk (Marocko, Tifinagh)"
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internettangentbord"
#: ../rules/base.xml.in.h:101
-msgid "Bosnian"
-msgstr "Bosnisk"
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
#: ../rules/base.xml.in.h:102
-msgid "Bosnian (US keyboard with Bosnian digraphs)"
-msgstr "Bosnisk (USA-tangentbord med bosniska digrafer)"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator-tangentbord"
#: ../rules/base.xml.in.h:103
-msgid "Bosnian (US keyboard with Bosnian letters)"
-msgstr "Bosnisk (USA-tangentbord med bosniska bokstäver)"
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
#: ../rules/base.xml.in.h:104
-msgid "Bosnian (use Bosnian digraphs)"
-msgstr "Bosnisk (Använd bosniska digrafer)"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
#: ../rules/base.xml.in.h:105
-msgid "Bosnian (use guillemets for quotes)"
-msgstr "Bosnisk (Använd gåsögon för citattecken)"
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
#: ../rules/base.xml.in.h:106
-msgid "Both Alt keys together"
-msgstr "Båda Alt-tangenterna tillsammans"
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
#: ../rules/base.xml.in.h:107
-msgid "Both Ctrl keys together"
-msgstr "Båda Ctrl-tangenterna tillsammans"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
#: ../rules/base.xml.in.h:108
-msgid "Both Shift keys together"
-msgstr "Båda Skift-tangenterna tillsammans"
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
#: ../rules/base.xml.in.h:109
-msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
-msgstr "Båda Skift-tangenterna tillsammans aktiverar Caps Lock, en Shift-tangent inaktiverar"
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
#: ../rules/base.xml.in.h:110
-msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr "Båda Skift-tangenterna tillsammans växlar Caps Lock"
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
#: ../rules/base.xml.in.h:111
-msgid "Both Shift-Keys together toggle ShiftLock"
-msgstr "Båda Skift-tangenterna tillsammans växlar ShiftLock"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access-tangentbord"
#: ../rules/base.xml.in.h:112
-msgid "Braille"
-msgstr "Punktskrift"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
#: ../rules/base.xml.in.h:113
-msgid "Braille (left hand)"
-msgstr "Punktskrift (vänster hand)"
+msgid "Microsoft Natural Ergonomic Keyboard 4000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
#: ../rules/base.xml.in.h:114
-msgid "Braille (right hand)"
-msgstr "Punktskrift (höger hand)"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
#: ../rules/base.xml.in.h:115
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internettangentbord"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
#: ../rules/base.xml.in.h:116
-msgid "Bulgarian"
-msgstr "Bulgarisk"
+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 (new phonetic)"
-msgstr "Bulgarisk (ny fonetisk)"
+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 (traditional phonetic)"
-msgstr "Bulgarisk (traditionell fonetisk)"
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
#: ../rules/base.xml.in.h:119
-msgid "Burmese"
-msgstr "Burmesisk"
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 internettangentbord"
#: ../rules/base.xml.in.h:120
-msgid "Cameroon Multilingual (Dvorak)"
-msgstr "Kamerun flerspråkig (Dvorak)"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, svensk"
#: ../rules/base.xml.in.h:121
-msgid "Cameroon Multilingual (azerty)"
-msgstr "Kamerun flerspråkig (azerty)"
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office-tangentbord"
#: ../rules/base.xml.in.h:122
-msgid "Cameroon Multilingual (qwerty)"
-msgstr "Kamerun flerspråkig (qwerty)"
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
#: ../rules/base.xml.in.h:123
-msgid "Canadian Multilingual"
-msgstr "Kanadensisk flerspråkig"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
#: ../rules/base.xml.in.h:124
-msgid "Canadian Multilingual (first part)"
-msgstr "Kanadensisk flerspråkig (första delen)"
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
#: ../rules/base.xml.in.h:125
-msgid "Canadian Multilingual (second part)"
-msgstr "Kanadensisk flerspråkig (andra delen)"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet-tangentbord"
#: ../rules/base.xml.in.h:126
-msgid "Caps Lock"
-msgstr "Caps Lock"
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
#: ../rules/base.xml.in.h:127
-msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
-msgstr "Caps Lock (till första layouten), Skift+Caps Lock (till sista layouten)"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
#: ../rules/base.xml.in.h:128
-msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
-msgstr "Caps Lock (när den trycks ned), Alt+Caps Lock gör ursprunglig capslock-åtgärd"
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
#: ../rules/base.xml.in.h:129
-msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock fungerar som Skift med låsning. Skift \"pausar\" Caps Lock"
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
#: ../rules/base.xml.in.h:130
-msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock fungerar som Skift med låsning. Skift påverkar inte Caps Lock"
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
#: ../rules/base.xml.in.h:131
-msgid "Caps Lock as Ctrl"
-msgstr "Caps Lock som Ctrl"
+msgid "SK-1300"
+msgstr "SK-1300"
#: ../rules/base.xml.in.h:132
-msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
-msgstr "Caps Lock väljer tredje nivån, låses när nedtryckt tillsammans med en annan tredjenivåväljare"
+msgid "SK-2500"
+msgstr "SK-2500"
#: ../rules/base.xml.in.h:133
-msgid "Caps Lock is disabled"
-msgstr "Caps Lock är inaktiverad"
+msgid "SK-6200"
+msgstr "SK-6200"
#: ../rules/base.xml.in.h:134
-msgid "Caps Lock key behavior"
-msgstr "Beteende för Caps Lock-tangenten"
+msgid "SK-7100"
+msgstr "SK-7100"
#: ../rules/base.xml.in.h:135
-msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr "Caps Lock växlar Skift så alla tangenter påverkas"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
#: ../rules/base.xml.in.h:136
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr "Caps Lock växlar normalt skiftläge på alfabetiska tecken"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
#: ../rules/base.xml.in.h:137
-msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock använder intern skiftlägesstyrning. Skift \"pausar\" Caps Lock"
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
#: ../rules/base.xml.in.h:138
-msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock använder intern skiftlägesstyrning. Skift påverkar inte Caps Lock"
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
#: ../rules/base.xml.in.h:139
-msgid "Catalan"
-msgstr "Katalansk"
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
#: ../rules/base.xml.in.h:140
-msgid "Catalan (Spain, with middle-dot L)"
-msgstr "Katalanska (Spanien, med mittenpunkts L)"
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
#: ../rules/base.xml.in.h:141
-msgid "Cherokee"
-msgstr "Cherokee"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access-tangentbord"
#: ../rules/base.xml.in.h:142
-msgid "Cherry B.UNLIMITED"
-msgstr "Cherry B.UNLIMITED"
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
#: ../rules/base.xml.in.h:143
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
#: ../rules/base.xml.in.h:144
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (alternativ)"
+msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgstr "TypeMatrix EZ-Reach 2030 PS2"
#: ../rules/base.xml.in.h:145
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-hubb"
+msgid "TypeMatrix EZ-Reach 2030 USB"
+msgstr "TypeMatrix EZ-Reach 2030 USB"
#: ../rules/base.xml.in.h:146
-msgid "Cherry CyMotion Expert"
-msgstr "Cherry CyMotion Expert"
+msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU-läge)"
#: ../rules/base.xml.in.h:147
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP-läge)"
#: ../rules/base.xml.in.h:148
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internettangentbord"
#: ../rules/base.xml.in.h:149
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internettangentbord"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
#: ../rules/base.xml.in.h:150
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
#: ../rules/base.xml.in.h:151
-msgid "Chicony KU-0108"
-msgstr "Chicony KU-0108"
+msgid "Macintosh"
+msgstr "Macintosh"
#: ../rules/base.xml.in.h:152
-msgid "Chicony KU-0420"
-msgstr "Chicony KU-0420"
+msgid "Macintosh Old"
+msgstr "Macintosh gammal"
#: ../rules/base.xml.in.h:153
-msgid "Chinese"
-msgstr "Kinesisk"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking-tangentbord för Mac"
#: ../rules/base.xml.in.h:154
-msgid "Chuvash"
-msgstr "Tjuvasjiska"
+msgid "Acer C300"
+msgstr "Acer C300"
#: ../rules/base.xml.in.h:155
-msgid "Chuvash (Latin)"
-msgstr "Chuvash (Latin)"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
#: ../rules/base.xml.in.h:156
-msgid "Classmate PC"
-msgstr "Classmate PC"
+msgid "Acer Laptop"
+msgstr "Bärbar Acer-dator"
#: ../rules/base.xml.in.h:157
-msgid "CloGaelach"
-msgstr "CloGaelach"
+msgid "Asus Laptop"
+msgstr "Bärbar Asus-dator"
#: ../rules/base.xml.in.h:158
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access-tangentbord"
+msgid "Apple"
+msgstr "Apple"
#: ../rules/base.xml.in.h:159
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internettangentbord (13 tangenter)"
+msgid "Apple Laptop"
+msgstr "Bärbar Apple-dator"
#: ../rules/base.xml.in.h:160
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internettangentbord (18 tangenter)"
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Apple aluminiumtangentbord (ANSI)"
#: ../rules/base.xml.in.h:161
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internettangentbord (7 tangenter)"
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Apple aluminiumtangentbord (ISO)"
#: ../rules/base.xml.in.h:162
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq-tangentbord"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Apple aluminiumtangentbord (JIS)"
#: ../rules/base.xml.in.h:163
-msgid "Compose key position"
-msgstr "Position för Compose-tangenten"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
#: ../rules/base.xml.in.h:164
-msgid "Control + Alt + Backspace"
-msgstr "Control + Alt + Backsteg"
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Bärbar eMachines m68xx"
#: ../rules/base.xml.in.h:165
-msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr "Control är mappad till Alt-tangenterna, Alt-tangenten är mappad till Win-tangenterna"
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
#: ../rules/base.xml.in.h:166
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr "Control är mappad till Win-tangenterna (och de vanliga Ctrl-tangenterna)"
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
#: ../rules/base.xml.in.h:167
-msgid "Creative Desktop Wireless 7000"
-msgstr "Creative Desktop Wireless 7000"
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
#: ../rules/base.xml.in.h:168
-msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "Krimtatariska (Turkisk Alt-Q)"
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking-tangentbord"
#: ../rules/base.xml.in.h:169
-msgid "Crimean Tatar (Turkish F)"
-msgstr "Krimtatariska (Turkiskt F)"
+msgid "Classmate PC"
+msgstr "Classmate PC"
#: ../rules/base.xml.in.h:170
-msgid "Crimean Tatar (Turkish Q)"
-msgstr "Krimtatariska (Turkiskt Q)"
+msgid "OLPC"
+msgstr "OLPC"
#: ../rules/base.xml.in.h:171
-msgid "Croatian"
-msgstr "Kroatisk"
+msgid "Sun Type 7 USB"
+msgstr "Sun Type 7 USB"
#: ../rules/base.xml.in.h:172
-msgid "Croatian (US keyboard with Croatian digraphs)"
-msgstr "Kroatisk (USA-tangentbord med kroatiska digrafer)"
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun Type 7 USB (Europeisk layout)"
#: ../rules/base.xml.in.h:173
-msgid "Croatian (US keyboard with Croatian letters)"
-msgstr "Kroatisk (USA-tangentbord med kroatiska bokstäver)"
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun Type 7 USB (Unix-layout)"
#: ../rules/base.xml.in.h:174
-msgid "Croatian (use Croatian digraphs)"
-msgstr "Kroatiska (använder kroatiska digrafer)"
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun Type 7 USB (Japansk layout) / Japansk 106-tangenters"
#: ../rules/base.xml.in.h:175
-msgid "Croatian (use guillemets for quotes)"
-msgstr "Kroatiska (använder gåsögon för citattecken)"
+msgid "Sun Type 6/7 USB"
+msgstr "Sun Type 6/7 USB"
#: ../rules/base.xml.in.h:176
-msgid "Ctrl key position"
-msgstr "Position för Ctrl-tangenten"
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun Type 6/7 USB (Europeisk layout)"
#: ../rules/base.xml.in.h:177
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Skift"
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun Type 6 USB (Unix-layout)"
#: ../rules/base.xml.in.h:178
-msgid "Czech"
-msgstr "Tjeckisk"
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun Type 6 USB (Japansk layout)"
#: ../rules/base.xml.in.h:179
-msgid "Czech (UCW layout, accented letters only)"
-msgstr "Tjeckiska (UCW-layout, endast bokstäver med accenter)"
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun Type 6 (Japansk layout)"
#: ../rules/base.xml.in.h:180
-msgid "Czech (US Dvorak with CZ UCW support)"
-msgstr "Tjeckisk (US Dvorak med CZ UCW-stöd)"
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
#: ../rules/base.xml.in.h:181
-msgid "Czech (qwerty)"
-msgstr "Tjeckisk (qwerty)"
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
#: ../rules/base.xml.in.h:182
-msgid "Czech (qwerty, extended Backslash)"
-msgstr "Tjeckisk (qwerty, utökat omvänt snedstreck)"
+msgid "FL90"
+msgstr "FL90"
#: ../rules/base.xml.in.h:183
-msgid "Czech (with &lt;\\|&gt; key)"
-msgstr "Tjeckiska (med &lt;\\|&gt;-tangent)"
+msgid "Creative Desktop Wireless 7000"
+msgstr "Creative Desktop Wireless 7000"
#: ../rules/base.xml.in.h:184
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:185
-msgid "Danish"
-msgstr "Dansk"
-
-#: ../rules/base.xml.in.h:186
-msgid "Danish (Dvorak)"
-msgstr "Dansk (Dvorak)"
+msgid "Htc Dream phone"
+msgstr "Htc Dream-telefon"
-#: ../rules/base.xml.in.h:187
-msgid "Danish (Macintosh)"
-msgstr "Danska (Macintosh)"
+#. Keyboard indicator for English layouts
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
+msgid "en"
+msgstr "en"
-#: ../rules/base.xml.in.h:188
-msgid "Danish (Macintosh, eliminate dead keys)"
-msgstr "Danska (Macintosh, eliminera stumma tangenter)"
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
+msgid "English (US)"
+msgstr "Engelsk (USA)"
+#. Keyboard indicator for Cherokee layouts
#: ../rules/base.xml.in.h:189
-msgid "Danish (eliminate dead keys)"
-msgstr "Dansk (eliminera stumma tangenter)"
+msgid "chr"
+msgstr "chr"
#: ../rules/base.xml.in.h:190
-msgid "Default numeric keypad keys"
-msgstr "Standardtangenter för numeriskt tangentbord"
+msgid "Cherokee"
+msgstr "Cherokee"
#: ../rules/base.xml.in.h:191
-msgid "Dell"
-msgstr "Dell"
+msgid "English (US, with euro on 5)"
+msgstr "Engelsk (USA, med euro på 5)"
#: ../rules/base.xml.in.h:192
-msgid "Dell 101-key PC"
-msgstr "Dell 101-tangenters PC"
+msgid "English (US, international with dead keys)"
+msgstr "Engelsk (USA, internationell med stumma tangenter)"
#: ../rules/base.xml.in.h:193
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Bärbar Dell Inspiron 6xxx/8xxx"
+msgid "English (US, alternative international)"
+msgstr "Engelsk (USA, alternativ internationell)"
#: ../rules/base.xml.in.h:194
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Bärbar Dell Precision M series"
+msgid "English (Colemak)"
+msgstr "Engelsk (Colemak)"
#: ../rules/base.xml.in.h:195
-msgid "Dell Latitude series laptop"
-msgstr "Bärbar Dell Latitude-serien"
+msgid "English (Dvorak)"
+msgstr "Engelsk (Dvorak)"
#: ../rules/base.xml.in.h:196
-msgid "Dell Precision M65"
-msgstr "Dell Precision M65"
+msgid "English (Dvorak, international with dead keys)"
+msgstr "Engelsk (Dvorak, Internationell med stumma tangenter)"
#: ../rules/base.xml.in.h:197
-msgid "Dell SK-8125"
-msgstr "Dell SK-8125"
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr "Engelsk (Dvorak alternativ internationell utan stumma tangenter)"
#: ../rules/base.xml.in.h:198
-msgid "Dell SK-8135"
-msgstr "Dell SK-8135"
+msgid "English (left handed Dvorak)"
+msgstr "Engelsk (vänsterhänt Dvorak)"
#: ../rules/base.xml.in.h:199
-msgid "Dell USB Multimedia Keyboard"
-msgstr "Dell USB-multimediatangentbord"
+msgid "English (right handed Dvorak)"
+msgstr "Engelsk (högerhänt Dvorak)"
#: ../rules/base.xml.in.h:200
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa trådlöst skrivbordstangentbord"
+msgid "English (classic Dvorak)"
+msgstr "Engelsk (klassisk Dvorak)"
#: ../rules/base.xml.in.h:201
-msgid "Dhivehi"
-msgstr "Dhivehi"
-
-#: ../rules/base.xml.in.h:202
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801/9802-serien"
+msgid "English (programmer Dvorak)"
+msgstr "Engelsk (Dvorak för programmerare)"
-#: ../rules/base.xml.in.h:203
-msgid "Dutch"
-msgstr "Nederländsk"
+#. Keyboard indicator for Russian layouts
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
+msgid "ru"
+msgstr "ru"
#: ../rules/base.xml.in.h:204
-msgid "Dutch (Macintosh)"
-msgstr "Nederländska (Macintosh)"
+msgid "Russian (US, phonetic)"
+msgstr "Rysk (USA, fonetisk)"
#: ../rules/base.xml.in.h:205
-msgid "Dutch (Sun dead keys)"
-msgstr "Nederländsk (Sun stumma tangenter)"
+msgid "English (Macintosh)"
+msgstr "Engelsk (Macintosh)"
#: ../rules/base.xml.in.h:206
-msgid "Dutch (standard)"
-msgstr "Nederländsk (standard)"
+msgid "English (international AltGr dead keys)"
+msgstr "Engelsk (internationell AltGr med stumma tangenter)"
#: ../rules/base.xml.in.h:207
-msgid "Dzongkha"
-msgstr "Dzongkha"
+msgid "English (the divide/multiply keys toggle the layout)"
+msgstr "Engelsk (divisions-/multiplikationstangenterna växlar layouten)"
#: ../rules/base.xml.in.h:208
-msgid "Enable extra typographic characters"
-msgstr "Aktivera extra typografiska tecken"
+msgid "Serbo-Croatian (US)"
+msgstr "Serbokroatisk (USA)"
#: ../rules/base.xml.in.h:209
-msgid "English (Cameroon)"
-msgstr "Engelsk (Kamerun)"
+msgid "English (Workman)"
+msgstr "Engelsk (Workman)"
#: ../rules/base.xml.in.h:210
-msgid "English (Canada)"
-msgstr "Engelsk (Kanada)"
-
-#: ../rules/base.xml.in.h:211
-msgid "English (Colemak)"
-msgstr "Engelsk (Colemak)"
+msgid "English (Workman, international with dead keys)"
+msgstr "Engelsk (Workman, Internationell med stumma tangenter)"
-#: ../rules/base.xml.in.h:212
-msgid "English (Dvorak alternative international no dead keys)"
-msgstr "Engelsk (Dvorak alternativ internationell utan stumma tangenter)"
+#. Keyboard indicator for Persian layouts
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
+msgid "fa"
+msgstr "fa"
#: ../rules/base.xml.in.h:213
-msgid "English (Dvorak international with dead keys)"
-msgstr "Engelsk (Dvorak Internationell med stumma tangenter)"
-
-#: ../rules/base.xml.in.h:214
-msgid "English (Dvorak)"
-msgstr "Engelsk (Dvorak)"
+msgid "Afghani"
+msgstr "Afgansk"
+#. Keyboard indicator for Pashto layouts
#: ../rules/base.xml.in.h:215
-msgid "English (Ghana)"
-msgstr "Engelsk (Ghana)"
+msgid "ps"
+msgstr "ps"
#: ../rules/base.xml.in.h:216
-msgid "English (Ghana, GILLBT)"
-msgstr "Engelsk (Ghana, GILLBT)"
-
-#: ../rules/base.xml.in.h:217
-msgid "English (Ghana, multilingual)"
-msgstr "Engelsk (Ghana, flerspråkig)"
+msgid "Pashto"
+msgstr "Pashto"
+#. Keyboard indicator for Uzbek layouts
#: ../rules/base.xml.in.h:218
-msgid "English (India, with RupeeSign)"
-msgstr "Engelsk (Indien, med rupietecken)"
+msgid "uz"
+msgstr "uz"
#: ../rules/base.xml.in.h:219
-msgid "English (Macintosh)"
-msgstr "Engelsk (Macintosh)"
+msgid "Uzbek (Afghanistan)"
+msgstr "Uzbekisk (Afganistan)"
#: ../rules/base.xml.in.h:220
-msgid "English (Mali, US Macintosh)"
-msgstr "Engelska (Mali, USA Macintosh)"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "Pashto (Afganistan, OLPC)"
#: ../rules/base.xml.in.h:221
-msgid "English (Mali, US international)"
-msgstr "Engelska (Mali, USA internationell)"
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "Persisk (Afganistan, Dari OLPC)"
#: ../rules/base.xml.in.h:222
-msgid "English (Nigeria)"
-msgstr "Engelsk (Nigeria)"
-
-#: ../rules/base.xml.in.h:223
-msgid "English (South Africa)"
-msgstr "Engelsk (Sydafrika)"
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "Uzbekisk (Afganistan, OLPC)"
-#: ../rules/base.xml.in.h:224
-msgid "English (UK)"
-msgstr "Engelsk (Storbritannien)"
+#. Keyboard indicator for Arabic layouts
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
+msgid "ar"
+msgstr "ar"
-#: ../rules/base.xml.in.h:225
-msgid "English (UK, Colemak)"
-msgstr "Engelsk (Storbritannien, Colemak)"
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
+msgid "Arabic"
+msgstr "Arabisk"
#: ../rules/base.xml.in.h:226
-msgid "English (UK, Dvorak with UK punctuation)"
-msgstr "Engelska (Storbritannien, Dvorak med brittisk-engelska skiljetecken)"
+msgid "Arabic (azerty)"
+msgstr "Arabisk (azerty)"
#: ../rules/base.xml.in.h:227
-msgid "English (UK, Dvorak)"
-msgstr "Engelsk (Storbritannien, Dvorak)"
+msgid "Arabic (azerty/digits)"
+msgstr "Arabisk (azerty/siffror)"
#: ../rules/base.xml.in.h:228
-msgid "English (UK, Macintosh international)"
-msgstr "Engelska (Storbritannien, Macintosh internationell)"
+msgid "Arabic (digits)"
+msgstr "Arabisk (siffror)"
#: ../rules/base.xml.in.h:229
-msgid "English (UK, Macintosh)"
-msgstr "Engelska (Storbritannien, Macintosh)"
+msgid "Arabic (qwerty)"
+msgstr "Arabisk (qwerty)"
#: ../rules/base.xml.in.h:230
-msgid "English (UK, extended WinKeys)"
-msgstr "Engelska (Storbritannien, utökade Windows-tangenter)"
+msgid "Arabic (qwerty/digits)"
+msgstr "Arabisk (qwerty/siffror)"
#: ../rules/base.xml.in.h:231
-msgid "English (UK, international with dead keys)"
-msgstr "Engelsk (Storbritannien, internationell med stumma tangenter)"
-
-#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
-msgid "English (US)"
-msgstr "Engelsk (USA)"
+msgid "Arabic (Buckwalter)"
+msgstr "Arabisk (Buckwalter)"
+#. Keyboard indicator for Albanian layouts
#: ../rules/base.xml.in.h:233
-msgid "English (US, alternative international)"
-msgstr "Engelsk (USA, alternativ internationell)"
+msgid "sq"
+msgstr "sq"
#: ../rules/base.xml.in.h:234
-msgid "English (US, international with dead keys)"
-msgstr "Engelsk (USA, internationell med stumma tangenter)"
+msgid "Albanian"
+msgstr "Albansk"
#: ../rules/base.xml.in.h:235
-msgid "English (US, with euro on 5)"
-msgstr "Engelsk (US, med euro på 5)"
+msgid "Albanian (Plisi D1)"
+msgstr "Albansk (Plisi D1)"
-#: ../rules/base.xml.in.h:236
-msgid "English (classic Dvorak)"
-msgstr "Engelsk (klassisk Dvorak)"
-
-#: ../rules/base.xml.in.h:237
-msgid "English (international AltGr dead keys)"
-msgstr "Engelsk (internationell AltGr med stumma tangenter)"
+#. Keyboard indicator for Armenian layouts
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
+msgid "hy"
+msgstr "hy"
-#: ../rules/base.xml.in.h:238
-msgid "English (layout toggle on multiply/divide key)"
-msgstr "Engelsk (layoutväxling på multiplicera/dividera-tangent)"
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
+msgid "Armenian"
+msgstr "Armenisk"
#: ../rules/base.xml.in.h:239
-msgid "English (left handed Dvorak)"
-msgstr "Engelsk (vänsterhänt Dvorak)"
+msgid "Armenian (phonetic)"
+msgstr "Armenisk (fonetisk)"
#: ../rules/base.xml.in.h:240
-msgid "English (programmer Dvorak)"
-msgstr "Engelsk (Dvorak för programmerare)"
+msgid "Armenian (alternative phonetic)"
+msgstr "Armenisk (Alternativ fonetisk)"
#: ../rules/base.xml.in.h:241
-msgid "English (right handed Dvorak)"
-msgstr "Engelsk (högerhänt Dvorak)"
+msgid "Armenian (eastern)"
+msgstr "Armenisk (östlig)"
#: ../rules/base.xml.in.h:242
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "Armenian (western)"
+msgstr "Armenisk (västlig)"
#: ../rules/base.xml.in.h:243
-msgid "Enter on keypad"
-msgstr "Enter på numeriskt tangentbord"
-
-#: ../rules/base.xml.in.h:244
-msgid "Esperanto"
-msgstr "Esperanto"
+msgid "Armenian (alternative eastern)"
+msgstr "Armenisk (Alternativ östlig)"
-#: ../rules/base.xml.in.h:245
-msgid "Esperanto (Portugal, Nativo)"
-msgstr "Esperanto (Portugal, Nativo)"
+#. Keyboard indicator for German layouts
+#: ../rules/base.xml.in.h:245 ../rules/base.extras.xml.in.h:22
+msgid "de"
+msgstr "de"
#: ../rules/base.xml.in.h:246
-msgid "Esperanto (displaced semicolon and quote, obsolete)"
-msgstr "Esperanto (flyttat semikolon och citattecken, föråldrat)"
+msgid "German (Austria)"
+msgstr "Tysk (Österrike)"
#: ../rules/base.xml.in.h:247
-msgid "Estonian"
-msgstr "Estnisk"
+msgid "German (Austria, eliminate dead keys)"
+msgstr "Tysk (Österrike, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:248
-msgid "Estonian (Dvorak)"
-msgstr "Estnisk (Dvorak)"
+msgid "German (Austria, Sun dead keys)"
+msgstr "Tysk (Österrike, Sun stumma tangenter)"
#: ../rules/base.xml.in.h:249
-msgid "Estonian (US keyboard with Estonian letters)"
-msgstr "Estnisk (USA-tangentbord med estniska bokstäver)"
-
-#: ../rules/base.xml.in.h:250
-msgid "Estonian (eliminate dead keys)"
-msgstr "Estnisk (eliminera stumma tangenter)"
+msgid "German (Austria, Macintosh)"
+msgstr "Tysk (Österrike, Macintosh)"
+#. Keyboard indicator for Azerbaijani layouts
#: ../rules/base.xml.in.h:251
-msgid "Euro on 2"
-msgstr "Euro på 2"
+msgid "az"
+msgstr "az"
#: ../rules/base.xml.in.h:252
-msgid "Euro on 4"
-msgstr "Euro på 4"
+msgid "Azerbaijani"
+msgstr "Azerbajdzjansk"
#: ../rules/base.xml.in.h:253
-msgid "Euro on 5"
-msgstr "Euro på 5"
-
-#: ../rules/base.xml.in.h:254
-msgid "Euro on E"
-msgstr "Euro på E"
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Azerbajdzjansk (Kyrillisk)"
+#. Keyboard indicator for Belarusian layouts
#: ../rules/base.xml.in.h:255
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "by"
+msgstr "by"
#: ../rules/base.xml.in.h:256
-msgid "Ewe"
-msgstr "Ewe"
+msgid "Belarusian"
+msgstr "Vitrysk"
#: ../rules/base.xml.in.h:257
-msgid "FL90"
-msgstr "FL90"
+msgid "Belarusian (legacy)"
+msgstr "Vitrysk (äldre)"
#: ../rules/base.xml.in.h:258
-msgid "Faroese"
-msgstr "Färöisk"
-
-#: ../rules/base.xml.in.h:259
-msgid "Faroese (eliminate dead keys)"
-msgstr "Färöisk (eliminera stumma tangenter)"
+msgid "Belarusian (Latin)"
+msgstr "Vitrysk (latin)"
-#: ../rules/base.xml.in.h:260
-msgid "Filipino"
-msgstr "Filipino"
+#. Keyboard indicator for Belgian layouts
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
+msgid "be"
+msgstr "be"
-#: ../rules/base.xml.in.h:261
-msgid "Filipino (Capewell-Dvorak Baybayin)"
-msgstr "Filipino (Capewell-Dvorak Baybayin)"
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
+msgid "Belgian"
+msgstr "Belgisk"
#: ../rules/base.xml.in.h:262
-msgid "Filipino (Capewell-Dvorak Latin)"
-msgstr "Filipino (Capewell-Dvorak Latin)"
+msgid "Belgian (alternative)"
+msgstr "Belgisk (alternativ)"
#: ../rules/base.xml.in.h:263
-msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
-msgstr "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgid "Belgian (alternative, Latin-9 only)"
+msgstr "Belgisk (alternativ, endast Latin-9)"
#: ../rules/base.xml.in.h:264
-msgid "Filipino (Capewell-QWERF 2006 Latin)"
-msgstr "Filipino (Capewell-QWERF 2006 Latin)"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "Belgisk (alternativ, Sun stumma tangenter)"
#: ../rules/base.xml.in.h:265
-msgid "Filipino (Colemak Baybayin)"
-msgstr "Filipino (Colemak Baybayin)"
+msgid "Belgian (ISO alternate)"
+msgstr "Belgisk (ISO-alternativ)"
#: ../rules/base.xml.in.h:266
-msgid "Filipino (Colemak Latin)"
-msgstr "Filipino (Colemak Latin)"
+msgid "Belgian (eliminate dead keys)"
+msgstr "Belgisk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:267
-msgid "Filipino (Dvorak Baybayin)"
-msgstr "Filipino (Dvorak Baybayin)"
+msgid "Belgian (Sun dead keys)"
+msgstr "Belgisk (Sun stumma tangenter)"
#: ../rules/base.xml.in.h:268
-msgid "Filipino (Dvorak Latin)"
-msgstr "Filipino (Dvorak Latin)"
-
-#: ../rules/base.xml.in.h:269
-msgid "Filipino (QWERTY Baybayin)"
-msgstr "Filipino (QWERTY Baybayin)"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "Belgisk (Wang modell 724 azerty)"
+#. Keyboard indicator for Bangla layouts
#: ../rules/base.xml.in.h:270
-msgid "Finnish"
-msgstr "Finsk"
+msgid "bn"
+msgstr "bn"
#: ../rules/base.xml.in.h:271
-msgid "Finnish (Macintosh)"
-msgstr "Finska (Macintosh)"
+msgid "Bangla"
+msgstr "Bengali"
#: ../rules/base.xml.in.h:272
-msgid "Finnish (classic)"
-msgstr "Finsk (klassisk)"
+msgid "Bangla (Probhat)"
+msgstr "Bengali (Probhat)"
-#: ../rules/base.xml.in.h:273
-msgid "Finnish (classic, eliminate dead keys)"
-msgstr "Finsk (klassisk, eliminera stumma tangenter)"
+#. Keyboard indicator for Indian layouts
+#: ../rules/base.xml.in.h:274
+msgid "in"
+msgstr "in"
+
+#: ../rules/base.xml.in.h:275
+msgid "Indian"
+msgstr "Indisk"
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
#: ../rules/base.xml.in.h:276
-msgid "Four-level key with abstract separators"
-msgstr "Fjärdenivåstangent med abstrakta avgränsare"
+msgid "Bangla (India)"
+msgstr "Bengali (Indien)"
#: ../rules/base.xml.in.h:277
-msgid "Four-level key with comma"
-msgstr "Fjärdenivåstangent med komma"
+msgid "Bangla (India, Probhat)"
+msgstr "Bengali (Indien, Probhat)"
#: ../rules/base.xml.in.h:278
-msgid "Four-level key with dot"
-msgstr "Fjärdenivåstangent med punkt"
+msgid "Bangla (India, Baishakhi)"
+msgstr "Bengali (Indien, Baishakhi)"
#: ../rules/base.xml.in.h:279
-msgid "Four-level key with dot, latin-9 restriction"
-msgstr "Fjärdenivåstangent med punkt, latin-9-begränsning"
+msgid "Bangla (India, Bornona)"
+msgstr "Bengali (Indien, Bornona)"
#: ../rules/base.xml.in.h:280
-msgid "Four-level key with momayyez"
-msgstr "Fjärdenivåstangent med momayyez"
+msgid "Bangla (India, Uni Gitanjali)"
+msgstr "Bengali (Indien, Uni Gitanjali)"
#: ../rules/base.xml.in.h:281
-msgid "French"
-msgstr "Fransk"
+msgid "Bangla (India, Baishakhi Inscript)"
+msgstr "Bengali (Indien, Baishakhi Inscript)"
#: ../rules/base.xml.in.h:282
-msgid "French (Bepo, ergonomic, Dvorak way)"
-msgstr "Fransk (Bepo, ergonomisk, Dvorak-liknande)"
-
-#: ../rules/base.xml.in.h:283
-msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
-msgstr "Fransk (Bepo, ergonomisk, Dvorak-liknande, endast latin-9)"
+msgid "Manipuri (Eeyek)"
+msgstr "Manipuri (Eeyek)"
+#. Keyboard indicator for Gujarati layouts
#: ../rules/base.xml.in.h:284
-msgid "French (Breton)"
-msgstr "Fransk (Bretagnsk)"
+msgid "gu"
+msgstr "gu"
#: ../rules/base.xml.in.h:285
-msgid "French (Cameroon)"
-msgstr "Franska (Kamerun)"
-
-#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
-msgid "French (Canada)"
-msgstr "Franska (Kanada)"
+msgid "Gujarati"
+msgstr "Gujaratisk"
+#. Keyboard indicator for Punjabi layouts
#: ../rules/base.xml.in.h:287
-msgid "French (Canada, Dvorak)"
-msgstr "Fransk (Kanada, Dvorak)"
+msgid "pa"
+msgstr "pa"
#: ../rules/base.xml.in.h:288
-msgid "French (Canada, legacy)"
-msgstr "Fransk (Kanada, äldre)"
+msgid "Punjabi (Gurmukhi)"
+msgstr "Punjabi (Gurmukhi)"
#: ../rules/base.xml.in.h:289
-msgid "French (Democratic Republic of the Congo)"
-msgstr "Fransk (Demokratiska republiken Kongo)"
-
-#: ../rules/base.xml.in.h:290
-msgid "French (Dvorak)"
-msgstr "Fransk (Dvorak)"
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "Punjabi (Gurmukhi Jhelum)"
+#. Keyboard indicator for Kannada layouts
#: ../rules/base.xml.in.h:291
-msgid "French (Guinea)"
-msgstr "Fransk (Guinea)"
+msgid "kn"
+msgstr "kn"
+# Även kanaresisk (äldre form)
#: ../rules/base.xml.in.h:292
-msgid "French (Macintosh)"
-msgstr "Franska (Macintosh)"
+msgid "Kannada"
+msgstr "Kannada"
#: ../rules/base.xml.in.h:293
-msgid "French (Mali, alternative)"
-msgstr "Fransk (Mali, alternativ)"
-
-#: ../rules/base.xml.in.h:294
-msgid "French (Morocco)"
-msgstr "Fransk (Marocko)"
+msgid "Kannada (KaGaPa phonetic)"
+msgstr "Kannada (KaGaPa-fonetisk)"
+#. Keyboard indicator for Malayalam layouts
#: ../rules/base.xml.in.h:295
-msgid "French (Sun dead keys)"
-msgstr "Fransk (Sun stumma tangenter)"
+msgid "ml"
+msgstr "ml"
#: ../rules/base.xml.in.h:296
-msgid "French (Switzerland)"
-msgstr "Fransk (Schweiz)"
+msgid "Malayalam"
+msgstr "Malayalam"
#: ../rules/base.xml.in.h:297
-msgid "French (Switzerland, Macintosh)"
-msgstr "Franska (Schweiz, Macintosh)"
+msgid "Malayalam (Lalitha)"
+msgstr "Malayalamsk (Lalitha)"
#: ../rules/base.xml.in.h:298
-msgid "French (Switzerland, Sun dead keys)"
-msgstr "Fransk (Schweiz, Sun stumma tangenter)"
-
-#: ../rules/base.xml.in.h:299
-msgid "French (Switzerland, eliminate dead keys)"
-msgstr "Fransk (Schweiz, eliminera stumma tangenter)"
+msgid "Malayalam (enhanced Inscript, with rupee sign)"
+msgstr "Malayalam (förbättrad Inscript, med rupietecken)"
+#. Keyboard indicator for Oriya layouts
#: ../rules/base.xml.in.h:300
-msgid "French (alternative)"
-msgstr "Fransk (alternativ)"
+msgid "or"
+msgstr "or"
#: ../rules/base.xml.in.h:301
-msgid "French (alternative, Sun dead keys)"
-msgstr "Fransk (alternativ, Sun stumma tangenter)"
-
-#: ../rules/base.xml.in.h:302
-msgid "French (alternative, eliminate dead keys)"
-msgstr "Fransk (alternativ, eliminera stumma tangenter)"
+msgid "Oriya"
+msgstr "Oriya"
+#. Keyboard indicator for Tamil layouts
#: ../rules/base.xml.in.h:303
-msgid "French (alternative, latin-9 only)"
-msgstr "Fransk (alternativ, endast latin-9)"
+msgid "ta"
+msgstr "ta"
#: ../rules/base.xml.in.h:304
-msgid "French (eliminate dead keys)"
-msgstr "Fransk (eliminera stumma tangenter)"
+msgid "Tamil (Unicode)"
+msgstr "Tamilsk (Unicode)"
#: ../rules/base.xml.in.h:305
-msgid "French (legacy, alternative)"
-msgstr "Franska (äldre, alternativ)"
+msgid "Tamil (keyboard with numerals)"
+msgstr "Tamilsk (tangentbord med siffror)"
#: ../rules/base.xml.in.h:306
-msgid "French (legacy, alternative, Sun dead keys)"
-msgstr "Fransk (äldre, alternativ, Sun stumma tangenter)"
+msgid "Tamil (TAB typewriter)"
+msgstr "Tamilsk (TAB Typewriter)"
#: ../rules/base.xml.in.h:307
-msgid "French (legacy, alternative, eliminate dead keys)"
-msgstr "Fransk (äldre, alternativ, eliminera stumma tangenter)"
+msgid "Tamil (TSCII typewriter)"
+msgstr "Tamilsk (TSCII Typewriter)"
#: ../rules/base.xml.in.h:308
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr "Fujitsu-Siemens Computers AMILO bärbar dator"
-
-#: ../rules/base.xml.in.h:309
-msgid "Fula"
-msgstr "Fula"
+msgid "Tamil"
+msgstr "Tamilsk"
+#. Keyboard indicator for Telugu layouts
#: ../rules/base.xml.in.h:310
-msgid "Ga"
-msgstr "Ga"
+msgid "te"
+msgstr "te"
#: ../rules/base.xml.in.h:311
-msgid "Generic 101-key PC"
-msgstr "Allmän 101-tangenters PC"
+msgid "Telugu"
+msgstr "Telugo"
#: ../rules/base.xml.in.h:312
-msgid "Generic 102-key (Intl) PC"
-msgstr "Allmän 102-tangenters (internationell) PC"
-
-#: ../rules/base.xml.in.h:313
-msgid "Generic 104-key PC"
-msgstr "Allmän 104-tangenters PC"
+msgid "Telugu (KaGaPa phonetic)"
+msgstr "Telugu (KaGaPa-fonetisk)"
+#. Keyboard indicator for Urdu layouts
#: ../rules/base.xml.in.h:314
-msgid "Generic 105-key (Intl) PC"
-msgstr "Allmän 105-tangenters (internationell) PC"
+msgid "ur"
+msgstr "ur"
#: ../rules/base.xml.in.h:315
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+msgid "Urdu (phonetic)"
+msgstr "Urdu (fonetisk)"
#: ../rules/base.xml.in.h:316
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM-tangentbord KWD-910"
+msgid "Urdu (alternative phonetic)"
+msgstr "Urdu (alternativ fonetisk)"
#: ../rules/base.xml.in.h:317
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
-
-#: ../rules/base.xml.in.h:318
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
+msgid "Urdu (WinKeys)"
+msgstr "Urdu (Windows-tangenter)"
+#. Keyboard indicator for Hindi layouts
#: ../rules/base.xml.in.h:319
-msgid "Genius KKB-2050HS"
-msgstr "Genius KKB-2050HS"
+msgid "hi"
+msgstr "hi"
#: ../rules/base.xml.in.h:320
-msgid "Georgian"
-msgstr "Georgisk"
+msgid "Hindi (Bolnagri)"
+msgstr "Hindi (Bolnagri)"
#: ../rules/base.xml.in.h:321
-msgid "Georgian (France, AZERTY Tskapo)"
-msgstr "Georgiska (Frankrike, AZERTY Tskapo)"
+msgid "Hindi (Wx)"
+msgstr "Hindi (Wx)"
#: ../rules/base.xml.in.h:322
-msgid "Georgian (Italy)"
-msgstr "Georgiska (Italien)"
-
-#: ../rules/base.xml.in.h:323
-msgid "Georgian (MESS)"
-msgstr "Georgisk (MESS)"
+msgid "Hindi (KaGaPa phonetic)"
+msgstr "Hindi (KaGaPa-fonetisk)"
+#. Keyboard indicator for Sanskrit layouts
#: ../rules/base.xml.in.h:324
-msgid "Georgian (ergonomic)"
-msgstr "Georgisk (ergonomisk)"
+msgid "sa"
+msgstr "sa"
-#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
-msgid "German"
-msgstr "Tysk"
-
-#: ../rules/base.xml.in.h:326
-msgid "German (Austria)"
-msgstr "Tysk (Österrike)"
+#: ../rules/base.xml.in.h:325
+msgid "Sanskrit (KaGaPa phonetic)"
+msgstr "Sanskrit (KaGaPa-fonetisk)"
+#. Keyboard indicator for Marathi layouts
#: ../rules/base.xml.in.h:327
-msgid "German (Austria, Macintosh)"
-msgstr "Tyska (Österrike, Macintosh)"
+msgid "mr"
+msgstr "mr"
#: ../rules/base.xml.in.h:328
-msgid "German (Austria, Sun dead keys)"
-msgstr "Tysk (Österrike, Sun stumma tangenter)"
+msgid "Marathi (KaGaPa phonetic)"
+msgstr "Marathi (KaGaPa-fonetisk)"
#: ../rules/base.xml.in.h:329
-msgid "German (Austria, eliminate dead keys)"
-msgstr "Tysk (Österrike, eliminera stumma tangenter)"
-
-#: ../rules/base.xml.in.h:330
-msgid "German (Dvorak)"
-msgstr "Tysk (Dvorak)"
+msgid "English (India, with rupee sign)"
+msgstr "Engelsk (Indien, med rupietecken)"
+#. Keyboard indicator for Bosnian layouts
#: ../rules/base.xml.in.h:331
-msgid "German (Macintosh)"
-msgstr "Tyska (Macintosh)"
+msgid "bs"
+msgstr "bs"
#: ../rules/base.xml.in.h:332
-msgid "German (Macintosh, eliminate dead keys)"
-msgstr "Tyska (Macintosh, eliminera stumma tangenter)"
+msgid "Bosnian"
+msgstr "Bosnisk"
#: ../rules/base.xml.in.h:333
-msgid "German (Neo 2)"
-msgstr "Tysk (Neo 2)"
+msgid "Bosnian (with guillemets for quotes)"
+msgstr "Bosnisk (med gåsögon för citattecken)"
#: ../rules/base.xml.in.h:334
-msgid "German (Sun dead keys)"
-msgstr "Tysk (Sun stumma tangenter)"
+msgid "Bosnian (with Bosnian digraphs)"
+msgstr "Bosnisk (med bosniska digrafer)"
#: ../rules/base.xml.in.h:335
-msgid "German (Switzerland)"
-msgstr "Tyska (Schweiz)"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "Bosnisk (USA-tangentbord med bosniska digrafer)"
#: ../rules/base.xml.in.h:336
-msgid "German (Switzerland, Macintosh)"
-msgstr "Tyska (Schweiz, Macintosh)"
-
-#: ../rules/base.xml.in.h:337
-msgid "German (Switzerland, Sun dead keys)"
-msgstr "Tysk (Schweiz, Sun stumma tangenter)"
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "Bosnisk (USA-tangentbord med bosniska bokstäver)"
-#: ../rules/base.xml.in.h:338
-msgid "German (Switzerland, eliminate dead keys)"
-msgstr "Tysk (Schweiz, eliminera stumma tangenter)"
+#. Keyboard indicator for Portuguese layouts
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
+msgid "pt"
+msgstr "pt"
-#: ../rules/base.xml.in.h:339
-msgid "German (Switzerland, legacy)"
-msgstr "Tyska (Schweiz, äldre)"
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
+msgid "Portuguese (Brazil)"
+msgstr "Portugisisk (Brasilien)"
#: ../rules/base.xml.in.h:340
-msgid "German (dead acute)"
-msgstr "Tysk (stumma akutaccent)"
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "Portugisisk (Brasilien, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:341
-msgid "German (dead grave acute)"
-msgstr "Tysk (stum grav accent)"
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "Portugisisk (Brasilien, Dvorak)"
#: ../rules/base.xml.in.h:342
-msgid "German (eliminate dead keys)"
-msgstr "Tysk (eliminera stumma tangenter)"
+msgid "Portuguese (Brazil, Nativo)"
+msgstr "Portugisisk (Brasilien, Nativo)"
#: ../rules/base.xml.in.h:343
-msgid "Greek"
-msgstr "Grekisk"
+msgid "Portuguese (Brazil, Nativo for US keyboards)"
+msgstr "Portugisisk (Brasilien, Nativo för USA-tangentbord)"
#: ../rules/base.xml.in.h:344
-msgid "Greek (eliminate dead keys)"
-msgstr "Grekisk (eliminera stumma tangenter)"
-
-#: ../rules/base.xml.in.h:345
-msgid "Greek (extended)"
-msgstr "Grekisk (utökad)"
+msgid "Esperanto (Brazil, Nativo)"
+msgstr "Esperanto (Brasilien, Nativo)"
+#. Keyboard indicator for Bulgarian layouts
#: ../rules/base.xml.in.h:346
-msgid "Greek (polytonic)"
-msgstr "Grekisk (polytonisk)"
+msgid "bg"
+msgstr "bg"
#: ../rules/base.xml.in.h:347
-msgid "Greek (simple)"
-msgstr "Grekisk (enkel)"
+msgid "Bulgarian"
+msgstr "Bulgarisk"
#: ../rules/base.xml.in.h:348
-msgid "Gujarati"
-msgstr "Gujaratisk"
+msgid "Bulgarian (traditional phonetic)"
+msgstr "Bulgarisk (traditionell fonetisk)"
#: ../rules/base.xml.in.h:349
-msgid "Gyration"
-msgstr "Gyration"
+msgid "Bulgarian (new phonetic)"
+msgstr "Bulgarisk (ny fonetisk)"
#: ../rules/base.xml.in.h:350
-msgid "HTC Dream"
-msgstr "HTC Dream"
-
-#: ../rules/base.xml.in.h:351
-msgid "Happy Hacking Keyboard"
-msgstr "Happy Hacking-tangentbord"
+msgid "Arabic (Morocco)"
+msgstr "Arabisk (Marocko)"
-#: ../rules/base.xml.in.h:352
-msgid "Happy Hacking Keyboard for Mac"
-msgstr "Happy Hacking-tangentbord för Mac"
+#. Keyboard indicator for French layouts
+#: ../rules/base.xml.in.h:352 ../rules/base.extras.xml.in.h:15
+msgid "fr"
+msgstr "fr"
#: ../rules/base.xml.in.h:353
-msgid "Hausa"
-msgstr "Hausa"
-
-#: ../rules/base.xml.in.h:354
-msgid "Hebrew"
-msgstr "Hebreisk"
+msgid "French (Morocco)"
+msgstr "Fransk (Marocko)"
+#. Keyboard indicator for Berber layouts
#: ../rules/base.xml.in.h:355
-msgid "Hebrew (Biblical, Tiro)"
-msgstr "Hebreiska (Biblisk, Tiro)"
+msgid "ber"
+msgstr "ber"
#: ../rules/base.xml.in.h:356
-msgid "Hebrew (lyx)"
-msgstr "Hebreisk (lyx)"
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "Berberisk (Marocko, Tifinagh)"
#: ../rules/base.xml.in.h:357
-msgid "Hebrew (phonetic)"
-msgstr "Hebreiska (fonetisk)"
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "Berberisk (Marocko, Tifinagh alternativ)"
#: ../rules/base.xml.in.h:358
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internettangentbord"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "Berberisk (Marocko, Tifinagh alternativ fonetisk)"
#: ../rules/base.xml.in.h:359
-msgid "Hewlett-Packard Mini 110 Notebook"
-msgstr "Bärbar Hewlett-Packard Mini 110"
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "Berberisk (Marocko, Tifinagh utökad)"
#: ../rules/base.xml.in.h:360
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "Berberisk (Marocko, Tifinagh fonetisk)"
#: ../rules/base.xml.in.h:361
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
-
-#: ../rules/base.xml.in.h:362
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "Berberisk (Marocko, Tifinagh utökad fonetisk)"
-#: ../rules/base.xml.in.h:363
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
+#. Keyboard indicator for Cameroon layouts
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
+msgid "cm"
+msgstr "cm"
-#: ../rules/base.xml.in.h:364
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
+msgid "English (Cameroon)"
+msgstr "Engelsk (Kamerun)"
#: ../rules/base.xml.in.h:365
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
+msgid "French (Cameroon)"
+msgstr "Fransk (Kamerun)"
#: ../rules/base.xml.in.h:366
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Kamerun flerspråkig (qwerty)"
#: ../rules/base.xml.in.h:367
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr "Hewlett-Packard Pavilion dv5"
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Kamerun flerspråkig (azerty)"
#: ../rules/base.xml.in.h:368
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:369
-msgid "Hewlett-Packard nx9020"
-msgstr "Hewlett-Packard nx9020"
+msgid "Cameroon Multilingual (Dvorak)"
+msgstr "Kamerun flerspråkig (Dvorak)"
+#. Keyboard indicator for Burmese layouts
#: ../rules/base.xml.in.h:370
-msgid "Hexadecimal"
-msgstr "Hexadecimal"
+msgid "my"
+msgstr "my"
#: ../rules/base.xml.in.h:371
-msgid "Hindi (Bolnagri)"
-msgstr "Hindi (Bolnagri)"
+msgid "Burmese"
+msgstr "Burmesisk"
-#: ../rules/base.xml.in.h:372
-msgid "Hindi (Wx)"
-msgstr "Hindi (Wx)"
+#: ../rules/base.xml.in.h:372 ../rules/base.extras.xml.in.h:16
+msgid "French (Canada)"
+msgstr "Fransk (Kanada)"
#: ../rules/base.xml.in.h:373
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "French (Canada, Dvorak)"
+msgstr "Fransk (Kanada, Dvorak)"
#: ../rules/base.xml.in.h:374
-msgid "Htc Dream phone"
-msgstr "Htc Dream-telefon"
+msgid "French (Canada, legacy)"
+msgstr "Fransk (Kanada, äldre)"
#: ../rules/base.xml.in.h:375
-msgid "Hungarian"
-msgstr "Ungersk"
+msgid "Canadian Multilingual"
+msgstr "Kanadensisk flerspråkig"
#: ../rules/base.xml.in.h:376
-msgid "Hungarian (101/qwerty/comma/dead keys)"
-msgstr "Ungersk (101/qwerty/komma/stumma tangenter)"
+msgid "Canadian Multilingual (first part)"
+msgstr "Kanadensisk flerspråkig (första delen)"
#: ../rules/base.xml.in.h:377
-msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
-msgstr "Ungersk (101/qwerty/komma/eliminera stumma tangenter)"
-
-#: ../rules/base.xml.in.h:378
-msgid "Hungarian (101/qwerty/dot/dead keys)"
-msgstr "Ungersk (101/qwerty/punkt/stumma tangenter)"
+msgid "Canadian Multilingual (second part)"
+msgstr "Kanadensisk flerspråkig (andra delen)"
+#. Keyboard indicator for Inuktikut layouts
#: ../rules/base.xml.in.h:379
-msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
-msgstr "Ungersk (101/qwerty/punkt/eliminera stumma tangenter)"
+msgid "ike"
+msgstr "ike"
#: ../rules/base.xml.in.h:380
-msgid "Hungarian (101/qwertz/comma/dead keys)"
-msgstr "Ungersk (101/qwertz/komma/stumma tangenter)"
+msgid "Inuktitut"
+msgstr "Inuktitut"
#: ../rules/base.xml.in.h:381
-msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
-msgstr "Ungersk (101/qwertz/komma/eliminera stumma tangenter)"
+msgid "English (Canada)"
+msgstr "Engelsk (Kanada)"
#: ../rules/base.xml.in.h:382
-msgid "Hungarian (101/qwertz/dot/dead keys)"
-msgstr "Ungersk (101/qwertz/punkt/stumma tangenter)"
-
-#: ../rules/base.xml.in.h:383
-msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
-msgstr "Ungersk (101/qwertz/punkt/eliminera stumma tangenter)"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "Fransk (Demokratiska republiken Kongo)"
+#. Keyboard indicator for Taiwanese layouts
#: ../rules/base.xml.in.h:384
-msgid "Hungarian (102/qwerty/comma/dead keys)"
-msgstr "Ungersk (102/qwerty/komma/stumma tangenter)"
+msgid "zh"
+msgstr "zh"
#: ../rules/base.xml.in.h:385
-msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
-msgstr "Ungersk (102/qwerty/komma/eliminera stumma tangenter)"
+msgid "Chinese"
+msgstr "Kinesisk"
#: ../rules/base.xml.in.h:386
-msgid "Hungarian (102/qwerty/dot/dead keys)"
-msgstr "Ungersk (102/qwerty/punkt/stumma tangenter)"
+msgid "Tibetan"
+msgstr "Tibetansk"
#: ../rules/base.xml.in.h:387
-msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
-msgstr "Ungersk (102/qwerty/punkt/eliminera stumma tangenter)"
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetansk (med ASCII-taltecken)"
#: ../rules/base.xml.in.h:388
-msgid "Hungarian (102/qwertz/comma/dead keys)"
-msgstr "Ungersk (102/qwertz/komma/stumma tangenter)"
+msgid "ug"
+msgstr "ug"
#: ../rules/base.xml.in.h:389
-msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
-msgstr "Ungersk (102/qwertz/komma/eliminera stumma tangenter)"
-
-#: ../rules/base.xml.in.h:390
-msgid "Hungarian (102/qwertz/dot/dead keys)"
-msgstr "Ungersk (102/qwertz/punkt/stumma tangenter)"
+msgid "Uyghur"
+msgstr "Uyghur"
+#. Keyboard indicator for Croatian layouts
#: ../rules/base.xml.in.h:391
-msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
-msgstr "Ungersk (102/qwertz/punkt/eliminera stumma tangenter)"
+msgid "hr"
+msgstr "hr"
#: ../rules/base.xml.in.h:392
-msgid "Hungarian (eliminate dead keys)"
-msgstr "Ungersk (eliminera stumma tangenter)"
+msgid "Croatian"
+msgstr "Kroatisk"
#: ../rules/base.xml.in.h:393
-msgid "Hungarian (qwerty)"
-msgstr "Ungersk (qwerty)"
+msgid "Croatian (with guillemets for quotes)"
+msgstr "Kroatisk (med gåsögon för citattecken)"
#: ../rules/base.xml.in.h:394
-msgid "Hungarian (standard)"
-msgstr "Ungersk (standard)"
+msgid "Croatian (with Croatian digraphs)"
+msgstr "Kroatisk (med kroatiska digrafer)"
#: ../rules/base.xml.in.h:395
-msgid "Hyper is mapped to Win-keys"
-msgstr "Hyper är mappad till Win-tangenterna"
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "Kroatisk (USA-tangentbord med kroatiska digrafer)"
#: ../rules/base.xml.in.h:396
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: ../rules/base.xml.in.h:397
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "Kroatisk (USA-tangentbord med kroatiska bokstäver)"
-#: ../rules/base.xml.in.h:398
-msgid "IBM Space Saver"
-msgstr "IBM Space Saver"
+#. Keyboard indicator for Chech layouts
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
+msgid "cs"
+msgstr "cs"
-#: ../rules/base.xml.in.h:399
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
+msgid "Czech"
+msgstr "Tjeckisk"
#: ../rules/base.xml.in.h:400
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr "IBM ThinkPad R60/T60/R61/T61"
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Tjeckisk (med &lt;\\|&gt;-tangent)"
#: ../rules/base.xml.in.h:401
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgid "Czech (qwerty)"
+msgstr "Tjeckisk (qwerty)"
#: ../rules/base.xml.in.h:402
-msgid "Icelandic"
-msgstr "Isländsk"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "Tjeckisk (qwerty, utökat omvänt snedstreck)"
#: ../rules/base.xml.in.h:403
-msgid "Icelandic (Dvorak)"
-msgstr "Isländsk (Dvorak)"
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "Tjeckisk (UCW-layout, endast bokstäver med accenter)"
#: ../rules/base.xml.in.h:404
-msgid "Icelandic (Macintosh)"
-msgstr "Isländska (Macintosh)"
-
-#: ../rules/base.xml.in.h:405
-msgid "Icelandic (Sun dead keys)"
-msgstr "Isländsk (Sun stumma tangenter)"
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "Tjeckisk (US Dvorak med CZ UCW-stöd)"
-#: ../rules/base.xml.in.h:406
-msgid "Icelandic (eliminate dead keys)"
-msgstr "Isländsk (eliminera stumma tangenter)"
+#. Keyboard indicator for Danish layouts
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
+msgid "da"
+msgstr "da"
-#: ../rules/base.xml.in.h:407
-msgid "Igbo"
-msgstr "Igbo"
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
+msgid "Danish"
+msgstr "Dansk"
#: ../rules/base.xml.in.h:408
-msgid "Indian"
-msgstr "Indisk"
+msgid "Danish (eliminate dead keys)"
+msgstr "Dansk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:409
-msgid "Inuktitut"
-msgstr "Inuktitut"
+msgid "Danish (Winkeys)"
+msgstr "Dansk (Windows-tangenter)"
#: ../rules/base.xml.in.h:410
-msgid "Iraqi"
-msgstr "Irakisk"
+msgid "Danish (Macintosh)"
+msgstr "Dansk (Macintosh)"
#: ../rules/base.xml.in.h:411
-msgid "Irish"
-msgstr "Irländsk"
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Dansk (Macintosh, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:412
-msgid "Irish (UnicodeExpert)"
-msgstr "Irländsk (UnicodeExpert)"
-
-#: ../rules/base.xml.in.h:413
-msgid "Italian"
-msgstr "Italiensk"
+msgid "Danish (Dvorak)"
+msgstr "Dansk (Dvorak)"
-#: ../rules/base.xml.in.h:414
-msgid "Italian (Macintosh)"
-msgstr "Italienska (Macintosh)"
+#. Keyboard indicator for Dutch layouts
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
+msgid "nl"
+msgstr "nl"
-#: ../rules/base.xml.in.h:415
-msgid "Italian (US keyboard with Italian letters)"
-msgstr "Italiensk (USA-tangentbord med italienska bokstäver)"
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
+msgid "Dutch"
+msgstr "Nederländsk"
#: ../rules/base.xml.in.h:416
-msgid "Italian (eliminate dead keys)"
-msgstr "Italiensk (eliminera stumma tangenter)"
+msgid "Dutch (Sun dead keys)"
+msgstr "Nederländsk (Sun stumma tangenter)"
#: ../rules/base.xml.in.h:417
-msgid "Japanese"
-msgstr "Japansk"
+msgid "Dutch (Macintosh)"
+msgstr "Nederländsk (Macintosh)"
#: ../rules/base.xml.in.h:418
-msgid "Japanese (Kana 86)"
-msgstr "Japansk (Kana 86)"
-
-#: ../rules/base.xml.in.h:419
-msgid "Japanese (Kana)"
-msgstr "Japansk (Kana)"
+msgid "Dutch (standard)"
+msgstr "Nederländsk (standard)"
+#. Keyboard indicator for Dzongkha layouts
#: ../rules/base.xml.in.h:420
-msgid "Japanese (Macintosh)"
-msgstr "Japanska (Macintosh)"
+msgid "dz"
+msgstr "dz"
#: ../rules/base.xml.in.h:421
-msgid "Japanese (OADG 109A)"
-msgstr "Japansk (OADG 109A)"
-
-#: ../rules/base.xml.in.h:422
-msgid "Japanese (PC-98xx Series)"
-msgstr "Japansk (PC-98xx-serien)"
+msgid "Dzongkha"
+msgstr "Dzongkha"
-#: ../rules/base.xml.in.h:423
-msgid "Japanese keyboard options"
-msgstr "Tangentbordsalternativ för japanska"
+#. Keyboard indicator for Estonian layouts
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
+msgid "et"
+msgstr "et"
-#: ../rules/base.xml.in.h:424
-msgid "Kalmyk"
-msgstr "Kalmyk"
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
+msgid "Estonian"
+msgstr "Estnisk"
#: ../rules/base.xml.in.h:425
-msgid "Kana Lock key is locking"
-msgstr "Kana Lock-tangent låser"
+msgid "Estonian (eliminate dead keys)"
+msgstr "Estnisk (eliminera stumma tangenter)"
-# Även kanaresisk (äldre form)
#: ../rules/base.xml.in.h:426
-msgid "Kannada"
-msgstr "Kannada"
+msgid "Estonian (Dvorak)"
+msgstr "Estnisk (Dvorak)"
#: ../rules/base.xml.in.h:427
-msgid "Kashubian"
-msgstr "Kashubian"
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "Estnisk (USA-tangentbord med estniska bokstäver)"
-#: ../rules/base.xml.in.h:428
-msgid "Kazakh"
-msgstr "Kazakisk"
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
+msgid "Persian"
+msgstr "Persisk"
#: ../rules/base.xml.in.h:429
-msgid "Kazakh (with Russian)"
-msgstr "Kazakisk (med ryska)"
-
-#: ../rules/base.xml.in.h:430
-msgid "Key sequence to kill the X server"
-msgstr "Tangentsekvens för att döda X-servern"
+msgid "Persian (with Persian keypad)"
+msgstr "Persisk (med persiskt numeriskt tangentbord)"
+#. Keyboard indicator for Kurdish layouts
#: ../rules/base.xml.in.h:431
-msgid "Key to choose 3rd level"
-msgstr "Tangent för att välja tredje nivå"
+msgid "ku"
+msgstr "ku"
#: ../rules/base.xml.in.h:432
-msgid "Key to choose 5th level"
-msgstr "Tangent för att välja femte nivå"
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "Kurdisk (Iran, Latinskt Q)"
#: ../rules/base.xml.in.h:433
-msgid "Key(s) to change layout"
-msgstr "Tangent(er) för att byta layout"
+msgid "Kurdish (Iran, F)"
+msgstr "Kurdisk (Iran, F)"
#: ../rules/base.xml.in.h:434
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurdisk (Iran, latinskt Alt-Q)"
#: ../rules/base.xml.in.h:435
-msgid "Khmer (Cambodia)"
-msgstr "Khmer (Kambodja)"
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "Kurdisk (Iran, Arabisk-Latin)"
#: ../rules/base.xml.in.h:436
-msgid "Kikuyu"
-msgstr "Kikuyu"
+msgid "Iraqi"
+msgstr "Irakisk"
#: ../rules/base.xml.in.h:437
-msgid "Kinesis"
-msgstr "Kinesis"
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "Kurdisk (Irak, latinskt Q)"
#: ../rules/base.xml.in.h:438
-msgid "Komi"
-msgstr "Komi"
+msgid "Kurdish (Iraq, F)"
+msgstr "Kurdisk (Irak, F)"
#: ../rules/base.xml.in.h:439
-msgid "Korean"
-msgstr "Koreansk"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "Kurdisk (Irak, latinskt Alt-Q)"
#: ../rules/base.xml.in.h:440
-msgid "Korean (101/104 key compatible)"
-msgstr "Koreansk (101/104-tangenters kompatibel)"
-
-#: ../rules/base.xml.in.h:441
-msgid "Kurdish (Iran, Arabic-Latin)"
-msgstr "Kurdisk (Iran, Arabisk-Latin)"
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "Kurdisk (Irak, Arabisk-Latin)"
+#. Keyboard indicator for Faroese layouts
#: ../rules/base.xml.in.h:442
-msgid "Kurdish (Iran, F)"
-msgstr "Kurdisk (Iran, F)"
+msgid "fo"
+msgstr "fo"
#: ../rules/base.xml.in.h:443
-msgid "Kurdish (Iran, Latin Alt-Q)"
-msgstr "Kurdiska (Iran, latinskt Alt-Q)"
+msgid "Faroese"
+msgstr "Färöisk"
#: ../rules/base.xml.in.h:444
-msgid "Kurdish (Iran, Latin Q)"
-msgstr "Kurdisk (Iran, Latinskt Q)"
-
-#: ../rules/base.xml.in.h:445
-msgid "Kurdish (Iraq, Arabic-Latin)"
-msgstr "Kurdisk (Irak, Arabisk-Latin)"
+msgid "Faroese (eliminate dead keys)"
+msgstr "Färöisk (eliminera stumma tangenter)"
-#: ../rules/base.xml.in.h:446
-msgid "Kurdish (Iraq, F)"
-msgstr "Kurdisk (Irak, F)"
+#. Keyboard indicator for Finnish layouts
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
+msgid "fi"
+msgstr "fi"
-#: ../rules/base.xml.in.h:447
-msgid "Kurdish (Iraq, Latin Alt-Q)"
-msgstr "Kurdisk (Irak, latinskt Alt-Q)"
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
+msgid "Finnish"
+msgstr "Finsk"
#: ../rules/base.xml.in.h:448
-msgid "Kurdish (Iraq, Latin Q)"
-msgstr "Kurdisk (Irak, latinskt Q)"
+msgid "Finnish (classic)"
+msgstr "Finsk (klassisk)"
#: ../rules/base.xml.in.h:449
-msgid "Kurdish (Syria, F)"
-msgstr "Kurdisk (Syrien, F)"
+msgid "Finnish (classic, eliminate dead keys)"
+msgstr "Finsk (klassisk, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:450
-msgid "Kurdish (Syria, Latin Alt-Q)"
-msgstr "Kurdisk (Syrien, latinskt Alt-Q)"
+msgid "Finnish (Winkeys)"
+msgstr "Finsk (Windows-tangenter)"
#: ../rules/base.xml.in.h:451
-msgid "Kurdish (Syria, Latin Q)"
-msgstr "Kurdisk (Syrien, latinskt Q)"
+msgid "Northern Saami (Finland)"
+msgstr "Nordsamisk (Finland)"
#: ../rules/base.xml.in.h:452
-msgid "Kurdish (Turkey, F)"
-msgstr "Kurdisk (Turkiet, F)"
+msgid "Finnish (Macintosh)"
+msgstr "Finska (Macintosh)"
-#: ../rules/base.xml.in.h:453
-msgid "Kurdish (Turkey, Latin Alt-Q)"
-msgstr "Kurdisk (Turkiet, latinskt Alt-Q)"
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
+msgid "French"
+msgstr "Fransk"
#: ../rules/base.xml.in.h:454
-msgid "Kurdish (Turkey, Latin Q)"
-msgstr "Kurdisk (Turkiet, latinskt Q)"
+msgid "French (eliminate dead keys)"
+msgstr "Fransk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:455
-msgid "Kyrgyz"
-msgstr "Kirgizisk"
+msgid "French (Sun dead keys)"
+msgstr "Fransk (Sun stumma tangenter)"
#: ../rules/base.xml.in.h:456
-msgid "Kyrgyz (phonetic)"
-msgstr "Kirgizisk (fonetisk)"
+msgid "French (alternative)"
+msgstr "Fransk (alternativ)"
#: ../rules/base.xml.in.h:457
-msgid "Lao"
-msgstr "Lao"
+msgid "French (alternative, Latin-9 only)"
+msgstr "Fransk (alternativ, endast Latin-9)"
#: ../rules/base.xml.in.h:458
-msgid "Lao (STEA proposed standard layout)"
-msgstr "Lao (STEA-föreslagen standardlayout)"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "Fransk (alternativ, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:459
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop-tangentbord för bärbar Compaq-dator (t.ex. Armada)"
+msgid "French (alternative, Sun dead keys)"
+msgstr "Fransk (alternativ, Sun stumma tangenter)"
#: ../rules/base.xml.in.h:460
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Internettangentbord för bärbar Compaq-dator (t.ex. Presario)"
+msgid "French (legacy, alternative)"
+msgstr "Franska (äldre, alternativ)"
#: ../rules/base.xml.in.h:461
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Bärbar eMachines m68xx"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "Fransk (äldre, alternativ, eliminera stumma tangenter)"
-#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
-msgid "Latvian"
-msgstr "Lettisk"
+#: ../rules/base.xml.in.h:462
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "Fransk (äldre, alternativ, Sun stumma tangenter)"
#: ../rules/base.xml.in.h:463
-msgid "Latvian (F variant)"
-msgstr "Lettisk (F-variant)"
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "Fransk (Bepo, ergonomisk, Dvorak-liknande)"
#: ../rules/base.xml.in.h:464
-msgid "Latvian (adapted)"
-msgstr "Lettisk (anpassad)"
+msgid "French (Bepo, ergonomic, Dvorak way, Latin-9 only)"
+msgstr "Fransk (Bepo, ergonomisk, Dvorak-liknande, endast Latin-9)"
#: ../rules/base.xml.in.h:465
-msgid "Latvian (apostrophe variant)"
-msgstr "Lettisk (apostrof-variant)"
+msgid "French (Dvorak)"
+msgstr "Fransk (Dvorak)"
#: ../rules/base.xml.in.h:466
-msgid "Latvian (ergonomic, ŪGJRMV)"
-msgstr "Lettisk (ergonomisk, ŪGJRMV)"
+msgid "French (Macintosh)"
+msgstr "Franska (Macintosh)"
#: ../rules/base.xml.in.h:467
-msgid "Latvian (modern)"
-msgstr "Lettisk (modern)"
+msgid "French (Breton)"
+msgstr "Fransk (Bretagnsk)"
#: ../rules/base.xml.in.h:468
-msgid "Latvian (tilde variant)"
-msgstr "Lettisk (tilde-variant)"
+msgid "Occitan"
+msgstr "Occitansk"
#: ../rules/base.xml.in.h:469
-msgid "Left Alt"
-msgstr "Vänster alt"
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Georgisk (Frankrike, AZERTY Tskapo)"
#: ../rules/base.xml.in.h:470
-msgid "Left Alt (while pressed)"
-msgstr "Vänster Alt (då den trycks ned)"
+msgid "English (Ghana)"
+msgstr "Engelsk (Ghana)"
#: ../rules/base.xml.in.h:471
-msgid "Left Alt is swapped with Left Win"
-msgstr "Vänster Alt är utbytt med vänster Win-tangent"
-
-#: ../rules/base.xml.in.h:472
-msgid "Left Alt+Left Shift"
-msgstr "Vänster Alt+Vänster Skift"
+msgid "English (Ghana, multilingual)"
+msgstr "Engelsk (Ghana, flerspråkig)"
+#. Keyboard indicator for Akan layouts
#: ../rules/base.xml.in.h:473
-msgid "Left Ctrl"
-msgstr "Vänster Ctrl"
+msgid "ak"
+msgstr "ak"
#: ../rules/base.xml.in.h:474
-msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
-msgstr "Vänster Ctrl (till första layouten), Höger Ctrl (till sista layouten)"
-
-#: ../rules/base.xml.in.h:475
-msgid "Left Ctrl as Meta"
-msgstr "Vänster Ctrl som Meta"
+msgid "Akan"
+msgstr "Akan"
+#. Keyboard indicator for Ewe layouts
#: ../rules/base.xml.in.h:476
-msgid "Left Ctrl+Left Shift"
-msgstr "Vänster ctrl+vänster skift"
+msgid "ee"
+msgstr "ee"
#: ../rules/base.xml.in.h:477
-msgid "Left Shift"
-msgstr "Vänster skift"
-
-#: ../rules/base.xml.in.h:478
-msgid "Left Win"
-msgstr "Vänster Win-tangent"
+msgid "Ewe"
+msgstr "Ewe"
+#. Keyboard indicator for Fula layouts
#: ../rules/base.xml.in.h:479
-msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
-msgstr "Vänster Win (till första layouten), Höger Win/Meny (till sista layouten)"
+msgid "ff"
+msgstr "ff"
#: ../rules/base.xml.in.h:480
-msgid "Left Win (while pressed)"
-msgstr "Vänster Win-tangent (då den trycks ned)"
-
-#: ../rules/base.xml.in.h:481
-msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Vänster Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
+msgid "Fula"
+msgstr "Fula"
+#. Keyboard indicator for Ga layouts
#: ../rules/base.xml.in.h:482
-msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
-msgstr "Vänster Ctrl+ Vänster Win (till första layouten), Höger Ctrl+Meny (till andra layouten)"
+msgid "gaa"
+msgstr "gaa"
#: ../rules/base.xml.in.h:483
-msgid "Legacy"
-msgstr "Äldre"
+msgid "Ga"
+msgstr "Ga"
-#: ../rules/base.xml.in.h:484
-msgid "Legacy Wang 724"
-msgstr "Gammalt Wang 724"
+#. Keyboard indicator for Hausa layouts
+#: ../rules/base.xml.in.h:485
+msgid "ha"
+msgstr "ha"
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
#: ../rules/base.xml.in.h:486
-msgid "Legacy key with comma"
-msgstr "Äldre tangent med komma"
-
-#: ../rules/base.xml.in.h:487
-msgid "Legacy key with dot"
-msgstr "Äldre tangent med punkt"
+msgid "Hausa"
+msgstr "Hausa"
-#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
-msgid "Lithuanian"
-msgstr "Litauiska"
+#. Keyboard indicator for Avatime layouts
+#: ../rules/base.xml.in.h:488
+msgid "avn"
+msgstr "avn"
#: ../rules/base.xml.in.h:489
-msgid "Lithuanian (IBM LST 1205-92)"
-msgstr "Litauiska (IBM LST 1205-92)"
+msgid "Avatime"
+msgstr "Avatime"
#: ../rules/base.xml.in.h:490
-msgid "Lithuanian (LEKP)"
-msgstr "Litauiska (LEKP)"
+msgid "English (Ghana, GILLBT)"
+msgstr "Engelsk (Ghana, GILLBT)"
#: ../rules/base.xml.in.h:491
-msgid "Lithuanian (LEKPa)"
-msgstr "Litauiska (LEKPa)"
-
-#: ../rules/base.xml.in.h:492
-msgid "Lithuanian (US keyboard with Lithuanian letters)"
-msgstr "Litauiska (USA-tangentbord med litauiska bokstäver)"
+msgid "French (Guinea)"
+msgstr "Fransk (Guinea)"
+#. Keyboard indicator for Georgian layouts
#: ../rules/base.xml.in.h:493
-msgid "Lithuanian (standard)"
-msgstr "Litauiska (standard)"
+msgid "ka"
+msgstr "ka"
#: ../rules/base.xml.in.h:494
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
+msgid "Georgian"
+msgstr "Georgisk"
#: ../rules/base.xml.in.h:495
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
+msgid "Georgian (ergonomic)"
+msgstr "Georgisk (ergonomisk)"
#: ../rules/base.xml.in.h:496
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop (alternativ)"
+msgid "Georgian (MESS)"
+msgstr "Georgisk (MESS)"
#: ../rules/base.xml.in.h:497
-msgid "Logitech Cordless Desktop EX110"
-msgstr "Logitech Cordless Desktop EX110"
+msgid "Russian (Georgia)"
+msgstr "Rysk (Georgien)"
#: ../rules/base.xml.in.h:498
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
+msgid "Ossetian (Georgia)"
+msgstr "Ossetisk (Georgien)"
-#: ../rules/base.xml.in.h:499
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
+#: ../rules/base.xml.in.h:499 ../rules/base.extras.xml.in.h:23
+msgid "German"
+msgstr "Tysk"
#: ../rules/base.xml.in.h:500
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
+msgid "German (dead acute)"
+msgstr "Tysk (stumma akutaccent)"
#: ../rules/base.xml.in.h:501
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "Logitech Cordless Desktop Pro (alternativt val 2)"
+msgid "German (dead grave acute)"
+msgstr "Tysk (stum grav accent)"
#: ../rules/base.xml.in.h:502
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
+msgid "German (eliminate dead keys)"
+msgstr "Tysk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:503
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
+msgid "German (T3)"
+msgstr "Tysk (T3)"
#: ../rules/base.xml.in.h:504
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15 extratangenter via G15daemon"
+msgid "Romanian (Germany)"
+msgstr "Rumänska (Tyskland)"
#: ../rules/base.xml.in.h:505
-msgid "Logitech Generic Keyboard"
-msgstr "Logitech Generic Keyboard"
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Rumänska (Tyskland, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:506
-msgid "Logitech Internet 350 Keyboard"
-msgstr "Logitech Internet 350 Keyboard"
+msgid "German (Dvorak)"
+msgstr "Tysk (Dvorak)"
#: ../rules/base.xml.in.h:507
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internettangentbord"
+msgid "German (Sun dead keys)"
+msgstr "Tysk (Sun stumma tangenter)"
#: ../rules/base.xml.in.h:508
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator-tangentbord"
+msgid "German (Neo 2)"
+msgstr "Tysk (Neo 2)"
#: ../rules/base.xml.in.h:509
-msgid "Logitech Media Elite Keyboard"
-msgstr "Logitech Media Elite Keyboard"
+msgid "German (Macintosh)"
+msgstr "Tysk (Macintosh)"
#: ../rules/base.xml.in.h:510
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Tysk (Macintosh, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:511
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
+msgid "Lower Sorbian"
+msgstr "Lågsorbisk"
#: ../rules/base.xml.in.h:512
-msgid "Logitech diNovo Edge Keyboard"
-msgstr "Logitech diNovo Edge Keyboard"
+msgid "Lower Sorbian (qwertz)"
+msgstr "Lågsorbisk (qwertz)"
#: ../rules/base.xml.in.h:513
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo Keyboard"
+msgid "German (qwerty)"
+msgstr "Tysk (qwerty)"
#: ../rules/base.xml.in.h:514
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+msgid "Turkish (Germany)"
+msgstr "Turkisk (Tyskland)"
#: ../rules/base.xml.in.h:515
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (modell Y-RB6)"
+msgid "Russian (Germany, phonetic)"
+msgstr "Rysk (Tyskland, fonetisk)"
#: ../rules/base.xml.in.h:516
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+msgid "German (legacy)"
+msgstr "Tysk (äldre)"
-#: ../rules/base.xml.in.h:517
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-
-#: ../rules/base.xml.in.h:518
-msgid "Lower Sorbian"
-msgstr "Lågsorbiska"
+#. Keyboard indicator for Greek layouts
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
+msgid "gr"
+msgstr "gr"
-#: ../rules/base.xml.in.h:519
-msgid "Lower Sorbian (qwertz)"
-msgstr "Lågsorbiska (qwertz)"
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
+msgid "Greek"
+msgstr "Grekisk"
#: ../rules/base.xml.in.h:520
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+msgid "Greek (simple)"
+msgstr "Grekisk (enkel)"
#: ../rules/base.xml.in.h:521
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (Intl)"
+msgid "Greek (extended)"
+msgstr "Grekisk (utökad)"
#: ../rules/base.xml.in.h:522
-msgid "Macedonian"
-msgstr "Makedonsk"
+msgid "Greek (eliminate dead keys)"
+msgstr "Grekisk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:523
-msgid "Macedonian (eliminate dead keys)"
-msgstr "Makedonsk (eliminera stumma tangenter)"
-
-#: ../rules/base.xml.in.h:524
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "Greek (polytonic)"
+msgstr "Grekisk (polytonisk)"
+#. Keyboard indicator for Hungarian layouts
#: ../rules/base.xml.in.h:525
-msgid "Macintosh Old"
-msgstr "Macintosh gammal"
+msgid "hu"
+msgstr "hu"
#: ../rules/base.xml.in.h:526
-msgid "Make Caps Lock an additional Backspace"
-msgstr "Gör Caps Lock till ytterligare en backstegstangent"
+msgid "Hungarian"
+msgstr "Ungersk"
#: ../rules/base.xml.in.h:527
-msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
-msgstr "Gör Caps Lock till ytterligare en Control men behåll Caps_Lock-keysym"
+msgid "Hungarian (standard)"
+msgstr "Ungersk (standard)"
#: ../rules/base.xml.in.h:528
-msgid "Make Caps Lock an additional ESC"
-msgstr "Gör Caps Lock till ytterligare en ESC-tangent"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "Ungersk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:529
-msgid "Make Caps Lock an additional Hyper"
-msgstr "Gör Caps Lock till ytterligare en Hyper-tangent"
+msgid "Hungarian (qwerty)"
+msgstr "Ungersk (qwerty)"
#: ../rules/base.xml.in.h:530
-msgid "Make Caps Lock an additional Num Lock"
-msgstr "Gör Caps Lock till ytterligare en Num Lock-tangent"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "Ungersk (101/qwertz/komma/stumma tangenter)"
#: ../rules/base.xml.in.h:531
-msgid "Make Caps Lock an additional Super"
-msgstr "Gör Caps Lock till ytterligare en Super-tangent"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "Ungersk (101/qwertz/komma/eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:532
-msgid "Make Zenkaku Hankaku an additional ESC"
-msgstr "Gör Zenkaku Hankaku till ytterligare en ESC-tangent"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "Ungersk (101/qwertz/punkt/stumma tangenter)"
#: ../rules/base.xml.in.h:533
-msgid "Malayalam"
-msgstr "Malayalam"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "Ungersk (101/qwertz/punkt/eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:534
-msgid "Malayalam (Lalitha)"
-msgstr "Malayalamsk (Lalitha)"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "Ungersk (101/qwerty/komma/stumma tangenter)"
#: ../rules/base.xml.in.h:535
-msgid "Malayalam (enhanced Inscript with Rupee Sign)"
-msgstr "Malayalam (förbättrad Inscript med Rupee-tecken)"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "Ungersk (101/qwerty/komma/eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:536
-msgid "Maltese"
-msgstr "Maltesisk"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "Ungersk (101/qwerty/punkt/stumma tangenter)"
#: ../rules/base.xml.in.h:537
-msgid "Maltese (with US layout)"
-msgstr "Maltesisk (med USA-layout)"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "Ungersk (101/qwerty/punkt/eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:538
-msgid "Maori"
-msgstr "Maori"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "Ungersk (102/qwertz/komma/stumma tangenter)"
#: ../rules/base.xml.in.h:539
-msgid "Mari"
-msgstr "Mari"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "Ungersk (102/qwertz/komma/eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:540
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "Ungersk (102/qwertz/punkt/stumma tangenter)"
#: ../rules/base.xml.in.h:541
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access-tangentbord"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "Ungersk (102/qwertz/punkt/eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:542
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "Ungersk (102/qwerty/komma/stumma tangenter)"
#: ../rules/base.xml.in.h:543
-msgid "Menu"
-msgstr "Meny"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "Ungersk (102/qwerty/komma/eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:544
-msgid "Menu as Right Ctrl"
-msgstr "Meny som Höger Ctrl"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "Ungersk (102/qwerty/punkt/stumma tangenter)"
#: ../rules/base.xml.in.h:545
-msgid "Meta is mapped to Left Win"
-msgstr "Meta är mappad till vänster Win-tangent"
-
-#: ../rules/base.xml.in.h:546
-msgid "Meta is mapped to Win keys"
-msgstr "Meta är mappad till Win-tangenterna"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "Ungersk (102/qwerty/punkt/eliminera stumma tangenter)"
+#. Keyboard indicator for Icelandic layouts
#: ../rules/base.xml.in.h:547
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "Microsoft Comfort Curve Keyboard 2000"
+msgid "is"
+msgstr "is"
#: ../rules/base.xml.in.h:548
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard"
+msgid "Icelandic"
+msgstr "Isländsk"
#: ../rules/base.xml.in.h:549
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, svensk"
+msgid "Icelandic (Sun dead keys)"
+msgstr "Isländsk (Sun stumma tangenter)"
#: ../rules/base.xml.in.h:550
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
+msgid "Icelandic (eliminate dead keys)"
+msgstr "Isländsk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:551
-msgid "Microsoft Natural Keyboard Elite"
-msgstr "Microsoft Natural Keyboard Elite"
+msgid "Icelandic (Macintosh, legacy)"
+msgstr "Isländsk (Macintosh, äldre)"
#: ../rules/base.xml.in.h:552
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgid "Icelandic (Macintosh)"
+msgstr "Isländsk (Macintosh)"
#: ../rules/base.xml.in.h:553
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
-
-#: ../rules/base.xml.in.h:554
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgid "Icelandic (Dvorak)"
+msgstr "Isländsk (Dvorak)"
-#: ../rules/base.xml.in.h:555
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+#. Keyboard indicator for Hebrew layouts
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
+msgid "he"
+msgstr "he"
-#: ../rules/base.xml.in.h:556
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
+msgid "Hebrew"
+msgstr "Hebreisk"
#: ../rules/base.xml.in.h:557
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office-tangentbord"
+msgid "Hebrew (lyx)"
+msgstr "Hebreisk (lyx)"
#: ../rules/base.xml.in.h:558
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgid "Hebrew (phonetic)"
+msgstr "Hebreisk (fonetisk)"
#: ../rules/base.xml.in.h:559
-msgid "Miscellaneous compatibility options"
-msgstr "Diverse kompatibilitetsalternativ"
-
-#: ../rules/base.xml.in.h:560
-msgid "Mongolian"
-msgstr "Mongolisk"
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hebreisk (Biblisk, Tiro)"
-#: ../rules/base.xml.in.h:561
-msgid "Montenegrin"
-msgstr "Montenegrinsk"
+#. Keyboard indicator for Italian layouts
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
+msgid "it"
+msgstr "it"
-#: ../rules/base.xml.in.h:562
-msgid "Montenegrin (Cyrillic with guillemets)"
-msgstr "Montenegrinsk (Kyrillisk med gåsögon)"
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
+msgid "Italian"
+msgstr "Italiensk"
#: ../rules/base.xml.in.h:563
-msgid "Montenegrin (Cyrillic)"
-msgstr "Montenegrinsk (Kyrillisk)"
+msgid "Italian (eliminate dead keys)"
+msgstr "Italiensk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:564
-msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
-msgstr "Montenegrinsk (Kyrillisk, Z och ZHE utbytta)"
+msgid "Italian (Winkeys)"
+msgstr "Italiensk (Windows-tangenter)"
#: ../rules/base.xml.in.h:565
-msgid "Montenegrin (Latin Unicode qwerty)"
-msgstr "Montenegrinska (Latin unicode qwerty)"
+msgid "Italian (Macintosh)"
+msgstr "Italiensk (Macintosh)"
#: ../rules/base.xml.in.h:566
-msgid "Montenegrin (Latin Unicode)"
-msgstr "Montenegrinska (Latin Unicode)"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "Italiensk (USA-tangentbord med italienska bokstäver)"
#: ../rules/base.xml.in.h:567
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Montenegrinsk (Latin qwerty)"
+msgid "Georgian (Italy)"
+msgstr "Georgisk (Italien)"
#: ../rules/base.xml.in.h:568
-msgid "Montenegrin (Latin with guillemets)"
-msgstr "Montenegrinsk (Latin med gåsögon)"
-
-#: ../rules/base.xml.in.h:569
-msgid "NICOLA-F style Backspace"
-msgstr "Backsteg i NICOLA-F-stil"
+msgid "Italian (IBM 142)"
+msgstr "Italiensk (IBM 142)"
-#: ../rules/base.xml.in.h:570
-msgid "Nepali"
-msgstr "Nepalesisk"
+#. Keyboard indicator for Japanese layouts
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
+msgid "ja"
+msgstr "ja"
-#: ../rules/base.xml.in.h:571
-msgid "Non-breakable space character at fourth level"
-msgstr "Icke-brytande blankstegstecken på fjärde nivån"
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
+msgid "Japanese"
+msgstr "Japansk"
#: ../rules/base.xml.in.h:572
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Icke-brytande blankstegstecken på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån"
+msgid "Japanese (Kana)"
+msgstr "Japansk (Kana)"
#: ../rules/base.xml.in.h:573
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
-msgstr "Icke-brytande blankstegstecken på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån (via Ctrl+Skift)"
+msgid "Japanese (Kana 86)"
+msgstr "Japansk (Kana 86)"
#: ../rules/base.xml.in.h:574
-msgid "Non-breakable space character at second level"
-msgstr "Icke-brytande blankstegstecken på andra nivån"
+msgid "Japanese (OADG 109A)"
+msgstr "Japansk (OADG 109A)"
#: ../rules/base.xml.in.h:575
-msgid "Non-breakable space character at third level"
-msgstr "Icke-brytande blankstegstecken på tredje nivån"
+msgid "Japanese (Macintosh)"
+msgstr "Japansk (Macintosh)"
#: ../rules/base.xml.in.h:576
-msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr "Icke-brytande blankstegstecken på tredje nivån, ingenting på fjärde nivån"
-
-#: ../rules/base.xml.in.h:577
-msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Icke-brytande blankstegstecken på tredje nivån, tunt icke-brytande blankstegstecken på fjärde nivån"
+msgid "Japanese (Dvorak)"
+msgstr "Japansk (Dvorak)"
+#. Keyboard indicator for Kikuyu layouts
#: ../rules/base.xml.in.h:578
-msgid "Northern Saami (Finland)"
-msgstr "Nordsamiska (Finland)"
+msgid "ki"
+msgstr "ki"
#: ../rules/base.xml.in.h:579
-msgid "Northern Saami (Norway)"
-msgstr "Nordsamiska (Norge)"
+msgid "Kyrgyz"
+msgstr "Kirgizisk"
#: ../rules/base.xml.in.h:580
-msgid "Northern Saami (Norway, eliminate dead keys)"
-msgstr "Nordsamiska (Norge, eliminera stumma tangenter)"
-
-#: ../rules/base.xml.in.h:581
-msgid "Northern Saami (Sweden)"
-msgstr "Nordsamiska (Sverige)"
+msgid "Kyrgyz (phonetic)"
+msgstr "Kirgizisk (fonetisk)"
+#. Keyboard indicator for Khmer layouts
#: ../rules/base.xml.in.h:582
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
+msgid "km"
+msgstr "km"
#: ../rules/base.xml.in.h:583
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: ../rules/base.xml.in.h:584
-msgid "Norwegian (Dvorak)"
-msgstr "Norsk (Dvorak)"
+msgid "Khmer (Cambodia)"
+msgstr "Khmer (Kambodja)"
+#. Keyboard indicator for Kazakh layouts
#: ../rules/base.xml.in.h:585
-msgid "Norwegian (Macintosh)"
-msgstr "Norska (Macintosh)"
+msgid "kk"
+msgstr "kk"
#: ../rules/base.xml.in.h:586
-msgid "Norwegian (Macintosh, eliminate dead keys)"
-msgstr "Norska (Macintosh, eliminera stumma tangenter)"
+msgid "Kazakh"
+msgstr "Kazakisk"
#: ../rules/base.xml.in.h:587
-msgid "Norwegian (eliminate dead keys)"
-msgstr "Norsk (eliminera stumma tangenter)"
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "Rysk (Kazakstan, med kazakiska)"
#: ../rules/base.xml.in.h:588
-msgid "Num Lock"
-msgstr "Num Lock"
-
-# KONTROLLERA DENNA
-#: ../rules/base.xml.in.h:589
-msgid "Numeric keypad delete key behaviour"
-msgstr "Beteende för Delete-tangent på numeriskt tangentbord"
+msgid "Kazakh (with Russian)"
+msgstr "Kazakisk (med ryska)"
+#. Keyboard indicator for Lao layouts
#: ../rules/base.xml.in.h:590
-msgid "Numeric keypad keys always enter digits (as in Mac OS)"
-msgstr "Tangenter på det numeriska tangentbordet ger alltid siffror (som på Mac OS)"
+msgid "lo"
+msgstr "lo"
#: ../rules/base.xml.in.h:591
-msgid "Numeric keypad layout selection"
-msgstr "Layoutval för numeriskt tangentbord"
+msgid "Lao"
+msgstr "Lao"
#: ../rules/base.xml.in.h:592
-msgid "OLPC"
-msgstr "OLPC"
-
-#: ../rules/base.xml.in.h:593
-msgid "Occitan"
-msgstr "Occitanska"
+msgid "Lao (STEA proposed standard layout)"
+msgstr "Lao (STEA-föreslagen standardlayout)"
-#: ../rules/base.xml.in.h:594
-msgid "Ogham"
-msgstr "Ogham"
+#. Keyboard indicator for Spanish layouts
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
+msgid "es"
+msgstr "es"
#: ../rules/base.xml.in.h:595
-msgid "Ogham (IS434)"
-msgstr "Ogham (IS434)"
+msgid "Spanish (Latin American)"
+msgstr "Spansk (Latinamerikansk)"
#: ../rules/base.xml.in.h:596
-msgid "Oriya"
-msgstr "Oriya"
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "Spansk (Latinamerikansk, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:597
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM/Internet-tangentbord"
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "Spansk (Latinamerikansk, inkluderar stumma tilde)"
#: ../rules/base.xml.in.h:598
-msgid "Ossetian (Georgia)"
-msgstr "Ossetiska (Georgien)"
-
-#: ../rules/base.xml.in.h:599
-msgid "Ossetian (WinKeys)"
-msgstr "Ossetiska (Windows-tangenter)"
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Spansk (Latinamerikansk, Sun stumma tangenter)"
-#: ../rules/base.xml.in.h:600
-msgid "Ossetian (legacy)"
-msgstr "Ossetiska (äldre)"
+#. Keyboard indicator for Lithuanian layouts
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
+msgid "lt"
+msgstr "lt"
-#: ../rules/base.xml.in.h:601
-msgid "PC-98xx Series"
-msgstr "PC-98xx-serien"
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
+msgid "Lithuanian"
+msgstr "Litauisk"
#: ../rules/base.xml.in.h:602
-msgid "Pannonian Rusyn (homophonic)"
-msgstr "Rusinska (homofonisk)"
+msgid "Lithuanian (standard)"
+msgstr "Litauisk (standard)"
#: ../rules/base.xml.in.h:603
-msgid "Pashto"
-msgstr "Pashto"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "Litauisk (USA-tangentbord med litauiska bokstäver)"
#: ../rules/base.xml.in.h:604
-msgid "Pashto (Afghanistan, OLPC)"
-msgstr "Pashto (Afganistan, OLPC)"
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "Litauisk (IBM LST 1205-92)"
#: ../rules/base.xml.in.h:605
-msgid "Pause"
-msgstr "Pause"
-
-#: ../rules/base.xml.in.h:606 ../rules/base.extras.xml.in.h:27
-msgid "Persian"
-msgstr "Persisk"
+msgid "Lithuanian (LEKP)"
+msgstr "Litauisk (LEKP)"
-#: ../rules/base.xml.in.h:607
-msgid "Persian (Afghanistan, Dari OLPC)"
-msgstr "Persisk (Afganistan, Dari OLPC)"
+#: ../rules/base.xml.in.h:606
+msgid "Lithuanian (LEKPa)"
+msgstr "Litauisk (LEKPa)"
-#: ../rules/base.xml.in.h:608
-msgid "Persian (with Persian Keypad)"
-msgstr "Persisk (med persiskt numeriskt tangentbord)"
+#. Keyboard indicator for Latvian layouts
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
+msgid "lv"
+msgstr "lv"
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:28
-msgid "Polish"
-msgstr "Polsk"
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
+msgid "Latvian"
+msgstr "Lettisk"
#: ../rules/base.xml.in.h:610
-msgid "Polish (Dvorak)"
-msgstr "Polsk (Dvorak)"
+msgid "Latvian (apostrophe variant)"
+msgstr "Lettisk (apostrof-variant)"
#: ../rules/base.xml.in.h:611
-msgid "Polish (Dvorak, Polish quotes on key 1)"
-msgstr "Polska (Dvorak, polska citattecken på tangent 1)"
+msgid "Latvian (tilde variant)"
+msgstr "Lettisk (tilde-variant)"
#: ../rules/base.xml.in.h:612
-msgid "Polish (Dvorak, Polish quotes on quotemark key)"
-msgstr "Polska (Dvorak, polska citattecken på citattangent)"
+msgid "Latvian (F variant)"
+msgstr "Lettisk (F-variant)"
#: ../rules/base.xml.in.h:613
-msgid "Polish (programmer Dvorak)"
-msgstr "Polsk (Dvorak för programmerare)"
+msgid "Latvian (modern)"
+msgstr "Lettisk (modern)"
#: ../rules/base.xml.in.h:614
-msgid "Polish (qwertz)"
-msgstr "Polsk (qwertz)"
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Lettisk (ergonomisk, ŪGJRMV)"
#: ../rules/base.xml.in.h:615
-msgid "Portuguese"
-msgstr "Portugisisk"
-
-#: ../rules/base.xml.in.h:616
-msgid "Portuguese (Brazil)"
-msgstr "Portugisisk (Brasilisk)"
+msgid "Latvian (adapted)"
+msgstr "Lettisk (anpassad)"
+#. Keyboard indicator for Maori layouts
#: ../rules/base.xml.in.h:617
-msgid "Portuguese (Brazil, Dvorak)"
-msgstr "Portugisisk (Brasiliansk, Dvorak)"
+msgid "mi"
+msgstr "mi"
#: ../rules/base.xml.in.h:618
-msgid "Portuguese (Brazil, eliminate dead keys)"
-msgstr "Portugisisk (Brasilisk, eliminera stumma tangenter)"
-
-#: ../rules/base.xml.in.h:619
-msgid "Portuguese (Brazil, nativo for Esperanto)"
-msgstr "Portugisisk (Brasilisk, nativo för Esperanto)"
+msgid "Maori"
+msgstr "Maori"
-#: ../rules/base.xml.in.h:620
-msgid "Portuguese (Brazil, nativo for USA keyboards)"
-msgstr "Portugisisk (Brasilisk, nativo för USA-tangentbord)"
+#. Keyboard indicator for Serbian layouts
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
+msgid "sr"
+msgstr "sr"
#: ../rules/base.xml.in.h:621
-msgid "Portuguese (Brazil, nativo)"
-msgstr "Portugisisk (Brasiliansk, nativo)"
+msgid "Montenegrin"
+msgstr "Montenegrinsk"
#: ../rules/base.xml.in.h:622
-msgid "Portuguese (Macintosh)"
-msgstr "Portugisiska (Macintosh)"
+msgid "Montenegrin (Cyrillic)"
+msgstr "Montenegrinsk (Kyrillisk)"
#: ../rules/base.xml.in.h:623
-msgid "Portuguese (Macintosh, Sun dead keys)"
-msgstr "Portugisiska (Macintosh, Sun stumma tangenter)"
+msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
+msgstr "Montenegrinsk (Kyrillisk, ZE och ZHE utbytta)"
#: ../rules/base.xml.in.h:624
-msgid "Portuguese (Macintosh, eliminate dead keys)"
-msgstr "Portugisiska (Macintosh, eliminera stumma tangenter)"
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Montenegrinsk (Latin Unicode)"
#: ../rules/base.xml.in.h:625
-msgid "Portuguese (Nativo for USA keyboards)"
-msgstr "Portugisisk (nativo för USA-tangentbord)"
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegrinsk (Latin qwerty)"
#: ../rules/base.xml.in.h:626
-msgid "Portuguese (Nativo)"
-msgstr "Portugisisk (Nativo)"
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Montenegrinsk (Latin unicode qwerty)"
#: ../rules/base.xml.in.h:627
-msgid "Portuguese (Sun dead keys)"
-msgstr "Portugisisk (Sun stumma tangenter)"
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "Montenegrinsk (Kyrillisk med gåsögon)"
#: ../rules/base.xml.in.h:628
-msgid "Portuguese (eliminate dead keys)"
-msgstr "Portugisisk (eliminera stumma tangenter)"
-
-#: ../rules/base.xml.in.h:629
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "Montenegrinsk (Latin med gåsögon)"
+#. Keyboard indicator for Macedonian layouts
#: ../rules/base.xml.in.h:630
-msgid "PrtSc"
-msgstr "PrtSc"
+msgid "mk"
+msgstr "mk"
#: ../rules/base.xml.in.h:631
-msgid "Punjabi (Gurmukhi Jhelum)"
-msgstr "Punjabi (Gurmukhi Jhelum)"
+msgid "Macedonian"
+msgstr "Makedonsk"
#: ../rules/base.xml.in.h:632
-msgid "Punjabi (Gurmukhi)"
-msgstr "Punjabi (Gurmukhi)"
-
-#: ../rules/base.xml.in.h:633
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Macedonian (eliminate dead keys)"
+msgstr "Makedonsk (eliminera stumma tangenter)"
+#. Keyboard indicator for Maltese layouts
#: ../rules/base.xml.in.h:634
-msgid "Right Alt"
-msgstr "Höger Alt"
+msgid "mt"
+msgstr "mt"
#: ../rules/base.xml.in.h:635
-msgid "Right Alt (while pressed)"
-msgstr "Höger Alt-tangent (då den trycks ned)"
+msgid "Maltese"
+msgstr "Maltesisk"
#: ../rules/base.xml.in.h:636
-msgid "Right Alt as Right Ctrl"
-msgstr "Höger Alt som Höger Ctrl"
-
-#: ../rules/base.xml.in.h:637
-msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Höger Alt-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
+msgid "Maltese (with US layout)"
+msgstr "Maltesisk (med USA-layout)"
+#. Keyboard indicator for Mongolian layouts
#: ../rules/base.xml.in.h:638
-msgid "Right Alt key never chooses 3rd level"
-msgstr "Höger Alt-tangent väljer aldrig tredje nivån"
+msgid "mn"
+msgstr "mn"
#: ../rules/base.xml.in.h:639
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Höger Alt-tangent, Skift+Höger Alt-tangent är Multi_Key"
-
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl"
-msgstr "Höger Ctrl"
+msgid "Mongolian"
+msgstr "Mongolisk"
-#: ../rules/base.xml.in.h:641
-msgid "Right Ctrl (while pressed)"
-msgstr "Höger Ctrl-tangent (då den trycks ned)"
+#. Keyboard indicator for Norwegian layouts
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
+msgid "no"
+msgstr "no"
-#: ../rules/base.xml.in.h:642
-msgid "Right Ctrl as Right Alt"
-msgstr "Höger Ctrl-tangent fungerar som höger Alt"
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
+msgid "Norwegian"
+msgstr "Norsk"
#: ../rules/base.xml.in.h:643
-msgid "Right Ctrl+Right Shift"
-msgstr "Höger Ctrl + höger Skift"
+msgid "Norwegian (eliminate dead keys)"
+msgstr "Norsk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:644
-msgid "Right Shift"
-msgstr "Höger skift"
+msgid "Norwegian (Winkeys)"
+msgstr "Norsk (Windows-tangenter)"
#: ../rules/base.xml.in.h:645
-msgid "Right Win"
-msgstr "Höger Win-tangent"
+msgid "Norwegian (Dvorak)"
+msgstr "Norsk (Dvorak)"
#: ../rules/base.xml.in.h:646
-msgid "Right Win (while pressed)"
-msgstr "Höger Win-tangent (då den trycks ned)"
+msgid "Northern Saami (Norway)"
+msgstr "Nordsamisk (Norge)"
#: ../rules/base.xml.in.h:647
-msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Höger Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Nordsamisk (Norge, eliminera stumma tangenter)"
-#: ../rules/base.xml.in.h:648 ../rules/base.extras.xml.in.h:30
-msgid "Romanian"
-msgstr "Rumänsk"
+#: ../rules/base.xml.in.h:648
+msgid "Norwegian (Macintosh)"
+msgstr "Norsk (Macintosh)"
#: ../rules/base.xml.in.h:649
-msgid "Romanian (Germany)"
-msgstr "Rumänska (Tyskland)"
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Norsk (Macintosh, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:650
-msgid "Romanian (Germany, eliminate dead keys)"
-msgstr "Rumänska (Tyskland, eliminera stumma tangenter)"
-
-#: ../rules/base.xml.in.h:651
-msgid "Romanian (WinKeys)"
-msgstr "Rumänsk (Windows-tangenter)"
+msgid "Norwegian (Colemak)"
+msgstr "Norsk (Colemak)"
-#: ../rules/base.xml.in.h:652
-msgid "Romanian (cedilla)"
-msgstr "Rumänsk (cedilj)"
+#. Keyboard indicator for Polish layouts
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
+msgid "pl"
+msgstr "pl"
-#: ../rules/base.xml.in.h:653
-msgid "Romanian (standard cedilla)"
-msgstr "Rumänsk (standard cedilj)"
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
+msgid "Polish"
+msgstr "Polsk"
#: ../rules/base.xml.in.h:654
-msgid "Romanian (standard)"
-msgstr "Rumänsk (standard)"
+msgid "Polish (legacy)"
+msgstr "Polsk (äldre)"
#: ../rules/base.xml.in.h:655
-msgid "Rupee on 4"
-msgstr "Rupee på 4"
+msgid "Polish (qwertz)"
+msgstr "Polsk (qwertz)"
-#: ../rules/base.xml.in.h:656 ../rules/base.extras.xml.in.h:32
-msgid "Russian"
-msgstr "Rysk"
+#: ../rules/base.xml.in.h:656
+msgid "Polish (Dvorak)"
+msgstr "Polsk (Dvorak)"
#: ../rules/base.xml.in.h:657
-msgid "Russian (DOS)"
-msgstr "Rysk (DOS)"
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "Polsk (Dvorak, polska citattecken på citattangent)"
#: ../rules/base.xml.in.h:658
-msgid "Russian (Georgia)"
-msgstr "Rysk (Georgien)"
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "Polsk (Dvorak, polska citattecken på tangent 1)"
#: ../rules/base.xml.in.h:659
-msgid "Russian (Germany, phonetic)"
-msgstr "Rysk (Tyskland, fonetiskt)"
+msgid "Kashubian"
+msgstr "Kasjubisk"
#: ../rules/base.xml.in.h:660
-msgid "Russian (Kazakhstan, with Kazakh)"
-msgstr "Rysk (Kazakstan, med kazakiska)"
+msgid "Silesian"
+msgstr "Schlesisk"
#: ../rules/base.xml.in.h:661
msgid "Russian (Poland, phonetic Dvorak)"
msgstr "Rysk (Polen, fonetisk Dvorak)"
#: ../rules/base.xml.in.h:662
-msgid "Russian (Sweden, phonetic)"
-msgstr "Rysk (Sverige, fonetiskt)"
+msgid "Polish (programmer Dvorak)"
+msgstr "Polsk (Dvorak för programmerare)"
-#: ../rules/base.xml.in.h:663
-msgid "Russian (Sweden, phonetic, eliminate dead keys)"
-msgstr "Rysk (Sverige, fonetiskt, eliminera stumma tangenter)"
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
+msgid "Portuguese"
+msgstr "Portugisisk"
#: ../rules/base.xml.in.h:664
-msgid "Russian (US, phonetic)"
-msgstr "Rysk (USA, fonetisk)"
+msgid "Portuguese (eliminate dead keys)"
+msgstr "Portugisisk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:665
-msgid "Russian (Ukraine, standard RSTU)"
-msgstr "Ryska (Ukraina, standard RSTU)"
+msgid "Portuguese (Sun dead keys)"
+msgstr "Portugisisk (Sun stumma tangenter)"
#: ../rules/base.xml.in.h:666
-msgid "Russian (legacy)"
-msgstr "Rysk (äldre)"
+msgid "Portuguese (Macintosh)"
+msgstr "Portugisisk (Macintosh)"
#: ../rules/base.xml.in.h:667
-msgid "Russian (phonetic WinKeys)"
-msgstr "Rysk (fonetisk Windows-tangenter)"
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portugisisk (Macintosh, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:668
-msgid "Russian (phonetic)"
-msgstr "Rysk (fonetiskt)"
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portugisisk (Macintosh, Sun stumma tangenter)"
#: ../rules/base.xml.in.h:669
-msgid "Russian (typewriter)"
-msgstr "Rysk (skrivmaskin)"
+msgid "Portuguese (Nativo)"
+msgstr "Portugisisk (Nativo)"
#: ../rules/base.xml.in.h:670
-msgid "Russian (typewriter, legacy)"
-msgstr "Rysk (skrivmaskin, äldre)"
+msgid "Portuguese (Nativo for US keyboards)"
+msgstr "Portugisisk (Nativo för USA-tangentbord)"
#: ../rules/base.xml.in.h:671
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
-
-#: ../rules/base.xml.in.h:672
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Esperanto (Portugal, Nativo)"
-#: ../rules/base.xml.in.h:673
-msgid "SK-2500"
-msgstr "SK-2500"
+#. Keyboard indicator for Romanian layouts
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
+msgid "ro"
+msgstr "ro"
-#: ../rules/base.xml.in.h:674
-msgid "SK-6200"
-msgstr "SK-6200"
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
+msgid "Romanian"
+msgstr "Rumänsk"
#: ../rules/base.xml.in.h:675
-msgid "SK-7100"
-msgstr "SK-7100"
+msgid "Romanian (cedilla)"
+msgstr "Rumänsk (cedilj)"
#: ../rules/base.xml.in.h:676
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+msgid "Romanian (standard)"
+msgstr "Rumänsk (standard)"
#: ../rules/base.xml.in.h:677
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
+msgid "Romanian (standard cedilla)"
+msgstr "Rumänsk (standard cedilj)"
#: ../rules/base.xml.in.h:678
-msgid "Saisiyat (Taiwan)"
-msgstr "Saisiyat (Taiwan)"
+msgid "Romanian (WinKeys)"
+msgstr "Rumänsk (Windows-tangenter)"
-#: ../rules/base.xml.in.h:679
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
+msgid "Russian"
+msgstr "Rysk"
#: ../rules/base.xml.in.h:680
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
+msgid "Russian (phonetic)"
+msgstr "Rysk (fonetisk)"
#: ../rules/base.xml.in.h:681
-msgid "Sanwa Supply SKB-KG3"
-msgstr "Sanwa Supply SKB-KG3"
+msgid "Russian (phonetic WinKeys)"
+msgstr "Rysk (fonetiska Windows-tangenter)"
#: ../rules/base.xml.in.h:682
-msgid "Scroll Lock"
-msgstr "Scroll Lock"
+msgid "Russian (typewriter)"
+msgstr "Rysk (skrivmaskin)"
#: ../rules/base.xml.in.h:683
-msgid "Semi-colon on third level"
-msgstr "Semikolon på tredje nivå"
+msgid "Russian (legacy)"
+msgstr "Rysk (äldre)"
#: ../rules/base.xml.in.h:684
-msgid "Serbian (Cyrillic with guillemets)"
-msgstr "Serbiska (Kyrillisk med gåsögon)"
+msgid "Russian (typewriter, legacy)"
+msgstr "Rysk (skrivmaskin, äldre)"
#: ../rules/base.xml.in.h:685
-msgid "Serbian (Cyrillic)"
-msgstr "Serbiska (Kyrillisk)"
+msgid "Tatar"
+msgstr "Tatar"
#: ../rules/base.xml.in.h:686
-msgid "Serbian (Cyrillic, Z and ZHE swapped)"
-msgstr "Serbiska (Kyrillisk, Z och ZHE utbytta)"
+msgid "Ossetian (legacy)"
+msgstr "Ossetisk (äldre)"
#: ../rules/base.xml.in.h:687
-msgid "Serbian (Latin Unicode qwerty)"
-msgstr "Serbisk (Latin Unicode qwerty)"
+msgid "Ossetian (WinKeys)"
+msgstr "Ossetisk (Windows-tangenter)"
#: ../rules/base.xml.in.h:688
-msgid "Serbian (Latin Unicode)"
-msgstr "Serbisk (Latin Unicode)"
+msgid "Chuvash"
+msgstr "Tjuvasjisk"
#: ../rules/base.xml.in.h:689
-msgid "Serbian (Latin qwerty)"
-msgstr "Serbisk (Latin qwerty)"
+msgid "Chuvash (Latin)"
+msgstr "Tjuvasjisk (Latin)"
#: ../rules/base.xml.in.h:690
-msgid "Serbian (Latin with guillemets)"
-msgstr "Serbisk (Latin med gåsögon)"
+msgid "Udmurt"
+msgstr "Udmurt"
#: ../rules/base.xml.in.h:691
-msgid "Serbian (Latin)"
-msgstr "Serbisk (Latin)"
+msgid "Komi"
+msgstr "Komi"
#: ../rules/base.xml.in.h:692
-msgid "Serbian (Russia)"
-msgstr "Serbiska (Ryssland)"
+msgid "Yakut"
+msgstr "Yakut"
#: ../rules/base.xml.in.h:693
-msgid "Serbo-Croatian (US)"
-msgstr "Serbokroatisk (US)"
+msgid "Kalmyk"
+msgstr "Kalmyk"
#: ../rules/base.xml.in.h:694
-msgid "Shift cancels Caps Lock"
-msgstr "Skift avbryter Caps Lock"
+msgid "Russian (DOS)"
+msgstr "Rysk (DOS)"
#: ../rules/base.xml.in.h:695
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
-msgstr "Skift avbryter inte Num Lock, väljer tredje nivån istället"
+msgid "Russian (Macintosh)"
+msgstr "Rysk (Macintosh)"
#: ../rules/base.xml.in.h:696
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Skift med tangenterna på numeriska tangentbordet fungerar som i MS Windows"
+msgid "Serbian (Russia)"
+msgstr "Serbisk (Ryssland)"
#: ../rules/base.xml.in.h:697
-msgid "Shift+Caps Lock"
-msgstr "Skift+Caps Lock"
+msgid "Bashkirian"
+msgstr "Basjkirisk"
#: ../rules/base.xml.in.h:698
-msgid "Sindhi"
-msgstr "Sindhi"
+msgid "Mari"
+msgstr "Mari"
#: ../rules/base.xml.in.h:699
-msgid "Sinhala (phonetic)"
-msgstr "Sinhala (fonetisk)"
+msgid "Russian (phonetic azerty)"
+msgstr "Rysk (fonetisk azerty)"
#: ../rules/base.xml.in.h:700
-msgid "Slovak"
-msgstr "Slovakisk"
+msgid "Russian (phonetic French)"
+msgstr "Rysk (fonetisk franska)"
-#: ../rules/base.xml.in.h:701
-msgid "Slovak (extended Backslash)"
-msgstr "Slovakisk (utökat omvänt snedstreck)"
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
+msgid "Serbian"
+msgstr "Serbisk"
#: ../rules/base.xml.in.h:702
-msgid "Slovak (qwerty)"
-msgstr "Slovakisk (qwerty)"
+msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
+msgstr "Serbisk (Kyrillisk, ZE och ZHE utbytta)"
#: ../rules/base.xml.in.h:703
-msgid "Slovak (qwerty, extended Backslash)"
-msgstr "Slovakisk (qwerty, utökat omvänt snedstreck)"
+msgid "Serbian (Latin)"
+msgstr "Serbisk (Latin)"
#: ../rules/base.xml.in.h:704
-msgid "Slovenian"
-msgstr "Slovenska"
+msgid "Serbian (Latin Unicode)"
+msgstr "Serbisk (Latin Unicode)"
#: ../rules/base.xml.in.h:705
-msgid "Slovenian (US keyboard with Slovenian letters)"
-msgstr "Slovenska (USA-tangentbord med slovenska bokstäver)"
+msgid "Serbian (Latin qwerty)"
+msgstr "Serbisk (Latin qwerty)"
#: ../rules/base.xml.in.h:706
-msgid "Slovenian (use guillemets for quotes)"
-msgstr "Slovenska (använder gåsögon för citattecken)"
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "Serbisk (Latin Unicode qwerty)"
#: ../rules/base.xml.in.h:707
-msgid "Spanish"
-msgstr "Spansk"
+msgid "Serbian (Cyrillic with guillemets)"
+msgstr "Serbisk (Kyrillisk med gåsögon)"
#: ../rules/base.xml.in.h:708
-msgid "Spanish (Dvorak)"
-msgstr "Spansk (Dvorak)"
+msgid "Serbian (Latin with guillemets)"
+msgstr "Serbisk (Latin med gåsögon)"
#: ../rules/base.xml.in.h:709
-msgid "Spanish (Latin American)"
-msgstr "Spansk (Latinamerikansk)"
-
-#: ../rules/base.xml.in.h:710
-msgid "Spanish (Latin American, Sun dead keys)"
-msgstr "Spanska (Latinamerikansk, Sun stumma tangenter)"
+msgid "Pannonian Rusyn"
+msgstr "Pannonisk rusinsk"
+#. Keyboard indicator for Slovenian layouts
#: ../rules/base.xml.in.h:711
-msgid "Spanish (Latin American, eliminate dead keys)"
-msgstr "Spansk (Latinamerikansk, eliminera stumma tangenter)"
+msgid "sl"
+msgstr "sl"
#: ../rules/base.xml.in.h:712
-msgid "Spanish (Latin American, include dead tilde)"
-msgstr "Spansk (Latinamerikansk, inkluderar stumma tilde)"
+msgid "Slovenian"
+msgstr "Slovensk"
#: ../rules/base.xml.in.h:713
-msgid "Spanish (Macintosh)"
-msgstr "Spanska (Macintosh)"
+msgid "Slovenian (with guillemets for quotes)"
+msgstr "Slovensk (med gåsögon för citattecken)"
#: ../rules/base.xml.in.h:714
-msgid "Spanish (Sun dead keys)"
-msgstr "Spansk (Sun stumma tangenter)"
-
-#: ../rules/base.xml.in.h:715
-msgid "Spanish (eliminate dead keys)"
-msgstr "Spansk (eliminera stumma tangenter)"
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "Slovensk (USA-tangentbord med slovenska bokstäver)"
-#: ../rules/base.xml.in.h:716
-msgid "Spanish (include dead tilde)"
-msgstr "Spansk (Inkludera dött tilde-tecken)"
+#. Keyboard indicator for Slovak layouts
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
+msgid "sk"
+msgstr "sk"
-#: ../rules/base.xml.in.h:717
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "Specialtangenter (Ctrl+Alt+‹tangent›) hanteras i en server"
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
+msgid "Slovak"
+msgstr "Slovakisk"
#: ../rules/base.xml.in.h:718
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Slovak (extended Backslash)"
+msgstr "Slovakisk (utökat omvänt snedstreck)"
#: ../rules/base.xml.in.h:719
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
+msgid "Slovak (qwerty)"
+msgstr "Slovakisk (qwerty)"
#: ../rules/base.xml.in.h:720
-msgid "Swahili (Kenya)"
-msgstr "Swahilisk (Kenya)"
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "Slovakisk (qwerty, utökat omvänt snedstreck)"
-#: ../rules/base.xml.in.h:721
-msgid "Swahili (Tanzania)"
-msgstr "Swahilisk (Tanzania)"
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
+msgid "Spanish"
+msgstr "Spansk"
#: ../rules/base.xml.in.h:722
-msgid "Swap Ctrl and Caps Lock"
-msgstr "Byt Ctrl och Caps Lock"
+msgid "Spanish (eliminate dead keys)"
+msgstr "Spansk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:723
-msgid "Swap ESC and Caps Lock"
-msgstr "Byt ESC och Caps Lock"
+msgid "Spanish (Winkeys)"
+msgstr "Spansk (Windows-tangenter)"
#: ../rules/base.xml.in.h:724
-msgid "Swedish"
-msgstr "Svensk"
+msgid "Spanish (include dead tilde)"
+msgstr "Spansk (Inkludera dött tilde-tecken)"
#: ../rules/base.xml.in.h:725
-msgid "Swedish (Dvorak)"
-msgstr "Svensk (Dvorak)"
+msgid "Spanish (Sun dead keys)"
+msgstr "Spansk (Sun stumma tangenter)"
#: ../rules/base.xml.in.h:726
-msgid "Swedish (Macintosh)"
-msgstr "Svenska (Macintosh)"
+msgid "Spanish (Dvorak)"
+msgstr "Spansk (Dvorak)"
#: ../rules/base.xml.in.h:727
-msgid "Swedish (Svdvorak)"
-msgstr "Svensk (Svdvorak)"
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturisk (Spanien, med nederpunkts H och nederpunkts L)"
#: ../rules/base.xml.in.h:728
-msgid "Swedish (eliminate dead keys)"
-msgstr "Svensk (eliminera stumma tangenter)"
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Katalansk (Spanien, med mittenpunkts L)"
#: ../rules/base.xml.in.h:729
-msgid "Swedish Sign Language"
-msgstr "Svenskt teckenspråk"
-
-#: ../rules/base.xml.in.h:730
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
+msgid "Spanish (Macintosh)"
+msgstr "Spansk (Macintosh)"
-#: ../rules/base.xml.in.h:731
-msgid "Syriac"
-msgstr "Syrisk"
+#. Keyboard indicator for Swedish layouts
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
+msgid "sv"
+msgstr "sv"
-#: ../rules/base.xml.in.h:732
-msgid "Syriac (phonetic)"
-msgstr "Syrisk (fonetisk)"
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
+msgid "Swedish"
+msgstr "Svensk"
#: ../rules/base.xml.in.h:733
-msgid "Taiwanese"
-msgstr "Taiwanesisk"
+msgid "Swedish (eliminate dead keys)"
+msgstr "Svensk (eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:734
-msgid "Taiwanese (indigenous)"
-msgstr "Taiwanesisk (inhemsk)"
+msgid "Swedish (Dvorak)"
+msgstr "Svensk (Dvorak)"
#: ../rules/base.xml.in.h:735
-msgid "Tajik"
-msgstr "Tadjikisk"
+msgid "Russian (Sweden, phonetic)"
+msgstr "Rysk (Sverige, fonetisk)"
#: ../rules/base.xml.in.h:736
-msgid "Tajik (legacy)"
-msgstr "Tadjikisk (äldre)"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "Rysk (Sverige, fonetisk, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:737
-msgid "Tamil"
-msgstr "Tamilsk"
+msgid "Northern Saami (Sweden)"
+msgstr "Nordsamisk (Sverige)"
#: ../rules/base.xml.in.h:738
-msgid "Tamil (Sri Lanka, TAB Typewriter)"
-msgstr "Tamilsk (Sri Lanka, TAB Typewriter)"
+msgid "Swedish (Macintosh)"
+msgstr "Svenska (Macintosh)"
#: ../rules/base.xml.in.h:739
-msgid "Tamil (Sri Lanka, Unicode)"
-msgstr "Tamilsk (Sri Lanka, Unicode)"
+msgid "Swedish (Svdvorak)"
+msgstr "Svensk (Svdvorak)"
#: ../rules/base.xml.in.h:740
-msgid "Tamil (TAB typewriter)"
-msgstr "Tamilsk (TAB Typewriter)"
+msgid "Swedish Sign Language"
+msgstr "Svenskt teckenspråk"
-#: ../rules/base.xml.in.h:741
-msgid "Tamil (TSCII typewriter)"
-msgstr "Tamilsk (TSCII Typewriter)"
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
+msgid "German (Switzerland)"
+msgstr "Tysk (Schweiz)"
#: ../rules/base.xml.in.h:742
-msgid "Tamil (Unicode)"
-msgstr "Tamilsk (Unicode)"
+msgid "German (Switzerland, legacy)"
+msgstr "Tysk (Schweiz, äldre)"
#: ../rules/base.xml.in.h:743
-msgid "Tamil (keyboard with numerals)"
-msgstr "Tamilsk (tangentbord med siffror)"
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "Tysk (Schweiz, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:744
-msgid "Targa Visionary 811"
-msgstr "Targa Visionary 811"
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "Tysk (Schweiz, Sun stumma tangenter)"
#: ../rules/base.xml.in.h:745
-msgid "Tatar"
-msgstr "Tatar"
+msgid "French (Switzerland)"
+msgstr "Fransk (Schweiz)"
#: ../rules/base.xml.in.h:746
-msgid "Telugu"
-msgstr "Telugo"
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "Fransk (Schweiz, eliminera stumma tangenter)"
#: ../rules/base.xml.in.h:747
-msgid "Thai"
-msgstr "Thailändsk"
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "Fransk (Schweiz, Sun stumma tangenter)"
#: ../rules/base.xml.in.h:748
-msgid "Thai (Pattachote)"
-msgstr "Thailändsk (Pattachote)"
+msgid "French (Switzerland, Macintosh)"
+msgstr "Fransk (Schweiz, Macintosh)"
#: ../rules/base.xml.in.h:749
-msgid "Thai (TIS-820.2538)"
-msgstr "Thailändsk (TIS-820.2538)"
+msgid "German (Switzerland, Macintosh)"
+msgstr "Tysk (Schweiz, Macintosh)"
#: ../rules/base.xml.in.h:750
-msgid "Tibetan"
-msgstr "Tibetanska"
-
-#: ../rules/base.xml.in.h:751
-msgid "Tibetan (with ASCII numerals)"
-msgstr "Tibetanska (med ASCII-taltecken)"
+msgid "Arabic (Syria)"
+msgstr "Arabisk (Syrien)"
+#. Keyboard indicator for Syriac layouts
#: ../rules/base.xml.in.h:752
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "Till motsvarande tangent på ett Dvorak-tangentbord."
+msgid "syc"
+msgstr "syc"
#: ../rules/base.xml.in.h:753
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "Till motsvarande tangent på ett Qwerty-tangentbord."
+msgid "Syriac"
+msgstr "Syrisk"
#: ../rules/base.xml.in.h:754
-msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr "Växla PointerKeys med Skift + NumLock."
+msgid "Syriac (phonetic)"
+msgstr "Syrisk (fonetisk)"
#: ../rules/base.xml.in.h:755
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "Kurdisk (Syrien, latinskt Q)"
#: ../rules/base.xml.in.h:756
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access-tangentbord"
+msgid "Kurdish (Syria, F)"
+msgstr "Kurdisk (Syrien, F)"
#: ../rules/base.xml.in.h:757
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
-
-#: ../rules/base.xml.in.h:758
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "Kurdisk (Syrien, latinskt Alt-Q)"
+#. Keyboard indicator for Tajik layouts
#: ../rules/base.xml.in.h:759
-msgid "Tswana"
-msgstr "Tswana"
+msgid "tg"
+msgstr "tg"
#: ../rules/base.xml.in.h:760
-msgid "Turkish"
-msgstr "Turkisk"
+msgid "Tajik"
+msgstr "Tadjikisk"
#: ../rules/base.xml.in.h:761
-msgid "Turkish (Alt-Q)"
-msgstr "Turkisk (Alt-Q)"
-
-#: ../rules/base.xml.in.h:762
-msgid "Turkish (F)"
-msgstr "Turkisk (F)"
+msgid "Tajik (legacy)"
+msgstr "Tadjikisk (äldre)"
+#. Keyboard indicator for Sinhala layouts
#: ../rules/base.xml.in.h:763
-msgid "Turkish (Sun dead keys)"
-msgstr "Turkisk (Sun stumma tangenter)"
+msgid "si"
+msgstr "si"
#: ../rules/base.xml.in.h:764
-msgid "Turkish (international with dead keys)"
-msgstr "Turkisk (Internationell med stumma tangenter)"
+msgid "Sinhala (phonetic)"
+msgstr "Sinhala (fonetisk)"
#: ../rules/base.xml.in.h:765
-msgid "Turkmen"
-msgstr "Turkmenisk"
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr "Tamilsk (Sri Lanka, Unicode)"
#: ../rules/base.xml.in.h:766
-msgid "Turkmen (Alt-Q)"
-msgstr "Turkmenisk (Alt-Q)"
-
-#: ../rules/base.xml.in.h:767
-msgid "TypeMatrix EZ-Reach 2020"
-msgstr "TypeMatrix EZ-Reach 2020"
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "Tamilsk (Sri Lanka, TAB Typewriter)"
+#. Keyboard indicator for Thai layouts
#: ../rules/base.xml.in.h:768
-msgid "TypeMatrix EZ-Reach 2030 PS2"
-msgstr "TypeMatrix EZ-Reach 2030 PS2"
+msgid "th"
+msgstr "th"
#: ../rules/base.xml.in.h:769
-msgid "TypeMatrix EZ-Reach 2030 USB"
-msgstr "TypeMatrix EZ-Reach 2030 USB"
+msgid "Thai"
+msgstr "Thailändsk"
#: ../rules/base.xml.in.h:770
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU-läge)"
+msgid "Thai (TIS-820.2538)"
+msgstr "Thailändsk (TIS-820.2538)"
#: ../rules/base.xml.in.h:771
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP-läge)"
-
-#: ../rules/base.xml.in.h:772
-msgid "Udmurt"
-msgstr "Udmurt"
+msgid "Thai (Pattachote)"
+msgstr "Thailändsk (Pattachote)"
-#: ../rules/base.xml.in.h:773
-msgid "Ukrainian"
-msgstr "Ukrainsk"
+#. Keyboard indicator for Turkish layouts
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
+msgid "tr"
+msgstr "tr"
-#: ../rules/base.xml.in.h:774
-msgid "Ukrainian (WinKeys)"
-msgstr "Ukrainsk (Windows-tangenter)"
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
+msgid "Turkish"
+msgstr "Turkisk"
#: ../rules/base.xml.in.h:775
-msgid "Ukrainian (homophonic)"
-msgstr "Ukrainsk (homofonisk)"
+msgid "Turkish (F)"
+msgstr "Turkisk (F)"
#: ../rules/base.xml.in.h:776
-msgid "Ukrainian (legacy)"
-msgstr "Ukrainsk (äldre)"
+msgid "Turkish (Alt-Q)"
+msgstr "Turkisk (Alt-Q)"
#: ../rules/base.xml.in.h:777
-msgid "Ukrainian (phonetic)"
-msgstr "Ukrainsk (fonetisk)"
+msgid "Turkish (Sun dead keys)"
+msgstr "Turkisk (Sun stumma tangenter)"
#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU)"
-msgstr "Ukrainsk (Standard RSTU)"
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "Kurdisk (Turkiet, latinskt Q)"
#: ../rules/base.xml.in.h:779
-msgid "Ukrainian (typewriter)"
-msgstr "Ukrainsk (skrivmaskin)"
+msgid "Kurdish (Turkey, F)"
+msgstr "Kurdisk (Turkiet, F)"
#: ../rules/base.xml.in.h:780
-msgid "Unicode additions (arrows and math operators)"
-msgstr "Unicode-tillägg (pilar och matematikoperatorer)"
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "Kurdisk (Turkiet, latinskt Alt-Q)"
#: ../rules/base.xml.in.h:781
-msgid "Unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå"
-
-#: ../rules/base.xml.in.h:782
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
+msgid "Turkish (international with dead keys)"
+msgstr "Turkisk (Internationell med stumma tangenter)"
-#: ../rules/base.xml.in.h:783
-msgid "Urdu (Pakistan)"
-msgstr "Urdu (Pakistan)"
+#. Keyboard indicator for Crimean Tatar layouts
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
+msgid "crh"
+msgstr "crh"
#: ../rules/base.xml.in.h:784
-msgid "Urdu (Pakistan, CRULP)"
-msgstr "Urdu (Pakistan, CRULP)"
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krimtatarisk (Turkiskt Q)"
#: ../rules/base.xml.in.h:785
-msgid "Urdu (Pakistan, NLA)"
-msgstr "Urdu (Pakistan, NLA)"
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krimtatarisk (Turkiskt F)"
#: ../rules/base.xml.in.h:786
-msgid "Urdu (WinKeys)"
-msgstr "Urdu (Windows-tangenter)"
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krimtatarisk (Turkisk Alt-Q)"
#: ../rules/base.xml.in.h:787
-msgid "Urdu (alternative phonetic)"
-msgstr "Urdu (alternativ fonetisk)"
+msgid "Taiwanese"
+msgstr "Taiwanesisk"
#: ../rules/base.xml.in.h:788
-msgid "Urdu (phonetic)"
-msgstr "Urdu (fonetisk)"
-
-#: ../rules/base.xml.in.h:789
-msgid "Use keyboard LED to show alternative layout"
-msgstr "Använd tangentbordslampa för att visa alternativ layout"
+msgid "Taiwanese (indigenous)"
+msgstr "Taiwanesisk (inhemsk)"
+#. Keyboard indicator for Saisiyat layouts
#: ../rules/base.xml.in.h:790
-msgid "Using space key to input non-breakable space character"
-msgstr "Använder blankstegstangenten för att mata in icke-brytande blankstegstecken"
+msgid "xsy"
+msgstr "xsy"
#: ../rules/base.xml.in.h:791
-msgid "Usual space at any level"
-msgstr "Vanligt blanksteg på alla nivåer"
-
-#: ../rules/base.xml.in.h:792
-msgid "Uyghur"
-msgstr "Uyghur"
+msgid "Saisiyat (Taiwan)"
+msgstr "Saisiyat (Taiwan)"
-#: ../rules/base.xml.in.h:793
-msgid "Uzbek"
-msgstr "Uzbekisk"
+#. Keyboard indicator for Ukranian layouts
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
+msgid "uk"
+msgstr "uk"
-#: ../rules/base.xml.in.h:794
-msgid "Uzbek (Afghanistan)"
-msgstr "Uzbekisk (Afganistan)"
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
+msgid "Ukrainian"
+msgstr "Ukrainsk"
#: ../rules/base.xml.in.h:795
-msgid "Uzbek (Afghanistan, OLPC)"
-msgstr "Uzbekisk (Afganistan, OLPC)"
+msgid "Ukrainian (phonetic)"
+msgstr "Ukrainsk (fonetisk)"
#: ../rules/base.xml.in.h:796
-msgid "Uzbek (Latin)"
-msgstr "Uzbekisk (Latin)"
+msgid "Ukrainian (typewriter)"
+msgstr "Ukrainsk (skrivmaskin)"
#: ../rules/base.xml.in.h:797
-msgid "Vietnamese"
-msgstr "Vietnamesisk"
+msgid "Ukrainian (WinKeys)"
+msgstr "Ukrainsk (Windows-tangenter)"
#: ../rules/base.xml.in.h:798
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "ViewSonic KU-306 internettangentbord"
+msgid "Ukrainian (legacy)"
+msgstr "Ukrainsk (äldre)"
#: ../rules/base.xml.in.h:799
-msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
-msgstr "Wang 724 numeriskt tangentbord med Unicode-tillägg (pilar och matematikoperatorer)"
+msgid "Ukrainian (standard RSTU)"
+msgstr "Ukrainsk (Standard RSTU)"
#: ../rules/base.xml.in.h:800
-msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Wang 724 numeriskt tangentbord med Unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå"
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Rysk (Ukraina, standard RSTU)"
#: ../rules/base.xml.in.h:801
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+msgid "Ukrainian (homophonic)"
+msgstr "Ukrainsk (homofonisk)"
-#: ../rules/base.xml.in.h:802
-msgid "Wolof"
-msgstr "Wolofsk"
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
+msgid "English (UK)"
+msgstr "Engelsk (Storbritannien)"
#: ../rules/base.xml.in.h:803
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internettangentbord"
+msgid "English (UK, extended WinKeys)"
+msgstr "Engelsk (Storbritannien, utökade Windows-tangenter)"
#: ../rules/base.xml.in.h:804
-msgid "Yakut"
-msgstr "Yakut"
+msgid "English (UK, international with dead keys)"
+msgstr "Engelsk (Storbritannien, internationell med stumma tangenter)"
#: ../rules/base.xml.in.h:805
-msgid "Yoruba"
-msgstr "Yoruba"
+msgid "English (UK, Dvorak)"
+msgstr "Engelsk (Storbritannien, Dvorak)"
#: ../rules/base.xml.in.h:806
-msgid "Zero-width non-joiner character at second level"
-msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån"
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Engelsk (Storbritannien, Dvorak med brittisk-engelska skiljetecken)"
#: ../rules/base.xml.in.h:807
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
-msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, icke-brytande blankstegstecken på tredje nivån"
+msgid "English (UK, Macintosh)"
+msgstr "Engelsk (Storbritannien, Macintosh)"
#: ../rules/base.xml.in.h:808
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
-msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, icke-brytande blankstegstecken på tredje nivån, ingenting på fjärde nivån"
+msgid "English (UK, Macintosh international)"
+msgstr "Engelsk (Storbritannien, Macintosh internationell)"
#: ../rules/base.xml.in.h:809
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
-msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, icke-brytande blankstegstecken på tredje nivån, tunt icke-brytande blanksteg på fjärde nivån"
+msgid "English (UK, Colemak)"
+msgstr "Engelsk (Storbritannien, Colemak)"
#: ../rules/base.xml.in.h:810
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
-msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, icke-brytande blankstegstecken på tredje nivån, noll-bredd sammanfogande på fjärde nivån"
+msgid "Uzbek"
+msgstr "Uzbekisk"
#: ../rules/base.xml.in.h:811
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
-msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, noll-bredd, sammanfogande tecken på tredje nivån"
-
-#: ../rules/base.xml.in.h:812
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
-msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, noll-bredd, sammanfogande tecken på tredje nivån, icke-brytande blankstegstecken på fjärde nivån"
+msgid "Uzbek (Latin)"
+msgstr "Uzbekisk (Latin)"
+#. Keyboard indicator for Vietnamese layouts
#: ../rules/base.xml.in.h:813
-msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
-msgstr "Noll-bredd, icke-sammanfogande tecken på tredje nivån, noll-bredd, sammanfogande på fjärde nivån"
+msgid "vi"
+msgstr "vi"
-#. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:815
-msgid "ak"
-msgstr "ak"
+#: ../rules/base.xml.in.h:814
+msgid "Vietnamese"
+msgstr "Vietnamesisk"
-#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:817
-msgid "am"
-msgstr "am"
+#. Keyboard indicator for Korean layouts
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
+msgid "ko"
+msgstr "ko"
+
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
+msgid "Korean"
+msgstr "Koreansk"
+
+#: ../rules/base.xml.in.h:818
+msgid "Korean (101/104 key compatible)"
+msgstr "Koreansk (101/104-tangenters kompatibel)"
-#. Keyboard indicator for Arabic layouts
#: ../rules/base.xml.in.h:819
-msgid "ar"
-msgstr "ar"
+msgid "Japanese (PC-98xx Series)"
+msgstr "Japansk (PC-98xx-serien)"
-#. Keyboard indicator for Avatime layouts
+#. Keyboard indicator for Irish layouts
#: ../rules/base.xml.in.h:821
-msgid "avn"
-msgstr "avn"
+msgid "ie"
+msgstr "ie"
+
+#: ../rules/base.xml.in.h:822
+msgid "Irish"
+msgstr "Irländsk"
-#. Keyboard indicator for Azerbaijani layouts
#: ../rules/base.xml.in.h:823
-msgid "az"
-msgstr "az"
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:824
+msgid "Irish (UnicodeExpert)"
+msgstr "Irländsk (UnicodeExpert)"
-#. Keyboard indicator for Belgian layouts
#: ../rules/base.xml.in.h:825
-msgid "be"
-msgstr "be"
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:826
+msgid "Ogham (IS434)"
+msgstr "Ogham (IS434)"
-#. Keyboard indicator for Berber layouts
#: ../rules/base.xml.in.h:827
-msgid "ber"
-msgstr "ber"
+msgid "Urdu (Pakistan)"
+msgstr "Urdu (Pakistan)"
+
+#: ../rules/base.xml.in.h:828
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "Urdu (Pakistan, CRULP)"
-#. Keyboard indicator for Bulgarian layouts
#: ../rules/base.xml.in.h:829
-msgid "bg"
-msgstr "bg"
+msgid "Urdu (Pakistan, NLA)"
+msgstr "Urdu (Pakistan, NLA)"
-#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:831
-msgid "bm"
-msgstr "bm"
+#: ../rules/base.xml.in.h:830
+msgid "Arabic (Pakistan)"
+msgstr "Arabisk (Pakistan)"
+
+#. Keyboard indicator for Sindhi layouts
+#: ../rules/base.xml.in.h:832
+msgid "sd"
+msgstr "sd"
-#. Keyboard indicator for Bengali layouts
#: ../rules/base.xml.in.h:833
-msgid "bn"
-msgstr "bn"
+msgid "Sindhi"
+msgstr "Sindhi"
-#. Keyboard indicator for Braille layouts
+#. Keyboard indicator for Dhivehi layouts
#: ../rules/base.xml.in.h:835
-msgid "brl"
-msgstr "brl"
+msgid "dv"
+msgstr "dv"
+
+#: ../rules/base.xml.in.h:836
+msgid "Dhivehi"
+msgstr "Dhivehi"
-#. Keyboard indicator for Bosnian layouts
#: ../rules/base.xml.in.h:837
-msgid "bs"
-msgstr "bs"
+msgid "English (South Africa)"
+msgstr "Engelsk (Sydafrika)"
-#. Keyboard indicator for Belarusian layouts
+#. Keyboard indicator for Esperanto layouts
#: ../rules/base.xml.in.h:839
-msgid "by"
-msgstr "by"
+msgid "eo"
+msgstr "eo"
+
+#: ../rules/base.xml.in.h:840
+msgid "Esperanto"
+msgstr "Esperanto"
-#. Keyboard indicator for Catalan layouts
#: ../rules/base.xml.in.h:841
-msgid "ca"
-msgstr "ca"
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "Esperanto (flyttat semikolon och citattecken, föråldrat)"
-#. Keyboard indicator for Cherokee layouts
+#. Keyboard indicator for Nepali layouts
#: ../rules/base.xml.in.h:843
-msgid "chr"
-msgstr "chr"
+msgid "ne"
+msgstr "ne"
+
+#: ../rules/base.xml.in.h:844
+msgid "Nepali"
+msgstr "Nepalesisk"
-#. Keyboard indicator for Cameroon layouts
#: ../rules/base.xml.in.h:845
-msgid "cm"
-msgstr "cm"
+msgid "English (Nigeria)"
+msgstr "Engelsk (Nigeria)"
-#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:847 ../rules/base.extras.xml.in.h:38
-msgid "crh"
-msgstr "crh"
+#. Keyboard indicator for Igbo layouts
+#: ../rules/base.xml.in.h:847
+msgid "ig"
+msgstr "ig"
-#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:849
-msgid "cs"
-msgstr "cs"
+#: ../rules/base.xml.in.h:848
+msgid "Igbo"
+msgstr "Igbo"
+
+#. Keyboard indicator for Yoruba layouts
+#: ../rules/base.xml.in.h:850
+msgid "yo"
+msgstr "yo"
-#. Keyboard indicator for Danish layouts
#: ../rules/base.xml.in.h:851
-msgid "da"
-msgstr "da"
+msgid "Yoruba"
+msgstr "Yoruba"
-#. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:853 ../rules/base.extras.xml.in.h:39
-msgid "de"
-msgstr "de"
+#. Keyboard indicator for Amharic layouts
+#: ../rules/base.xml.in.h:853
+msgid "am"
+msgstr "am"
-#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:855
-msgid "dv"
-msgstr "dv"
+#: ../rules/base.xml.in.h:854
+msgid "Amharic"
+msgstr "Amharisk"
+
+#. Keyboard indicator for Wolof layouts
+#: ../rules/base.xml.in.h:856
+msgid "wo"
+msgstr "wo"
-#. Keyboard indicator for Dzongkha layouts
#: ../rules/base.xml.in.h:857
-msgid "dz"
-msgstr "dz"
+msgid "Wolof"
+msgstr "Wolofsk"
-#. Keyboard indicator for Ewe layouts
+#. Keyboard indicator for Braille layouts
#: ../rules/base.xml.in.h:859
-msgid "ee"
-msgstr "ee"
+msgid "brl"
+msgstr "brl"
-#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:861 ../rules/base.extras.xml.in.h:40
-msgid "en"
-msgstr "en"
+#: ../rules/base.xml.in.h:860
+msgid "Braille"
+msgstr "Punktskrift"
-#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:863
-msgid "eo"
-msgstr "eo"
+#: ../rules/base.xml.in.h:861
+msgid "Braille (left hand)"
+msgstr "Punktskrift (vänster hand)"
+
+#: ../rules/base.xml.in.h:862
+msgid "Braille (right hand)"
+msgstr "Punktskrift (höger hand)"
+
+#. Keyboard indicator for Turkmen layouts
+#: ../rules/base.xml.in.h:864
+msgid "tk"
+msgstr "tk"
-#. Keyboard indicator for Spanish layouts
#: ../rules/base.xml.in.h:865
-msgid "es"
-msgstr "es"
+msgid "Turkmen"
+msgstr "Turkmenisk"
-#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:867
-msgid "et"
-msgstr "et"
+#: ../rules/base.xml.in.h:866
+msgid "Turkmen (Alt-Q)"
+msgstr "Turkmenisk (Alt-Q)"
-#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:41
-msgid "fa"
-msgstr "fa"
+#. Keyboard indicator for Bambara layouts
+#: ../rules/base.xml.in.h:868
+msgid "bm"
+msgstr "bm"
+
+#: ../rules/base.xml.in.h:869
+msgid "Bambara"
+msgstr "Bambara"
+
+#: ../rules/base.xml.in.h:870
+msgid "French (Mali, alternative)"
+msgstr "Fransk (Mali, alternativ)"
-#. Keyboard indicator for Fula layouts
#: ../rules/base.xml.in.h:871
-msgid "ff"
-msgstr "ff"
+msgid "English (Mali, US Macintosh)"
+msgstr "Engelsk (Mali, USA Macintosh)"
-#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:873
-msgid "fi"
-msgstr "fi"
+#: ../rules/base.xml.in.h:872
+msgid "English (Mali, US international)"
+msgstr "Engelsk (Mali, USA internationell)"
+
+#. Keyboard indicator for Swahili layouts
+#: ../rules/base.xml.in.h:874
+msgid "sw"
+msgstr "sw"
-#. Keyboard indicator for Faroese layouts
#: ../rules/base.xml.in.h:875
-msgid "fo"
-msgstr "fo"
+msgid "Swahili (Tanzania)"
+msgstr "Swahilisk (Tanzania)"
-#. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:877 ../rules/base.extras.xml.in.h:42
-msgid "fr"
-msgstr "fr"
+#: ../rules/base.xml.in.h:876
+msgid "Swahili (Kenya)"
+msgstr "Swahilisk (Kenya)"
-#. Keyboard indicator for Ga layouts
+#: ../rules/base.xml.in.h:877
+msgid "Kikuyu"
+msgstr "Kikuyu"
+
+#. Keyboard indicator for Tswana layouts
#: ../rules/base.xml.in.h:879
-msgid "gaa"
-msgstr "gaa"
+msgid "tn"
+msgstr "tn"
-#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:881
-msgid "gr"
-msgstr "gr"
+#: ../rules/base.xml.in.h:880
+msgid "Tswana"
+msgstr "Tswana"
+
+#. Keyboard indicator for Filipino layouts
+#: ../rules/base.xml.in.h:882
+msgid "ph"
+msgstr "ph"
-#. Keyboard indicator for Gujarati layouts
#: ../rules/base.xml.in.h:883
-msgid "gu"
-msgstr "gu"
+msgid "Filipino"
+msgstr "Filipino"
+
+#: ../rules/base.xml.in.h:884
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "Filipino (QWERTY Baybayin)"
-#. Keyboard indicator for Hausa layouts
#: ../rules/base.xml.in.h:885
-msgid "ha"
-msgstr "ha"
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "Filipino (Capewell-Dvorak Latin)"
+
+#: ../rules/base.xml.in.h:886
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "Filipino (Capewell-Dvorak Baybayin)"
-#. Keyboard indicator for Hebrew layouts
#: ../rules/base.xml.in.h:887
-msgid "he"
-msgstr "he"
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "Filipino (Capewell-QWERF 2006 Latin)"
+
+#: ../rules/base.xml.in.h:888
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "Filipino (Capewell-QWERF 2006 Baybayin)"
-#. Keyboard indicator for Hindi layouts
#: ../rules/base.xml.in.h:889
-msgid "hi"
-msgstr "hi"
+msgid "Filipino (Colemak Latin)"
+msgstr "Filipino (Colemak Latin)"
+
+#: ../rules/base.xml.in.h:890
+msgid "Filipino (Colemak Baybayin)"
+msgstr "Filipino (Colemak Baybayin)"
-#. Keyboard indicator for Croatian layouts
#: ../rules/base.xml.in.h:891
-msgid "hr"
-msgstr "hr"
+msgid "Filipino (Dvorak Latin)"
+msgstr "Filipino (Dvorak Latin)"
+
+#: ../rules/base.xml.in.h:892
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filipino (Dvorak Baybayin)"
-#. Keyboard indicator for Hungarian layouts
#: ../rules/base.xml.in.h:893
-msgid "hu"
-msgstr "hu"
+msgid "md"
+msgstr "md"
-#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:43
-msgid "hy"
-msgstr "hy"
+#: ../rules/base.xml.in.h:894
+msgid "Moldavian"
+msgstr "Moldavisk"
+
+#: ../rules/base.xml.in.h:895
+msgid "gag"
+msgstr "gag"
+
+#: ../rules/base.xml.in.h:896
+msgid "Moldavian (Gagauz)"
+msgstr "Moldavisk (Gagauz)"
-#. Keyboard indicator for Irish layouts
#: ../rules/base.xml.in.h:897
-msgid "ie"
-msgstr "ie"
+msgid "Switching to another layout"
+msgstr "Byta till en annan layout"
+
+#: ../rules/base.xml.in.h:898
+msgid "Right Alt (while pressed)"
+msgstr "Höger Alt-tangent (då den trycks ned)"
-#. Keyboard indicator for Igbo layouts
#: ../rules/base.xml.in.h:899
-msgid "ig"
-msgstr "ig"
+msgid "Left Alt (while pressed)"
+msgstr "Vänster Alt (då den trycks ned)"
+
+#: ../rules/base.xml.in.h:900
+msgid "Left Win (while pressed)"
+msgstr "Vänster Win-tangent (då den trycks ned)"
-#. Keyboard indicator for Inuktikut layouts
#: ../rules/base.xml.in.h:901
-msgid "ike"
-msgstr "ike"
+msgid "Right Win (while pressed)"
+msgstr "Höger Win-tangent (då den trycks ned)"
+
+#: ../rules/base.xml.in.h:902
+msgid "Any Win key (while pressed)"
+msgstr "Valfri Win-tangent (då den trycks ned)"
-#. Keyboard indicator for Indian layouts
#: ../rules/base.xml.in.h:903
-msgid "in"
-msgstr "in"
+msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
+msgstr "Caps Lock (när den trycks ned), Alt+Caps Lock gör ursprunglig capslock-åtgärd"
+
+#: ../rules/base.xml.in.h:904
+msgid "Right Ctrl (while pressed)"
+msgstr "Höger Ctrl-tangent (då den trycks ned)"
-#. Keyboard indicator for Icelandic layouts
#: ../rules/base.xml.in.h:905
-msgid "is"
-msgstr "is"
+msgid "Right Alt"
+msgstr "Höger Alt"
+
+#: ../rules/base.xml.in.h:906
+msgid "Left Alt"
+msgstr "Vänster alt"
-#. Keyboard indicator for Italian layouts
#: ../rules/base.xml.in.h:907
-msgid "it"
-msgstr "it"
+msgid "Caps Lock"
+msgstr "Caps Lock"
+
+#: ../rules/base.xml.in.h:908
+msgid "Shift+Caps Lock"
+msgstr "Skift+Caps Lock"
-#. Keyboard indicator for Japanese layouts
#: ../rules/base.xml.in.h:909
-msgid "ja"
-msgstr "ja"
+msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
+msgstr "Caps Lock (till första layouten), Skift+Caps Lock (till sista layouten)"
+
+#: ../rules/base.xml.in.h:910
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Vänster Win (till första layouten), Höger Win/Meny (till sista layouten)"
-#. Keyboard indicator for Georgian layouts
#: ../rules/base.xml.in.h:911
-msgid "ka"
-msgstr "ka"
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Vänster Ctrl (till första layouten), Höger Ctrl (till sista layouten)"
+
+#: ../rules/base.xml.in.h:912
+msgid "Alt+Caps Lock"
+msgstr "Alt+Caps Lock"
-#. Keyboard indicator for Kikuyu layouts
#: ../rules/base.xml.in.h:913
-msgid "ki"
-msgstr "ki"
+msgid "Both Shift keys together"
+msgstr "Båda Skift-tangenterna tillsammans"
+
+#: ../rules/base.xml.in.h:914
+msgid "Both Alt keys together"
+msgstr "Båda Alt-tangenterna tillsammans"
-#. Keyboard indicator for Kazakh layouts
#: ../rules/base.xml.in.h:915
-msgid "kk"
-msgstr "kk"
+msgid "Both Ctrl keys together"
+msgstr "Båda Ctrl-tangenterna tillsammans"
+
+#: ../rules/base.xml.in.h:916
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Skift"
-#. Keyboard indicator for Khmer layouts
#: ../rules/base.xml.in.h:917
-msgid "km"
-msgstr "km"
+msgid "Left Ctrl+Left Shift"
+msgstr "Vänster ctrl+vänster skift"
+
+#: ../rules/base.xml.in.h:918
+msgid "Right Ctrl+Right Shift"
+msgstr "Höger Ctrl + höger Skift"
-#. Keyboard indicator for Kannada layouts
#: ../rules/base.xml.in.h:919
-msgid "kn"
-msgstr "kn"
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../rules/base.xml.in.h:920
+msgid "Alt+Shift"
+msgstr "Alt+Skift"
-#. Keyboard indicator for Korean layouts
#: ../rules/base.xml.in.h:921
-msgid "ko"
-msgstr "ko"
+msgid "Left Alt+Left Shift"
+msgstr "Vänster Alt+Vänster Skift"
+
+#: ../rules/base.xml.in.h:922
+msgid "Alt+Space"
+msgstr "Alt+Blanksteg"
-#. Keyboard indicator for Kurdish layouts
#: ../rules/base.xml.in.h:923
-msgid "ku"
-msgstr "ku"
+msgid "Menu"
+msgstr "Meny"
+
+#: ../rules/base.xml.in.h:924
+msgid "Left Win"
+msgstr "Vänster Win-tangent"
-#. Keyboard indicator for Lao layouts
#: ../rules/base.xml.in.h:925
-msgid "lo"
-msgstr "lo"
+msgid "Win Key+Space"
+msgstr "Win-tangent+Blanksteg"
-#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:927 ../rules/base.extras.xml.in.h:45
-msgid "lt"
-msgstr "lt"
+#: ../rules/base.xml.in.h:926
+msgid "Right Win"
+msgstr "Höger Win-tangent"
-#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:929 ../rules/base.extras.xml.in.h:46
-msgid "lv"
-msgstr "lv"
+#: ../rules/base.xml.in.h:927
+msgid "Left Shift"
+msgstr "Vänster skift"
+
+#: ../rules/base.xml.in.h:928
+msgid "Right Shift"
+msgstr "Höger skift"
+
+#: ../rules/base.xml.in.h:929
+msgid "Left Ctrl"
+msgstr "Vänster Ctrl"
+
+#: ../rules/base.xml.in.h:930
+msgid "Right Ctrl"
+msgstr "Höger Ctrl"
-#. Keyboard indicator for Maori layouts
#: ../rules/base.xml.in.h:931
-msgid "mi"
-msgstr "mi"
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#: ../rules/base.xml.in.h:932
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgstr "Vänster Ctrl+ Vänster Win (till första layouten), Höger Ctrl+Meny (till andra layouten)"
-#. Keyboard indicator for Macedonian layouts
#: ../rules/base.xml.in.h:933
-msgid "mk"
-msgstr "mk"
+msgid "Key to choose 3rd level"
+msgstr "Tangent för att välja tredje nivån"
+
+#: ../rules/base.xml.in.h:934
+msgid "Any Win key"
+msgstr "Valfri Win-tangent"
-#. Keyboard indicator for Malayalam layouts
#: ../rules/base.xml.in.h:935
-msgid "ml"
-msgstr "ml"
+msgid "Any Alt key"
+msgstr "Valfri Alt-tangent"
+
+#: ../rules/base.xml.in.h:936
+msgid "Right Alt, Shift+Right Alt key is Compose"
+msgstr "Höger Alt-tangent, Skift+höger Alt-tangent är Compose"
-#. Keyboard indicator for Mongolian layouts
#: ../rules/base.xml.in.h:937
-msgid "mn"
-msgstr "mn"
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Höger Alt-tangent väljer aldrig tredje nivån"
+
+#: ../rules/base.xml.in.h:938
+msgid "Enter on keypad"
+msgstr "Enter på numeriskt tangentbord"
-#. Keyboard indicator for Maltese layouts
#: ../rules/base.xml.in.h:939
-msgid "mt"
-msgstr "mt"
+msgid "Backslash"
+msgstr "Omvänt snedstreck"
+
+#: ../rules/base.xml.in.h:940
+msgid "&lt;Less/Greater&gt;"
+msgstr "&lt;Mindre än/Större än&gt;"
-#. Keyboard indicator for Burmese layouts
#: ../rules/base.xml.in.h:941
-msgid "my"
-msgstr "my"
+msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "Caps Lock väljer tredje nivån, låses när nedtryckt tillsammans med en annan tredjenivåväljare"
+
+#: ../rules/base.xml.in.h:942
+msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "Omvänt snedstreck väljer tredje nivån, låses när nedtryckt tillsammans med en annan tredjenivåväljare"
-#. Keyboard indicator for Nepali layouts
#: ../rules/base.xml.in.h:943
-msgid "ne"
-msgstr "ne"
+msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "&lt;Mindre än/Större än&gt; väljer tredje nivån, låses när nedtryckt tillsammans med annan tredjenivåväljare"
+
+#: ../rules/base.xml.in.h:944
+msgid "Ctrl key position"
+msgstr "Position för Ctrl-tangenten"
-#. Keyboard indicator for Dutch layouts
#: ../rules/base.xml.in.h:945
-msgid "nl"
-msgstr "nl"
+msgid "Caps Lock as Ctrl"
+msgstr "Caps Lock som Ctrl"
+
+#: ../rules/base.xml.in.h:946
+msgid "Left Ctrl as Meta"
+msgstr "Vänster Ctrl som Meta"
-#. Keyboard indicator for Norwegian layouts
#: ../rules/base.xml.in.h:947
-msgid "no"
-msgstr "no"
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Byt Ctrl och Caps Lock"
+
+#: ../rules/base.xml.in.h:948
+msgid "At left of 'A'"
+msgstr "Till vänster om \"A\""
-#. Keyboard indicator for Oriya layouts
#: ../rules/base.xml.in.h:949
-msgid "or"
-msgstr "or"
+msgid "At bottom left"
+msgstr "Nere till vänster"
+
+#: ../rules/base.xml.in.h:950
+msgid "Right Ctrl as Right Alt"
+msgstr "Höger Ctrl-tangent fungerar som höger Alt"
-#. Keyboard indicator for Punjabi layouts
#: ../rules/base.xml.in.h:951
-msgid "pa"
-msgstr "pa"
+msgid "Menu as Right Ctrl"
+msgstr "Meny som Höger Ctrl"
+
+#: ../rules/base.xml.in.h:952
+msgid "Right Alt as Right Ctrl"
+msgstr "Höger Alt som Höger Ctrl"
-#. Keyboard indicator for Filipino layouts
#: ../rules/base.xml.in.h:953
-msgid "ph"
-msgstr "ph"
+msgid "Swap Left Alt key with Left Ctrl key"
+msgstr "Byt vänster Alt-tangent med vänster Ctrl-tangent"
-#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:955 ../rules/base.extras.xml.in.h:47
-msgid "pl"
-msgstr "pl"
+#: ../rules/base.xml.in.h:954
+msgid "Swap Left Win key with Left Ctrl key"
+msgstr "Byt vänster Win-tangent med vänster Ctrl-tangent"
+
+#: ../rules/base.xml.in.h:955
+msgid "Swap Right Win key with Right Ctrl key"
+msgstr "Byt höger Win-tangent med höger Ctrl-tangent"
+
+#: ../rules/base.xml.in.h:956
+msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
+msgstr "Vänster Alt som Ctrl, vänster Ctrl som Win, vänster Win som Alt"
-#. Keyboard indicator for Pashto layouts
#: ../rules/base.xml.in.h:957
-msgid "ps"
-msgstr "ps"
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Använd tangentbordslampa för att visa alternativ layout"
+
+#: ../rules/base.xml.in.h:958
+msgid "Num Lock"
+msgstr "Num Lock"
-#. Keyboard indicator for Portuguese layouts
#: ../rules/base.xml.in.h:959
-msgid "pt"
-msgstr "pt"
+msgid "Layout of numeric keypad"
+msgstr "Layout för numeriskt tangentbord"
-#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:961 ../rules/base.extras.xml.in.h:48
-msgid "ro"
-msgstr "ro"
+#: ../rules/base.xml.in.h:960
+msgid "Legacy"
+msgstr "Äldre"
-#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:963 ../rules/base.extras.xml.in.h:49
-msgid "ru"
-msgstr "ru"
+#: ../rules/base.xml.in.h:961
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unicode-tillägg (pilar och matematikoperatorer)"
+
+#: ../rules/base.xml.in.h:962
+msgid "Unicode additions (arrows and math operators; math operators on default level)"
+msgstr "Unicode-tillägg (pilar och matematikoperatorer; matematikoperatorer på standardnivå)"
+
+#: ../rules/base.xml.in.h:963
+msgid "Legacy Wang 724"
+msgstr "Gammalt Wang 724"
+
+#: ../rules/base.xml.in.h:964
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr "Wang 724 numeriskt tangentbord med Unicode-tillägg (pilar och matematikoperatorer)"
-#. Keyboard indicator for Sindhi layouts
#: ../rules/base.xml.in.h:965
-msgid "sd"
-msgstr "sd"
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
+msgstr "Wang 724 numeriskt tangentbord med Unicode-tillägg (pilar och matematikoperatorer; matematikoperatorer på standardnivå)"
+
+#: ../rules/base.xml.in.h:966
+msgid "Hexadecimal"
+msgstr "Hexadecimal"
-#. Keyboard indicator for Sinhala layouts
#: ../rules/base.xml.in.h:967
-msgid "si"
-msgstr "si"
+msgid "ATM/phone-style"
+msgstr "Knappsats/telefonliknande"
+
+# KONTROLLERA DENNA
+#: ../rules/base.xml.in.h:968
+msgid "Numeric keypad delete key behaviour"
+msgstr "Beteende för Delete-tangent på numeriskt tangentbord"
-#. Keyboard indicator for Slovak layouts
#: ../rules/base.xml.in.h:969
-msgid "sk"
-msgstr "sk"
+msgid "Legacy key with dot"
+msgstr "Äldre tangent med punkt"
-#. Keyboard indicator for Slovenian layouts
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
#: ../rules/base.xml.in.h:971
-msgid "sl"
-msgstr "sl"
+msgid "Legacy key with comma"
+msgstr "Äldre tangent med komma"
+
+#: ../rules/base.xml.in.h:972
+msgid "Four-level key with dot"
+msgstr "Fjärdenivåtangent med punkt"
-#. Keyboard indicator for Albanian layouts
#: ../rules/base.xml.in.h:973
-msgid "sq"
-msgstr "sq"
+msgid "Four-level key with dot, Latin-9 only"
+msgstr "Fjärdenivåtangent med punkt, Latin-9-begränsning"
-#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:975 ../rules/base.extras.xml.in.h:51
-msgid "sr"
-msgstr "sr"
+#: ../rules/base.xml.in.h:974
+msgid "Four-level key with comma"
+msgstr "Fjärdenivåtangent med komma"
-#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:977
-msgid "sv"
-msgstr "sv"
+#: ../rules/base.xml.in.h:975
+msgid "Four-level key with momayyez"
+msgstr "Fjärdenivåtangent med momayyez"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:978
+msgid "Four-level key with abstract separators"
+msgstr "Fjärdenivåtangent med abstrakta avgränsare"
-#. Keyboard indicator for Swahili layouts
#: ../rules/base.xml.in.h:979
-msgid "sw"
-msgstr "sw"
+msgid "Semicolon on third level"
+msgstr "Semikolon på tredje nivån"
+
+#: ../rules/base.xml.in.h:980
+msgid "Caps Lock key behavior"
+msgstr "Beteende för Caps Lock-tangenten"
-#. Keyboard indicator for Syriac layouts
#: ../rules/base.xml.in.h:981
-msgid "syc"
-msgstr "syc"
+msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock använder intern skiftlägesstyrning; Skift \"pausar\" Caps Lock"
+
+#: ../rules/base.xml.in.h:982
+msgid "Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock"
+msgstr "Caps Lock använder intern skiftlägesstyrning; Skift påverkar inte Caps Lock"
-#. Keyboard indicator for Tamil layouts
#: ../rules/base.xml.in.h:983
-msgid "ta"
-msgstr "ta"
+msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock fungerar som Skift med låsning; Skift \"pausar\" Caps Lock"
+
+#: ../rules/base.xml.in.h:984
+msgid "Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock"
+msgstr "Caps Lock fungerar som Skift med låsning; Skift påverkar inte Caps Lock"
-#. Keyboard indicator for Telugu layouts
#: ../rules/base.xml.in.h:985
-msgid "te"
-msgstr "te"
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgstr "Caps Lock växlar normalt skiftläge på alfabetiska tecken"
+
+#: ../rules/base.xml.in.h:986
+msgid "Make Caps Lock an additional Num Lock"
+msgstr "Gör Caps Lock till ytterligare en Num Lock-tangent"
-#. Keyboard indicator for Tajik layouts
#: ../rules/base.xml.in.h:987
-msgid "tg"
-msgstr "tg"
+msgid "Swap ESC and Caps Lock"
+msgstr "Byt ESC och Caps Lock"
+
+#: ../rules/base.xml.in.h:988
+msgid "Make Caps Lock an additional ESC"
+msgstr "Gör Caps Lock till ytterligare en ESC-tangent"
-#. Keyboard indicator for Thai layouts
#: ../rules/base.xml.in.h:989
-msgid "th"
-msgstr "th"
+msgid "Make Caps Lock an additional Backspace"
+msgstr "Gör Caps Lock till ytterligare en backstegstangent"
+
+#: ../rules/base.xml.in.h:990
+msgid "Make Caps Lock an additional Super"
+msgstr "Gör Caps Lock till ytterligare en Super-tangent"
-#. Keyboard indicator for Turkmen layouts
#: ../rules/base.xml.in.h:991
-msgid "tk"
-msgstr "tk"
+msgid "Make Caps Lock an additional Hyper"
+msgstr "Gör Caps Lock till ytterligare en Hyper-tangent"
+
+#: ../rules/base.xml.in.h:992
+msgid "Caps Lock toggles ShiftLock (affects all keys)"
+msgstr "Caps Lock växlar Skift (påverkar alla tangenter)"
-#. Keyboard indicator for Tswana layouts
#: ../rules/base.xml.in.h:993
-msgid "tn"
-msgstr "tn"
+msgid "Caps Lock is disabled"
+msgstr "Caps Lock är inaktiverad"
+
+#: ../rules/base.xml.in.h:994
+msgid "Make Caps Lock an additional Ctrl"
+msgstr "Gör Caps Lock till ytterligare en Ctrl-tangent"
-#. Keyboard indicator for Turkish layouts
#: ../rules/base.xml.in.h:995
-msgid "tr"
-msgstr "tr"
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win-tangentbeteende"
+
+#: ../rules/base.xml.in.h:996
+msgid "Add the standard behavior to Menu key"
+msgstr "Lägg till standardbeteendet till Meny-tangenten"
-#. Keyboard indicator for Ukranian layouts
#: ../rules/base.xml.in.h:997
-msgid "uk"
-msgstr "uk"
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt och Meta finns på Alt-tangenterna"
+
+#: ../rules/base.xml.in.h:998
+msgid "Alt is mapped to Win keys (and the usual Alt keys)"
+msgstr "Alt är mappad till Win-tangenterna (och de vanliga Alt-tangenterna)"
-#. Keyboard indicator for Urdu layouts
#: ../rules/base.xml.in.h:999
-msgid "ur"
-msgstr "ur"
+msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Ctrl är mappad till Win-tangenterna (och de vanliga Ctrl-tangenterna)"
+
+#: ../rules/base.xml.in.h:1000
+msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Ctrl är mappad till Alt-tangenterna, Alt-tangenten är mappad till Win-tangenterna"
-#. Keyboard indicator for Uzbek layouts
#: ../rules/base.xml.in.h:1001
-msgid "uz"
-msgstr "uz"
+msgid "Meta is mapped to Win keys"
+msgstr "Meta är mappad till Win-tangenterna"
+
+#: ../rules/base.xml.in.h:1002
+msgid "Meta is mapped to Left Win"
+msgstr "Meta är mappad till vänster Win-tangent"
-#. Keyboard indicator for Vietnamese layouts
#: ../rules/base.xml.in.h:1003
-msgid "vi"
-msgstr "vi"
+msgid "Hyper is mapped to Win keys"
+msgstr "Hyper är mappad till Win-tangenterna"
+
+#: ../rules/base.xml.in.h:1004
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt är mappad till högra Win-tangenten och Super till Meny"
-#. Keyboard indicator for Wolof layouts
#: ../rules/base.xml.in.h:1005
-msgid "wo"
-msgstr "wo"
+msgid "Alt is swapped with Win"
+msgstr "Alt är utbytt med Win-tangent"
+
+#: ../rules/base.xml.in.h:1006
+msgid "Position of Compose key"
+msgstr "Placering av Compose-tangent"
-#. Keyboard indicator for Saisiyat layouts
#: ../rules/base.xml.in.h:1007
-msgid "xsy"
-msgstr "xsy"
+msgid "3rd level of Left Win"
+msgstr "Tredje nivån av vänster Win"
+
+#: ../rules/base.xml.in.h:1008
+msgid "3rd level of Right Win"
+msgstr "Tredje nivån av höger Win"
-#. Keyboard indicator for Yoruba layouts
#: ../rules/base.xml.in.h:1009
-msgid "yo"
-msgstr "yo"
+msgid "3rd level of Menu"
+msgstr "Tredje nivån av Meny"
+
+#: ../rules/base.xml.in.h:1010
+msgid "3rd level of Left Ctrl"
+msgstr "Tredje nivån av vänster Ctrl"
-#. Keyboard indicator for Taiwanese layouts
#: ../rules/base.xml.in.h:1011
-msgid "zh"
-msgstr "zh"
+msgid "3rd level of Right Ctrl"
+msgstr "Tredje nivån av höger Ctrl"
+
+#: ../rules/base.xml.in.h:1012
+msgid "3rd level of Caps Lock"
+msgstr "Tredje nivån av Caps Lock"
+
+#: ../rules/base.xml.in.h:1013
+msgid "3rd level of &lt;Less/Greater&gt;"
+msgstr "Tredje nivån av &lt;Mindre än/Större än&gt;"
+
+#: ../rules/base.xml.in.h:1014
+msgid "Pause"
+msgstr "Pause"
+
+#: ../rules/base.xml.in.h:1015
+msgid "PrtSc"
+msgstr "PrtSc"
+
+#: ../rules/base.xml.in.h:1016
+msgid "Miscellaneous compatibility options"
+msgstr "Diverse kompatibilitetsalternativ"
+
+#: ../rules/base.xml.in.h:1017
+msgid "Default numeric keypad keys"
+msgstr "Standardtangenter för numeriskt tangentbord"
+
+#: ../rules/base.xml.in.h:1018
+msgid "Numeric keypad keys always enter digits (as in Mac OS)"
+msgstr "Tangenter på det numeriska tangentbordet ger alltid siffror (som på Mac OS)"
+
+#: ../rules/base.xml.in.h:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "NumLock på: siffror, Skift växlar till piltangenter, Numlock av: alltid piltangenter (som i MS Windows)"
+
+#: ../rules/base.xml.in.h:1020
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgstr "Skift avbryter inte Num Lock, väljer tredje nivån istället"
+
+#: ../rules/base.xml.in.h:1021
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Specialtangenter (Ctrl+Alt+‹tangent›) hanteras i en server"
+
+#: ../rules/base.xml.in.h:1022
+msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
+msgstr "Apple aluminiumtangentbord: emulera PC-tangenter (Print, Scroll Lock, Pause, Num Lock)"
+
+#: ../rules/base.xml.in.h:1023
+msgid "Shift cancels Caps Lock"
+msgstr "Skift avbryter Caps Lock"
+
+#: ../rules/base.xml.in.h:1024
+msgid "Enable extra typographic characters"
+msgstr "Aktivera extra typografiska tecken"
+
+#: ../rules/base.xml.in.h:1025
+msgid "Both Shift keys together toggle Caps Lock"
+msgstr "Båda Skifttangenterna tillsammans växlar Caps Lock"
+
+#: ../rules/base.xml.in.h:1026
+msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
+msgstr "Båda Skifttangenterna tillsammans aktiverar Caps Lock, en Skifttangent inaktiverar"
+
+#: ../rules/base.xml.in.h:1027
+msgid "Both Shift keys together toggle ShiftLock"
+msgstr "Båda Skifttangenterna tillsammans växlar ShiftLock"
+
+#: ../rules/base.xml.in.h:1028
+msgid "Shift + NumLock toggles PointerKeys"
+msgstr "Skift + NumLock växlar pekartangenter"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
+msgstr "Tillåt avbrott av fångad inmatning med tangentbordsåtgärder (varning: säkerhetsrisk)"
+
+#: ../rules/base.xml.in.h:1030
+msgid "Allow grab and window tree logging"
+msgstr "Tillåt loggning av fångst och fönsterträd"
+
+#: ../rules/base.xml.in.h:1031
+msgid "Adding currency signs to certain keys"
+msgstr "Lägga till valutatecken till vissa tangenter"
+
+#: ../rules/base.xml.in.h:1032
+msgid "Euro on E"
+msgstr "Euro på E"
+
+#: ../rules/base.xml.in.h:1033
+msgid "Euro on 2"
+msgstr "Euro på 2"
+
+#: ../rules/base.xml.in.h:1034
+msgid "Euro on 4"
+msgstr "Euro på 4"
+
+#: ../rules/base.xml.in.h:1035
+msgid "Euro on 5"
+msgstr "Euro på 5"
+
+#: ../rules/base.xml.in.h:1036
+msgid "Rupee on 4"
+msgstr "Rupee på 4"
+
+#: ../rules/base.xml.in.h:1037
+msgid "Key to choose 5th level"
+msgstr "Tangent för att välja femte nivån"
+
+#: ../rules/base.xml.in.h:1038
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "&lt;Mindre än/Större än&gt; väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
+
+#: ../rules/base.xml.in.h:1039
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Höger Alt-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
+
+#: ../rules/base.xml.in.h:1040
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Vänster Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
+
+#: ../rules/base.xml.in.h:1041
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Höger Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
+
+#: ../rules/base.xml.in.h:1042
+msgid "Using space key to input non-breakable space character"
+msgstr "Använda blankstegstangenten för att mata in icke-brytande blankstegstecken"
+
+#: ../rules/base.xml.in.h:1043
+msgid "Usual space at any level"
+msgstr "Vanligt blanksteg på alla nivåer"
+
+#: ../rules/base.xml.in.h:1044
+msgid "Non-breakable space character at second level"
+msgstr "Icke-brytande blankstegstecken på andra nivån"
+
+#: ../rules/base.xml.in.h:1045
+msgid "Non-breakable space character at third level"
+msgstr "Icke-brytande blankstegstecken på tredje nivån"
+
+#: ../rules/base.xml.in.h:1046
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Icke-brytande blankstegstecken på tredje nivån, ingenting på fjärde nivån"
+
+#: ../rules/base.xml.in.h:1047
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Icke-brytande blankstegstecken på tredje nivån, tunt icke-brytande blankstegstecken på fjärde nivån"
+
+#: ../rules/base.xml.in.h:1048
+msgid "Non-breakable space character at fourth level"
+msgstr "Icke-brytande blankstegstecken på fjärde nivån"
+
+#: ../rules/base.xml.in.h:1049
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Icke-brytande blankstegstecken på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån"
+
+#: ../rules/base.xml.in.h:1050
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Icke-brytande blankstegstecken på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån (via Ctrl+Skift)"
+
+#: ../rules/base.xml.in.h:1051
+msgid "Zero-width non-joiner character at second level"
+msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån"
+
+#: ../rules/base.xml.in.h:1052
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
+msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, noll-bredd, sammanfogande tecken på tredje nivån"
+
+#: ../rules/base.xml.in.h:1053
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
+msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, noll-bredd, sammanfogande tecken på tredje nivån, icke-brytande blankstegstecken på fjärde nivån"
+
+#: ../rules/base.xml.in.h:1054
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
+msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, icke-brytande blankstegstecken på tredje nivån"
+
+#: ../rules/base.xml.in.h:1055
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
+msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, icke-brytande blankstegstecken på tredje nivån, ingenting på fjärde nivån"
+
+#: ../rules/base.xml.in.h:1056
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
+msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, icke-brytande blankstegstecken på tredje nivån, noll-bredd sammanfogande på fjärde nivån"
+
+#: ../rules/base.xml.in.h:1057
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
+msgstr "Noll-bredd, icke-sammanfogande tecken på andra nivån, icke-brytande blankstegstecken på tredje nivån, tunt icke-brytande blanksteg på fjärde nivån"
+
+#: ../rules/base.xml.in.h:1058
+msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
+msgstr "Noll-bredd, icke-sammanfogande tecken på tredje nivån, noll-bredd, sammanfogande på fjärde nivån"
+
+#: ../rules/base.xml.in.h:1059
+msgid "Japanese keyboard options"
+msgstr "Tangentbordsalternativ för japanska"
+
+#: ../rules/base.xml.in.h:1060
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock-tangent låser"
+
+#: ../rules/base.xml.in.h:1061
+msgid "NICOLA-F style Backspace"
+msgstr "Backsteg i NICOLA-F-stil"
+
+#: ../rules/base.xml.in.h:1062
+msgid "Make Zenkaku Hankaku an additional ESC"
+msgstr "Gör Zenkaku Hankaku till ytterligare en ESC-tangent"
+
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Koreanska Hangul/Hanja-tangenter"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Hårdvarutangenter för Hangul/Hanja"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Höger Alt som Hangul, höger Ctrl som Hanja"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Höger Ctrl som Hangul, höger Alt som Hanja"
+
+#: ../rules/base.xml.in.h:1067
+msgid "Adding Esperanto supersigned letters"
+msgstr "Lägga till bokstäver med övertecken för Esperanto"
+
+#: ../rules/base.xml.in.h:1068
+msgid "To the corresponding key in a Qwerty layout"
+msgstr "Till motsvarande tangent i en Qwerty-layout."
+
+#: ../rules/base.xml.in.h:1069
+msgid "To the corresponding key in a Dvorak layout"
+msgstr "Till motsvarande tangent i en Dvorak-layout."
+
+#: ../rules/base.xml.in.h:1070
+msgid "To the corresponding key in a Colemak layout"
+msgstr "Till motsvarande tangent i en Colemak-layout."
+
+#: ../rules/base.xml.in.h:1071
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Behåll tangentkompatibilitet med gamla tangentkoder för Solaris"
+
+#: ../rules/base.xml.in.h:1072
+msgid "Sun Key compatibility"
+msgstr "Kompatibilitet med Sun-tangenter"
+
+#: ../rules/base.xml.in.h:1073
+msgid "Key sequence to kill the X server"
+msgstr "Tangentsekvens för att döda X-servern"
+
+#: ../rules/base.xml.in.h:1074
+msgid "Ctrl + Alt + Backspace"
+msgstr "Ctrl + Alt + Backsteg"
#: ../rules/base.extras.xml.in.h:1
-msgid "APL Keyboard Symbols"
+msgid "apl"
+msgstr "apl"
+
+#: ../rules/base.extras.xml.in.h:2
+msgid "APL keyboard symbols"
msgstr "APL-tangentbordssymboler"
#: ../rules/base.extras.xml.in.h:3
-msgid "Armenian (OLPC phonetic)"
-msgstr "Armenisk (OLPC-fonetisk)"
+msgid "dlg"
+msgstr "dlg"
#: ../rules/base.extras.xml.in.h:4
-msgid "Atsina"
-msgstr "Atsina"
+msgid "APL keyboard symbols (Dyalog)"
+msgstr "APL-tangentbordssymboler (Dyalog)"
#: ../rules/base.extras.xml.in.h:5
-msgid "Avestan"
-msgstr "Avestan"
+msgid "sax"
+msgstr "sax"
#: ../rules/base.extras.xml.in.h:6
-msgid "Couer D'alene Salish"
-msgstr "Couer D'alene Salish"
+msgid "APL keyboard symbols (sax)"
+msgstr "APL-tangentbordssymboler (sax)"
#: ../rules/base.extras.xml.in.h:7
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Krimtatariska (Dobruja Q)"
+msgid "ufd"
+msgstr "ufd"
+
+#: ../rules/base.extras.xml.in.h:8
+msgid "APL keyboard symbols (unified)"
+msgstr "APL-tangentbordssymboler (enad)"
#: ../rules/base.extras.xml.in.h:9
-msgid "English (US, international AltGr Unicode combining)"
-msgstr "Engelsk (USA, internationell AltGr med kombinerad Unicode)"
+msgid "apl2"
+msgstr "apl2"
#: ../rules/base.extras.xml.in.h:10
-msgid "English (US, international AltGr Unicode combining, alternative)"
-msgstr "Engelsk (USA, internationell AltGr med kombinerad Unicode, alternativ)"
+msgid "APL keyboard symbols (IBM APL2)"
+msgstr "APL-tangentbordssymboler (IBM APL2)"
+
+#: ../rules/base.extras.xml.in.h:11
+msgid "aplII"
+msgstr "aplII"
+
+#: ../rules/base.extras.xml.in.h:12
+msgid "APL keyboard symbols (Manugistics APL*PLUS II)"
+msgstr "APL-tangentbordssymboler (Manugistics APL*PLUS II)"
#: ../rules/base.extras.xml.in.h:13
-msgid "German (US keyboard with German letters)"
-msgstr "Tysk (US-tangentbord med tyska bokstäver)"
+msgid "aplx"
+msgstr "aplx"
#: ../rules/base.extras.xml.in.h:14
-msgid "German (with Hungarian letters and no dead keys)"
-msgstr "Tysk (med ungerska bokstäver och inga stumma tangenter)"
-
-#: ../rules/base.extras.xml.in.h:15
-msgid "Kutenai"
-msgstr "Kutenai"
+msgid "APL keyboard symbols (APLX unified)"
+msgstr "APL-tangentbordssymboler (enad APLX)"
#: ../rules/base.extras.xml.in.h:17
-msgid "Latvian (US Colemak)"
-msgstr "Lettisk (US Colemak)"
+msgid "kut"
+msgstr "kut"
#: ../rules/base.extras.xml.in.h:18
-msgid "Latvian (US Colemak, apostrophe variant)"
-msgstr "Lettisk (US Colemak, apostrof-variant)"
+msgid "Kutenai"
+msgstr "Kutenai"
#: ../rules/base.extras.xml.in.h:19
+msgid "shs"
+msgstr "shs"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.extras.xml.in.h:21
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Flerspråkig (Kanada, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:24
+msgid "German (US keyboard with German letters)"
+msgstr "Tysk (USA-tangentbord med tyska bokstäver)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Tysk (med ungerska bokstäver och inga stumma tangenter)"
+
+#: ../rules/base.extras.xml.in.h:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Polsk (Tyskland, eliminera stumma tangenter)"
+
+#: ../rules/base.extras.xml.in.h:27
+msgid "German (Sun Type 6/7)"
+msgstr "Tysk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:28
+msgid "German (Aus der Neo-Welt)"
+msgstr "Tysk (Aus der Neo-Welt)"
+
+#: ../rules/base.extras.xml.in.h:31
+msgid "Avestan"
+msgstr "Avestan"
+
+#: ../rules/base.extras.xml.in.h:34
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Litauisk (USA Dvorak med litauiska bokstäver)"
+
+#: ../rules/base.extras.xml.in.h:35
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Litauisk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Lettisk (US Dvorak)"
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Lettisk (US Dvorak, Y-variant)"
-#: ../rules/base.extras.xml.in.h:21
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Lettisk (US Dvorak, minus-variant)"
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Lettisk (Dvorak för programmerare)"
-#: ../rules/base.extras.xml.in.h:23
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Lettisk (US Dvorak för programmerare, Y-variant)"
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Lettisk (US Dvorak för programmerare, minus-variant)"
-#: ../rules/base.extras.xml.in.h:26
-msgid "Lithuanian (US Dvorak with Lithuanian letters)"
-msgstr "Litauisk (USA Dvorak med litauiska bokstäver)"
+#: ../rules/base.extras.xml.in.h:44
+msgid "Latvian (US Colemak)"
+msgstr "Lettisk (US Colemak)"
+
+#: ../rules/base.extras.xml.in.h:45
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Lettisk (US Colemak, apostrof-variant)"
+
+#: ../rules/base.extras.xml.in.h:46
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Lettisk (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:29
+#: ../rules/base.extras.xml.in.h:49
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Engelsk (USA, internationell AltGr med kombinerad Unicode)"
+
+#: ../rules/base.extras.xml.in.h:50
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "Engelsk (USA, internationell AltGr med kombinerad Unicode, alternativ)"
+
+#: ../rules/base.extras.xml.in.h:51
+msgid "Atsina"
+msgstr "Atsina"
+
+#: ../rules/base.extras.xml.in.h:52
+msgid "Coeur d'Alene Salish"
+msgstr "Coeur d'Alene Salish"
+
+#: ../rules/base.extras.xml.in.h:53
+msgid "Czech Slovak and German (US)"
+msgstr "Tjeckisk, slovakisk och tysk (USA)"
+
+#: ../rules/base.extras.xml.in.h:54
+msgid "English (US, Sun Type 6/7)"
+msgstr "Engelsk (USA, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:55
+msgid "English (Norman)"
+msgstr "Engelsk (Norman)"
+
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Polsk (internationell med stumma tangenter)"
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:59
+msgid "Polish (Colemak)"
+msgstr "Polsk (Colemak)"
+
+#: ../rules/base.extras.xml.in.h:60
+msgid "Polish (Sun Type 6/7)"
+msgstr "Polsk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:64
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Krimtatariska (Dobruja Q)"
+
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Rumänsk (ergonomisk Touchtype)"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:66
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Rumänsk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:69
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Serbisk (kombinerade accenter istället för stumma tangenter)"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Church Slavonic"
+msgstr "Kyrkoslavisk"
+
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
msgstr "Rysk (med ukrainsk-vitrysk layout)"
-#: ../rules/base.extras.xml.in.h:34
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
+#: ../rules/base.extras.xml.in.h:74
+msgid "Russian (Sun Type 6/7)"
+msgstr "Rysk (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:35
-msgid "Serbian"
-msgstr "Serbisk"
+#: ../rules/base.extras.xml.in.h:77
+msgid "Armenian (OLPC phonetic)"
+msgstr "Armenisk (OLPC-fonetisk)"
-#: ../rules/base.extras.xml.in.h:36
-msgid "Serbian (combining accents instead of dead keys)"
-msgstr "Serbisk (kombinerade accenter istället för stumma tangenter)"
+#: ../rules/base.extras.xml.in.h:80
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "Hebreiska (Biblisk, SIL-fonetisk)"
-#: ../rules/base.extras.xml.in.h:37
-msgid "apl"
-msgstr "apl"
+#: ../rules/base.extras.xml.in.h:83
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Arabisk (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:44
-msgid "kut"
-msgstr "kut"
+#: ../rules/base.extras.xml.in.h:86
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Belgisk (Sun Type 6/7)"
-#: ../rules/base.extras.xml.in.h:50
-msgid "shs"
-msgstr "shs"
+#: ../rules/base.extras.xml.in.h:89
+msgid "Portuguese (Brazil, Sun Type 6/7)"
+msgstr "Portugisisk (Brasilien, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:92
+msgid "Czech (Sun Type 6/7)"
+msgstr "Tjeckisk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:95
+msgid "Danish (Sun Type 6/7)"
+msgstr "Dansk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:98
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Nederländsk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:101
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Estnisk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:104
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Finsk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:106
+msgid "French (Sun Type 6/7)"
+msgstr "Fransk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:109
+msgid "Greek (Sun Type 6/7)"
+msgstr "Grekisk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:112
+msgid "Italian (Sun Type 6/7)"
+msgstr "Italiensk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid "Japanese (Sun Type 6)"
+msgstr "Japansk (Sun Type 6)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Japansk (Sun Type 7 - pc-kompatibel)"
+
+#: ../rules/base.extras.xml.in.h:117
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Japansk (Sun Type 7 - sun-kompatibel)"
+
+#: ../rules/base.extras.xml.in.h:120
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Norsk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:122
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Portugisisk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:125
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Slovakisk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:128
+msgid "Spanish (Sun Type 6/7)"
+msgstr "Spansk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:131
+msgid "Swedish (Dvorak A5)"
+msgstr "Svensk (Dvorak A5)"
+
+#: ../rules/base.extras.xml.in.h:132
+msgid "Swedish (Sun Type 6/7)"
+msgstr "Svensk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:134
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Tysk (Schweiz, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:135
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Fransk (Schweiz, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:138
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Turkisk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:141
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Ukrainsk (Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:143
+msgid "English (UK, Sun Type 6/7)"
+msgstr "Engelsk (Storbritannien, Sun Type 6/7)"
+
+#: ../rules/base.extras.xml.in.h:146
+msgid "Korean (Sun Type 6/7)"
+msgstr "Koreansk (Sun Type 6/7)"
+
+#. Keyboard indicator for European layouts
+#: ../rules/base.extras.xml.in.h:148
+msgid "eu"
+msgstr "eu"
+
+#: ../rules/base.extras.xml.in.h:149
+msgid "EurKEY (US based layout with european letters)"
+msgstr "EurKEY (USA-baserad layout med europeiska bokstäver)"
+
+#: ../rules/base.extras.xml.in.h:152
+msgid "Mmuock"
+msgstr "Mmuock"
+
+#~ msgid "Shift with numeric keypad keys works as in MS Windows"
+#~ msgstr "Skift med tangenterna på numeriska tangentbordet fungerar som i MS Windows"
+
+#~ msgid "Bengali"
+#~ msgstr "Bengalisk"
+
+#~ msgid "Catalan"
+#~ msgstr "Katalansk"
+
+#~ msgid "Compose key position"
+#~ msgstr "Position för Compose-tangenten"
+
+#~ msgid "English (layout toggle on multiply/divide key)"
+#~ msgstr "Engelsk (layoutväxling på multiplicera/dividera-tangent)"
+
+#~ msgid "Key(s) to change layout"
+#~ msgstr "Tangent(er) för att byta layout"
+
+#~ msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
+#~ msgstr "Gör Caps Lock till ytterligare en Control men behåll Caps_Lock-keysym"
+
+#~ msgid "Numeric keypad layout selection"
+#~ msgstr "Layoutval för numeriskt tangentbord"
+
+#~ msgid "Portuguese (Brazil, nativo for Esperanto)"
+#~ msgstr "Portugisisk (Brasilisk, nativo för Esperanto)"
+
+#~ msgid "Serbian (Cyrillic)"
+#~ msgstr "Serbiska (Kyrillisk)"
+
+#~ msgid "Toggle PointerKeys with Shift + NumLock."
+#~ msgstr "Växla PointerKeys med Skift + NumLock."
+
+#~ msgid "ca"
+#~ msgstr "ca"
#~ 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 "‹Mindre än/Större än› väljer femte nivån och aktiverar level5-Lock när nedtryckt tillsammans med en annan femtenivåväljare, ett tryck släpper på låset"
@@ -3891,9 +4399,6 @@ msgstr "shs"
#~ msgid "Danish (Mac)"
#~ msgstr "Dansk (Mac)"
-#~ msgid "English (UK, Mac)"
-#~ msgstr "Engelsk (Storbritannien, Mac)"
-
#~ msgid "Finnish (Mac)"
#~ msgstr "Finsk (Mac)"
@@ -3906,9 +4411,6 @@ msgstr "shs"
#~ msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
#~ msgstr "Tysk (Rumänskt tangentbord med tyska bokstäver, eliminera stumma tangenter)"
-#~ msgid "German (qwerty)"
-#~ msgstr "Tysk (qwerty)"
-
#~ msgid "Irish (Ogham)"
#~ msgstr "Irländsk (Ogham)"
@@ -3921,12 +4423,6 @@ msgstr "shs"
#~ msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
#~ msgstr "Vänster Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare, ett tryck släpper på låset"
-#~ msgid "Make Caps Lock an additional Ctrl"
-#~ msgstr "Gör Caps Lock till ytterligare en Ctrl-tangent"
-
-#~ msgid "Meta on Left Ctrl"
-#~ msgstr "Meta på vänster Ctrl"
-
#~ msgid "Māori"
#~ msgstr "Māori"
@@ -4005,9 +4501,6 @@ msgstr "shs"
#~ msgid "Swiss"
#~ msgstr "Schweizisk"
-#~ msgid "Swiss (legacy)"
-#~ msgstr "Schweizisk (äldre)"
-
#~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
#~ msgstr "Turkisk (Krimtatarisk turkiskt Alt-Q)"
@@ -4113,9 +4606,6 @@ msgstr "shs"
#~ msgid "Aze"
#~ msgstr "Aze"
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesh"
-
#~ msgid "Bel"
#~ msgstr "Bel"
@@ -4194,9 +4684,6 @@ msgstr "shs"
#~ msgid "Denmark"
#~ msgstr "Danmark"
-#~ msgid "Deu"
-#~ msgstr "Deu"
-
#~ msgid "Dvorak"
#~ msgstr "Dvorak"
diff --git a/xorg-server/xkeyboard-config/po/tr.po b/xorg-server/xkeyboard-config/po/tr.po
index 8f68328b8..38b97a2f1 100644
--- a/xorg-server/xkeyboard-config/po/tr.po
+++ b/xorg-server/xkeyboard-config/po/tr.po
@@ -1,2595 +1,4996 @@
# Turkish translations for xkeyboard-config.
# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
#
-# Nilgün Belma Bugüner <nilgun@buguner.name.tr>, 2003, ..., 2007.
+# Nilgün Belma Bugüner <nilgun@buguner.name.tr>, 2003, ..., 2007, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 1.0-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-28 15:21+0100\n"
-"PO-Revision-Date: 2007-07-09 10:09+0300\n"
-"Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
+"Project-Id-Version: xkeyboard-config 2.12.99\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2014-09-18 23:46+0100\n"
+"PO-Revision-Date: 2015-01-10 21:04+0100\n"
+"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../rules/base.xml.in.h:1
-msgid "(F)"
-msgstr "F Klavye"
+msgid "Generic 101-key PC"
+msgstr "Soysal 101 tuşlu PC"
#: ../rules/base.xml.in.h:2
-msgid "(Legacy) Alternative"
-msgstr "(Eski) Diğer"
+msgid "Generic 102-key (Intl) PC"
+msgstr "Soysal 102 tuşlu (Uluslararası) PC"
#: ../rules/base.xml.in.h:3
-msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(Eski) Diğer, Sun ölü tuşlar"
+msgid "Generic 104-key PC"
+msgstr "Soysal 104 tuşlu PC"
#: ../rules/base.xml.in.h:4
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(Eski) Diğer, ölü tuşsuz"
+msgid "Generic 105-key (Intl) PC"
+msgstr "Soysal 105 tuşlu (uluslararası) PC"
#: ../rules/base.xml.in.h:5
-msgid "(Legacy) Dvorak"
-msgstr "(Kadim) Dvorak"
+msgid "Dell 101-key PC"
+msgstr "Dell 101 tuşlu PC"
#: ../rules/base.xml.in.h:6
-msgid "101/104 key Compatible"
-msgstr "101/104 tuş Uyumlu"
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude serisi Dizüstü"
-#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/virgül/Ölü tuşlar"
+#: ../rules/base.xml.in.h:7
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
-#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/virgül/Ölü tuşları normal yapar"
+#: ../rules/base.xml.in.h:8
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
-#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/nokta/Ölü tuşlar"
+#: ../rules/base.xml.in.h:9
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
-#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/nokta/Ölü tuşsuz"
+#: ../rules/base.xml.in.h:10
+msgid "Microsoft Natural"
+msgstr "Microsoft Basit"
-#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/virgül/Ölü tuşlar"
+#: ../rules/base.xml.in.h:11
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
#: ../rules/base.xml.in.h:12
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/virgül/Ölü tuşsuz"
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
-#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/nokta/Ölü tuşlar"
+#: ../rules/base.xml.in.h:13
+msgid "PC-98xx Series"
+msgstr "PC-98xx Serisi"
-#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/nokta/Ölü tuşsuz"
+#: ../rules/base.xml.in.h:14
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
-#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/virgül/Ölü tuşlar"
+#: ../rules/base.xml.in.h:15
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/virgül/Ölü tuşsuz"
+#: ../rules/base.xml.in.h:16
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
-#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/nokta/Ölü tuşlar"
+#: ../rules/base.xml.in.h:17
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
-#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/nokta/Ölü tuşsuz"
+#: ../rules/base.xml.in.h:18
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
-#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/virgül/Ölü tuşlar"
+#: ../rules/base.xml.in.h:19
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
-#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/virgül/Ölü tuşsuz"
+#: ../rules/base.xml.in.h:20
+msgid "Brother Internet Keyboard"
+msgstr "Brother Genel Ağ Klavyesi"
-#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/nokta/Ölü tuşlar"
+#: ../rules/base.xml.in.h:21
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Çokluortam"
-#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/nokta/Ölü tuşsuz"
+#: ../rules/base.xml.in.h:22
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
#: ../rules/base.xml.in.h:23
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
#: ../rules/base.xml.in.h:24
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "BTC 9000"
+msgstr "BTC 9000"
#: ../rules/base.xml.in.h:25
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
#: ../rules/base.xml.in.h:26
-msgid "ACPI Standard"
-msgstr "ACPI Standardı"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
#: ../rules/base.xml.in.h:27
-msgid "AZERTY Tskapo"
-msgstr "AZERTY Tskapo"
+msgid "BTC 5090"
+msgstr "BTC 5090"
#: ../rules/base.xml.in.h:28
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
#: ../rules/base.xml.in.h:29
-msgid "Acer C300"
-msgstr "Acer C300"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Mini Kablosuz İnternet ve Oyun"
#: ../rules/base.xml.in.h:30
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
#: ../rules/base.xml.in.h:31
-msgid "Acer TravelMate 800"
-msgstr "Acer TravelMate 800"
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
#: ../rules/base.xml.in.h:32
-msgid "Add the EuroSign to the 2 key."
-msgstr "2 tuşuna € sembolünü ekler"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (diğer seçenek)"
#: ../rules/base.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "5 tuşuna € sembolünü ekler"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
#: ../rules/base.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "E tuşuna € sembolünü ekler"
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Uzman"
#: ../rules/base.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Menü tuşuna standart işlevini ekler."
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
#: ../rules/base.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
-msgstr "Belli tuşlara € sembolünün eklenmesi"
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Genel Ağ Klavyesi"
#: ../rules/base.xml.in.h:37
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
#: ../rules/base.xml.in.h:38
-msgid "Afg"
-msgstr "Afg"
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
#: ../rules/base.xml.in.h:39
-msgid "Afghanistan"
-msgstr "Afganistan"
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
#: ../rules/base.xml.in.h:40
-msgid "Akan"
-msgstr "Akan"
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Kolay Erişim Klavyesi"
#: ../rules/base.xml.in.h:41
-msgid "Alb"
-msgstr "Arn"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Genel Ağ Klavyesi (7 tuşlu)"
#: ../rules/base.xml.in.h:42
-msgid "Albania"
-msgstr "Arnavutluk"
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Genel Ağ Klavyesi (13 tuşlu)"
#: ../rules/base.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt ve Meta, Alt tuşlarındadır."
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Genel Ağ Klavyesi (18 tuşlu)"
#: ../rules/base.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt, sağdaki Pencere tuşu ile Süper ise Menü tuşu ile eşleştirilir."
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
#: ../rules/base.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+CapsLock yerleşimi değiştirir."
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Dizüstü/defter Compaq (örn. Armada) Dizüstü Klavyesi"
#: ../rules/base.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrlyerleşimi değiştirir."
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Dizüstü/defter Compaq (örn. Presario) Genel Ağ Klavyesi"
#: ../rules/base.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Shift yerleşimi değiştirir."
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Klavyesi"
#: ../rules/base.xml.in.h:48
-msgid "Alt-Q"
-msgstr "Yazılımcı klavyesi (Q)"
+msgid "Dell"
+msgstr "Dell"
#: ../rules/base.xml.in.h:49
-msgid "Alt/Win key behavior"
-msgstr "Alt/Pencere tuşu davranışı"
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
#: ../rules/base.xml.in.h:50
-msgid "Alternative"
-msgstr "Diğer"
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
#: ../rules/base.xml.in.h:51
-msgid "Alternative Eastern"
-msgstr "Diğer Doğu"
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Çokluortam Klavyesi"
#: ../rules/base.xml.in.h:52
-msgid "Alternative Phonetic"
-msgstr "Diğer Fonetik"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dizüstü/defter Dell Inspiron 6xxx/8xxx"
#: ../rules/base.xml.in.h:53
-msgid "Alternative international (former us_intl)"
-msgstr "Uluslararası Q klavle (nam-ı diğer us_intl)"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Dizüstü/defter Precision M series"
#: ../rules/base.xml.in.h:54
-msgid "Alternative, Sun dead keys"
-msgstr "Diğer, Sun ölü tuşlar"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Kablosuz Masaüstü Klavyesi"
#: ../rules/base.xml.in.h:55
-msgid "Alternative, eliminate dead keys"
-msgstr "Diğer, ölü tuşsuz"
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serileri"
#: ../rules/base.xml.in.h:56
-msgid "Alternative, latin-9 only"
-msgstr "Diğer, sadece latin-9"
+msgid "DTK2000"
+msgstr "DTK2000"
#: ../rules/base.xml.in.h:57
-msgid "And"
-msgstr "And"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
#: ../rules/base.xml.in.h:58
-msgid "Andorra"
-msgstr "Andora"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO diz üstü bilgisayarı"
#: ../rules/base.xml.in.h:59
-msgid "Apostrophe (') variant"
-msgstr "Tek tırnaklı (')"
+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 "Apple"
-msgstr "Apple"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
#: ../rules/base.xml.in.h:61
-msgid "Apple Laptop"
-msgstr "Apple Dizüstü"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
#: ../rules/base.xml.in.h:62
-msgid "Ara"
-msgstr "Ara"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
#: ../rules/base.xml.in.h:63
-msgid "Arabic"
-msgstr "Arapça"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
#: ../rules/base.xml.in.h:64
-msgid "Arm"
-msgstr "Erm"
+msgid "Gyration"
+msgstr "Çekimsel"
#: ../rules/base.xml.in.h:65
-msgid "Armenia"
-msgstr "Ermenistan"
+msgid "HTC Dream"
+msgstr "HTC Dream"
#: ../rules/base.xml.in.h:66
-msgid "Aze"
-msgstr "Aze"
+msgid "Kinesis"
+msgstr "Kinesis"
#: ../rules/base.xml.in.h:67
-msgid "Azerbaijan"
-msgstr "Azerbaycan"
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Genel Klavye"
#: ../rules/base.xml.in.h:68
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 wireless Internet Keyboard"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15, G15daemon üzerinden ek tuşlu"
#: ../rules/base.xml.in.h:69
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Genel Ağ Klavyesi"
#: ../rules/base.xml.in.h:70
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Çokluortam"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Çokluortam Klavyesi"
#: ../rules/base.xml.in.h:71
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
#: ../rules/base.xml.in.h:72
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
#: ../rules/base.xml.in.h:73
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
#: ../rules/base.xml.in.h:74
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
#: ../rules/base.xml.in.h:75
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
#: ../rules/base.xml.in.h:76
-msgid "Ban"
-msgstr "Ban"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
#: ../rules/base.xml.in.h:77
-msgid "Bangladesh"
-msgstr "Bangladeş"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
-#: ../rules/base.xml.in.h:78 ../rules/sun.xml.in.h:22
-msgid "Bel"
-msgstr "Bel"
+#: ../rules/base.xml.in.h:78
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
#: ../rules/base.xml.in.h:79
-msgid "Belarus"
-msgstr "Belarus"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
#: ../rules/base.xml.in.h:80
-msgid "Belgium"
-msgstr "Belçika"
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
#: ../rules/base.xml.in.h:81
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Diz Üstü"
#: ../rules/base.xml.in.h:82
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
+msgid "IBM Rapid Access"
+msgstr "IBM Hızlı Erişim"
#: ../rules/base.xml.in.h:83
-msgid "Bengali"
-msgstr "Bengalce"
+msgid "IBM Rapid Access II"
+msgstr "IBM Hızlı Erişim II"
#: ../rules/base.xml.in.h:84
-msgid "Bengali Probhat"
-msgstr "Bengali Probhat"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
#: ../rules/base.xml.in.h:85
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr "Bepo, ergonomik, Dvorak yolu"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
#: ../rules/base.xml.in.h:86
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr "Bepo, ergonomik, Dvorak yolu, sadece latin-9"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
-msgid "Bgr"
-msgstr "Bgr"
+#: ../rules/base.xml.in.h:87
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
#: ../rules/base.xml.in.h:88
-msgid "Bhu"
-msgstr "Bhu"
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
#: ../rules/base.xml.in.h:89
-msgid "Bhutan"
-msgstr "Butan"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Kablosuz Masaüstü LX-300"
#: ../rules/base.xml.in.h:90
-msgid "Biblical Hebrew (Tiro)"
-msgstr "Dini İbranice (Tiro)"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Klavyesi"
#: ../rules/base.xml.in.h:91
-msgid "Bih"
-msgstr "Bih"
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Medya Elit Klavyesi"
#: ../rules/base.xml.in.h:92
-msgid "Blr"
-msgstr "Blr"
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Kablosuz Masaüstü"
#: ../rules/base.xml.in.h:93
-msgid "Bosnia and Herzegovina"
-msgstr "Bosna Hersek"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Kablosuz Masaüstü iTouch"
#: ../rules/base.xml.in.h:94
-msgid "Both Alt keys together change layout."
-msgstr "Alt tuşları birlikte yerleşimi değiştirir."
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Kablosuz Masaüstü Tarayıcı"
#: ../rules/base.xml.in.h:95
-msgid "Both Ctrl keys together change layout."
-msgstr "Ctrl tuşları birlikte yerleşimi değiştirir."
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Kablosuz Masaüstü Optik"
#: ../rules/base.xml.in.h:96
-msgid "Both Shift keys together change layout."
-msgstr "Shift tuşları birlikte yerleşimi değiştirir."
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Kablosuz Masaüstü (diğer seçenek)"
#: ../rules/base.xml.in.h:97
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Pencere tuşları birlikte yerleşimi değiştirir."
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Kablosuz Masaüstü Pro (diğer 2. seçenek)"
#: ../rules/base.xml.in.h:98
-msgid "Bra"
-msgstr "Bra"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Kablosuz Özgür/Masaüstü Tarayıcı"
#: ../rules/base.xml.in.h:99
-msgid "Braille"
-msgstr "Üç noktalı"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Kablosuz Klavyesi (model Y-RB6)"
#: ../rules/base.xml.in.h:100
-msgid "Brazil"
-msgstr "Brezilya"
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Genel Ağ Klavyesi"
#: ../rules/base.xml.in.h:101
-msgid "Brazilian ABNT2"
-msgstr "Brazilya dili ABNT2"
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
#: ../rules/base.xml.in.h:102
-msgid "Brl"
-msgstr "Brl"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Genel Ağ Tarayıcı Klavyesi"
#: ../rules/base.xml.in.h:103
-msgid "Brother Internet Keyboard"
-msgstr "Brother Genel Ağ Klavyesi"
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Kablosuz Masaüstü EX110"
#: ../rules/base.xml.in.h:104
-msgid "Buckwalter"
-msgstr "Bükvalter"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Genel Ağ Tarayıcı Klavyesi SE"
#: ../rules/base.xml.in.h:105
-msgid "Bulgaria"
-msgstr "Bulgaristan"
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Genel Ağ Tarayıcı Klavyesi SE (USB)"
#: ../rules/base.xml.in.h:106
-msgid "Cambodia"
-msgstr "Kamboçya"
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
-#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
-msgid "Can"
-msgstr "Kan"
+#: ../rules/base.xml.in.h:107
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Kablosuz Medya Masaüstü Klavyesi"
#: ../rules/base.xml.in.h:108
-msgid "Canada"
-msgstr "Kanada"
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech Access Klavye"
#: ../rules/base.xml.in.h:109
-msgid "Caps Lock is Compose."
-msgstr "CapsLock tuşu karakter birleşimi yapar."
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Klavyesi"
#: ../rules/base.xml.in.h:110
-msgid "CapsLock LED shows alternative layout."
-msgstr "Caps Lock LED'i diğer yerleşimi gösterir."
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
#: ../rules/base.xml.in.h:111
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu ise Caps Lock tuşunu \"bekletir\"."
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ Erişim Klavyesi"
#: ../rules/base.xml.in.h:112
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu Caps Lock davranışını etkilemez."
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
#: ../rules/base.xml.in.h:113
-msgid "CapsLock just locks the Shift modifier."
-msgstr "Caps Lock sadece kilitlemeli Shift tuşu gibi çalışır."
+msgid "Microsoft Natural Ergonomic Keyboard 4000"
+msgstr "Microsoft Doğal Ergonomik Klavye 4000"
-#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
-msgid "CapsLock key behavior"
-msgstr "CapsLock tuşunun davranışı"
+#: ../rules/base.xml.in.h:114
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Doğal Kablosuz Ergonomik Klavye 7000"
#: ../rules/base.xml.in.h:115
-msgid "CapsLock key changes layout."
-msgstr "Caps Lock tuşu yerleşimi değiştirir"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Genel Ağ Klavyesi"
#: ../rules/base.xml.in.h:116
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "Caps Lock tuşu Shift davranışını ters çevirir; bundan alfabetik olmayan tuşlar da etkilenir."
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Basit Klavye Pro / Microsoft Genel Ağ Klavyesi Pro"
#: ../rules/base.xml.in.h:117
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "Caps Lock tuşu büyük/küçük harf geçişi yapar."
+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 "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock dahili dönüşümü kullanılır, Shift tuşu Caps Lock tuşunu \"bekletir\"."
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Basit Klavye Pro OEM"
#: ../rules/base.xml.in.h:119
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock dahili dönüşümü kullanır. Shift tuşu Caps Lock davranışını etkilemez."
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Klavyesi"
#: ../rules/base.xml.in.h:120
-msgid "Catalan variant with middle-dot L"
-msgstr "Ortası noktalı L'li Katalan yerleşimi"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Genel Ağ Klavyesi Pro, İsveçce"
#: ../rules/base.xml.in.h:121
-msgid "Che"
-msgstr "Che"
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Ofis Klavyesi"
#: ../rules/base.xml.in.h:122
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
#: ../rules/base.xml.in.h:123
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (diğer seçenek)"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Doğal Seçkin Klavye"
#: ../rules/base.xml.in.h:124
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Rahat Eğri Klavye 2000"
#: ../rules/base.xml.in.h:125
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Genel Ağ Klavyesi"
#: ../rules/base.xml.in.h:126
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
#: ../rules/base.xml.in.h:127
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Genel Ağ Klavyesi"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
#: ../rules/base.xml.in.h:128
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
#: ../rules/base.xml.in.h:129
-msgid "Chuvash"
-msgstr "Çuvaş"
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
#: ../rules/base.xml.in.h:130
-msgid "Chuvash Latin"
-msgstr "Çuvaş Latin"
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
#: ../rules/base.xml.in.h:131
-msgid "Classic Dvorak"
-msgstr "Klasik Dvorak"
+msgid "SK-1300"
+msgstr "SK-1300"
#: ../rules/base.xml.in.h:132
-msgid "CloGaelach"
-msgstr "CloGaelach"
+msgid "SK-2500"
+msgstr "SK-2500"
#: ../rules/base.xml.in.h:133
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Kolay Erişim Klavyesi"
+msgid "SK-6200"
+msgstr "SK-6200"
#: ../rules/base.xml.in.h:134
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Genel Ağ Klavyesi (13 tuşlu)"
+msgid "SK-7100"
+msgstr "SK-7100"
#: ../rules/base.xml.in.h:135
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Genel Ağ Klavyesi (18 tuşlu)"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
#: ../rules/base.xml.in.h:136
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Genel Ağ Klavyesi (7 tuşlu)"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomik 2500"
#: ../rules/base.xml.in.h:137
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Klavyesi"
+msgid "SVEN Slim 303"
+msgstr "SVEN İnce 303"
#: ../rules/base.xml.in.h:138
-msgid "Compose key position"
-msgstr "Karakter oluşturma (compose) tuşu konumu"
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
#: ../rules/base.xml.in.h:139
-msgid "Congo, Democratic Republic of the"
-msgstr "Kongo Demokratik Cumhuriyeti"
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
#: ../rules/base.xml.in.h:140
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Ctrl, Win tuşlarına eşlenir."
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Kablosuz Klasik Klavye"
#: ../rules/base.xml.in.h:141
-msgid "Croatia"
-msgstr "Hırvatistan"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Doğrudan Erişimli Klavye"
#: ../rules/base.xml.in.h:142
-msgid "Ctrl key at bottom left"
-msgstr "Sol alttaki Ctrl tuşu"
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
#: ../rules/base.xml.in.h:143
-msgid "Ctrl key at left of 'A'"
-msgstr "'A'nın solundaki Ctrl Tuşu"
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
#: ../rules/base.xml.in.h:144
-msgid "Ctrl key position"
-msgstr "Ctrl tuşunun yeri"
+msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgstr "TypeMatrix EZ-Reach 2030 PS2"
#: ../rules/base.xml.in.h:145
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+Shift tuşları yerleşimi değiştirir."
+msgid "TypeMatrix EZ-Reach 2030 USB"
+msgstr "TypeMatrix EZ-Reach 2030 USB"
#: ../rules/base.xml.in.h:146
-msgid "Cyrillic"
-msgstr "Kril"
+msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU mod)"
-#: ../rules/base.xml.in.h:147 ../rules/sun.xml.in.h:39
-msgid "Cze"
-msgstr "Çek"
+#: ../rules/base.xml.in.h:147
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP mod)"
#: ../rules/base.xml.in.h:148
-msgid "Czechia"
-msgstr "Çek Cumhuriyeti"
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Genel Ağ Klavyesi"
#: ../rules/base.xml.in.h:149
-msgid "DRC"
-msgstr "DRC"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
#: ../rules/base.xml.in.h:150
-msgid "DTK2000"
-msgstr "DTK2000"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Uluslararası)"
-#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:42
-msgid "Dead acute"
-msgstr "Ölü acute (´)"
+#: ../rules/base.xml.in.h:151
+msgid "Macintosh"
+msgstr "Macintosh"
-#: ../rules/base.xml.in.h:152 ../rules/sun.xml.in.h:43
-msgid "Dead grave acute"
-msgstr "Ölü grave acute (`)"
+#: ../rules/base.xml.in.h:152
+msgid "Macintosh Old"
+msgstr "Eski Macintosh"
#: ../rules/base.xml.in.h:153
-msgid "Default numeric keypad keys."
-msgstr "Öntanımlı tuştakımı tuşları."
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Mac için Mutlu Kodlama Klavyesi"
#: ../rules/base.xml.in.h:154
-msgid "Dell"
-msgstr "Dell"
+msgid "Acer C300"
+msgstr "Acer C300"
#: ../rules/base.xml.in.h:155
-msgid "Dell 101-key PC"
-msgstr "Dell 101 tuşlu PC"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
#: ../rules/base.xml.in.h:156
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dizüstü/defter Dell Inspiron 6xxx/8xxx"
+msgid "Acer Laptop"
+msgstr "Acer Dizüstü"
#: ../rules/base.xml.in.h:157
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell Dizüstü/defter Precision M series"
+msgid "Asus Laptop"
+msgstr "Asus Dizüstü"
#: ../rules/base.xml.in.h:158
-msgid "Dell Latitude series laptop"
-msgstr "Dell Latitude serisi Dizüstü"
+msgid "Apple"
+msgstr "Apple"
#: ../rules/base.xml.in.h:159
-msgid "Dell SK-8125 USB Multimedia Keybard"
-msgstr "Dell SK-8125 USB Çokluortam Klavyesi"
+msgid "Apple Laptop"
+msgstr "Apple Dizüstü"
#: ../rules/base.xml.in.h:160
-msgid "Dell SK-8135 USB Multimedia Keybard"
-msgstr "Dell SK-8135 USB Çokluortam Klavyesi"
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Apple Alüminyum Klavye (ANSI)"
#: ../rules/base.xml.in.h:161
-msgid "Dell USB Multimedia Keybard"
-msgstr "Dell USB Çokluortam Klavyesi"
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Apple Alüminyum Klavye (ISO)"
#: ../rules/base.xml.in.h:162
-msgid "Denmark"
-msgstr "Danimarka"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Apple Alüminyum Klavye (JIS)"
-#: ../rules/base.xml.in.h:163 ../rules/sun.xml.in.h:44
-msgid "Deu"
-msgstr "Alm"
+#: ../rules/base.xml.in.h:163
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Çokluortam Kablosuz Klavyesi"
#: ../rules/base.xml.in.h:164
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Kablosuz Masaüstü Klavyesi"
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Dizüstü/defter eMachines m68xx"
#: ../rules/base.xml.in.h:165
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 serileri"
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
-#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:46
-msgid "Dnk"
-msgstr "Dnk"
+#: ../rules/base.xml.in.h:166
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
-#: ../rules/base.xml.in.h:167 ../rules/sun.xml.in.h:48
-msgid "Dvorak"
-msgstr "Dvorak"
+#: ../rules/base.xml.in.h:167
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
#: ../rules/base.xml.in.h:168
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "Dvorak, \"1/!\" tuşunda Lehçe tırnaklar"
+msgid "Happy Hacking Keyboard"
+msgstr "Mutlu Kodlama Klavyesi"
#: ../rules/base.xml.in.h:169
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Dvorak, çift tırnak tuşunda Lehçe tırnaklar"
+msgid "Classmate PC"
+msgstr "Classmate PC"
#: ../rules/base.xml.in.h:170
-msgid "Eastern"
-msgstr "Doğu"
+msgid "OLPC"
+msgstr "OLPC"
-#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:49
-msgid "Eliminate dead keys"
-msgstr "Ölü tuşları normal yapar"
+#: ../rules/base.xml.in.h:171
+msgid "Sun Type 7 USB"
+msgstr "Sun Tür 7 USB"
#: ../rules/base.xml.in.h:172
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "Sun Type 7 USB (European layout)"
+msgstr "Sun Tür 7 USB (Avrupa yerleşimi)"
#: ../rules/base.xml.in.h:173
-msgid "Epo"
-msgstr "Epo"
+msgid "Sun Type 7 USB (Unix layout)"
+msgstr "Sun Tür 7 USB (Unix yerleşimi)"
#: ../rules/base.xml.in.h:174
-msgid "Ergonomic"
-msgstr "Ergonomik"
+msgid "Sun Type 7 USB (Japanese layout) / Japanese 106-key"
+msgstr "Sun Tür 7 USB (Japonca yerleşimi) / Japonca 106-tuş"
-#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:50
-msgid "Esp"
-msgstr "Esp"
+#: ../rules/base.xml.in.h:175
+msgid "Sun Type 6/7 USB"
+msgstr "Sun 6/7 Tipi USB"
#: ../rules/base.xml.in.h:176
-msgid "Esperanto"
-msgstr "Esperanto"
+msgid "Sun Type 6/7 USB (European layout)"
+msgstr "Sun 6/7 Tipi USB (Avrupa yerleşimi)"
#: ../rules/base.xml.in.h:177
-msgid "Est"
-msgstr "Est"
+msgid "Sun Type 6 USB (Unix layout)"
+msgstr "Sun Tür 6 USB (Unix yerleşimi)"
#: ../rules/base.xml.in.h:178
-msgid "Estonia"
-msgstr "Estonya"
+msgid "Sun Type 6 USB (Japanese layout)"
+msgstr "Sun Tür 6 USB (Japonca yerleşimi)"
#: ../rules/base.xml.in.h:179
-msgid "Eth"
-msgstr "Ety"
+msgid "Sun Type 6 (Japanese layout)"
+msgstr "Sun Tür 6 (Japonca yerleşimi)"
#: ../rules/base.xml.in.h:180
-msgid "Ethiopia"
-msgstr "Etyopya"
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
#: ../rules/base.xml.in.h:181
-msgid "Evdev-managed keyboard"
-msgstr "Evdev yönetimli klavye"
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
#: ../rules/base.xml.in.h:182
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "FL90"
+msgstr "FL90"
#: ../rules/base.xml.in.h:183
-msgid "Ewe"
-msgstr "Eve"
+msgid "Creative Desktop Wireless 7000"
+msgstr "Creative Masaüstü Kablosuz 7000"
#: ../rules/base.xml.in.h:184
-msgid "Extended"
-msgstr "Gelişmiş"
-
-#: ../rules/base.xml.in.h:185
-msgid "Extended Backslash"
-msgstr "Gelişmiş Gerisilme"
-
-#: ../rules/base.xml.in.h:186
-msgid "F-letter (F) variant"
-msgstr "F harfli (F) türü"
+msgid "Htc Dream phone"
+msgstr "Htc Dream telefonu"
-#: ../rules/base.xml.in.h:187
-msgid "Fao"
-msgstr "Fao"
+#. Keyboard indicator for English layouts
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+msgid "en"
+msgstr "ing"
-#: ../rules/base.xml.in.h:188
-msgid "Faroe Islands"
-msgstr "Faroe Adaları"
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+msgid "English (US)"
+msgstr "İngilizce (Amerikan)"
-#: ../rules/base.xml.in.h:189 ../rules/sun.xml.in.h:51
-msgid "Fin"
-msgstr "Fin"
+#. Keyboard indicator for Cherokee layouts
+#: ../rules/base.xml.in.h:189
+msgid "chr"
+msgstr "chr"
#: ../rules/base.xml.in.h:190
-msgid "Finland"
-msgstr "Finlandiya"
+msgid "Cherokee"
+msgstr "Cherokee"
#: ../rules/base.xml.in.h:191
-msgid "Force standard legacy keypad"
-msgstr "Standart kadim tuştakımını etkin kılar"
+msgid "English (US, with euro on 5)"
+msgstr "İngilizce (US, avro işareti 5 tuşunda)"
-#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:53
-msgid "Fra"
-msgstr "Fra"
+#: ../rules/base.xml.in.h:192
+msgid "English (US, international with dead keys)"
+msgstr "İngilizce (Amerikan, uluslararası ölü tuşlarla)"
#: ../rules/base.xml.in.h:193
-msgid "France"
-msgstr "Fransa"
+msgid "English (US, alternative international)"
+msgstr "İngilizce (Amerikan, diğer uluslararası)"
-#: ../rules/base.xml.in.h:194 ../rules/sun.xml.in.h:55
-msgid "French"
-msgstr "Fransızca"
+#: ../rules/base.xml.in.h:194
+msgid "English (Colemak)"
+msgstr "İngilizce (Colemak)"
#: ../rules/base.xml.in.h:195
-msgid "French (Macintosh)"
-msgstr "Fransız (Makintoş)"
+msgid "English (Dvorak)"
+msgstr "İngilizce (Dvorak)"
-#: ../rules/base.xml.in.h:196 ../rules/sun.xml.in.h:56
-msgid "French (legacy)"
-msgstr "Fransızca (eski)"
+#: ../rules/base.xml.in.h:196
+msgid "English (Dvorak, international with dead keys)"
+msgstr "İngilizce (Dvorak, uluslararası ölü tuşlarla)"
#: ../rules/base.xml.in.h:197
-msgid "French Dvorak"
-msgstr "Fransızca Dvorak"
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr "İngilizce (Dvorak alternatif uluslararası ölü tuşlarla)"
#: ../rules/base.xml.in.h:198
-msgid "French, Sun dead keys"
-msgstr "Fransızca, Sun ölü tuşlar"
+msgid "English (left handed Dvorak)"
+msgstr "İngilizce (solak Dvorak)"
#: ../rules/base.xml.in.h:199
-msgid "French, eliminate dead keys"
-msgstr "Fransızca, ölü tuşsuz"
+msgid "English (right handed Dvorak)"
+msgstr "İngilizce (sağ elle Dvorak)"
#: ../rules/base.xml.in.h:200
-msgid "Fula"
-msgstr "Fula"
+msgid "English (classic Dvorak)"
+msgstr "İngilizce (klasik Dvorak)"
#: ../rules/base.xml.in.h:201
-msgid "GBr"
-msgstr "GBr"
+msgid "English (programmer Dvorak)"
+msgstr "İngilizce (programcı Dvorak)"
-#: ../rules/base.xml.in.h:202
-msgid "Ga"
-msgstr "Ga"
-
-#: ../rules/base.xml.in.h:203
-msgid "Generic 101-key PC"
-msgstr "Soysal 101 tuşlu PC"
+#. Keyboard indicator for Russian layouts
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+msgid "ru"
+msgstr "ru"
#: ../rules/base.xml.in.h:204
-msgid "Generic 102-key (Intl) PC"
-msgstr "Soysal 102 tuşlu (Uluslararası) PC"
+msgid "Russian (US, phonetic)"
+msgstr "Rusça (Amerikan, fonetik)"
#: ../rules/base.xml.in.h:205
-msgid "Generic 104-key PC"
-msgstr "Soysal 104 tuşlu PC"
+msgid "English (Macintosh)"
+msgstr "İngilizce (Macintosh)"
#: ../rules/base.xml.in.h:206
-msgid "Generic 105-key (Intl) PC"
-msgstr "Soysal 105 tuşlu (uluslararası) PC"
+msgid "English (international AltGr dead keys)"
+msgstr "İngilizce (Uluslararası AltGr ölü tuşlarla)"
#: ../rules/base.xml.in.h:207
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+msgid "English (the divide/multiply keys toggle the layout)"
+msgstr "İngilizce (bölme/çarpma tuşları yerleşimi değiştirir)"
#: ../rules/base.xml.in.h:208
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgid "Serbo-Croatian (US)"
+msgstr "Sırp-Hırvatça (Amerikan)"
#: ../rules/base.xml.in.h:209
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "English (Workman)"
+msgstr "İngilizce (İşçi)"
#: ../rules/base.xml.in.h:210
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
+msgid "English (Workman, international with dead keys)"
+msgstr "İngilizce (İşçi, uluslararası ölü tuşlarla)"
-#: ../rules/base.xml.in.h:211
-msgid "Geo"
-msgstr "Geo"
-
-#: ../rules/base.xml.in.h:212
-msgid "Georgia"
-msgstr "Gürcistan"
+#. Keyboard indicator for Persian layouts
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
+msgid "fa"
+msgstr "fa"
#: ../rules/base.xml.in.h:213
-msgid "German (Macintosh)"
-msgstr "Alman (Makintoş)"
-
-#: ../rules/base.xml.in.h:214
-msgid "German, Sun dead keys"
-msgstr "Almanca, Sun ölü tuşlar"
+msgid "Afghani"
+msgstr "Afganca"
+#. Keyboard indicator for Pashto layouts
#: ../rules/base.xml.in.h:215
-msgid "German, eliminate dead keys"
-msgstr "Almanca, ölü tuşsuz"
+msgid "ps"
+msgstr "ps"
#: ../rules/base.xml.in.h:216
-msgid "Germany"
-msgstr "Almanya"
-
-#: ../rules/base.xml.in.h:217
-msgid "Gha"
-msgstr "Gha"
+msgid "Pashto"
+msgstr "Paşto"
+#. Keyboard indicator for Uzbek layouts
#: ../rules/base.xml.in.h:218
-msgid "Ghana"
-msgstr "Gana"
+msgid "uz"
+msgstr "uz"
#: ../rules/base.xml.in.h:219
-msgid "Gre"
-msgstr "Gre"
+msgid "Uzbek (Afghanistan)"
+msgstr "Özbekçe (Afganistan)"
#: ../rules/base.xml.in.h:220
-msgid "Greece"
-msgstr "Yunanistan"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "Pestuca (Afganistan, OLPC)"
#: ../rules/base.xml.in.h:221
-msgid "Gujarati"
-msgstr "Batı Hint dili"
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "Pestuca (Afganistan, Dari OLPC)"
#: ../rules/base.xml.in.h:222
-msgid "Gurmukhi"
-msgstr "Gurmukhi"
-
-#: ../rules/base.xml.in.h:223
-msgid "Gyration"
-msgstr "Çekimsel"
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "Özbekçe (Afganistan, OLPC)"
-#: ../rules/base.xml.in.h:224
-msgid "Hausa"
-msgstr "Havza"
+#. Keyboard indicator for Arabic layouts
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+msgid "ar"
+msgstr "ar"
-#: ../rules/base.xml.in.h:225
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Genel Ağ Klavyesi"
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+msgid "Arabic"
+msgstr "Arapça"
#: ../rules/base.xml.in.h:226
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+msgid "Arabic (azerty)"
+msgstr "Arapça (azerty)"
#: ../rules/base.xml.in.h:227
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
+msgid "Arabic (azerty/digits)"
+msgstr "Arapça (azerty/rakamlar)"
#: ../rules/base.xml.in.h:228
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "Arabic (digits)"
+msgstr "Arapça (rakamlar)"
#: ../rules/base.xml.in.h:229
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
+msgid "Arabic (qwerty)"
+msgstr "Arapça (qwerty)"
#: ../rules/base.xml.in.h:230
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+msgid "Arabic (qwerty/digits)"
+msgstr "Arapça (qwerty/rakamlar)"
#: ../rules/base.xml.in.h:231
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: ../rules/base.xml.in.h:232
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+msgid "Arabic (Buckwalter)"
+msgstr "Arapça (Buckwalter)"
+#. Keyboard indicator for Albanian layouts
#: ../rules/base.xml.in.h:233
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Çokluortam Klavyesi"
+msgid "sq"
+msgstr "sq"
#: ../rules/base.xml.in.h:234
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Genel Ağ Klavyesi"
+msgid "Albanian"
+msgstr "Arnavutça"
#: ../rules/base.xml.in.h:235
-msgid "Hindi Bolnagri"
-msgstr "Hindi Bolnagri"
-
-#: ../rules/base.xml.in.h:236
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "Albanian (Plisi D1)"
+msgstr "Arnavutça (Plisi D1)"
-#: ../rules/base.xml.in.h:237
-msgid "Hrv"
-msgstr "Hrv"
+#. Keyboard indicator for Armenian layouts
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+msgid "hy"
+msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/sun.xml.in.h:59
-msgid "Hun"
-msgstr "Mcr"
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+msgid "Armenian"
+msgstr "Ermenice"
#: ../rules/base.xml.in.h:239
-msgid "Hungary"
-msgstr "Macaristan"
+msgid "Armenian (phonetic)"
+msgstr "Ermenice (fonetik)"
#: ../rules/base.xml.in.h:240
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper, Pencere tuşlarına eşlenir."
+msgid "Armenian (alternative phonetic)"
+msgstr "Ermenice (alternatif fonetik)"
#: ../rules/base.xml.in.h:241
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
+msgid "Armenian (eastern)"
+msgstr "Ermenice (doğu)"
#: ../rules/base.xml.in.h:242
-msgid "IBM Rapid Access"
-msgstr "IBM Hızlı Erişim"
+msgid "Armenian (western)"
+msgstr "Ermenice (doğu)"
#: ../rules/base.xml.in.h:243
-msgid "IBM Rapid Access II"
-msgstr "IBM Hızlı Erişim II"
+msgid "Armenian (alternative eastern)"
+msgstr "Ermenice (alternatif doğu)"
-#: ../rules/base.xml.in.h:244
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Hızlı Erişim II (diğer seçenek)"
-
-#: ../rules/base.xml.in.h:245
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+#. Keyboard indicator for German layouts
+#: ../rules/base.xml.in.h:245 ../rules/base.extras.xml.in.h:22
+msgid "de"
+msgstr "de"
#: ../rules/base.xml.in.h:246
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgid "German (Austria)"
+msgstr "Almanca (Avusturya)"
-#: ../rules/base.xml.in.h:247 ../rules/sun.xml.in.h:61
-msgid "ISO Alternate"
-msgstr "ISO diğer"
+#: ../rules/base.xml.in.h:247
+msgid "German (Austria, eliminate dead keys)"
+msgstr "Almanca (Avusturya, ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:248
-msgid "Iceland"
-msgstr "İzlanda"
+msgid "German (Austria, Sun dead keys)"
+msgstr "Almanca (Avusturya, Sun ölü tuşlarıyla)"
#: ../rules/base.xml.in.h:249
-msgid "Igbo"
-msgstr "Igbo"
-
-#: ../rules/base.xml.in.h:250
-msgid "Ind"
-msgstr "Ind"
+msgid "German (Austria, Macintosh)"
+msgstr "Almanca (Avusturya, Macintosh)"
+#. Keyboard indicator for Azerbaijani layouts
#: ../rules/base.xml.in.h:251
-msgid "India"
-msgstr "Hindistan"
+msgid "az"
+msgstr "az"
-#: ../rules/base.xml.in.h:252 ../rules/sun.xml.in.h:62
-msgid "International (with dead keys)"
-msgstr "Uluslararası (ölü tuşlarla)"
+#: ../rules/base.xml.in.h:252
+msgid "Azerbaijani"
+msgstr "Azerice"
#: ../rules/base.xml.in.h:253
-msgid "Inuktitut"
-msgstr "Inuktitut"
-
-#: ../rules/base.xml.in.h:254
-msgid "Iran"
-msgstr "İran"
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Azerice (Kiril)"
+#. Keyboard indicator for Belarusian layouts
#: ../rules/base.xml.in.h:255
-msgid "Iraq"
-msgstr "Irak"
+msgid "by"
+msgstr "by"
#: ../rules/base.xml.in.h:256
-msgid "Ireland"
-msgstr "İrlanda"
+msgid "Belarusian"
+msgstr "Belarusça"
#: ../rules/base.xml.in.h:257
-msgid "Irl"
-msgstr "İrl"
+msgid "Belarusian (legacy)"
+msgstr "Belarusça (eski)"
#: ../rules/base.xml.in.h:258
-msgid "Irn"
-msgstr "Irn"
+msgid "Belarusian (Latin)"
+msgstr "Belarusça (Latin)"
-#: ../rules/base.xml.in.h:259
-msgid "Irq"
-msgstr "Irk"
+#. Keyboard indicator for Belgian layouts
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+msgid "be"
+msgstr "be"
-#: ../rules/base.xml.in.h:260
-msgid "Isl"
-msgstr "Izl"
-
-#: ../rules/base.xml.in.h:261
-msgid "Isr"
-msgstr "İbr"
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+msgid "Belgian"
+msgstr "Belçikaca"
#: ../rules/base.xml.in.h:262
-msgid "Israel"
-msgstr "İsrail"
+msgid "Belgian (alternative)"
+msgstr "Belçikaca (alternatif)"
-#: ../rules/base.xml.in.h:263 ../rules/sun.xml.in.h:63
-msgid "Ita"
-msgstr "İta"
+#: ../rules/base.xml.in.h:263
+msgid "Belgian (alternative, Latin-9 only)"
+msgstr "Belçikaca (alternatif, sadece latin-9)"
#: ../rules/base.xml.in.h:264
-msgid "Italy"
-msgstr "İtalya"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "Belçikaca (alternatif, Sun ölü tuşlarıyla)"
#: ../rules/base.xml.in.h:265
-msgid "Japan"
-msgstr "Japonya"
+msgid "Belgian (ISO alternate)"
+msgstr "Belçikaca (alternatif ISO)"
#: ../rules/base.xml.in.h:266
-msgid "Japan (PC-98xx Series)"
-msgstr "Japon (PC-98xx Series)"
+msgid "Belgian (eliminate dead keys)"
+msgstr "Belçikaca (ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:267
-msgid "Japanese 106-key"
-msgstr "Japonca 106 tuşlu"
+msgid "Belgian (Sun dead keys)"
+msgstr "Belçikaca (Sun ölü tuşlarıyla)"
#: ../rules/base.xml.in.h:268
-msgid "Japanese keyboard options"
-msgstr "Japonca klavye seçenekleri"
-
-#: ../rules/base.xml.in.h:269 ../rules/sun.xml.in.h:66
-msgid "Jpn"
-msgstr "Jpn"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "Belçikaca (Wang model 724 azerty)"
+#. Keyboard indicator for Bangla layouts
#: ../rules/base.xml.in.h:270
-msgid "Kana"
-msgstr "Kana"
+msgid "bn"
+msgstr "bn"
#: ../rules/base.xml.in.h:271
-msgid "Kana Lock key is locking"
-msgstr "Kana Lock tuşu kilitler"
+msgid "Bangla"
+msgstr "Bengalce"
#: ../rules/base.xml.in.h:272
-msgid "Kannada"
-msgstr "Güney Hint dili"
-
-#: ../rules/base.xml.in.h:273
-msgid "Kashubian"
-msgstr "Kaşubyalı"
+msgid "Bangla (Probhat)"
+msgstr "Bengalce (Probhat)"
+#. Keyboard indicator for Indian layouts
#: ../rules/base.xml.in.h:274
-msgid "Kaz"
-msgstr "Kaz"
+msgid "in"
+msgstr "in"
#: ../rules/base.xml.in.h:275
-msgid "Kazakh with Russian"
-msgstr "Kazak (rus)"
+msgid "Indian"
+msgstr "Hintçe"
#: ../rules/base.xml.in.h:276
-msgid "Kazakhstan"
-msgstr "Kazakistan"
+msgid "Bangla (India)"
+msgstr "Bengalce (Hindistan)"
#: ../rules/base.xml.in.h:277
-msgid "Keypad"
-msgstr "Tuştakımı"
+msgid "Bangla (India, Probhat)"
+msgstr "Bengalce (Hindistan, Probhat)"
#: ../rules/base.xml.in.h:278
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Bangla (India, Baishakhi)"
+msgstr "Bengalce (Hindistan, Baishakhi)"
#: ../rules/base.xml.in.h:279
-msgid "Khm"
-msgstr "Kım"
+msgid "Bangla (India, Bornona)"
+msgstr "Bengalce (Hindistan, Bornona)"
#: ../rules/base.xml.in.h:280
-msgid "Kor"
-msgstr "Kor"
+msgid "Bangla (India, Uni Gitanjali)"
+msgstr "Bengalce (Hindistan, Uni Gitanjali)"
#: ../rules/base.xml.in.h:281
-msgid "Korea, Republic of"
-msgstr "Kore Cumhuriyeti"
+msgid "Bangla (India, Baishakhi Inscript)"
+msgstr "Bengalce (Hindistan, Baishakhi Yazısı)"
#: ../rules/base.xml.in.h:282
-msgid "Korean 106-key"
-msgstr "Korece 106 tuşlu"
-
-#: ../rules/base.xml.in.h:283
-msgid "Kotoistus"
-msgstr "Kotüstus"
+msgid "Manipuri (Eeyek)"
+msgstr "Manipuri (Eeyek)"
+#. Keyboard indicator for Gujarati layouts
#: ../rules/base.xml.in.h:284
-msgid "Kurdish, (F)"
-msgstr "Kürtçe (Türkçe F klavye)"
+msgid "gu"
+msgstr "gu"
#: ../rules/base.xml.in.h:285
-msgid "Kurdish, Arabic-Latin"
-msgstr "Kürtçe (Arapça-Latin)"
-
-#: ../rules/base.xml.in.h:286
-msgid "Kurdish, Latin Alt-Q"
-msgstr "Kürtçe (Türkçe Alt-Q klavye)"
+msgid "Gujarati"
+msgstr "Batı Hint dili"
+#. Keyboard indicator for Punjabi layouts
#: ../rules/base.xml.in.h:287
-msgid "Kurdish, Latin Q"
-msgstr "Kürtçe (Türkçe Q klavye)"
+msgid "pa"
+msgstr "pa"
#: ../rules/base.xml.in.h:288
-msgid "Kyr"
-msgstr "Kır"
+msgid "Punjabi (Gurmukhi)"
+msgstr "Pencapça (Gurmukhi)"
#: ../rules/base.xml.in.h:289
-msgid "Kyrgyzstan"
-msgstr "Kırgızistan"
-
-#: ../rules/base.xml.in.h:290
-msgid "LAm"
-msgstr "LAm"
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "Pencapça (Gurmukhi Jhelum)"
+#. Keyboard indicator for Kannada layouts
#: ../rules/base.xml.in.h:291
-msgid "LCtrl+LShift change layout."
-msgstr "Ctrl+Shift tuşları yerleşimi değiştirir."
+msgid "kn"
+msgstr "kn"
#: ../rules/base.xml.in.h:292
-msgid "Lao"
-msgstr "Lao"
+msgid "Kannada"
+msgstr "Güney Hint dili"
#: ../rules/base.xml.in.h:293
-msgid "Laos"
-msgstr "Laos"
-
-#: ../rules/base.xml.in.h:294
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Dizüstü/defter Compaq (örn. Armada) Dizüstü Klavyesi"
+msgid "Kannada (KaGaPa phonetic)"
+msgstr "Kannada (KaGaPa fonetik)"
+#. Keyboard indicator for Malayalam layouts
#: ../rules/base.xml.in.h:295
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Dizüstü/defter Compaq (örn. Presario) Genel Ağ Klavyesi"
+msgid "ml"
+msgstr "ml"
#: ../rules/base.xml.in.h:296
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Dizüstü/defter eMachines m68xx"
+msgid "Malayalam"
+msgstr "Malayalam dili"
#: ../rules/base.xml.in.h:297
-msgid "Latin"
-msgstr "Latin"
+msgid "Malayalam (Lalitha)"
+msgstr "Malayalam (Lalitha)"
#: ../rules/base.xml.in.h:298
-msgid "Latin American"
-msgstr "Latin Amerikanca"
-
-#: ../rules/base.xml.in.h:299
-msgid "Latin Unicode"
-msgstr "Latin Unicode"
+msgid "Malayalam (enhanced Inscript, with rupee sign)"
+msgstr "Malayalam (rupi işareti ile, gelişmiş Alfabe)"
+#. Keyboard indicator for Oriya layouts
#: ../rules/base.xml.in.h:300
-msgid "Latin Unicode qwerty"
-msgstr "Latin Unicode qwerty"
+msgid "or"
+msgstr "or"
#: ../rules/base.xml.in.h:301
-msgid "Latin qwerty"
-msgstr "Latin qwerty"
-
-#: ../rules/base.xml.in.h:302
-msgid "Latin with guillemets"
-msgstr "Açılı ayraçlarla Latin"
+msgid "Oriya"
+msgstr "Orissa dili"
+#. Keyboard indicator for Tamil layouts
#: ../rules/base.xml.in.h:303
-msgid "Latvia"
-msgstr "Letonya"
+msgid "ta"
+msgstr "ta"
#: ../rules/base.xml.in.h:304
-msgid "Layout switching"
-msgstr "Yerleşim değiştirme "
+msgid "Tamil (Unicode)"
+msgstr "Tamil (Unicode)"
#: ../rules/base.xml.in.h:305
-msgid "Left Alt is swapped with left Win-key."
-msgstr "Soydaki Alt tuşu ile soldaki Pencere tuşu yerdeğiştirir."
+msgid "Tamil (keyboard with numerals)"
+msgstr "Tamil (rakamlı klavye)"
#: ../rules/base.xml.in.h:306
-msgid "Left Alt key changes layout."
-msgstr "Soldaki Alt tuşu yerleşimi değiştirir."
+msgid "Tamil (TAB typewriter)"
+msgstr "Tamil (TAB daktilo)"
#: ../rules/base.xml.in.h:307
-msgid "Left Alt key switches layout while pressed."
-msgstr "Soldaki Alt tuşu basılıyken diğer yerleşimi etkin olur."
+msgid "Tamil (TSCII typewriter)"
+msgstr "Tamil (TSCII daktilo)"
#: ../rules/base.xml.in.h:308
-msgid "Left Ctrl key changes layout."
-msgstr "Soldaki Ctrl tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:309
-msgid "Left Shift key changes layout."
-msgstr "Soldaki Shift tuşu yerleşimi değiştirir."
+msgid "Tamil"
+msgstr "Tamil dili"
+#. Keyboard indicator for Telugu layouts
#: ../rules/base.xml.in.h:310
-msgid "Left Win-key changes layout."
-msgstr "Soldaki Pencere tuşu yerleşimi değiştirir."
+msgid "te"
+msgstr "te"
#: ../rules/base.xml.in.h:311
-msgid "Left Win-key is Compose."
-msgstr "Soldaki Pencere tuşu karakter birleşimi yapar."
+msgid "Telugu"
+msgstr "Telugu dili"
#: ../rules/base.xml.in.h:312
-msgid "Left Win-key switches layout while pressed."
-msgstr "Soldaki Win tuşu basılıyken diğer yerleşim etkin olur."
-
-#: ../rules/base.xml.in.h:313
-msgid "Left hand"
-msgstr "Solak"
+msgid "Telugu (KaGaPa phonetic)"
+msgstr "Telugu (KaGaPa fonetik)"
+#. Keyboard indicator for Urdu layouts
#: ../rules/base.xml.in.h:314
-msgid "Left handed Dvorak"
-msgstr "Solak Dvorak"
+msgid "ur"
+msgstr "ur"
#: ../rules/base.xml.in.h:315
-msgid "Lithuania"
-msgstr "Litvanya"
+msgid "Urdu (phonetic)"
+msgstr "Urdu dili (fonetik)"
#: ../rules/base.xml.in.h:316
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
+msgid "Urdu (alternative phonetic)"
+msgstr "Urdu (diğer fonetik)"
#: ../rules/base.xml.in.h:317
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Kablosuz Masaüstü"
-
-#: ../rules/base.xml.in.h:318
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Kablosuz Masaüstü LX-300"
+msgid "Urdu (WinKeys)"
+msgstr "Urdu (WinKeys)"
+#. Keyboard indicator for Hindi layouts
#: ../rules/base.xml.in.h:319
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Kablosuz Masaüstü Tarayıcı"
+msgid "hi"
+msgstr "hi"
#: ../rules/base.xml.in.h:320
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Kablosuz Masaüstü Optik"
+msgid "Hindi (Bolnagri)"
+msgstr "Hintçe (Bolnagri)"
#: ../rules/base.xml.in.h:321
-msgid "Logitech Cordless Desktop Pro"
-msgstr "Logitech Kablosuz Masaüstü Pro"
+msgid "Hindi (Wx)"
+msgstr "Hintçe (Wx)"
#: ../rules/base.xml.in.h:322
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr "Logitech Kablosuz Masaüstü Pro (diğer seçenek)"
-
-#: ../rules/base.xml.in.h:323
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Kablosuz Masaüstü Pro (diğer 2. seçenek)"
+msgid "Hindi (KaGaPa phonetic)"
+msgstr "Hintçe (fonetik KaGaPa)"
+#. Keyboard indicator for Sanskrit layouts
#: ../rules/base.xml.in.h:324
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Kablosuz Masaüstü iTouch"
+msgid "sa"
+msgstr "sa"
#: ../rules/base.xml.in.h:325
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Kablosuz Özgür/Masaüstü Tarayıcı"
-
-#: ../rules/base.xml.in.h:326
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15, G15daemon üzerinden ek tuşlu"
+msgid "Sanskrit (KaGaPa phonetic)"
+msgstr "Sanskritçe (KaGaPa fonetik)"
+#. Keyboard indicator for Marathi layouts
#: ../rules/base.xml.in.h:327
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Genel Ağ Klavyesi"
+msgid "mr"
+msgstr "mr"
#: ../rules/base.xml.in.h:328
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Genel Ağ Tarayıcı Klavyesi"
+msgid "Marathi (KaGaPa phonetic)"
+msgstr "Marathi (KaGaPa fonetik)"
#: ../rules/base.xml.in.h:329
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
-
-#: ../rules/base.xml.in.h:330
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech Access Klavye"
+msgid "English (India, with rupee sign)"
+msgstr "İngilizce (Hindistan, rupi işareti ile)"
+#. Keyboard indicator for Bosnian layouts
#: ../rules/base.xml.in.h:331
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+msgid "bs"
+msgstr "bs"
#: ../rules/base.xml.in.h:332
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Kablosuz Klavyesi (model Y-RB6)"
+msgid "Bosnian"
+msgstr "Boşnakça"
#: ../rules/base.xml.in.h:333
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Genel Ağ Tarayıcı Klavyesi SE"
+msgid "Bosnian (with guillemets for quotes)"
+msgstr "Boşnakça (alıntılar için tırnak işareti ile)"
#: ../rules/base.xml.in.h:334
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Genel Ağ Tarayıcı Klavyesi SE (USB)"
+msgid "Bosnian (with Bosnian digraphs)"
+msgstr "Boşnakça (tek sesi oluşturan iki harfler ile)"
#: ../rules/base.xml.in.h:335
-msgid "Ltu"
-msgstr "Ltu"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "Boşnakça (Boşnakça iki harf ile Amerikan klavye)"
#: ../rules/base.xml.in.h:336
-msgid "Lva"
-msgstr "Lva"
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "Boşnakça (Bosna harfleri ile Amerikan klavye)"
-#: ../rules/base.xml.in.h:337
-msgid "MESS"
-msgstr "MESS"
+#. Keyboard indicator for Portuguese layouts
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+msgid "pt"
+msgstr "pt"
-#: ../rules/base.xml.in.h:338
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
-
-#: ../rules/base.xml.in.h:339
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (Uluslararası)"
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+msgid "Portuguese (Brazil)"
+msgstr "Portekizce (Brezilya)"
#: ../rules/base.xml.in.h:340
-msgid "Macedonia"
-msgstr "Makedonya"
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "Portekizce (Brezilya, ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:341
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "Portekizce (Brezilya, Dvorak)"
#: ../rules/base.xml.in.h:342
-msgid "Macintosh Old"
-msgstr "Eski Macintosh"
+msgid "Portuguese (Brazil, Nativo)"
+msgstr "Portekizce (Brezilya, Yerel)"
#: ../rules/base.xml.in.h:343
-msgid "Macintosh, Sun dead keys"
-msgstr "Makintoş, Sun ölü tuşlar"
+msgid "Portuguese (Brazil, Nativo for US keyboards)"
+msgstr "Portekizce (Brezilya, Amerikan klavyeler için Yerel)"
#: ../rules/base.xml.in.h:344
-msgid "Macintosh, eliminate dead keys"
-msgstr "Makintoş, ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:345
-msgid "Make CapsLock an additional Ctrl."
-msgstr "CapsLock tuşunu ek bir Ctrl tuşu yapar."
+msgid "Esperanto (Brazil, Nativo)"
+msgstr "Esperanto (Brezilya, Yerel)"
+#. Keyboard indicator for Bulgarian layouts
#: ../rules/base.xml.in.h:346
-msgid "Mal"
-msgstr "Mal"
+msgid "bg"
+msgstr "bg"
#: ../rules/base.xml.in.h:347
-msgid "Malayalam"
-msgstr "Malayalam dili"
+msgid "Bulgarian"
+msgstr "Bulgarca"
#: ../rules/base.xml.in.h:348
-msgid "Maldives"
-msgstr "Maldivler"
+msgid "Bulgarian (traditional phonetic)"
+msgstr "Bulgarca (geleneksel fonetik)"
#: ../rules/base.xml.in.h:349
-msgid "Malta"
-msgstr "Malta"
+msgid "Bulgarian (new phonetic)"
+msgstr "Bulgarca (yeni fonetik)"
#: ../rules/base.xml.in.h:350
-msgid "Maltese keyboard with US layout"
-msgstr "Ameriken yerleşimli Maltız klavyesi"
-
-#: ../rules/base.xml.in.h:351
-msgid "Mao"
-msgstr "Mao"
+msgid "Arabic (Morocco)"
+msgstr "Arapça (Fas)"
-#: ../rules/base.xml.in.h:352
-msgid "Maori"
-msgstr "Mayorka"
+#. Keyboard indicator for French layouts
+#: ../rules/base.xml.in.h:352 ../rules/base.extras.xml.in.h:15
+msgid "fr"
+msgstr "fr"
#: ../rules/base.xml.in.h:353
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: ../rules/base.xml.in.h:354
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ Erişim Klavyesi"
+msgid "French (Morocco)"
+msgstr "Fransızca (Fas)"
+#. Keyboard indicator for Berber layouts
#: ../rules/base.xml.in.h:355
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+msgid "ber"
+msgstr "ber"
#: ../rules/base.xml.in.h:356
-msgid "Menu is Compose."
-msgstr "Menü tuşu karakter birleşimi yapar."
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "Berberice (Fas, Tifinagh)"
#: ../rules/base.xml.in.h:357
-msgid "Menu key changes layout."
-msgstr "Menü tuşu yerleşimi değiştirir."
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "Berberice (Fas, Tifinagh alternatifi)"
#: ../rules/base.xml.in.h:358
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta, Win tuşları ile eşleştirilir."
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "Berberice (Fas, fonetik diğer Tifinagh)"
#: ../rules/base.xml.in.h:359
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta, soldaki Win tuşu ile eşleştirilir."
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "Berberice (Fas, genişletilmiş Tifinagh)"
#: ../rules/base.xml.in.h:360
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Genel Ağ Klavyesi"
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "Berberice (Fas, fonetik Tifinagh)"
#: ../rules/base.xml.in.h:361
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Genel Ağ Klavyesi Pro, İsveçce"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "Berberice (Fas, genişletilmiş fonetik Tifinagh)"
-#: ../rules/base.xml.in.h:362
-msgid "Microsoft Natural"
-msgstr "Microsoft Basit"
+#. Keyboard indicator for Cameroon layouts
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
+msgid "cm"
+msgstr "cm"
-#: ../rules/base.xml.in.h:363
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Basit Klavye Pro / Microsoft Genel Ağ Klavyesi Pro"
-
-#: ../rules/base.xml.in.h:364
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Basit Klavye Pro OEM"
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
+msgid "English (Cameroon)"
+msgstr "İngilizce (Kamerun)"
#: ../rules/base.xml.in.h:365
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgid "French (Cameroon)"
+msgstr "Fransızca (Kamerun)"
#: ../rules/base.xml.in.h:366
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Ofis Klavyesi"
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Kamerun Çok Dilli (qwerty)"
#: ../rules/base.xml.in.h:367
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-
-#: ../rules/base.xml.in.h:368 ../rules/sun.xml.in.h:72
-msgid "Miscellaneous compatibility options"
-msgstr "Çeşitli uyumluluk seçenekleri"
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Kamerun Çok Dilli (azerty)"
-#: ../rules/base.xml.in.h:369
-msgid "Mkd"
-msgstr "Mkd"
+#: ../rules/base.xml.in.h:368
+msgid "Cameroon Multilingual (Dvorak)"
+msgstr "Kamerun Çok Dilli (Dvorak)"
+#. Keyboard indicator for Burmese layouts
#: ../rules/base.xml.in.h:370
-msgid "Mlt"
-msgstr "Mlt"
+msgid "my"
+msgstr "my"
#: ../rules/base.xml.in.h:371
-msgid "Mmr"
-msgstr "Mmr"
+msgid "Burmese"
+msgstr "Birmanca"
-#: ../rules/base.xml.in.h:372
-msgid "Mng"
-msgstr "Moğ"
+#: ../rules/base.xml.in.h:372 ../rules/base.extras.xml.in.h:16
+msgid "French (Canada)"
+msgstr "Fransızca (Kanada)"
#: ../rules/base.xml.in.h:373
-msgid "Mongolia"
-msgstr "Moğolistan"
+msgid "French (Canada, Dvorak)"
+msgstr "Fransızca (Kanada, Dvorak)"
#: ../rules/base.xml.in.h:374
-msgid "Morocco"
-msgstr "Fas"
+msgid "French (Canada, legacy)"
+msgstr "Fransızca (Kanada, eski)"
-#: ../rules/base.xml.in.h:375 ../rules/sun.xml.in.h:73
-msgid "Multilingual"
-msgstr "Çokdilli"
+#: ../rules/base.xml.in.h:375
+msgid "Canadian Multilingual"
+msgstr "Kanada Çok Dilli"
#: ../rules/base.xml.in.h:376
-msgid "Multilingual, first part"
-msgstr "Çokdilli, ilk bölüm"
-
-#: ../rules/base.xml.in.h:377 ../rules/sun.xml.in.h:74
-msgid "Multilingual, second part"
-msgstr "Çokdilli, ikinci bölüm"
+msgid "Canadian Multilingual (first part)"
+msgstr "Kanada Çok Dilli (ilk bölüm)"
-#: ../rules/base.xml.in.h:378
-msgid "Myanmar"
-msgstr "Miyanmar"
+#: ../rules/base.xml.in.h:377
+msgid "Canadian Multilingual (second part)"
+msgstr "Kanada Çok Dilli (ikinci bölüm)"
+#. Keyboard indicator for Inuktikut layouts
#: ../rules/base.xml.in.h:379
-msgid "NICOLA-F style Backspace"
-msgstr "NICOLA-F tarzı Gerisilme"
+msgid "ike"
+msgstr "ike"
#: ../rules/base.xml.in.h:380
-msgid "Neostyle"
-msgstr "Yenitarz"
+msgid "Inuktitut"
+msgstr "Inuktitut"
#: ../rules/base.xml.in.h:381
-msgid "Nep"
-msgstr "Nep"
+msgid "English (Canada)"
+msgstr "İngilizce (Kanada)"
#: ../rules/base.xml.in.h:382
-msgid "Nepal"
-msgstr "Nepal"
-
-#: ../rules/base.xml.in.h:383
-msgid "Netherlands"
-msgstr "Hollanda"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "Fransızca (Demokratik Kongo Cumhuriyeti)"
+#. Keyboard indicator for Taiwanese layouts
#: ../rules/base.xml.in.h:384
-msgid "Nig"
-msgstr "Nij"
+msgid "zh"
+msgstr "zh"
#: ../rules/base.xml.in.h:385
-msgid "Nigeria"
-msgstr "Nijerya"
+msgid "Chinese"
+msgstr "Çince"
#: ../rules/base.xml.in.h:386
-msgid "Nld"
-msgstr "Hol"
+msgid "Tibetan"
+msgstr "Tibetçe"
-#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:75
-msgid "Nor"
-msgstr "Nor"
+#: ../rules/base.xml.in.h:387
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetçe (ASCII rakamları ile)"
#: ../rules/base.xml.in.h:388
-msgid "Northern Saami"
-msgstr "Kuzey Sami"
+msgid "ug"
+msgstr "ug"
#: ../rules/base.xml.in.h:389
-msgid "Northern Saami, eliminate dead keys"
-msgstr "Kuzey Sami, ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:390
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
+msgid "Uyghur"
+msgstr "Uygurca"
+#. Keyboard indicator for Croatian layouts
#: ../rules/base.xml.in.h:391
-msgid "Norway"
-msgstr "Norveç"
+msgid "hr"
+msgstr "hr"
#: ../rules/base.xml.in.h:392
-msgid "NumLock LED shows alternative layout."
-msgstr "Num_Lock LED'i diğer yerleşimi gösterir."
+msgid "Croatian"
+msgstr "Hırvatça"
#: ../rules/base.xml.in.h:393
-msgid "Numeric keypad keys work as with Mac."
-msgstr "Tuştakımı Mac gibi çalışır."
+msgid "Croatian (with guillemets for quotes)"
+msgstr "Hırvatça (tırnak işareti ile)"
#: ../rules/base.xml.in.h:394
-msgid "Numeric keypad layout selection"
-msgstr "Sayısal tuştakımı yerleşimi seçimi"
+msgid "Croatian (with Croatian digraphs)"
+msgstr "Hırvatça (Hırvar iki harflileri ile)"
#: ../rules/base.xml.in.h:395
-msgid "OADG 109A"
-msgstr "OADG 109A"
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "Hırvatça (Hırvat iki harflileri ile Amerikan klavye)"
#: ../rules/base.xml.in.h:396
-msgid "Ogham"
-msgstr "Ogham"
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "Hırvatça (Hırvat harfleri ile Amerikan klavye)"
-#: ../rules/base.xml.in.h:397
-msgid "Ogham IS434"
-msgstr "Ogham IS434"
+#. Keyboard indicator for Chech layouts
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+msgid "cs"
+msgstr "cs"
-#: ../rules/base.xml.in.h:398
-msgid "Oriya"
-msgstr "Orissa dili"
-
-#: ../rules/base.xml.in.h:399
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Oretec MCK-800 MM/Genel Ağ Klavyesi"
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+msgid "Czech"
+msgstr "Çekçe"
#: ../rules/base.xml.in.h:400
-msgid "Ossetian"
-msgstr "Osetya"
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Çekçe (with &lt;\\|&gt; key)"
#: ../rules/base.xml.in.h:401
-msgid "Ossetian, Winkeys"
-msgstr "Osetya, Pencere tuşları"
+msgid "Czech (qwerty)"
+msgstr "Çekçe (qwerty)"
#: ../rules/base.xml.in.h:402
-msgid "PC-98xx Series"
-msgstr "PC-98xx Serisi"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "Çekçe (qwerty, genişletilmiş Ters Bölü)"
#: ../rules/base.xml.in.h:403
-msgid "Pak"
-msgstr "Pak"
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "Çekçe (UCW yerleşimi, sadece aksanlı harfler)"
#: ../rules/base.xml.in.h:404
-msgid "Pakistan"
-msgstr "Pakistan"
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "Çekçe (CZ UCW destekli Amerikan Dvorak ile)"
-#: ../rules/base.xml.in.h:405
-msgid "Pashto"
-msgstr "Paşto"
+#. Keyboard indicator for Danish layouts
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:92
+msgid "da"
+msgstr "da"
-#: ../rules/base.xml.in.h:406
-msgid "Pattachote"
-msgstr "Pataküte"
-
-#: ../rules/base.xml.in.h:407 ../rules/sun.xml.in.h:78
-msgid "Phonetic"
-msgstr "Fonetik"
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+msgid "Danish"
+msgstr "Danca"
-#: ../rules/base.xml.in.h:408 ../rules/sun.xml.in.h:79
-msgid "Pol"
-msgstr "Pol"
+#: ../rules/base.xml.in.h:408
+msgid "Danish (eliminate dead keys)"
+msgstr "Danimarkaca (ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:409
-msgid "Poland"
-msgstr "Polonya"
+msgid "Danish (Winkeys)"
+msgstr "Danimarkaca (Win Tuşları)"
#: ../rules/base.xml.in.h:410
-msgid "Polytonic"
-msgstr "Politonik"
+msgid "Danish (Macintosh)"
+msgstr "Danimarkaca (Macintosh)"
#: ../rules/base.xml.in.h:411
-msgid "Portugal"
-msgstr "Portekiz"
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Danimarkaca (Macintosh, ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:412
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "3. seviyeyi seçmek için soldaki Alt tuşuna basın."
+msgid "Danish (Dvorak)"
+msgstr "Danimarkaca (Dvorak)"
-#: ../rules/base.xml.in.h:413
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "3. seviyeyi seçmek için soldaki Win tuşuna basın."
+#. Keyboard indicator for Dutch layouts
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+msgid "nl"
+msgstr "nl"
-#: ../rules/base.xml.in.h:414
-msgid "Press Menu key to choose 3rd level."
-msgstr "3. seviyeyi seçmek için Menü tuşuna basın."
-
-#: ../rules/base.xml.in.h:415
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın, Sağdaki Alt tuşuyla birlikte Shift tuşu AltGr gibi davranır."
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+msgid "Dutch"
+msgstr "Felemenkçe"
#: ../rules/base.xml.in.h:416
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın."
+msgid "Dutch (Sun dead keys)"
+msgstr "Felemenkçe (Sun ölü tuşlar)"
#: ../rules/base.xml.in.h:417
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın."
+msgid "Dutch (Macintosh)"
+msgstr "Felemenkçe (Macintosh)"
#: ../rules/base.xml.in.h:418
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "3. seviyeyi seçmek için sağdaki Win tuşuna basın."
-
-#: ../rules/base.xml.in.h:419
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "3. seviyeyi seçmek için Alt tuşlarından birine basın."
+msgid "Dutch (standard)"
+msgstr "Felemenkçe (standart)"
+#. Keyboard indicator for Dzongkha layouts
#: ../rules/base.xml.in.h:420
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "3. seviyeyi seçmek için Win tuşlarından birine basın."
+msgid "dz"
+msgstr "dz"
#: ../rules/base.xml.in.h:421
-msgid "Pro"
-msgstr "Pro"
+msgid "Dzongkha"
+msgstr "Dzongkha"
-#: ../rules/base.xml.in.h:422
-msgid "Pro Keypad"
-msgstr "Pro Klavye"
+#. Keyboard indicator for Estonian layouts
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+msgid "et"
+msgstr "et"
-#: ../rules/base.xml.in.h:423
-msgid "Probhat"
-msgstr "Probat"
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+msgid "Estonian"
+msgstr "Estonca"
-#: ../rules/base.xml.in.h:424
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: ../rules/base.xml.in.h:425 ../rules/sun.xml.in.h:88
-msgid "Prt"
-msgstr "Prt"
+#: ../rules/base.xml.in.h:425
+msgid "Estonian (eliminate dead keys)"
+msgstr "Estonca (ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:426
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Estonian (Dvorak)"
+msgstr "Estonca (Dvorak)"
#: ../rules/base.xml.in.h:427
-msgid "R-Alt switches layout while pressed."
-msgstr "Sağdaki Alt tuşu basılıyken diğer yerleşim etkin olur."
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "Estonca (Estonya harfleri ile Amerikan klavye)"
-#: ../rules/base.xml.in.h:428
-msgid "Right Alt is Compose."
-msgstr "Sağdaki Alt tuşu karakter birleşimi yapar."
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+msgid "Persian"
+msgstr "Farsça"
#: ../rules/base.xml.in.h:429
-msgid "Right Alt key changes layout."
-msgstr "Sağdaki Alt tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:430 ../rules/sun.xml.in.h:90
-msgid "Right Alt key never chooses 3rd level."
-msgstr "Sağdaki Alt tuşu 3. seviyeyi asla seçmez."
+msgid "Persian (with Persian keypad)"
+msgstr "Farsça (İran klavye ile)"
+#. Keyboard indicator for Kurdish layouts
#: ../rules/base.xml.in.h:431
-msgid "Right Ctrl is Compose."
-msgstr "Sağdaki Ctrl tuşu karakter birleşimi yapar."
+msgid "ku"
+msgstr "ku"
#: ../rules/base.xml.in.h:432
-msgid "Right Ctrl key changes layout."
-msgstr "Sağdaki Ctrl tuşu yerleşimi değiştirir."
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "Kürtçe (İran, Latin Q)"
#: ../rules/base.xml.in.h:433
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Sağdaki Ctrl tuşu basılıyken diğer yerleşim etkin olur."
+msgid "Kurdish (Iran, F)"
+msgstr "Kürtçe (İran, F)"
#: ../rules/base.xml.in.h:434
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Sağdaki Ctrl tuşu sağdaki Alt tuşu gibi çalışır."
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kürtçe (İran, Latin Alt-Q)"
#: ../rules/base.xml.in.h:435
-msgid "Right Shift key changes layout."
-msgstr "Sağdaki Shift tuşu yerleşimi değiştirir."
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "Kürtçe (İran, Arap-Latin)"
#: ../rules/base.xml.in.h:436
-msgid "Right Win-key changes layout."
-msgstr "Sağdaki Win tuşu yerleşimi değiştirir."
+msgid "Iraqi"
+msgstr "Irak"
#: ../rules/base.xml.in.h:437
-msgid "Right Win-key is Compose."
-msgstr "Sağdaki Win tuşu karakter birleşimi yapar."
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "Kürtçe (Irak, Latin Q)"
#: ../rules/base.xml.in.h:438
-msgid "Right Win-key switches layout while pressed."
-msgstr "Sağdaki Win tuşu basılıyken diğer yerleşim etkin olur."
+msgid "Kurdish (Iraq, F)"
+msgstr "Kürtçe (Irak, F)"
#: ../rules/base.xml.in.h:439
-msgid "Right hand"
-msgstr "Sağ el"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "Kürtçe (Irak, Latin Alt-Q)"
#: ../rules/base.xml.in.h:440
-msgid "Right handed Dvorak"
-msgstr "Sağ elle Dvorak"
-
-#: ../rules/base.xml.in.h:441
-msgid "Romania"
-msgstr "Romenya"
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "Kürtçe (Irak, Arapça-Latin)"
+#. Keyboard indicator for Faroese layouts
#: ../rules/base.xml.in.h:442
-msgid "Romanian keyboard with German letters"
-msgstr "Alman harfleriyle Romanya klavyesi"
+msgid "fo"
+msgstr "fo"
#: ../rules/base.xml.in.h:443
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Alman harfleriyle Romanya klavyesi, ölü tuşsuz"
+msgid "Faroese"
+msgstr "Faroece"
#: ../rules/base.xml.in.h:444
-msgid "Rou"
-msgstr "Rou"
-
-#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:95
-msgid "Rus"
-msgstr "Rus"
+msgid "Faroese (eliminate dead keys)"
+msgstr "Faroe dili (ölü tuşlar olmadan)"
-#: ../rules/base.xml.in.h:446
-msgid "Russia"
-msgstr "Rusya"
+#. Keyboard indicator for Finnish layouts
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+msgid "fi"
+msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/sun.xml.in.h:96
-msgid "Russian"
-msgstr "Rusça"
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+msgid "Finnish"
+msgstr "Fince"
#: ../rules/base.xml.in.h:448
-msgid "Russian phonetic"
-msgstr "Rusça fonetik"
+msgid "Finnish (classic)"
+msgstr "Fince (klasik)"
#: ../rules/base.xml.in.h:449
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "Rusça fonetik, ölü tuşsuz"
+msgid "Finnish (classic, eliminate dead keys)"
+msgstr "Fince (klasik, ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:450
-msgid "Russian with Kazakh"
-msgstr "Rusça (kazak)"
+msgid "Finnish (Winkeys)"
+msgstr "Fince (Win tuşları)"
#: ../rules/base.xml.in.h:451
-msgid "SCG"
-msgstr "SCG"
+msgid "Northern Saami (Finland)"
+msgstr "Kuzey Saami (Finlandiya)"
#: ../rules/base.xml.in.h:452
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Çokluortam Kablosuz Klavyesi"
+msgid "Finnish (Macintosh)"
+msgstr "Fince (Macintosh)"
-#: ../rules/base.xml.in.h:453
-msgid "SK-1300"
-msgstr "SK-1300"
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+msgid "French"
+msgstr "Fransızca"
#: ../rules/base.xml.in.h:454
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "French (eliminate dead keys)"
+msgstr "Fransızca (ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:455
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "French (Sun dead keys)"
+msgstr "Fransızca (Sun ölü tuşlar)"
#: ../rules/base.xml.in.h:456
-msgid "SK-7100"
-msgstr "SK-7100"
+msgid "French (alternative)"
+msgstr "Fransızca (alternatif)"
#: ../rules/base.xml.in.h:457
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomik 2500"
+msgid "French (alternative, Latin-9 only)"
+msgstr "Fransızca (alternatif, sadece Latin-9)"
#: ../rules/base.xml.in.h:458
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "Fransızca (alternatif, ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:459
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
+msgid "French (alternative, Sun dead keys)"
+msgstr "Fransızca (alternatif, Sun ölü tuşları)"
#: ../rules/base.xml.in.h:460
-msgid "ScrollLock LED shows alternative layout."
-msgstr "Scroll_Lock LED'i diğer yerleşimi gösterir."
+msgid "French (legacy, alternative)"
+msgstr "Fransızca (eski, alternatif)"
#: ../rules/base.xml.in.h:461
-msgid "Serbia and Montenegro"
-msgstr "Sırbistan ve Karadağ"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "Fransızca (eski, alternatif, ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:462
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Sayısal tuştakımı Shift ile MS Windows'daki gibi çalışır."
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "Fransızca (eski, alternatif, Sun ölü tuşları)"
#: ../rules/base.xml.in.h:463
-msgid "Shift+CapsLock changes layout."
-msgstr "Shift+CapsLock tuşları yerleşimi değiştirir."
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "Fransızca (Bepo, ergonomik, Dvorak düzeni)"
#: ../rules/base.xml.in.h:464
-msgid "Slovakia"
-msgstr "Slovakya"
+msgid "French (Bepo, ergonomic, Dvorak way, Latin-9 only)"
+msgstr "Fransızca (Bepo, ergonomik, Dvorak, sadece Latin-9)"
#: ../rules/base.xml.in.h:465
-msgid "Slovenia"
-msgstr "Slovenya"
+msgid "French (Dvorak)"
+msgstr "Fransızca (Dvorak)"
#: ../rules/base.xml.in.h:466
-msgid "South Africa"
-msgstr "Güney Afrika"
+msgid "French (Macintosh)"
+msgstr "Fransız (Makintoş)"
#: ../rules/base.xml.in.h:467
-msgid "Southern Uzbek"
-msgstr "Güney Özbekistan"
+msgid "French (Breton)"
+msgstr "Fransızca (Bretonca)"
#: ../rules/base.xml.in.h:468
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar, altıncı seviyede incesini basar"
+msgid "Occitan"
+msgstr "Oksitanca"
#: ../rules/base.xml.in.h:469
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar."
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Gürcüce (Fransa, AZERTY Tskapo)"
#: ../rules/base.xml.in.h:470
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "Boşluk tuşu nobreakspace'i ikinci seviyede çıktılar."
+msgid "English (Ghana)"
+msgstr "İngilizce (Gana)"
#: ../rules/base.xml.in.h:471
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar, üçüncü işlevsizdir."
-
-#: ../rules/base.xml.in.h:472
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Boşluk tuşu üçüncü seviyede nobreakspace basar, dördüncü seviyede incesini basar"
+msgid "English (Ghana, multilingual)"
+msgstr "İngilizce (Gana, çok dilli)"
+#. Keyboard indicator for Akan layouts
#: ../rules/base.xml.in.h:473
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "Boşluk tuşu nobreakspace'i üçüncü seviyede çıktılar."
+msgid "ak"
+msgstr "ak"
#: ../rules/base.xml.in.h:474
-msgid "Space key outputs usual space at any level."
-msgstr "Boşluk tuşu her seviyede boşluk basar (nobreakspace basmaz)."
-
-#: ../rules/base.xml.in.h:475
-msgid "Spain"
-msgstr "İspanya"
+msgid "Akan"
+msgstr "Akan"
-#: ../rules/base.xml.in.h:476 ../rules/sun.xml.in.h:103
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Bir sunucuda elde edilen özel tuşlar (Ctrl+Alt+&lt;tuş&gt;)"
+#. Keyboard indicator for Ewe layouts
+#: ../rules/base.xml.in.h:476
+msgid "ee"
+msgstr "ee"
#: ../rules/base.xml.in.h:477
-msgid "SrL"
-msgstr "SrL"
+msgid "Ewe"
+msgstr "Eve"
-#: ../rules/base.xml.in.h:478
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
+#. Keyboard indicator for Fula layouts
+#: ../rules/base.xml.in.h:479
+msgid "ff"
+msgstr "ff"
-#: ../rules/base.xml.in.h:479 ../rules/sun.xml.in.h:104
-msgid "Standard"
-msgstr "Standart"
+#: ../rules/base.xml.in.h:480
+msgid "Fula"
+msgstr "Fula"
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:481
-msgid "Standard RSTU"
-msgstr "Standart RSTU"
+#. Keyboard indicator for Ga layouts
+#: ../rules/base.xml.in.h:482
+msgid "gaa"
+msgstr "gaa"
-#. RSTU 2019-91
#: ../rules/base.xml.in.h:483
-msgid "Standard RSTU on Russian layout"
-msgstr "Rusça yerleşimde standart RSTU"
-
-#: ../rules/base.xml.in.h:484 ../rules/sun.xml.in.h:112
-msgid "Sun dead keys"
-msgstr "Sun ölü tuşlar"
+msgid "Ga"
+msgstr "Ga"
+#. Keyboard indicator for Hausa layouts
#: ../rules/base.xml.in.h:485
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
+msgid "ha"
+msgstr "ha"
#: ../rules/base.xml.in.h:486
-msgid "Super is mapped to the Win-keys."
-msgstr "Super, Pencere tuşlarına eşlenir."
-
-#: ../rules/base.xml.in.h:487
-msgid "Svdvorak"
-msgstr "Svdvorak"
+msgid "Hausa"
+msgstr "Havza"
-#: ../rules/base.xml.in.h:488 ../rules/sun.xml.in.h:113
-msgid "Svk"
-msgstr "Svk"
+#. Keyboard indicator for Avatime layouts
+#: ../rules/base.xml.in.h:488
+msgid "avn"
+msgstr "avn"
#: ../rules/base.xml.in.h:489
-msgid "Svn"
-msgstr "Svn"
+msgid "Avatime"
+msgstr "Avatime"
#: ../rules/base.xml.in.h:490
-msgid "Swap Ctrl and CapsLock."
-msgstr "Ctrl ile Caps Lock yer değiştirir."
+msgid "English (Ghana, GILLBT)"
+msgstr "İngilizce (Gana, GILLBT)"
#: ../rules/base.xml.in.h:491
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Makintoş klavyeler çekirdek tarafından algılanamadığında iki seviyeli tuş kodlarına geçilir."
-
-#: ../rules/base.xml.in.h:492 ../rules/sun.xml.in.h:115
-msgid "Swe"
-msgstr "İsve"
+msgid "French (Guinea)"
+msgstr "Fransızca (Gine)"
+#. Keyboard indicator for Georgian layouts
#: ../rules/base.xml.in.h:493
-msgid "Sweden"
-msgstr "İsveç"
+msgid "ka"
+msgstr "ka"
#: ../rules/base.xml.in.h:494
-msgid "Switzerland"
-msgstr "İsviçre"
+msgid "Georgian"
+msgstr "Gürcüce"
#: ../rules/base.xml.in.h:495
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
+msgid "Georgian (ergonomic)"
+msgstr "Gürcüce (ergonomik)"
#: ../rules/base.xml.in.h:496
-msgid "Syr"
-msgstr "Sur"
+msgid "Georgian (MESS)"
+msgstr "Gürcüce (MESS)"
#: ../rules/base.xml.in.h:497
-msgid "Syria"
-msgstr "Suriye"
+msgid "Russian (Georgia)"
+msgstr "Rusça (Gürcistan)"
#: ../rules/base.xml.in.h:498
-msgid "Syriac"
-msgstr "Suriye"
+msgid "Ossetian (Georgia)"
+msgstr "Osetçe (Gürcistan)"
-#: ../rules/base.xml.in.h:499
-msgid "Syriac phonetic"
-msgstr "Suriye fonetik"
+#: ../rules/base.xml.in.h:499 ../rules/base.extras.xml.in.h:23
+msgid "German"
+msgstr "Almanca"
#: ../rules/base.xml.in.h:500
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
+msgid "German (dead acute)"
+msgstr "Almanca (ölü akut)"
#: ../rules/base.xml.in.h:501
-msgid "Tajikistan"
-msgstr "Tacikistan"
+msgid "German (dead grave acute)"
+msgstr "Almanca (ölü aksan akut)"
#: ../rules/base.xml.in.h:502
-msgid "Tamil"
-msgstr "Tamil dili"
+msgid "German (eliminate dead keys)"
+msgstr "Almanca (ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:503
-msgid "Tamil TAB Typewriter"
-msgstr "Tamil TAB Daktilo"
+msgid "German (T3)"
+msgstr "Almanca (T3)"
#: ../rules/base.xml.in.h:504
-msgid "Tamil TSCII Typewriter"
-msgstr "Tamil TSCII Daktilo"
+msgid "Romanian (Germany)"
+msgstr "Rumence (Almanya)"
#: ../rules/base.xml.in.h:505
-msgid "Tamil Unicode"
-msgstr "Tamil Unicode"
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Rumence (Almanya, ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:506
-msgid "Tatar"
-msgstr "Tatar"
+msgid "German (Dvorak)"
+msgstr "Almanca (Dvorak)"
#: ../rules/base.xml.in.h:507
-msgid "Telugu"
-msgstr "Telugu dili"
+msgid "German (Sun dead keys)"
+msgstr "Almanca (Sun ölü tuşlar)"
#: ../rules/base.xml.in.h:508
-msgid "Tha"
-msgstr "Tha"
+msgid "German (Neo 2)"
+msgstr "Almanca (Neo 2)"
#: ../rules/base.xml.in.h:509
-msgid "Thailand"
-msgstr "Tayland"
+msgid "German (Macintosh)"
+msgstr "Alman (Makintoş)"
-#: ../rules/base.xml.in.h:510 ../rules/sun.xml.in.h:119
-msgid "Third level choosers"
-msgstr "3. seviye seçiciler"
+#: ../rules/base.xml.in.h:510
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Almanca (Macintosh, ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:511
-msgid "Tifinagh"
-msgstr "Tifinagh"
+msgid "Lower Sorbian"
+msgstr "Aşağı Sorbca"
#: ../rules/base.xml.in.h:512
-msgid "Tifinagh Alternative"
-msgstr "Tifinagh Diğer"
+msgid "Lower Sorbian (qwertz)"
+msgstr "Aşağı Sorbca (qwertz)"
#: ../rules/base.xml.in.h:513
-msgid "Tifinagh Alternative Phonetic"
-msgstr "Tifinagh Diğer Fonetik"
+msgid "German (qwerty)"
+msgstr "Almanca (qwerty)"
#: ../rules/base.xml.in.h:514
-msgid "Tifinagh Extended"
-msgstr "Tifinagh Gelişkin"
+msgid "Turkish (Germany)"
+msgstr "Türkçe (Almanya)"
#: ../rules/base.xml.in.h:515
-msgid "Tifinagh Extended Phonetic"
-msgstr "Tifinagh Gelişmiş Fonetik"
+msgid "Russian (Germany, phonetic)"
+msgstr "Rusça (Almanya, fonetik)"
#: ../rules/base.xml.in.h:516
-msgid "Tifinagh Phonetic"
-msgstr "Tifinagh Fonetik"
+msgid "German (legacy)"
+msgstr "Almanca (eski)"
-#: ../rules/base.xml.in.h:517
-msgid "Tilde (~) variant"
-msgstr "Tilde (~) tuşlu"
+#. Keyboard indicator for Greek layouts
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+msgid "gr"
+msgstr "gr"
-#: ../rules/base.xml.in.h:518
-msgid "Tjk"
-msgstr "Tck"
-
-#: ../rules/base.xml.in.h:519
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+msgid "Greek"
+msgstr "Yünanca"
#: ../rules/base.xml.in.h:520
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Doğrudan Erişimli Klavye"
+msgid "Greek (simple)"
+msgstr "Yünanca (basit)"
#: ../rules/base.xml.in.h:521
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Kablosuz Klasik Klavye"
+msgid "Greek (extended)"
+msgstr "Yünanca (genişletilmiş)"
-#: ../rules/base.xml.in.h:522 ../rules/sun.xml.in.h:120
-msgid "Tur"
-msgstr "Trk"
+#: ../rules/base.xml.in.h:522
+msgid "Greek (eliminate dead keys)"
+msgstr "Yünanca (ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:523
-msgid "Turkey"
-msgstr "Türkiye"
+msgid "Greek (polytonic)"
+msgstr "Yünanca (politonik)"
-#: ../rules/base.xml.in.h:524
-msgid "Typewriter"
-msgstr "Daktilo"
-
-#: ../rules/base.xml.in.h:525 ../rules/sun.xml.in.h:124
-msgid "U.S. English"
-msgstr "Amerikan ingilizcesi"
+#. Keyboard indicator for Hungarian layouts
+#: ../rules/base.xml.in.h:525
+msgid "hu"
+msgstr "hu"
#: ../rules/base.xml.in.h:526
-msgid "US keyboard with Bosnian digraphs"
-msgstr "Bosna ikil harfleriyle amerikan klavyesi"
+msgid "Hungarian"
+msgstr "Macarca"
#: ../rules/base.xml.in.h:527
-msgid "US keyboard with Bosnian letters"
-msgstr "Bosna harfleriyle amerikan klavyesi"
+msgid "Hungarian (standard)"
+msgstr "Macarca (standart)"
#: ../rules/base.xml.in.h:528
-msgid "US keyboard with Croatian digraphs"
-msgstr "Hırvat ikil harfleriyle amerikan klavyesi"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "Macarca (ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:529
-msgid "US keyboard with Croatian letters"
-msgstr "Hırvat harfleriyle amerikan klavyesi"
+msgid "Hungarian (qwerty)"
+msgstr "Macarca (qwerty)"
#: ../rules/base.xml.in.h:530
-msgid "US keyboard with Lithuanian letters"
-msgstr "Litvanya harfleriyle amerikan klavyesi"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "101/qwertz/virgül/ölü tuşlar"
#: ../rules/base.xml.in.h:531
-msgid "US keyboard with Slovenian digraphs"
-msgstr "Sloven ikil harfleriyle amerikan klavyesi"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "Macarca (101/qwertz/virgül/ölü tuş olmadan)"
#: ../rules/base.xml.in.h:532
-msgid "US keyboard with Slovenian letters"
-msgstr "Sloven harfleriyle amerikan klavyesi"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "Macarca (101/qwertz/nokta/ölü tuşlar olmadan)"
-#: ../rules/base.xml.in.h:533 ../rules/sun.xml.in.h:126
-msgid "USA"
-msgstr "ABD"
+#: ../rules/base.xml.in.h:533
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "Macarca (101/qwertz/nokta/ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:534
-msgid "Udmurt"
-msgstr "Udmurt"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "Macarca (101/qwerty/virgül/ölü tuşlar)"
#: ../rules/base.xml.in.h:535
-msgid "Ukr"
-msgstr "Ukr"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "Macarca (101/qwerty/virgül/ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:536
-msgid "Ukraine"
-msgstr "Ukrayna"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "Macarca (101/qwerty/nokta/ölü tuşlar)"
#: ../rules/base.xml.in.h:537
-msgid "UnicodeExpert"
-msgstr "Unicode Uzman"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "Macarca (101/qwert/nokta/ölü tuşlar olmadan)"
-#: ../rules/base.xml.in.h:538 ../rules/sun.xml.in.h:127
-msgid "United Kingdom"
-msgstr "İngiltere"
+#: ../rules/base.xml.in.h:538
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "Macarca (102/qwertz/virgül/ölü tuşlar)"
#: ../rules/base.xml.in.h:539
-msgid "Urdu"
-msgstr "Urdu"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "Macarca (102/qwertz/virgül/ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:540
-msgid "Use Bosnian digraphs"
-msgstr "Bosna ikil harflerini kullanır"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "Macarca (102/qwertz/nokta/ölü tuşlar)"
#: ../rules/base.xml.in.h:541
-msgid "Use Croatian digraphs"
-msgstr "Hırvat ikil harflerini kullanır"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "Macarca (102/qwertz/nokta/ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:542
-msgid "Use Slovenian digraphs"
-msgstr "Sloven ikil harflerini kullanır"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "Macarca (102/qwerty/virgül/ölü tuşlar)"
#: ../rules/base.xml.in.h:543
-msgid "Use guillemets for quotes"
-msgstr "Tırnakların yerine açılı ayraçlar kullanılır"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "Macarca (102/qwerty/virgül/ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:544
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Diğer yerleşimi göstermek için klavye LED'i kullanılır."
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "Macarca (102/qwerty/nokta/ölü tuşlar)"
#: ../rules/base.xml.in.h:545
-msgid "Use keypad with unicode additions (arrows and math operators)"
-msgstr "Tuştakımı Unicode eklentileri ile kullanılır (ok ve aritmetik tuşları)"
-
-#: ../rules/base.xml.in.h:546
-msgid "Using space key to input non-breakable space character"
-msgstr "nobreakspace'i yazmak için boşluk tuşu kullanımı"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "Macarca (102/qwerty/nokta/ölü tuşlar olmadan)"
+#. Keyboard indicator for Icelandic layouts
#: ../rules/base.xml.in.h:547
-msgid "Uzb"
-msgstr "Özb"
+msgid "is"
+msgstr "is"
#: ../rules/base.xml.in.h:548
-msgid "Uzbekistan"
-msgstr "Özbekistan"
+msgid "Icelandic"
+msgstr "İzlandaca"
#: ../rules/base.xml.in.h:549
-msgid "Vietnam"
-msgstr "Vietnam"
+msgid "Icelandic (Sun dead keys)"
+msgstr "İzlandaca (Sun ölü tuşlar)"
#: ../rules/base.xml.in.h:550
-msgid "Vnm"
-msgstr "Vnm"
+msgid "Icelandic (eliminate dead keys)"
+msgstr "İzlandaca (ölü tuşlar olmadan)"
#: ../rules/base.xml.in.h:551
-msgid "Wang model 724 azerty"
-msgstr "Wang model 724 azerty"
+msgid "Icelandic (Macintosh, legacy)"
+msgstr "İzlandaca (Macintosh, eski)"
#: ../rules/base.xml.in.h:552
-msgid "Western"
-msgstr "Batı"
+msgid "Icelandic (Macintosh)"
+msgstr "İzlandaca (Macintosh)"
#: ../rules/base.xml.in.h:553
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
-
-#: ../rules/base.xml.in.h:554
-msgid "Winkeys"
-msgstr "Win tuşları"
+msgid "Icelandic (Dvorak)"
+msgstr "İzlandaca (Dvorak)"
-#: ../rules/base.xml.in.h:555
-msgid "With &lt;\\|&gt; key"
-msgstr "&lt;\\|&gt; tuşuyla"
+#. Keyboard indicator for Hebrew layouts
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
+msgid "he"
+msgstr "he"
-#: ../rules/base.xml.in.h:556
-msgid "With EuroSign on 5"
-msgstr "€ sembolü ile 5 tuşu"
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
+msgid "Hebrew"
+msgstr "İbranice"
#: ../rules/base.xml.in.h:557
-msgid "With guillemets"
-msgstr "Açılı ayraçlarla"
+msgid "Hebrew (lyx)"
+msgstr "İbranice (lyx)"
#: ../rules/base.xml.in.h:558
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Genel Ağ Klavyesi"
+msgid "Hebrew (phonetic)"
+msgstr "İbranice (fonetik)"
#: ../rules/base.xml.in.h:559
-msgid "Yoruba"
-msgstr "Yoruba"
-
-#: ../rules/base.xml.in.h:560
-msgid "Z and ZHE swapped"
-msgstr "Z ile ZHE yer değiştirir"
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "İbranice (İncil, Acemi)"
-#: ../rules/base.xml.in.h:561
-msgid "Zar"
-msgstr "Zar"
+#. Keyboard indicator for Italian layouts
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
+msgid "it"
+msgstr "it"
-#: ../rules/base.xml.in.h:562
-msgid "azerty"
-msgstr "azerty"
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
+msgid "Italian"
+msgstr "İtalyanca"
#: ../rules/base.xml.in.h:563
-msgid "azerty/digits"
-msgstr "azerty/rakamlar"
+msgid "Italian (eliminate dead keys)"
+msgstr "İtalyanca"
#: ../rules/base.xml.in.h:564
-msgid "digits"
-msgstr "rakamlar"
+msgid "Italian (Winkeys)"
+msgstr "İtalyanca (Win tuşları)"
#: ../rules/base.xml.in.h:565
-msgid "displaced semicolon and quote (obsolete)"
-msgstr "noktalı virgül ve çift tırnak kalkar (atıl)"
+msgid "Italian (Macintosh)"
+msgstr "İtalyanca (Macintosh)"
#: ../rules/base.xml.in.h:566
-msgid "lyx"
-msgstr "lyx"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "İtalyanca (İtalyan harfleri ile Amerikan klavye)"
-#: ../rules/base.xml.in.h:567 ../rules/sun.xml.in.h:132
-msgid "qwerty"
-msgstr "qwerty"
+#: ../rules/base.xml.in.h:567
+msgid "Georgian (Italy)"
+msgstr "Gürcüce (İtalya)"
#: ../rules/base.xml.in.h:568
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, galişmiş Gerisilme"
+msgid "Italian (IBM 142)"
+msgstr "İtalyanca (IBM 142)"
-#: ../rules/base.xml.in.h:569
-msgid "qwerty/digits"
-msgstr "qwerty/rakamlar"
+#. Keyboard indicator for Japanese layouts
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
+msgid "ja"
+msgstr "ja"
-#: ../rules/base.xml.in.h:570
-msgid "qwertz"
-msgstr "qwertz"
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
+msgid "Japanese"
+msgstr "Japonca"
-#: ../rules/sun.xml.in.h:1
-msgid "\"Typewriter\""
-msgstr "\"Daktilo\""
+#: ../rules/base.xml.in.h:572
+msgid "Japanese (Kana)"
+msgstr "Japonca (Kana)"
-#: ../rules/sun.xml.in.h:17
-msgid "Acts as Shift with locking. Shift cancels Caps."
-msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu ise Caps Lock tuşunu keser."
+#: ../rules/base.xml.in.h:573
+msgid "Japanese (Kana 86)"
+msgstr "Japonca (Kana 86)"
-#: ../rules/sun.xml.in.h:18
-msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu Caps Lock'u kesmez"
+#: ../rules/base.xml.in.h:574
+msgid "Japanese (OADG 109A)"
+msgstr "Japonca (OADG 109A)"
-#: ../rules/sun.xml.in.h:19
-msgid "Alt+Control changes group"
-msgstr "Alt+Ctrl grubu değiştirir."
+#: ../rules/base.xml.in.h:575
+msgid "Japanese (Macintosh)"
+msgstr "Japonca (Macintosh)"
-#: ../rules/sun.xml.in.h:20
-msgid "Alt+Shift changes group"
-msgstr "Alt+Shift grubu değiştirir."
+#: ../rules/base.xml.in.h:576
+msgid "Japanese (Dvorak)"
+msgstr "Japonca (Dvorak)"
-#: ../rules/sun.xml.in.h:21
-msgid "Basic"
-msgstr "Temel"
+#. Keyboard indicator for Kikuyu layouts
+#: ../rules/base.xml.in.h:578
+msgid "ki"
+msgstr "ki"
-#: ../rules/sun.xml.in.h:23
-msgid "Belgian"
-msgstr "Belçikaca"
+#: ../rules/base.xml.in.h:579
+msgid "Kyrgyz"
+msgstr "Kırgızca"
-#: ../rules/sun.xml.in.h:25
-msgid "Both Alt keys together change group"
-msgstr "Alt tuşları birlikte grubu değiştirir"
+#: ../rules/base.xml.in.h:580
+msgid "Kyrgyz (phonetic)"
+msgstr "Kırgızca (fonetik)"
-#: ../rules/sun.xml.in.h:26
-msgid "Both Ctrl keys together change group"
-msgstr "Ctrl tuşları birlikte grubu değiştirir"
+#. Keyboard indicator for Khmer layouts
+#: ../rules/base.xml.in.h:582
+msgid "km"
+msgstr "km"
-#: ../rules/sun.xml.in.h:27
-msgid "Both Shift keys together change group"
-msgstr "Shift tuşları birlikte grubu değiştirir"
+#: ../rules/base.xml.in.h:583
+msgid "Khmer (Cambodia)"
+msgstr "Kmerce (Kamboçya)"
-#: ../rules/sun.xml.in.h:28
-msgid "Bulgarian"
-msgstr "Bulgarca"
+#. Keyboard indicator for Kazakh layouts
+#: ../rules/base.xml.in.h:585
+msgid "kk"
+msgstr "kk"
-#: ../rules/sun.xml.in.h:30
-msgid "Canadian"
-msgstr "Kanadaca"
+#: ../rules/base.xml.in.h:586
+msgid "Kazakh"
+msgstr "Kazakça"
-#: ../rules/sun.xml.in.h:31
-msgid "Caps Lock is Compose"
-msgstr "CapsLock tuşu karakter birleşimi yapar"
+#: ../rules/base.xml.in.h:587
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "Rusça (Kazakistan, Kazakça ile)"
-#: ../rules/sun.xml.in.h:32
-msgid "Caps Lock key changes group"
-msgstr "Caps Lock tuşu grubu değiştirir"
+#: ../rules/base.xml.in.h:588
+msgid "Kazakh (with Russian)"
+msgstr "Kazakça (Rusça ile)"
-#: ../rules/sun.xml.in.h:34
-msgid "Caps_Lock LED shows alternative group"
-msgstr "Caps Lock LED'i diğer grubu gösterir"
+#. Keyboard indicator for Lao layouts
+#: ../rules/base.xml.in.h:590
+msgid "lo"
+msgstr "lo"
-#: ../rules/sun.xml.in.h:35
-msgid "Control Key Position"
-msgstr "Ctrl tuşunun yeri"
+#: ../rules/base.xml.in.h:591
+msgid "Lao"
+msgstr "Lao"
-#: ../rules/sun.xml.in.h:36
-msgid "Control key at bottom left"
-msgstr "Sol alttaki Ctrl tuşu"
+#: ../rules/base.xml.in.h:592
+msgid "Lao (STEA proposed standard layout)"
+msgstr "Laoca (STEA önerilen standart düzen)"
-#: ../rules/sun.xml.in.h:37
-msgid "Control key at left of 'A'"
-msgstr "'A'nın solundaki Ctrl Tuşu"
+#. Keyboard indicator for Spanish layouts
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
+msgid "es"
+msgstr "es"
-#: ../rules/sun.xml.in.h:38
-msgid "Control+Shift changes group"
-msgstr "Ctrl+Shift tuşları grubu değiştirir"
+#: ../rules/base.xml.in.h:595
+msgid "Spanish (Latin American)"
+msgstr "İspanyolca (Latin Amerikan)"
-#: ../rules/sun.xml.in.h:40
-msgid "Czech"
-msgstr "Çekçe"
+#: ../rules/base.xml.in.h:596
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "İspanyolca (Latin Amerikan, ölü tuşlar olmadan)"
-#: ../rules/sun.xml.in.h:41
-msgid "Danish"
-msgstr "Danca"
+#: ../rules/base.xml.in.h:597
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "İspanyolca (Latin Amerikan, ölü tilda içerir)"
-#: ../rules/sun.xml.in.h:45
-msgid "DeuCH"
-msgstr "DeuCH"
+#: ../rules/base.xml.in.h:598
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "İspanyolca (Latin Amerikan, Sun ölü tuşlar)"
-#: ../rules/sun.xml.in.h:47
-msgid "Dvo"
-msgstr "Dvo"
+#. Keyboard indicator for Lithuanian layouts
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:31
+msgid "lt"
+msgstr "lt"
-#: ../rules/sun.xml.in.h:52
-msgid "Finnish"
-msgstr "Fince"
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
+msgid "Lithuanian"
+msgstr "Litvanca"
-#: ../rules/sun.xml.in.h:54
-msgid "FraCH"
-msgstr "FraCH"
+#: ../rules/base.xml.in.h:602
+msgid "Lithuanian (standard)"
+msgstr "Litvanca (standart)"
-#: ../rules/sun.xml.in.h:57
-msgid "German"
-msgstr "Almanca"
+#: ../rules/base.xml.in.h:603
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "Litvanca (Litvanya harfleri ile Amerikan klavye)"
-#: ../rules/sun.xml.in.h:58
-msgid "Group Shift/Lock behavior"
-msgstr "Shift/Lock Grubu davranışı"
+#: ../rules/base.xml.in.h:604
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "Litvanca (IBM LST 1205-92)"
-#: ../rules/sun.xml.in.h:60
-msgid "Hungarian"
-msgstr "Macarca"
+#: ../rules/base.xml.in.h:605
+msgid "Lithuanian (LEKP)"
+msgstr "Litvanca (LEKP)"
-#: ../rules/sun.xml.in.h:64
-msgid "Italian"
-msgstr "İtalyanca"
+#: ../rules/base.xml.in.h:606
+msgid "Lithuanian (LEKPa)"
+msgstr "Litvanca (LEKPa)"
-#: ../rules/sun.xml.in.h:65
-msgid "Japanese"
-msgstr "Japonca"
+#. Keyboard indicator for Latvian layouts
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
+msgid "lv"
+msgstr "lv"
-#: ../rules/sun.xml.in.h:67
-msgid "Left Alt key changes group"
-msgstr "Soldaki Alt tuşu grubu değiştirir"
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
+msgid "Latvian"
+msgstr "Letonca"
-#: ../rules/sun.xml.in.h:68
-msgid "Left Alt key switches group while pressed"
-msgstr "Soldaki Alt tuşu basılıyken diğer grup etkin olur"
+#: ../rules/base.xml.in.h:610
+msgid "Latvian (apostrophe variant)"
+msgstr "Letonca (kesme işareti türevi)"
-#: ../rules/sun.xml.in.h:69
-msgid "Left Ctrl key changes group"
-msgstr "Soldaki Ctrl tuşu grubu değiştirir"
+#: ../rules/base.xml.in.h:611
+msgid "Latvian (tilde variant)"
+msgstr "Letonca (tilda türevi)"
-#: ../rules/sun.xml.in.h:70
-msgid "Left Shift key changes group"
-msgstr "Soldaki Shift tuşu grubu değiştirir"
+#: ../rules/base.xml.in.h:612
+msgid "Latvian (F variant)"
+msgstr "Litvanca (F biçiminde)"
-#: ../rules/sun.xml.in.h:71
-msgid "Make CapsLock an additional Control"
-msgstr "CapsLock tuşunu ek bir Ctrl tuşu yapar"
+#: ../rules/base.xml.in.h:613
+msgid "Latvian (modern)"
+msgstr "Litvanca (modern)"
+
+#: ../rules/base.xml.in.h:614
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Litvanca (ergonomik, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:615
+msgid "Latvian (adapted)"
+msgstr "Litvanca (uyarlanmış)"
-#: ../rules/sun.xml.in.h:76
+#. Keyboard indicator for Maori layouts
+#: ../rules/base.xml.in.h:617
+msgid "mi"
+msgstr "mi"
+
+#: ../rules/base.xml.in.h:618
+msgid "Maori"
+msgstr "Mayorka"
+
+#. Keyboard indicator for Serbian layouts
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
+msgid "sr"
+msgstr "sr"
+
+#: ../rules/base.xml.in.h:621
+msgid "Montenegrin"
+msgstr "Karadağca"
+
+#: ../rules/base.xml.in.h:622
+msgid "Montenegrin (Cyrillic)"
+msgstr "Karadağca (Cyrillic)"
+
+#: ../rules/base.xml.in.h:623
+msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
+msgstr "Karadağca (Kiril, ZE ve ZHE değiştirilmiş)"
+
+#: ../rules/base.xml.in.h:624
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Karadağca (Latin Unicode)"
+
+#: ../rules/base.xml.in.h:625
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Karadağca (Latin qwerty)"
+
+#: ../rules/base.xml.in.h:626
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Karadağca (Latin Unicode qwerty)"
+
+#: ../rules/base.xml.in.h:627
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "Karadağca (tırnak işareti ile Kirilce)"
+
+#: ../rules/base.xml.in.h:628
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "Karadağca (tırnak işareti ile Latice)"
+
+#. Keyboard indicator for Macedonian layouts
+#: ../rules/base.xml.in.h:630
+msgid "mk"
+msgstr "mk"
+
+#: ../rules/base.xml.in.h:631
+msgid "Macedonian"
+msgstr "Makedonca"
+
+#: ../rules/base.xml.in.h:632
+msgid "Macedonian (eliminate dead keys)"
+msgstr "Makedonca (ölü tuşlar olmadan)"
+
+#. Keyboard indicator for Maltese layouts
+#: ../rules/base.xml.in.h:634
+msgid "mt"
+msgstr "mt"
+
+#: ../rules/base.xml.in.h:635
+msgid "Maltese"
+msgstr "Maltaca"
+
+#: ../rules/base.xml.in.h:636
+msgid "Maltese (with US layout)"
+msgstr "Maltaca (Amerikan düzeni ile)"
+
+#. Keyboard indicator for Mongolian layouts
+#: ../rules/base.xml.in.h:638
+msgid "mn"
+msgstr "mn"
+
+#: ../rules/base.xml.in.h:639
+msgid "Mongolian"
+msgstr "Moğolca"
+
+#. Keyboard indicator for Norwegian layouts
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
+msgid "no"
+msgstr "no"
+
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
msgid "Norwegian"
msgstr "Norveçce"
-#: ../rules/sun.xml.in.h:77
-msgid "Num_Lock LED shows alternative group"
-msgstr "Num_Lock LED'i diğer grubu gösterir"
+#: ../rules/base.xml.in.h:643
+msgid "Norwegian (eliminate dead keys)"
+msgstr "Norveççe (ölü tuşlar olmadan)"
-#: ../rules/sun.xml.in.h:80
+#: ../rules/base.xml.in.h:644
+msgid "Norwegian (Winkeys)"
+msgstr "Norveççe (Win tuşları)"
+
+#: ../rules/base.xml.in.h:645
+msgid "Norwegian (Dvorak)"
+msgstr "Norveççe (Dvorak)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Northern Saami (Norway)"
+msgstr "Kuzey Saamice (Norveç)"
+
+#: ../rules/base.xml.in.h:647
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Kuzey Saamice (Norveç, ölü tuşlar olmadan)"
+
+#: ../rules/base.xml.in.h:648
+msgid "Norwegian (Macintosh)"
+msgstr "Norveççe (Macintosh)"
+
+#: ../rules/base.xml.in.h:649
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Norveççe (Macintosh, ölü tuşlar olmadan)"
+
+#: ../rules/base.xml.in.h:650
+msgid "Norwegian (Colemak)"
+msgstr "Norveççe (Colemak)"
+
+#. Keyboard indicator for Polish layouts
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
+msgid "pl"
+msgstr "pl"
+
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
msgid "Polish"
msgstr "Polonez"
-#: ../rules/sun.xml.in.h:81
-msgid "Polish with Polish quotes on key \"1/!\""
-msgstr "Lehçe, \"1/!\" tuşunda Lehçe tırnaklar"
+#: ../rules/base.xml.in.h:654
+msgid "Polish (legacy)"
+msgstr "Lehçe (eski)"
+
+#: ../rules/base.xml.in.h:655
+msgid "Polish (qwertz)"
+msgstr "Lehçe (qwertz)"
+
+#: ../rules/base.xml.in.h:656
+msgid "Polish (Dvorak)"
+msgstr "Lehçe (Dvorak)"
+
+#: ../rules/base.xml.in.h:657
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "Lehçe (Dvorak, Lehçe tırnak işraketi)"
-#: ../rules/sun.xml.in.h:82
+#: ../rules/base.xml.in.h:658
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "Lehçe (Dvorak, 1 tuşunda Lehçe tırnak işareti)"
+
+#: ../rules/base.xml.in.h:659
+msgid "Kashubian"
+msgstr "Kaşubyalı"
+
+#: ../rules/base.xml.in.h:660
+msgid "Silesian"
+msgstr "Silesian"
+
+#: ../rules/base.xml.in.h:661
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "Rusça (Polonya, fonetik Dvorak)"
+
+#: ../rules/base.xml.in.h:662
+msgid "Polish (programmer Dvorak)"
+msgstr "Lehçe (programcı Dvorak)"
+
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
msgid "Portuguese"
msgstr "Portekizce"
-#: ../rules/sun.xml.in.h:83
-msgid "Press Left Alt key to choose 3rd level"
-msgstr "3. seviyeyi seçmek için soldaki Alt tuşuna basın"
+#: ../rules/base.xml.in.h:664
+msgid "Portuguese (eliminate dead keys)"
+msgstr "Portekizce (ölü tuşlar olmadan)"
+
+#: ../rules/base.xml.in.h:665
+msgid "Portuguese (Sun dead keys)"
+msgstr "Portekizce (Sun ölü tuşlar)"
+
+#: ../rules/base.xml.in.h:666
+msgid "Portuguese (Macintosh)"
+msgstr "Portekizce (Macintosh)"
-#: ../rules/sun.xml.in.h:84
-msgid "Press Right Alt key to choose 3rd level"
-msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın"
+#: ../rules/base.xml.in.h:667
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portekizce (Macintosh, ölü tuşlar olmadan)"
-#: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın, Sağdaki Alt tuşuyla birlikte Shift tuşu AltGr gibi davranır"
+#: ../rules/base.xml.in.h:668
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portekizce (Macintosh, Sun ölü tuşları)"
-#: ../rules/sun.xml.in.h:86
-msgid "Press Right Control to choose 3rd level"
-msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın"
+#: ../rules/base.xml.in.h:669
+msgid "Portuguese (Nativo)"
+msgstr "Portekizce (Yerel)"
-#: ../rules/sun.xml.in.h:87
-msgid "Press any of Alt keys to choose 3rd level"
-msgstr "3. seviyeyi seçmek için Alt tuşlarından birine basın"
+#: ../rules/base.xml.in.h:670
+msgid "Portuguese (Nativo for US keyboards)"
+msgstr "Portekizce (Amerikan klavye ile Yerel)"
-#: ../rules/sun.xml.in.h:89
-msgid "Right Alt key changes group"
-msgstr "Sağdaki Alt tuşu grubu değiştirir"
+#: ../rules/base.xml.in.h:671
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Esperanto (Portekiz, Yerel)"
-#: ../rules/sun.xml.in.h:91
-msgid "Right Alt switches group while pressed"
-msgstr "Sağdaki Alt tuşu basılıyken diğer grup etkin olur"
+#. Keyboard indicator for Romanian layouts
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
+msgid "ro"
+msgstr "ro"
-#: ../rules/sun.xml.in.h:92
-msgid "Right Control key works as Right Alt"
-msgstr "Sağdaki Ctrl tuşu sağdaki Alt tuşu gibi çalışır"
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
+msgid "Romanian"
+msgstr "Rumence"
-#: ../rules/sun.xml.in.h:93
-msgid "Right Ctrl key changes group"
-msgstr "Sağdaki Ctrl tuşu grubu değiştirir"
+#: ../rules/base.xml.in.h:675
+msgid "Romanian (cedilla)"
+msgstr "Rumence (alt çizgi)"
-#: ../rules/sun.xml.in.h:94
-msgid "Right Shift key changes group"
-msgstr "Sağdaki Shift tuşu grubu değiştirir"
+#: ../rules/base.xml.in.h:676
+msgid "Romanian (standard)"
+msgstr "Rumence (standart)"
-#: ../rules/sun.xml.in.h:97
-msgid "Scroll Lock changes group"
-msgstr "Scroll Lock grubu değiştirir"
+#: ../rules/base.xml.in.h:677
+msgid "Romanian (standard cedilla)"
+msgstr "Rumence (standart alt çizgi)"
-#: ../rules/sun.xml.in.h:98
-msgid "Scroll_Lock LED shows alternative group"
-msgstr "Scroll_Lock LED'i diğer grubu gösterir"
+#: ../rules/base.xml.in.h:678
+msgid "Romanian (WinKeys)"
+msgstr "Rumence (Win Tuşları)"
-#: ../rules/sun.xml.in.h:99
-msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Sayısal tuştakımı Shift ile MS Windows'daki gibi çalışır"
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
+msgid "Russian"
+msgstr "Rusça"
-#: ../rules/sun.xml.in.h:100
-msgid "Shift+CapsLock changes group"
-msgstr "Shift+CapsLock tuşları grubu değiştirir"
+#: ../rules/base.xml.in.h:680
+msgid "Russian (phonetic)"
+msgstr "Rusça (fonetik)"
-#: ../rules/sun.xml.in.h:101
+#: ../rules/base.xml.in.h:681
+msgid "Russian (phonetic WinKeys)"
+msgstr "Rusça (fonetik Win Tuşları)"
+
+#: ../rules/base.xml.in.h:682
+msgid "Russian (typewriter)"
+msgstr "Rusça (daktilo)"
+
+#: ../rules/base.xml.in.h:683
+msgid "Russian (legacy)"
+msgstr "Rusça (eski)"
+
+#: ../rules/base.xml.in.h:684
+msgid "Russian (typewriter, legacy)"
+msgstr "Rusça (daktilo, eski)"
+
+#: ../rules/base.xml.in.h:685
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:686
+msgid "Ossetian (legacy)"
+msgstr "Osetçe (eski)"
+
+#: ../rules/base.xml.in.h:687
+msgid "Ossetian (WinKeys)"
+msgstr "Osetçe (Win Tuşları)"
+
+#: ../rules/base.xml.in.h:688
+msgid "Chuvash"
+msgstr "Çuvaş"
+
+#: ../rules/base.xml.in.h:689
+msgid "Chuvash (Latin)"
+msgstr "Çuvaşça (Latin)"
+
+#: ../rules/base.xml.in.h:690
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: ../rules/base.xml.in.h:691
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:692
+msgid "Yakut"
+msgstr "Yakutça"
+
+#: ../rules/base.xml.in.h:693
+msgid "Kalmyk"
+msgstr "Kalmıkça"
+
+#: ../rules/base.xml.in.h:694
+msgid "Russian (DOS)"
+msgstr "Rusça (DOS)"
+
+#: ../rules/base.xml.in.h:695
+msgid "Russian (Macintosh)"
+msgstr "Rusça (Macintosh)"
+
+#: ../rules/base.xml.in.h:696
+msgid "Serbian (Russia)"
+msgstr "Sırpça (Rusya)"
+
+#: ../rules/base.xml.in.h:697
+msgid "Bashkirian"
+msgstr "Başkurtça"
+
+#: ../rules/base.xml.in.h:698
+msgid "Mari"
+msgstr "Mari Dili"
+
+#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
+msgid "Serbian"
+msgstr "Sırpça"
+
+#: ../rules/base.xml.in.h:700
+msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
+msgstr "Sırpça (Kiril, ZE ve ZHE değiştirilmiş)"
+
+#: ../rules/base.xml.in.h:701
+msgid "Serbian (Latin)"
+msgstr "Sırpça (Latin)"
+
+#: ../rules/base.xml.in.h:702
+msgid "Serbian (Latin Unicode)"
+msgstr "Sırpça (Latin Unicode)"
+
+#: ../rules/base.xml.in.h:703
+msgid "Serbian (Latin qwerty)"
+msgstr "Sırpça (Latin qwerty)"
+
+#: ../rules/base.xml.in.h:704
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "Sırpça (Latin Unicode qwerty)"
+
+#: ../rules/base.xml.in.h:705
+msgid "Serbian (Cyrillic with guillemets)"
+msgstr "Sırpça (tırnak işareti ile Kiril)"
+
+#: ../rules/base.xml.in.h:706
+msgid "Serbian (Latin with guillemets)"
+msgstr "Sırpça (tırnak işareti ile Latin)"
+
+#: ../rules/base.xml.in.h:707
+msgid "Pannonian Rusyn"
+msgstr "Panoniyen Rusyn"
+
+#. Keyboard indicator for Slovenian layouts
+#: ../rules/base.xml.in.h:709
+msgid "sl"
+msgstr "sl"
+
+#: ../rules/base.xml.in.h:710
+msgid "Slovenian"
+msgstr "Slovence"
+
+#: ../rules/base.xml.in.h:711
+msgid "Slovenian (with guillemets for quotes)"
+msgstr "Slovence (alıntılar için tırnak işareti ile)"
+
+#: ../rules/base.xml.in.h:712
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "Slovence (Sloven harfleri ile Amerikan klavye)"
+
+#. Keyboard indicator for Slovak layouts
+#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:122
+msgid "sk"
+msgstr "sk"
+
+#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
msgid "Slovak"
msgstr "Slovakça"
-#: ../rules/sun.xml.in.h:102
+#: ../rules/base.xml.in.h:716
+msgid "Slovak (extended Backslash)"
+msgstr "Slovakça (genişleşletilmiş ters bölü işareti ile)"
+
+#: ../rules/base.xml.in.h:717
+msgid "Slovak (qwerty)"
+msgstr "Slovakça (qwerty)"
+
+#: ../rules/base.xml.in.h:718
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "Slovakça (qwerty, genişletilmiş ters bölü işareti ile)"
+
+#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
msgid "Spanish"
msgstr "İspanyolca"
-#: ../rules/sun.xml.in.h:105
-msgid "Sun Type 4"
-msgstr "Sun 4. tür"
+#: ../rules/base.xml.in.h:720
+msgid "Spanish (eliminate dead keys)"
+msgstr "İspanyolca (ölü tuşlar olmadan)"
-#: ../rules/sun.xml.in.h:106
-msgid "Sun Type 5"
-msgstr "Sun 5. Tür"
+#: ../rules/base.xml.in.h:721
+msgid "Spanish (Winkeys)"
+msgstr "İspanyolca (Win tuşları)"
-#: ../rules/sun.xml.in.h:107
-msgid "Sun Type 5 European"
-msgstr "Sun 5. tür Avrupa"
+#: ../rules/base.xml.in.h:722
+msgid "Spanish (include dead tilde)"
+msgstr "İspanyolca (ölü tilda dahil)"
-#: ../rules/sun.xml.in.h:108
-msgid "Sun Type 5 Unix"
-msgstr "Sun 5. tür, Unix"
+#: ../rules/base.xml.in.h:723
+msgid "Spanish (Sun dead keys)"
+msgstr "İspanyolca (Sun ölü tuşları)"
-#: ../rules/sun.xml.in.h:109
-msgid "Sun Type 6"
-msgstr "Sun 6. tür"
+#: ../rules/base.xml.in.h:724
+msgid "Spanish (Dvorak)"
+msgstr "İspanyolca (Dvorak)"
-#: ../rules/sun.xml.in.h:110
-msgid "Sun Type 6 Unix"
-msgstr "Sun 6. tür, Unix"
+#: ../rules/base.xml.in.h:725
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturyasça (İspanya, alt nokta H ve alt nokta L ile)"
-#: ../rules/sun.xml.in.h:111
-msgid "Sun Type 6 with Euro key"
-msgstr "Sun 6. Tür, € tuşlu"
+#: ../rules/base.xml.in.h:726
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Katalanca (İspanya, orta nokta L ile)"
-#: ../rules/sun.xml.in.h:114
-msgid "Swap Control and Caps Lock"
-msgstr "Ctrl ile Caps Lock yer değiştirir"
+#: ../rules/base.xml.in.h:727
+msgid "Spanish (Macintosh)"
+msgstr "İspanyolca (Macintosh)"
-#: ../rules/sun.xml.in.h:116
+#. Keyboard indicator for Swedish layouts
+#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
+msgid "sv"
+msgstr "sv"
+
+#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
msgid "Swedish"
msgstr "İsveçce"
-#: ../rules/sun.xml.in.h:117
-msgid "Swiss French"
-msgstr "İsviçre Fransızcası"
+#: ../rules/base.xml.in.h:731
+msgid "Swedish (eliminate dead keys)"
+msgstr "İsveççe (ölü tuşlar olmadan)"
+
+#: ../rules/base.xml.in.h:732
+msgid "Swedish (Dvorak)"
+msgstr "İsveççe (Dvorak)"
-#: ../rules/sun.xml.in.h:118
-msgid "Swiss German"
-msgstr "İsviçre Almancası"
+#: ../rules/base.xml.in.h:733
+msgid "Russian (Sweden, phonetic)"
+msgstr "Rusça (İsveç, fonetik)"
-#: ../rules/sun.xml.in.h:121
+#: ../rules/base.xml.in.h:734
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "Rusça (İsveç, fonetik, ölü tuşlar olmadan)"
+
+#: ../rules/base.xml.in.h:735
+msgid "Northern Saami (Sweden)"
+msgstr "Kuzey Saamice (İsveç)"
+
+#: ../rules/base.xml.in.h:736
+msgid "Swedish (Macintosh)"
+msgstr "İsveççe (Macintosh)"
+
+#: ../rules/base.xml.in.h:737
+msgid "Swedish (Svdvorak)"
+msgstr "İsveççe (Svdvorak)"
+
+#: ../rules/base.xml.in.h:738
+msgid "Swedish Sign Language"
+msgstr "İsveççe İşaret Dili"
+
+#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
+msgid "German (Switzerland)"
+msgstr "Almanca (İsviçre)"
+
+#: ../rules/base.xml.in.h:740
+msgid "German (Switzerland, legacy)"
+msgstr "Almanca (İsviçre, eski)"
+
+#: ../rules/base.xml.in.h:741
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "Almanca (İsviçre, ölü tuşlar olmadan)"
+
+#: ../rules/base.xml.in.h:742
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "Almanca (İsviçre, Sun ölü tuşları)"
+
+#: ../rules/base.xml.in.h:743
+msgid "French (Switzerland)"
+msgstr "Fransızca (İsviçre)"
+
+#: ../rules/base.xml.in.h:744
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "Fransızca (İsviçre, ölü tuşlar olmadan)"
+
+#: ../rules/base.xml.in.h:745
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "Fransızca (İsviçre, Sun ölü tuşları)"
+
+#: ../rules/base.xml.in.h:746
+msgid "French (Switzerland, Macintosh)"
+msgstr "Fransızca (İsviçre, Macintosh)"
+
+#: ../rules/base.xml.in.h:747
+msgid "German (Switzerland, Macintosh)"
+msgstr "Almanca (İsviçre, Macintosh)"
+
+#: ../rules/base.xml.in.h:748
+msgid "Arabic (Syria)"
+msgstr "Arapça (Suriye)"
+
+#. Keyboard indicator for Syriac layouts
+#: ../rules/base.xml.in.h:750
+msgid "syc"
+msgstr "syc"
+
+#: ../rules/base.xml.in.h:751
+msgid "Syriac"
+msgstr "Suriye"
+
+#: ../rules/base.xml.in.h:752
+msgid "Syriac (phonetic)"
+msgstr "Süryanice (fonetik)"
+
+#: ../rules/base.xml.in.h:753
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "Kürtçe (Suriye, Latin Q)"
+
+#: ../rules/base.xml.in.h:754
+msgid "Kurdish (Syria, F)"
+msgstr "Kürtçe (Suriye, F)"
+
+#: ../rules/base.xml.in.h:755
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "Kürtçe (Suriye, Latin Alt-Q)"
+
+#. Keyboard indicator for Tajik layouts
+#: ../rules/base.xml.in.h:757
+msgid "tg"
+msgstr "tg"
+
+#: ../rules/base.xml.in.h:758
+msgid "Tajik"
+msgstr "Tacikçe"
+
+#: ../rules/base.xml.in.h:759
+msgid "Tajik (legacy)"
+msgstr "Tacikçe (eski)"
+
+#. Keyboard indicator for Sinhala layouts
+#: ../rules/base.xml.in.h:761
+msgid "si"
+msgstr "si"
+
+#: ../rules/base.xml.in.h:762
+msgid "Sinhala (phonetic)"
+msgstr "Sinhala (fonetik)"
+
+#: ../rules/base.xml.in.h:763
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr "Tamilce (Sri Lanka, Unicode)"
+
+#: ../rules/base.xml.in.h:764
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "Tamice (Sri Lanka, TAB Daktilo)"
+
+#. Keyboard indicator for Thai layouts
+#: ../rules/base.xml.in.h:766
+msgid "th"
+msgstr "th"
+
+#: ../rules/base.xml.in.h:767
+msgid "Thai"
+msgstr "Tayca"
+
+#: ../rules/base.xml.in.h:768
+msgid "Thai (TIS-820.2538)"
+msgstr "Tayca (TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:769
+msgid "Thai (Pattachote)"
+msgstr "Tayca (Pattachote)"
+
+#. Keyboard indicator for Turkish layouts
+#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
+msgid "tr"
+msgstr "tr"
+
+#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
msgid "Turkish"
msgstr "Türkçe Q Klavye"
-#: ../rules/sun.xml.in.h:122
+#: ../rules/base.xml.in.h:773
msgid "Turkish (F)"
msgstr "Türkçe F klavye"
-#: ../rules/sun.xml.in.h:123
-msgid "Turkish Alt-Q Layout"
-msgstr "Türkçe Alt-Q (yazılımcılar ve dizüstü) klavye"
+#: ../rules/base.xml.in.h:774
+msgid "Turkish (Alt-Q)"
+msgstr "Türkçe (Alt-Q)"
+
+#: ../rules/base.xml.in.h:775
+msgid "Turkish (Sun dead keys)"
+msgstr "Türkçe (Sun ölü tuşlar)"
+
+#: ../rules/base.xml.in.h:776
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "Kürtçe (Türkiye, Latin Q)"
+
+#: ../rules/base.xml.in.h:777
+msgid "Kurdish (Turkey, F)"
+msgstr "Kürtçe (Türkiye, F)"
+
+#: ../rules/base.xml.in.h:778
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "Kürtçe (Türkiye, Latin Alt-Q)"
+
+#: ../rules/base.xml.in.h:779
+msgid "Turkish (international with dead keys)"
+msgstr "Türkçe (uluslararası ve ölü tuşlar ile)"
+
+#. Keyboard indicator for Crimean Tatar layouts
+#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:62
+msgid "crh"
+msgstr "crh"
+
+#: ../rules/base.xml.in.h:782
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Kırım Tatarcası (Türkçe Q)"
+
+#: ../rules/base.xml.in.h:783
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Kırım Tatarcası (Türkçe F)"
+
+#: ../rules/base.xml.in.h:784
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Kırım Tatarcası (Türkçe Alt-Q)"
+
+#: ../rules/base.xml.in.h:785
+msgid "Taiwanese"
+msgstr "Tayvanca"
+
+#: ../rules/base.xml.in.h:786
+msgid "Taiwanese (indigenous)"
+msgstr "Tayvanca (yöreye özgü)"
+
+#. Keyboard indicator for Saisiyat layouts
+#: ../rules/base.xml.in.h:788
+msgid "xsy"
+msgstr "xsy"
+
+#: ../rules/base.xml.in.h:789
+msgid "Saisiyat (Taiwan)"
+msgstr "Saisiyat (Tayvan)"
+
+#. Keyboard indicator for Ukranian layouts
+#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
+msgid "uk"
+msgstr "uk"
+
+#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
+msgid "Ukrainian"
+msgstr "Ukraynaca"
+
+#: ../rules/base.xml.in.h:793
+msgid "Ukrainian (phonetic)"
+msgstr "Ukraynaca (fonetik)"
+
+#: ../rules/base.xml.in.h:794
+msgid "Ukrainian (typewriter)"
+msgstr "Ukraynaca (daktilo)"
+
+#: ../rules/base.xml.in.h:795
+msgid "Ukrainian (WinKeys)"
+msgstr "Ukraynaca (Win Tuşları)"
+
+#: ../rules/base.xml.in.h:796
+msgid "Ukrainian (legacy)"
+msgstr "Ukraynaca (eski)"
+
+#: ../rules/base.xml.in.h:797
+msgid "Ukrainian (standard RSTU)"
+msgstr "Ukraynaca (standart RSTU)"
+
+#: ../rules/base.xml.in.h:798
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Rusça (Ukrayna, standart RSTU)"
+
+#: ../rules/base.xml.in.h:799
+msgid "Ukrainian (homophonic)"
+msgstr "Ukraynaca (eşsesli)"
+
+#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
+msgid "English (UK)"
+msgstr "İngilizce (İngiltere)"
+
+#: ../rules/base.xml.in.h:801
+msgid "English (UK, extended WinKeys)"
+msgstr "İngilizce (İngiltere, genişletilmiş WinKeys)"
+
+#: ../rules/base.xml.in.h:802
+msgid "English (UK, international with dead keys)"
+msgstr "İngilizce (İngiltere, uluslararası ve ölü tuşlar ile)"
+
+#: ../rules/base.xml.in.h:803
+msgid "English (UK, Dvorak)"
+msgstr "İngilizce (İngiltere, Dvorak)"
+
+#: ../rules/base.xml.in.h:804
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "İngilizce (İngiltere, İngiliz noktalama ile Dvorak)"
+
+#: ../rules/base.xml.in.h:805
+msgid "English (UK, Macintosh)"
+msgstr "İngilizce (İngiltere, Macintosh)"
+
+#: ../rules/base.xml.in.h:806
+msgid "English (UK, Macintosh international)"
+msgstr "İngilizce (İngiltere, uluslararası Macintosh)"
+
+#: ../rules/base.xml.in.h:807
+msgid "English (UK, Colemak)"
+msgstr "İngilizce (İngiltere, Colemak)"
+
+#: ../rules/base.xml.in.h:808
+msgid "Uzbek"
+msgstr "Özbekçe"
+
+#: ../rules/base.xml.in.h:809
+msgid "Uzbek (Latin)"
+msgstr "Özbekçe (Latin)"
+
+#. Keyboard indicator for Vietnamese layouts
+#: ../rules/base.xml.in.h:811
+msgid "vi"
+msgstr "vi"
+
+#: ../rules/base.xml.in.h:812
+msgid "Vietnamese"
+msgstr "Vietnamca"
+
+#. Keyboard indicator for Korean layouts
+#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
+msgid "ko"
+msgstr "ko"
+
+#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
+msgid "Korean"
+msgstr "Korece"
+
+#: ../rules/base.xml.in.h:816
+msgid "Korean (101/104 key compatible)"
+msgstr "Korece (101/104 tuş uyumlu)"
+
+#: ../rules/base.xml.in.h:817
+msgid "Japanese (PC-98xx Series)"
+msgstr "Japonca (PC-99xx Serisi)"
+
+#. Keyboard indicator for Irish layouts
+#: ../rules/base.xml.in.h:819
+msgid "ie"
+msgstr "ie"
+
+#: ../rules/base.xml.in.h:820
+msgid "Irish"
+msgstr "İrlandaca"
+
+#: ../rules/base.xml.in.h:821
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:822
+msgid "Irish (UnicodeExpert)"
+msgstr "İrlandaca (UnicodeExpert)"
+
+#: ../rules/base.xml.in.h:823
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:824
+msgid "Ogham (IS434)"
+msgstr "Ogham (IS434)"
+
+#: ../rules/base.xml.in.h:825
+msgid "Urdu (Pakistan)"
+msgstr "Urduca (Pakistan)"
+
+#: ../rules/base.xml.in.h:826
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "Urduca (Pakistan, CRULP)"
+
+#: ../rules/base.xml.in.h:827
+msgid "Urdu (Pakistan, NLA)"
+msgstr "Urduca (Pakistan, NLA)"
+
+#: ../rules/base.xml.in.h:828
+msgid "Arabic (Pakistan)"
+msgstr "Arapça (Pakistan)"
+
+#. Keyboard indicator for Sindhi layouts
+#: ../rules/base.xml.in.h:830
+msgid "sd"
+msgstr "sd"
+
+#: ../rules/base.xml.in.h:831
+msgid "Sindhi"
+msgstr "Sintçe"
+
+#. Keyboard indicator for Dhivehi layouts
+#: ../rules/base.xml.in.h:833
+msgid "dv"
+msgstr "dv"
+
+#: ../rules/base.xml.in.h:834
+msgid "Dhivehi"
+msgstr "Dhivehi"
+
+#: ../rules/base.xml.in.h:835
+msgid "English (South Africa)"
+msgstr "İngilizce (Güney Afrika)"
+
+#. Keyboard indicator for Esperanto layouts
+#: ../rules/base.xml.in.h:837
+msgid "eo"
+msgstr "eo"
+
+#: ../rules/base.xml.in.h:838
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:839
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "Esperanto (yerinden noktalı virgül, tırnak işarati, eski)"
+
+#. Keyboard indicator for Nepali layouts
+#: ../rules/base.xml.in.h:841
+msgid "ne"
+msgstr "ne"
+
+#: ../rules/base.xml.in.h:842
+msgid "Nepali"
+msgstr "Nepalce"
+
+#: ../rules/base.xml.in.h:843
+msgid "English (Nigeria)"
+msgstr "İngilizce (Nijerya)"
+
+#. Keyboard indicator for Igbo layouts
+#: ../rules/base.xml.in.h:845
+msgid "ig"
+msgstr "ig"
+
+#: ../rules/base.xml.in.h:846
+msgid "Igbo"
+msgstr "Igbo"
+
+#. Keyboard indicator for Yoruba layouts
+#: ../rules/base.xml.in.h:848
+msgid "yo"
+msgstr "yo"
+
+#: ../rules/base.xml.in.h:849
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#. Keyboard indicator for Amharic layouts
+#: ../rules/base.xml.in.h:851
+msgid "am"
+msgstr "am"
+
+#: ../rules/base.xml.in.h:852
+msgid "Amharic"
+msgstr "Amharca"
+
+#. Keyboard indicator for Wolof layouts
+#: ../rules/base.xml.in.h:854
+msgid "wo"
+msgstr "wo"
+
+#: ../rules/base.xml.in.h:855
+msgid "Wolof"
+msgstr "Volofça"
+
+#. Keyboard indicator for Braille layouts
+#: ../rules/base.xml.in.h:857
+msgid "brl"
+msgstr "brl"
+
+#: ../rules/base.xml.in.h:858
+msgid "Braille"
+msgstr "Üç noktalı"
+
+#: ../rules/base.xml.in.h:859
+msgid "Braille (left hand)"
+msgstr "Kör Alfabesi (sol el)"
+
+#: ../rules/base.xml.in.h:860
+msgid "Braille (right hand)"
+msgstr "Kör Alfabesi (sağ el)"
+
+#. Keyboard indicator for Turkmen layouts
+#: ../rules/base.xml.in.h:862
+msgid "tk"
+msgstr "tk"
+
+#: ../rules/base.xml.in.h:863
+msgid "Turkmen"
+msgstr "Türkmence"
+
+#: ../rules/base.xml.in.h:864
+msgid "Turkmen (Alt-Q)"
+msgstr "Türkmence (Alt-Q)"
+
+#. Keyboard indicator for Bambara layouts
+#: ../rules/base.xml.in.h:866
+msgid "bm"
+msgstr "bm"
+
+#: ../rules/base.xml.in.h:867
+msgid "Bambara"
+msgstr "Bambara"
+
+#: ../rules/base.xml.in.h:868
+msgid "French (Mali, alternative)"
+msgstr "Fransızca (Mali, alternatif)"
+
+#: ../rules/base.xml.in.h:869
+msgid "English (Mali, US Macintosh)"
+msgstr "İngilizce (Mali, Amerikan Macintosh)"
+
+#: ../rules/base.xml.in.h:870
+msgid "English (Mali, US international)"
+msgstr "İngilizce (Mali, Amerikan uluslararası)"
+
+#. Keyboard indicator for Swahili layouts
+#: ../rules/base.xml.in.h:872
+msgid "sw"
+msgstr "sw"
+
+#: ../rules/base.xml.in.h:873
+msgid "Swahili (Tanzania)"
+msgstr "Savahilice (Tanzanya)"
+
+#: ../rules/base.xml.in.h:874
+msgid "Swahili (Kenya)"
+msgstr "Savahilice (Kenya) "
+
+#: ../rules/base.xml.in.h:875
+msgid "Kikuyu"
+msgstr "Kikuyu Dili"
+
+#. Keyboard indicator for Tswana layouts
+#: ../rules/base.xml.in.h:877
+msgid "tn"
+msgstr "tn"
+
+#: ../rules/base.xml.in.h:878
+msgid "Tswana"
+msgstr "Tswana"
+
+#. Keyboard indicator for Filipino layouts
+#: ../rules/base.xml.in.h:880
+msgid "ph"
+msgstr "ph"
+
+#: ../rules/base.xml.in.h:881
+msgid "Filipino"
+msgstr "Filipince"
+
+#: ../rules/base.xml.in.h:882
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "Filipince (QWERTY Baybayin)"
+
+#: ../rules/base.xml.in.h:883
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "Filipince (Capewell-Dvorak Latin)"
+
+#: ../rules/base.xml.in.h:884
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "Filipince (Capewell-Dvorak Baybayin)"
+
+#: ../rules/base.xml.in.h:885
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "Filipince (Capewell-QWERF 2006 Latin)"
+
+#: ../rules/base.xml.in.h:886
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "Filipince (Capewell-QWERF 2006 Baybayin)"
+
+#: ../rules/base.xml.in.h:887
+msgid "Filipino (Colemak Latin)"
+msgstr "Filipince (Colemak Latin)"
+
+#: ../rules/base.xml.in.h:888
+msgid "Filipino (Colemak Baybayin)"
+msgstr "Filipince (Colemak Baybayin)"
+
+#: ../rules/base.xml.in.h:889
+msgid "Filipino (Dvorak Latin)"
+msgstr "Filipince (Dvorak Latin) "
+
+#: ../rules/base.xml.in.h:890
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filipince (Dvorak Baybayin)"
+
+#: ../rules/base.xml.in.h:891
+msgid "md"
+msgstr "md"
+
+#: ../rules/base.xml.in.h:892
+msgid "Moldavian"
+msgstr "Moldovaca"
+
+#: ../rules/base.xml.in.h:893
+msgid "gag"
+msgstr "gag"
+
+#: ../rules/base.xml.in.h:894
+msgid "Moldavian (Gagauz)"
+msgstr "Moldovaca (Gagauz)"
+
+#: ../rules/base.xml.in.h:895
+msgid "Switching to another layout"
+msgstr "Başka bir düzene geçiş"
+
+#: ../rules/base.xml.in.h:896
+msgid "Right Alt (while pressed)"
+msgstr "Right Alt (basılıyken)"
+
+#: ../rules/base.xml.in.h:897
+msgid "Left Alt (while pressed)"
+msgstr "Sol Alt (basılıyken)"
+
+#: ../rules/base.xml.in.h:898
+msgid "Left Win (while pressed)"
+msgstr "Sol Win (basılıyken)"
+
+#: ../rules/base.xml.in.h:899
+msgid "Right Win (while pressed)"
+msgstr "Sağ Win (basılıyken)"
+
+#: ../rules/base.xml.in.h:900
+msgid "Any Win key (while pressed)"
+msgstr "Her hangi bir Win tuşu (basılıyken)"
+
+#: ../rules/base.xml.in.h:901
+msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
+msgstr "Caps Lock (basılı iken), Alt+Caps Lock kendi eylemini yapar"
+
+#: ../rules/base.xml.in.h:902
+msgid "Right Ctrl (while pressed)"
+msgstr "Sağ Ctrl (basılıyken)"
+
+#: ../rules/base.xml.in.h:903
+msgid "Right Alt"
+msgstr "Sağ Alt"
+
+#: ../rules/base.xml.in.h:904
+msgid "Left Alt"
+msgstr "Sol Alt"
+
+#: ../rules/base.xml.in.h:905
+msgid "Caps Lock"
+msgstr "Caps Lock"
+
+#: ../rules/base.xml.in.h:906
+msgid "Shift+Caps Lock"
+msgstr "Shift+Caps Lock"
+
+#: ../rules/base.xml.in.h:907
+msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
+msgstr "Caps Lock (ilk düzen için), Shift+Caps Lock (son düzen için)"
+
+#: ../rules/base.xml.in.h:908
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Sol Win (ilk düzen için), Sağ Win/Menu (son düzen için)"
+
+#: ../rules/base.xml.in.h:909
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Sol Ctrl (ilk düzen için), Sağ Ctrl (son düzen için)"
+
+#: ../rules/base.xml.in.h:910
+msgid "Alt+Caps Lock"
+msgstr "Alt+Caps Lock"
+
+#: ../rules/base.xml.in.h:911
+msgid "Both Shift keys together"
+msgstr "Tüm Shift tuşları beraber"
+
+#: ../rules/base.xml.in.h:912
+msgid "Both Alt keys together"
+msgstr "Tüm Alt tuşları beraber"
+
+#: ../rules/base.xml.in.h:913
+msgid "Both Ctrl keys together"
+msgstr "Tüm Ctrl tuşları beraber"
+
+#: ../rules/base.xml.in.h:914
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../rules/base.xml.in.h:915
+msgid "Left Ctrl+Left Shift"
+msgstr "Sol Ctrl+Sol Shift"
+
+#: ../rules/base.xml.in.h:916
+msgid "Right Ctrl+Right Shift"
+msgstr "Sağ Ctrl+Sağ Shift"
+
+#: ../rules/base.xml.in.h:917
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../rules/base.xml.in.h:918
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../rules/base.xml.in.h:919
+msgid "Left Alt+Left Shift"
+msgstr "Sol Alt+Sol Shift"
+
+#: ../rules/base.xml.in.h:920
+msgid "Alt+Space"
+msgstr "Alt+Boşluk"
+
+#: ../rules/base.xml.in.h:921
+msgid "Menu"
+msgstr "Menü"
+
+#: ../rules/base.xml.in.h:922
+msgid "Left Win"
+msgstr "Sol Win"
+
+#: ../rules/base.xml.in.h:923
+msgid "Win Key+Space"
+msgstr "Win Tuşu+Boşluk"
+
+#: ../rules/base.xml.in.h:924
+msgid "Right Win"
+msgstr "Sağ Win"
+
+#: ../rules/base.xml.in.h:925
+msgid "Left Shift"
+msgstr "Sol Shift"
+
+#: ../rules/base.xml.in.h:926
+msgid "Right Shift"
+msgstr "Sağ Shift"
+
+#: ../rules/base.xml.in.h:927
+msgid "Left Ctrl"
+msgstr "Sol Ctrl"
+
+#: ../rules/base.xml.in.h:928
+msgid "Right Ctrl"
+msgstr "Sağ Ctrl"
+
+#: ../rules/base.xml.in.h:929
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#: ../rules/base.xml.in.h:930
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgstr "LeftCtrl+LeftWin (ilk düzen için), RightCtrl+Menu (ikinci düzen için)"
+
+#: ../rules/base.xml.in.h:931
+msgid "Key to choose 3rd level"
+msgstr "3. seviye seçimi için tuş"
+
+#: ../rules/base.xml.in.h:932
+msgid "Any Win key"
+msgstr "Herhangi bir Win tuşu"
+
+#: ../rules/base.xml.in.h:933
+msgid "Any Alt key"
+msgstr "Herhangi bir Alt tuşu"
+
+#: ../rules/base.xml.in.h:934
+msgid "Right Alt, Shift+Right Alt key is Compose"
+msgstr "Sağ Alt, Shigt+Sağ Alt tuşu bir Compose"
+
+#: ../rules/base.xml.in.h:935
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Sağdaki Alt tuşu 3. seviyeyi asla seçmez"
+
+#: ../rules/base.xml.in.h:936
+msgid "Enter on keypad"
+msgstr "Tuş takımındaki Enter"
+
+#: ../rules/base.xml.in.h:937
+msgid "Backslash"
+msgstr "Ters Bölü"
+
+#: ../rules/base.xml.in.h:938
+msgid "&lt;Less/Greater&gt;"
+msgstr "&lt;Büyük/Küçük&gt;"
+
+#: ../rules/base.xml.in.h:939
+msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "Caps Lock 3. seviyeyi seçer, diğer 3. seviye seçici ile birlikte basılıyken, bir kereliğine kilit olarak çalışır"
+
+#: ../rules/base.xml.in.h:940
+msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "Ters Bölü 3. seviyeyi seçer, diğer 3. seviye seçici ile birlikte basılıyken, bir kereliğine kilit olarak çalışır"
+
+#: ../rules/base.xml.in.h:941
+msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
+msgstr "&lt;Büyük/Küçük&gt 3. seviyeyi seçer, diğer 3. seviye seçici ile birlikte basılıyken, bir kereliğine kilit olarak çalışır"
+
+#: ../rules/base.xml.in.h:942
+msgid "Ctrl key position"
+msgstr "Ctrl tuşunun yeri"
+
+#: ../rules/base.xml.in.h:943
+msgid "Caps Lock as Ctrl"
+msgstr "Ctrl olarak Caps Lock"
+
+#: ../rules/base.xml.in.h:944
+msgid "Left Ctrl as Meta"
+msgstr "Meta olarak Sol Ctrl"
+
+#: ../rules/base.xml.in.h:945
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Ctrl ile Caps Lock yer değiştir"
+
+#: ../rules/base.xml.in.h:946
+msgid "At left of 'A'"
+msgstr "'A' nın solunda"
+
+#: ../rules/base.xml.in.h:947
+msgid "At bottom left"
+msgstr "Sol Altta"
+
+#: ../rules/base.xml.in.h:948
+msgid "Right Ctrl as Right Alt"
+msgstr "Sağ Alt olarak Sağ Ctrl"
+
+#: ../rules/base.xml.in.h:949
+msgid "Menu as Right Ctrl"
+msgstr "Sağ Ctrl olarak Menü"
+
+#: ../rules/base.xml.in.h:950
+msgid "Right Alt as Right Ctrl"
+msgstr "Sağ Ctrl olarak Sağ Alt"
+
+#: ../rules/base.xml.in.h:951
+msgid "Swap Left Alt key with Left Ctrl key"
+msgstr "Sol Alt ile Sol Ctrl tuşunu değiştir"
+
+#: ../rules/base.xml.in.h:952
+msgid "Swap Left Win key with Left Ctrl key"
+msgstr "Sol Win ile Sol Ctrl tuşunu değiştir"
+
+#: ../rules/base.xml.in.h:953
+msgid "Swap Right Win key with Right Ctrl key"
+msgstr "Sağ win tuşunu Sağ Ctrl tuşuyla değiştir"
+
+#: ../rules/base.xml.in.h:954
+msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
+msgstr "Ctrl olarak Sol Alt, Win olarak Sol Ctrl, Alt olarak Sol Win"
+
+#: ../rules/base.xml.in.h:955
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Diğer yerleşimi göstermek için klavye LED kullanı"
+
+#: ../rules/base.xml.in.h:956
+msgid "Num Lock"
+msgstr "Num Lock"
+
+#: ../rules/base.xml.in.h:957
+msgid "Layout of numeric keypad"
+msgstr "Sayısal tuş takımının düzeni"
+
+#: ../rules/base.xml.in.h:958
+msgid "Legacy"
+msgstr "Eski"
+
+#: ../rules/base.xml.in.h:959
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unicode ekletileri (oklar ve matematik işlemleri)"
+
+#: ../rules/base.xml.in.h:960
+msgid "Unicode additions (arrows and math operators; math operators on default level)"
+msgstr "Unicode eklentileri (oklar ve matematik işlemleri; varsayılan seviyede matematik işlemleri)"
+
+#: ../rules/base.xml.in.h:961
+msgid "Legacy Wang 724"
+msgstr "Eski Wang 724"
+
+#: ../rules/base.xml.in.h:962
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr "Unicode eklentileri ile Wang 724 tuştakımı (oklar ve matematik işlemleri)"
+
+#: ../rules/base.xml.in.h:963
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
+msgstr "Unicode eklentileri ile Wang 724 tuştakımı (oklar ve matematik işlemleri; varsayılan seviyede matematik işlemleri)"
+
+#: ../rules/base.xml.in.h:964
+msgid "Hexadecimal"
+msgstr "Onaltılık"
+
+#: ../rules/base.xml.in.h:965
+msgid "ATM/phone-style"
+msgstr "ATM/phone biçimi"
+
+#: ../rules/base.xml.in.h:966
+msgid "Numeric keypad delete key behaviour"
+msgstr "Sayısal tuş takımı delete tuşu davranışı"
+
+#: ../rules/base.xml.in.h:967
+msgid "Legacy key with dot"
+msgstr "Nokta ile eski tuş"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:969
+msgid "Legacy key with comma"
+msgstr "Virgüllü eski tuş"
+
+#: ../rules/base.xml.in.h:970
+msgid "Four-level key with dot"
+msgstr "Noktalı seviye dört tuşu"
+
+#: ../rules/base.xml.in.h:971
+msgid "Four-level key with dot, Latin-9 only"
+msgstr "Noktalu seviye dört tuşu, sadece Latin-9"
+
+#: ../rules/base.xml.in.h:972
+msgid "Four-level key with comma"
+msgstr "Virgül ile seviye dört tuşu"
+
+#: ../rules/base.xml.in.h:973
+msgid "Four-level key with momayyez"
+msgstr "Momayyez ile seviye dört tuşu"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:976
+msgid "Four-level key with abstract separators"
+msgstr "Soyut ayırıcılar ile seviye dört tuşu"
+
+#: ../rules/base.xml.in.h:977
+msgid "Semicolon on third level"
+msgstr "Üçüncü seviyede noktalı virgül"
+
+#: ../rules/base.xml.in.h:978
+msgid "Caps Lock key behavior"
+msgstr "Caps Lock tuşu davranışı"
+
+#: ../rules/base.xml.in.h:979
+msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
+msgstr "CapsLock dahili dönüşümü kullanılır, Shift tuşu Caps Lock tuşunu \"bekletir\""
+
+#: ../rules/base.xml.in.h:980
+msgid "Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock"
+msgstr "CapsLock dahili dönüşümü kullanır; Shift tuşu Caps Lock davranışını etkilemez."
+
+#: ../rules/base.xml.in.h:981
+msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır; Shift tuşu ise Caps Lock tuşunu \"bekletir\"."
+
+#: ../rules/base.xml.in.h:982
+msgid "Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock"
+msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır; Shift tuşu Caps Lock davranışını etkilemez."
+
+#: ../rules/base.xml.in.h:983
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgstr "Caps Lock tuşu büyük/küçük harf geçişi yapar."
+
+#: ../rules/base.xml.in.h:984
+msgid "Make Caps Lock an additional Num Lock"
+msgstr "CapsLock tuşunu ek bir Num tuşu yapar"
+
+#: ../rules/base.xml.in.h:985
+msgid "Swap ESC and Caps Lock"
+msgstr "ESC ile Caps Lock yer değiştirir"
+
+#: ../rules/base.xml.in.h:986
+msgid "Make Caps Lock an additional ESC"
+msgstr "CapsLock tuşunu ek bir ESC tuşu yapar"
+
+#: ../rules/base.xml.in.h:987
+msgid "Make Caps Lock an additional Backspace"
+msgstr "CapsLock tuşunu ek bir Geri tuşu yapar"
+
+#: ../rules/base.xml.in.h:988
+msgid "Make Caps Lock an additional Super"
+msgstr "CapsLock tuşunu ek bir Super tuşu yapar"
+
+#: ../rules/base.xml.in.h:989
+msgid "Make Caps Lock an additional Hyper"
+msgstr "CapsLock tuşunu ek bir Hyper tuşu yapar."
+
+#: ../rules/base.xml.in.h:990
+msgid "Caps Lock toggles ShiftLock (affects all keys)"
+msgstr "Caps Lock tuşu Shift davranışını ters çevirir (tüm tuşları etkiler)"
+
+#: ../rules/base.xml.in.h:991
+msgid "Caps Lock is disabled"
+msgstr "Caps Lock etkin değil"
+
+#: ../rules/base.xml.in.h:992
+msgid "Make Caps Lock an additional Ctrl"
+msgstr "CapsLock tuşunu ek bir Ctrl tuşu yapar"
+
+#: ../rules/base.xml.in.h:993
+msgid "Alt/Win key behavior"
+msgstr "Alt/Pencere tuşu davranışı"
+
+#: ../rules/base.xml.in.h:994
+msgid "Add the standard behavior to Menu key"
+msgstr "Menü tuşuna standart işlevini ekler"
+
+#: ../rules/base.xml.in.h:995
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt ve Meta, Alt tuşlarındadır"
+
+#: ../rules/base.xml.in.h:996
+msgid "Alt is mapped to Win keys (and the usual Alt keys)"
+msgstr "Alt tuşu Win tuşlarına eşleştirilmiş (ve her zamanki Alt tuşları)"
+
+#: ../rules/base.xml.in.h:997
+msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Ctrl tuşu Win tuşlarına eşleştirilmiş (ve her zamanki Ctrl tuşları)"
+
+#: ../rules/base.xml.in.h:998
+msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Ctrl tuşu Alt tuşlarına eşleştirilmiş, Alt tuşu Win tuşlarına eşleştirilmiş"
+
+#: ../rules/base.xml.in.h:999
+msgid "Meta is mapped to Win keys"
+msgstr "Meta, Win tuşları ile eşleştirilir"
+
+#: ../rules/base.xml.in.h:1000
+msgid "Meta is mapped to Left Win"
+msgstr "Meta, sol Win tuşu ile eşleştirilir"
+
+#: ../rules/base.xml.in.h:1001
+msgid "Hyper is mapped to Win keys"
+msgstr "Hyper, Win tuşlarına eşlenir"
+
+#: ../rules/base.xml.in.h:1002
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt tuşu Sağ Win tuşuna eşleşmiş, Super ise Menu tuşuna"
+
+#: ../rules/base.xml.in.h:1003
+msgid "Alt is swapped with Win"
+msgstr "Alt tuşu ile Win tuşu ile yer değiştirir"
+
+#: ../rules/base.xml.in.h:1004
+msgid "Position of Compose key"
+msgstr "Compose tuşunun konumu"
+
+#: ../rules/base.xml.in.h:1005
+msgid "3rd level of Left Win"
+msgstr "3. seviye Sol Win"
+
+#: ../rules/base.xml.in.h:1006
+msgid "3rd level of Right Win"
+msgstr "3. seviye Sağ Win"
+
+#: ../rules/base.xml.in.h:1007
+msgid "3rd level of Menu"
+msgstr "3. seviye Menü"
+
+#: ../rules/base.xml.in.h:1008
+msgid "3rd level of Left Ctrl"
+msgstr "Sol Ctrl tuşunun 3. seviyesi"
+
+#: ../rules/base.xml.in.h:1009
+msgid "3rd level of Right Ctrl"
+msgstr "Sağ Ctrl tuşunun 3. seviyesi"
+
+#: ../rules/base.xml.in.h:1010
+msgid "3rd level of Caps Lock"
+msgstr "Caps Lock tuşunun 3. seviyesi"
+
+#: ../rules/base.xml.in.h:1011
+msgid "3rd level of &lt;Less/Greater&gt;"
+msgstr "&lt;Büyük/Küçük&gt; tuşunun 3. seviyesi"
+
+#: ../rules/base.xml.in.h:1012
+msgid "Pause"
+msgstr "Pause"
+
+#: ../rules/base.xml.in.h:1013
+msgid "PrtSc"
+msgstr "PrtSc"
+
+#: ../rules/base.xml.in.h:1014
+msgid "Miscellaneous compatibility options"
+msgstr "Çeşitli uyumluluk seçenekleri"
+
+#: ../rules/base.xml.in.h:1015
+msgid "Default numeric keypad keys"
+msgstr "Varsayılan sayısal tuştakımı tuşları"
+
+#: ../rules/base.xml.in.h:1016
+msgid "Numeric keypad keys always enter digits (as in Mac OS)"
+msgstr "Sayısal tuştakımı tuşları her zaman sayı girer (Mac OS ta olduğu gibi)"
+
+#: ../rules/base.xml.in.h:1017
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Sayısal tuş takımı tuşları ile Shift, MS Windows gibi çalışır"
+
+#: ../rules/base.xml.in.h:1018
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgstr "Shift tuşu Num Locak tuşunu iptal etmez, onun yerine 3. seviyesini seçer"
+
+#: ../rules/base.xml.in.h:1019
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Bir sunucuda elde edilen özel tuşlar (Ctrl+Alt+&lt;tuş&gt;)"
+
+#: ../rules/base.xml.in.h:1020
+msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
+msgstr "Apple Aliminyum Klavye: PC tuşlarını taklite eder (Print, Scroll Lock, Pause, Num Lock)"
+
+#: ../rules/base.xml.in.h:1021
+msgid "Shift cancels Caps Lock"
+msgstr "Shift tuşu Caps Lock tuşunu iptal eder"
+
+#: ../rules/base.xml.in.h:1022
+msgid "Enable extra typographic characters"
+msgstr "Fazladan tipografik karakterleri etkinleştir"
+
+#: ../rules/base.xml.in.h:1023
+msgid "Both Shift keys together toggle Caps Lock"
+msgstr "Her iki Shift tuşuna basarak Caps Lock geçişi yapılır"
+
+#: ../rules/base.xml.in.h:1024
+msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
+msgstr "Her iki Shift tuşuna basarak Caps Lock etkinleştirir, tek Shift tuşu iptal eder"
+
+#: ../rules/base.xml.in.h:1025
+msgid "Both Shift keys together toggle ShiftLock"
+msgstr "Her iki Shift tuşuna basarak ShiftLock geçişi yapar"
+
+#: ../rules/base.xml.in.h:1026
+msgid "Shift + NumLock toggles PointerKeys"
+msgstr "Shift + NumLock basarak PointerKeys geçişi yapılır"
+
+#: ../rules/base.xml.in.h:1027
+msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
+msgstr "Klavye eylemler ile yakalamaya izin ver (uyarı: güvenlik tehlikesi)"
+
+#: ../rules/base.xml.in.h:1028
+msgid "Allow grab and window tree logging"
+msgstr "Yakalama ve pencere ağacı günlüklemeye izin ver"
+
+#: ../rules/base.xml.in.h:1029
+msgid "Adding currency signs to certain keys"
+msgstr "Belli tuşlara döviz sembolünün ekleme"
+
+#: ../rules/base.xml.in.h:1030
+msgid "Euro on E"
+msgstr "E üzerinde Avro"
+
+#: ../rules/base.xml.in.h:1031
+msgid "Euro on 2"
+msgstr "2 üzerinde Avro"
+
+#: ../rules/base.xml.in.h:1032
+msgid "Euro on 4"
+msgstr "4 üzerinde Avro"
+
+#: ../rules/base.xml.in.h:1033
+msgid "Euro on 5"
+msgstr "5 üzerinde Avro"
+
+#: ../rules/base.xml.in.h:1034
+msgid "Rupee on 4"
+msgstr "4 üzerinde Rupi"
+
+#: ../rules/base.xml.in.h:1035
+msgid "Key to choose 5th level"
+msgstr "5. seviye tuş seç"
+
+#: ../rules/base.xml.in.h:1036
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "&lt;Less/Greater&gt; 5. seviye seçer, diğer 5. seviye seçici ile basılıyken kilitler"
+
+#: ../rules/base.xml.in.h:1037
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Sağ Alt tuşu 5. seviye seçer, diğer 5. seviye seçici ile basılıyken kilitler"
+
+#: ../rules/base.xml.in.h:1038
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Sol Win tuşu 5. seviye seçer, diğer 5. seviye seçici ile basılıyken kilitler"
+
+#: ../rules/base.xml.in.h:1039
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Sağ Win tuşu 5. seviye seçer, diğer 5. seviye seçici ile basılıyken kilitler"
+
+#: ../rules/base.xml.in.h:1040
+msgid "Using space key to input non-breakable space character"
+msgstr "nobreakspace'i yazmak için boşluk tuşu kullanımı"
+
+#: ../rules/base.xml.in.h:1041
+msgid "Usual space at any level"
+msgstr "Her hangi bir seviyede normal boşluk"
+
+#: ../rules/base.xml.in.h:1042
+msgid "Non-breakable space character at second level"
+msgstr "Seviye ikide nbsp karakteri"
+
+#: ../rules/base.xml.in.h:1043
+msgid "Non-breakable space character at third level"
+msgstr "Seviye üçte nbsp karakteri"
+
+#: ../rules/base.xml.in.h:1044
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Seviye üçte nbsp karakteri, seviye dörtte birşey yok"
+
+#: ../rules/base.xml.in.h:1045
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Seviye içte nbsp karakteri, seviye dörtte ince nbsp karakteri"
+
+#: ../rules/base.xml.in.h:1046
+msgid "Non-breakable space character at fourth level"
+msgstr "Seviye dörtte nbsp karakteri"
+
+#: ../rules/base.xml.in.h:1047
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Seviye dörtte nbsp karakteri, seviye altıda ince nbsp karakteri"
+
+#: ../rules/base.xml.in.h:1048
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Seviye dörtte nbsp karakteri, seviye altıda ince nbsp karakteri (Ctrl+Shift yolu ile)"
+
+#: ../rules/base.xml.in.h:1049
+msgid "Zero-width non-joiner character at second level"
+msgstr "Seviye ikide zwnj karakteri"
+
+#: ../rules/base.xml.in.h:1050
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
+msgstr "Seviye ikide zwnj karakteri, seviye üçte zwnj karakteri"
+
+#: ../rules/base.xml.in.h:1051
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
+msgstr "Seviye ikide zwnj karakteri, seviye üçte zwnj karakteri, seviye dörtte nbsp karakteri"
+
+#: ../rules/base.xml.in.h:1052
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
+msgstr "Seviye ikide zwnj karakteri, seviye üçte nbsp karakteri"
+
+#: ../rules/base.xml.in.h:1053
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
+msgstr "Seviye ikide zwnj karakteri, seviye üçte nbsp karakteri"
+
+#: ../rules/base.xml.in.h:1054
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
+msgstr "Seviye ikide zwnj karakteri, seviye üçte nbsp karakteri, seviye dörtte zwnj karakteri"
+
+#: ../rules/base.xml.in.h:1055
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
+msgstr "Seviye ikide zwnj karakteri, seviye üçte nbsp karakteri, seviye dörtte ince nbsp karakteri"
+
+#: ../rules/base.xml.in.h:1056
+msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
+msgstr "Seviye üçte zwnj karakteri, seviye dörtte zwnj karakteri"
+
+#: ../rules/base.xml.in.h:1057
+msgid "Japanese keyboard options"
+msgstr "Japonca klavye seçenekleri"
+
+#: ../rules/base.xml.in.h:1058
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock tuşu kilitler"
+
+#: ../rules/base.xml.in.h:1059
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F tarzı Gerisilme"
+
+#: ../rules/base.xml.in.h:1060
+msgid "Make Zenkaku Hankaku an additional ESC"
+msgstr "Zenkaku Hankaku ek ESC yap"
+
+#: ../rules/base.xml.in.h:1061
+msgid "Adding Esperanto supersigned letters"
+msgstr "Esperanto supersigned harfleri ekle"
+
+#: ../rules/base.xml.in.h:1062
+msgid "To the corresponding key in a Qwerty layout"
+msgstr "Qwerty düzeninde karşılık gelen tuş"
+
+#: ../rules/base.xml.in.h:1063
+msgid "To the corresponding key in a Dvorak layout"
+msgstr "Dvorak düzeninde karşılık gelen tuş"
+
+#: ../rules/base.xml.in.h:1064
+msgid "To the corresponding key in a Colemak layout"
+msgstr "Colemak düzeninde karşılık gelen tuş"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Maintain key compatibility with old Solaris keycodes"
+msgstr "Eski Solaris tuş kodları ile tuş uyumluluğunu koruma"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Sun Key compatibility"
+msgstr "Sun Tuşu uyumu"
+
+#: ../rules/base.xml.in.h:1067
+msgid "Key sequence to kill the X server"
+msgstr "X sunucusunu kapatmak için tuş dizisi"
+
+#: ../rules/base.xml.in.h:1068
+msgid "Ctrl + Alt + Backspace"
+msgstr "Ctrl + 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 "APL klavye sembolleri"
+
+#: ../rules/base.extras.xml.in.h:3
+msgid "dlg"
+msgstr "dlg"
+
+#: ../rules/base.extras.xml.in.h:4
+msgid "APL keyboard symbols (Dyalog)"
+msgstr "APL klavye sembolleri (Dyalog)"
+
+#: ../rules/base.extras.xml.in.h:5
+msgid "sax"
+msgstr "sax"
+
+#: ../rules/base.extras.xml.in.h:6
+msgid "APL keyboard symbols (sax)"
+msgstr "APL klavye sembolleri (sax)"
+
+#: ../rules/base.extras.xml.in.h:7
+msgid "ufd"
+msgstr "ufd"
+
+#: ../rules/base.extras.xml.in.h:8
+msgid "APL keyboard symbols (unified)"
+msgstr "APL klavye sembolleri (birleşik)"
+
+#: ../rules/base.extras.xml.in.h:9
+msgid "apl2"
+msgstr "apl2"
+
+#: ../rules/base.extras.xml.in.h:10
+msgid "APL keyboard symbols (IBM APL2)"
+msgstr "APL klavye sembolleri (IBM APL2)"
+
+#: ../rules/base.extras.xml.in.h:11
+msgid "aplII"
+msgstr "aplll"
+
+#: ../rules/base.extras.xml.in.h:12
+msgid "APL keyboard symbols (Manugistics APL*PLUS II)"
+msgstr "APL klavye sembolleri (Manugistics APL*PLUS II)"
+
+#: ../rules/base.extras.xml.in.h:13
+msgid "aplx"
+msgstr "aplx"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "APL keyboard symbols (APLX unified)"
+msgstr "APL klavye sembolleri (birleşik APLX)"
+
+#: ../rules/base.extras.xml.in.h:17
+msgid "kut"
+msgstr "kut"
+
+#: ../rules/base.extras.xml.in.h:18
+msgid "Kutenai"
+msgstr "Kutenai Dili"
+
+#: ../rules/base.extras.xml.in.h:19
+msgid "shs"
+msgstr "shs"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Secwepemctsin"
+msgstr "Shuswap Dili"
+
+#: ../rules/base.extras.xml.in.h:21
+msgid "Multilingual (Canada, Sun Type 6/7)"
+msgstr "Çok Dilli (Kanada, Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:24
+msgid "German (US keyboard with German letters)"
+msgstr "Almaca (Alman harfleri ile Amerikan klavye)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Almanca (Macar harfleri ve ölü tuşlar olmadan)"
+
+#: ../rules/base.extras.xml.in.h:26
+msgid "German (Sun Type 6/7)"
+msgstr "Almanca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:27
+msgid "German (Aus der Neo-Welt)"
+msgstr "Almanca (Aus der Neo-Welt)"
+
+#: ../rules/base.extras.xml.in.h:30
+msgid "Avestan"
+msgstr "Avestçe"
+
+#: ../rules/base.extras.xml.in.h:33
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Litvanca (Litvanya harfleri ile Amerikan Dvorak)"
+
+#: ../rules/base.extras.xml.in.h:34
+msgid "Lithuanian (Sun Type 6/7)"
+msgstr "Letonca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:37
+msgid "Latvian (US Dvorak)"
+msgstr "Litvanca (Amerikan Dvorak)"
+
+#: ../rules/base.extras.xml.in.h:38
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Litvanca (Amerikan Dvorak, Y türevi)"
+
+#: ../rules/base.extras.xml.in.h:39
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "Letonca (Amerikan Dvorak, eksi türevi)"
+
+#: ../rules/base.extras.xml.in.h:40
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Letonca (programcı Amerikan Dvorak)"
+
+#: ../rules/base.extras.xml.in.h:41
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Letonca (Amerikan programcı Dvorak, Y türevi)"
+
+#: ../rules/base.extras.xml.in.h:42
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Letonca (Amerikan programcı Dvorak, eksi türevi)"
+
+#: ../rules/base.extras.xml.in.h:43
+msgid "Latvian (US Colemak)"
+msgstr "Letonca (Amerikan Colemak)"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Letonca (Amerikan Colemak, kesme işareti türevi)"
+
+#: ../rules/base.extras.xml.in.h:45
+msgid "Latvian (Sun Type 6/7)"
+msgstr "Letonca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:48
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "İngilizce (Amerikan, uluslararası AltGr Unicode birleşimi)"
+
+#: ../rules/base.extras.xml.in.h:49
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "İngilizce (Amerikan, uluslararası AltGr Unicode birleşimi, alternatif)"
+
+#: ../rules/base.extras.xml.in.h:50
+msgid "Atsina"
+msgstr "Atsina Dili"
+
+#: ../rules/base.extras.xml.in.h:51
+msgid "Coeur d'Alene Salish"
+msgstr "İç Saliş Dilleri"
+
+#: ../rules/base.extras.xml.in.h:52
+msgid "Czech Slovak and German (US)"
+msgstr "Çekçe Slovakça ve Almanca (Amerikan)"
+
+#: ../rules/base.extras.xml.in.h:53
+msgid "English (US, Sun Type 6/7)"
+msgstr "İngilizce (Amerikan, Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:54
+msgid "English (Norman)"
+msgstr "İngilizce (Normandiya)"
+
+#: ../rules/base.extras.xml.in.h:57
+msgid "Polish (international with dead keys)"
+msgstr "Lehçe (ölü tuşlar ile uluslararası)"
+
+#: ../rules/base.extras.xml.in.h:58
+msgid "Polish (Colemak)"
+msgstr "Lehçe (Colemak)"
+
+#: ../rules/base.extras.xml.in.h:59
+msgid "Polish (Sun Type 6/7)"
+msgstr "Lehçe (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:63
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Kırım Tatarcası (Dobruja Q)"
+
+#: ../rules/base.extras.xml.in.h:64
+msgid "Romanian (ergonomic Touchtype)"
+msgstr "Rumence (ergonomik dokunmatik daktilo)"
+
+#: ../rules/base.extras.xml.in.h:65
+msgid "Romanian (Sun Type 6/7)"
+msgstr "Rumence (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:68
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Sırpça (ölü karakterler yerine aksanların birleşimi)"
+
+#: ../rules/base.extras.xml.in.h:71
+msgid "Church Slavonic"
+msgstr "Slav Kilise Dili"
+
+#: ../rules/base.extras.xml.in.h:72
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "Rusça (Ukrayna-Belarus düzeni ile)"
+
+#: ../rules/base.extras.xml.in.h:73
+msgid "Russian (Sun Type 6/7)"
+msgstr "Rusça (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:76
+msgid "Armenian (OLPC phonetic)"
+msgstr "Ermenice (OLPC fonetik)"
+
+#: ../rules/base.extras.xml.in.h:79
+msgid "Hebrew (Biblical, SIL phonetic)"
+msgstr "İbranice (İncil, SIL fonetik)"
+
+#: ../rules/base.extras.xml.in.h:82
+msgid "Arabic (Sun Type 6/7)"
+msgstr "Arapça (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:85
+msgid "Belgian (Sun Type 6/7)"
+msgstr "Belçika (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:88
+msgid "Portuguese (Brazil, Sun Type 6/7)"
+msgstr "Portekizce (Brezilya, Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:91
+msgid "Czech (Sun Type 6/7)"
+msgstr "Çekçe (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:94
+msgid "Danish (Sun Type 6/7)"
+msgstr "Dabca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:97
+msgid "Dutch (Sun Type 6/7)"
+msgstr "Danca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:100
+msgid "Estonian (Sun Type 6/7)"
+msgstr "Estonca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:103
+msgid "Finnish (Sun Type 6/7)"
+msgstr "Fince (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:105
+msgid "French (Sun Type 6/7)"
+msgstr "Fransızca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:108
+msgid "Greek (Sun Type 6/7)"
+msgstr "Yünanca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:111
+msgid "Italian (Sun Type 6/7)"
+msgstr "İtalyanca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:114
+msgid "Japanese (Sun Type 6)"
+msgstr "Japonca (Sun 6 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:115
+msgid "Japanese (Sun Type 7 - pc compatible)"
+msgstr "Japonca (Sun 7 Tipi - pc uyumlu)"
+
+#: ../rules/base.extras.xml.in.h:116
+msgid "Japanese (Sun Type 7 - sun compatible)"
+msgstr "Japonca (Sun 7 Tipi - sun uyumlu)"
+
+#: ../rules/base.extras.xml.in.h:119
+msgid "Norwegian (Sun Type 6/7)"
+msgstr "Norveççe (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:121
+msgid "Portuguese (Sun Type 6/7)"
+msgstr "Portekizce (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:124
+msgid "Slovak (Sun Type 6/7)"
+msgstr "Slovakça (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:127
+msgid "Spanish (Sun Type 6/7)"
+msgstr "İspanyolca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:130
+msgid "Swedish (Dvorak A5)"
+msgstr "İsveççe (Dvorak A5)"
+
+#: ../rules/base.extras.xml.in.h:131
+msgid "Swedish (Sun Type 6/7)"
+msgstr "İsveççe (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:133
+msgid "German (Switzerland, Sun Type 6/7)"
+msgstr "Almanca (İsviçre, Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:134
+msgid "French (Switzerland, Sun Type 6/7)"
+msgstr "Fransızca (İsviçre (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:137
+msgid "Turkish (Sun Type 6/7)"
+msgstr "Türkçe (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:140
+msgid "Ukrainian (Sun Type 6/7)"
+msgstr "Ukraynaca (Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:142
+msgid "English (UK, Sun Type 6/7)"
+msgstr "İngilizce (İngiltere, Sun 6/7 Tipi)"
+
+#: ../rules/base.extras.xml.in.h:145
+msgid "Korean (Sun Type 6/7)"
+msgstr "Korece (Sun 6/7 Tipi)"
+
+#. Keyboard indicator for European layouts
+#: ../rules/base.extras.xml.in.h:147
+msgid "eu"
+msgstr "eu"
+
+#: ../rules/base.extras.xml.in.h:148
+msgid "EurKEY (US based layout with european letters)"
+msgstr "EurKey (avrupa harfleri ile Amerikan temelli düzen)"
+
+#: ../rules/base.extras.xml.in.h:151
+msgid "Mmuock"
+msgstr "Mmuock"
+
+#~ msgid "(F)"
+#~ msgstr "F Klavye"
+
+#~ msgid "(Legacy) Dvorak"
+#~ msgstr "(Kadim) Dvorak"
+
+#~ msgid "ACPI Standard"
+#~ msgstr "ACPI Standardı"
+
+#~ msgid "AZERTY Tskapo"
+#~ msgstr "AZERTY Tskapo"
+
+#~ msgid "Acer TravelMate 800"
+#~ msgstr "Acer TravelMate 800"
+
+#~ msgid "Add the EuroSign to the 2 key."
+#~ msgstr "2 tuşuna € sembolünü ekler"
+
+#~ msgid "Add the EuroSign to the 5 key."
+#~ msgstr "5 tuşuna € sembolünü ekler"
+
+#~ msgid "Add the EuroSign to the E key."
+#~ msgstr "E tuşuna € sembolünü ekler"
+
+#~ msgid "Afg"
+#~ msgstr "Afg"
+
+#~ msgid "Alb"
+#~ msgstr "Arn"
+
+#~ msgid "Alt+CapsLock changes layout."
+#~ msgstr "Alt+CapsLock yerleşimi değiştirir."
+
+#~ msgid "Alt+Ctrl change layout."
+#~ msgstr "Alt+Ctrlyerleşimi değiştirir."
+
+#~ msgid "Alt+Shift change layout."
+#~ msgstr "Alt+Shift yerleşimi değiştirir."
+
+#~ msgid "Alt-Q"
+#~ msgstr "Yazılımcı klavyesi (Q)"
+
+#~ msgid "Alternative"
+#~ msgstr "Diğer"
+
+#~ msgid "And"
+#~ msgstr "And"
+
+#~ msgid "Andorra"
+#~ msgstr "Andora"
+
+#~ msgid "Ara"
+#~ msgstr "Ara"
+
+#~ msgid "Arm"
+#~ msgstr "Erm"
+
+#~ msgid "Aze"
+#~ msgstr "Aze"
+
+#~ msgid "Bel"
+#~ msgstr "Bel"
+
+#~ msgid "Belgium"
+#~ msgstr "Belçika"
+
+#~ msgid "Bengali"
+#~ msgstr "Bengalce"
+
+#~ msgid "Bhutan"
+#~ msgstr "Butan"
+
+#~ msgid "Bih"
+#~ msgstr "Bih"
+
+#~ msgid "Blr"
+#~ msgstr "Blr"
+
+#~ msgid "Bosnia and Herzegovina"
+#~ msgstr "Bosna Hersek"
+
+#~ msgid "Both Alt keys together change layout."
+#~ msgstr "Alt tuşları birlikte yerleşimi değiştirir."
+
+#~ msgid "Both Ctrl keys together change layout."
+#~ msgstr "Ctrl tuşları birlikte yerleşimi değiştirir."
+
+#~ msgid "Bra"
+#~ msgstr "Bra"
+
+#~ msgid "Brazil"
+#~ msgstr "Brezilya"
+
+#~ msgid "Brazilian ABNT2"
+#~ msgstr "Brazilya dili ABNT2"
+
+#~ msgid "Bulgaria"
+#~ msgstr "Bulgaristan"
+
+#~ msgid "Can"
+#~ msgstr "Kan"
+
+#~ msgid "Canada"
+#~ msgstr "Kanada"
+
+#~ msgid "Caps Lock is Compose."
+#~ msgstr "CapsLock tuşu karakter birleşimi yapar."
+
+#~ msgid "CapsLock LED shows alternative layout."
+#~ msgstr "Caps Lock LED'i diğer yerleşimi gösterir."
+
+#~ msgid "CapsLock just locks the Shift modifier."
+#~ msgstr "Caps Lock sadece kilitlemeli Shift tuşu gibi çalışır."
+
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "Caps Lock tuşu yerleşimi değiştirir"
+
+#~ msgid "Compose key position"
+#~ msgstr "Karakter oluşturma (compose) tuşu konumu"
+
+#~ msgid "Ctrl+Shift change layout."
+#~ msgstr "Ctrl+Shift tuşları yerleşimi değiştirir."
+
+#~ msgid "Cyrillic"
+#~ msgstr "Kril"
+
+#~ msgid "Cze"
+#~ msgstr "Çek"
+
+#~ msgid "Czechia"
+#~ msgstr "Çek Cumhuriyeti"
+
+#~ msgid "DRC"
+#~ msgstr "DRC"
+
+#~ msgid "Dead acute"
+#~ msgstr "Ölü acute (´)"
+
+#~ msgid "Dell SK-8125 USB Multimedia Keybard"
+#~ msgstr "Dell SK-8125 USB Çokluortam Klavyesi"
+
+#~ msgid "Dell SK-8135 USB Multimedia Keybard"
+#~ msgstr "Dell SK-8135 USB Çokluortam Klavyesi"
+
+#~ msgid "Denmark"
+#~ msgstr "Danimarka"
+
+#~ msgid "Dnk"
+#~ msgstr "Dnk"
+
+#~ msgid "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid "Eastern"
+#~ msgstr "Doğu"
+
+#~ msgid "Epo"
+#~ msgstr "Epo"
+
+#~ msgid "Ergonomic"
+#~ msgstr "Ergonomik"
+
+#~ msgid "Esp"
+#~ msgstr "Esp"
+
+#~ msgid "Est"
+#~ msgstr "Est"
+
+#~ msgid "Ethiopia"
+#~ msgstr "Etyopya"
+
+#~ msgid "Evdev-managed keyboard"
+#~ msgstr "Evdev yönetimli klavye"
+
+#~ msgid "Extended"
+#~ msgstr "Gelişmiş"
+
+#~ msgid "Fao"
+#~ msgstr "Fao"
+
+#~ msgid "Finland"
+#~ msgstr "Finlandiya"
+
+#~ msgid "Force standard legacy keypad"
+#~ msgstr "Standart kadim tuştakımını etkin kılar"
+
+#~ msgid "Fra"
+#~ msgstr "Fra"
+
+#~ msgid "France"
+#~ msgstr "Fransa"
+
+#~ msgid "GBr"
+#~ msgstr "GBr"
+
+#~ msgid "Germany"
+#~ msgstr "Almanya"
+
+#~ msgid "Ghana"
+#~ msgstr "Gana"
+
+#~ msgid "Gre"
+#~ msgstr "Gre"
+
+#~ msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+#~ msgstr "Hewlett-Packard SK-2505 Genel Ağ Klavyesi"
+
+#~ msgid "Hrv"
+#~ msgstr "Hrv"
+
+#~ msgid "Hun"
+#~ msgstr "Mcr"
+
+#~ msgid "Hungary"
+#~ msgstr "Macaristan"
+
+#~ msgid "IBM Rapid Access II (alternate option)"
+#~ msgstr "IBM Hızlı Erişim II (diğer seçenek)"
+
+#~ msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+#~ msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#~ msgid "Ind"
+#~ msgstr "Ind"
+
+#~ msgid "Iran"
+#~ msgstr "İran"
+
+#~ msgid "Ireland"
+#~ msgstr "İrlanda"
+
+#~ msgid "Irl"
+#~ msgstr "İrl"
+
+#~ msgid "Irn"
+#~ msgstr "Irn"
+
+#~ msgid "Irq"
+#~ msgstr "Irk"
+
+#~ msgid "Israel"
+#~ msgstr "İsrail"
+
+#~ msgid "Italy"
+#~ msgstr "İtalya"
+
+#~ msgid "Japan"
+#~ msgstr "Japonya"
+
+#~ msgid "Japanese 106-key"
+#~ msgstr "Japonca 106 tuşlu"
+
+#~ msgid "Jpn"
+#~ msgstr "Jpn"
+
+#~ msgid "Kana"
+#~ msgstr "Kana"
+
+#~ msgid "Keypad"
+#~ msgstr "Tuştakımı"
+
+#~ msgid "Khm"
+#~ msgstr "Kım"
+
+#~ msgid "Korea, Republic of"
+#~ msgstr "Kore Cumhuriyeti"
+
+#~ msgid "Kotoistus"
+#~ msgstr "Kotüstus"
+
+#~ msgid "Kyr"
+#~ msgstr "Kır"
+
+#~ msgid "LAm"
+#~ msgstr "LAm"
+
+#~ msgid "LCtrl+LShift change layout."
+#~ msgstr "Ctrl+Shift tuşları yerleşimi değiştirir."
+
+#~ msgid "Laos"
+#~ msgstr "Laos"
+
+#~ msgid "Latin"
+#~ msgstr "Latin"
+
+#~ msgid "Layout switching"
+#~ msgstr "Yerleşim değiştirme "
+
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "Soldaki Alt tuşu yerleşimi değiştirir."
+
+#~ msgid "Left Alt key switches layout while pressed."
+#~ msgstr "Soldaki Alt tuşu basılıyken diğer yerleşimi etkin olur."
+
+#~ msgid "Left Shift key changes layout."
+#~ msgstr "Soldaki Shift tuşu yerleşimi değiştirir."
+
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "Soldaki Pencere tuşu yerleşimi değiştirir."
+
+#~ msgid "Left Win-key is Compose."
+#~ msgstr "Soldaki Pencere tuşu karakter birleşimi yapar."
+
+#~ msgid "Ltu"
+#~ msgstr "Ltu"
+
+#~ msgid "Lva"
+#~ msgstr "Lva"
+
+#~ msgid "MESS"
+#~ msgstr "MESS"
+
+#~ msgid "Maldives"
+#~ msgstr "Maldivler"
+
+#~ msgid "Mao"
+#~ msgstr "Mao"
+
+#~ msgid "Menu is Compose."
+#~ msgstr "Menü tuşu karakter birleşimi yapar."
+
+#~ msgid "Menu key changes layout."
+#~ msgstr "Menü tuşu yerleşimi değiştirir."
+
+#~ msgid "Mkd"
+#~ msgstr "Mkd"
+
+#~ msgid "Mng"
+#~ msgstr "Moğ"
+
+#~ msgid "Myanmar"
+#~ msgstr "Miyanmar"
+
+#~ msgid "Neostyle"
+#~ msgstr "Yenitarz"
+
+#~ msgid "Nep"
+#~ msgstr "Nep"
+
+#~ msgid "Netherlands"
+#~ msgstr "Hollanda"
+
+#~ msgid "Nigeria"
+#~ msgstr "Nijerya"
+
+#~ msgid "Nld"
+#~ msgstr "Hol"
+
+#~ msgid "Nor"
+#~ msgstr "Nor"
+
+#~ msgid "Norway"
+#~ msgstr "Norveç"
+
+#~ msgid "NumLock LED shows alternative layout."
+#~ msgstr "Num_Lock LED'i diğer yerleşimi gösterir."
+
+#~ msgid "Phonetic"
+#~ msgstr "Fonetik"
+
+#~ msgid "Pol"
+#~ msgstr "Pol"
+
+#~ msgid "Poland"
+#~ msgstr "Polonya"
+
+#~ msgid "Portugal"
+#~ msgstr "Portekiz"
+
+#~ msgid "Press Left Alt key to choose 3rd level."
+#~ msgstr "3. seviyeyi seçmek için soldaki Alt tuşuna basın."
+
+#~ msgid "Press Left Win-key to choose 3rd level."
+#~ msgstr "3. seviyeyi seçmek için soldaki Win tuşuna basın."
+
+#~ msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+#~ msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın, Sağdaki Alt tuşuyla birlikte Shift tuşu AltGr gibi davranır."
+
+#~ msgid "Press Right Alt key to choose 3rd level."
+#~ msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın."
+
+#~ msgid "Press Right Ctrl to choose 3rd level."
+#~ msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın."
+
+#~ msgid "Press Right Win-key to choose 3rd level."
+#~ msgstr "3. seviyeyi seçmek için sağdaki Win tuşuna basın."
+
+#~ msgid "Press any of Alt keys to choose 3rd level."
+#~ msgstr "3. seviyeyi seçmek için Alt tuşlarından birine basın."
+
+#~ msgid "Press any of Win-keys to choose 3rd level."
+#~ msgstr "3. seviyeyi seçmek için Win tuşlarından birine basın."
+
+#~ msgid "Probhat"
+#~ msgstr "Probat"
+
+#~ msgid "Prt"
+#~ msgstr "Prt"
+
+#~ msgid "R-Alt switches layout while pressed."
+#~ msgstr "Sağdaki Alt tuşu basılıyken diğer yerleşim etkin olur."
+
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "Sağdaki Alt tuşu yerleşimi değiştirir."
+
+#~ msgid "Right Ctrl key changes layout."
+#~ msgstr "Sağdaki Ctrl tuşu yerleşimi değiştirir."
+
+#~ msgid "Right Ctrl key switches layout while pressed."
+#~ msgstr "Sağdaki Ctrl tuşu basılıyken diğer yerleşim etkin olur."
+
+#~ msgid "Right Shift key changes layout."
+#~ msgstr "Sağdaki Shift tuşu yerleşimi değiştirir."
+
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "Sağdaki Win tuşu yerleşimi değiştirir."
+
+#~ msgid "Right Win-key is Compose."
+#~ msgstr "Sağdaki Win tuşu karakter birleşimi yapar."
+
+#~ msgid "Rou"
+#~ msgstr "Rou"
+
+#~ msgid "Rus"
+#~ msgstr "Rus"
+
+#~ msgid "Russia"
+#~ msgstr "Rusya"
+
+#~ msgid "SCG"
+#~ msgstr "SCG"
+
+#~ msgid "ScrollLock LED shows alternative layout."
+#~ msgstr "Scroll_Lock LED'i diğer yerleşimi gösterir."
+
+#~ msgid "Serbia and Montenegro"
+#~ msgstr "Sırbistan ve Karadağ"
+
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "Shift+CapsLock tuşları yerleşimi değiştirir."
+
+#~ msgid "Slovakia"
+#~ msgstr "Slovakya"
+
+#~ msgid "Southern Uzbek"
+#~ msgstr "Güney Özbekistan"
+
+#~ msgid "Spain"
+#~ msgstr "İspanya"
+
+#~ msgid "SrL"
+#~ msgstr "SrL"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "Sri Lanka"
+
+#~ msgid "Standard"
+#~ msgstr "Standart"
+
+#~ msgid "Standard RSTU on Russian layout"
+#~ msgstr "Rusça yerleşimde standart RSTU"
+
+#~ msgid "Super is mapped to the Win-keys."
+#~ msgstr "Super, Pencere tuşlarına eşlenir."
+
+#~ msgid "Svk"
+#~ msgstr "Svk"
+
+#~ msgid "Svn"
+#~ msgstr "Svn"
+
+#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+#~ msgstr "Makintoş klavyeler çekirdek tarafından algılanamadığında iki seviyeli tuş kodlarına geçilir."
+
+#~ msgid "Swe"
+#~ msgstr "İsve"
+
+#~ msgid "Sweden"
+#~ msgstr "İsveç"
+
+#~ msgid "Syr"
+#~ msgstr "Sur"
+
+#~ msgid "Syria"
+#~ msgstr "Suriye"
+
+#~ msgid "Tha"
+#~ msgstr "Tha"
+
+#~ msgid "Third level choosers"
+#~ msgstr "3. seviye seçiciler"
+
+#~ msgid "Tifinagh"
+#~ msgstr "Tifinagh"
+
+#~ msgid "Tjk"
+#~ msgstr "Tck"
+
+#~ msgid "Typewriter"
+#~ msgstr "Daktilo"
+
+#~ msgid "U.S. English"
+#~ msgstr "Amerikan ingilizcesi"
+
+#~ msgid "US keyboard with Slovenian digraphs"
+#~ msgstr "Sloven ikil harfleriyle amerikan klavyesi"
+
+#~ msgid "USA"
+#~ msgstr "ABD"
+
+#~ msgid "Ukr"
+#~ msgstr "Ukr"
+
+#~ msgid "United Kingdom"
+#~ msgstr "İngiltere"
+
+#~ msgid "Use Bosnian digraphs"
+#~ msgstr "Bosna ikil harflerini kullanır"
+
+#~ msgid "Use Croatian digraphs"
+#~ msgstr "Hırvat ikil harflerini kullanır"
+
+#~ msgid "Use Slovenian digraphs"
+#~ msgstr "Sloven ikil harflerini kullanır"
+
+#~ msgid "Uzb"
+#~ msgstr "Özb"
+
+#~ msgid "Vnm"
+#~ msgstr "Vnm"
+
+#~ msgid "Western"
+#~ msgstr "Batı"
+
+#~ msgid "With guillemets"
+#~ msgstr "Açılı ayraçlarla"
+
+#~ msgid "azerty"
+#~ msgstr "azerty"
+
+#~ msgid "digits"
+#~ msgstr "rakamlar"
+
+#~ msgid "lyx"
+#~ msgstr "lyx"
+
+#~ msgid "qwertz"
+#~ msgstr "qwertz"
+
+#~ msgid "\"Typewriter\""
+#~ msgstr "\"Daktilo\""
+
+#~ msgid "Acts as Shift with locking. Shift cancels Caps."
+#~ msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu ise Caps Lock tuşunu keser."
+
+#~ msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+#~ msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu Caps Lock'u kesmez"
+
+#~ msgid "Alt+Control changes group"
+#~ msgstr "Alt+Ctrl grubu değiştirir."
+
+#~ msgid "Alt+Shift changes group"
+#~ msgstr "Alt+Shift grubu değiştirir."
+
+#~ msgid "Basic"
+#~ msgstr "Temel"
+
+#~ msgid "Canadian"
+#~ msgstr "Kanadaca"
+
+#~ msgid "Caps Lock key changes group"
+#~ msgstr "Caps Lock tuşu grubu değiştirir"
+
+#~ msgid "Caps_Lock LED shows alternative group"
+#~ msgstr "Caps Lock LED'i diğer grubu gösterir"
+
+#~ msgid "Control Key Position"
+#~ msgstr "Ctrl tuşunun yeri"
+
+#~ msgid "Control key at bottom left"
+#~ msgstr "Sol alttaki Ctrl tuşu"
+
+#~ msgid "Control key at left of 'A'"
+#~ msgstr "'A'nın solundaki Ctrl Tuşu"
+
+#~ msgid "Control+Shift changes group"
+#~ msgstr "Ctrl+Shift tuşları grubu değiştirir"
+
+#~ msgid "DeuCH"
+#~ msgstr "DeuCH"
+
+#~ msgid "Dvo"
+#~ msgstr "Dvo"
+
+#~ msgid "FraCH"
+#~ msgstr "FraCH"
+
+#~ msgid "Group Shift/Lock behavior"
+#~ msgstr "Shift/Lock Grubu davranışı"
+
+#~ msgid "Left Alt key changes group"
+#~ msgstr "Soldaki Alt tuşu grubu değiştirir"
+
+#~ msgid "Left Ctrl key changes group"
+#~ msgstr "Soldaki Ctrl tuşu grubu değiştirir"
+
+#~ msgid "Left Shift key changes group"
+#~ msgstr "Soldaki Shift tuşu grubu değiştirir"
+
+#~ msgid "Num_Lock LED shows alternative group"
+#~ msgstr "Num_Lock LED'i diğer grubu gösterir"
+
+#~ msgid "Polish with Polish quotes on key \"1/!\""
+#~ msgstr "Lehçe, \"1/!\" tuşunda Lehçe tırnaklar"
+
+#~ msgid "Press Left Alt key to choose 3rd level"
+#~ msgstr "3. seviyeyi seçmek için soldaki Alt tuşuna basın"
+
+#~ msgid "Press Right Alt key to choose 3rd level"
+#~ msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın"
+
+#~ msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+#~ msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın, Sağdaki Alt tuşuyla birlikte Shift tuşu AltGr gibi davranır"
+
+#~ msgid "Press Right Control to choose 3rd level"
+#~ msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın"
+
+#~ msgid "Press any of Alt keys to choose 3rd level"
+#~ msgstr "3. seviyeyi seçmek için Alt tuşlarından birine basın"
+
+#~ msgid "Right Alt key changes group"
+#~ msgstr "Sağdaki Alt tuşu grubu değiştirir"
+
+#~ msgid "Right Control key works as Right Alt"
+#~ msgstr "Sağdaki Ctrl tuşu sağdaki Alt tuşu gibi çalışır"
+
+#~ msgid "Right Ctrl key changes group"
+#~ msgstr "Sağdaki Ctrl tuşu grubu değiştirir"
+
+#~ msgid "Right Shift key changes group"
+#~ msgstr "Sağdaki Shift tuşu grubu değiştirir"
+
+#~ msgid "Scroll_Lock LED shows alternative group"
+#~ msgstr "Scroll_Lock LED'i diğer grubu gösterir"
+
+#~ msgid "Shift with numpad keys works as in MS Windows"
+#~ msgstr "Sayısal tuştakımı Shift ile MS Windows'daki gibi çalışır"
+
+#~ msgid "Sun Type 4"
+#~ msgstr "Sun 4. tür"
+
+#~ msgid "Sun Type 5"
+#~ msgstr "Sun 5. Tür"
+
+#~ msgid "Sun Type 6 with Euro key"
+#~ msgstr "Sun 6. Tür, € tuşlu"
+
+#~ msgid "Swiss French"
+#~ msgstr "İsviçre Fransızcası"
+
+#~ msgid "Swiss German"
+#~ msgstr "İsviçre Almancası"
-#: ../rules/sun.xml.in.h:125
-msgid "U.S. English w/ ISO9995-3"
-msgstr "Amerikan ingilizcesi (ISO9995-3 ile)"
+#~ msgid "Turkish Alt-Q Layout"
+#~ msgstr "Türkçe Alt-Q (yazılımcılar ve dizüstü) klavye"
-#: ../rules/sun.xml.in.h:128
-msgid "Use keyboard LED to show alternative group"
-msgstr "Diğer grubu göstermek içim klavye LED'i kullanılır"
+#~ msgid "U.S. English w/ ISO9995-3"
+#~ msgstr "Amerikan ingilizcesi (ISO9995-3 ile)"
-#: ../rules/sun.xml.in.h:129
-msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "CapsLock dahili dönüşümü kullanılır, Shift tuşu Caps Lock tuşunu keser."
+#~ msgid "Use keyboard LED to show alternative group"
+#~ msgstr "Diğer grubu göstermek içim klavye LED'i kullanılır"
-#: ../rules/sun.xml.in.h:130
-msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "CapsLock dahili dönüşümü kullanır. Shift tuşu Caps Lock'u kesmez."
+#~ msgid "Uses internal capitalization. Shift cancels Caps."
+#~ msgstr "CapsLock dahili dönüşümü kullanılır, Shift tuşu Caps Lock tuşunu keser."
-#: ../rules/sun.xml.in.h:131
-msgid "bksl"
-msgstr "bksl"
+#~ msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+#~ msgstr "CapsLock dahili dönüşümü kullanır. Shift tuşu Caps Lock'u kesmez."
-#: ../rules/sun.xml.in.h:133
-msgid "type4"
-msgstr "4. tür"
+#~ msgid "type4"
+#~ msgstr "4. tür"
diff --git a/xorg-server/xkeyboard-config/po/vi.po b/xorg-server/xkeyboard-config/po/vi.po
index d20f448c1..fc092c165 100644
--- a/xorg-server/xkeyboard-config/po/vi.po
+++ b/xorg-server/xkeyboard-config/po/vi.po
@@ -1,16 +1,17 @@
# Vietnamese translation for X Keyboard Config.
-# Copyright © 2014 Free Software Foundation, Inc.
+# Bản dịch tiếng Việt dành cho xkeyboard-config.
+# Copyright © 2015 Free Software Foundation, Inc.
# This file is distributed under the same license as the xkeyboard-config package.
# Phan Vinh Thinh <teppi82@gmail.com>, 2005.
# Clytie Siddall <clytie@riverland.net.au>, 2007-2010.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2014.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 2.12.99\n"
+"Project-Id-Version: xkeyboard-config 2.13.99\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-09-18 23:46+0100\n"
-"PO-Revision-Date: 2014-09-21 08:40+0700\n"
+"POT-Creation-Date: 2015-01-15 01:16+0000\n"
+"PO-Revision-Date: 2015-01-16 14:54+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -18,7 +19,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.8\n"
#: ../rules/base.xml.in.h:1
msgid "Generic 101-key PC"
@@ -42,7 +42,7 @@ msgstr "Dell PC 101 phím"
#: ../rules/base.xml.in.h:6
msgid "Dell Latitude series laptop"
-msgstr "Xách tay Dell dãy Latitude"
+msgstr "Máy tính xách tay Dell sê-ri Latitude"
#: ../rules/base.xml.in.h:7
msgid "Dell Precision M65"
@@ -102,7 +102,7 @@ msgstr "Bàn phím Internet Brother"
#: ../rules/base.xml.in.h:21
msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Phim nhạc"
+msgstr "BTC 5113RF đa phương tiện"
#: ../rules/base.xml.in.h:22
msgid "BTC 5126T"
@@ -277,7 +277,7 @@ msgstr "Genius KKB-2050HS"
#: ../rules/base.xml.in.h:64
msgid "Gyration"
-msgstr "Sự chuyển hồi"
+msgstr "Gyration"
#: ../rules/base.xml.in.h:65
msgid "HTC Dream"
@@ -541,7 +541,7 @@ msgstr "Samsung SDM 4510P"
#: ../rules/base.xml.in.h:130
msgid "Sanwa Supply SKB-KG3"
-msgstr ""
+msgstr "Sanwa áp dụng SKB-KG3"
#: ../rules/base.xml.in.h:131
msgid "SK-1300"
@@ -761,11 +761,11 @@ msgid "Htc Dream phone"
msgstr "Điện thoại Htc Dream"
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:47
msgid "en"
msgstr "en"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:48
msgid "English (US)"
msgstr "Tiếng Anh (Mỹ)"
@@ -816,14 +816,14 @@ msgstr "Tiếng Anh (Dvorak cho người thuận tay phải)"
#: ../rules/base.xml.in.h:200
msgid "English (classic Dvorak)"
-msgstr "Tiếng Anh (Dvorak kinh điển)"
+msgstr "Tiếng Anh (Dvorak cổ điển)"
#: ../rules/base.xml.in.h:201
msgid "English (programmer Dvorak)"
msgstr "Tiếng Anh (Dvorak dành cho người lập trình)"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:70
msgid "ru"
msgstr "ru"
@@ -841,11 +841,11 @@ msgstr "Tiếng Anh (Quốc tế với phím chết AltGr)"
#: ../rules/base.xml.in.h:207
msgid "English (the divide/multiply keys toggle the layout)"
-msgstr ""
+msgstr "Tiếng Anh (các phím chia/nhân bật tắt bố cục)"
#: ../rules/base.xml.in.h:208
msgid "Serbo-Croatian (US)"
-msgstr ""
+msgstr "Serbo-Crô-oát (Mỹ)"
#: ../rules/base.xml.in.h:209
msgid "English (Workman)"
@@ -856,7 +856,7 @@ msgid "English (Workman, international with dead keys)"
msgstr "Tiếng Anh (Workman quốc tế với phím chết)"
#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:29
msgid "fa"
msgstr "fa"
@@ -895,11 +895,11 @@ msgid "Uzbek (Afghanistan, OLPC)"
msgstr "Tiếng U-x-béc (Áp-ga-nít-xtan, OLPC)"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:81
msgid "ar"
msgstr "ar"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:82
msgid "Arabic"
msgstr "Ả Rập"
@@ -938,14 +938,14 @@ msgstr "Tiếng An-ba-ni"
#: ../rules/base.xml.in.h:235
msgid "Albanian (Plisi D1)"
-msgstr ""
+msgstr "Tiếng An-ba-ni (Plisi D1)"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:75
msgid "hy"
msgstr "hy"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:76
msgid "Armenian"
msgstr "Tiếng Ác-mê-ni"
@@ -966,9 +966,8 @@ msgid "Armenian (western)"
msgstr "Tiếng Ác-mê-ni (miền tây)"
#: ../rules/base.xml.in.h:243
-#, fuzzy
msgid "Armenian (alternative eastern)"
-msgstr "Đông thay thế"
+msgstr "Tiếng Ác-mê-ni (miền đông thay thế)"
#. Keyboard indicator for German layouts
#: ../rules/base.xml.in.h:245 ../rules/base.extras.xml.in.h:22
@@ -981,7 +980,7 @@ msgstr "Tiếng Đức (Áo)"
#: ../rules/base.xml.in.h:247
msgid "German (Austria, eliminate dead keys)"
-msgstr "Tiếng Đức (Áo , phím chết loại trừ)"
+msgstr "Tiếng Đức (Áo, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:248
msgid "German (Austria, Sun dead keys)"
@@ -1022,11 +1021,11 @@ msgid "Belarusian (Latin)"
msgstr "Tiếng Be-la-ru (La-tinh)"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:84
msgid "be"
msgstr "be"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:85
msgid "Belgian"
msgstr "Tiếng Bỉ"
@@ -1048,7 +1047,7 @@ msgstr "Tiếng Bỉ (ISO Xen kẽ)"
#: ../rules/base.xml.in.h:266
msgid "Belgian (eliminate dead keys)"
-msgstr "Tiếng Bỉ (phím chết loại trừ)"
+msgstr "Tiếng Bỉ (loại bỏ phím chết)"
#: ../rules/base.xml.in.h:267
msgid "Belgian (Sun dead keys)"
@@ -1106,7 +1105,7 @@ msgstr "Tiếng Băng-la-đét (Ấn-độ, Baishakhi Inscript)"
#: ../rules/base.xml.in.h:282
msgid "Manipuri (Eeyek)"
-msgstr ""
+msgstr "Manipuri (Eeyek)"
#. Keyboard indicator for Gujarati layouts
#: ../rules/base.xml.in.h:284
@@ -1158,7 +1157,7 @@ msgstr "Tiếng Ma-lay-am (Lalitha)"
#: ../rules/base.xml.in.h:298
msgid "Malayalam (enhanced Inscript, with rupee sign)"
-msgstr ""
+msgstr "Tiếng Ma-lay-am (enhanced Inscript, with rupee sign)"
#. Keyboard indicator for Oriya layouts
#: ../rules/base.xml.in.h:300
@@ -1205,7 +1204,7 @@ msgstr "Te-lu-gu"
#: ../rules/base.xml.in.h:312
msgid "Telugu (KaGaPa phonetic)"
-msgstr ""
+msgstr "Te-lu-gu (ngữ âm KaGaPa)"
#. Keyboard indicator for Urdu layouts
#: ../rules/base.xml.in.h:314
@@ -1238,9 +1237,8 @@ msgid "Hindi (Wx)"
msgstr "Hin-đi (Wx)"
#: ../rules/base.xml.in.h:322
-#, fuzzy
msgid "Hindi (KaGaPa phonetic)"
-msgstr "Ti-phi-nac ngữ âm"
+msgstr "Hin-đi (ngữ âm KaGaPa)"
#. Keyboard indicator for Sanskrit layouts
#: ../rules/base.xml.in.h:324
@@ -1248,9 +1246,8 @@ msgid "sa"
msgstr "sa"
#: ../rules/base.xml.in.h:325
-#, fuzzy
msgid "Sanskrit (KaGaPa phonetic)"
-msgstr "Xy-ri ngữ âm"
+msgstr "Sanskrit (ngữ âm KaGaPa)"
#. Keyboard indicator for Marathi layouts
#: ../rules/base.xml.in.h:327
@@ -1258,12 +1255,10 @@ msgid "mr"
msgstr "mr"
#: ../rules/base.xml.in.h:328
-#, fuzzy
msgid "Marathi (KaGaPa phonetic)"
-msgstr "Ngữ âm truyền thống"
+msgstr "Marathi (ngữ âm KaGaPa)"
#: ../rules/base.xml.in.h:329
-#, fuzzy
msgid "English (India, with rupee sign)"
msgstr "Tiếng Anh (Mỹ với euro trên 5)"
@@ -1277,37 +1272,33 @@ msgid "Bosnian"
msgstr "Tiếng Bô-xni-a"
#: ../rules/base.xml.in.h:333
-#, fuzzy
msgid "Bosnian (with guillemets for quotes)"
-msgstr "Dùng “chim uria” làm dấu trích dẫn"
+msgstr "Bo-x-ni-a (Dùng “guillemets” làm dấu trích dẫn)"
#: ../rules/base.xml.in.h:334
-#, fuzzy
msgid "Bosnian (with Bosnian digraphs)"
msgstr "Dùng chữ ghép Bo-x-ni-a"
#: ../rules/base.xml.in.h:335
-#, fuzzy
msgid "Bosnian (US keyboard with Bosnian digraphs)"
-msgstr "Bàn phím Mỹ với các chữ ghép Bo-x-ni-a"
+msgstr "Bo-x-ni-a (Bàn phím Mỹ với các chữ ghép Bo-x-ni-a)"
#: ../rules/base.xml.in.h:336
-#, fuzzy
msgid "Bosnian (US keyboard with Bosnian letters)"
-msgstr "Đức (Bàn phím Mỹ với các chữ cái Đức)"
+msgstr "Bo-x-ni-a (Bàn phím Mỹ với các chữ cái Bo-x-ni-a)"
#. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:338 ../rules/base.extras.xml.in.h:87
msgid "pt"
msgstr "pt"
-#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:87
+#: ../rules/base.xml.in.h:339 ../rules/base.extras.xml.in.h:88
msgid "Portuguese (Brazil)"
msgstr "Bồ Đào Nha (Bra-xin)"
#: ../rules/base.xml.in.h:340
msgid "Portuguese (Brazil, eliminate dead keys)"
-msgstr "Bồ Đào Nha (Bra-xin, phím chết loại trừ)"
+msgstr "Bồ Đào Nha (Bra-xin, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:341
msgid "Portuguese (Brazil, Dvorak)"
@@ -1319,11 +1310,11 @@ msgstr "Bồ Đào Nha (Brazil, Nativo)"
#: ../rules/base.xml.in.h:343
msgid "Portuguese (Brazil, Nativo for US keyboards)"
-msgstr "Bồ Đào Nha (Bra-xin, Nativo cho bàn phím Mỹ"
+msgstr "Bồ Đào Nha (Bra-xin, Nativo cho bàn phím Mỹ)"
#: ../rules/base.xml.in.h:344
msgid "Esperanto (Brazil, Nativo)"
-msgstr "Quốc tế ngữ (Bra-xin, Dvorak)"
+msgstr "Quốc tế ngữ (Bra-xin, Nativo)"
#. Keyboard indicator for Bulgarian layouts
#: ../rules/base.xml.in.h:346
@@ -1365,36 +1356,31 @@ msgid "Berber (Morocco, Tifinagh)"
msgstr "Berber (Ma Rốc, Tifinagh)"
#: ../rules/base.xml.in.h:357
-#, fuzzy
msgid "Berber (Morocco, Tifinagh alternative)"
-msgstr "Ti-phi-nac thay thế"
+msgstr "Berber (Ma Rốc, Ti-phi-nac thay thế)"
#: ../rules/base.xml.in.h:358
-#, fuzzy
msgid "Berber (Morocco, Tifinagh alternative phonetic)"
-msgstr "Ti-phi-nac ngữ âm thay thế"
+msgstr "Berber (Ma Rốc, Ti-phi-nac ngữ âm thay thế)"
#: ../rules/base.xml.in.h:359
-#, fuzzy
msgid "Berber (Morocco, Tifinagh extended)"
-msgstr "Ti-phi-nac mở rộng"
+msgstr "Berber (Ma Rốc, Ti-phi-nac mở rộng)"
#: ../rules/base.xml.in.h:360
-#, fuzzy
msgid "Berber (Morocco, Tifinagh phonetic)"
-msgstr "Ti-phi-nac ngữ âm"
+msgstr "Berber (Ma Rốc, Ti-phi-nac ngữ âm)"
#: ../rules/base.xml.in.h:361
-#, fuzzy
msgid "Berber (Morocco, Tifinagh extended phonetic)"
-msgstr "Ti-phi-nac mở rộng ngữ âm"
+msgstr "Berber (Ma Rốc, Ti-phi-nac mở rộng ngữ âm)"
#. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:149
+#: ../rules/base.xml.in.h:363 ../rules/base.extras.xml.in.h:150
msgid "cm"
msgstr "cm"
-#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:150
+#: ../rules/base.xml.in.h:364 ../rules/base.extras.xml.in.h:151
msgid "English (Cameroon)"
msgstr "Tiếng Anh (Ca-mơ-run)"
@@ -1429,11 +1415,11 @@ msgstr "Pháp (Ca-na-đa)"
#: ../rules/base.xml.in.h:373
msgid "French (Canada, Dvorak)"
-msgstr "Pháp (Ca-na-đa, Dvorak)"
+msgstr "Tiếng Pháp (Ca-na-đa, Dvorak)"
#: ../rules/base.xml.in.h:374
msgid "French (Canada, legacy)"
-msgstr "Pháp (Ca-na-đa, cổ)"
+msgstr "Tiếng Pháp (Ca-na-đa, cổ)"
#: ../rules/base.xml.in.h:375
msgid "Canadian Multilingual"
@@ -1462,7 +1448,7 @@ msgstr "Tiếng Anh (Ca-na-đa)"
#: ../rules/base.xml.in.h:382
msgid "French (Democratic Republic of the Congo)"
-msgstr "Tiếng Pháp (Cộng Hoà Dân Chủ Công-gô)"
+msgstr "Tiếng Pháp (Cộng Hòa Dân Chủ Công-gô)"
#. Keyboard indicator for Taiwanese layouts
#: ../rules/base.xml.in.h:384
@@ -1496,30 +1482,30 @@ msgstr "hr"
#: ../rules/base.xml.in.h:392
msgid "Croatian"
-msgstr "Croát-chi-a"
+msgstr "Tiếng Croát-chi-a"
#: ../rules/base.xml.in.h:393
msgid "Croatian (with guillemets for quotes)"
-msgstr "Croát-chi-a (Dùng “guillemets” làm dấu trích dẫn)"
+msgstr "Tiếng Croát-chi-a (Dùng “guillemets” làm dấu trích dẫn)"
#: ../rules/base.xml.in.h:394
msgid "Croatian (with Croatian digraphs)"
-msgstr "Croát-chi-a (với chữ ghép Croát-chi-a)"
+msgstr "Tiếng Croát-chi-a (với chữ ghép Croát-chi-a)"
#: ../rules/base.xml.in.h:395
msgid "Croatian (US keyboard with Croatian digraphs)"
-msgstr "Croát-chi-a (Bàn phím Mỹ với các chữ ghép Croát-chi-a)"
+msgstr "Tiếng Croát-chi-a (Bàn phím Mỹ với các chữ ghép Croát-chi-a)"
#: ../rules/base.xml.in.h:396
msgid "Croatian (US keyboard with Croatian letters)"
msgstr "Croát-chi-a (Bàn phím Mỹ với các chữ cái Croát-chi-a)"
#. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:89
+#: ../rules/base.xml.in.h:398 ../rules/base.extras.xml.in.h:90
msgid "cs"
msgstr "cs"
-#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:399 ../rules/base.extras.xml.in.h:91
msgid "Czech"
msgstr "Tiếng Séc"
@@ -1544,17 +1530,17 @@ msgid "Czech (US Dvorak with CZ UCW support)"
msgstr "Tiếng Séc (Mỹ Dvorak cũng hỗ trợ CZ UCW)"
#. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:92
+#: ../rules/base.xml.in.h:406 ../rules/base.extras.xml.in.h:93
msgid "da"
msgstr "da"
-#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:407 ../rules/base.extras.xml.in.h:94
msgid "Danish"
msgstr "Tiếng Đan Mạch"
#: ../rules/base.xml.in.h:408
msgid "Danish (eliminate dead keys)"
-msgstr "Tiếng Đan Mạch ( phím chết loại trừ)"
+msgstr "Tiếng Đan Mạch ( loại bỏ phím chết)"
#: ../rules/base.xml.in.h:409
msgid "Danish (Winkeys)"
@@ -1566,18 +1552,18 @@ msgstr "Tiếng Đan Mạch (Macintosh)"
#: ../rules/base.xml.in.h:411
msgid "Danish (Macintosh, eliminate dead keys)"
-msgstr "Tiếng Đan Mạch (Macintosh, phím chết loại trừ)"
+msgstr "Tiếng Đan Mạch (Macintosh, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:412
msgid "Danish (Dvorak)"
msgstr "Tiếng Đan Mạch (Dvorak)"
#. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:95
+#: ../rules/base.xml.in.h:414 ../rules/base.extras.xml.in.h:96
msgid "nl"
msgstr "nl"
-#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:415 ../rules/base.extras.xml.in.h:97
msgid "Dutch"
msgstr "Tiếng Hà Lan"
@@ -1603,17 +1589,17 @@ msgid "Dzongkha"
msgstr "Tiếng Dzongkha"
#. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:98
+#: ../rules/base.xml.in.h:423 ../rules/base.extras.xml.in.h:99
msgid "et"
msgstr "et"
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:99
+#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:100
msgid "Estonian"
msgstr "Tiếng Et-tô-ni-a"
#: ../rules/base.xml.in.h:425
msgid "Estonian (eliminate dead keys)"
-msgstr "Et-tô-ni-a (phím chết loại trừ)"
+msgstr "Et-tô-ni-a (loại bỏ phím chết)"
#: ../rules/base.xml.in.h:426
msgid "Estonian (Dvorak)"
@@ -1623,13 +1609,13 @@ msgstr "Et-tô-ni-a (Dvorak)"
msgid "Estonian (US keyboard with Estonian letters)"
msgstr "Et-tô-ni-a (bàn phím Mỹ với các chữ cái E-x-tô-ni-a)"
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:29
+#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:30
msgid "Persian"
msgstr "Tiếng Ba Tư"
#: ../rules/base.xml.in.h:429
msgid "Persian (with Persian keypad)"
-msgstr "Tiếng Ba Tư (có vùng phím Ba Tư"
+msgstr "Tiếng Ba Tư (có vùng phím Ba Tư)"
#. Keyboard indicator for Kurdish layouts
#: ../rules/base.xml.in.h:431
@@ -1638,19 +1624,19 @@ msgstr "ku"
#: ../rules/base.xml.in.h:432
msgid "Kurdish (Iran, Latin Q)"
-msgstr "Tiếng Kút (I ran, La-tinh Q)"
+msgstr "Tiếng Kuổ-đít (I ran, La-tinh Q)"
#: ../rules/base.xml.in.h:433
msgid "Kurdish (Iran, F)"
-msgstr "Tiếng Kút (I ran, F)"
+msgstr "Tiếng Kuổ-đít (I ran, F)"
#: ../rules/base.xml.in.h:434
msgid "Kurdish (Iran, Latin Alt-Q)"
-msgstr "Tiếng Kút (I ran, La-tinh Alt-Q"
+msgstr "Tiếng Kuổ-đít (I ran, La-tinh Alt-Q)"
#: ../rules/base.xml.in.h:435
msgid "Kurdish (Iran, Arabic-Latin)"
-msgstr "Kuổ-đít (Iran, A Rập La-tinh)"
+msgstr "Tiếng Kuổ-đít (Iran, A Rập La-tinh)"
#: ../rules/base.xml.in.h:436
msgid "Iraqi"
@@ -1683,14 +1669,14 @@ msgstr "Tiếng Pha-rô"
#: ../rules/base.xml.in.h:444
msgid "Faroese (eliminate dead keys)"
-msgstr "Tiếng Pha-rô (phím chết loại trừ)"
+msgstr "Tiếng Pha-rô (loại bỏ phím chết)"
#. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:102
msgid "fi"
msgstr "fi"
-#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:447 ../rules/base.extras.xml.in.h:103
msgid "Finnish"
msgstr "Tiếng Phần Lan"
@@ -1714,13 +1700,13 @@ msgstr "Bắc Xa-mi (Phần Lan)"
msgid "Finnish (Macintosh)"
msgstr "Tiếng Phần Lan (Macintosh)"
-#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:453 ../rules/base.extras.xml.in.h:105
msgid "French"
msgstr "Pháp"
#: ../rules/base.xml.in.h:454
msgid "French (eliminate dead keys)"
-msgstr "Tiếng Pháp (phím chết loại trừ)"
+msgstr "Tiếng Pháp (loại bỏ phím chết)"
#: ../rules/base.xml.in.h:455
msgid "French (Sun dead keys)"
@@ -1736,7 +1722,7 @@ msgstr "Tiếng Pháp (thay thế, chỉ Latin-9)"
#: ../rules/base.xml.in.h:458
msgid "French (alternative, eliminate dead keys)"
-msgstr "Tiếng Pháp (thay thế, phím chết loại trừ)"
+msgstr "Tiếng Pháp (thay thế, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:459
msgid "French (alternative, Sun dead keys)"
@@ -1748,7 +1734,7 @@ msgstr "Tiếng Pháp (cũ, thay thế)"
#: ../rules/base.xml.in.h:461
msgid "French (legacy, alternative, eliminate dead keys)"
-msgstr "Tiếng Pháp (cổ, thay thế, phím chết loại trừ)"
+msgstr "Tiếng Pháp (cổ, thay thế, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:462
msgid "French (legacy, alternative, Sun dead keys)"
@@ -1784,7 +1770,7 @@ msgstr "Óc-khi-tanh (Pháp, AZERTY Tskapo)"
#: ../rules/base.xml.in.h:470
msgid "English (Ghana)"
-msgstr "Tiếng Anh (Cộng hoà Ga-na)"
+msgstr "Tiếng Anh (Cộng hòa Ga-na)"
#: ../rules/base.xml.in.h:471
msgid "English (Ghana, multilingual)"
@@ -1891,7 +1877,7 @@ msgstr "Tiếng Đức (dấu huyền chết)"
#: ../rules/base.xml.in.h:502
msgid "German (eliminate dead keys)"
-msgstr "Tiếng Đức (phím chết loại trừ)"
+msgstr "Tiếng Đức (loại bỏ phím chết)"
#: ../rules/base.xml.in.h:503
msgid "German (T3)"
@@ -1903,7 +1889,7 @@ msgstr "Tiếng Ru-ma-ny (Đức)"
#: ../rules/base.xml.in.h:505
msgid "Romanian (Germany, eliminate dead keys)"
-msgstr "Tiếng Ru-ma-ny (Đức, phím chết loại trừ)"
+msgstr "Tiếng Ru-ma-ny (Đức, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:506
msgid "German (Dvorak)"
@@ -1923,7 +1909,7 @@ msgstr "Tiếng Đức (Macintosh)"
#: ../rules/base.xml.in.h:510
msgid "German (Macintosh, eliminate dead keys)"
-msgstr "Tiếng Đức (Macintosh, phím chết loại trừ)"
+msgstr "Tiếng Đức (Macintosh, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:511
msgid "Lower Sorbian"
@@ -1950,11 +1936,11 @@ msgid "German (legacy)"
msgstr "Tiếng Đức (cổ)"
#. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:518 ../rules/base.extras.xml.in.h:107
msgid "gr"
msgstr "gr"
-#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:519 ../rules/base.extras.xml.in.h:108
msgid "Greek"
msgstr "Hy Lạp"
@@ -1968,7 +1954,7 @@ msgstr "Hy Lạp (mở rộng)"
#: ../rules/base.xml.in.h:522
msgid "Greek (eliminate dead keys)"
-msgstr "Hy-lạp (phím chết loại trừ)"
+msgstr "Hy-lạp (loại bỏ phím chết)"
#: ../rules/base.xml.in.h:523
msgid "Greek (polytonic)"
@@ -1989,7 +1975,7 @@ msgstr "Tiếng Hung Ga ri (tiêu chuẩn)"
#: ../rules/base.xml.in.h:528
msgid "Hungarian (eliminate dead keys)"
-msgstr "Tiếng Hung Ga ri (phím chết loại trừ)"
+msgstr "Tiếng Hung Ga ri (loại bỏ phím chết)"
#: ../rules/base.xml.in.h:529
msgid "Hungarian (qwerty)"
@@ -2001,7 +1987,7 @@ msgstr "Tiếng Hung Ga ri (101/qwertz/dấu phẩy/Phím chết)"
#: ../rules/base.xml.in.h:531
msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
-msgstr "Tiếng Hung Ga ri (101/qwertz/dấu phẩy/Phím chết loại trừ)"
+msgstr "Tiếng Hung Ga ri (101/qwertz/dấu phẩy/loại bỏ phím chết)"
#: ../rules/base.xml.in.h:532
msgid "Hungarian (101/qwertz/dot/dead keys)"
@@ -2009,7 +1995,7 @@ msgstr "Tiếng Hung Ga ri (101/qwertz/dấu chấm/Phím chết)"
#: ../rules/base.xml.in.h:533
msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
-msgstr "Tiếng Hung Ga ri (101/qwertz/dấu chấm/Phím chết loại trừ)"
+msgstr "Tiếng Hung Ga ri (101/qwertz/dấu chấm/loại bỏ phím chết)"
#: ../rules/base.xml.in.h:534
msgid "Hungarian (101/qwerty/comma/dead keys)"
@@ -2017,7 +2003,7 @@ msgstr "Tiếng Hung Ga ri (101/qwerty/dấu phẩy/Phím chết)"
#: ../rules/base.xml.in.h:535
msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
-msgstr "Tiếng Hung Ga ri (101/qwerty/dấu phẩy/Phím chết loại trừ)"
+msgstr "Tiếng Hung Ga ri (101/qwerty/dấu phẩy/loại bỏ phím chết)"
#: ../rules/base.xml.in.h:536
msgid "Hungarian (101/qwerty/dot/dead keys)"
@@ -2025,7 +2011,7 @@ msgstr "Tiếng Hung Ga ri (101/qwerty/dấu chấm/Phím chết)"
#: ../rules/base.xml.in.h:537
msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
-msgstr "Tiếng Hung Ga ri (101/qwerty/dấu chấm/Phím chết loại trừ)"
+msgstr "Tiếng Hung Ga ri (101/qwerty/dấu chấm/loại bỏ phím chết)"
#: ../rules/base.xml.in.h:538
msgid "Hungarian (102/qwertz/comma/dead keys)"
@@ -2033,7 +2019,7 @@ msgstr "Tiếng Hung Ga ri (102/qwertz/dấu phẩy/Phím chết)"
#: ../rules/base.xml.in.h:539
msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
-msgstr "Hung-ga-ri (102/qwertz/dấu phẩy/Phím chết loại trừ)"
+msgstr "Hung-ga-ri (102/qwertz/dấu phẩy/loại bỏ phím chết)"
#: ../rules/base.xml.in.h:540
msgid "Hungarian (102/qwertz/dot/dead keys)"
@@ -2041,7 +2027,7 @@ msgstr "Hung-ga-ri (102/qwertz/dấu chấm/Phím chết)"
#: ../rules/base.xml.in.h:541
msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
-msgstr "Hung-ga-ri (102/qwertz/dấu chấm/Phím chết loại trừ)"
+msgstr "Hung-ga-ri (102/qwertz/dấu chấm/loại bỏ phím chết)"
#: ../rules/base.xml.in.h:542
msgid "Hungarian (102/qwerty/comma/dead keys)"
@@ -2049,7 +2035,7 @@ msgstr "Hung-ga-ri (102/qwerty/dấu phẩy/Phím chết)"
#: ../rules/base.xml.in.h:543
msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
-msgstr "Hung-ga-ri (102/qwerty/dấu phẩy/Phím chết loại trừ)"
+msgstr "Hung-ga-ri (102/qwerty/dấu phẩy/loại bỏ phím chết)"
#: ../rules/base.xml.in.h:544
msgid "Hungarian (102/qwerty/dot/dead keys)"
@@ -2057,7 +2043,7 @@ msgstr "Hung-ga-ri (102/qwerty/dấu chấm/Phím chết)"
#: ../rules/base.xml.in.h:545
msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
-msgstr "Hung-ga-ri (102/qwerty/dấu chấm/Phím chết loại trừ)"
+msgstr "Hung-ga-ri (102/qwerty/dấu chấm/loại bỏ phím chết)"
#. Keyboard indicator for Icelandic layouts
#: ../rules/base.xml.in.h:547
@@ -2074,7 +2060,7 @@ msgstr "Ai-len (phím chết Sun)"
#: ../rules/base.xml.in.h:550
msgid "Icelandic (eliminate dead keys)"
-msgstr "Ai-len (phím chết loại trừ)"
+msgstr "Ai-len (loại bỏ phím chết)"
#: ../rules/base.xml.in.h:551
msgid "Icelandic (Macintosh, legacy)"
@@ -2089,13 +2075,13 @@ msgid "Icelandic (Dvorak)"
msgstr "Tiếng Ai-xơ-len (Dvorak)"
#. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:78
msgid "he"
msgstr "he"
-#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:78
+#: ../rules/base.xml.in.h:556 ../rules/base.extras.xml.in.h:79
msgid "Hebrew"
-msgstr "Tiếng Do Thái "
+msgstr "Tiếng Do Thái"
#: ../rules/base.xml.in.h:557
msgid "Hebrew (lyx)"
@@ -2110,17 +2096,17 @@ msgid "Hebrew (Biblical, Tiro)"
msgstr "Hê-brơ (Do thái) cổ (Kinh thánh, Tiro)"
#. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:110
msgid "it"
msgstr "it"
-#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:111
msgid "Italian"
msgstr "Tiếng Ý"
#: ../rules/base.xml.in.h:563
msgid "Italian (eliminate dead keys)"
-msgstr "Tiếng Ý (phím chết loại trừ)"
+msgstr "Tiếng Ý (loại bỏ phím chết)"
#: ../rules/base.xml.in.h:564
msgid "Italian (Winkeys)"
@@ -2135,22 +2121,21 @@ msgid "Italian (US keyboard with Italian letters)"
msgstr "Ý (Bàn phím Mỹ với các chữ cái Ý)"
#: ../rules/base.xml.in.h:567
-#, fuzzy
msgid "Georgian (Italy)"
-msgstr "Gi-oa-gi-a (Mkhedruli)"
+msgstr "Gi-oa-gi-a (Ý)"
#: ../rules/base.xml.in.h:568
msgid "Italian (IBM 142)"
msgstr "Tiếng Ý (IBM 142)"
#. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:113
msgid "ja"
msgstr "ja"
-#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:114
msgid "Japanese"
-msgstr "Tiếng Nhật "
+msgstr "Tiếng Nhật"
#: ../rules/base.xml.in.h:572
msgid "Japanese (Kana)"
@@ -2178,14 +2163,12 @@ msgid "ki"
msgstr "ki"
#: ../rules/base.xml.in.h:579
-#, fuzzy
msgid "Kyrgyz"
-msgstr "Nước Cộng Hoà Khư-rơ-gư-xtanh"
+msgstr "Khư-rơ-gư-xtanh"
#: ../rules/base.xml.in.h:580
-#, fuzzy
msgid "Kyrgyz (phonetic)"
-msgstr "Mở rộng Ngữ âm"
+msgstr "Khư-rơ-gư-xtanh (ngữ âm)"
#. Keyboard indicator for Khmer layouts
#: ../rules/base.xml.in.h:582
@@ -2206,9 +2189,8 @@ msgid "Kazakh"
msgstr "Tiếng Ca-dakh"
#: ../rules/base.xml.in.h:587
-#, fuzzy
msgid "Russian (Kazakhstan, with Kazakh)"
-msgstr "Nga có Kha-xắc"
+msgstr "Nga (Ka-zắc-tan, có Kha-xắc)"
#: ../rules/base.xml.in.h:588
msgid "Kazakh (with Russian)"
@@ -2228,7 +2210,7 @@ msgid "Lao (STEA proposed standard layout)"
msgstr "Lào (bố cục STEA tiêu chuẩn dự kiến)"
#. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:125
+#: ../rules/base.xml.in.h:594 ../rules/base.extras.xml.in.h:126
msgid "es"
msgstr "es"
@@ -2238,22 +2220,22 @@ msgstr "Tiếng Tây Ban Nha (Mỹ La-tinh)"
#: ../rules/base.xml.in.h:596
msgid "Spanish (Latin American, eliminate dead keys)"
-msgstr "Tiếng Tây Ban Nha (Mỹ La-tinh, phím chết loại trừ)"
+msgstr "Tiếng Tây Ban Nha (Mỹ La-tinh, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:597
msgid "Spanish (Latin American, include dead tilde)"
-msgstr ""
+msgstr "Tiếng Tây Ban Nha (Mỹ La-tinh, có phím chết)"
#: ../rules/base.xml.in.h:598
msgid "Spanish (Latin American, Sun dead keys)"
msgstr "Tiếng Tây Ban Nha (Mỹ La-tinh, phím chết sun)"
#. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:32
msgid "lt"
msgstr "lt"
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:32
+#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:33
msgid "Lithuanian"
msgstr "Tiếng Li-tu-a-ni"
@@ -2278,28 +2260,25 @@ msgid "Lithuanian (LEKPa)"
msgstr "Tiếng Li-tu-a-ni (LEKPa)"
#. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:36
msgid "lv"
msgstr "lv"
-#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:609 ../rules/base.extras.xml.in.h:37
msgid "Latvian"
msgstr "Tiếng Lát-vi-a"
#: ../rules/base.xml.in.h:610
-#, fuzzy
msgid "Latvian (apostrophe variant)"
-msgstr "Phương án hô ngữ (”)"
+msgstr "Tiếng Lát-vi-a (biến thể hô ngữ)"
#: ../rules/base.xml.in.h:611
-#, fuzzy
msgid "Latvian (tilde variant)"
-msgstr "Phương án dấu sóng (~)"
+msgstr "Tiếng Lát-vi-a (biến thể dấu sóng ~)"
#: ../rules/base.xml.in.h:612
-#, fuzzy
msgid "Latvian (F variant)"
-msgstr "Biến thể phông chữ"
+msgstr "Tiếng Lát-vi-a (biến thể F)"
#: ../rules/base.xml.in.h:613
msgid "Latvian (modern)"
@@ -2307,7 +2286,7 @@ msgstr "Tiếng Lát-vi-a (hiện đại)"
#: ../rules/base.xml.in.h:614
msgid "Latvian (ergonomic, ŪGJRMV)"
-msgstr ""
+msgstr "Tiếng Lát-vi-a (công thái học, ŪGJRMV)"
#: ../rules/base.xml.in.h:615
msgid "Latvian (adapted)"
@@ -2323,48 +2302,41 @@ msgid "Maori"
msgstr "Mao-ri"
#. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:66
+#: ../rules/base.xml.in.h:620 ../rules/base.extras.xml.in.h:67
msgid "sr"
msgstr "sr"
#: ../rules/base.xml.in.h:621
msgid "Montenegrin"
-msgstr ""
+msgstr "Montenegrin"
#: ../rules/base.xml.in.h:622
-#, fuzzy
msgid "Montenegrin (Cyrillic)"
-msgstr "Ki-rin/Tiếng Nga"
+msgstr "Montenegrin (Ki-rin)"
#: ../rules/base.xml.in.h:623
-#, fuzzy
msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
-msgstr "Ki-rin, đổi chỗ Z và ZHE"
+msgstr "Montenegrin (Ki-rin, đổi chỗ Z và ZHE)"
#: ../rules/base.xml.in.h:624
-#, fuzzy
msgid "Montenegrin (Latin Unicode)"
-msgstr "La-tinh Unicode"
+msgstr "Montenegrin (La-tinh Unicode)"
#: ../rules/base.xml.in.h:625
-#, fuzzy
msgid "Montenegrin (Latin qwerty)"
-msgstr "La-tinh qwerty"
+msgstr "Montenegrin (La-tinh qwerty)"
#: ../rules/base.xml.in.h:626
-#, fuzzy
msgid "Montenegrin (Latin Unicode qwerty)"
-msgstr "La-tinh Unicode qwerty"
+msgstr "Montenegrin (La-tinh Unicode qwerty)"
#: ../rules/base.xml.in.h:627
-#, fuzzy
msgid "Montenegrin (Cyrillic with guillemets)"
-msgstr "Ki-rin với “chim uria”"
+msgstr "Montenegrin (Ki-rin có “guillemets”)"
#: ../rules/base.xml.in.h:628
-#, fuzzy
msgid "Montenegrin (Latin with guillemets)"
-msgstr "La-tinh với “chim uria”"
+msgstr "Montenegrin (La-tinh có “guillemets”)"
#. Keyboard indicator for Macedonian layouts
#: ../rules/base.xml.in.h:630
@@ -2377,7 +2349,7 @@ msgstr "Tiếng Maxêđôni"
#: ../rules/base.xml.in.h:632
msgid "Macedonian (eliminate dead keys)"
-msgstr "Maxêđôni (phím chết loại trừ)"
+msgstr "Maxêđôni (loại bỏ phím chết)"
#. Keyboard indicator for Maltese layouts
#: ../rules/base.xml.in.h:634
@@ -2386,7 +2358,7 @@ msgstr "mt"
#: ../rules/base.xml.in.h:635
msgid "Maltese"
-msgstr "Tiếng Mantơ "
+msgstr "Tiếng Mantơ"
#: ../rules/base.xml.in.h:636
msgid "Maltese (with US layout)"
@@ -2402,17 +2374,17 @@ msgid "Mongolian"
msgstr "Tiếng Mông Cổ"
#. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:117
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:118
msgid "no"
msgstr "no"
-#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:642 ../rules/base.extras.xml.in.h:119
msgid "Norwegian"
msgstr "Tiếng Na-uy"
#: ../rules/base.xml.in.h:643
msgid "Norwegian (eliminate dead keys)"
-msgstr "Na Uy (phím chết loại trừ)"
+msgstr "Na Uy (loại bỏ phím chết)"
#: ../rules/base.xml.in.h:644
msgid "Norwegian (Winkeys)"
@@ -2423,14 +2395,12 @@ msgid "Norwegian (Dvorak)"
msgstr "Na Uy (Dvorak)"
#: ../rules/base.xml.in.h:646
-#, fuzzy
msgid "Northern Saami (Norway)"
-msgstr "Bắc Xa-mi"
+msgstr "Bắc Xa-mi (Na Uy)"
#: ../rules/base.xml.in.h:647
-#, fuzzy
msgid "Northern Saami (Norway, eliminate dead keys)"
-msgstr "Bắc Xa-mi, phím chết loại trừ"
+msgstr "Bắc Xa-mi (Na Uy, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:648
msgid "Norwegian (Macintosh)"
@@ -2438,20 +2408,20 @@ msgstr "Na Uy (Macintosh)"
#: ../rules/base.xml.in.h:649
msgid "Norwegian (Macintosh, eliminate dead keys)"
-msgstr "Na Uy (Macintosh, phím chết loại trừ)"
+msgstr "Na Uy (Macintosh, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:650
msgid "Norwegian (Colemak)"
-msgstr "Tiếng Na-uy (Colemak) "
+msgstr "Tiếng Na-uy (Colemak)"
#. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:652 ../rules/base.extras.xml.in.h:56
msgid "pl"
msgstr "pl"
-#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:56
+#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:57
msgid "Polish"
-msgstr "Tiếng Ba Lan "
+msgstr "Tiếng Ba Lan"
#: ../rules/base.xml.in.h:654
msgid "Polish (legacy)"
@@ -2478,9 +2448,8 @@ msgid "Kashubian"
msgstr "Kha-su-bi"
#: ../rules/base.xml.in.h:660
-#, fuzzy
msgid "Silesian"
-msgstr "Tiếng Ba Tư"
+msgstr "Silesian"
#: ../rules/base.xml.in.h:661
msgid "Russian (Poland, phonetic Dvorak)"
@@ -2490,13 +2459,13 @@ msgstr "Ru-man-ni (Ba Lan, ngữ âm Dvorak)"
msgid "Polish (programmer Dvorak)"
msgstr "Tiếng Ba Lan (dành cho người lập trình)"
-#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:120
+#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:121
msgid "Portuguese"
msgstr "Bồ Đào Nha"
#: ../rules/base.xml.in.h:664
msgid "Portuguese (eliminate dead keys)"
-msgstr "Bồ Đào Nha (phím chết loại trừ)"
+msgstr "Bồ Đào Nha (loại bỏ phím chết)"
#: ../rules/base.xml.in.h:665
msgid "Portuguese (Sun dead keys)"
@@ -2508,7 +2477,7 @@ msgstr "Bồ Đào Nha (Macintosh)"
#: ../rules/base.xml.in.h:667
msgid "Portuguese (Macintosh, eliminate dead keys)"
-msgstr "Bồ Đào Nha (Macintosh, phím chết loại trừ)"
+msgstr "Bồ Đào Nha (Macintosh, loại bỏ phím chết)"
#: ../rules/base.xml.in.h:668
msgid "Portuguese (Macintosh, Sun dead keys)"
@@ -2527,11 +2496,11 @@ msgid "Esperanto (Portugal, Nativo)"
msgstr "Ét-pê-ran-to (Bồ Đào Nha, Nguyên gốc)"
#. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:60
+#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:61
msgid "ro"
msgstr "ro"
-#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:674 ../rules/base.extras.xml.in.h:62
msgid "Romanian"
msgstr "Tiếng Ru-ma-ni"
@@ -2551,7 +2520,7 @@ msgstr "Ru-man-ni (dấu phẩy tiêu chuẩn)"
msgid "Romanian (WinKeys)"
msgstr "Ru-man-ni (Có phím Windows)"
-#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:679 ../rules/base.extras.xml.in.h:71
msgid "Russian"
msgstr "Nga"
@@ -2613,15 +2582,15 @@ msgstr "Kalmyk"
#: ../rules/base.xml.in.h:694
msgid "Russian (DOS)"
-msgstr "Nga (DOS)"
+msgstr "Tiếng Nga (DOS)"
#: ../rules/base.xml.in.h:695
msgid "Russian (Macintosh)"
-msgstr "Nga (Macintosh)"
+msgstr "Tiếng Nga (Macintosh)"
#: ../rules/base.xml.in.h:696
msgid "Serbian (Russia)"
-msgstr "Xéc-bi (Nga)"
+msgstr "Tiếng Xéc-bi (Nga)"
#: ../rules/base.xml.in.h:697
msgid "Bashkirian"
@@ -2631,1414 +2600,1414 @@ msgstr "Ba-s-khi-ri"
msgid "Mari"
msgstr "Tiếng Ma-ri"
-#: ../rules/base.xml.in.h:699 ../rules/base.extras.xml.in.h:67
-msgid "Serbian"
-msgstr "Xéc-bi"
+#: ../rules/base.xml.in.h:699
+msgid "Russian (phonetic azerty)"
+msgstr "Tiếng Nga (ngữ âm azerty)"
#: ../rules/base.xml.in.h:700
-#, fuzzy
+msgid "Russian (phonetic French)"
+msgstr "Tiếng Nga (Pháp ngữ âm)"
+
+#: ../rules/base.xml.in.h:701 ../rules/base.extras.xml.in.h:68
+msgid "Serbian"
+msgstr "Tiếng Xéc-bi"
+
+#: ../rules/base.xml.in.h:702
msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
-msgstr "Ki-rin, đổi chỗ Z và ZHE"
+msgstr "Tiếng Xéc-bi (Ki-rin, đổi chỗ Z và ZHE)"
-#: ../rules/base.xml.in.h:701
-#, fuzzy
+#: ../rules/base.xml.in.h:703
msgid "Serbian (Latin)"
msgstr "Tiếng Xéc-bi (La-tinh)"
-#: ../rules/base.xml.in.h:702
-#, fuzzy
+#: ../rules/base.xml.in.h:704
msgid "Serbian (Latin Unicode)"
-msgstr "La-tinh Unicode"
+msgstr "Tiếng Xéc-bi (La-tinh Unicode)"
-#: ../rules/base.xml.in.h:703
-#, fuzzy
+#: ../rules/base.xml.in.h:705
msgid "Serbian (Latin qwerty)"
-msgstr "La-tinh qwerty"
+msgstr "Tiếng Xéc-bi (La-tinh qwerty)"
-#: ../rules/base.xml.in.h:704
-#, fuzzy
+#: ../rules/base.xml.in.h:706
msgid "Serbian (Latin Unicode qwerty)"
-msgstr "La-tinh Unicode qwerty"
+msgstr "Tiếng Xéc-bi (La-tinh Unicode qwerty)"
-#: ../rules/base.xml.in.h:705
-#, fuzzy
+#: ../rules/base.xml.in.h:707
msgid "Serbian (Cyrillic with guillemets)"
-msgstr "Ki-rin với “chim uria”"
+msgstr "Tiếng Xéc-bi (Ki-rin với “guillemets”)"
-#: ../rules/base.xml.in.h:706
-#, fuzzy
+#: ../rules/base.xml.in.h:708
msgid "Serbian (Latin with guillemets)"
-msgstr "La-tinh với “chim uria”"
+msgstr "Tiếng Xéc-bi (La-tinh với “guillemets”)"
-#: ../rules/base.xml.in.h:707
-#, fuzzy
+#: ../rules/base.xml.in.h:709
msgid "Pannonian Rusyn"
msgstr "Đồng điệu Ru-xin Pa-non"
#. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:711
msgid "sl"
msgstr "sl"
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:712
msgid "Slovenian"
msgstr "Tiếng Xlô-ven"
-#: ../rules/base.xml.in.h:711
-#, fuzzy
+#: ../rules/base.xml.in.h:713
msgid "Slovenian (with guillemets for quotes)"
-msgstr "Dùng “chim uria” làm dấu trích dẫn"
+msgstr "Tiếng Xlô-ven (Dùng “guillemets” làm dấu trích dẫn)"
-#: ../rules/base.xml.in.h:712
-#, fuzzy
+#: ../rules/base.xml.in.h:714
msgid "Slovenian (US keyboard with Slovenian letters)"
-msgstr "Đức (Bàn phím Mỹ với các chữ cái Đức)"
+msgstr "Tiếng Xlô-ven (Bàn phím Mỹ với các chữ cái Xlô-ven)"
#. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:716 ../rules/base.extras.xml.in.h:123
msgid "sk"
msgstr "sk"
-#: ../rules/base.xml.in.h:715 ../rules/base.extras.xml.in.h:123
+#: ../rules/base.xml.in.h:717 ../rules/base.extras.xml.in.h:124
msgid "Slovak"
-msgstr "Tiếng Xlô-vác "
+msgstr "Tiếng Xlô-vác"
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:718
msgid "Slovak (extended Backslash)"
-msgstr "Xlô vác (gạch ngược Mở rộng)"
+msgstr "Tiếng Xlô vác (gạch ngược Mở rộng)"
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:719
msgid "Slovak (qwerty)"
-msgstr "Xlô vác (qwerty)"
+msgstr "Tiếng Xlô vác (qwerty)"
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:720
msgid "Slovak (qwerty, extended Backslash)"
-msgstr "Xlô vác (qwerty, Gạch ngược mở rộng)"
+msgstr "Tiếng Xlô vác (qwerty, Gạch ngược mở rộng)"
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:721 ../rules/base.extras.xml.in.h:127
msgid "Spanish"
-msgstr "Tiếng Tây Ban Nha "
+msgstr "Tiếng Tây Ban Nha"
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:722
msgid "Spanish (eliminate dead keys)"
-msgstr "Tây Ban Nha (phím chết loại trừ)"
+msgstr "Tây Ban Nha (loại bỏ phím chết)"
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:723
msgid "Spanish (Winkeys)"
msgstr "Tây Ban Nha (Có phím Windows)"
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:724
msgid "Spanish (include dead tilde)"
msgstr "Tây Ban Nha (bao gồm dấu sóng chết)"
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:725
msgid "Spanish (Sun dead keys)"
msgstr "Tây Ban Nha (phím chết Sun)"
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:726
msgid "Spanish (Dvorak)"
msgstr "Tây Ban Nha (Dvorak)"
-#: ../rules/base.xml.in.h:725
-#, fuzzy
+#: ../rules/base.xml.in.h:727
msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
msgstr "Biến thế Ax-tu-ri có H chấm dưới và L chấm dưới"
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:728
msgid "Catalan (Spain, with middle-dot L)"
msgstr "Ca-ta-lăng (Tây Ban Nha, có chữ L chấm giữa)"
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:729
msgid "Spanish (Macintosh)"
msgstr "Tây Ban Nha (Macintosh)"
#. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:729 ../rules/base.extras.xml.in.h:128
+#: ../rules/base.xml.in.h:731 ../rules/base.extras.xml.in.h:129
msgid "sv"
msgstr "sv"
-#: ../rules/base.xml.in.h:730 ../rules/base.extras.xml.in.h:129
+#: ../rules/base.xml.in.h:732 ../rules/base.extras.xml.in.h:130
msgid "Swedish"
msgstr "Tiếng Thụy Điển"
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:733
msgid "Swedish (eliminate dead keys)"
-msgstr "Thụy Điển (phím chết loại trừ)"
+msgstr "Thụy Điển (loại bỏ phím chết)"
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:734
msgid "Swedish (Dvorak)"
msgstr "Tiếng Thụy Điển (Dvorak)"
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:735
msgid "Russian (Sweden, phonetic)"
-msgstr "Nga (Thụy Điển, ngữ âm)"
+msgstr "Tiếng Nga (Thụy Điển, ngữ âm)"
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:736
msgid "Russian (Sweden, phonetic, eliminate dead keys)"
-msgstr "Nga (Thụy Điển, ngữ âm, phím chết loại trừ)"
+msgstr "Tiếng Nga (Thụy Điển, ngữ âm, loại bỏ phím chết)"
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:737
msgid "Northern Saami (Sweden)"
msgstr "Bắc Xa-mi (Thụy Điển)"
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:738
msgid "Swedish (Macintosh)"
msgstr "Thụy Điển (Macintosh)"
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:739
msgid "Swedish (Svdvorak)"
msgstr "Thụy Điển (Svdvorak)"
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:740
msgid "Swedish Sign Language"
-msgstr ""
+msgstr "Thụy Điển ngôn ngữ ký hiệu"
-#: ../rules/base.xml.in.h:739 ../rules/base.extras.xml.in.h:132
+#: ../rules/base.xml.in.h:741 ../rules/base.extras.xml.in.h:133
msgid "German (Switzerland)"
msgstr "Đức (Thụy sỹ)"
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:742
msgid "German (Switzerland, legacy)"
msgstr "Đức (Thụy Sỹ, cũ)"
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:743
msgid "German (Switzerland, eliminate dead keys)"
-msgstr "Đức (Thụy Sỹ, phím chết loại trừ)"
+msgstr "Đức (Thụy Sỹ, loại bỏ phím chết)"
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:744
msgid "German (Switzerland, Sun dead keys)"
msgstr "Đức (Thụy Sỹ, phím chết Sun)"
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:745
msgid "French (Switzerland)"
msgstr "Pháp (Thụy sỹ)"
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
msgid "French (Switzerland, eliminate dead keys)"
-msgstr "Pháp (Thụy Sỹ, phím chết loại trừ)"
+msgstr "Pháp (Thụy Sỹ, loại bỏ phím chết)"
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
msgid "French (Switzerland, Sun dead keys)"
msgstr "Pháp (Thụy Sỹ, phím chết Sun)"
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
msgid "French (Switzerland, Macintosh)"
msgstr "Pháp (Thụy Sỹ, Macintosh)"
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
msgid "German (Switzerland, Macintosh)"
msgstr "Đức (Thụy Sỹ, Macintosh)"
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:750
msgid "Arabic (Syria)"
msgstr "Tiếng A Rập (Xy-ri)"
#. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:752
msgid "syc"
msgstr "syc"
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:753
msgid "Syriac"
msgstr "Xi-ri"
-#: ../rules/base.xml.in.h:752
-#, fuzzy
+#: ../rules/base.xml.in.h:754
msgid "Syriac (phonetic)"
msgstr "Mở rộng Ngữ âm"
-#: ../rules/base.xml.in.h:753
-#, fuzzy
+#: ../rules/base.xml.in.h:755
msgid "Kurdish (Syria, Latin Q)"
msgstr "Kuổ-đít (Iran, A Rập La-tinh)"
-#: ../rules/base.xml.in.h:754
-#, fuzzy
+#: ../rules/base.xml.in.h:756
msgid "Kurdish (Syria, F)"
msgstr "Tiếng A Rập (Xy-ri)"
-#: ../rules/base.xml.in.h:755
-#, fuzzy
+#: ../rules/base.xml.in.h:757
msgid "Kurdish (Syria, Latin Alt-Q)"
msgstr "Tiếng Iran (I-rắc, La-tinh Alt-Q)"
#. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:759
msgid "tg"
msgstr "tg"
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:760
msgid "Tajik"
msgstr "Tiếng Ta-gic"
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:761
msgid "Tajik (legacy)"
msgstr "Tiếng Ta-gíc (cổ)"
#. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:763
msgid "si"
msgstr "si"
-#: ../rules/base.xml.in.h:762
-#, fuzzy
+#: ../rules/base.xml.in.h:764
msgid "Sinhala (phonetic)"
msgstr "Mở rộng Ngữ âm"
-#: ../rules/base.xml.in.h:763
-#, fuzzy
+#: ../rules/base.xml.in.h:765
msgid "Tamil (Sri Lanka, Unicode)"
msgstr "Ta-min Unicode"
-#: ../rules/base.xml.in.h:764
-#, fuzzy
+#: ../rules/base.xml.in.h:766
msgid "Tamil (Sri Lanka, TAB Typewriter)"
msgstr "Ta-min TAB máy chữ"
#. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:768
msgid "th"
msgstr "th"
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:769
msgid "Thai"
-msgstr "Tiếng Thái Lan "
+msgstr "Tiếng Thái Lan"
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:770
msgid "Thai (TIS-820.2538)"
msgstr "Thái (TIS-820.2538)"
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:771
msgid "Thai (Pattachote)"
msgstr "Thái Lan (Pattachote)"
#. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:135
+#: ../rules/base.xml.in.h:773 ../rules/base.extras.xml.in.h:136
msgid "tr"
msgstr "tr"
-#: ../rules/base.xml.in.h:772 ../rules/base.extras.xml.in.h:136
+#: ../rules/base.xml.in.h:774 ../rules/base.extras.xml.in.h:137
msgid "Turkish"
msgstr "Tiếng Thổ Nhĩ Kỳ"
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:775
msgid "Turkish (F)"
msgstr "Tiếng Thổ Nhĩ Kỳ (F)"
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:776
msgid "Turkish (Alt-Q)"
msgstr "Thổ nhĩ kỳ (Alt-Q)"
-#: ../rules/base.xml.in.h:775
-#, fuzzy
+#: ../rules/base.xml.in.h:777
msgid "Turkish (Sun dead keys)"
msgstr "Bồ Đào Nha (phím chết Sun)"
-#: ../rules/base.xml.in.h:776
-#, fuzzy
+#: ../rules/base.xml.in.h:778
msgid "Kurdish (Turkey, Latin Q)"
msgstr "Kuổ-đít (Iran, A Rập La-tinh)"
-#: ../rules/base.xml.in.h:777
-#, fuzzy
+#: ../rules/base.xml.in.h:779
msgid "Kurdish (Turkey, F)"
-msgstr "Nước Cộng Hoà Thổ Nhĩ Kỳ"
+msgstr "Nước Cộng Hòa Thổ Nhĩ Kỳ"
-#: ../rules/base.xml.in.h:778
-#, fuzzy
+#: ../rules/base.xml.in.h:780
msgid "Kurdish (Turkey, Latin Alt-Q)"
msgstr "Tiếng Iran (I-rắc, La-tinh Alt-Q)"
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:781
msgid "Turkish (international with dead keys)"
msgstr "Thổ Nhĩ Kỳ (quốc tế với phím chết)"
#. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:783 ../rules/base.extras.xml.in.h:63
msgid "crh"
msgstr "crh"
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:784
msgid "Crimean Tatar (Turkish Q)"
msgstr "Ta-tă Cợ-ri-mia (Thổ Nhĩ Kỳ Q)"
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:785
msgid "Crimean Tatar (Turkish F)"
msgstr "Ta-tă Cợ-ri-mia (Thổ Nhĩ Kỳ F)"
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:786
msgid "Crimean Tatar (Turkish Alt-Q)"
msgstr "Ta-tă Cợ-ri-mia (Thổ Nhĩ Kỳ Alt-Q)"
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:787
msgid "Taiwanese"
msgstr "Tiếng Đài Loan"
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:788
msgid "Taiwanese (indigenous)"
msgstr "Tiếng Đài Loan (bản địa)"
#. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:790
msgid "xsy"
msgstr "xsy"
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:791
msgid "Saisiyat (Taiwan)"
msgstr "Tiếng Saisiyat (Đài-loan)"
#. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:791 ../rules/base.extras.xml.in.h:138
+#: ../rules/base.xml.in.h:793 ../rules/base.extras.xml.in.h:139
msgid "uk"
msgstr "uk"
-#: ../rules/base.xml.in.h:792 ../rules/base.extras.xml.in.h:139
+#: ../rules/base.xml.in.h:794 ../rules/base.extras.xml.in.h:140
msgid "Ukrainian"
-msgstr "Tiếng Ukraina "
+msgstr "Tiếng Ukraina"
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:795
msgid "Ukrainian (phonetic)"
-msgstr "U-crai-na (ngữ âm)"
+msgstr "Tiếng U-crai-na (ngữ âm)"
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:796
msgid "Ukrainian (typewriter)"
-msgstr "U-crai-na (máy đánh chữ)"
+msgstr "Tiếng U-crai-na (máy đánh chữ)"
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:797
msgid "Ukrainian (WinKeys)"
-msgstr "U-crai-na(Có phím Windows)"
+msgstr "Tiếng U-crai-na(Có phím Windows)"
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:798
msgid "Ukrainian (legacy)"
-msgstr "U-crai-na (cổ)"
+msgstr "Tiếng U-crai-na (cổ)"
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:799
msgid "Ukrainian (standard RSTU)"
-msgstr "U-crai-na (RSTU chuẩn)"
+msgstr "Tiếng U-crai-na (RSTU chuẩn)"
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:800
msgid "Russian (Ukraine, standard RSTU)"
-msgstr ""
+msgstr "Tiếng Nga (U-crai-na, RSTU chuẩn)"
-#: ../rules/base.xml.in.h:799
-#, fuzzy
+#: ../rules/base.xml.in.h:801
msgid "Ukrainian (homophonic)"
-msgstr "Đồng Că-bo-va-néc U-cợ-rainh"
+msgstr "U-crai-na (phát âm giống nhau)"
-#: ../rules/base.xml.in.h:800 ../rules/base.extras.xml.in.h:141
+#: ../rules/base.xml.in.h:802 ../rules/base.extras.xml.in.h:142
msgid "English (UK)"
msgstr "Tiếng Anh (UK)"
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:803
msgid "English (UK, extended WinKeys)"
msgstr "Tiếng Anh (UK, WinKeys)"
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:804
msgid "English (UK, international with dead keys)"
-msgstr "Anh (Anh, quốc tế với phím chết)"
+msgstr "Tiếng Anh (Anh, quốc tế với phím chết)"
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:805
msgid "English (UK, Dvorak)"
msgstr "Tiếng Anh (UK, Dvorak)"
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:806
msgid "English (UK, Dvorak with UK punctuation)"
-msgstr "Anh (Mỹ, Dvorak dấu chấm câu Anh Quốc)"
+msgstr "Tiếng Anh (Mỹ, Dvorak dấu chấm câu Anh Quốc)"
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:807
msgid "English (UK, Macintosh)"
msgstr "Tiếng Anh (UK, Macintosh)"
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:808
msgid "English (UK, Macintosh international)"
-msgstr "Anh (Anh, Macintosh quốc tế)"
+msgstr "Tiếng Anh (Anh, Macintosh quốc tế)"
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:809
msgid "English (UK, Colemak)"
-msgstr "Anh (UK, Colemak)"
+msgstr "Tiếng Anh (UK, Colemak)"
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:810
msgid "Uzbek"
msgstr "Tiếng U-dơ-bếch"
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:811
msgid "Uzbek (Latin)"
msgstr "Tiếng U-x-béc (La-tinh)"
#. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:813
msgid "vi"
msgstr "vi"
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:814
msgid "Vietnamese"
msgstr "Tiếng Việt"
#. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:143
+#: ../rules/base.xml.in.h:816 ../rules/base.extras.xml.in.h:144
msgid "ko"
msgstr "ko"
-#: ../rules/base.xml.in.h:815 ../rules/base.extras.xml.in.h:144
+#: ../rules/base.xml.in.h:817 ../rules/base.extras.xml.in.h:145
msgid "Korean"
-msgstr "Tiếng Hàn Quốc "
+msgstr "Tiếng Hàn Quốc"
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:818
msgid "Korean (101/104 key compatible)"
-msgstr "Hàn Quốc (tương thích với kiểu bàn phím 101/104)"
+msgstr "Tiếng Hàn Quốc (tương thích với kiểu bàn phím 101/104)"
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:819
msgid "Japanese (PC-98xx Series)"
msgstr "Tiếng Nhật (Sê-ri PC-98xx)"
#. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:821
msgid "ie"
msgstr "ie"
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:822
msgid "Irish"
msgstr "Tiếng Ai-len"
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:823
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:824
msgid "Irish (UnicodeExpert)"
msgstr "Ai-len (UnicodeExpert)"
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:825
msgid "Ogham"
msgstr "Og-âm"
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:826
msgid "Ogham (IS434)"
msgstr "Ogam (IS434)"
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:827
msgid "Urdu (Pakistan)"
msgstr "Tiếng Ua-đu (Pa-ki-x-thănh)"
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:828
msgid "Urdu (Pakistan, CRULP)"
-msgstr ""
+msgstr "Tiếng Ua-đu (Pa-ki-x-thănh, CRULP)"
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:829
msgid "Urdu (Pakistan, NLA)"
-msgstr ""
+msgstr "Tiếng Ua-đu (Pa-ki-x-thănh, NLA)"
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:830
msgid "Arabic (Pakistan)"
msgstr "Ả Rập (Pa-ki-x-thănh)"
#. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:832
msgid "sd"
msgstr "sd"
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:833
msgid "Sindhi"
msgstr "Xin-đi"
#. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:835
msgid "dv"
msgstr "dv"
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:836
msgid "Dhivehi"
msgstr "Tiếng Đi-ve-hi"
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:837
msgid "English (South Africa)"
msgstr "Tiếng Anh (Nam Phi)"
#. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:839
msgid "eo"
msgstr "eo"
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:840
msgid "Esperanto"
msgstr "Ét-pe-ran-tô"
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:841
msgid "Esperanto (displaced semicolon and quote, obsolete)"
msgstr "Ét-pe-ran-tô (hoán đổi dấu chấm phẩy và dấu nháy, cũ)"
#. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:843
msgid "ne"
msgstr "ne"
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:844
msgid "Nepali"
msgstr "Tiếng Nê-pan"
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:845
msgid "English (Nigeria)"
msgstr "Tiếng Anh (Nigeria)"
#. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:847
msgid "ig"
msgstr "ig"
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:848
msgid "Igbo"
msgstr "Ig-bô"
#. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:850
msgid "yo"
msgstr "yo"
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:851
msgid "Yoruba"
msgstr "Yoa-ru-ba"
#. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:853
msgid "am"
msgstr "am"
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:854
msgid "Amharic"
msgstr "Tiếng Am-ha-ri"
#. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:856
msgid "wo"
msgstr "wo"
-#: ../rules/base.xml.in.h:855
-#, fuzzy
+#: ../rules/base.xml.in.h:857
msgid "Wolof"
-msgstr "Tiếng Ou-o-loc"
+msgstr "Wolof"
#. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:859
msgid "brl"
msgstr "brl"
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:860
msgid "Braille"
msgstr "Chữ nổi"
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:861
msgid "Braille (left hand)"
msgstr "Chữ nổi (tay trái)"
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:862
msgid "Braille (right hand)"
msgstr "Chữ nổi (tay phải)"
#. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:864
msgid "tk"
msgstr "tk"
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:865
msgid "Turkmen"
msgstr "Tiếng Tuôcmen"
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:866
msgid "Turkmen (Alt-Q)"
msgstr "Tiếng Tuôcmen (Alt-Q)"
#. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:868
msgid "bm"
msgstr "bm"
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:869
msgid "Bambara"
msgstr "Tiếng Bam-ba-ra"
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:870
msgid "French (Mali, alternative)"
msgstr "Pháp (Mali, thay thế)"
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:871
msgid "English (Mali, US Macintosh)"
msgstr "Anh (Mali, Macintosh Mỹ)"
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:872
msgid "English (Mali, US international)"
msgstr "Anh (Mali, Mỹ quốc tế)"
#. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:874
msgid "sw"
msgstr "sw"
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:875
msgid "Swahili (Tanzania)"
msgstr "Tiếng Bantu (Tanzania)"
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:876
msgid "Swahili (Kenya)"
msgstr "Tiếng Bantu (Kenya)"
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:877
msgid "Kikuyu"
msgstr "Ki-ku-yu"
#. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:879
msgid "tn"
msgstr "tn"
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:880
msgid "Tswana"
msgstr "Tiếng T-xoua-na"
#. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:882
msgid "ph"
msgstr "ph"
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:883
msgid "Filipino"
msgstr "Tiếng Phi-li-pin"
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:884
msgid "Filipino (QWERTY Baybayin)"
msgstr "Tiếng Phi-li-pin (QWERTY Baybayin)"
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:885
msgid "Filipino (Capewell-Dvorak Latin)"
msgstr "Tiếng Phi-li-pin (Capewell-Dvorak Latin)"
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:886
msgid "Filipino (Capewell-Dvorak Baybayin)"
msgstr "Tiếng Phi-li-pin (Capewell-Dvorak Baybayin)"
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:887
msgid "Filipino (Capewell-QWERF 2006 Latin)"
msgstr "Tiếng Phi-li-pin (Capewell-QWERF 2006 Latin)"
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:888
msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
msgstr "Tiếng Phi-li-pin (Capewell-QWERF 2006 Baybayin)"
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:889
msgid "Filipino (Colemak Latin)"
msgstr "Tiếng Phi-li-pin (Colemak Latin)"
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:890
msgid "Filipino (Colemak Baybayin)"
msgstr "Tiếng Phi-li-pin (Colemak Baybayin)"
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:891
msgid "Filipino (Dvorak Latin)"
msgstr "Tiếng Phi-li-pin (Dvorak Latin)"
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:892
msgid "Filipino (Dvorak Baybayin)"
msgstr "Tiếng Phi-li-pin (Dvorak Baybayin)"
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:893
msgid "md"
msgstr "md"
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:894
msgid "Moldavian"
msgstr "Tiếng Moa-đô-va"
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:895
msgid "gag"
msgstr "gag"
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:896
msgid "Moldavian (Gagauz)"
msgstr "Tiếng Mon-đa-vi (Gagauz)"
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:897
msgid "Switching to another layout"
msgstr "Chuyển sang bố cục khác"
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:898
msgid "Right Alt (while pressed)"
msgstr "Alt phải (trong khi bấm)"
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:899
msgid "Left Alt (while pressed)"
msgstr "Alt trái (trong khi bấm)"
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:900
msgid "Left Win (while pressed)"
msgstr "Win trái (trong khi bấm)"
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:901
msgid "Right Win (while pressed)"
msgstr "Win phải (trong khi bấm)"
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:902
msgid "Any Win key (while pressed)"
msgstr "Bất kỳ phím Win (trong khi bấm)"
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:903
msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
-msgstr "CapsLock (trong khi bấm), Alt+CapsLock thì làm việc gốc khoá chữ hoa"
+msgstr "CapsLock (trong khi bấm), Alt+CapsLock thì làm việc gốc khóa chữ hoa"
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:904
msgid "Right Ctrl (while pressed)"
msgstr "Ctrl phải (trong khi bấm)"
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:905
msgid "Right Alt"
msgstr "Alt phải"
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:906
msgid "Left Alt"
msgstr "Alt trái"
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:907
msgid "Caps Lock"
msgstr "CapsLock"
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:908
msgid "Shift+Caps Lock"
msgstr "Shift+CapsLock"
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:909
msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
msgstr "CapsLock (tới bố trí đầu tiên), Shift+CapsLock (tới bố trí cuối cùng)"
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:910
msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
msgstr "Win trái (tới bố trí đầu tiên), Win phải/Trình đơn (tới bố trí cuối cùng)"
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:911
msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
msgstr "Ctrl trái (tới bố trí đầu tiên), Ctrl phải (tới bố trí cuối cùng)"
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:912
msgid "Alt+Caps Lock"
msgstr "Alt+CapsLock"
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:913
msgid "Both Shift keys together"
msgstr "Cả hai phím Shift với nhau"
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:914
msgid "Both Alt keys together"
msgstr "Cả hai phím Alt với nhau"
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:915
msgid "Both Ctrl keys together"
msgstr "Cả hai phím Ctrl với nhau"
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:916
msgid "Ctrl+Shift"
msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:917
msgid "Left Ctrl+Left Shift"
msgstr "Ctrl trái+Shift trái"
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:918
msgid "Right Ctrl+Right Shift"
msgstr "Ctrl phải + Shift phải"
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:919
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:920
msgid "Alt+Shift"
msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:921
msgid "Left Alt+Left Shift"
msgstr "Alt trái + Sift trái"
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:922
msgid "Alt+Space"
msgstr "Alt+Space"
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:923
msgid "Menu"
msgstr "Trình đơn"
-#: ../rules/base.xml.in.h:922
+#: ../rules/base.xml.in.h:924
msgid "Left Win"
msgstr "Win trái"
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:925
msgid "Win Key+Space"
msgstr "Phím Win+Space"
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:926
msgid "Right Win"
msgstr "Win phải"
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:927
msgid "Left Shift"
msgstr "Shift trái"
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:928
msgid "Right Shift"
msgstr "Shift phải"
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:929
msgid "Left Ctrl"
msgstr "Ctrl trái"
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:930
msgid "Right Ctrl"
msgstr "Ctrl phải"
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:931
msgid "Scroll Lock"
msgstr "Scroll Lock"
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:932
msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
msgstr "Ctrl trái + Win trái (chuyển đến bố trí đầu tiên), Ctrl phải+Menu (tới bố trí thứ hai)"
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:933
msgid "Key to choose 3rd level"
msgstr "Phím để chọn cấp ba"
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:934
msgid "Any Win key"
msgstr "Bất kỳ phím Win"
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:935
msgid "Any Alt key"
msgstr "Bất kỳ phím Alt"
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:936
msgid "Right Alt, Shift+Right Alt key is Compose"
msgstr "Alt phải, phím Shift+ Alt phải là Compose"
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:937
msgid "Right Alt key never chooses 3rd level"
msgstr "Phím Alt bên phải không bao giờ chọn bậc thứ 3"
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:938
msgid "Enter on keypad"
msgstr "Enter trên vùng phím"
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:939
msgid "Backslash"
msgstr "Gạch chéo ngược"
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:940
msgid "&lt;Less/Greater&gt;"
msgstr "&lt;Nhỏ/Lớn hơn&gt;"
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:941
msgid "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
-msgstr "Caps Lock chọn cấp 3, thực hiện khoá một lần khi bấm với một bộ chọn cấp 3 khác"
+msgstr "Caps Lock chọn cấp 3, thực hiện khóa một lần khi bấm với một bộ chọn cấp 3 khác"
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:942
msgid "Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
-msgstr "Backslash chọn cấp 3, thực hiện khoá một lần khi bấm với một bộ chọn cấp 3 khác"
+msgstr "Backslash chọn cấp 3, thực hiện khóa một lần khi bấm với một bộ chọn cấp 3 khác"
-#: ../rules/base.xml.in.h:941
+#: ../rules/base.xml.in.h:943
msgid "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"
msgstr "&lt;Nhỏ/Lớn hơn&gt; chọn cấp 3, hành động một lần khóa khi bấm cùng với các chọn cấp 3 khác"
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:944
msgid "Ctrl key position"
msgstr "Vị trí phím Ctrl"
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:945
msgid "Caps Lock as Ctrl"
msgstr "Caps Lock là Ctrl"
-#: ../rules/base.xml.in.h:944
+#: ../rules/base.xml.in.h:946
msgid "Left Ctrl as Meta"
msgstr "Ctrl trái là Meta"
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:947
msgid "Swap Ctrl and Caps Lock"
msgstr "Trao đổi Ctrl và CapsLock"
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:948
msgid "At left of 'A'"
msgstr "Bên trái của “A”"
-#: ../rules/base.xml.in.h:947
+#: ../rules/base.xml.in.h:949
msgid "At bottom left"
msgstr "Dưới trái"
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:950
msgid "Right Ctrl as Right Alt"
msgstr "Ctrl phải làm Alt phải"
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:951
msgid "Menu as Right Ctrl"
msgstr "Ctrl phải làm Trình đơn"
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:952
msgid "Right Alt as Right Ctrl"
msgstr "Alt phải như là Ctrl phải"
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:953
msgid "Swap Left Alt key with Left Ctrl key"
msgstr "Hoán đổi Alt trái với phím Ctrl trái"
-#: ../rules/base.xml.in.h:952
+#: ../rules/base.xml.in.h:954
msgid "Swap Left Win key with Left Ctrl key"
msgstr "Hoán đổi Win trái với phím Ctrl trái"
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:955
msgid "Swap Right Win key with Right Ctrl key"
msgstr "Hoán đổi Win phải với phím Ctrl phải"
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:956
msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt"
msgstr "Alt trái là Ctrl, Ctrl trái là Win, Win trái là Alt"
-#: ../rules/base.xml.in.h:955
+#: ../rules/base.xml.in.h:957
msgid "Use keyboard LED to show alternative layout"
msgstr "Sử dụng đèn bàn phím để chỉ ra bố trí xen kẽ"
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:958
msgid "Num Lock"
msgstr "NumLock"
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:959
msgid "Layout of numeric keypad"
msgstr "Bố trí vùng phím số"
-#: ../rules/base.xml.in.h:958
+#: ../rules/base.xml.in.h:960
msgid "Legacy"
msgstr "Thừa tự"
-#: ../rules/base.xml.in.h:959
+#: ../rules/base.xml.in.h:961
msgid "Unicode additions (arrows and math operators)"
msgstr "Phần thêm Unicode (các mũi tên và toán tử toán học)"
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:962
msgid "Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Phần thêm Unicode (các mũi tên và toán tử toán học; toán tử toán học ở mức mặc định)"
-#: ../rules/base.xml.in.h:961
+#: ../rules/base.xml.in.h:963
msgid "Legacy Wang 724"
msgstr "Wang 724 thừa tự"
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:964
msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
msgstr "Vùng phím Wang 724 có phần thêm Unicode (các mũi tên và toán tử toán học)"
-#: ../rules/base.xml.in.h:963
+#: ../rules/base.xml.in.h:965
msgid "Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)"
msgstr "Vùng phím Wang 724 có phần thêm Unicode (các mũi tên và toán tử toán học; toán tử toán học ở mức mặc định)"
-#: ../rules/base.xml.in.h:964
+#: ../rules/base.xml.in.h:966
msgid "Hexadecimal"
msgstr "Thập lục"
-#: ../rules/base.xml.in.h:965
+#: ../rules/base.xml.in.h:967
msgid "ATM/phone-style"
msgstr "Kiểu điện thoại/ATM"
-#: ../rules/base.xml.in.h:966
+#: ../rules/base.xml.in.h:968
msgid "Numeric keypad delete key behaviour"
-msgstr "Ứng xử phím xoá của vùng số"
+msgstr "Ứng xử phím xóa của vùng số"
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:969
msgid "Legacy key with dot"
msgstr "Phím thừa tự có chấm"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:971
msgid "Legacy key with comma"
msgstr "Phím thừa tự có dấu phẩy"
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:972
msgid "Four-level key with dot"
msgstr "Phím bốn bậc có chấm"
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:973
msgid "Four-level key with dot, Latin-9 only"
msgstr "Phím bốn bậc có chấm, chỉ Latin-9"
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:974
msgid "Four-level key with comma"
msgstr "Phím bốn bậc có dấu phẩy"
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:975
msgid "Four-level key with momayyez"
msgstr "Phím bốn bậc có momayyez"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:976
+#: ../rules/base.xml.in.h:978
msgid "Four-level key with abstract separators"
msgstr "Phím bốn bậc có bộ phân cách ảo"
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:979
msgid "Semicolon on third level"
msgstr "Dấu chấm phẩy ở cấp ba"
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:980
msgid "Caps Lock key behavior"
msgstr "Đặc điểm của phím CapsLock"
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:981
msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
msgstr "CapsLock sử dụng chức năng viết hoa nội bộ; Shift “tạm dừng” CapsLock"
-#: ../rules/base.xml.in.h:980
+#: ../rules/base.xml.in.h:982
msgid "Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock"
msgstr "CapsLock sử dụng chức năng viết hoa nội bộ; Shift không có tác động CapsLock"
-#: ../rules/base.xml.in.h:981
+#: ../rules/base.xml.in.h:983
msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
-msgstr "CapsLock hoạt động như Shift mà cũng khoá; Shift “tạm dừng” CapsLock"
+msgstr "CapsLock hoạt động như Shift mà cũng khóa; Shift “tạm dừng” CapsLock"
-#: ../rules/base.xml.in.h:982
+#: ../rules/base.xml.in.h:984
msgid "Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock"
-msgstr "CapsLock hoạt động như Shift mà cũng khoá; Shift không có tác động CapsLock"
+msgstr "CapsLock hoạt động như Shift mà cũng khóa; Shift không có tác động CapsLock"
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:985
msgid "Caps Lock toggles normal capitalization of alphabetic characters"
msgstr "CapsLock bật tắt viết hoa thông thường của các ký tự chữ cái"
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:986
msgid "Make Caps Lock an additional Num Lock"
msgstr "Đặt CapsLock làm một phím NumLock bổ sung"
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:987
msgid "Swap ESC and Caps Lock"
msgstr "Trao đổi ESC và CapsLock"
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:988
msgid "Make Caps Lock an additional ESC"
msgstr "Đặt CapsLock làm một phím ESC bổ sung"
-#: ../rules/base.xml.in.h:987
+#: ../rules/base.xml.in.h:989
msgid "Make Caps Lock an additional Backspace"
-msgstr "Đặt CapsLock làm một phím Xoá lùi bổ sung"
+msgstr "Đặt CapsLock làm một phím Xóa lùi bổ sung"
-#: ../rules/base.xml.in.h:988
+#: ../rules/base.xml.in.h:990
msgid "Make Caps Lock an additional Super"
msgstr "Đặt CapsLock làm một phím Super bổ sung"
-#: ../rules/base.xml.in.h:989
+#: ../rules/base.xml.in.h:991
msgid "Make Caps Lock an additional Hyper"
msgstr "Đặt CapsLock làm một phím Hyper bổ sung"
-#: ../rules/base.xml.in.h:990
+#: ../rules/base.xml.in.h:992
msgid "Caps Lock toggles ShiftLock (affects all keys)"
msgstr "CapsLock bật tắt ShiftLock (mọi phím đều bị ảnh hưởng)"
-#: ../rules/base.xml.in.h:991
+#: ../rules/base.xml.in.h:993
msgid "Caps Lock is disabled"
msgstr "CapsLock bị tắt"
-#: ../rules/base.xml.in.h:992
+#: ../rules/base.xml.in.h:994
msgid "Make Caps Lock an additional Ctrl"
msgstr "Đặt CapsLock làm một phím Ctrl bổ sung"
-#: ../rules/base.xml.in.h:993
+#: ../rules/base.xml.in.h:995
msgid "Alt/Win key behavior"
msgstr "Ứng xử phím Alt/Win"
-#: ../rules/base.xml.in.h:994
+#: ../rules/base.xml.in.h:996
msgid "Add the standard behavior to Menu key"
msgstr "Thêm ứng xử tiêu chuẩn vào phím trình đơn."
-#: ../rules/base.xml.in.h:995
+#: ../rules/base.xml.in.h:997
msgid "Alt and Meta are on Alt keys"
msgstr "Alt và Meta nằm trên các phím Alt"
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:998
msgid "Alt is mapped to Win keys (and the usual Alt keys)"
msgstr "Alt ánh xạ tới các phím Win (và các phím Alt thường dùng)"
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:999
msgid "Ctrl is mapped to Win keys (and the usual Ctrl keys)"
msgstr "Ctrl ánh xạ tới các phím Win (và các phím Ctrl thường dùng)"
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:1000
msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
msgstr "Ctrl ánh xạ tới các phím Alt, phím Alt lại ánh xạ đến Win"
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:1001
msgid "Meta is mapped to Win keys"
msgstr "Meta ánh xạ tới các phím Win"
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:1002
msgid "Meta is mapped to Left Win"
msgstr "Meta ánh xạ tới Win trái"
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:1003
msgid "Hyper is mapped to Win keys"
msgstr "Hyper ánh xạ tới các phím Win"
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:1004
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Ánh xạ Alt sang phím Win bên phải và Super sang phím trình đơn"
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:1005
msgid "Alt is swapped with Win"
msgstr "Alt được tráo đổi với phím Win"
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:1006
msgid "Position of Compose key"
msgstr "Vị trí phím Compose"
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:1007
msgid "3rd level of Left Win"
msgstr "Mức thứ 3 của phím Win trái"
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:1008
msgid "3rd level of Right Win"
msgstr "Mức thứ 3 của phím Win phải"
-#: ../rules/base.xml.in.h:1007
+#: ../rules/base.xml.in.h:1009
msgid "3rd level of Menu"
msgstr "Mức thứ 3 của phím Menu"
-#: ../rules/base.xml.in.h:1008
+#: ../rules/base.xml.in.h:1010
msgid "3rd level of Left Ctrl"
msgstr "Mức thứ 3 của phím Ctrl trái"
-#: ../rules/base.xml.in.h:1009
+#: ../rules/base.xml.in.h:1011
msgid "3rd level of Right Ctrl"
msgstr "Mức thứ 3 của Ctrl phải"
-#: ../rules/base.xml.in.h:1010
+#: ../rules/base.xml.in.h:1012
msgid "3rd level of Caps Lock"
msgstr "Mức thứ 3 của phím Caps Lock"
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:1013
msgid "3rd level of &lt;Less/Greater&gt;"
msgstr "Mức thứ 3 của &lt;Nhỏ/Lớn hơn&gt;"
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:1014
msgid "Pause"
msgstr "Pause"
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:1015
msgid "PrtSc"
msgstr "PrtSc"
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:1016
msgid "Miscellaneous compatibility options"
msgstr "Tùy chọn tương thích khác"
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:1017
msgid "Default numeric keypad keys"
msgstr "Các phím vùng số mặc định"
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:1018
msgid "Numeric keypad keys always enter digits (as in Mac OS)"
msgstr "Phím vùng số luôn nhập số (như trên HDH Mac)"
-#: ../rules/base.xml.in.h:1017
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift với các phím vùng số làm việc như trong MS Windows"
+#: ../rules/base.xml.in.h:1019
+msgid "NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)"
+msgstr "NumLock bật: chữ số, Shift chuyển thành phím mũi tên, Numlock tắt: luôn dùng phím mũi tên (giống như trong MS Windows)"
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:1020
msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
msgstr "Shift không hủy Numlock, chọn cấp 3 để thay thế"
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:1021
msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
msgstr "Các ký tự đặc biệt (Ctrl+Alt+&lt;key&gt;) được xử lý bằng một trình phục vụ"
-#: ../rules/base.xml.in.h:1020
+#: ../rules/base.xml.in.h:1022
msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
-msgstr "Bàn phím nhôm Apple: mô phỏng phím PC: Print (In), Scroll_Lock (Khoá cuộn), Pause (Tạm dừng), NumLock (Khoá số)"
+msgstr "Bàn phím nhôm Apple: mô phỏng phím PC: Print (In), Scroll_Lock (Khóa cuộn), Pause (Tạm dừng), NumLock (Khóa số)"
-#: ../rules/base.xml.in.h:1021
+#: ../rules/base.xml.in.h:1023
msgid "Shift cancels Caps Lock"
msgstr "Shift thôi CapsLock"
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:1024
msgid "Enable extra typographic characters"
msgstr "Bật thêm ký tự thuật in máy"
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:1025
msgid "Both Shift keys together toggle Caps Lock"
msgstr "Cả hai phím Shift với nhau thì bật/tắt Caps Lock"
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:1026
msgid "Both Shift keys together activate Caps Lock, one Shift key deactivates"
msgstr "Cả hai phím Shift với nhau thì kích hoạt Caps Lock, một Shift bỏ kích hoạt"
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:1027
msgid "Both Shift keys together toggle ShiftLock"
msgstr "Cả hai phím Shift với nhau thì bật/tắt ShiftLock"
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:1028
msgid "Shift + NumLock toggles PointerKeys"
msgstr "Shift + NumLock bật/tắt PointerKeys"
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:1029
msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
-msgstr ""
+msgstr "Cho bắt ngắt với thao tác của bàn phím (cảnh báo: tiềm ẩn nhiều rủi ro)"
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:1030
msgid "Allow grab and window tree logging"
-msgstr ""
+msgstr "Cho bắt và ghi nhật ký cây cửa sổ"
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:1031
msgid "Adding currency signs to certain keys"
msgstr "Đang thêm ký hiệu tiền tệ vào phím nào đó"
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:1032
msgid "Euro on E"
msgstr "Euro trên E"
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:1033
msgid "Euro on 2"
msgstr "Euro trên 2"
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:1034
msgid "Euro on 4"
msgstr "Euro trên 4"
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:1035
msgid "Euro on 5"
msgstr "Euro trên 5"
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:1036
msgid "Rupee on 4"
msgstr "Ru pi trên 4"
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:1037
msgid "Key to choose 5th level"
msgstr "Phím để chọn cấp 5"
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1038
msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "&lt;Nhỏ/Lớn hơn&gt; chọn cấp năm, khoá khi bấm nhau với một bộ chọn cấp năm khác"
+msgstr "&lt;Nhỏ/Lớn hơn&gt; chọn cấp năm, khóa khi bấm nhau với một bộ chọn cấp năm khác"
-#: ../rules/base.xml.in.h:1037
+#: ../rules/base.xml.in.h:1039
msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Alt phải chọn cấp 5, khoá khi bấm nhau với một bộ chọn cấp 5 khác"
+msgstr "Alt phải chọn cấp 5, khóa khi bấm nhau với một bộ chọn cấp 5 khác"
-#: ../rules/base.xml.in.h:1038
+#: ../rules/base.xml.in.h:1040
msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Win trái chọn cấp 5, khoá khi bấm nhau với một bộ chọn năm 5 khác"
+msgstr "Win trái chọn cấp 5, khóa khi bấm nhau với một bộ chọn năm 5 khác"
-#: ../rules/base.xml.in.h:1039
+#: ../rules/base.xml.in.h:1041
msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Win phải chọn cấp 5, khoá khi bấm nhau với một bộ chọn cấp 5 khác"
+msgstr "Win phải chọn cấp 5, khóa khi bấm nhau với một bộ chọn cấp 5 khác"
-#: ../rules/base.xml.in.h:1040
+#: ../rules/base.xml.in.h:1042
msgid "Using space key to input non-breakable space character"
msgstr "Dùng phím dài để nhập ký tự dấu cách không thể ngắt"
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1043
msgid "Usual space at any level"
msgstr "Dấu cách bình thường ở mọi bậc"
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1044
msgid "Non-breakable space character at second level"
msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ hai"
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1045
msgid "Non-breakable space character at third level"
msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ ba"
-#: ../rules/base.xml.in.h:1044
+#: ../rules/base.xml.in.h:1046
msgid "Non-breakable space character at third level, nothing at fourth level"
msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ ba, không nhập gì ở bậc thứ tư"
-#: ../rules/base.xml.in.h:1045
+#: ../rules/base.xml.in.h:1047
msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ ba, ký tự dấu cách không thể ngắt mảnh ở bậc thứ tư"
-#: ../rules/base.xml.in.h:1046
+#: ../rules/base.xml.in.h:1048
msgid "Non-breakable space character at fourth level"
msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ tư"
-#: ../rules/base.xml.in.h:1047
+#: ../rules/base.xml.in.h:1049
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ tư, ký tự dấu cách không thể ngắt mảnh ở bậc thứ sáu"
-#: ../rules/base.xml.in.h:1048
+#: ../rules/base.xml.in.h:1050
msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ tư, ký tự dấu cách không thể ngắt mảnh ở bậc thứ sáu (dùng Ctrl+Shift)"
-#: ../rules/base.xml.in.h:1049
+#: ../rules/base.xml.in.h:1051
msgid "Zero-width non-joiner character at second level"
msgstr "Ký tự không nối có chiều rộng không tại cấp 2"
-#: ../rules/base.xml.in.h:1050
+#: ../rules/base.xml.in.h:1052
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
msgstr "Ký tự không nối có chiều rộng không tại cấp 2, ký tự nối có chiều rộng không ở cấp 3"
-#: ../rules/base.xml.in.h:1051
+#: ../rules/base.xml.in.h:1053
msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
msgstr "Ký tự không nối có chiều rộng không tại cấp 2, ký tự nối có chiều rộng không ở cấp 3, ký tự dấu cách không thể ngắt ở cấp 4"
-#: ../rules/base.xml.in.h:1052
+#: ../rules/base.xml.in.h:1054
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
msgstr "Ký tự không nối có chiều rộng không tại cấp 2, ký tự dấu cách không thể ngắt ở cấp 3"
-#: ../rules/base.xml.in.h:1053
+#: ../rules/base.xml.in.h:1055
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
msgstr "Ký tự không nối có chiều rộng không tại cấp 2, ký tự dấu cách không thể ngắt ở cấp 3, không có gì ở cấp 4"
-#: ../rules/base.xml.in.h:1054
+#: ../rules/base.xml.in.h:1056
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
msgstr "Ký tự không nối có chiều rộng không tại cấp 2, ký tự dấu cách không thể ngắt ở cấp 3, ký tự nối có chiều rộng không ở cấp 4"
-#: ../rules/base.xml.in.h:1055
+#: ../rules/base.xml.in.h:1057
msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
msgstr "Ký tự không nối có chiều rộng không tại cấp 2, ký tự dấu cách không thể ngắt ở cấp 3, ký tự dấu cách mảnh không thể ngắt ở cấp 4"
-#: ../rules/base.xml.in.h:1056
+#: ../rules/base.xml.in.h:1058
msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
msgstr "Ký tự không nối có chiều rộng không tại cấp 3, ký tự nối có chiều rộng không ở cấp 4"
-#: ../rules/base.xml.in.h:1057
+#: ../rules/base.xml.in.h:1059
msgid "Japanese keyboard options"
msgstr "Tùy chọn bàn phím tiếng Nhật"
-#: ../rules/base.xml.in.h:1058
+#: ../rules/base.xml.in.h:1060
msgid "Kana Lock key is locking"
-msgstr "Phím Kana Lock sẽ khoá"
+msgstr "Phím Kana Lock sẽ khóa"
-#: ../rules/base.xml.in.h:1059
+#: ../rules/base.xml.in.h:1061
msgid "NICOLA-F style Backspace"
-msgstr "Xoá lùi kiểu NICOLA-F"
+msgstr "Xóa lùi kiểu NICOLA-F"
-#: ../rules/base.xml.in.h:1060
+#: ../rules/base.xml.in.h:1062
msgid "Make Zenkaku Hankaku an additional ESC"
msgstr "Đặt Zenkaku Hankaku làm một phím ESC bổ sung"
-#: ../rules/base.xml.in.h:1061
+#: ../rules/base.xml.in.h:1063
+msgid "Korean Hangul/Hanja keys"
+msgstr "Phím Hangul/Hanja Hàn Quốc"
+
+#: ../rules/base.xml.in.h:1064
+msgid "Hardware Hangul/Hanja keys"
+msgstr "Phím Hangul/Hanja phần cứng"
+
+#: ../rules/base.xml.in.h:1065
+msgid "Right Alt as Hangul, right Ctrl as Hanja"
+msgstr "Alt phải như là Hangul, Ctrl phải là Hanja"
+
+#: ../rules/base.xml.in.h:1066
+msgid "Right Ctrl as Hangul, right Alt as Hanja"
+msgstr "Ctrl phải làmHangul, Alt phải là Hanja"
+
+#: ../rules/base.xml.in.h:1067
msgid "Adding Esperanto supersigned letters"
msgstr "Đang thêm các dấu mũ tiếng Ét-pe-ran-tô"
-#: ../rules/base.xml.in.h:1062
+#: ../rules/base.xml.in.h:1068
msgid "To the corresponding key in a Qwerty layout"
msgstr "Để tương ứng phím trên một bố trí Qwerty"
-#: ../rules/base.xml.in.h:1063
+#: ../rules/base.xml.in.h:1069
msgid "To the corresponding key in a Dvorak layout"
msgstr "Để tương ứng phím trên một bố trí Dvorak"
-#: ../rules/base.xml.in.h:1064
+#: ../rules/base.xml.in.h:1070
msgid "To the corresponding key in a Colemak layout"
msgstr "Để tương ứng phím trên một bố trí Colemak"
-#: ../rules/base.xml.in.h:1065
+#: ../rules/base.xml.in.h:1071
msgid "Maintain key compatibility with old Solaris keycodes"
msgstr "Bảo trì phím tương thích với mã Solaris cũ."
-#: ../rules/base.xml.in.h:1066
+#: ../rules/base.xml.in.h:1072
msgid "Sun Key compatibility"
msgstr "Tương thích phím Sun"
-#: ../rules/base.xml.in.h:1067
+#: ../rules/base.xml.in.h:1073
msgid "Key sequence to kill the X server"
msgstr "Dãy phím để giết trình phục vụ X"
-#: ../rules/base.xml.in.h:1068
+#: ../rules/base.xml.in.h:1074
msgid "Ctrl + Alt + Backspace"
msgstr "Ctrl + Alt + Backspace"
@@ -4127,256 +4096,263 @@ msgid "German (with Hungarian letters and no dead keys)"
msgstr "Đức (có chữ Hung-ga-ri và không có phím chết"
#: ../rules/base.extras.xml.in.h:26
+msgid "Polish (Germany, eliminate dead keys)"
+msgstr "Tiếng Ba Lan (Đức, loại bỏ phím chết)"
+
+#: ../rules/base.extras.xml.in.h:27
msgid "German (Sun Type 6/7)"
msgstr "Đức (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:28
msgid "German (Aus der Neo-Welt)"
msgstr "Tiếng Đức (Aus der Neo-Welt)"
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:31
msgid "Avestan"
msgstr "A-ve-x-tanh"
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:34
msgid "Lithuanian (US Dvorak with Lithuanian letters)"
msgstr "Li-tu-a-nia (Bàn phím Dvorak Mỹ với các chữ cái Li-tu-a-nia)"
-#: ../rules/base.extras.xml.in.h:34
+#: ../rules/base.extras.xml.in.h:35
msgid "Lithuanian (Sun Type 6/7)"
msgstr "Lát-vi (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:38
msgid "Latvian (US Dvorak)"
msgstr "Lát-vi-a (US Dvorak)"
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:39
msgid "Latvian (US Dvorak, Y variant)"
msgstr "Lát-vi-a (US Dvorak, biến thể Y)"
-#: ../rules/base.extras.xml.in.h:39
+#: ../rules/base.extras.xml.in.h:40
msgid "Latvian (US Dvorak, minus variant)"
msgstr "Lát-vi-a (US Dvorak, biến thể dấu trừ)"
-#: ../rules/base.extras.xml.in.h:40
+#: ../rules/base.extras.xml.in.h:41
msgid "Latvian (programmer US Dvorak)"
msgstr "Lát-vi-a (US Dvorak dành cho người lập trình)"
-#: ../rules/base.extras.xml.in.h:41
+#: ../rules/base.extras.xml.in.h:42
msgid "Latvian (programmer US Dvorak, Y variant)"
msgstr "Lát-vi-a (US Dvorak dành cho người lập trình, biến thể Y)"
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:43
msgid "Latvian (programmer US Dvorak, minus variant)"
msgstr "Lát-vi-a (US Dvorak dành cho người lập trình,biến thể dấu trừ)"
-#: ../rules/base.extras.xml.in.h:43
+#: ../rules/base.extras.xml.in.h:44
msgid "Latvian (US Colemak)"
msgstr "Lát-vi-a (US Colemak)"
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:45
msgid "Latvian (US Colemak, apostrophe variant)"
msgstr "Lát-vi-a (US Colemak, biến thể nháy đơn)"
-#: ../rules/base.extras.xml.in.h:45
+#: ../rules/base.extras.xml.in.h:46
msgid "Latvian (Sun Type 6/7)"
msgstr "Lát-vi-a (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:49
msgid "English (US, international AltGr Unicode combining)"
msgstr "Anh (Mỹ, quốc tế tổ hợp Unicode AltGr)"
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:50
msgid "English (US, international AltGr Unicode combining, alternative)"
msgstr "Anh (Mỹ, Quốc tế tổ hợp Unicode AltGr, thay thế)"
-#: ../rules/base.extras.xml.in.h:50
+#: ../rules/base.extras.xml.in.h:51
msgid "Atsina"
msgstr "Át-xi-na"
-#: ../rules/base.extras.xml.in.h:51
+#: ../rules/base.extras.xml.in.h:52
msgid "Coeur d'Alene Salish"
msgstr "Coeur d'Alene Salish"
-#: ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:53
msgid "Czech Slovak and German (US)"
-msgstr ""
+msgstr "Slô-vác Séc và Đức (Mỹ)"
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:54
msgid "English (US, Sun Type 6/7)"
msgstr "Anh (Mỹ, Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:54
+#: ../rules/base.extras.xml.in.h:55
msgid "English (Norman)"
msgstr "Tiếng Anh (Norman)"
-#: ../rules/base.extras.xml.in.h:57
+#: ../rules/base.extras.xml.in.h:58
msgid "Polish (international with dead keys)"
msgstr "Ba Lan (quốc tế với phím chết)"
-#: ../rules/base.extras.xml.in.h:58
+#: ../rules/base.extras.xml.in.h:59
msgid "Polish (Colemak)"
msgstr "Ba Lan (Colemak)"
-#: ../rules/base.extras.xml.in.h:59
+#: ../rules/base.extras.xml.in.h:60
msgid "Polish (Sun Type 6/7)"
msgstr "Ba Lan (Sun kiểu 6/7)"
-#: ../rules/base.extras.xml.in.h:63
+#: ../rules/base.extras.xml.in.h:64
msgid "Crimean Tatar (Dobruja Q)"
msgstr "Tiếng Tác-ta (Dobruja Q)"
-#: ../rules/base.extras.xml.in.h:64
+#: ../rules/base.extras.xml.in.h:65
msgid "Romanian (ergonomic Touchtype)"
msgstr "Ru-ma-ni (Touchtype sinh thái công)"
-#: ../rules/base.extras.xml.in.h:65
+#: ../rules/base.extras.xml.in.h:66
msgid "Romanian (Sun Type 6/7)"
msgstr "Ru-ma-ni (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:68
+#: ../rules/base.extras.xml.in.h:69
msgid "Serbian (combining accents instead of dead keys)"
msgstr "Xéc-bi (tổ hợp dấu phụ thay cho phím chết)"
-#: ../rules/base.extras.xml.in.h:71
+#: ../rules/base.extras.xml.in.h:72
msgid "Church Slavonic"
msgstr "Tiếng Xla-vơ nhà thơ"
-#: ../rules/base.extras.xml.in.h:72
+#: ../rules/base.extras.xml.in.h:73
msgid "Russian (with Ukrainian-Belorussian layout)"
-msgstr ""
+msgstr "Nga (với bố trí Ucrai-na Belorussian)"
-#: ../rules/base.extras.xml.in.h:73
+#: ../rules/base.extras.xml.in.h:74
msgid "Russian (Sun Type 6/7)"
msgstr "Nga (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:76
+#: ../rules/base.extras.xml.in.h:77
msgid "Armenian (OLPC phonetic)"
msgstr "Ac-mê-ni (ngữ âm OLPC)"
-#: ../rules/base.extras.xml.in.h:79
+#: ../rules/base.extras.xml.in.h:80
msgid "Hebrew (Biblical, SIL phonetic)"
msgstr "Hê-brơ (Do thái) (Kinh thánh, ngữ âm SIL)"
-#: ../rules/base.extras.xml.in.h:82
+#: ../rules/base.extras.xml.in.h:83
msgid "Arabic (Sun Type 6/7)"
msgstr "Ả rập (Sun kiểu 6/7)"
-#: ../rules/base.extras.xml.in.h:85
+#: ../rules/base.extras.xml.in.h:86
msgid "Belgian (Sun Type 6/7)"
msgstr "Bỉ (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:88
+#: ../rules/base.extras.xml.in.h:89
msgid "Portuguese (Brazil, Sun Type 6/7)"
msgstr "Bồ Đào Nha (Bra-xin, Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:91
+#: ../rules/base.extras.xml.in.h:92
msgid "Czech (Sun Type 6/7)"
msgstr "Séc (Sun kiểu 6/7)"
-#: ../rules/base.extras.xml.in.h:94
+#: ../rules/base.extras.xml.in.h:95
msgid "Danish (Sun Type 6/7)"
msgstr "Đan-mạch (Sun kiểu 6/7)"
-#: ../rules/base.extras.xml.in.h:97
+#: ../rules/base.extras.xml.in.h:98
msgid "Dutch (Sun Type 6/7)"
msgstr "Hà-lan (Sun kiểu 6/7)"
-#: ../rules/base.extras.xml.in.h:100
+#: ../rules/base.extras.xml.in.h:101
msgid "Estonian (Sun Type 6/7)"
msgstr "Ét-tôn-nia (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:103
+#: ../rules/base.extras.xml.in.h:104
msgid "Finnish (Sun Type 6/7)"
msgstr "Phần Lan (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:105
+#: ../rules/base.extras.xml.in.h:106
msgid "French (Sun Type 6/7)"
msgstr "Pháp (Sun kiểu 6/7)"
-#: ../rules/base.extras.xml.in.h:108
+#: ../rules/base.extras.xml.in.h:109
msgid "Greek (Sun Type 6/7)"
msgstr "Hy Lạp (Sun kiểu 6/7)"
-#: ../rules/base.extras.xml.in.h:111
+#: ../rules/base.extras.xml.in.h:112
msgid "Italian (Sun Type 6/7)"
msgstr "Ý (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:114
+#: ../rules/base.extras.xml.in.h:115
msgid "Japanese (Sun Type 6)"
msgstr "Tiếng Nhật (Sun kiểu 6/7)"
-#: ../rules/base.extras.xml.in.h:115
+#: ../rules/base.extras.xml.in.h:116
msgid "Japanese (Sun Type 7 - pc compatible)"
msgstr "Nhật (Kiểu Sun 7 - tương thích pc)"
-#: ../rules/base.extras.xml.in.h:116
+#: ../rules/base.extras.xml.in.h:117
msgid "Japanese (Sun Type 7 - sun compatible)"
msgstr "Nhật (Kiểu Sun 7 - tương thích sun)"
-#: ../rules/base.extras.xml.in.h:119
+#: ../rules/base.extras.xml.in.h:120
msgid "Norwegian (Sun Type 6/7)"
msgstr "Na Uy (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:121
+#: ../rules/base.extras.xml.in.h:122
msgid "Portuguese (Sun Type 6/7)"
msgstr "Bồ Đào Nha (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:124
+#: ../rules/base.extras.xml.in.h:125
msgid "Slovak (Sun Type 6/7)"
msgstr "Tiếng X-lô-vác (Sun kiểu 6/7)"
-#: ../rules/base.extras.xml.in.h:127
+#: ../rules/base.extras.xml.in.h:128
msgid "Spanish (Sun Type 6/7)"
msgstr "Tây Ban Nha (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:130
+#: ../rules/base.extras.xml.in.h:131
msgid "Swedish (Dvorak A5)"
msgstr "Tiếng Thụy Điển (Dvorak A5)"
-#: ../rules/base.extras.xml.in.h:131
+#: ../rules/base.extras.xml.in.h:132
msgid "Swedish (Sun Type 6/7)"
msgstr "Thụy Điển (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:133
+#: ../rules/base.extras.xml.in.h:134
msgid "German (Switzerland, Sun Type 6/7)"
msgstr "Đức (Thụy Sỹ, Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:134
+#: ../rules/base.extras.xml.in.h:135
msgid "French (Switzerland, Sun Type 6/7)"
msgstr "Pháp (Thụy Sỹ, Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:137
+#: ../rules/base.extras.xml.in.h:138
msgid "Turkish (Sun Type 6/7)"
msgstr "Thổ Nhĩ Kỳ (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:140
+#: ../rules/base.extras.xml.in.h:141
msgid "Ukrainian (Sun Type 6/7)"
msgstr "U-crai-na (Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:142
+#: ../rules/base.extras.xml.in.h:143
msgid "English (UK, Sun Type 6/7)"
msgstr "Tiếng Anh (UK, Kiểu Sun 6/7)"
-#: ../rules/base.extras.xml.in.h:145
+#: ../rules/base.extras.xml.in.h:146
msgid "Korean (Sun Type 6/7)"
-msgstr "Tiếng Hàn Tiếng Ba Lan"
+msgstr "Tiếng Hàn (Kiểu Sun 6/7)"
#. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:147
+#: ../rules/base.extras.xml.in.h:148
msgid "eu"
msgstr "eu"
-#: ../rules/base.extras.xml.in.h:148
+#: ../rules/base.extras.xml.in.h:149
msgid "EurKEY (US based layout with european letters)"
-msgstr "EurKEY (Bố cụ Mỹ với các chữ cái châu âu)"
+msgstr "EurKEY (Bố cục Mỹ với các chữ cái châu âu)"
-#: ../rules/base.extras.xml.in.h:151
+#: ../rules/base.extras.xml.in.h:152
msgid "Mmuock"
msgstr "Mmuock"
+#~ msgid "Shift with numeric keypad keys works as in MS Windows"
+#~ msgstr "Shift với các phím vùng số làm việc như trong MS Windows"
+
#~ msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-#~ msgstr "&lt;Nhỏ/Lớn hơn&gt; chọn cấp năm, khoá khi bấm nhau với một bộ chọn cấp năm khác, một cú bấm cũng buông khoá"
+#~ msgstr "&lt;Nhỏ/Lớn hơn&gt; chọn cấp năm, khóa khi bấm nhau với một bộ chọn cấp năm khác, một cú bấm cũng buông khóa"
#~ msgid "(F)"
#~ msgstr "(F)"
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 2e1e89d6b..749fc7225 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -120,6 +120,16 @@
</variant>
<variant>
<configItem>
+ <name>pl</name>
+ <_description>Polish (Germany, eliminate dead keys)</_description>
+ <languageList>
+ <iso639Id>ger</iso639Id>
+ <iso639Id>pol</iso639Id>
+ </languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>sun_type6</name>
<_description>German (Sun Type 6/7)</_description>
</configItem>
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index cda36e459..5e6f6648c 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -125,6 +125,8 @@
nbsp:level4nl = +nbsp(level4nl)
japan:nicola_f_bs = +jp(nicola_f_bs)
japan:hztg_escape = +jp(hztg_escape)
+ korean:ralt_rctrl = +kr(ralt_hangul)+kr(rctrl_hanja)
+ korean:rctrl_ralt = +kr(rctrl_hangul)+kr(ralt_hanja)
kpdl:dot = +kpdl(dot)
kpdl:comma = +kpdl(comma)
kpdl:dotoss = +kpdl(dotoss)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 682f8c9f9..803de50ac 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1576,6 +1576,12 @@
<_description>Arabic (Buckwalter)</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>mac</name>
+ <_description>Arabic (Macintosh)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -2568,7 +2574,7 @@
<_shortDescription>ug</_shortDescription>
<_description>Uyghur</_description>
<languageList>
- <iso639Id>ug</iso639Id>
+ <iso639Id>uig</iso639Id>
</languageList>
</configItem>
</variant>
@@ -6628,7 +6634,7 @@
<option>
<configItem>
<name>numpad:microsoft</name>
- <_description>Shift with numeric keypad keys works as in MS Windows</_description>
+ <_description>NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)</_description>
</configItem>
</option>
<option>
@@ -6930,6 +6936,30 @@
</configItem>
</option>
</group>
+ <group allowMultipleSelection="true">
+ <configItem>
+ <name>korean</name>
+ <_description>Korean Hangul/Hanja keys</_description>
+ </configItem>
+ <option>
+ <configItem>
+ <name>korean:hw_keys</name>
+ <_description>Hardware Hangul/Hanja keys</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>korean:ralt_rctrl</name>
+ <_description>Right Alt as Hangul, right Ctrl as Hanja</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>korean:rctrl_ralt</name>
+ <_description>Right Ctrl as Hangul, right Alt as Hanja</_description>
+ </configItem>
+ </option>
+ </group>
<group allowMultipleSelection="false">
<configItem>
<name>esperanto</name>
diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara
index 9c1d57e09..a79a84ab6 100644
--- a/xorg-server/xkeyboard-config/symbols/ara
+++ b/xorg-server/xkeyboard-config/symbols/ara
@@ -283,6 +283,57 @@ xkb_symbols "olpc" {
include "group(olpc)"
};
+partial alphanumeric_keys
+xkb_symbols "mac" {
+
+ //This is a layout that is compatible with macbooks
+
+ include "ara(digits)"
+ name[Group1]= "Arabic (Macintosh)";
+
+ key <AE11> { [ minus, underscore ] };
+ key <AE12> { [ equal, plus ] };
+
+ key <TLDE> { [ VoidSymbol, VoidSymbol ] };
+ key <AD03> { [ Arabic_theh, Arabic_kasra ] };
+ key <AD04> { [ Arabic_qaf, Arabic_kasratan ] };
+ key <AD05> { [ Arabic_feh, Arabic_damma ] };
+ key <AD06> { [ Arabic_ghain, Arabic_dammatan ] };
+ key <AD07> { [ Arabic_ain, Arabic_sukun ] };
+ key <AD08> { [ Arabic_ha, Arabic_shadda ] };
+ key <AD09> { [ Arabic_khah, bracketright ] };
+ key <AD10> { [ Arabic_hah, bracketleft ] };
+ key <AD11> { [ Arabic_jeem, braceright ] };
+ key <AD12> { [Arabic_tehmarbuta, braceleft ] };
+
+ key <AC01> { [ Arabic_sheen, guillemotright ] };
+ key <AC02> { [ Arabic_seen, guillemotleft ] };
+ key <AC03> { [ Arabic_yeh, Arabic_alefmaksura] };
+ key <AC04> { [ Arabic_beh, VoidSymbol ] };
+ key <AC05> { [ Arabic_lam, VoidSymbol ] };
+ key <AC06> { [ Arabic_alef, Arabic_maddaonalef ] };
+ key <AC07> { [ Arabic_teh, VoidSymbol ] };
+ key <AC08> { [ Arabic_noon, VoidSymbol ] };
+ key <AC09> { [ Arabic_meem, VoidSymbol ] };
+ key <AC10> { [ Arabic_kaf, colon ] };
+ key <AC11> { [ Arabic_semicolon, quotedbl ] };
+
+ key <BKSL> { [ backslash, bar ] };
+
+ key <LSGT> { [ Arabic_tatweel, VoidSymbol ] };
+ key <AB01> { [ Arabic_zah, VoidSymbol ] };
+ key <AB02> { [ Arabic_tah, VoidSymbol ] };
+ key <AB03> { [ Arabic_thal, Arabic_hamzaonyeh ] };
+ key <AB04> { [ Arabic_dal, Arabic_hamza ] };
+ key <AB05> { [ Arabic_zain, Arabic_hamzaonalef ] };
+ key <AB06> { [ Arabic_ra, Arabic_hamzaunderalef ] };
+ key <AB07> { [ Arabic_waw, Arabic_hamzaonwaw ] };
+ key <AB08> { [ Arabic_comma, greater ] };
+ key <AB09> { [ period, less ] };
+ key <AB10> { [ slash, Arabic_question_mark ] };
+
+};
+
// EXTRAS:
partial alphanumeric_keys
diff --git a/xorg-server/xkeyboard-config/symbols/ch b/xorg-server/xkeyboard-config/symbols/ch
index 62c69f958..245a36a13 100644
--- a/xorg-server/xkeyboard-config/symbols/ch
+++ b/xorg-server/xkeyboard-config/symbols/ch
@@ -20,6 +20,7 @@ xkb_symbols "basic" {
key <AD03> { [ e, E, EuroSign ] };
key <AD06> { [ z, Z ] };
+ key <AD09> { [ o, O, oe, OE ] };
key <AD11> { [ udiaeresis, egrave, bracketleft ] };
key <AD12> { [ dead_diaeresis, exclam, bracketright ] };
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index 944732e51..fa3c7ec97 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -637,6 +637,40 @@ xkb_symbols "ru" {
};
partial alphanumeric_keys
+xkb_symbols "pl" {
+
+ // Combined layout for entering both German and Polish symbols on a German physical
+ // keyboard. Based on German (eliminate dead keys) and Polish (basic). Polish diacritics
+ // on AltGr+"acelnosxz". EuroSign moved to AE04 (AltGr+dollar key) to avoid conflict
+ // with Polish eogonek.
+ //
+ // https://github.com/kontextify/xkeyboard-config
+
+ include "latin(type4)"
+
+ name[Group1]= "Polish (Germany, eliminate dead keys)";
+
+ include "de(nodeadkeys)"
+ key <AE04> { [ 4, dollar, EuroSign, currency ] };
+
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ w, W ] };
+ key <AD03> { [ e, E, eogonek, Eogonek ] };
+ key <AD09> { [ o, O, oacute, Oacute ] };
+ key <AC01> { [ a, A, aogonek, Aogonek ] };
+ key <AC02> { [ s, S, sacute, Sacute ] };
+ key <AC04> { [ f, F ] };
+ key <AD06> { [ z, Z, zabovedot, Zabovedot ] };
+ key <AB02> { [ x, X, zacute, Zacute ] };
+ key <AB03> { [ c, C, cacute, Cacute ] };
+ key <AB06> { [ n, N, nacute, Nacute ] };
+
+ include "kpdl(comma)"
+
+ include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
xkb_symbols "htcdream" {
include "inet(htcdream)"
diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi
index 6afed2106..47bc24f13 100644
--- a/xorg-server/xkeyboard-config/symbols/fi
+++ b/xorg-server/xkeyboard-config/symbols/fi
@@ -79,7 +79,6 @@ xkb_symbols "kotoistus" {
include "nbsp(level3)"
include "kpdl(comma)"
include "level3(ralt_switch)"
- include "compose(rwin)"
};
partial alphanumeric_keys
diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
index 63bf56aca..26ae26768 100644
--- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
@@ -25,7 +25,7 @@
//
// Japanese layout for a Fujitsu 140 key keyboard
-xkb_symbols {
+xkb_symbols "basic" {
override "fujitsu_vndr/us"
augment key <AE01> { [], [ kana_NU ] };
key <AE02> { [ 2, quotedbl ], [ kana_FU ] };
diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
index 30661dbb2..f62b5c832 100644
--- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
@@ -24,7 +24,7 @@
//from The Open Group.
//
// US/ASCII layout for a Fujitsu 138 key keyboard
-xkb_symbols {
+xkb_symbols "basic" {
include "us(basic)"
// A few alphanumeric keys are different
diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il
index 48452d620..67487c111 100644
--- a/xorg-server/xkeyboard-config/symbols/il
+++ b/xorg-server/xkeyboard-config/symbols/il
@@ -205,7 +205,7 @@ xkb_symbols "biblical" {
key <AE02> { [ 2, U0599, VoidSymbol, at ] };
key <AE03> { [ 3, U0592, VoidSymbol, numbersign ] };
key <AE04> { [ 4, U05AF, NewSheqelSign, dollar ] };
- key <AE05> { [ 5, VoidSymbol, U200D, percent ] };
+ key <AE05> { [ 5, U05BA, U200D, percent ] };
key <AE06> { [ 6, U05B9, U200C, asciicircum ] };
key <AE07> { [ 7, U05BF, U034F, ampersand ] };
key <AE08> { [ 8, U05C2, U200E, asterisk ] };
diff --git a/xorg-server/xkeyboard-config/symbols/kr b/xorg-server/xkeyboard-config/symbols/kr
index 1ee560bf8..e554af0c6 100644
--- a/xorg-server/xkeyboard-config/symbols/kr
+++ b/xorg-server/xkeyboard-config/symbols/kr
@@ -2,27 +2,53 @@ default alphanumeric_keys
xkb_symbols "kr106" {
include "us"
name[Group1]= "Korean";
- include "kr(koreankeys)"
+ include "kr(hw_keys)"
};
alphanumeric_keys
xkb_symbols "kr104" {
include "us"
name[Group1]= "Korean (101/104 key compatible)";
- include "kr(koreankeys)"
- include "kr(koreankeys_raltctl)"
+ include "kr(ralt_hangul)"
+ include "kr(rctrl_hanja)"
};
-hidden partial function_keys
-xkb_symbols "koreankeys" {
- key <K71> { [ Hangul ] };
- key <K72> { [ Hangul_Hanja ] };
+partial function_keys
+xkb_symbols "hw_keys" {
+ key <HNGL> { [ Hangul ] };
+ key <HJCV> { [ Hangul_Hanja ] };
};
-hidden partial function_keys
-xkb_symbols "koreankeys_raltctl" {
- key <RALT> { [ Hangul ] };
- key <RCTL> { [ Hangul_Hanja ] };
+partial function_keys
+xkb_symbols "ralt_hangul" {
+ replace key <RALT> {
+ type[Group1] = "ONE_LEVEL",
+ symbols[Group1]= [ Hangul ]
+ };
+};
+
+partial function_keys
+xkb_symbols "rctrl_hangul" {
+ replace key <RCTL> {
+ type[Group1] = "ONE_LEVEL",
+ symbols[Group1]= [ Hangul ]
+ };
+};
+
+partial function_keys
+xkb_symbols "ralt_hanja" {
+ replace key <RALT> {
+ type[Group1] = "ONE_LEVEL",
+ symbols[Group1]= [ Hangul_Hanja ]
+ };
+};
+
+partial function_keys
+xkb_symbols "rctrl_hanja" {
+ replace key <RCTL> {
+ type[Group1] = "ONE_LEVEL",
+ symbols[Group1]= [ Hangul_Hanja ]
+ };
};
// EXTRAS:
diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 37b61a7dc..0ba987067 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -478,11 +478,12 @@ xkb_symbols "srp" {
};
// Mari language layout
-// http://www.marlamuter.ru/
+// http://www.marlamuter.com/
+// Last edit by Viatcheslav Kileev (slavakileev@yandex.ru)
partial alphanumeric_keys
xkb_symbols "chm" {
- include "ru(common)"
+ include "ru(winkeys)"
name[Group1]= "Mari";
key.type[group1]="FOUR_LEVEL_ALPHABETIC";
@@ -491,9 +492,7 @@ xkb_symbols "chm" {
key <AD03> { [ Cyrillic_u, Cyrillic_U, U04F1, U04F0 ] };
key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU, U04F9, U04F8 ] };
key <AD06> { [ Cyrillic_en, Cyrillic_EN, U04A5, U04A4 ] };
- key <AC11> { [ Cyrillic_e, Cyrillic_E, U04E9, U04E8 ] };
- key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, U04EB, U04EA ] };
- key <AC01> { [ Cyrillic_ef, Cyrillic_EF, UF537, UF536 ] };
+ key <AC07> { [ Cyrillic_o, Cyrillic_O, U04E7, U04E6 ] };
include "level3(ralt_switch)"
};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
index cc6d29e9a..0cd6a8665 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
@@ -58,12 +58,28 @@ partial alphanumeric_keys
include "kr(kr104)"
};
-partial alphanumeric_keys
- xkb_symbols "koreankeys" {
- include "kr(koreankeys)"
+partial function_keys
+ xkb_symbols "hw_keys" {
+ include "kr(hw_keys)"
};
-partial alphanumeric_keys
- xkb_symbols "koreankeys_raltctl" {
- include "kr(koreankeys_raltctl)"
+partial function_keys
+ xkb_symbols "ralt_hangul" {
+ include "kr(ralt_hangul)"
};
+
+partial function_keys
+ xkb_symbols "rctrl_hangul" {
+ include "kr(rctrl_hangul)"
+};
+
+partial function_keys
+ xkb_symbols "ralt_hanja" {
+ include "kr(ralt_hanja)"
+};
+
+partial function_keys
+ xkb_symbols "rctrl_hanja" {
+ include "kr(rctrl_hanja)"
+};
+