diff options
Diffstat (limited to 'hw')
124 files changed, 5510 insertions, 2673 deletions
diff --git a/hw/dmx/dmx.h b/hw/dmx/dmx.h index 6ebd00efd..fbb8b96ed 100644 --- a/hw/dmx/dmx.h +++ b/hw/dmx/dmx.h @@ -62,9 +62,7 @@ #include "globals.h" #include "scrnintstr.h" -#ifdef RENDER #include "picturestr.h" -#endif #ifdef GLXEXT #include <GL/glx.h> @@ -233,7 +231,6 @@ typedef struct _DMXScreenInfo { SetShapeProcPtr SetShape; -#ifdef RENDER CreatePictureProcPtr CreatePicture; DestroyPictureProcPtr DestroyPicture; ChangePictureClipProcPtr ChangePictureClip; @@ -254,7 +251,6 @@ typedef struct _DMXScreenInfo { TrianglesProcPtr Triangles; TriStripProcPtr TriStrip; TriFanProcPtr TriFan; -#endif } DMXScreenInfo; /* Global variables available to all Xserver/hw/dmx routines. */ diff --git a/hw/dmx/dmxclient.h b/hw/dmx/dmxclient.h index 147d14ed8..c45f71fc0 100644 --- a/hw/dmx/dmxclient.h +++ b/hw/dmx/dmxclient.h @@ -86,10 +86,8 @@ typedef XID KeySym64; #include <X11/extensions/shape.h> -#ifdef RENDER #include <X11/extensions/Xrender.h> #undef PictFormatType -#endif #include <X11/extensions/XKB.h> #include "xkbstr.h" diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c index 22660419c..4e555330e 100644 --- a/hw/dmx/dmxextension.c +++ b/hw/dmx/dmxextension.c @@ -53,9 +53,7 @@ #include "dmxgc.h" #include "dmxfont.h" #include "dmxcmap.h" -#ifdef RENDER #include "dmxpict.h" -#endif #include "dmxinput.h" #include "dmxsync.h" #include "dmxscrinit.h" @@ -896,14 +894,12 @@ static void dmxBECreateResources(pointer value, XID id, RESTYPE type, if (pCmap->pScreen->myNum == scrnNum) (void)dmxBECreateColormap((ColormapPtr)value); #if 0 -#ifdef RENDER /* TODO: Recreate Picture and GlyphSet resources */ } else if ((type & TypeMask) == (PictureType & TypeMask)) { /* Picture resources are created when windows are created */ } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) { dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value); #endif -#endif } else { /* Other resource types??? */ } @@ -1057,7 +1053,6 @@ static Bool dmxCompareScreens(DMXScreenInfo *new, DMXScreenInfo *old) return TRUE; } -#ifdef RENDER /** Restore Render's picture */ static void dmxBERestoreRenderPict(pointer value, XID id, pointer n) { @@ -1164,7 +1159,6 @@ static void dmxBERestoreRenderGlyph(pointer value, XID id, pointer n) free(gids); free(glyphs); } -#endif /** Reattach previously detached back-end screen. */ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr) @@ -1284,7 +1278,6 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr) /* Create window hierarchy (top down) */ dmxBECreateWindowTree(idx); -#ifdef RENDER /* Restore the picture state for RENDER */ for (i = currentMaxClients; --i >= 0; ) if (clients[i]) @@ -1296,7 +1289,6 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr) if (clients[i]) FindClientResourcesByType(clients[i],GlyphSetType, dmxBERestoreRenderGlyph,(pointer)idx); -#endif /* Refresh screen by generating exposure events for all windows */ dmxForceExposures(idx); @@ -1482,7 +1474,6 @@ static void dmxBEDestroyResources(pointer value, XID id, RESTYPE type, ColormapPtr pCmap = value; if (pCmap->pScreen->myNum == scrnNum) dmxBEFreeColormap((ColormapPtr)value); -#ifdef RENDER } else if ((type & TypeMask) == (PictureType & TypeMask)) { PicturePtr pPict = value; if (pPict->pDrawable->pScreen->myNum == scrnNum) { @@ -1496,7 +1487,6 @@ static void dmxBEDestroyResources(pointer value, XID id, RESTYPE type, } } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) { dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value); -#endif } else { /* Other resource types??? */ } diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index f481cf5c9..cc9ea0b97 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -53,9 +53,7 @@ #include "dmxcb.h" #include "dmxprop.h" #include "dmxstat.h" -#ifdef RENDER #include "dmxpict.h" -#endif #include <X11/Xos.h> /* For gettimeofday */ #include "dixstruct.h" @@ -795,11 +793,9 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[]) */ dmxInitFonts(); -#ifdef RENDER /* Initialize the render extension */ if (!noRenderExtension) dmxInitRender(); -#endif /* Initialized things that need timer hooks */ dmxStatInit(); diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c index 09734f56d..c1beb9ba5 100644 --- a/hw/dmx/dmxscrinit.c +++ b/hw/dmx/dmxscrinit.c @@ -53,9 +53,7 @@ #include "dmxprop.h" #include "dmxdpms.h" -#ifdef RENDER #include "dmxpict.h" -#endif #include "fb.h" #include "mipointer.h" @@ -78,12 +76,10 @@ static int dmxScreenPrivateKeyIndex; DevPrivateKey dmxScreenPrivateKey = &dmxScreenPrivateKeyIndex; /**< Private index for Screens */ static int dmxColormapPrivateKeyIndex; DevPrivateKey dmxColormapPrivateKey = &dmxColormapPrivateKeyIndex; /**< Private index for Colormaps */ -#ifdef RENDER static int dmxPictPrivateKeyIndex; DevPrivateKey dmxPictPrivateKey = &dmxPictPrivateKeyIndex; /**< Private index for Picts */ static int dmxGlyphSetPrivateKeyIndex; DevPrivateKey dmxGlyphSetPrivateKey = &dmxGlyphSetPrivateKeyIndex; /**< Private index for GlyphSets */ -#endif /** Initialize the parts of screen \a idx that require access to the * back-end server. */ @@ -278,9 +274,7 @@ Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[]) dmxScreen->beXDPI, dmxScreen->scrnWidth, dmxScreen->beBPP); -#ifdef RENDER (void)dmxPictureInit(pScreen, 0, 0); -#endif /* Not yet... */ pScreen->GetWindowPixmap = NULL; @@ -435,9 +429,7 @@ Bool dmxCloseScreen(int idx, ScreenPtr pScreen) /* Reset the proc vectors */ if (idx == 0) { -#ifdef RENDER dmxResetRender(); -#endif dmxResetFonts(); } diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c index f9e46db1e..ea2f2c579 100644 --- a/hw/dmx/dmxwindow.c +++ b/hw/dmx/dmxwindow.c @@ -46,9 +46,7 @@ #include "dmxvisual.h" #include "dmxinput.h" #include "dmxextension.h" -#ifdef RENDER #include "dmxpict.h" -#endif #include "windowstr.h" @@ -288,9 +286,7 @@ void dmxCreateAndRealizeWindow(WindowPtr pWindow, Bool doSync) pWinPriv->window = dmxCreateNonRootWindow(pWindow); if (pWinPriv->restacked) dmxDoRestackWindow(pWindow); if (pWinPriv->isShaped) dmxDoSetShape(pWindow); -#ifdef RENDER if (pWinPriv->hasPict) dmxCreatePictureList(pWindow); -#endif if (pWinPriv->mapped) XMapWindow(dmxScreen->beDisplay, pWinPriv->window); if (doSync) dmxSync(dmxScreen, False); @@ -320,9 +316,7 @@ Bool dmxCreateWindow(WindowPtr pWindow) pWinPriv->restacked = FALSE; pWinPriv->attribMask = 0; pWinPriv->isShaped = FALSE; -#ifdef RENDER pWinPriv->hasPict = FALSE; -#endif #ifdef GLXEXT pWinPriv->swapGroup = NULL; pWinPriv->barrier = 0; @@ -405,10 +399,8 @@ Bool dmxDestroyWindow(WindowPtr pWindow) DMX_UNWRAP(DestroyWindow, dmxScreen, pScreen); -#ifdef RENDER /* Destroy any picture list associated with this window */ needSync |= dmxDestroyPictureList(pWindow); -#endif /* Destroy window on back-end server */ needSync |= dmxBEDestroyWindow(pWindow); diff --git a/hw/dmx/dmxwindow.h b/hw/dmx/dmxwindow.h index 353d0a3ba..740a21f0b 100644 --- a/hw/dmx/dmxwindow.h +++ b/hw/dmx/dmxwindow.h @@ -49,9 +49,7 @@ typedef struct _dmxWinPriv { Colormap cmap; Visual *visual; Bool isShaped; -#ifdef RENDER Bool hasPict; -#endif #ifdef GLXEXT void *swapGroup; int barrier; diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 1902ab885..765bd0ea7 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -1003,10 +1003,8 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) pScreen->BlockHandler = KdBlockHandler; pScreen->WakeupHandler = KdWakeupHandler; -#ifdef RENDER if (!fbPictureInit (pScreen, 0, 0)) return FALSE; -#endif if (card->cfuncs->initScreen) if (!(*card->cfuncs->initScreen) (pScreen)) return FALSE; diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index 35d1dc4d2..10bb6a599 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -43,6 +43,7 @@ from The Open Group. #include <X11/keysym.h> #include "xserver-properties.h" #include "exevents.h" +#include "extinit.h" Bool LegalModifier(unsigned int key, DeviceIntPtr pDev) @@ -136,10 +137,15 @@ void InitInput(int argc, char *argv[]) { DeviceIntPtr p, k; + Atom xiclass; p = AddInputDevice(serverClient, vfbMouseProc, TRUE); k = AddInputDevice(serverClient, vfbKeybdProc, TRUE); RegisterPointerDevice(p); + xiclass = MakeAtom(XI_MOUSE, sizeof(XI_MOUSE) - 1, TRUE); + AssignTypeAndName(p, xiclass, "Xvfb mouse"); RegisterKeyboardDevice(k); + xiclass = MakeAtom(XI_KEYBOARD, sizeof(XI_KEYBOARD) - 1, TRUE); + AssignTypeAndName(k, xiclass, "Xvfb keyboard"); (void)mieqInit(); } diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index e7dd1d95f..60915fdbf 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -248,10 +248,8 @@ ddxUseMsg(void) { ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); ErrorF("-pixdepths list-of-int support given pixmap depths\n"); -#ifdef RENDER - ErrorF("+/-render turn on/of RENDER extension support" + ErrorF("+/-render turn on/off RENDER extension support" "(default on)\n"); -#endif ErrorF("-linebias n adjust thin line pixelization\n"); ErrorF("-blackpixel n pixel value for black\n"); ErrorF("-whitepixel n pixel value for white\n"); @@ -904,10 +902,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, dpix, dpiy, pvfb->paddedWidth,pvfb->bitsPerPixel); -#ifdef RENDER if (ret && Render) fbPictureInit (pScreen, 0, 0); -#endif if (!ret) return FALSE; diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 1e9543fa2..9a2837e7b 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -67,9 +67,7 @@ extern DeviceAssocRec mouse_assoc; #include "xkbsrv.h" -#ifdef RENDER #include "picture.h" -#endif /* * These paths define the way the config file search is done. The escape @@ -925,7 +923,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) } } -#ifdef RENDER { if ((s = xf86GetOptValString(FlagOptions, FLAG_RENDER_COLORMAP_MODE))){ int policy = PictureParseCmapPolicy (s); @@ -938,7 +935,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) } } } -#endif #ifdef RANDR xf86Info.disableRandR = FALSE; diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 71ac9a9fe..03a29ea0f 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -74,9 +74,7 @@ #include "xf86DDC.h" #include "xf86Xinput.h" #include "xf86InPriv.h" -#ifdef RENDER #include "picturestr.h" -#endif #include "xf86VGAarbiter.h" #include "globals.h" @@ -110,15 +108,9 @@ static PixmapFormatRec formats[MAXFORMATS] = { { 15, 16, BITMAP_SCANLINE_PAD }, { 16, 16, BITMAP_SCANLINE_PAD }, { 24, 32, BITMAP_SCANLINE_PAD }, -#ifdef RENDER { 32, 32, BITMAP_SCANLINE_PAD }, -#endif }; -#ifdef RENDER static int numFormats = 7; -#else -static int numFormats = 6; -#endif static Bool formatsDone = FALSE; #ifndef OSNAME @@ -1082,7 +1074,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) xf86Screens[i]->pScreen->CreateWindow); xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow; -#ifdef RENDER if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown) { xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC); @@ -1092,7 +1083,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) SubPixelHorizontalRGB : SubPixelNone) : SubPixelUnknown); } -#endif #ifdef RANDR if (!xf86Info.disableRandR) xf86RandRInit (screenInfo.screens[scr_index]); diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c index cd45cd187..52a8b9a60 100644 --- a/hw/xfree86/common/xf86VGAarbiter.c +++ b/hw/xfree86/common/xf86VGAarbiter.c @@ -151,9 +151,7 @@ xf86VGAarbiterWrapFunctions(void) ScrnInfoPtr pScrn; VGAarbiterScreenPtr pScreenPriv; miPointerScreenPtr PointPriv; -#ifdef RENDER PictureScreenPtr ps; -#endif ScreenPtr pScreen; int vga_count, i; @@ -173,9 +171,7 @@ xf86VGAarbiterWrapFunctions(void) for (i = 0; i < xf86NumScreens; i++) { pScreen = xf86Screens[i]->pScreen; -#ifdef RENDER ps = GetPictureScreenIfSet(pScreen); -#endif pScrn = xf86Screens[pScreen->myNum]; PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey); @@ -204,11 +200,9 @@ xf86VGAarbiterWrapFunctions(void) WRAP_SCREEN(UnrealizeCursor, VGAarbiterUnrealizeCursor); WRAP_SCREEN(RecolorCursor, VGAarbiterRecolorCursor); WRAP_SCREEN(SetCursorPosition, VGAarbiterSetCursorPosition); -#ifdef RENDER WRAP_PICT(Composite,VGAarbiterComposite); WRAP_PICT(Glyphs,VGAarbiterGlyphs); WRAP_PICT(CompositeRects,VGAarbiterCompositeRects); -#endif WRAP_SCREEN_INFO(AdjustFrame, VGAarbiterAdjustFrame); WRAP_SCREEN_INFO(SwitchMode, VGAarbiterSwitchMode); WRAP_SCREEN_INFO(EnterVT, VGAarbiterEnterVT); @@ -230,9 +224,7 @@ VGAarbiterCloseScreen (int i, ScreenPtr pScreen) &pScreen->devPrivates, VGAarbiterScreenKey); miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate( &pScreen->devPrivates, miPointerScreenKey); -#ifdef RENDER PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); -#endif UNWRAP_SCREEN(CreateGC); UNWRAP_SCREEN(CloseScreen); @@ -248,11 +240,9 @@ VGAarbiterCloseScreen (int i, ScreenPtr pScreen) UNWRAP_SCREEN(UnrealizeCursor); UNWRAP_SCREEN(RecolorCursor); UNWRAP_SCREEN(SetCursorPosition); -#ifdef RENDER UNWRAP_PICT(Composite); UNWRAP_PICT(Glyphs); UNWRAP_PICT(CompositeRects); -#endif UNWRAP_SCREEN_INFO(AdjustFrame); UNWRAP_SCREEN_INFO(SwitchMode); UNWRAP_SCREEN_INFO(EnterVT); @@ -1048,7 +1038,6 @@ VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) SPRITE_EPILOG; } -#ifdef RENDER static void VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, @@ -1097,7 +1086,6 @@ VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRe VGAPut(); PICTURE_EPILOGUE (CompositeRects, VGAarbiterCompositeRects); } -#endif #else /* dummy functions */ void xf86VGAarbiterInit(void) {} diff --git a/hw/xfree86/common/xf86VGAarbiterPriv.h b/hw/xfree86/common/xf86VGAarbiterPriv.h index 40d436856..9b4a59731 100644 --- a/hw/xfree86/common/xf86VGAarbiterPriv.h +++ b/hw/xfree86/common/xf86VGAarbiterPriv.h @@ -43,9 +43,7 @@ #include "xf86str.h" #include "mipointer.h" #include "mipointrst.h" -#ifdef RENDER # include "picturestr.h" -#endif #define WRAP_SCREEN(x,y) {pScreenPriv->x = pScreen->x; pScreen->x = y;} @@ -139,11 +137,9 @@ typedef struct _VGAarbiterScreen { void (*LeaveVT)(int, int); void (*FreeScreen)(int, int); miPointerSpriteFuncPtr miSprite; -#ifdef RENDER CompositeProcPtr Composite; GlyphsProcPtr Glyphs; CompositeRectsProcPtr CompositeRects; -#endif } VGAarbiterScreenRec, *VGAarbiterScreenPtr; typedef struct _VGAarbiterGC { @@ -254,7 +250,6 @@ static Bool VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScree static void VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen); -#ifdef RENDER static void VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height); @@ -263,4 +258,3 @@ static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, list, GlyphPtr *glyphs); static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects); -#endif diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 822922717..dba3370f3 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -86,6 +86,7 @@ #include "windowstr.h" /* screenIsSaved */ #include <stdarg.h> +#include <stdint.h> /* for int64_t */ #include <X11/Xpoll.h> @@ -625,25 +626,30 @@ MergeInputClasses(IDevPtr idev, InputAttributes *attrs) return Success; } +/* + * Iterate the list of classes and look for Option "Ignore". Return the + * value of the last matching class and holler when returning TRUE. + */ static Bool IgnoreInputClass(IDevPtr idev, InputAttributes *attrs) { XF86ConfInputClassPtr cl; - Bool ignore; + Bool ignore = FALSE; + const char *ignore_class; for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) { if (!InputClassMatches(cl, attrs)) continue; if (xf86findOption(cl->option_lst, "Ignore")) { ignore = xf86CheckBoolOption(cl->option_lst, "Ignore", FALSE); - if (ignore) - xf86Msg(X_CONFIG, - "%s: Ignoring device from InputClass \"%s\"\n", - idev->identifier, cl->identifier); - return ignore; + ignore_class = cl->identifier; } } - return FALSE; + + if (ignore) + xf86Msg(X_CONFIG, "%s: Ignoring device from InputClass \"%s\"\n", + idev->identifier, ignore_class); + return ignore; } /** @@ -1172,12 +1178,11 @@ xf86ScaleAxis(int Cx, int Rxlow ) { int X; - int dSx = Sxhigh - Sxlow; - int dRx = Rxhigh - Rxlow; + int64_t dSx = Sxhigh - Sxlow; + int64_t dRx = Rxhigh - Rxlow; - dSx = Sxhigh - Sxlow; if (dRx) { - X = ((dSx * (Cx - Rxlow)) / dRx) + Sxlow; + X = (int)(((dSx * (Cx - Rxlow)) / dRx) + Sxlow); } else { X = 0; diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index 299562592..7d2086802 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -47,15 +47,6 @@ static ExtensionModule extensionModules[] = { NULL }, #endif -#ifdef MULTIBUFFER - { - MultibufferExtensionInit, - MULTIBUFFER_PROTOCOL_NAME, - &noMultibufferExtension, - NULL, - NULL - }, -#endif #ifdef SCREENSAVER { ScreenSaverExtensionInit, diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 6210526aa..1154e4601 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -9,11 +9,6 @@ #include <X11/extensions/shapeproto.h> -#ifdef MULTIBUFFER -extern void MultibufferExtensionInit(INITARGS); -#include <X11/extensions/multibufproto.h> -#endif - #ifdef XTEST extern void XTestExtensionInit(INITARGS); #include <X11/extensions/xtestproto.h> diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c index 2bdb73392..6c4dabc41 100644 --- a/hw/xfree86/dri2/dri2.c +++ b/hw/xfree86/dri2/dri2.c @@ -48,15 +48,14 @@ CARD8 dri2_major; /* version of DRI2 supported by DDX */ CARD8 dri2_minor; -static int dri2ScreenPrivateKeyIndex; +static int dri2ScreenPrivateKeyIndex; static DevPrivateKey dri2ScreenPrivateKey = &dri2ScreenPrivateKeyIndex; -static int dri2WindowPrivateKeyIndex; -static DevPrivateKey dri2WindowPrivateKey = &dri2WindowPrivateKeyIndex; -static int dri2PixmapPrivateKeyIndex; -static DevPrivateKey dri2PixmapPrivateKey = &dri2PixmapPrivateKeyIndex; +static RESTYPE dri2DrawableRes; + +typedef struct _DRI2Screen *DRI2ScreenPtr; typedef struct _DRI2Drawable { - unsigned int refCount; + DRI2ScreenPtr dri2_screen; int width; int height; DRI2BufferPtr *buffers; @@ -73,9 +72,8 @@ typedef struct _DRI2Drawable { int swap_limit; /* for N-buffering */ } DRI2DrawableRec, *DRI2DrawablePtr; -typedef struct _DRI2Screen *DRI2ScreenPtr; - typedef struct _DRI2Screen { + ScreenPtr screen; unsigned int numDrivers; const char **driverNames; const char *deviceName; @@ -101,45 +99,35 @@ DRI2GetScreen(ScreenPtr pScreen) static DRI2DrawablePtr DRI2GetDrawable(DrawablePtr pDraw) { - WindowPtr pWin; - PixmapPtr pPixmap; + DRI2DrawablePtr pPriv; + int rc; - if (!pDraw) + rc = dixLookupResourceByType((pointer *) &pPriv, pDraw->id, + dri2DrawableRes, NULL, DixReadAccess); + if (rc != Success) return NULL; - if (pDraw->type == DRAWABLE_WINDOW) - { - pWin = (WindowPtr) pDraw; - return dixLookupPrivate(&pWin->devPrivates, dri2WindowPrivateKey); - } - else - { - pPixmap = (PixmapPtr) pDraw; - return dixLookupPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey); - } + return pPriv; } int DRI2CreateDrawable(DrawablePtr pDraw) { DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); - WindowPtr pWin; - PixmapPtr pPixmap; DRI2DrawablePtr pPriv; CARD64 ust; + int rc; - pPriv = DRI2GetDrawable(pDraw); - if (pPriv != NULL) - { - pPriv->refCount++; - return Success; - } + rc = dixLookupResourceByType((pointer *) &pPriv, pDraw->id, + dri2DrawableRes, NULL, DixReadAccess); + if (rc == Success || rc != BadValue) + return rc; pPriv = xalloc(sizeof *pPriv); if (pPriv == NULL) return BadAlloc; - pPriv->refCount = 1; + pPriv->dri2_screen = ds; pPriv->width = pDraw->width; pPriv->height = pDraw->height; pPriv->buffers = NULL; @@ -158,43 +146,30 @@ DRI2CreateDrawable(DrawablePtr pDraw) pPriv->last_swap_msc = 0; pPriv->last_swap_ust = 0; - if (pDraw->type == DRAWABLE_WINDOW) - { - pWin = (WindowPtr) pDraw; - dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, pPriv); - } - else - { - pPixmap = (PixmapPtr) pDraw; - dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, pPriv); - } + if (!AddResource(pDraw->id, dri2DrawableRes, pPriv)) + return BadAlloc; return Success; } -static void -DRI2FreeDrawable(DrawablePtr pDraw) +static int DRI2DrawableGone(pointer p, XID id) { - DRI2DrawablePtr pPriv; - WindowPtr pWin; - PixmapPtr pPixmap; + DRI2DrawablePtr pPriv = p; + DRI2ScreenPtr ds = pPriv->dri2_screen; + DrawablePtr root; + int i; - pPriv = DRI2GetDrawable(pDraw); - if (pPriv == NULL) - return; + root = &WindowTable[ds->screen->myNum]->drawable; + if (pPriv->buffers != NULL) { + for (i = 0; i < pPriv->bufferCount; i++) + (*ds->DestroyBuffer)(root, pPriv->buffers[i]); + + xfree(pPriv->buffers); + } xfree(pPriv); - if (pDraw->type == DRAWABLE_WINDOW) - { - pWin = (WindowPtr) pDraw; - dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, NULL); - } - else - { - pPixmap = (PixmapPtr) pDraw; - dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, NULL); - } + return Success; } static int @@ -505,10 +480,6 @@ DRI2WaitMSCComplete(ClientPtr client, DrawablePtr pDraw, int frame, pPriv->blockedClient = NULL; pPriv->blockedOnMsc = FALSE; - - /* If there's still a swap pending, let DRI2SwapComplete free it */ - if (pPriv->refCount == 0 && pPriv->swapsPending == 0) - DRI2FreeDrawable(pDraw); } static void @@ -576,13 +547,6 @@ DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame, pPriv->last_swap_ust = ust; DRI2WakeClient(client, pDraw, frame, tv_sec, tv_usec); - - /* - * It's normal for the app to have exited with a swap outstanding, but - * don't free the drawable until they're all complete. - */ - if (pPriv->swapsPending == 0 && pPriv->refCount == 0) - DRI2FreeDrawable(pDraw); } Bool @@ -750,7 +714,7 @@ DRI2WaitMSC(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc, Bool ret; pPriv = DRI2GetDrawable(pDraw); - if (pPriv == NULL || pPriv->refCount == 0) + if (pPriv == NULL) return BadDrawable; /* Old DDX just completes immediately */ @@ -774,7 +738,7 @@ DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw, CARD64 target_sbc, DRI2DrawablePtr pPriv; pPriv = DRI2GetDrawable(pDraw); - if (pPriv == NULL || pPriv->refCount == 0) + if (pPriv == NULL) return BadDrawable; /* target_sbc == 0 means to block until all pending swaps are @@ -800,36 +764,6 @@ DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw, CARD64 target_sbc, return Success; } -void -DRI2DestroyDrawable(DrawablePtr pDraw) -{ - DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); - DRI2DrawablePtr pPriv; - - pPriv = DRI2GetDrawable(pDraw); - if (pPriv == NULL) - return; - - pPriv->refCount--; - if (pPriv->refCount > 0) - return; - - if (pPriv->buffers != NULL) { - int i; - - for (i = 0; i < pPriv->bufferCount; i++) - (*ds->DestroyBuffer)(pDraw, pPriv->buffers[i]); - - xfree(pPriv->buffers); - } - - /* If the window is destroyed while we have a swap or wait pending, don't - * actually free the priv yet. We'll need it in the DRI2SwapComplete() - * callback and we'll free it there once we're done. */ - if (!pPriv->swapsPending && !pPriv->blockedClient) - DRI2FreeDrawable(pDraw); -} - Bool DRI2HasSwapControl(ScreenPtr pScreen) { @@ -890,6 +824,7 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) if (!ds) return FALSE; + ds->screen = pScreen; ds->fd = info->fd; ds->deviceName = info->deviceName; dri2_major = 1; @@ -961,6 +896,8 @@ DRI2Setup(pointer module, pointer opts, int *errmaj, int *errmin) { static Bool setupDone = FALSE; + dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone, "DRI2Drawable"); + if (!setupDone) { setupDone = TRUE; diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c index 094d54dc0..17df1304e 100644 --- a/hw/xfree86/dri2/dri2ext.c +++ b/hw/xfree86/dri2/dri2ext.c @@ -51,7 +51,6 @@ #include "xf86Module.h" static ExtensionEntry *dri2Extension; -static RESTYPE dri2DrawableRes; static Bool validDrawable(ClientPtr client, XID drawable, Mask access_mode, @@ -172,11 +171,6 @@ ProcDRI2CreateDrawable(ClientPtr client) if (status != Success) return status; - if (!AddResource(stuff->drawable, dri2DrawableRes, pDrawable)) { - DRI2DestroyDrawable(pDrawable); - return BadAlloc; - } - return client->noClientException; } @@ -192,8 +186,6 @@ ProcDRI2DestroyDrawable(ClientPtr client) &pDrawable, &status)) return status; - FreeResourceByType(stuff->drawable, dri2DrawableRes, FALSE); - return client->noClientException; } @@ -627,25 +619,11 @@ SProcDRI2Dispatch (ClientPtr client) } } -static int DRI2DrawableGone(pointer p, XID id) -{ - DrawablePtr pDrawable = p; - - DRI2DestroyDrawable(pDrawable); - - return Success; -} - int DRI2EventBase; static void DRI2ExtensionInit(void) { - dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone, "DRI2Drawable"); - - if (!dri2DrawableRes) - return; - dri2Extension = AddExtension(DRI2_NAME, DRI2NumberEvents, DRI2NumberErrors, diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c index 7c39edbee..61224eaa5 100644 --- a/hw/xfree86/i2c/fi1236.c +++ b/hw/xfree86/i2c/fi1236.c @@ -398,10 +398,6 @@ int TUNER_get_afc_hint(FI1236Ptr f) { if(f->afc_timer_installed)return TUNER_STILL_TUNING; return f->last_afc_hint; -if(f->type==TUNER_TYPE_MT2032) - return MT2032_get_afc_hint(f); - else - return FI1236_get_afc_hint(f); } static void MT2032_dump_status(FI1236Ptr f) diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 860e520ad..1ccaffc10 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -42,9 +42,7 @@ #include "X11/extensions/render.h" #include "X11/extensions/dpmsconst.h" #include "X11/Xatom.h" -#ifdef RENDER #include "picturestr.h" -#endif #include "xf86xv.h" @@ -184,7 +182,6 @@ xf86CrtcInUse (xf86CrtcPtr crtc) void xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen) { -#ifdef RENDER int subpixel_order = SubPixelUnknown; Bool has_none = FALSE; ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; @@ -243,7 +240,6 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen) if (subpixel_order == SubPixelUnknown && has_none) subpixel_order = SubPixelNone; PictureSetSubpixelOrder (pScreen, subpixel_order); -#endif } /** diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index e2e174e59..f90ecc227 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -41,9 +41,7 @@ #include "X11/extensions/render.h" #include "X11/extensions/dpmsconst.h" #include "X11/Xatom.h" -#ifdef RENDER #include "picturestr.h" -#endif #include "cursorstr.h" #include "inputstr.h" diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index 4ba8599ab..da57939cf 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -340,14 +340,9 @@ xf86SetSerial (int fd, pointer options) if ((xf86SetBoolOption (options, "ClearRTS", FALSE))) { -#ifdef CLEARRTS_SUPPORT - val = TIOCM_RTS; - SYSCALL (ioctl(fd, TIOCMBIC, &val)); -#else xf86Msg (X_WARNING, "Option ClearRTS not supported on this OS\n"); return (-1); -#endif xf86MarkOptionUsedByName (options, "ClearRTS"); } diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c index 1091be5e5..4e42b24f0 100644 --- a/hw/xfree86/parser/read.c +++ b/hw/xfree86/parser/read.c @@ -219,15 +219,15 @@ xf86readConfigFile (void) } else { - Error (INVALID_SECTION_MSG, xf86tokenString ()); free(val.str); val.str = NULL; + Error (INVALID_SECTION_MSG, xf86tokenString ()); } break; default: - Error (INVALID_KEYWORD_MSG, xf86tokenString ()); free(val.str); val.str = NULL; + Error (INVALID_KEYWORD_MSG, xf86tokenString ()); } } diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index 8aab0cf41..06710d55a 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -845,10 +845,13 @@ static int ConfigFilter(const struct dirent *de) { const char *name = de->d_name; - size_t len = strlen(name); + size_t len; size_t suflen = strlen(XCONFIGSUFFIX); - if (!name || name[0] == '.' || len <= suflen) + if (!name || name[0] == '.') + return 0; + len = strlen(name); + if(len <= suflen) return 0; if (strcmp(&name[len-suflen], XCONFIGSUFFIX) != 0) return 0; diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index 9c9aa0d55..1c8170104 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -27,9 +27,7 @@ #include "xf86str.h" #include "shadowfb.h" -#ifdef RENDER # include "picturestr.h" -#endif static Bool ShadowCloseScreen (int i, ScreenPtr pScreen); static void ShadowCopyWindow( @@ -51,7 +49,6 @@ static Bool ShadowModifyPixmapHeader( static Bool ShadowEnterVT(int index, int flags); static void ShadowLeaveVT(int index, int flags); -#ifdef RENDER static void ShadowComposite( CARD8 op, PicturePtr pSrc, @@ -66,7 +63,6 @@ static void ShadowComposite( CARD16 width, CARD16 height ); -#endif /* RENDER */ typedef struct { @@ -77,9 +73,7 @@ typedef struct { CopyWindowProcPtr CopyWindow; CreateGCProcPtr CreateGC; ModifyPixmapHeaderProcPtr ModifyPixmapHeader; -#ifdef RENDER CompositeProcPtr Composite; -#endif /* RENDER */ Bool (*EnterVT)(int, int); void (*LeaveVT)(int, int); Bool vtSema; @@ -164,9 +158,7 @@ ShadowFBInit2 ( ){ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ShadowScreenPtr pPriv; -#ifdef RENDER PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); -#endif /* RENDER */ if(!preRefreshArea && !postRefreshArea) return FALSE; @@ -199,12 +191,10 @@ ShadowFBInit2 ( pScrn->EnterVT = ShadowEnterVT; pScrn->LeaveVT = ShadowLeaveVT; -#ifdef RENDER if(ps) { pPriv->Composite = ps->Composite; ps->Composite = ShadowComposite; } -#endif /* RENDER */ return TRUE; } @@ -251,9 +241,7 @@ ShadowCloseScreen (int i, ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen); -#ifdef RENDER PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); -#endif /* RENDER */ pScreen->CloseScreen = pPriv->CloseScreen; pScreen->CopyWindow = pPriv->CopyWindow; @@ -263,11 +251,9 @@ ShadowCloseScreen (int i, ScreenPtr pScreen) pScrn->EnterVT = pPriv->EnterVT; pScrn->LeaveVT = pPriv->LeaveVT; -#ifdef RENDER if(ps) { ps->Composite = pPriv->Composite; } -#endif /* RENDER */ xfree((pointer)pPriv); @@ -355,7 +341,6 @@ ShadowModifyPixmapHeader( return retval; } -#ifdef RENDER static void ShadowComposite( CARD8 op, @@ -408,7 +393,6 @@ ShadowComposite( (*pPriv->postRefresh)(pPriv->pScrn, 1, &box); } } -#endif /* RENDER */ /**********************************************************/ diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h index 7db6b95d5..2af954fee 100644 --- a/hw/xfree86/xaa/xaa.h +++ b/hw/xfree86/xaa/xaa.h @@ -108,9 +108,7 @@ #include "regionstr.h" #include "xf86fbman.h" -#ifdef RENDER #include "picturestr.h" -#endif /* Flags */ #define PIXMAP_CACHE 0x00000001 @@ -1251,7 +1249,6 @@ typedef struct _XAAInfoRec { CARD32 FullPlanemasks[32]; -#ifdef RENDER Bool (*Composite) ( CARD8 op, PicturePtr pSrc, @@ -1336,13 +1333,10 @@ typedef struct _XAAInfoRec { CARD32 * CPUToScreenTextureFormats; -#endif - /* these were added for 4.3.0 */ BoxRec SolidLineLimits; BoxRec DashedLineLimits; -#ifdef RENDER /* These were added for X.Org 6.8.0 */ Bool (*SetupForCPUToScreenAlphaTexture2) ( ScrnInfoPtr pScrn, @@ -1373,7 +1367,6 @@ typedef struct _XAAInfoRec { int flags ); CARD32 *CPUToScreenTextureDstFormats; -#endif /* RENDER */ } XAAInfoRec, *XAAInfoRecPtr; #define SET_SYNC_FLAG(infoRec) (infoRec)->NeedToSync = TRUE diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index 2ce2d9085..7d4583dc2 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -100,9 +100,7 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; XAAScreenPtr pScreenPriv; int i; -#ifdef RENDER PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); -#endif /* Return successfully if no acceleration wanted */ if (!infoRec) @@ -173,7 +171,6 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) pScrn->EnableDisableFBAccess = XAAEnableDisableFBAccess; pScreenPriv->WindowExposures = pScreen->WindowExposures; -#ifdef RENDER if (ps) { pScreenPriv->Composite = ps->Composite; @@ -181,7 +178,6 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) pScreenPriv->Glyphs = ps->Glyphs; ps->Glyphs = XAAGlyphs; } -#endif if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR) XAASetupOverlay8_32Planar(pScreen); diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 157325e4b..6f3d622e1 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -1251,7 +1251,6 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) infoRec->ComputeDash = XAAComputeDash; } -#ifdef RENDER { Bool haveTexture = infoRec->CPUToScreenTextureFormats && infoRec->CPUToScreenTextureDstFormats && @@ -1271,7 +1270,6 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) infoRec->Glyphs = XAADoGlyphs; } } -#endif /************ Validation Functions **************/ diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index 57d8aa318..f33261453 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -260,7 +260,6 @@ typedef struct _XAAStateWrapRec { GetImageProcPtr GetImage; GetSpansProcPtr GetSpans; CopyWindowProcPtr CopyWindow; -#ifdef RENDER Bool (*SetupForCPUToScreenAlphaTexture2)(ScrnInfoPtr pScrn, int op, CARD16 red, CARD16 green, CARD16 blue, CARD16 alpha, @@ -271,7 +270,6 @@ typedef struct _XAAStateWrapRec { CARD32 srcFormat, CARD32 dstFormat, CARD8 *texPtr, int texPitch, int width, int height, int flags); -#endif } XAAStateWrapRec, *XAAStateWrapPtr; static int XAAStateKeyIndex; @@ -1457,7 +1455,6 @@ static void XAAStateWrapCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, prgnSrc); } -#ifdef RENDER static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn, int op, CARD16 red, CARD16 green, @@ -1494,7 +1491,6 @@ static Bool XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op, dstFormat, texPtr, texPitch, width, height, flags); } -#endif /* Setup Function */ Bool @@ -1624,9 +1620,7 @@ XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAA_STATE_WRAP(GetImage); XAA_STATE_WRAP(GetSpans); XAA_STATE_WRAP(CopyWindow); -#ifdef RENDER XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2); XAA_STATE_WRAP(SetupForCPUToScreenTexture2); -#endif return TRUE; } diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c index 88418946f..d6409887c 100644 --- a/hw/xfree86/xaa/xaaWrapper.c +++ b/hw/xfree86/xaa/xaaWrapper.c @@ -62,10 +62,8 @@ typedef struct { UninstallColormapProcPtr UninstallColormap; ListInstalledColormapsProcPtr ListInstalledColormaps; StoreColorsProcPtr StoreColors; -#ifdef RENDER CompositeProcPtr Composite; GlyphsProcPtr Glyphs; -#endif CloseScreenProcPtr wrapCloseScreen; CreateScreenResourcesProcPtr wrapCreateScreenResources; @@ -79,10 +77,8 @@ typedef struct { UninstallColormapProcPtr wrapUninstallColormap; ListInstalledColormapsProcPtr wrapListInstalledColormaps; StoreColorsProcPtr wrapStoreColors; -#ifdef RENDER CompositeProcPtr wrapComposite; GlyphsProcPtr wrapGlyphs; -#endif int depth; } xaaWrapperScrPrivRec, *xaaWrapperScrPrivPtr; @@ -270,9 +266,7 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f { Bool ret; xaaWrapperScrPrivPtr pScrPriv; -#ifdef RENDER PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); -#endif if (!dixRequestPrivate(xaaWrapperGCPrivateKey, sizeof(xaaWrapperGCPrivRec))) return FALSE; @@ -293,12 +287,10 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f get (pScrPriv, pScreen, UninstallColormap, wrapUninstallColormap); get (pScrPriv, pScreen, ListInstalledColormaps, wrapListInstalledColormaps); get (pScrPriv, pScreen, StoreColors, wrapStoreColors); -#ifdef RENDER if (ps) { get (pScrPriv, ps, Glyphs, wrapGlyphs); get (pScrPriv, ps, Composite, wrapComposite); } -#endif if (!(ret = XAAInit(pScreen,infoPtr))) return FALSE; @@ -317,12 +309,10 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f xaaWrapperListInstalledColormaps); wrap (pScrPriv, pScreen, StoreColors, xaaWrapperStoreColors); -#ifdef RENDER if (ps) { wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs); wrap (pScrPriv, ps, Composite, xaaWrapperComposite); } -#endif pScrPriv->depth = depth; dixSetPrivate(&pScreen->devPrivates, xaaWrapperScrPrivateKey, pScrPriv); @@ -438,7 +428,6 @@ xaaWrapperDestroyClip(GCPtr pGC) XAAWRAPPER_GC_FUNC_EPILOGUE (pGC); } -#ifdef RENDER static void xaaWrapperComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, @@ -470,7 +459,6 @@ xaaWrapperGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs); } -#endif void XAASync(ScreenPtr pScreen) diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index 5e3d373c6..129c1d6c4 100644 --- a/hw/xfree86/xaa/xaalocal.h +++ b/hw/xfree86/xaa/xaalocal.h @@ -10,9 +10,7 @@ #include "xf86fbman.h" #include "xaa.h" #include "mi.h" -#ifdef RENDER #include "picturestr.h" -#endif #define GCWhenForced (GCArcMode << 1) @@ -55,10 +53,8 @@ typedef struct _XAAScreen { void (*LeaveVT)(int, int); int (*SetDGAMode)(int, int, DGADevicePtr); void (*EnableDisableFBAccess)(int, Bool); -#ifdef RENDER CompositeProcPtr Composite; GlyphsProcPtr Glyphs; -#endif } XAAScreenRec, *XAAScreenPtr; #define OPS_ARE_PIXMAP 0x00000001 @@ -1539,7 +1535,6 @@ extern _X_EXPORT void XAARemoveAreaCallback(FBAreaPtr area); extern _X_EXPORT void XAAMoveOutOffscreenPixmap(PixmapPtr pPix); extern _X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec); -#ifdef RENDER extern _X_EXPORT void XAAComposite (CARD8 op, PicturePtr pSrc, @@ -1627,8 +1622,6 @@ XAAGetPixelFromRGBA ( CARD32 format ); -#endif - /* XXX should be static */ extern _X_EXPORT GCOps XAAFallbackOps; extern _X_EXPORT GCOps *XAAGetFallbackOps(void); diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h index 857dbc3ed..86ba003d6 100644 --- a/hw/xfree86/xaa/xaawrap.h +++ b/hw/xfree86/xaa/xaawrap.h @@ -61,14 +61,12 @@ #include <xorg-config.h> #endif -#ifdef RENDER #define XAA_RENDER_PROLOGUE(pScreen,field)\ (GetPictureScreen(pScreen)->field = \ ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field) #define XAA_RENDER_EPILOGUE(pScreen, field, wrapper)\ (GetPictureScreen(pScreen)->field = wrapper) -#endif /* This also works fine for drawables */ diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c index f2af3ffb6..70558ed20 100644 --- a/hw/xquartz/GL/indirect.c +++ b/hw/xquartz/GL/indirect.c @@ -548,7 +548,7 @@ static CGLPixelFormatObj makeFormat(__GLXconfig *conf) { attr[i++] = conf->samples; } - attr[i + 1] = 0; + attr[i] = 0; error = CGLChoosePixelFormat(attr, &fobj, &formats); if(error) { diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h index d7e9a5fa5..ce19e034a 100644 --- a/hw/xquartz/X11Application.h +++ b/hw/xquartz/X11Application.h @@ -90,6 +90,7 @@ extern int quartzHasRoot, quartzEnableRootless, quartzFullscreenMenu; #define PREFS_NO_TCP "nolisten_tcp" #define PREFS_DONE_XINIT_CHECK "done_xinit_check" #define PREFS_NO_QUIT_ALERT "no_quit_alert" +#define PREFS_OPTION_SENDS_ALT "option_sends_alt" #define PREFS_FAKE_BUTTON2 "fake_button2" #define PREFS_FAKE_BUTTON3 "fake_button3" #define PREFS_APPKIT_MODIFIERS "appkit_modifiers" diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 54066404e..c9a0d669f 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -712,10 +712,13 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) { default:quartzEnableRootless]; quartzFullscreenMenu = [self prefs_get_boolean:@PREFS_FULLSCREEN_MENU default:quartzFullscreenMenu]; - quartzFullscreenDisableHotkeys = ![self prefs_get_boolean: - @PREFS_FULLSCREEN_HOTKEYS default:!quartzFullscreenDisableHotkeys]; + quartzFullscreenDisableHotkeys = ![self prefs_get_boolean:@PREFS_FULLSCREEN_HOTKEYS + default:!quartzFullscreenDisableHotkeys]; darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS default:darwinFakeButtons]; + quartzOptionSendsAlt = [self prefs_get_boolean:@PREFS_OPTION_SENDS_ALT + default:quartzOptionSendsAlt]; + if (darwinFakeButtons) { const char *fake2, *fake3; @@ -969,8 +972,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) { fprintf(stderr, "X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n"); #endif - memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap)); - if (!QuartzReadSystemKeymap(&keyInfo)) { + if (!QuartsResyncKeymap(FALSE)) { fprintf(stderr, "X11ApplicationMain: Could not build a valid keymap.\n"); } @@ -1229,17 +1231,10 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe if(key_layout != last_key_layout) { last_key_layout = key_layout; #endif - /* Update keyInfo */ - pthread_mutex_lock(&keyInfo_mutex); - memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap)); - if (!QuartzReadSystemKeymap(&keyInfo)) { + if (!QuartsResyncKeymap(TRUE)) { fprintf(stderr, "sendX11NSEvent: Could not build a valid keymap.\n"); } - pthread_mutex_unlock(&keyInfo_mutex); - - /* Tell server thread to deal with new keyInfo */ - DarwinSendDDXEvent(kXquartzReloadKeymap, 0); } } diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h index 9e16f75ce..65a09b8d5 100644 --- a/hw/xquartz/X11Controller.h +++ b/hw/xquartz/X11Controller.h @@ -55,10 +55,9 @@ typedef unsigned int NSUInteger; #endif #endif -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 -@interface X11Controller : NSObject <NSTableViewDataSource> -#else @interface X11Controller : NSObject +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 +<NSTableViewDataSource> #endif { IBOutlet NSPanel *prefs_panel; @@ -69,6 +68,7 @@ typedef unsigned int NSUInteger; IBOutlet NSButton *use_sysbeep; IBOutlet NSButton *enable_keyequivs; IBOutlet NSButton *sync_keymap; + IBOutlet NSButton *option_sends_alt; IBOutlet NSButton *click_through; IBOutlet NSButton *focus_follows_mouse; IBOutlet NSButton *focus_on_new_window; diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index b28f4d303..d66d039b0 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -43,6 +43,7 @@ #include "darwin.h" #include "darwinEvents.h" #include "quartz.h" +#include "quartzKeyboard.h" #include <X11/extensions/applewmconst.h> #include "applewmExt.h" @@ -630,49 +631,69 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row - (IBAction)prefs_changed:sender { - BOOL pbproxy_active; - - darwinFakeButtons = [fake_buttons intValue]; - quartzUseSysBeep = [use_sysbeep intValue]; - X11EnableKeyEquivalents = [enable_keyequivs intValue]; - darwinSyncKeymap = [sync_keymap intValue]; - quartzFullscreenMenu = [enable_fullscreen_menu intValue]; - - /* after adding prefs here, also add to [X11Application read_defaults] - and prefs_show */ - - [NSApp prefs_set_boolean:@PREFS_FAKEBUTTONS value:darwinFakeButtons]; - [NSApp prefs_set_boolean:@PREFS_SYSBEEP value:quartzUseSysBeep]; - [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:X11EnableKeyEquivalents]; - [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap]; - [NSApp prefs_set_boolean:@PREFS_FULLSCREEN_MENU value:quartzFullscreenMenu]; - [NSApp prefs_set_boolean:@PREFS_CLICK_THROUGH value:[click_through intValue]]; - [NSApp prefs_set_boolean:@PREFS_FFM value:[focus_follows_mouse intValue]]; - [NSApp prefs_set_boolean:@PREFS_FOCUS_ON_NEW_WINDOW value:[focus_on_new_window intValue]]; - [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]]; - [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]]; - [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]]; - - pbproxy_active = [sync_pasteboard intValue]; - - [NSApp prefs_set_boolean:@PREFS_SYNC_PB value:pbproxy_active]; - [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD value:[sync_pasteboard_to_clipboard intValue]]; - [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_PRIMARY value:[sync_pasteboard_to_primary intValue]]; - [NSApp prefs_set_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB value:[sync_clipboard_to_pasteboard intValue]]; - [NSApp prefs_set_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT value:[sync_primary_immediately intValue]]; + if(!sender) + return; + + if(sender == fake_buttons) { + darwinFakeButtons = [fake_buttons intValue]; + [NSApp prefs_set_boolean:@PREFS_FAKEBUTTONS value:darwinFakeButtons]; + } else if(sender == use_sysbeep) { + quartzUseSysBeep = [use_sysbeep intValue]; + [NSApp prefs_set_boolean:@PREFS_SYSBEEP value:quartzUseSysBeep]; + } else if(sender == enable_keyequivs) { + X11EnableKeyEquivalents = [enable_keyequivs intValue]; + [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:X11EnableKeyEquivalents]; + } else if(sender == sync_keymap) { + darwinSyncKeymap = [sync_keymap intValue]; + [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap]; + } else if(sender == enable_fullscreen_menu) { + quartzFullscreenMenu = [enable_fullscreen_menu intValue]; + [NSApp prefs_set_boolean:@PREFS_FULLSCREEN_MENU value:quartzFullscreenMenu]; + } else if(sender == option_sends_alt) { + BOOL prev_opt_sends_alt = quartzOptionSendsAlt; + + quartzOptionSendsAlt = [option_sends_alt intValue]; + [NSApp prefs_set_boolean:@PREFS_OPTION_SENDS_ALT value:quartzOptionSendsAlt]; + + if(prev_opt_sends_alt != quartzOptionSendsAlt) + QuartsResyncKeymap(TRUE); + } else if(sender == click_through) { + [NSApp prefs_set_boolean:@PREFS_CLICK_THROUGH value:[click_through intValue]]; + } else if(sender == focus_follows_mouse) { + [NSApp prefs_set_boolean:@PREFS_FFM value:[focus_follows_mouse intValue]]; + } else if(sender == focus_on_new_window) { + [NSApp prefs_set_boolean:@PREFS_FOCUS_ON_NEW_WINDOW value:[focus_on_new_window intValue]]; + } else if(sender == enable_auth) { + [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]]; + } else if(sender == enable_tcp) { + [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]]; + } else if(sender == depth) { + [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]]; + } else if(sender == sync_pasteboard) { + BOOL pbproxy_active = [sync_pasteboard intValue]; + [NSApp prefs_set_boolean:@PREFS_SYNC_PB value:pbproxy_active]; + + [sync_pasteboard_to_clipboard setEnabled:pbproxy_active]; + [sync_pasteboard_to_primary setEnabled:pbproxy_active]; + [sync_clipboard_to_pasteboard setEnabled:pbproxy_active]; + [sync_primary_immediately setEnabled:pbproxy_active]; + + // setEnabled doesn't do this... + [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]]; + [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]]; + } else if(sender == sync_pasteboard_to_clipboard) { + [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD value:[sync_pasteboard_to_clipboard intValue]]; + } else if(sender == sync_pasteboard_to_primary) { + [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_PRIMARY value:[sync_pasteboard_to_primary intValue]]; + } else if(sender == sync_clipboard_to_pasteboard) { + [NSApp prefs_set_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB value:[sync_clipboard_to_pasteboard intValue]]; + } else if(sender == sync_primary_immediately) { + [NSApp prefs_set_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT value:[sync_primary_immediately intValue]]; + } [NSApp prefs_synchronize]; - - [sync_pasteboard_to_clipboard setEnabled:pbproxy_active]; - [sync_pasteboard_to_primary setEnabled:pbproxy_active]; - [sync_clipboard_to_pasteboard setEnabled:pbproxy_active]; - [sync_primary_immediately setEnabled:pbproxy_active]; - - // setEnabled doesn't do this... - [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]]; - [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]]; - DarwinSendDDXEvent(kXquartzReloadPreferences, 0); + DarwinSendDDXEvent(kXquartzReloadPreferences, 0); } - (IBAction) prefs_show:sender @@ -683,6 +704,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row [use_sysbeep setIntValue:quartzUseSysBeep]; [enable_keyequivs setIntValue:X11EnableKeyEquivalents]; [sync_keymap setIntValue:darwinSyncKeymap]; + [option_sends_alt setIntValue:quartzOptionSendsAlt]; [click_through setIntValue:[NSApp prefs_get_boolean:@PREFS_CLICK_THROUGH default:NO]]; [focus_follows_mouse setIntValue:[NSApp prefs_get_boolean:@PREFS_FFM default:NO]]; [focus_on_new_window setIntValue:[NSApp prefs_get_boolean:@PREFS_FOCUS_ON_NEW_WINDOW default:YES]]; diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings Binary files differindex 40a843ee7..c36905cb1 100644 --- a/hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist b/hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist index edae5819d..4985b9029 100644 --- a/hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>nl</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib index 7d1eb9cc9..ec62e0293 100644 --- a/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">729</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">729</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -341,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -397,7 +386,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <nil key="NSNextResponder"/> @@ -438,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="544301944"> + <object class="NSCustomResource" key="NSNormalImage" id="803592898"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -521,7 +510,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -560,7 +549,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -599,7 +588,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -706,7 +695,6 @@ ZW4uCg</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -762,7 +750,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -784,7 +772,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -839,7 +827,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -877,7 +865,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -899,7 +887,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -921,7 +909,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -943,7 +931,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1013,7 +1001,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1051,7 +1039,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1089,7 +1077,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1140,7 +1128,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1162,7 +1150,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="544301944"/> + <reference key="NSNormalImage" ref="803592898"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1244,7 +1232,7 @@ ZW4uCg</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1257,7 +1245,7 @@ ZW4uCg</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1557,7 +1545,7 @@ ZW4uCg</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1980,14 +1968,6 @@ ZW4uCg</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2232,7 +2212,6 @@ ZW4uCg</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3037,11 +3016,6 @@ ZW4uCg</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3375,7 +3349,6 @@ ZW4uCg</string> <string>24.editorWindowContentRectSynchronizationRect</string> <string>244.IBEditorWindowLastContentRect</string> <string>244.IBPluginDependency</string> - <string>244.IBViewEditorWindowController.showingLayoutRectangles</string> <string>244.IBWindowTemplateEditedContentRect</string> <string>244.ImportedFromIB2</string> <string>244.editorWindowContentRectSynchronizationRect</string> @@ -3424,8 +3397,6 @@ ZW4uCg</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3460,27 +3431,19 @@ ZW4uCg</string> <string>300441.IBPluginDependency</string> <string>300447.IBPluginDependency</string> <string>300447.ImportedFromIB2</string> - <string>300447.object.labelIdentifier</string> <string>300450.IBPluginDependency</string> - <string>300450.object.labelIdentifier</string> <string>300451.IBPluginDependency</string> <string>300451.ImportedFromIB2</string> - <string>300451.object.labelIdentifier</string> <string>300452.IBPluginDependency</string> - <string>300452.object.labelIdentifier</string> <string>300453.IBPluginDependency</string> <string>300453.ImportedFromIB2</string> - <string>300453.object.labelIdentifier</string> <string>300454.IBPluginDependency</string> - <string>300454.object.labelIdentifier</string> <string>300455.IBPluginDependency</string> <string>300455.ImportedFromIB2</string> <string>300456.IBPluginDependency</string> <string>300457.IBPluginDependency</string> <string>300457.ImportedFromIB2</string> - <string>300457.object.labelIdentifier</string> <string>300458.IBPluginDependency</string> - <string>300458.object.labelIdentifier</string> <string>300459.IBPluginDependency</string> <string>300459.ImportedFromIB2</string> <string>300460.IBPluginDependency</string> @@ -3666,14 +3629,13 @@ ZW4uCg</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> - <string>{{437, 698}, {564, 308}}</string> + <string>{{437, 749}, {484, 308}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>{{437, 698}, {564, 308}}</string> + <string>{{437, 749}, {484, 308}}</string> <integer value="1"/> <string>{{184, 290}, {481, 345}}</string> <integer value="0"/> @@ -3730,8 +3692,6 @@ ZW4uCg</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3757,27 +3717,19 @@ ZW4uCg</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib Binary files differindex 9209e81fa..0e8eff5dd 100644 --- a/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib index 94d01047c..7609393ba 100644 --- a/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <data> - <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9L29</string> - <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.54</string> - <string key="IBDocument.HIToolboxVersion">353.00</string> - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> - <bool key="EncodedWithXMLCoder">YES</bool> + <int key="IBDocument.SystemTarget">1040</int> + <string key="IBDocument.SystemVersion">10D573</string> + <string key="IBDocument.InterfaceBuilderVersion">761</string> + <string key="IBDocument.AppKitVersion">1038.29</string> + <string key="IBDocument.HIToolboxVersion">460.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="NS.object.0">761</string> </object> - <object class="NSArray" key="IBDocument.PluginDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/> + <array key="IBDocument.PluginDependencies"> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - </object> - <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <object class="NSMutableArray" key="IBDocument.RootObjects" id="904585544"> - <bool key="EncodedWithXMLCoder">YES</bool> + </array> + <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/> + <array class="NSMutableArray" key="IBDocument.RootObjects" id="904585544"> <object class="NSCustomObject" id="815810918"> <object class="NSMutableString" key="NSClassName"> <characters key="NS.bytes">NSApplication</characters> @@ -37,8 +29,7 @@ </object> <object class="NSMenu" id="524015605"> <string key="NSTitle">MainMenu</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSMenuItems"> <object class="NSMenuItem" id="365880285"> <reference key="NSMenu" ref="524015605"/> <string key="NSTitle">X11</string> @@ -56,8 +47,7 @@ <string key="NSAction">submenuAction:</string> <object class="NSMenu" key="NSSubmenu" id="576521955"> <string key="NSTitle">X11</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSMenuItems"> <object class="NSMenuItem" id="139290918"> <reference key="NSMenu" ref="576521955"/> <string key="NSTitle">About X11</string> @@ -99,9 +89,7 @@ <object class="NSMutableString" key="NSTitle"> <characters key="NS.bytes">Services</characters> </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <array class="NSMutableArray" key="NSMenuItems"/> <string key="NSName">_NSServicesMenu</string> </object> </object> @@ -185,7 +173,7 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - </object> + </array> <string key="NSName">_NSAppleMenu</string> </object> </object> @@ -200,8 +188,7 @@ <string key="NSAction">submenuAction:</string> <object class="NSMenu" key="NSSubmenu" id="981161348"> <string key="NSTitle">Applications</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSMenuItems"> <object class="NSMenuItem" id="390088328"> <reference key="NSMenu" ref="981161348"/> <bool key="NSIsDisabled">YES</bool> @@ -222,7 +209,7 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - </object> + </array> </object> </object> <object class="NSMenuItem" id="200491363"> @@ -236,8 +223,7 @@ <string key="NSAction">submenuAction:</string> <object class="NSMenu" key="NSSubmenu" id="526778998"> <string key="NSTitle">Edit</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSMenuItems"> <object class="NSMenuItem" id="185296989"> <reference key="NSMenu" ref="526778998"/> <string key="NSTitle">Copy</string> @@ -247,7 +233,7 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - </object> + </array> </object> </object> <object class="NSMenuItem" id="931553638"> @@ -263,8 +249,7 @@ <object class="NSMutableString" key="NSTitle"> <characters key="NS.bytes">Window</characters> </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSMenuItems"> <object class="NSMenuItem" id="984461797"> <reference key="NSMenu" ref="96874957"/> <string key="NSTitle">Close</string> @@ -341,7 +326,7 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - </object> + </array> <string key="NSName">_NSWindowsMenu</string> </object> </object> @@ -356,8 +341,7 @@ <string key="NSAction">submenuAction:</string> <object class="NSMenu" key="NSSubmenu" id="511848303"> <string key="NSTitle">Help</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSMenuItems"> <object class="NSMenuItem" id="504984881"> <reference key="NSMenu" ref="511848303"/> <string key="NSTitle">X11 Help</string> @@ -367,10 +351,10 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - </object> + </array> </object> </object> - </object> + </array> <string key="NSName">_NSMainMenu</string> </object> <object class="NSCustomObject" id="485884620"> @@ -386,20 +370,19 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSTabView" id="448510093"> <reference key="NSNextResponder" ref="941366957"/> <int key="NSvFlags">256</int> <string key="NSFrame">{{13, 10}, {458, 292}}</string> <reference key="NSSuperview" ref="941366957"/> - <object class="NSMutableArray" key="NSTabViewItems"> - <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="NSWindow"/> + <array class="NSMutableArray" key="NSTabViewItems"> <object class="NSTabViewItem" id="287591690"> <object class="NSMutableString" key="NSIdentifier"> <characters key="NS.bytes">1</characters> @@ -407,13 +390,13 @@ <object class="NSView" key="NSView" id="596750588"> <reference key="NSNextResponder" ref="448510093"/> <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSButton" id="119157981"> <reference key="NSNextResponder" ref="596750588"/> <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 210}, {402, 18}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="990762273"> <int key="NSCellFlags">67239424</int> @@ -421,7 +404,7 @@ <string key="NSContents">Emulate three button mouse</string> <object class="NSFont" key="NSSupport" id="463863101"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> + <double key="NSSize">13</double> <int key="NSfFlags">1044</int> </object> <reference key="NSControlView" ref="119157981"/> @@ -441,6 +424,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 60}, {385, 31}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="391919450"> <int key="NSCellFlags">67239424</int> @@ -448,7 +432,7 @@ <string key="NSContents">When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier.</string> <object class="NSFont" key="NSSupport" id="26"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.100000e+01</double> + <double key="NSSize">11</double> <int key="NSfFlags">3100</int> </object> <reference key="NSControlView" ref="443008216"/> @@ -458,7 +442,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor" id="590688762"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> <object class="NSColor" key="NSTextColor" id="930815747"> @@ -477,6 +461,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 162}, {385, 42}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="649334366"> <int key="NSCellFlags">67239424</int> @@ -494,6 +479,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 97}, {402, 18}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="940564599"> <int key="NSCellFlags">67239424</int> @@ -515,6 +501,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 126}, {385, 14}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="666057093"> <int key="NSCellFlags">67239424</int> @@ -531,6 +518,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 146}, {402, 18}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="967619578"> <int key="NSCellFlags">67239424</int> @@ -547,9 +535,49 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <int key="NSPeriodicInterval">25</int> </object> </object> - </object> + <object class="NSTextField" id="278155937"> + <reference key="NSNextResponder" ref="596750588"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{36, -1}, {385, 31}}</string> + <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="617441821"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">4194304</int> + <string key="NSContents">When enabled, the option keys send Alt_L and Alt_R X11 key symbols instead of Mode_switch.</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="278155937"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSButton" id="406291430"> + <reference key="NSNextResponder" ref="596750588"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{18, 36}, {402, 18}}</string> + <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="67728988"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Option keys send Alt_L and Alt_R</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="406291430"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </array> <string key="NSFrame">{{10, 33}, {438, 246}}</string> <reference key="NSSuperview" ref="448510093"/> + <reference key="NSWindow"/> </object> <string key="NSLabel">Input</string> <reference key="NSColor" ref="57160303"/> @@ -562,8 +590,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <object class="NSView" key="NSView" id="515308735"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSButton" id="418227126"> <reference key="NSNextResponder" ref="515308735"/> <int key="NSvFlags">256</int> @@ -616,7 +643,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <int key="NSButtonFlags2">1</int> <object class="NSFont" key="NSAlternateImage"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> + <double key="NSSize">13</double> <int key="NSfFlags">16</int> </object> <object class="NSMutableString" key="NSAlternateContents"> @@ -645,8 +672,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <object class="NSMutableString" key="NSTitle"> <characters key="NS.bytes">OtherViews</characters> </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSMenuItems"> <reference ref="616492372"/> <object class="NSMenuItem" id="759499526"> <reference key="NSMenu" ref="341113515"/> @@ -684,7 +710,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <int key="NSTag">24</int> <reference key="NSTarget" ref="633115429"/> </object> - </object> + </array> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -701,7 +727,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <object class="NSTextFieldCell" key="NSCell" id="930265681"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string type="base64-UTF8" key="NSContents">Q29sb3JzOgo</string> + <string key="NSContents">Colors:</string> <reference key="NSSupport" ref="463863101"/> <reference key="NSControlView" ref="201731424"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -782,7 +808,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <reference key="NSTextColor" ref="930815747"/> </object> </object> - </object> + </array> <string key="NSFrame">{{10, 33}, {438, 246}}</string> </object> <string key="NSLabel">Output</string> @@ -796,8 +822,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <object class="NSView" key="NSView" id="408298283"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSButton" id="878106058"> <reference key="NSNextResponder" ref="408298283"/> <int key="NSvFlags">256</int> @@ -828,9 +853,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string> <object class="NSTextFieldCell" key="NSCell" id="572508492"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string type="base64-UTF8" key="NSContents">RW5hYmxlcyB0aGUgImNvcHkiIG1lbnUgaXRlbSBhbmQgYWxsb3dzIGZvciBzeW5jaW5nIGJldHdlZW4g -dGhlIE9TWCBQYXN0ZWJvYXJkIGFuZCB0aGUgWDExIENMSVBCT0FSRCBhbmQgUFJJTUFSWSBidWZmZXJz -Lg</string> + <string key="NSContents">Enables the "copy" menu item and allows for syncing between the OSX Pasteboard and the X11 CLIPBOARD and PRIMARY buffers.</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="386152084"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -953,7 +976,7 @@ Lg</string> <reference key="NSTextColor" ref="930815747"/> </object> </object> - </object> + </array> <string key="NSFrame">{{10, 33}, {438, 246}}</string> </object> <string key="NSLabel">Pasteboard</string> @@ -967,8 +990,7 @@ Lg</string> <object class="NSView" key="NSView" id="184765684"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSButton" id="657659108"> <reference key="NSNextResponder" ref="184765684"/> <int key="NSvFlags">256</int> @@ -1080,7 +1102,7 @@ Lg</string> <reference key="NSTextColor" ref="930815747"/> </object> </object> - </object> + </array> <string key="NSFrame">{{10, 33}, {438, 246}}</string> </object> <string key="NSLabel">Windows</string> @@ -1091,8 +1113,7 @@ Lg</string> <object class="NSView" key="NSView" id="300811574"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSButton" id="989050925"> <reference key="NSNextResponder" ref="300811574"/> <int key="NSvFlags">256</int> @@ -1144,9 +1165,7 @@ Lg</string> <object class="NSTextFieldCell" key="NSCell" id="53243865"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string type="base64-UTF8" key="NSContents">TGF1bmNoaW5nIFgxMSB3aWxsIGNyZWF0ZSBYYXV0aG9yaXR5IGFjY2Vzcy1jb250cm9sIGtleXMuIElm -IHRoZSBzeXN0ZW0ncyBJUCBhZGRyZXNzIGNoYW5nZXMsIHRoZXNlIGtleXMgYmVjb21lIGludmFsaWQg -d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> + <string key="NSContents">Launching X11 will create Xauthority access-control keys. If the system's IP address changes, these keys become invalid which may prevent X11 applications from launching.</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="168436707"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -1185,30 +1204,31 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <reference key="NSTextColor" ref="930815747"/> </object> </object> - </object> + </array> <string key="NSFrame">{{10, 33}, {438, 246}}</string> </object> <string key="NSLabel">Security</string> <reference key="NSColor" ref="57160303"/> <reference key="NSTabView" ref="448510093"/> </object> - </object> + </array> <reference key="NSSelectedTabViewItem" ref="287591690"/> <reference key="NSFont" ref="463863101"/> <int key="NSTvFlags">0</int> <bool key="NSAllowTruncatedLabels">YES</bool> <bool key="NSDrawsBackground">YES</bool> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <reference ref="596750588"/> - </object> + </array> </object> - </object> + </array> <string key="NSFrameSize">{484, 308}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1221,13 +1241,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSButton" id="671954382"> <reference key="NSNextResponder" ref="85544634"/> <int key="NSvFlags">265</int> @@ -1244,7 +1263,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <int key="NSButtonFlags2">1</int> <object class="NSFont" key="NSAlternateImage" id="549406736"> <string key="NSName">Helvetica</string> - <double key="NSSize">1.300000e+01</double> + <double key="NSSize">13</double> <int key="NSfFlags">16</int> </object> <object class="NSMutableString" key="NSAlternateContents"> @@ -1285,13 +1304,11 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="NSScrollView" id="1063387772"> <reference key="NSNextResponder" ref="85544634"/> <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSClipView" id="580565898"> <reference key="NSNextResponder" ref="1063387772"/> <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSTableView" id="905092943"> <reference key="NSNextResponder" ref="580565898"/> <int key="NSvFlags">256</int> @@ -1311,15 +1328,14 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <string key="NSFrame">{{302, 0}, {16, 17}}</string> <reference key="NSSuperview" ref="1063387772"/> </object> - <object class="NSMutableArray" key="NSTableColumns"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSTableColumns"> <object class="NSTableColumn" id="938444323"> - <double key="NSWidth">1.217310e+02</double> - <double key="NSMinWidth">6.273100e+01</double> - <double key="NSMaxWidth">1.000000e+03</double> + <double key="NSWidth">121.73099999999999</double> + <double key="NSMinWidth">62.731000000000002</double> + <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">75628032</int> - <int key="NSCellFlags2">0</int> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">2048</int> <string key="NSContents">Name</string> <reference key="NSSupport" ref="26"/> <object class="NSColor" key="NSBackgroundColor" id="113872566"> @@ -1351,12 +1367,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <reference key="NSTableView" ref="905092943"/> </object> <object class="NSTableColumn" id="84282687"> - <double key="NSWidth">9.900000e+01</double> - <double key="NSMinWidth">4.000000e+01</double> - <double key="NSMaxWidth">1.000000e+03</double> + <double key="NSWidth">99</double> + <double key="NSMinWidth">40</double> + <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">75628032</int> - <int key="NSCellFlags2">0</int> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">2048</int> <string key="NSContents">Command</string> <reference key="NSSupport" ref="26"/> <reference key="NSBackgroundColor" ref="113872566"/> @@ -1377,12 +1393,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <reference key="NSTableView" ref="905092943"/> </object> <object class="NSTableColumn" id="242608782"> - <double key="NSWidth">7.100000e+01</double> - <double key="NSMinWidth">1.000000e+01</double> - <double key="NSMaxWidth">1.000000e+03</double> + <double key="NSWidth">71</double> + <double key="NSMinWidth">10</double> + <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">2048</int> <string key="NSContents">Shortcut</string> <reference key="NSSupport" ref="26"/> <object class="NSColor" key="NSBackgroundColor"> @@ -1399,7 +1415,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <string key="NSContents">Text Cell</string> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.200000e+01</double> + <double key="NSSize">12</double> <int key="NSfFlags">16</int> </object> <reference key="NSControlView" ref="905092943"/> @@ -1417,9 +1433,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <bool key="NSIsEditable">YES</bool> <reference key="NSTableView" ref="905092943"/> </object> - </object> - <double key="NSIntercellSpacingWidth">3.000000e+00</double> - <double key="NSIntercellSpacingHeight">2.000000e+00</double> + </array> + <double key="NSIntercellSpacingWidth">3</double> + <double key="NSIntercellSpacingHeight">2</double> <reference key="NSBackgroundColor" ref="822946413"/> <object class="NSColor" key="NSGridColor"> <int key="NSColorSpace">6</int> @@ -1430,14 +1446,17 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <bytes key="NSWhite">MC41AA</bytes> </object> </object> - <double key="NSRowHeight">1.700000e+01</double> + <double key="NSRowHeight">17</double> <int key="NSTvFlags">1379958784</int> + <reference key="NSDelegate"/> + <reference key="NSDataSource"/> <int key="NSColumnAutoresizingStyle">1</int> <int key="NSDraggingSourceMaskForLocal">-1</int> <int key="NSDraggingSourceMaskForNonLocal">0</int> <bool key="NSAllowsTypeSelect">YES</bool> + <int key="NSTableViewDraggingDestinationStyle">0</int> </object> - </object> + </array> <string key="NSFrame">{{1, 17}, {301, 198}}</string> <reference key="NSSuperview" ref="1063387772"/> <reference key="NSNextKeyView" ref="905092943"/> @@ -1452,7 +1471,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <reference key="NSSuperview" ref="1063387772"/> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">9.949238e-01</double> + <double key="NSPercent">0.99492380000000002</double> </object> <object class="NSScroller" id="17278747"> <reference key="NSNextResponder" ref="1063387772"/> @@ -1462,15 +1481,14 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">6.885246e-01</double> + <double key="NSPercent">0.68852460000000004</double> </object> <object class="NSClipView" id="672307654"> <reference key="NSNextResponder" ref="1063387772"/> <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <reference ref="792419186"/> - </object> + </array> <string key="NSFrame">{{1, 0}, {301, 17}}</string> <reference key="NSSuperview" ref="1063387772"/> <reference key="NSNextKeyView" ref="792419186"/> @@ -1479,7 +1497,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <int key="NScvFlags">4</int> </object> <reference ref="898633680"/> - </object> + </array> <string key="NSFrame">{{20, 20}, {318, 231}}</string> <reference key="NSSuperview" ref="85544634"/> <reference key="NSNextKeyView" ref="580565898"/> @@ -1488,7 +1506,6 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <reference key="NSHScroller" ref="17278747"/> <reference key="NSContentView" ref="580565898"/> <reference key="NSHeaderClipView" ref="672307654"/> - <reference key="NSCornerView" ref="898633680"/> <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> </object> <object class="NSButton" id="758204686"> @@ -1516,18 +1533,17 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <int key="NSPeriodicInterval">25</int> </object> </object> - </object> + </array> <string key="NSFrameSize">{454, 271}</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> <string key="NSTitle">Menu</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSMenuItems"> <object class="NSMenuItem" id="318286212"> <reference key="NSMenu" ref="294137138"/> <bool key="NSIsDisabled">YES</bool> @@ -1550,8 +1566,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <string key="NSAction">submenuAction:</string> <object class="NSMenu" key="NSSubmenu" id="48278059"> <string key="NSTitle">Applications</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSMenuItems"> <object class="NSMenuItem" id="563798000"> <reference key="NSMenu" ref="48278059"/> <bool key="NSIsDisabled">YES</bool> @@ -1565,23 +1580,22 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> </object> <object class="NSMenuItem" id="1032342329"> <reference key="NSMenu" ref="48278059"/> - <string type="base64-UTF8" key="NSTitle">Q3VzdG9taXpl4oCmA</string> + <string key="NSTitle">Customize…</string> <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - </object> + </array> </object> </object> - </object> + </array> <string key="NSName"/> </object> - </object> + </array> <object class="IBObjectContainer" key="IBDocument.Objects"> - <object class="NSMutableArray" key="connectionRecords"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="connectionRecords"> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">copy:</string> @@ -2126,64 +2140,74 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> </object> <int key="connectionID">300475</int> </object> - </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="406291430"/> + </object> + <int key="connectionID">300480</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">option_sends_alt</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="406291430"/> + </object> + <int key="connectionID">300481</int> + </object> + </array> <object class="IBMutableOrderedSet" key="objectRecords"> - <object class="NSArray" key="orderedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array key="orderedObjects"> <object class="IBObjectRecord"> <int key="objectID">0</int> - <object class="NSArray" key="object" id="330408435"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <array key="object" id="0"/> <reference key="children" ref="904585544"/> <nil key="parent"/> </object> <object class="IBObjectRecord"> <int key="objectID">-2</int> <reference key="object" ref="815810918"/> - <reference key="parent" ref="330408435"/> - <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> </object> <object class="IBObjectRecord"> <int key="objectID">-1</int> <reference key="object" ref="941939442"/> - <reference key="parent" ref="330408435"/> + <reference key="parent" ref="0"/> <string key="objectName">First Responder</string> </object> <object class="IBObjectRecord"> <int key="objectID">-3</int> <reference key="object" ref="951368722"/> - <reference key="parent" ref="330408435"/> + <reference key="parent" ref="0"/> <string key="objectName">Application</string> </object> <object class="IBObjectRecord"> <int key="objectID">29</int> <reference key="object" ref="524015605"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="931553638"/> <reference ref="365880285"/> <reference ref="200491363"/> <reference ref="868031522"/> <reference ref="551174276"/> - </object> - <reference key="parent" ref="330408435"/> + </array> + <reference key="parent" ref="0"/> <string key="objectName">MainMenu</string> </object> <object class="IBObjectRecord"> <int key="objectID">19</int> <reference key="object" ref="931553638"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="96874957"/> - </object> + </array> <reference key="parent" ref="524015605"/> </object> <object class="IBObjectRecord"> <int key="objectID">24</int> <reference key="object" ref="96874957"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="677652931"/> <reference ref="276216762"/> <reference ref="1066447520"/> @@ -2192,7 +2216,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <reference ref="155085383"/> <reference ref="984461797"/> <reference ref="280172320"/> - </object> + </array> <reference key="parent" ref="931553638"/> </object> <object class="IBObjectRecord"> @@ -2238,17 +2262,15 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">56</int> <reference key="object" ref="365880285"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="576521955"/> - </object> + </array> <reference key="parent" ref="524015605"/> </object> <object class="IBObjectRecord"> <int key="objectID">57</int> <reference key="object" ref="576521955"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="139290918"/> <reference ref="386173216"/> <reference ref="32285361"/> @@ -2261,7 +2283,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <reference ref="1023546148"/> <reference ref="6876565"/> <reference ref="479677589"/> - </object> + </array> <reference key="parent" ref="365880285"/> </object> <object class="IBObjectRecord"> @@ -2277,10 +2299,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">131</int> <reference key="object" ref="32285361"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="821388474"/> - </object> + </array> <reference key="parent" ref="576521955"/> </object> <object class="IBObjectRecord"> @@ -2336,19 +2357,17 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">163</int> <reference key="object" ref="200491363"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="526778998"/> - </object> + </array> <reference key="parent" ref="524015605"/> </object> <object class="IBObjectRecord"> <int key="objectID">169</int> <reference key="object" ref="526778998"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="185296989"/> - </object> + </array> <reference key="parent" ref="200491363"/> </object> <object class="IBObjectRecord"> @@ -2359,20 +2378,18 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">269</int> <reference key="object" ref="868031522"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="981161348"/> - </object> + </array> <reference key="parent" ref="524015605"/> </object> <object class="IBObjectRecord"> <int key="objectID">270</int> <reference key="object" ref="981161348"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="390088328"/> <reference ref="1065386165"/> - </object> + </array> <reference key="parent" ref="868031522"/> </object> <object class="IBObjectRecord"> @@ -2388,19 +2405,17 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">419</int> <reference key="object" ref="551174276"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="511848303"/> - </object> + </array> <reference key="parent" ref="524015605"/> </object> <object class="IBObjectRecord"> <int key="objectID">420</int> <reference key="object" ref="511848303"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="504984881"/> - </object> + </array> <reference key="parent" ref="551174276"/> </object> <object class="IBObjectRecord"> @@ -2411,132 +2426,121 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">196</int> <reference key="object" ref="485884620"/> - <reference key="parent" ref="330408435"/> + <reference key="parent" ref="0"/> <string key="objectName">X11Controller</string> </object> <object class="IBObjectRecord"> <int key="objectID">244</int> <reference key="object" ref="124913468"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="941366957"/> - </object> - <reference key="parent" ref="330408435"/> + </array> + <reference key="parent" ref="0"/> <string key="objectName">PrefsPanel</string> </object> <object class="IBObjectRecord"> <int key="objectID">245</int> <reference key="object" ref="941366957"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="448510093"/> - </object> + </array> <reference key="parent" ref="124913468"/> </object> <object class="IBObjectRecord"> <int key="objectID">348</int> <reference key="object" ref="448510093"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="287591690"/> <reference ref="960678392"/> <reference ref="348328898"/> <reference ref="10973343"/> <reference ref="723450037"/> - </object> + </array> <reference key="parent" ref="941366957"/> </object> <object class="IBObjectRecord"> <int key="objectID">349</int> <reference key="object" ref="287591690"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="596750588"/> - </object> + </array> <reference key="parent" ref="448510093"/> </object> <object class="IBObjectRecord"> <int key="objectID">351</int> <reference key="object" ref="596750588"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="119157981"/> <reference ref="443008216"/> <reference ref="282885445"/> <reference ref="842100515"/> <reference ref="31160162"/> <reference ref="179949713"/> - </object> + <reference ref="278155937"/> + <reference ref="406291430"/> + </array> <reference key="parent" ref="287591690"/> </object> <object class="IBObjectRecord"> <int key="objectID">363</int> <reference key="object" ref="119157981"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="990762273"/> - </object> + </array> <reference key="parent" ref="596750588"/> </object> <object class="IBObjectRecord"> <int key="objectID">364</int> <reference key="object" ref="443008216"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="391919450"/> - </object> + </array> <reference key="parent" ref="596750588"/> </object> <object class="IBObjectRecord"> <int key="objectID">365</int> <reference key="object" ref="282885445"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="649334366"/> - </object> + </array> <reference key="parent" ref="596750588"/> </object> <object class="IBObjectRecord"> <int key="objectID">368</int> <reference key="object" ref="842100515"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="940564599"/> - </object> + </array> <reference key="parent" ref="596750588"/> </object> <object class="IBObjectRecord"> <int key="objectID">369</int> <reference key="object" ref="31160162"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="666057093"/> - </object> + </array> <reference key="parent" ref="596750588"/> </object> <object class="IBObjectRecord"> <int key="objectID">370</int> <reference key="object" ref="179949713"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="967619578"/> - </object> + </array> <reference key="parent" ref="596750588"/> </object> <object class="IBObjectRecord"> <int key="objectID">352</int> <reference key="object" ref="960678392"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="515308735"/> - </object> + </array> <reference key="parent" ref="448510093"/> </object> <object class="IBObjectRecord"> <int key="objectID">350</int> <reference key="object" ref="515308735"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="709074847"/> <reference ref="201731424"/> <reference ref="86150604"/> @@ -2545,170 +2549,153 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <reference ref="298603383"/> <reference ref="418227126"/> <reference ref="1039016593"/> - </object> + </array> <reference key="parent" ref="960678392"/> </object> <object class="IBObjectRecord"> <int key="objectID">371</int> <reference key="object" ref="418227126"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="1016069354"/> - </object> + </array> <reference key="parent" ref="515308735"/> </object> <object class="IBObjectRecord"> <int key="objectID">372</int> <reference key="object" ref="1039016593"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="624655599"/> - </object> + </array> <reference key="parent" ref="515308735"/> </object> <object class="IBObjectRecord"> <int key="objectID">382</int> <reference key="object" ref="709074847"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="633115429"/> - </object> + </array> <reference key="parent" ref="515308735"/> </object> <object class="IBObjectRecord"> <int key="objectID">385</int> <reference key="object" ref="201731424"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="930265681"/> - </object> + </array> <reference key="parent" ref="515308735"/> </object> <object class="IBObjectRecord"> <int key="objectID">386</int> <reference key="object" ref="86150604"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="311969422"/> - </object> + </array> <reference key="parent" ref="515308735"/> </object> <object class="IBObjectRecord"> <int key="objectID">541</int> <reference key="object" ref="477203622"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="631531164"/> - </object> + </array> <reference key="parent" ref="515308735"/> </object> <object class="IBObjectRecord"> <int key="objectID">543</int> <reference key="object" ref="298603383"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="761107402"/> - </object> + </array> <reference key="parent" ref="515308735"/> </object> <object class="IBObjectRecord"> <int key="objectID">353</int> <reference key="object" ref="348328898"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="300811574"/> - </object> + </array> <reference key="parent" ref="448510093"/> </object> <object class="IBObjectRecord"> <int key="objectID">354</int> <reference key="object" ref="300811574"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="989050925"/> <reference ref="700826966"/> <reference ref="168436707"/> <reference ref="363817195"/> <reference ref="223835729"/> - </object> + </array> <reference key="parent" ref="348328898"/> </object> <object class="IBObjectRecord"> <int key="objectID">374</int> <reference key="object" ref="989050925"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="189594322"/> - </object> + </array> <reference key="parent" ref="300811574"/> </object> <object class="IBObjectRecord"> <int key="objectID">375</int> <reference key="object" ref="700826966"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="489340979"/> - </object> + </array> <reference key="parent" ref="300811574"/> </object> <object class="IBObjectRecord"> <int key="objectID">376</int> <reference key="object" ref="168436707"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="53243865"/> - </object> + </array> <reference key="parent" ref="300811574"/> </object> <object class="IBObjectRecord"> <int key="objectID">377</int> <reference key="object" ref="363817195"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="390084685"/> - </object> + </array> <reference key="parent" ref="300811574"/> </object> <object class="IBObjectRecord"> <int key="objectID">379</int> <reference key="object" ref="223835729"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="283628678"/> - </object> + </array> <reference key="parent" ref="300811574"/> </object> <object class="IBObjectRecord"> <int key="objectID">285</int> <reference key="object" ref="604417141"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="85544634"/> - </object> - <reference key="parent" ref="330408435"/> + </array> + <reference key="parent" ref="0"/> <string key="objectName">EditPrograms</string> </object> <object class="IBObjectRecord"> <int key="objectID">286</int> <reference key="object" ref="85544634"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="1063387772"/> <reference ref="758204686"/> <reference ref="671954382"/> <reference ref="492358940"/> - </object> + </array> <reference key="parent" ref="604417141"/> </object> <object class="IBObjectRecord"> <int key="objectID">423</int> <reference key="object" ref="294137138"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="318286212"/> <reference ref="511651072"/> - </object> - <reference key="parent" ref="330408435"/> + </array> + <reference key="parent" ref="0"/> <string key="objectName">DockMenu</string> </object> <object class="IBObjectRecord"> @@ -2719,20 +2706,18 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">526</int> <reference key="object" ref="511651072"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="48278059"/> - </object> + </array> <reference key="parent" ref="294137138"/> </object> <object class="IBObjectRecord"> <int key="objectID">527</int> <reference key="object" ref="48278059"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="1032342329"/> <reference ref="563798000"/> - </object> + </array> <reference key="parent" ref="511651072"/> </object> <object class="IBObjectRecord"> @@ -2788,10 +2773,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">100382</int> <reference key="object" ref="633115429"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="341113515"/> - </object> + </array> <reference key="parent" ref="709074847"/> </object> <object class="IBObjectRecord"> @@ -2842,13 +2826,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">380</int> <reference key="object" ref="341113515"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="759499526"/> <reference ref="616492372"/> <reference ref="543935434"/> <reference ref="836673018"/> - </object> + </array> <reference key="parent" ref="633115429"/> </object> <object class="IBObjectRecord"> @@ -2874,13 +2857,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">295</int> <reference key="object" ref="1063387772"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="792419186"/> <reference ref="17278747"/> <reference ref="842897584"/> <reference ref="905092943"/> - </object> + </array> <reference key="parent" ref="85544634"/> </object> <object class="IBObjectRecord"> @@ -2901,21 +2883,19 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">296</int> <reference key="object" ref="905092943"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="242608782"/> <reference ref="938444323"/> <reference ref="84282687"/> - </object> + </array> <reference key="parent" ref="1063387772"/> </object> <object class="IBObjectRecord"> <int key="objectID">535</int> <reference key="object" ref="242608782"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="34714764"/> - </object> + </array> <reference key="parent" ref="905092943"/> </object> <object class="IBObjectRecord"> @@ -2926,10 +2906,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">298</int> <reference key="object" ref="938444323"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="825378892"/> - </object> + </array> <reference key="parent" ref="905092943"/> </object> <object class="IBObjectRecord"> @@ -2940,10 +2919,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">297</int> <reference key="object" ref="84282687"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="432610585"/> - </object> + </array> <reference key="parent" ref="905092943"/> </object> <object class="IBObjectRecord"> @@ -2954,10 +2932,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">310</int> <reference key="object" ref="758204686"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="1025474039"/> - </object> + </array> <reference key="parent" ref="85544634"/> </object> <object class="IBObjectRecord"> @@ -2968,10 +2945,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">292</int> <reference key="object" ref="671954382"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="143554520"/> - </object> + </array> <reference key="parent" ref="85544634"/> </object> <object class="IBObjectRecord"> @@ -2982,10 +2958,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">293</int> <reference key="object" ref="492358940"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="8201128"/> - </object> + </array> <reference key="parent" ref="85544634"/> </object> <object class="IBObjectRecord"> @@ -2996,42 +2971,38 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="184765684"/> - </object> + </array> <reference key="parent" ref="448510093"/> </object> <object class="IBObjectRecord"> <int key="objectID">300338</int> <reference key="object" ref="184765684"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="657659108"/> <reference ref="290578835"/> <reference ref="992839333"/> <reference ref="138261120"/> <reference ref="128352289"/> <reference ref="57161931"/> - </object> + </array> <reference key="parent" ref="10973343"/> </object> <object class="IBObjectRecord"> <int key="objectID">300358</int> <reference key="object" ref="290578835"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="399127858"/> - </object> + </array> <reference key="parent" ref="184765684"/> </object> <object class="IBObjectRecord"> <int key="objectID">300359</int> <reference key="object" ref="657659108"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="259618205"/> - </object> + </array> <reference key="parent" ref="184765684"/> </object> <object class="IBObjectRecord"> @@ -3047,10 +3018,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300362</int> <reference key="object" ref="992839333"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="959555182"/> - </object> + </array> <reference key="parent" ref="184765684"/> </object> <object class="IBObjectRecord"> @@ -3061,10 +3031,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300364</int> <reference key="object" ref="138261120"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="183409141"/> - </object> + </array> <reference key="parent" ref="184765684"/> </object> <object class="IBObjectRecord"> @@ -3075,10 +3044,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300368</int> <reference key="object" ref="128352289"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="556463187"/> - </object> + </array> <reference key="parent" ref="184765684"/> </object> <object class="IBObjectRecord"> @@ -3089,10 +3057,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300370</int> <reference key="object" ref="57161931"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="989804990"/> - </object> + </array> <reference key="parent" ref="184765684"/> </object> <object class="IBObjectRecord"> @@ -3103,17 +3070,15 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300421</int> <reference key="object" ref="723450037"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="408298283"/> - </object> + </array> <reference key="parent" ref="448510093"/> </object> <object class="IBObjectRecord"> <int key="objectID">300422</int> <reference key="object" ref="408298283"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="878106058"/> <reference ref="386152084"/> <reference ref="487809555"/> @@ -3122,25 +3087,23 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <reference ref="765780304"/> <reference ref="1002778833"/> <reference ref="522511724"/> - </object> + </array> <reference key="parent" ref="723450037"/> </object> <object class="IBObjectRecord"> <int key="objectID">300423</int> <reference key="object" ref="386152084"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="572508492"/> - </object> + </array> <reference key="parent" ref="408298283"/> </object> <object class="IBObjectRecord"> <int key="objectID">300424</int> <reference key="object" ref="878106058"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="718083688"/> - </object> + </array> <reference key="parent" ref="408298283"/> </object> <object class="IBObjectRecord"> @@ -3156,10 +3119,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300447</int> <reference key="object" ref="477050998"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="501304422"/> - </object> + </array> <reference key="parent" ref="408298283"/> </object> <object class="IBObjectRecord"> @@ -3170,10 +3132,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300451</int> <reference key="object" ref="765780304"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="510771323"/> - </object> + </array> <reference key="parent" ref="408298283"/> </object> <object class="IBObjectRecord"> @@ -3184,10 +3145,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300453</int> <reference key="object" ref="487809555"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="619977658"/> - </object> + </array> <reference key="parent" ref="408298283"/> </object> <object class="IBObjectRecord"> @@ -3198,10 +3158,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300455</int> <reference key="object" ref="620944856"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="461823902"/> - </object> + </array> <reference key="parent" ref="408298283"/> </object> <object class="IBObjectRecord"> @@ -3212,10 +3171,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300457</int> <reference key="object" ref="1002778833"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="897099877"/> - </object> + </array> <reference key="parent" ref="408298283"/> </object> <object class="IBObjectRecord"> @@ -3226,10 +3184,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300459</int> <reference key="object" ref="522511724"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="994587858"/> - </object> + </array> <reference key="parent" ref="408298283"/> </object> <object class="IBObjectRecord"> @@ -3240,10 +3197,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <object class="IBObjectRecord"> <int key="objectID">300472</int> <reference key="object" ref="57246850"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="917248662"/> - </object> + </array> <reference key="parent" ref="515308735"/> </object> <object class="IBObjectRecord"> @@ -3251,610 +3207,333 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <reference key="object" ref="917248662"/> <reference key="parent" ref="57246850"/> </object> - </object> - </object> - <object class="NSMutableDictionary" key="flattenedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>-1.IBPluginDependency</string> - <string>-2.IBPluginDependency</string> - <string>-3.IBPluginDependency</string> - <string>-3.ImportedFromIB2</string> - <string>100292.IBPluginDependency</string> - <string>100293.IBPluginDependency</string> - <string>100295.IBPluginDependency</string> - <string>100295.IBShouldRemoveOnLegacySave</string> - <string>100310.IBPluginDependency</string> - <string>100363.IBPluginDependency</string> - <string>100364.IBPluginDependency</string> - <string>100365.IBPluginDependency</string> - <string>100368.IBPluginDependency</string> - <string>100369.IBPluginDependency</string> - <string>100370.IBPluginDependency</string> - <string>100371.IBPluginDependency</string> - <string>100372.IBPluginDependency</string> - <string>100374.IBPluginDependency</string> - <string>100375.IBPluginDependency</string> - <string>100376.IBPluginDependency</string> - <string>100377.IBPluginDependency</string> - <string>100379.IBPluginDependency</string> - <string>100382.IBPluginDependency</string> - <string>100385.IBPluginDependency</string> - <string>100386.IBPluginDependency</string> - <string>100541.IBPluginDependency</string> - <string>100543.IBPluginDependency</string> - <string>129.IBPluginDependency</string> - <string>129.ImportedFromIB2</string> - <string>130.IBPluginDependency</string> - <string>130.ImportedFromIB2</string> - <string>131.IBPluginDependency</string> - <string>131.ImportedFromIB2</string> - <string>134.IBPluginDependency</string> - <string>134.ImportedFromIB2</string> - <string>136.IBPluginDependency</string> - <string>136.ImportedFromIB2</string> - <string>143.IBPluginDependency</string> - <string>143.ImportedFromIB2</string> - <string>144.IBPluginDependency</string> - <string>144.ImportedFromIB2</string> - <string>145.IBPluginDependency</string> - <string>145.ImportedFromIB2</string> - <string>149.IBPluginDependency</string> - <string>149.ImportedFromIB2</string> - <string>150.IBPluginDependency</string> - <string>150.ImportedFromIB2</string> - <string>157.IBPluginDependency</string> - <string>157.ImportedFromIB2</string> - <string>163.IBPluginDependency</string> - <string>163.ImportedFromIB2</string> - <string>169.IBEditorWindowLastContentRect</string> - <string>169.IBPluginDependency</string> - <string>169.ImportedFromIB2</string> - <string>169.editorWindowContentRectSynchronizationRect</string> - <string>19.IBPluginDependency</string> - <string>19.ImportedFromIB2</string> - <string>196.IBPluginDependency</string> - <string>196.ImportedFromIB2</string> - <string>200295.IBPluginDependency</string> - <string>200295.IBShouldRemoveOnLegacySave</string> - <string>203.IBPluginDependency</string> - <string>203.ImportedFromIB2</string> - <string>204.IBPluginDependency</string> - <string>204.ImportedFromIB2</string> - <string>23.IBPluginDependency</string> - <string>23.ImportedFromIB2</string> - <string>24.IBEditorWindowLastContentRect</string> - <string>24.IBPluginDependency</string> - <string>24.ImportedFromIB2</string> - <string>24.editorWindowContentRectSynchronizationRect</string> - <string>244.IBEditorWindowLastContentRect</string> - <string>244.IBWindowTemplateEditedContentRect</string> - <string>244.ImportedFromIB2</string> - <string>244.editorWindowContentRectSynchronizationRect</string> - <string>244.windowTemplate.hasMaxSize</string> - <string>244.windowTemplate.hasMinSize</string> - <string>244.windowTemplate.maxSize</string> - <string>244.windowTemplate.minSize</string> - <string>245.IBPluginDependency</string> - <string>245.ImportedFromIB2</string> - <string>269.IBPluginDependency</string> - <string>269.ImportedFromIB2</string> - <string>270.IBEditorWindowLastContentRect</string> - <string>270.IBPluginDependency</string> - <string>270.ImportedFromIB2</string> - <string>270.editorWindowContentRectSynchronizationRect</string> - <string>272.IBPluginDependency</string> - <string>272.ImportedFromIB2</string> - <string>285.IBEditorWindowLastContentRect</string> - <string>285.IBViewEditorWindowController.showingBoundsRectangles</string> - <string>285.IBViewEditorWindowController.showingLayoutRectangles</string> - <string>285.IBWindowTemplateEditedContentRect</string> - <string>285.ImportedFromIB2</string> - <string>285.editorWindowContentRectSynchronizationRect</string> - <string>285.windowTemplate.hasMaxSize</string> - <string>285.windowTemplate.hasMinSize</string> - <string>285.windowTemplate.maxSize</string> - <string>285.windowTemplate.minSize</string> - <string>286.IBPluginDependency</string> - <string>286.ImportedFromIB2</string> - <string>29.IBEditorWindowLastContentRect</string> - <string>29.IBPluginDependency</string> - <string>29.ImportedFromIB2</string> - <string>29.editorWindowContentRectSynchronizationRect</string> - <string>292.IBPluginDependency</string> - <string>292.ImportedFromIB2</string> - <string>293.IBPluginDependency</string> - <string>293.ImportedFromIB2</string> - <string>295.IBPluginDependency</string> - <string>295.ImportedFromIB2</string> - <string>296.IBPluginDependency</string> - <string>296.ImportedFromIB2</string> - <string>297.IBPluginDependency</string> - <string>297.ImportedFromIB2</string> - <string>298.IBPluginDependency</string> - <string>298.ImportedFromIB2</string> - <string>300295.IBPluginDependency</string> - <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300337.IBPluginDependency</string> - <string>300337.ImportedFromIB2</string> - <string>300338.IBPluginDependency</string> - <string>300338.ImportedFromIB2</string> - <string>300358.IBPluginDependency</string> - <string>300358.ImportedFromIB2</string> - <string>300359.IBPluginDependency</string> - <string>300359.ImportedFromIB2</string> - <string>300360.IBPluginDependency</string> - <string>300361.IBPluginDependency</string> - <string>300362.IBPluginDependency</string> - <string>300362.ImportedFromIB2</string> - <string>300363.IBPluginDependency</string> - <string>300364.IBPluginDependency</string> - <string>300364.ImportedFromIB2</string> - <string>300365.IBPluginDependency</string> - <string>300368.IBPluginDependency</string> - <string>300368.ImportedFromIB2</string> - <string>300369.IBPluginDependency</string> - <string>300370.IBPluginDependency</string> - <string>300370.ImportedFromIB2</string> - <string>300371.IBPluginDependency</string> - <string>300421.IBPluginDependency</string> - <string>300421.ImportedFromIB2</string> - <string>300422.IBPluginDependency</string> - <string>300422.ImportedFromIB2</string> - <string>300423.IBPluginDependency</string> - <string>300423.ImportedFromIB2</string> - <string>300424.IBPluginDependency</string> - <string>300424.ImportedFromIB2</string> - <string>300440.IBPluginDependency</string> - <string>300441.IBPluginDependency</string> - <string>300447.IBPluginDependency</string> - <string>300447.ImportedFromIB2</string> - <string>300450.IBPluginDependency</string> - <string>300451.IBPluginDependency</string> - <string>300451.ImportedFromIB2</string> - <string>300452.IBPluginDependency</string> - <string>300453.IBPluginDependency</string> - <string>300453.ImportedFromIB2</string> - <string>300454.IBPluginDependency</string> - <string>300455.IBPluginDependency</string> - <string>300455.ImportedFromIB2</string> - <string>300456.IBPluginDependency</string> - <string>300457.IBPluginDependency</string> - <string>300457.ImportedFromIB2</string> - <string>300458.IBPluginDependency</string> - <string>300459.IBPluginDependency</string> - <string>300459.ImportedFromIB2</string> - <string>300460.IBPluginDependency</string> - <string>300472.IBPluginDependency</string> - <string>300472.ImportedFromIB2</string> - <string>300473.IBPluginDependency</string> - <string>305.IBPluginDependency</string> - <string>305.ImportedFromIB2</string> - <string>310.IBPluginDependency</string> - <string>310.ImportedFromIB2</string> - <string>348.IBPluginDependency</string> - <string>348.ImportedFromIB2</string> - <string>349.IBPluginDependency</string> - <string>349.ImportedFromIB2</string> - <string>350.IBPluginDependency</string> - <string>350.ImportedFromIB2</string> - <string>351.IBPluginDependency</string> - <string>351.ImportedFromIB2</string> - <string>352.IBPluginDependency</string> - <string>352.ImportedFromIB2</string> - <string>353.IBPluginDependency</string> - <string>353.ImportedFromIB2</string> - <string>354.IBPluginDependency</string> - <string>354.ImportedFromIB2</string> - <string>363.IBPluginDependency</string> - <string>363.ImportedFromIB2</string> - <string>364.IBPluginDependency</string> - <string>364.ImportedFromIB2</string> - <string>365.IBPluginDependency</string> - <string>365.ImportedFromIB2</string> - <string>368.IBPluginDependency</string> - <string>368.ImportedFromIB2</string> - <string>369.IBPluginDependency</string> - <string>369.ImportedFromIB2</string> - <string>370.IBPluginDependency</string> - <string>370.ImportedFromIB2</string> - <string>371.IBPluginDependency</string> - <string>371.ImportedFromIB2</string> - <string>372.IBPluginDependency</string> - <string>372.ImportedFromIB2</string> - <string>374.IBPluginDependency</string> - <string>374.ImportedFromIB2</string> - <string>375.IBPluginDependency</string> - <string>375.ImportedFromIB2</string> - <string>376.IBPluginDependency</string> - <string>376.ImportedFromIB2</string> - <string>377.IBPluginDependency</string> - <string>377.ImportedFromIB2</string> - <string>379.IBPluginDependency</string> - <string>379.ImportedFromIB2</string> - <string>380.IBPluginDependency</string> - <string>380.ImportedFromIB2</string> - <string>381.IBPluginDependency</string> - <string>381.ImportedFromIB2</string> - <string>382.IBPluginDependency</string> - <string>382.ImportedFromIB2</string> - <string>383.IBPluginDependency</string> - <string>383.ImportedFromIB2</string> - <string>384.IBPluginDependency</string> - <string>384.ImportedFromIB2</string> - <string>385.IBPluginDependency</string> - <string>385.ImportedFromIB2</string> - <string>386.IBPluginDependency</string> - <string>386.ImportedFromIB2</string> - <string>419.IBPluginDependency</string> - <string>419.ImportedFromIB2</string> - <string>420.IBPluginDependency</string> - <string>420.ImportedFromIB2</string> - <string>421.IBPluginDependency</string> - <string>421.ImportedFromIB2</string> - <string>423.IBPluginDependency</string> - <string>423.ImportedFromIB2</string> - <string>435.IBPluginDependency</string> - <string>435.ImportedFromIB2</string> - <string>5.IBPluginDependency</string> - <string>5.ImportedFromIB2</string> - <string>524.IBPluginDependency</string> - <string>524.ImportedFromIB2</string> - <string>526.IBPluginDependency</string> - <string>526.ImportedFromIB2</string> - <string>527.IBPluginDependency</string> - <string>527.ImportedFromIB2</string> - <string>532.IBPluginDependency</string> - <string>532.ImportedFromIB2</string> - <string>533.IBPluginDependency</string> - <string>533.ImportedFromIB2</string> - <string>535.IBPluginDependency</string> - <string>535.ImportedFromIB2</string> - <string>536.IBPluginDependency</string> - <string>536.ImportedFromIB2</string> - <string>537.IBPluginDependency</string> - <string>537.ImportedFromIB2</string> - <string>538.IBPluginDependency</string> - <string>538.ImportedFromIB2</string> - <string>541.IBPluginDependency</string> - <string>541.ImportedFromIB2</string> - <string>543.IBPluginDependency</string> - <string>543.ImportedFromIB2</string> - <string>544.IBPluginDependency</string> - <string>544.ImportedFromIB2</string> - <string>545.IBPluginDependency</string> - <string>545.ImportedFromIB2</string> - <string>56.IBPluginDependency</string> - <string>56.ImportedFromIB2</string> - <string>57.IBEditorWindowLastContentRect</string> - <string>57.IBPluginDependency</string> - <string>57.ImportedFromIB2</string> - <string>57.editorWindowContentRectSynchronizationRect</string> - <string>573.IBPluginDependency</string> - <string>573.ImportedFromIB2</string> - <string>574.IBPluginDependency</string> - <string>574.ImportedFromIB2</string> - <string>575.IBPluginDependency</string> - <string>575.ImportedFromIB2</string> - <string>58.IBPluginDependency</string> - <string>58.ImportedFromIB2</string> - <string>92.IBPluginDependency</string> - <string>92.ImportedFromIB2</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1" id="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{168, 821}, {113, 23}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{202, 626}, {154, 153}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{349, 868}, {315, 143}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{271, 666}, {301, 153}}</string> - <string>{{437, 749}, {484, 308}}</string> - <string>{{437, 749}, {484, 308}}</string> - <reference ref="9"/> - <string>{{184, 290}, {481, 345}}</string> - <integer value="0" id="8"/> - <reference ref="9"/> - <string>{3.40282e+38, 3.40282e+38}</string> - <string>{320, 240}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{58, 803}, {155, 33}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{100, 746}, {155, 33}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{68, 585}, {454, 271}}</string> - <reference ref="9"/> - <reference ref="9"/> - <string>{{68, 585}, {454, 271}}</string> - <reference ref="9"/> - <string>{{433, 406}, {486, 327}}</string> - <reference ref="8"/> - <reference ref="9"/> - <string>{3.40282e+38, 3.40282e+38}</string> - <string>{320, 240}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{145, 1011}, {336, 20}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{67, 819}, {336, 20}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{20, 641}, {218, 203}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{79, 616}, {218, 203}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - </object> - </object> - <object class="NSMutableDictionary" key="unlocalizedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <object class="IBObjectRecord"> + <int key="objectID">300476</int> + <reference key="object" ref="278155937"/> + <array class="NSMutableArray" key="children"> + <reference ref="617441821"/> + </array> + <reference key="parent" ref="596750588"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300477</int> + <reference key="object" ref="406291430"/> + <array class="NSMutableArray" key="children"> + <reference ref="67728988"/> + </array> + <reference key="parent" ref="596750588"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300478</int> + <reference key="object" ref="67728988"/> + <reference key="parent" ref="406291430"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300479</int> + <reference key="object" ref="617441821"/> + <reference key="parent" ref="278155937"/> + </object> + </array> </object> + <dictionary class="NSMutableDictionary" key="flattenedProperties"> + <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="-3.ImportedFromIB2"/> + <string key="100292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="100295.IBShouldRemoveOnLegacySave"/> + <string key="100310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="100543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="129.ImportedFromIB2"/> + <string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="130.ImportedFromIB2"/> + <string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="131.ImportedFromIB2"/> + <string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="134.ImportedFromIB2"/> + <string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="136.ImportedFromIB2"/> + <string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="143.ImportedFromIB2"/> + <string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="144.ImportedFromIB2"/> + <string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="145.ImportedFromIB2"/> + <string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="149.ImportedFromIB2"/> + <string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="150.ImportedFromIB2"/> + <string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="157.ImportedFromIB2"/> + <string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="163.ImportedFromIB2"/> + <string key="169.IBEditorWindowLastContentRect">{{168, 821}, {113, 23}}</string> + <string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="169.ImportedFromIB2"/> + <string key="169.editorWindowContentRectSynchronizationRect">{{202, 626}, {154, 153}}</string> + <string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="19.ImportedFromIB2"/> + <integer value="1" key="196.ImportedFromIB2"/> + <string key="200295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="200295.IBShouldRemoveOnLegacySave"/> + <string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="203.ImportedFromIB2"/> + <string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="204.ImportedFromIB2"/> + <string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="23.ImportedFromIB2"/> + <string key="24.IBEditorWindowLastContentRect">{{349, 868}, {315, 143}}</string> + <string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="24.ImportedFromIB2"/> + <string key="24.editorWindowContentRectSynchronizationRect">{{271, 666}, {301, 153}}</string> + <string key="244.IBEditorWindowLastContentRect">{{507, 565}, {484, 308}}</string> + <string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="244.IBWindowTemplateEditedContentRect">{{507, 565}, {484, 308}}</string> + <integer value="1" key="244.ImportedFromIB2"/> + <string key="244.editorWindowContentRectSynchronizationRect">{{184, 290}, {481, 345}}</string> + <integer value="0" key="244.windowTemplate.hasMaxSize"/> + <integer value="1" key="244.windowTemplate.hasMinSize"/> + <string key="244.windowTemplate.maxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="244.windowTemplate.minSize">{320, 240}</string> + <string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="245.ImportedFromIB2"/> + <string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="269.ImportedFromIB2"/> + <string key="270.IBEditorWindowLastContentRect">{{58, 803}, {155, 33}}</string> + <string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="270.ImportedFromIB2"/> + <string key="270.editorWindowContentRectSynchronizationRect">{{100, 746}, {155, 33}}</string> + <string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="272.ImportedFromIB2"/> + <string key="285.IBEditorWindowLastContentRect">{{68, 585}, {454, 271}}</string> + <string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="285.IBViewEditorWindowController.showingBoundsRectangles"/> + <integer value="1" key="285.IBViewEditorWindowController.showingLayoutRectangles"/> + <string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {454, 271}}</string> + <integer value="1" key="285.ImportedFromIB2"/> + <string key="285.editorWindowContentRectSynchronizationRect">{{433, 406}, {486, 327}}</string> + <integer value="0" key="285.windowTemplate.hasMaxSize"/> + <integer value="1" key="285.windowTemplate.hasMinSize"/> + <string key="285.windowTemplate.maxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="285.windowTemplate.minSize">{320, 240}</string> + <string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="286.ImportedFromIB2"/> + <string key="29.IBEditorWindowLastContentRect">{{145, 1011}, {336, 20}}</string> + <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="29.ImportedFromIB2"/> + <string key="29.editorWindowContentRectSynchronizationRect">{{67, 819}, {336, 20}}</string> + <string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="292.ImportedFromIB2"/> + <string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="293.ImportedFromIB2"/> + <string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="295.ImportedFromIB2"/> + <string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="296.ImportedFromIB2"/> + <string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="297.ImportedFromIB2"/> + <string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="298.ImportedFromIB2"/> + <string key="300295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300295.IBShouldRemoveOnLegacySave"/> + <string key="300337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300337.ImportedFromIB2"/> + <string key="300338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300338.ImportedFromIB2"/> + <string key="300358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300358.ImportedFromIB2"/> + <string key="300359.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300359.ImportedFromIB2"/> + <string key="300360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300362.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300362.ImportedFromIB2"/> + <string key="300363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300364.ImportedFromIB2"/> + <string key="300365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300368.ImportedFromIB2"/> + <string key="300369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300370.ImportedFromIB2"/> + <string key="300371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300421.ImportedFromIB2"/> + <string key="300422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300422.ImportedFromIB2"/> + <string key="300423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300423.ImportedFromIB2"/> + <string key="300424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300424.ImportedFromIB2"/> + <string key="300440.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300441.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300447.ImportedFromIB2"/> + <string key="300450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300451.ImportedFromIB2"/> + <string key="300452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300453.ImportedFromIB2"/> + <string key="300454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300455.ImportedFromIB2"/> + <string key="300456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300457.ImportedFromIB2"/> + <string key="300458.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300459.ImportedFromIB2"/> + <string key="300460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300472.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300472.ImportedFromIB2"/> + <string key="300473.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300476.ImportedFromIB2"/> + <string key="300477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="300477.ImportedFromIB2"/> + <string key="300478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="300479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="305.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="305.ImportedFromIB2"/> + <string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="310.ImportedFromIB2"/> + <string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="348.ImportedFromIB2"/> + <string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="349.ImportedFromIB2"/> + <string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="350.ImportedFromIB2"/> + <string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="351.ImportedFromIB2"/> + <string key="352.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="352.ImportedFromIB2"/> + <string key="353.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="353.ImportedFromIB2"/> + <string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="354.ImportedFromIB2"/> + <string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="363.ImportedFromIB2"/> + <string key="364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="364.ImportedFromIB2"/> + <string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="365.ImportedFromIB2"/> + <string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="368.ImportedFromIB2"/> + <string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="369.ImportedFromIB2"/> + <string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="370.ImportedFromIB2"/> + <string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="371.ImportedFromIB2"/> + <string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="372.ImportedFromIB2"/> + <string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="374.ImportedFromIB2"/> + <string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="375.ImportedFromIB2"/> + <string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="376.ImportedFromIB2"/> + <string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="377.ImportedFromIB2"/> + <string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="379.ImportedFromIB2"/> + <string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="380.ImportedFromIB2"/> + <string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="381.ImportedFromIB2"/> + <string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="382.ImportedFromIB2"/> + <string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="383.ImportedFromIB2"/> + <string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="384.ImportedFromIB2"/> + <string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="385.ImportedFromIB2"/> + <string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="386.ImportedFromIB2"/> + <string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="419.ImportedFromIB2"/> + <string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="420.ImportedFromIB2"/> + <string key="421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="421.ImportedFromIB2"/> + <string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="423.ImportedFromIB2"/> + <string key="435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="435.ImportedFromIB2"/> + <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="5.ImportedFromIB2"/> + <string key="524.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="524.ImportedFromIB2"/> + <string key="526.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="526.ImportedFromIB2"/> + <string key="527.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="527.ImportedFromIB2"/> + <string key="532.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="532.ImportedFromIB2"/> + <string key="533.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="533.ImportedFromIB2"/> + <string key="535.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="535.ImportedFromIB2"/> + <string key="536.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="536.ImportedFromIB2"/> + <string key="537.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="537.ImportedFromIB2"/> + <string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="538.ImportedFromIB2"/> + <string key="541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="541.ImportedFromIB2"/> + <string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="543.ImportedFromIB2"/> + <string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="544.ImportedFromIB2"/> + <string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="545.ImportedFromIB2"/> + <string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="56.ImportedFromIB2"/> + <string key="57.IBEditorWindowLastContentRect">{{20, 641}, {218, 203}}</string> + <string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="57.ImportedFromIB2"/> + <string key="57.editorWindowContentRectSynchronizationRect">{{79, 616}, {218, 203}}</string> + <string key="573.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="573.ImportedFromIB2"/> + <string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="574.ImportedFromIB2"/> + <string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="575.ImportedFromIB2"/> + <string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="58.ImportedFromIB2"/> + <string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" key="92.ImportedFromIB2"/> + </dictionary> + <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <nil key="activeLocalization"/> - <object class="NSMutableDictionary" key="localizations"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> + <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">300475</int> + <int key="maxID">300481</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> - <object class="NSMutableArray" key="referencedPartialClassDescriptions"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="IBPartialClassDescription"> <string key="className">FirstResponder</string> <string key="superclassName">NSObject</string> @@ -3879,131 +3558,81 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string> <string key="minorKey"/> </object> </object> - </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> - <bool key="EncodedWithXMLCoder">YES</bool> + </array> + <array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> <object class="IBPartialClassDescription"> <string key="className">X11Controller</string> <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>apps_table_delete:</string> - <string>apps_table_done:</string> - <string>apps_table_duplicate:</string> - <string>apps_table_new:</string> - <string>apps_table_show:</string> - <string>bring_to_front:</string> - <string>close_window:</string> - <string>enable_fullscreen_changed:</string> - <string>minimize_window:</string> - <string>next_window:</string> - <string>prefs_changed:</string> - <string>prefs_show:</string> - <string>previous_window:</string> - <string>quit:</string> - <string>toggle_fullscreen:</string> - <string>x11_help:</string> - <string>zoom_window:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>apps_separator</string> - <string>apps_table</string> - <string>click_through</string> - <string>copy_menu_item</string> - <string>depth</string> - <string>dock_apps_menu</string> - <string>dock_menu</string> - <string>dock_window_separator</string> - <string>enable_auth</string> - <string>enable_fullscreen</string> - <string>enable_fullscreen_menu</string> - <string>enable_keyequivs</string> - <string>enable_tcp</string> - <string>fake_buttons</string> - <string>focus_follows_mouse</string> - <string>focus_on_new_window</string> - <string>prefs_panel</string> - <string>sync_clipboard_to_pasteboard</string> - <string>sync_keymap</string> - <string>sync_pasteboard</string> - <string>sync_pasteboard_to_clipboard</string> - <string>sync_pasteboard_to_primary</string> - <string>sync_primary_immediately</string> - <string>sync_text1</string> - <string>sync_text2</string> - <string>toggle_fullscreen_item</string> - <string>use_sysbeep</string> - <string>window_separator</string> - <string>x11_about_item</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSMenuItem</string> - <string>NSTableView</string> - <string>NSButton</string> - <string>NSMenuItem</string> - <string>NSPopUpButton</string> - <string>NSMenu</string> - <string>NSMenu</string> - <string>NSMenuItem</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSPanel</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSTextField</string> - <string>NSTextField</string> - <string>NSMenuItem</string> - <string>NSButton</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - </object> - </object> + <dictionary class="NSMutableDictionary" key="actions"> + <string key="apps_table_delete:">id</string> + <string key="apps_table_done:">id</string> + <string key="apps_table_duplicate:">id</string> + <string key="apps_table_new:">id</string> + <string key="apps_table_show:">id</string> + <string key="bring_to_front:">id</string> + <string key="close_window:">id</string> + <string key="enable_fullscreen_changed:">id</string> + <string key="minimize_window:">id</string> + <string key="next_window:">id</string> + <string key="prefs_changed:">id</string> + <string key="prefs_show:">id</string> + <string key="previous_window:">id</string> + <string key="quit:">id</string> + <string key="toggle_fullscreen:">id</string> + <string key="x11_help:">id</string> + <string key="zoom_window:">id</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="outlets"> + <string key="apps_separator">NSMenuItem</string> + <string key="apps_table">NSTableView</string> + <string key="click_through">NSButton</string> + <string key="copy_menu_item">NSMenuItem</string> + <string key="depth">NSPopUpButton</string> + <string key="dock_apps_menu">NSMenu</string> + <string key="dock_menu">NSMenu</string> + <string key="dock_window_separator">NSMenuItem</string> + <string key="enable_auth">NSButton</string> + <string key="enable_fullscreen">NSButton</string> + <string key="enable_fullscreen_menu">NSButton</string> + <string key="enable_keyequivs">NSButton</string> + <string key="enable_tcp">NSButton</string> + <string key="fake_buttons">NSButton</string> + <string key="focus_follows_mouse">NSButton</string> + <string key="focus_on_new_window">NSButton</string> + <string key="option_sends_alt">NSButton</string> + <string key="prefs_panel">NSPanel</string> + <string key="sync_clipboard_to_pasteboard">NSButton</string> + <string key="sync_keymap">NSButton</string> + <string key="sync_pasteboard">NSButton</string> + <string key="sync_pasteboard_to_clipboard">NSButton</string> + <string key="sync_pasteboard_to_primary">NSButton</string> + <string key="sync_primary_immediately">NSButton</string> + <string key="sync_text1">NSTextField</string> + <string key="sync_text2">NSTextField</string> + <string key="toggle_fullscreen_item">NSMenuItem</string> + <string key="use_sysbeep">NSButton</string> + <string key="window_separator">NSMenuItem</string> + <string key="x11_about_item">NSMenuItem</string> + </dictionary> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBDocumentRelativeSource</string> <string key="minorKey">../../../X11Controller.h</string> </object> </object> - </object> + </array> </object> <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> + <integer value="1040" key="NS.object.0"/> + </object> + <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../X11.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> + <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <string key="NSMenuCheckmark">{9, 8}</string> + <string key="NSMenuMixedState">{7, 2}</string> + </dictionary> </data> </archive> diff --git a/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib Binary files differindex fee8f1ce9..888424dfc 100644 --- a/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/French.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/French.lproj/Localizable.strings Binary files differindex 1dd2e0601..81ecfc14b 100644 --- a/hw/xquartz/bundle/Resources/French.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/French.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/French.lproj/locversion.plist b/hw/xquartz/bundle/Resources/French.lproj/locversion.plist index 566c84236..5e82f7fd1 100644 --- a/hw/xquartz/bundle/Resources/French.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/French.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>fr</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib index 76299a761..69f7075ac 100644 --- a/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">728</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">10A432</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1038</string> + <string key="IBDocument.HIToolboxVersion">437.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">728</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -344,17 +344,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -400,7 +389,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <reference key="NSNextResponder"/> @@ -441,7 +430,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="592754637"> + <object class="NSCustomResource" key="NSNormalImage" id="738309631"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -477,7 +466,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor" id="590688762"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> </object> </object> <object class="NSColor" key="NSTextColor" id="930815747"> @@ -524,7 +513,7 @@ A</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -563,7 +552,7 @@ A</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -602,7 +591,7 @@ A</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -709,7 +698,6 @@ A</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -765,7 +753,7 @@ A</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -787,7 +775,7 @@ A</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -842,7 +830,7 @@ A</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -880,7 +868,7 @@ A</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -902,7 +890,7 @@ A</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -924,7 +912,7 @@ A</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -946,7 +934,7 @@ A</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1016,7 +1004,7 @@ A</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1055,7 +1043,7 @@ A</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1094,7 +1082,7 @@ A</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1146,7 +1134,7 @@ A</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1168,7 +1156,7 @@ A</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="592754637"/> + <reference key="NSNormalImage" ref="738309631"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1251,7 +1239,7 @@ A</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1264,7 +1252,7 @@ A</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1363,7 +1351,7 @@ A</string> <reference key="NSSupport" ref="26"/> <object class="NSColor" key="NSBackgroundColor" id="113872566"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes> + <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes> </object> <object class="NSColor" key="NSTextColor" id="249576247"> <int key="NSColorSpace">6</int> @@ -1500,7 +1488,7 @@ A</string> <reference key="NSSuperview" ref="1063387772"/> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.99492380000000002</double> + <double key="NSPercent">0.99492377042770386</double> </object> <object class="NSScroller" id="17278747"> <reference key="NSNextResponder" ref="1063387772"/> @@ -1510,7 +1498,7 @@ A</string> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.97368421052631582</double> + <double key="NSPercent">0.97368419170379639</double> </object> <object class="NSClipView" id="672307654"> <reference key="NSNextResponder" ref="1063387772"/> @@ -1567,7 +1555,7 @@ A</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1990,14 +1978,6 @@ A</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2242,7 +2222,6 @@ A</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3047,11 +3026,6 @@ A</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3434,8 +3408,6 @@ A</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3506,6 +3478,7 @@ A</string> <string>349.IBPluginDependency</string> <string>349.ImportedFromIB2</string> <string>350.IBPluginDependency</string> + <string>350.IBUserGuides</string> <string>350.ImportedFromIB2</string> <string>351.IBPluginDependency</string> <string>351.ImportedFromIB2</string> @@ -3541,6 +3514,7 @@ A</string> <string>377.ImportedFromIB2</string> <string>379.IBPluginDependency</string> <string>379.ImportedFromIB2</string> + <string>380.IBEditorWindowLastContentRect</string> <string>380.IBPluginDependency</string> <string>380.ImportedFromIB2</string> <string>381.IBPluginDependency</string> @@ -3676,14 +3650,14 @@ A</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> - <string>{{437, 698}, {582, 308}}</string> + <string>{{437, 749}, {582, 308}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> - <string>{{437, 698}, {582, 308}}</string> + <string>{{437, 749}, {582, 308}}</string> <integer value="1"/> <string>{{184, 290}, {481, 345}}</string> <integer value="0"/> @@ -3740,8 +3714,6 @@ A</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3803,6 +3775,14 @@ A</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBUserGuide"> + <reference key="view" ref="515308735"/> + <double key="location">36</double> + <int key="affinity">0</int> + </object> + </object> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3838,6 +3818,7 @@ A</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <string>{{553, 917}, {155, 83}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib Binary files differindex 9c65224a7..689405d29 100644 --- a/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/German.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/German.lproj/Localizable.strings Binary files differindex 48c4e29c4..8c29a2b57 100644 --- a/hw/xquartz/bundle/Resources/German.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/German.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/German.lproj/locversion.plist b/hw/xquartz/bundle/Resources/German.lproj/locversion.plist index fe47b3743..e10376e68 100644 --- a/hw/xquartz/bundle/Resources/German.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/German.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>de</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib index 47a28c186..5fc898489 100644 --- a/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib @@ -2,17 +2,16 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">728</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">728</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="348"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -342,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -398,10 +386,10 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -439,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="1045407417"> + <object class="NSCustomResource" key="NSNormalImage" id="211986633"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -522,7 +510,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -561,7 +549,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -600,7 +588,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -707,7 +695,6 @@ dmllcmVuLgo</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -763,7 +750,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -785,7 +772,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -840,7 +827,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -878,7 +865,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -900,7 +887,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -922,7 +909,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -944,7 +931,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1014,7 +1001,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1052,7 +1039,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1090,7 +1077,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1141,7 +1128,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1163,7 +1150,7 @@ dmllcmVuLgo</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045407417"/> + <reference key="NSNormalImage" ref="211986633"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1242,11 +1229,10 @@ dmllcmVuLgo</string> </object> </object> <string key="NSFrameSize">{613, 302}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1259,7 +1245,7 @@ dmllcmVuLgo</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1559,7 +1545,7 @@ dmllcmVuLgo</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1982,14 +1968,6 @@ dmllcmVuLgo</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2234,7 +2212,6 @@ dmllcmVuLgo</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3039,11 +3016,6 @@ dmllcmVuLgo</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3425,8 +3397,6 @@ dmllcmVuLgo</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3461,27 +3431,19 @@ dmllcmVuLgo</string> <string>300441.IBPluginDependency</string> <string>300447.IBPluginDependency</string> <string>300447.ImportedFromIB2</string> - <string>300447.object.labelIdentifier</string> <string>300450.IBPluginDependency</string> - <string>300450.object.labelIdentifier</string> <string>300451.IBPluginDependency</string> <string>300451.ImportedFromIB2</string> - <string>300451.object.labelIdentifier</string> <string>300452.IBPluginDependency</string> - <string>300452.object.labelIdentifier</string> <string>300453.IBPluginDependency</string> <string>300453.ImportedFromIB2</string> - <string>300453.object.labelIdentifier</string> <string>300454.IBPluginDependency</string> - <string>300454.object.labelIdentifier</string> <string>300455.IBPluginDependency</string> <string>300455.ImportedFromIB2</string> <string>300456.IBPluginDependency</string> <string>300457.IBPluginDependency</string> <string>300457.ImportedFromIB2</string> - <string>300457.object.labelIdentifier</string> <string>300458.IBPluginDependency</string> - <string>300458.object.labelIdentifier</string> <string>300459.IBPluginDependency</string> <string>300459.ImportedFromIB2</string> <string>300460.IBPluginDependency</string> @@ -3667,13 +3629,13 @@ dmllcmVuLgo</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> - <string>{{437, 704}, {613, 302}}</string> + <string>{{437, 749}, {484, 308}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{437, 704}, {613, 302}}</string> + <string>{{437, 749}, {484, 308}}</string> <integer value="1"/> <string>{{184, 290}, {481, 345}}</string> <integer value="0"/> @@ -3730,8 +3692,6 @@ dmllcmVuLgo</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3757,27 +3717,19 @@ dmllcmVuLgo</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib Binary files differindex 1cc64172e..467adef59 100644 --- a/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings Binary files differindex 560a1fe40..de1d777bb 100644 --- a/hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist b/hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist index 6e84bb019..b170cc465 100644 --- a/hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>it</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib index e2932b92f..90f8d4cb1 100644 --- a/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib @@ -2,17 +2,16 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">728</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">728</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="348"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -342,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -398,10 +386,10 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -439,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="1045379289"> + <object class="NSCustomResource" key="NSNormalImage" id="572644485"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -522,7 +510,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -561,7 +549,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -600,7 +588,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -707,7 +695,6 @@ Q29tYW5kby4KA</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -763,7 +750,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -785,7 +772,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -840,7 +827,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -878,7 +865,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -900,7 +887,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -922,7 +909,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -944,7 +931,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1014,7 +1001,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1052,7 +1039,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1090,7 +1077,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1141,7 +1128,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1163,7 +1150,7 @@ Q29tYW5kby4KA</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1045379289"/> + <reference key="NSNormalImage" ref="572644485"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1242,11 +1229,10 @@ Q29tYW5kby4KA</string> </object> </object> <string key="NSFrameSize">{664, 308}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1259,7 +1245,7 @@ Q29tYW5kby4KA</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1562,7 +1548,7 @@ Q29tYW5kby4KA</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1985,14 +1971,6 @@ Q29tYW5kby4KA</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2237,7 +2215,6 @@ Q29tYW5kby4KA</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3042,11 +3019,6 @@ Q29tYW5kby4KA</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3380,7 +3352,6 @@ Q29tYW5kby4KA</string> <string>24.editorWindowContentRectSynchronizationRect</string> <string>244.IBEditorWindowLastContentRect</string> <string>244.IBPluginDependency</string> - <string>244.IBViewEditorWindowController.showingLayoutRectangles</string> <string>244.IBWindowTemplateEditedContentRect</string> <string>244.ImportedFromIB2</string> <string>244.editorWindowContentRectSynchronizationRect</string> @@ -3429,8 +3400,6 @@ Q29tYW5kby4KA</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3465,27 +3434,19 @@ Q29tYW5kby4KA</string> <string>300441.IBPluginDependency</string> <string>300447.IBPluginDependency</string> <string>300447.ImportedFromIB2</string> - <string>300447.object.labelIdentifier</string> <string>300450.IBPluginDependency</string> - <string>300450.object.labelIdentifier</string> <string>300451.IBPluginDependency</string> <string>300451.ImportedFromIB2</string> - <string>300451.object.labelIdentifier</string> <string>300452.IBPluginDependency</string> - <string>300452.object.labelIdentifier</string> <string>300453.IBPluginDependency</string> <string>300453.ImportedFromIB2</string> - <string>300453.object.labelIdentifier</string> <string>300454.IBPluginDependency</string> - <string>300454.object.labelIdentifier</string> <string>300455.IBPluginDependency</string> <string>300455.ImportedFromIB2</string> <string>300456.IBPluginDependency</string> <string>300457.IBPluginDependency</string> <string>300457.ImportedFromIB2</string> - <string>300457.object.labelIdentifier</string> <string>300458.IBPluginDependency</string> - <string>300458.object.labelIdentifier</string> <string>300459.IBPluginDependency</string> <string>300459.ImportedFromIB2</string> <string>300460.IBPluginDependency</string> @@ -3671,14 +3632,13 @@ Q29tYW5kby4KA</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> - <string>{{437, 698}, {664, 308}}</string> + <string>{{437, 749}, {484, 308}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>{{437, 698}, {664, 308}}</string> + <string>{{437, 749}, {484, 308}}</string> <integer value="1"/> <string>{{184, 290}, {481, 345}}</string> <integer value="0"/> @@ -3735,8 +3695,6 @@ Q29tYW5kby4KA</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3762,27 +3720,19 @@ Q29tYW5kby4KA</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib Binary files differindex 3c95f407b..74222e9c3 100644 --- a/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings Binary files differindex 23c1879a7..54adc1670 100644 --- a/hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist b/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist index a4db22357..be26034a4 100644 --- a/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>ja</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib index ad08afd53..b211f8037 100644 --- a/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">729</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">10A432</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1038</string> + <string key="IBDocument.HIToolboxVersion">437.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">729</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -341,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -397,10 +386,10 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -409,6 +398,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{13, 10}, {558, 292}}</string> <reference key="NSSuperview" ref="941366957"/> + <reference key="NSWindow"/> <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTabViewItem" id="287591690"> @@ -425,6 +415,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 210}, {402, 18}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="990762273"> <int key="NSCellFlags">67239424</int> @@ -438,7 +429,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="964646176"> + <object class="NSCustomResource" key="NSNormalImage" id="150825124"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -456,6 +447,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 59}, {466, 28}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="391919450"> <int key="NSCellFlags">67239424</int> @@ -474,7 +466,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor" id="590688762"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> </object> </object> <object class="NSColor" key="NSTextColor" id="930815747"> @@ -493,6 +485,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 176}, {466, 28}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="649334366"> <int key="NSCellFlags">67239424</int> @@ -513,6 +506,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 93}, {402, 18}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="940564599"> <int key="NSCellFlags">67239424</int> @@ -522,7 +516,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -535,6 +529,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 123}, {466, 17}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="666057093"> <int key="NSCellFlags">67239424</int> @@ -552,6 +547,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 146}, {402, 18}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="967619578"> <int key="NSCellFlags">67239424</int> @@ -561,7 +557,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -572,6 +568,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> </object> <string key="NSFrame">{{10, 33}, {538, 246}}</string> <reference key="NSSuperview" ref="448510093"/> + <reference key="NSWindow"/> </object> <string key="NSLabel">入力</string> <reference key="NSColor" ref="57160303"/> @@ -600,7 +597,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -707,7 +704,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -763,7 +759,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -785,7 +781,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -840,7 +836,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -878,7 +874,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -900,7 +896,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -922,7 +918,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -944,7 +940,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1014,7 +1010,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1053,7 +1049,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1092,7 +1088,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1144,7 +1140,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1166,7 +1162,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="964646176"/> + <reference key="NSNormalImage" ref="150825124"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1245,10 +1241,12 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> </object> </object> <string key="NSFrameSize">{584, 308}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1261,8 +1259,8 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> - <string key="NSWindowContentMinSize">{320, 240}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMinSize">{454, 271}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> @@ -1360,7 +1358,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSSupport" ref="26"/> <object class="NSColor" key="NSBackgroundColor" id="113872566"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes> + <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes> </object> <object class="NSColor" key="NSTextColor" id="249576247"> <int key="NSColorSpace">6</int> @@ -1485,7 +1483,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> </object> <string key="NSFrame">{{1, 17}, {301, 198}}</string> <reference key="NSSuperview" ref="1063387772"/> - <reference key="NSNextKeyView" ref="905092943"/> <reference key="NSDocView" ref="905092943"/> <reference key="NSBGColor" ref="812484075"/> <int key="NScvFlags">4</int> @@ -1497,7 +1494,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="NSSuperview" ref="1063387772"/> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.99492380000000002</double> + <double key="NSPercent">0.99492377042770386</double> </object> <object class="NSScroller" id="17278747"> <reference key="NSNextResponder" ref="1063387772"/> @@ -1507,7 +1504,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.94357366771159878</double> + <double key="NSPercent">0.94357365369796753</double> </object> <object class="NSClipView" id="672307654"> <reference key="NSNextResponder" ref="1063387772"/> @@ -1518,7 +1515,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> </object> <string key="NSFrame">{{1, 0}, {301, 17}}</string> <reference key="NSSuperview" ref="1063387772"/> - <reference key="NSNextKeyView" ref="792419186"/> <reference key="NSDocView" ref="792419186"/> <reference key="NSBGColor" ref="812484075"/> <int key="NScvFlags">4</int> @@ -1527,7 +1523,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> </object> <string key="NSFrame">{{20, 20}, {318, 231}}</string> <reference key="NSSuperview" ref="85544634"/> - <reference key="NSNextKeyView" ref="580565898"/> <int key="NSsFlags">50</int> <reference key="NSVScroller" ref="842897584"/> <reference key="NSHScroller" ref="17278747"/> @@ -1563,8 +1558,8 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <string key="NSFrameSize">{454, 271}</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> - <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMinSize">{454, 293}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1987,14 +1982,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2239,7 +2226,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3044,11 +3030,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3382,7 +3363,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <string>24.editorWindowContentRectSynchronizationRect</string> <string>244.IBEditorWindowLastContentRect</string> <string>244.IBPluginDependency</string> - <string>244.IBViewEditorWindowController.showingLayoutRectangles</string> <string>244.IBWindowTemplateEditedContentRect</string> <string>244.ImportedFromIB2</string> <string>244.editorWindowContentRectSynchronizationRect</string> @@ -3431,8 +3411,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3538,7 +3516,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <string>377.ImportedFromIB2</string> <string>379.IBPluginDependency</string> <string>379.ImportedFromIB2</string> - <string>380.IBEditorWindowLastContentRect</string> <string>380.IBPluginDependency</string> <string>380.ImportedFromIB2</string> <string>381.IBPluginDependency</string> @@ -3559,6 +3536,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <string>420.ImportedFromIB2</string> <string>421.IBPluginDependency</string> <string>421.ImportedFromIB2</string> + <string>423.IBEditorWindowLastContentRect</string> <string>423.IBPluginDependency</string> <string>423.ImportedFromIB2</string> <string>435.IBPluginDependency</string> @@ -3569,6 +3547,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <string>524.ImportedFromIB2</string> <string>526.IBPluginDependency</string> <string>526.ImportedFromIB2</string> + <string>527.IBEditorWindowLastContentRect</string> <string>527.IBPluginDependency</string> <string>527.ImportedFromIB2</string> <string>532.IBPluginDependency</string> @@ -3674,14 +3653,13 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> - <string>{{437, 698}, {584, 308}}</string> + <string>{{437, 548}, {584, 308}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>{{437, 698}, {584, 308}}</string> + <string>{{437, 548}, {584, 308}}</string> <integer value="1"/> <string>{{184, 290}, {481, 345}}</string> <integer value="0"/> @@ -3708,10 +3686,10 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <integer value="0"/> <integer value="1"/> <string>{3.40282e+38, 3.40282e+38}</string> - <string>{320, 240}</string> + <string>{454, 271}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{145, 1011}, {336, 20}}</string> + <string>{{145, 836}, {394, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{67, 819}, {336, 20}}</string> @@ -3738,8 +3716,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3836,7 +3812,6 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{524, 865}, {178, 83}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3857,6 +3832,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <string>{{717, 463}, {178, 33}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3867,6 +3843,7 @@ nOOBq+OBquOCiuOBvuOBmeOAggo</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <string>{{895, 453}, {164, 33}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib Binary files differindex 7c96bfaec..7728acbb0 100644 --- a/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings Binary files differindex 156f61841..ec90bf90c 100644 --- a/hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist b/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist index 03167cdac..687d53f1c 100644 --- a/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>es</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib index 7be5fbaa4..b315636bf 100644 --- a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">728</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">10A432</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1038</string> + <string key="IBDocument.HIToolboxVersion">437.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">728</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -342,17 +342,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -439,7 +428,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="133743284"> + <object class="NSCustomResource" key="NSNormalImage" id="396171174"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -521,7 +510,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -560,7 +549,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -599,7 +588,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -706,7 +695,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -762,7 +750,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -773,18 +761,18 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <object class="NSButton" id="57246850"> <reference key="NSNextResponder" ref="515308735"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{37, 88}, {527, 18}}</string> + <string key="NSFrame">{{37, 88}, {533, 18}}</string> <reference key="NSSuperview" ref="515308735"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="917248662"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Mostra barra de menús automáticamente en la modalidad de pantalla completa </string> + <string key="NSContents">Mostrar barra de menús automáticamente en la modalidad de pantalla completa </string> <reference key="NSSupport" ref="463863101"/> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -839,7 +827,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -877,7 +865,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -899,7 +887,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -921,7 +909,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -943,7 +931,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1013,7 +1001,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1051,7 +1039,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1068,7 +1056,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <object class="NSTextFieldCell" key="NSCell" id="183409141"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">El punto de enfoque de la ventana de X11 sigue el cursor. Esto conlleva algunos inconvenientes.</string> + <string key="NSContents">El punto de enfoque de la ventana de X11 sigue el cursor. Esto conlleva algunos inconvenientes.</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="138261120"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -1089,7 +1077,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1140,7 +1128,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1162,7 +1150,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="133743284"/> + <reference key="NSNormalImage" ref="396171174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1984,14 +1972,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2236,7 +2216,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3041,11 +3020,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3428,8 +3402,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3464,27 +3436,19 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <string>300441.IBPluginDependency</string> <string>300447.IBPluginDependency</string> <string>300447.ImportedFromIB2</string> - <string>300447.object.labelIdentifier</string> <string>300450.IBPluginDependency</string> - <string>300450.object.labelIdentifier</string> <string>300451.IBPluginDependency</string> <string>300451.ImportedFromIB2</string> - <string>300451.object.labelIdentifier</string> <string>300452.IBPluginDependency</string> - <string>300452.object.labelIdentifier</string> <string>300453.IBPluginDependency</string> <string>300453.ImportedFromIB2</string> - <string>300453.object.labelIdentifier</string> <string>300454.IBPluginDependency</string> - <string>300454.object.labelIdentifier</string> <string>300455.IBPluginDependency</string> <string>300455.ImportedFromIB2</string> <string>300456.IBPluginDependency</string> <string>300457.IBPluginDependency</string> <string>300457.ImportedFromIB2</string> - <string>300457.object.labelIdentifier</string> <string>300458.IBPluginDependency</string> - <string>300458.object.labelIdentifier</string> <string>300459.IBPluginDependency</string> <string>300459.ImportedFromIB2</string> <string>300460.IBPluginDependency</string> @@ -3670,7 +3634,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> @@ -3734,8 +3698,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3761,27 +3723,19 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib Binary files differindex 7e584058b..408b7eea2 100644 --- a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings Binary files differnew file mode 100644 index 000000000..bf2a3336b --- /dev/null +++ b/hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings diff --git a/hw/xquartz/bundle/Resources/ar.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/ar.lproj/Localizable.strings Binary files differnew file mode 100644 index 000000000..558170441 --- /dev/null +++ b/hw/xquartz/bundle/Resources/ar.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist b/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist new file mode 100644 index 000000000..d7bcbb86c --- /dev/null +++ b/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>LprojCompatibleVersion</key> + <string>84.1</string> + <key>LprojLocale</key> + <string>ar</string> + <key>LprojRevisionLevel</key> + <string>1</string> + <key>LprojVersion</key> + <string>85</string> +</dict> +</plist> diff --git a/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib new file mode 100644 index 000000000..cf595d25e --- /dev/null +++ b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib @@ -0,0 +1,3955 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> + <data> + <int key="IBDocument.SystemTarget">1050</int> + <string key="IBDocument.SystemVersion">10A432</string> + <string key="IBDocument.InterfaceBuilderVersion">740</string> + <string key="IBDocument.AppKitVersion">1038</string> + <string key="IBDocument.HIToolboxVersion">437.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="NS.object.0">740</string> + </object> + <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="286"/> + <integer value="348"/> + </object> + <object class="NSArray" key="IBDocument.PluginDependencies"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys" id="0"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <object class="NSMutableArray" key="IBDocument.RootObjects" id="904585544"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSCustomObject" id="815810918"> + <object class="NSMutableString" key="NSClassName"> + <characters key="NS.bytes">NSApplication</characters> + </object> + </object> + <object class="NSCustomObject" id="941939442"> + <string key="NSClassName">FirstResponder</string> + </object> + <object class="NSCustomObject" id="951368722"> + <string key="NSClassName">NSApplication</string> + </object> + <object class="NSMenu" id="524015605"> + <string key="NSTitle">MainMenu</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="365880285"> + <reference key="NSMenu" ref="524015605"/> + <string key="NSTitle">X11</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <object class="NSCustomResource" key="NSOnImage" id="531645050"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuCheckmark</string> + </object> + <object class="NSCustomResource" key="NSMixedImage" id="351811234"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuMixedState</string> + </object> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="576521955"> + <string key="NSTitle">X11</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="139290918"> + <reference key="NSMenu" ref="576521955"/> + <string key="NSTitle">حول X11</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="386173216"> + <reference key="NSMenu" ref="576521955"/> + <string key="NSTitle">تفضيلات...</string> + <string key="NSKeyEquiv">,</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="272876017"> + <reference key="NSMenu" ref="576521955"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="32285361"> + <reference key="NSMenu" ref="576521955"/> + <string key="NSTitle">خدمات</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="821388474"> + <string key="NSTitle">خدمات</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <string key="NSName">_NSServicesMenu</string> + </object> + </object> + <object class="NSMenuItem" id="431301145"> + <reference key="NSMenu" ref="576521955"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="6876565"> + <reference key="NSMenu" ref="576521955"/> + <string key="NSTitle">تبديل ملء الشاشة</string> + <string key="NSKeyEquiv">a</string> + <int key="NSKeyEquivModMask">1572864</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="479677589"> + <reference key="NSMenu" ref="576521955"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="301008465"> + <reference key="NSMenu" ref="576521955"/> + <string key="NSTitle">إخفاء X11</string> + <string key="NSKeyEquiv">h</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <int key="NSTag">42</int> + </object> + <object class="NSMenuItem" id="206802571"> + <reference key="NSMenu" ref="576521955"/> + <string key="NSTitle">إخفاء الآخرين</string> + <string key="NSKeyEquiv">h</string> + <int key="NSKeyEquivModMask">1572864</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="1023546148"> + <reference key="NSMenu" ref="576521955"/> + <string key="NSTitle">إظهار الكل</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <int key="NSTag">42</int> + </object> + <object class="NSMenuItem" id="848095279"> + <reference key="NSMenu" ref="576521955"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="274138642"> + <reference key="NSMenu" ref="576521955"/> + <string key="NSTitle">إنهاء X11</string> + <string key="NSKeyEquiv">q</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + </object> + <string key="NSName">_NSAppleMenu</string> + </object> + </object> + <object class="NSMenuItem" id="868031522"> + <reference key="NSMenu" ref="524015605"/> + <string key="NSTitle">التطبيقات</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="981161348"> + <string key="NSTitle">التطبيقات</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="390088328"> + <reference key="NSMenu" ref="981161348"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="1065386165"> + <reference key="NSMenu" ref="981161348"/> + <string key="NSTitle">تخصيص...</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + </object> + </object> + </object> + <object class="NSMenuItem" id="200491363"> + <reference key="NSMenu" ref="524015605"/> + <string key="NSTitle">تحرير</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="526778998"> + <string key="NSTitle">تحرير</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="185296989"> + <reference key="NSMenu" ref="526778998"/> + <string key="NSTitle">نسخ</string> + <string key="NSKeyEquiv">c</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + </object> + </object> + </object> + <object class="NSMenuItem" id="931553638"> + <reference key="NSMenu" ref="524015605"/> + <string key="NSTitle">إطار</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="96874957"> + <string key="NSTitle">إطار</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="984461797"> + <reference key="NSMenu" ref="96874957"/> + <string key="NSTitle">إغلاق</string> + <string key="NSKeyEquiv">w</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="677652931"> + <reference key="NSMenu" ref="96874957"/> + <string key="NSTitle">تصغير</string> + <string key="NSKeyEquiv">m</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="1066447520"> + <reference key="NSMenu" ref="96874957"/> + <string key="NSTitle">تكبير/تصغير</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="280172320"> + <reference key="NSMenu" ref="96874957"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="1036389925"> + <reference key="NSMenu" ref="96874957"/> + <string key="NSTitle">تدوير عبر إطارات</string> + <string key="NSKeyEquiv">`</string> + <int key="NSKeyEquivModMask">1048840</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="369641893"> + <reference key="NSMenu" ref="96874957"/> + <string key="NSTitle">عكس التدوير عبر الإطارات</string> + <string key="NSKeyEquiv">~</string> + <int key="NSKeyEquivModMask">1179914</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="155085383"> + <reference key="NSMenu" ref="96874957"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="276216762"> + <reference key="NSMenu" ref="96874957"/> + <string key="NSTitle">إحضار الكل إلى الأمام</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="444952046"> + <reference key="NSMenu" ref="96874957"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + </object> + <string key="NSName">_NSWindowsMenu</string> + </object> + </object> + <object class="NSMenuItem" id="551174276"> + <reference key="NSMenu" ref="524015605"/> + <string key="NSTitle">تعليمات</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="511848303"> + <string key="NSTitle">تعليمات</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="504984881"> + <reference key="NSMenu" ref="511848303"/> + <string key="NSTitle">تعليمات X11</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + </object> + </object> + </object> + </object> + <string key="NSName">_NSMainMenu</string> + </object> + <object class="NSCustomObject" id="485884620"> + <string key="NSClassName">X11Controller</string> + </object> + <object class="NSWindowTemplate" id="124913468"> + <int key="NSWindowStyleMask">3</int> + <int key="NSWindowBacking">2</int> + <string key="NSWindowRect">{{266, 364}, {484, 308}}</string> + <int key="NSWTFlags">1350041600</int> + <string key="NSWindowTitle">تفضيلات X11</string> + <string key="NSWindowClass">NSPanel</string> + <object class="NSMutableString" key="NSViewClass"> + <characters key="NS.bytes">View</characters> + </object> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMinSize">{320, 240}</string> + <object class="NSView" key="NSWindowView" id="941366957"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTabView" id="448510093"> + <reference key="NSNextResponder" ref="941366957"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{13, 10}, {458, 292}}</string> + <reference key="NSSuperview" ref="941366957"/> + <object class="NSMutableArray" key="NSTabViewItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTabViewItem" id="287591690"> + <object class="NSMutableString" key="NSIdentifier"> + <characters key="NS.bytes">1</characters> + </object> + <object class="NSView" key="NSView" id="596750588"> + <reference key="NSNextResponder" ref="448510093"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="119157981"> + <reference key="NSNextResponder" ref="596750588"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{18, 207}, {402, 23}}</string> + <reference key="NSSuperview" ref="596750588"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="990762273"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">مضاهاة ماوس ثلاثي الأزرار</string> + <object class="NSFont" key="NSSupport" id="463863101"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="119157981"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <object class="NSCustomResource" key="NSNormalImage" id="884612548"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSSwitch</string> + </object> + <object class="NSButtonImageSource" key="NSAlternateImage" id="391434389"> + <string key="NSImageName">NSSwitch</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="443008216"> + <reference key="NSNextResponder" ref="596750588"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{17, 60}, {385, 31}}</string> + <reference key="NSSuperview" ref="596750588"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="391919450"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">في حالة التمكين، قد تتداخل مكافئات مفاتيح شريط القوائم مع تطبيقات X11 التي تستخدم مفتاح تعديل Meta.</string> + <object class="NSFont" key="NSSupport" id="26"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">11</double> + <int key="NSfFlags">3100</int> + </object> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="443008216"/> + <object class="NSColor" key="NSBackgroundColor" id="57160303"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlColor</string> + <object class="NSColor" key="NSColor" id="590688762"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor" id="930815747"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlTextColor</string> + <object class="NSColor" key="NSColor" id="214098874"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MAA</bytes> + </object> + </object> + </object> + </object> + <object class="NSTextField" id="282885445"> + <reference key="NSNextResponder" ref="596750588"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{17, 163}, {385, 42}}</string> + <reference key="NSSuperview" ref="596750588"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="649334366"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string type="base64-UTF8" key="NSContents">2KfYtti62Lcg2YXYuSDYp9mE2KfYs9iq2YXYsdin2LEg2LnZhNmJINmF2YHYqtin2K0g2KfZhNin2K7Y +qtmK2KfYsSDYo9mIINmF2YHYqtin2K0g2KfZhNij2YjYp9mF2LEg2KPYq9mG2KfYoSDYp9mE2YbZgtix +INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF +2YYuCg</string> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="282885445"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSButton" id="842100515"> + <reference key="NSNextResponder" ref="596750588"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{18, 92}, {402, 25}}</string> + <reference key="NSSuperview" ref="596750588"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="940564599"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">تمكين مكافئات المفاتيح في X11</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="842100515"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="31160162"> + <reference key="NSNextResponder" ref="596750588"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{17, 121}, {385, 19}}</string> + <reference key="NSSuperview" ref="596750588"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="666057093"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">السماح بكتابة تغييرات قائمة الإدخال فوق مخطط مفاتيح X11 الحالي.</string> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="31160162"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSButton" id="179949713"> + <reference key="NSNextResponder" ref="596750588"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{18, 142}, {402, 25}}</string> + <reference key="NSSuperview" ref="596750588"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="967619578"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">اتباع تصميم لوحة مفاتيح النظام</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="179949713"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrame">{{10, 33}, {438, 246}}</string> + <reference key="NSSuperview" ref="448510093"/> + </object> + <string key="NSLabel">إدخال</string> + <reference key="NSColor" ref="57160303"/> + <reference key="NSTabView" ref="448510093"/> + </object> + <object class="NSTabViewItem" id="960678392"> + <object class="NSMutableString" key="NSIdentifier"> + <characters key="NS.bytes">2</characters> + </object> + <object class="NSView" key="NSView" id="515308735"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="418227126"> + <reference key="NSNextResponder" ref="515308735"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{16, 58}, {409, 25}}</string> + <reference key="NSSuperview" ref="515308735"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="1016069354"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">استخدام تأثير تنبيه النظام</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="418227126"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="1039016593"> + <reference key="NSNextResponder" ref="515308735"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{22, 26}, {385, 31}}</string> + <reference key="NSSuperview" ref="515308735"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="624655599"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">تستخدم إشارات X11 الصوتية تنبيه النظام القياسي، كما هو محدد في لوحة تفضيلات النظام لمؤثرات الصوت.</string> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="1039016593"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSPopUpButton" id="709074847"> + <reference key="NSNextResponder" ref="515308735"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{238, 202}, {128, 26}}</string> + <reference key="NSSuperview" ref="515308735"/> + <bool key="NSEnabled">YES</bool> + <object class="NSPopUpButtonCell" key="NSCell" id="633115429"> + <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags2">67126400</int> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="709074847"/> + <int key="NSButtonFlags">109199615</int> + <int key="NSButtonFlags2">1</int> + <object class="NSFont" key="NSAlternateImage"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">16</int> + </object> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + <object class="NSMenuItem" key="NSMenuItem" id="616492372"> + <reference key="NSMenu" ref="341113515"/> + <string key="NSTitle">من شاشة العرض</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <int key="NSState">1</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <string key="NSAction">_popUpItemAction:</string> + <int key="NSTag">-1</int> + <reference key="NSTarget" ref="633115429"/> + </object> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="341113515"> + <object class="NSMutableString" key="NSTitle"> + <characters key="NS.bytes">OtherViews</characters> + </object> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="616492372"/> + <object class="NSMenuItem" id="759499526"> + <reference key="NSMenu" ref="341113515"/> + <string key="NSTitle">256 لونًا</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <string key="NSAction">_popUpItemAction:</string> + <int key="NSTag">8</int> + <reference key="NSTarget" ref="633115429"/> + </object> + <object class="NSMenuItem" id="543935434"> + <reference key="NSMenu" ref="341113515"/> + <string key="NSTitle">آلاف</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <string key="NSAction">_popUpItemAction:</string> + <int key="NSTag">15</int> + <reference key="NSTarget" ref="633115429"/> + </object> + <object class="NSMenuItem" id="836673018"> + <reference key="NSMenu" ref="341113515"/> + <string key="NSTitle">ملايين</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <string key="NSAction">_popUpItemAction:</string> + <int key="NSTag">24</int> + <reference key="NSTarget" ref="633115429"/> + </object> + </object> + <reference key="NSMenuFont" ref="463863101"/> + </object> + <int key="NSPreferredEdge">3</int> + <bool key="NSUsesItemFromMenu">YES</bool> + <bool key="NSAltersState">YES</bool> + <int key="NSArrowPosition">1</int> + </object> + </object> + <object class="NSTextField" id="201731424"> + <reference key="NSNextResponder" ref="515308735"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{369, 205}, {55, 20}}</string> + <reference key="NSSuperview" ref="515308735"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="930265681"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71303168</int> + <string type="base64-UTF8" key="NSContents">2KfZhNij2YTZiNin2YY6Cg</string> + <reference key="NSSupport" ref="463863101"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="201731424"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSTextField" id="86150604"> + <reference key="NSNextResponder" ref="515308735"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{15, 178}, {392, 19}}</string> + <reference key="NSSuperview" ref="515308735"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="311969422"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">يتم تنفيذ هذا الخيار في المرة التالية لبدء تشغيل X11.</string> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="86150604"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSButton" id="477203622"> + <reference key="NSNextResponder" ref="515308735"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{16, 149}, {409, 23}}</string> + <reference key="NSSuperview" ref="515308735"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="631531164"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">وضع ملء الشاشة</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="477203622"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="57246850"> + <reference key="NSNextResponder" ref="515308735"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{22, 84}, {384, 25}}</string> + <reference key="NSSuperview" ref="515308735"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="917248662"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">إظهار تلقائي لشريط القوائم في وضع ملء الشاشة</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="57246850"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="298603383"> + <reference key="NSNextResponder" ref="515308735"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{22, 113}, {385, 31}}</string> + <reference key="NSSuperview" ref="515308735"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="761107402"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">تمكين إطار X11 الجذري. استخدم ضغط مفاتيح الأوامر-الاختيار-A لدخول ومغادرة وضع ملء الشاشة.</string> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="298603383"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + </object> + <string key="NSFrame">{{10, 33}, {438, 246}}</string> + </object> + <string key="NSLabel">الإخراج</string> + <reference key="NSColor" ref="57160303"/> + <reference key="NSTabView" ref="448510093"/> + </object> + <object class="NSTabViewItem" id="723450037"> + <object class="NSMutableString" key="NSIdentifier"> + <characters key="NS.bytes">2</characters> + </object> + <object class="NSView" key="NSView" id="408298283"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="878106058"> + <reference key="NSNextResponder" ref="408298283"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{18, 221}, {409, 25}}</string> + <reference key="NSSuperview" ref="408298283"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="718083688"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">تمكين المزامنة</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="878106058"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="386152084"> + <reference key="NSNextResponder" ref="408298283"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{24, 184}, {385, 32}}</string> + <reference key="NSSuperview" ref="408298283"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="572508492"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">يقوم بتمكين عنصر القائمة "نسخ" ويسمح بالمزامنة بين لوحة اللصق في OSX وحافظة X11 وذاكرات التخزين المؤقت الأساسية.</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="386152084"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSButton" id="477050998"> + <reference key="NSNextResponder" ref="408298283"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{14, 93}, {394, 26}}</string> + <reference key="NSSuperview" ref="408298283"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="501304422"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">تحديث الحافظة عند إجراء تغييرات على لوحة اللصق</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="477050998"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="765780304"> + <reference key="NSNextResponder" ref="408298283"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{14, 71}, {394, 23}}</string> + <reference key="NSSuperview" ref="408298283"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="510771323"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">تحديث الذاكرة الأساسية (نقر بالزر الأوسط) عند إجراء تغييرات على لوحة اللصق</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="765780304"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="1002778833"> + <reference key="NSNextResponder" ref="408298283"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{14, 45}, {394, 25}}</string> + <reference key="NSSuperview" ref="408298283"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="897099877"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">تحديث لوحة اللصق على الفور عند تحديد نص جديد</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="1002778833"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="487809555"> + <reference key="NSNextResponder" ref="408298283"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{-1, 157}, {409, 25}}</string> + <reference key="NSSuperview" ref="408298283"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="619977658"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">تحديث لوحة اللصق عند إجراء تغييرات على الحافظة</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="487809555"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="620944856"> + <reference key="NSNextResponder" ref="408298283"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{6, 122}, {385, 31}}</string> + <reference key="NSSuperview" ref="408298283"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="461823902"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">قم بتعطيل هذا الخيار إذا كنت ترغب في استخدام xclipboard أوklipper أو أية أداة أخرى لإدارة حافظة X11.</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="620944856"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSTextField" id="522511724"> + <reference key="NSNextResponder" ref="408298283"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{-5, 14}, {396, 28}}</string> + <reference key="NSSuperview" ref="408298283"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="994587858"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">نظرًا للقيود الموجودة في بروتوكول X11، قد لا يعمل هذا الخيار دومًا في بعض التطبيقات.</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="522511724"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + </object> + <string key="NSFrame">{{10, 33}, {438, 246}}</string> + </object> + <string key="NSLabel">لوحة اللصق</string> + <reference key="NSColor" ref="57160303"/> + <reference key="NSTabView" ref="448510093"/> + </object> + <object class="NSTabViewItem" id="10973343"> + <object class="NSMutableString" key="NSIdentifier"> + <characters key="NS.bytes">2</characters> + </object> + <object class="NSView" key="NSView" id="184765684"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="657659108"> + <reference key="NSNextResponder" ref="184765684"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{15, 209}, {402, 23}}</string> + <reference key="NSSuperview" ref="184765684"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="259618205"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">النقر خلال الإطارات غير النشطة</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="657659108"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="290578835"> + <reference key="NSNextResponder" ref="184765684"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{20, 175}, {385, 31}}</string> + <reference key="NSSuperview" ref="184765684"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="399127858"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">عند تمكينه، سيؤدي النقر على إطار غير نشط إلى مرور نقرة الماوس هذه عبر هذا الإطار بالإضافة إلى تنشيطه.</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="290578835"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSButton" id="992839333"> + <reference key="NSNextResponder" ref="184765684"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{15, 146}, {402, 23}}</string> + <reference key="NSSuperview" ref="184765684"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="959555182"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">التركيز تبعًا لموضع مؤشر الماوس</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="992839333"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="138261120"> + <reference key="NSNextResponder" ref="184765684"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{20, 127}, {385, 17}}</string> + <reference key="NSSuperview" ref="184765684"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="183409141"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">يتبع تركيز إطار X11 موضع المؤشر. ولهذا بعض الآثار السلبية.</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="138261120"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSButton" id="128352289"> + <reference key="NSNextResponder" ref="184765684"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{15, 99}, {402, 23}}</string> + <reference key="NSSuperview" ref="184765684"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="556463187"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">التركيز على الإطارات الجديدة</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="128352289"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="57161931"> + <reference key="NSNextResponder" ref="184765684"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{20, 65}, {385, 31}}</string> + <reference key="NSSuperview" ref="184765684"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="989804990"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">عند تمكينه، سيؤدي إنشاء إطار X11 جديد إلى انتقال تطبيق X11.app إلى المقدمة (بدلاً من Finder.app أو Terminal.app وما إلى ذلك)</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="57161931"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + </object> + <string key="NSFrame">{{10, 33}, {438, 246}}</string> + </object> + <string key="NSLabel">Windows</string> + <reference key="NSColor" ref="57160303"/> + <reference key="NSTabView" ref="448510093"/> + </object> + <object class="NSTabViewItem" id="348328898"> + <object class="NSView" key="NSView" id="300811574"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="989050925"> + <reference key="NSNextResponder" ref="300811574"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{18, 207}, {402, 21}}</string> + <reference key="NSSuperview" ref="300811574"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="189594322"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">مصادقة الاتصالات</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="989050925"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="700826966"> + <reference key="NSNextResponder" ref="300811574"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{18, 128}, {402, 23}}</string> + <reference key="NSSuperview" ref="300811574"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="489340979"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67125376</int> + <string key="NSContents">السماح بالاتصالات من عملاء الشبكة</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="700826966"/> + <int key="NSButtonFlags">1210864127</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="884612548"/> + <reference key="NSAlternateImage" ref="391434389"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="168436707"> + <reference key="NSNextResponder" ref="300811574"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{18, 162}, {385, 42}}</string> + <reference key="NSSuperview" ref="300811574"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="53243865"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">يؤدي بدء تشغيل X11 إلى إنشاء مفاتيح تحكم في وصول Xauthority. في حالة تغيير عنوان IP للنظام، تصبح هذه المفاتيح غير صالحة، مما قد يؤدي إلى الحيلولة دون بدء تشغيل تطبيقات X11.</string> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="168436707"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSTextField" id="363817195"> + <reference key="NSNextResponder" ref="300811574"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{18, 85}, {385, 42}}</string> + <reference key="NSSuperview" ref="300811574"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="390084685"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71319680</int> + <string key="NSContents">في حالة التمكين، يجب أيضًا تمكين مصادقة الاتصالات للتأكد من تأمين النظام. وفي حالة التعطيل، لا يتم السماح بالاتصالات من تطبيقات بعيدة.</string> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="363817195"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + <object class="NSTextField" id="223835729"> + <reference key="NSNextResponder" ref="300811574"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{20, -16}, {404, 14}}</string> + <reference key="NSSuperview" ref="300811574"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="283628678"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71303168</int> + <string key="NSContents">يتم تنفيذ هذه الخيارات في المرة التالية لبدء تشغيل X11.</string> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="223835729"/> + <reference key="NSBackgroundColor" ref="57160303"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + </object> + </object> + <string key="NSFrame">{{10, 33}, {438, 246}}</string> + </object> + <string key="NSLabel">تأمين</string> + <reference key="NSColor" ref="57160303"/> + <reference key="NSTabView" ref="448510093"/> + </object> + </object> + <reference key="NSSelectedTabViewItem" ref="287591690"/> + <reference key="NSFont" ref="463863101"/> + <int key="NSTvFlags">0</int> + <bool key="NSAllowTruncatedLabels">YES</bool> + <bool key="NSDrawsBackground">YES</bool> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="596750588"/> + </object> + </object> + </object> + <string key="NSFrameSize">{484, 308}</string> + <reference key="NSSuperview"/> + </object> + <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> + <string key="NSMinSize">{320, 262}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSFrameAutosaveName">x11_prefs</string> + </object> + <object class="NSWindowTemplate" id="604417141"> + <int key="NSWindowStyleMask">11</int> + <int key="NSWindowBacking">2</int> + <string key="NSWindowRect">{{302, 440}, {454, 271}}</string> + <int key="NSWTFlags">1350041600</int> + <string key="NSWindowTitle">قائمة تطبيقات X11</string> + <string key="NSWindowClass">NSPanel</string> + <object class="NSMutableString" key="NSViewClass"> + <characters key="NS.bytes">View</characters> + </object> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMinSize">{320, 240}</string> + <object class="NSView" key="NSWindowView" id="85544634"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="671954382"> + <reference key="NSNextResponder" ref="85544634"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{18, 191}, {100, 32}}</string> + <reference key="NSSuperview" ref="85544634"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="143554520"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">137887744</int> + <string key="NSContents">تكرار</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="671954382"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">1</int> + <object class="NSFont" key="NSAlternateImage" id="549406736"> + <string key="NSName">Helvetica</string> + <double key="NSSize">13</double> + <int key="NSfFlags">16</int> + </object> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="492358940"> + <reference key="NSNextResponder" ref="85544634"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{18, 159}, {100, 32}}</string> + <reference key="NSSuperview" ref="85544634"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="8201128"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">137887744</int> + <string key="NSContents">إزالة</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="492358940"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">1</int> + <reference key="NSAlternateImage" ref="549406736"/> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSScrollView" id="1063387772"> + <reference key="NSNextResponder" ref="85544634"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSClipView" id="580565898"> + <reference key="NSNextResponder" ref="1063387772"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTableView" id="905092943"> + <reference key="NSNextResponder" ref="580565898"/> + <int key="NSvFlags">256</int> + <string key="NSFrameSize">{301, 198}</string> + <reference key="NSSuperview" ref="580565898"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTableHeaderView" key="NSHeaderView" id="792419186"> + <reference key="NSNextResponder" ref="672307654"/> + <int key="NSvFlags">256</int> + <string key="NSFrameSize">{301, 17}</string> + <reference key="NSSuperview" ref="672307654"/> + <reference key="NSTableView" ref="905092943"/> + </object> + <object class="_NSCornerView" key="NSCornerView" id="898633680"> + <reference key="NSNextResponder" ref="1063387772"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{302, 0}, {16, 17}}</string> + <reference key="NSSuperview" ref="1063387772"/> + </object> + <object class="NSMutableArray" key="NSTableColumns"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTableColumn" id="242608782"> + <double key="NSWidth">71</double> + <double key="NSMinWidth">10</double> + <double key="NSMaxWidth">1000</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">67110912</int> + <string key="NSContents">مفتاح اختصار</string> + <reference key="NSSupport" ref="26"/> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">headerColor</string> + <object class="NSColor" key="NSColor" id="822946413"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor" id="249576247"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">headerTextColor</string> + <reference key="NSColor" ref="214098874"/> + </object> + </object> + <object class="NSTextFieldCell" key="NSDataCell" id="34714764"> + <int key="NSCellFlags">338820672</int> + <int key="NSCellFlags2">67126400</int> + <string key="NSContents">Text Cell</string> + <object class="NSFont" key="NSSupport"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">12</double> + <int key="NSfFlags">16</int> + </object> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="905092943"/> + <bool key="NSDrawsBackground">YES</bool> + <object class="NSColor" key="NSBackgroundColor" id="812484075"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlBackgroundColor</string> + <reference key="NSColor" ref="590688762"/> + </object> + <reference key="NSTextColor" ref="930815747"/> + </object> + <int key="NSResizingMask">3</int> + <bool key="NSIsResizeable">YES</bool> + <bool key="NSIsEditable">YES</bool> + <reference key="NSTableView" ref="905092943"/> + <string key="NSHeaderToolTip"/> + </object> + <object class="NSTableColumn" id="84282687"> + <double key="NSWidth">99</double> + <double key="NSMinWidth">40</double> + <double key="NSMaxWidth">1000</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">67110912</int> + <string key="NSContents">الأوامر</string> + <reference key="NSSupport" ref="26"/> + <object class="NSColor" key="NSBackgroundColor" id="113872566"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes> + </object> + <reference key="NSTextColor" ref="249576247"/> + </object> + <object class="NSTextFieldCell" key="NSDataCell" id="432610585"> + <int key="NSCellFlags">338820672</int> + <int key="NSCellFlags2">67126400</int> + <string key="NSContents">Text Cell</string> + <reference key="NSSupport" ref="463863101"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="905092943"/> + <reference key="NSBackgroundColor" ref="822946413"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + <int key="NSResizingMask">3</int> + <bool key="NSIsResizeable">YES</bool> + <bool key="NSIsEditable">YES</bool> + <reference key="NSTableView" ref="905092943"/> + <string key="NSHeaderToolTip"/> + </object> + <object class="NSTableColumn" id="938444323"> + <double key="NSWidth">121.73100280761719</double> + <double key="NSMinWidth">62.730998992919922</double> + <double key="NSMaxWidth">1000</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">67110912</int> + <string key="NSContents">الاسم</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSBackgroundColor" ref="113872566"/> + <reference key="NSTextColor" ref="249576247"/> + </object> + <object class="NSTextFieldCell" key="NSDataCell" id="825378892"> + <int key="NSCellFlags">338820672</int> + <int key="NSCellFlags2">67126400</int> + <string key="NSContents">Text Cell</string> + <reference key="NSSupport" ref="463863101"/> + <string key="NSPlaceholderString"/> + <reference key="NSControlView" ref="905092943"/> + <reference key="NSBackgroundColor" ref="822946413"/> + <reference key="NSTextColor" ref="930815747"/> + </object> + <int key="NSResizingMask">3</int> + <bool key="NSIsResizeable">YES</bool> + <bool key="NSIsEditable">YES</bool> + <reference key="NSTableView" ref="905092943"/> + <string key="NSHeaderToolTip"/> + </object> + </object> + <double key="NSIntercellSpacingWidth">3</double> + <double key="NSIntercellSpacingHeight">2</double> + <reference key="NSBackgroundColor" ref="822946413"/> + <object class="NSColor" key="NSGridColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">gridColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + </object> + </object> + <double key="NSRowHeight">17</double> + <int key="NSTvFlags">1379958784</int> + <reference key="NSDelegate"/> + <reference key="NSDataSource"/> + <int key="NSColumnAutoresizingStyle">1</int> + <int key="NSDraggingSourceMaskForLocal">-1</int> + <int key="NSDraggingSourceMaskForNonLocal">0</int> + <bool key="NSAllowsTypeSelect">YES</bool> + <int key="NSTableViewDraggingDestinationStyle">0</int> + </object> + </object> + <string key="NSFrame">{{1, 17}, {301, 198}}</string> + <reference key="NSSuperview" ref="1063387772"/> + <reference key="NSNextKeyView" ref="905092943"/> + <reference key="NSDocView" ref="905092943"/> + <reference key="NSBGColor" ref="812484075"/> + <int key="NScvFlags">4</int> + </object> + <object class="NSScroller" id="842897584"> + <reference key="NSNextResponder" ref="1063387772"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{302, 17}, {15, 198}}</string> + <reference key="NSSuperview" ref="1063387772"/> + <reference key="NSTarget" ref="1063387772"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">0.99492377042770386</double> + </object> + <object class="NSScroller" id="17278747"> + <reference key="NSNextResponder" ref="1063387772"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{1, 215}, {301, 15}}</string> + <reference key="NSSuperview" ref="1063387772"/> + <int key="NSsFlags">1</int> + <reference key="NSTarget" ref="1063387772"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">0.68852460384368896</double> + </object> + <object class="NSClipView" id="672307654"> + <reference key="NSNextResponder" ref="1063387772"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="792419186"/> + </object> + <string key="NSFrame">{{1, 0}, {301, 17}}</string> + <reference key="NSSuperview" ref="1063387772"/> + <reference key="NSNextKeyView" ref="792419186"/> + <reference key="NSDocView" ref="792419186"/> + <reference key="NSBGColor" ref="812484075"/> + <int key="NScvFlags">4</int> + </object> + <reference ref="898633680"/> + </object> + <string key="NSFrame">{{122, 20}, {318, 231}}</string> + <reference key="NSSuperview" ref="85544634"/> + <reference key="NSNextKeyView" ref="580565898"/> + <int key="NSsFlags">50</int> + <reference key="NSVScroller" ref="842897584"/> + <reference key="NSHScroller" ref="17278747"/> + <reference key="NSContentView" ref="580565898"/> + <reference key="NSHeaderClipView" ref="672307654"/> + <reference key="NSCornerView" ref="898633680"/> + <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> + </object> + <object class="NSButton" id="758204686"> + <reference key="NSNextResponder" ref="85544634"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{18, 223}, {100, 32}}</string> + <reference key="NSSuperview" ref="85544634"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="1025474039"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">137887744</int> + <string key="NSContents">إضافة عنصر</string> + <reference key="NSSupport" ref="463863101"/> + <reference key="NSControlView" ref="758204686"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">1</int> + <reference key="NSAlternateImage" ref="549406736"/> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrameSize">{454, 271}</string> + <reference key="NSSuperview"/> + </object> + <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> + <string key="NSMinSize">{320, 262}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSFrameAutosaveName">x11_apps</string> + </object> + <object class="NSMenu" id="294137138"> + <string key="NSTitle">قائمة</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="318286212"> + <reference key="NSMenu" ref="294137138"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="511651072"> + <reference key="NSMenu" ref="294137138"/> + <string key="NSTitle">التطبيقات</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="48278059"> + <string key="NSTitle">التطبيقات</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="563798000"> + <reference key="NSMenu" ref="48278059"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + <object class="NSMenuItem" id="1032342329"> + <reference key="NSMenu" ref="48278059"/> + <string key="NSTitle">تخصيص…</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="531645050"/> + <reference key="NSMixedImage" ref="351811234"/> + </object> + </object> + </object> + </object> + </object> + <string key="NSName"/> + </object> + </object> + <object class="IBObjectContainer" key="IBDocument.Objects"> + <object class="NSMutableArray" key="connectionRecords"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">copy:</string> + <reference key="source" ref="941939442"/> + <reference key="destination" ref="185296989"/> + </object> + <int key="connectionID">181</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">minimize_window:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="677652931"/> + </object> + <int key="connectionID">202</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">close_window:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="984461797"/> + </object> + <int key="connectionID">205</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">zoom_window:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="1066447520"/> + </object> + <int key="connectionID">206</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">bring_to_front:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="276216762"/> + </object> + <int key="connectionID">207</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">hideOtherApplications:</string> + <reference key="source" ref="815810918"/> + <reference key="destination" ref="206802571"/> + </object> + <int key="connectionID">263</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">apps_separator</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="390088328"/> + </object> + <int key="connectionID">273</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">apps_table</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="905092943"/> + </object> + <int key="connectionID">301</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">apps_table_delete:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="492358940"/> + </object> + <int key="connectionID">303</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">apps_table_duplicate:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="671954382"/> + </object> + <int key="connectionID">304</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">apps_table_show:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="1065386165"/> + </object> + <int key="connectionID">308</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">apps_table_new:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="758204686"/> + </object> + <int key="connectionID">311</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_show:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="386173216"/> + </object> + <int key="connectionID">318</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">x11_about_item</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="139290918"/> + </object> + <int key="connectionID">321</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">enable_auth</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="989050925"/> + </object> + <int key="connectionID">387</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">enable_tcp</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="700826966"/> + </object> + <int key="connectionID">388</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">depth</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="709074847"/> + </object> + <int key="connectionID">389</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">use_sysbeep</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="418227126"/> + </object> + <int key="connectionID">390</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fake_buttons</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="119157981"/> + </object> + <int key="connectionID">391</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sync_keymap</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="179949713"/> + </object> + <int key="connectionID">392</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">enable_keyequivs</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="842100515"/> + </object> + <int key="connectionID">393</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="119157981"/> + </object> + <int key="connectionID">394</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="179949713"/> + </object> + <int key="connectionID">395</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="842100515"/> + </object> + <int key="connectionID">396</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="418227126"/> + </object> + <int key="connectionID">397</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="709074847"/> + </object> + <int key="connectionID">398</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="989050925"/> + </object> + <int key="connectionID">399</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="700826966"/> + </object> + <int key="connectionID">401</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">prefs_panel</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="124913468"/> + </object> + <int key="connectionID">402</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">x11_help:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="504984881"/> + </object> + <int key="connectionID">422</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">dockMenu</string> + <reference key="source" ref="815810918"/> + <reference key="destination" ref="294137138"/> + </object> + <int key="connectionID">426</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">dock_menu</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="294137138"/> + </object> + <int key="connectionID">428</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="815810918"/> + <reference key="destination" ref="485884620"/> + </object> + <int key="connectionID">429</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">hide:</string> + <reference key="source" ref="815810918"/> + <reference key="destination" ref="301008465"/> + </object> + <int key="connectionID">430</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">unhideAllApplications:</string> + <reference key="source" ref="815810918"/> + <reference key="destination" ref="1023546148"/> + </object> + <int key="connectionID">431</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">orderFrontStandardAboutPanel:</string> + <reference key="source" ref="815810918"/> + <reference key="destination" ref="139290918"/> + </object> + <int key="connectionID">433</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">dock_apps_menu</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="48278059"/> + </object> + <int key="connectionID">530</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">dock_window_separator</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="318286212"/> + </object> + <int key="connectionID">531</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">apps_table_show:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="1032342329"/> + </object> + <int key="connectionID">534</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">next_window:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="1036389925"/> + </object> + <int key="connectionID">539</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">previous_window:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="369641893"/> + </object> + <int key="connectionID">540</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">enable_fullscreen</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="477203622"/> + </object> + <int key="connectionID">546</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">enable_fullscreen_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="477203622"/> + </object> + <int key="connectionID">547</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">toggle_fullscreen:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="6876565"/> + </object> + <int key="connectionID">548</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">toggle_fullscreen_item</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="6876565"/> + </object> + <int key="connectionID">549</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">window_separator</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="444952046"/> + </object> + <int key="connectionID">300331</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">menu</string> + <reference key="source" ref="815810918"/> + <reference key="destination" ref="524015605"/> + </object> + <int key="connectionID">300334</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">terminate:</string> + <reference key="source" ref="815810918"/> + <reference key="destination" ref="274138642"/> + </object> + <int key="connectionID">300336</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="657659108"/> + </object> + <int key="connectionID">300389</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="992839333"/> + </object> + <int key="connectionID">300390</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="128352289"/> + </object> + <int key="connectionID">300391</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">click_through</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="657659108"/> + </object> + <int key="connectionID">300392</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">focus_follows_mouse</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="992839333"/> + </object> + <int key="connectionID">300393</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">focus_on_new_window</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="128352289"/> + </object> + <int key="connectionID">300394</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">copy_menu_item</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="185296989"/> + </object> + <int key="connectionID">300443</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sync_pasteboard</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="878106058"/> + </object> + <int key="connectionID">300444</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sync_clipboard_to_pasteboard</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="487809555"/> + </object> + <int key="connectionID">300461</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sync_pasteboard_to_clipboard</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="477050998"/> + </object> + <int key="connectionID">300462</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sync_pasteboard_to_primary</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="765780304"/> + </object> + <int key="connectionID">300463</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sync_primary_immediately</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="1002778833"/> + </object> + <int key="connectionID">300464</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="878106058"/> + </object> + <int key="connectionID">300465</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="487809555"/> + </object> + <int key="connectionID">300466</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="477050998"/> + </object> + <int key="connectionID">300467</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="765780304"/> + </object> + <int key="connectionID">300468</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="1002778833"/> + </object> + <int key="connectionID">300469</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sync_text1</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="620944856"/> + </object> + <int key="connectionID">300470</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sync_text2</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="522511724"/> + </object> + <int key="connectionID">300471</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">enable_fullscreen_menu</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="57246850"/> + </object> + <int key="connectionID">300474</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">prefs_changed:</string> + <reference key="source" ref="485884620"/> + <reference key="destination" ref="57246850"/> + </object> + <int key="connectionID">300475</int> + </object> + </object> + <object class="IBMutableOrderedSet" key="objectRecords"> + <object class="NSArray" key="orderedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBObjectRecord"> + <int key="objectID">0</int> + <reference key="object" ref="0"/> + <reference key="children" ref="904585544"/> + <nil key="parent"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-2</int> + <reference key="object" ref="815810918"/> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-1</int> + <reference key="object" ref="941939442"/> + <reference key="parent" ref="0"/> + <string key="objectName">First Responder</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-3</int> + <reference key="object" ref="951368722"/> + <reference key="parent" ref="0"/> + <string key="objectName">Application</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">29</int> + <reference key="object" ref="524015605"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="931553638"/> + <reference ref="365880285"/> + <reference ref="200491363"/> + <reference ref="868031522"/> + <reference ref="551174276"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">MainMenu</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">19</int> + <reference key="object" ref="931553638"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="96874957"/> + </object> + <reference key="parent" ref="524015605"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">24</int> + <reference key="object" ref="96874957"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="677652931"/> + <reference ref="276216762"/> + <reference ref="1066447520"/> + <reference ref="1036389925"/> + <reference ref="369641893"/> + <reference ref="155085383"/> + <reference ref="444952046"/> + <reference ref="984461797"/> + <reference ref="280172320"/> + </object> + <reference key="parent" ref="931553638"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5</int> + <reference key="object" ref="276216762"/> + <reference key="parent" ref="96874957"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">23</int> + <reference key="object" ref="677652931"/> + <reference key="parent" ref="96874957"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">92</int> + <reference key="object" ref="280172320"/> + <reference key="parent" ref="96874957"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">203</int> + <reference key="object" ref="984461797"/> + <reference key="parent" ref="96874957"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">204</int> + <reference key="object" ref="1066447520"/> + <reference key="parent" ref="96874957"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">536</int> + <reference key="object" ref="155085383"/> + <reference key="parent" ref="96874957"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">537</int> + <reference key="object" ref="1036389925"/> + <reference key="parent" ref="96874957"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">538</int> + <reference key="object" ref="369641893"/> + <reference key="parent" ref="96874957"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">56</int> + <reference key="object" ref="365880285"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="576521955"/> + </object> + <reference key="parent" ref="524015605"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">57</int> + <reference key="object" ref="576521955"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="139290918"/> + <reference ref="386173216"/> + <reference ref="32285361"/> + <reference ref="301008465"/> + <reference ref="274138642"/> + <reference ref="272876017"/> + <reference ref="431301145"/> + <reference ref="206802571"/> + <reference ref="848095279"/> + <reference ref="1023546148"/> + <reference ref="6876565"/> + <reference ref="479677589"/> + </object> + <reference key="parent" ref="365880285"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">58</int> + <reference key="object" ref="139290918"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">129</int> + <reference key="object" ref="386173216"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">131</int> + <reference key="object" ref="32285361"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="821388474"/> + </object> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">130</int> + <reference key="object" ref="821388474"/> + <reference key="parent" ref="32285361"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">134</int> + <reference key="object" ref="301008465"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">136</int> + <reference key="object" ref="274138642"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">143</int> + <reference key="object" ref="272876017"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">144</int> + <reference key="object" ref="431301145"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">145</int> + <reference key="object" ref="206802571"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">149</int> + <reference key="object" ref="848095279"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">150</int> + <reference key="object" ref="1023546148"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">544</int> + <reference key="object" ref="6876565"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">545</int> + <reference key="object" ref="479677589"/> + <reference key="parent" ref="576521955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">163</int> + <reference key="object" ref="200491363"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="526778998"/> + </object> + <reference key="parent" ref="524015605"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">169</int> + <reference key="object" ref="526778998"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="185296989"/> + </object> + <reference key="parent" ref="200491363"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">157</int> + <reference key="object" ref="185296989"/> + <reference key="parent" ref="526778998"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">269</int> + <reference key="object" ref="868031522"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="981161348"/> + </object> + <reference key="parent" ref="524015605"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">270</int> + <reference key="object" ref="981161348"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="390088328"/> + <reference ref="1065386165"/> + </object> + <reference key="parent" ref="868031522"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">272</int> + <reference key="object" ref="390088328"/> + <reference key="parent" ref="981161348"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">305</int> + <reference key="object" ref="1065386165"/> + <reference key="parent" ref="981161348"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">419</int> + <reference key="object" ref="551174276"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="511848303"/> + </object> + <reference key="parent" ref="524015605"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">420</int> + <reference key="object" ref="511848303"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="504984881"/> + </object> + <reference key="parent" ref="551174276"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">421</int> + <reference key="object" ref="504984881"/> + <reference key="parent" ref="511848303"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">196</int> + <reference key="object" ref="485884620"/> + <reference key="parent" ref="0"/> + <string key="objectName">X11Controller</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">244</int> + <reference key="object" ref="124913468"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="941366957"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">PrefsPanel</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">245</int> + <reference key="object" ref="941366957"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="448510093"/> + </object> + <reference key="parent" ref="124913468"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">348</int> + <reference key="object" ref="448510093"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="287591690"/> + <reference ref="960678392"/> + <reference ref="348328898"/> + <reference ref="10973343"/> + <reference ref="723450037"/> + </object> + <reference key="parent" ref="941366957"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">349</int> + <reference key="object" ref="287591690"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="596750588"/> + </object> + <reference key="parent" ref="448510093"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">351</int> + <reference key="object" ref="596750588"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="119157981"/> + <reference ref="443008216"/> + <reference ref="282885445"/> + <reference ref="842100515"/> + <reference ref="31160162"/> + <reference ref="179949713"/> + </object> + <reference key="parent" ref="287591690"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">363</int> + <reference key="object" ref="119157981"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="990762273"/> + </object> + <reference key="parent" ref="596750588"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">364</int> + <reference key="object" ref="443008216"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="391919450"/> + </object> + <reference key="parent" ref="596750588"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">365</int> + <reference key="object" ref="282885445"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="649334366"/> + </object> + <reference key="parent" ref="596750588"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">368</int> + <reference key="object" ref="842100515"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="940564599"/> + </object> + <reference key="parent" ref="596750588"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">369</int> + <reference key="object" ref="31160162"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="666057093"/> + </object> + <reference key="parent" ref="596750588"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">370</int> + <reference key="object" ref="179949713"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="967619578"/> + </object> + <reference key="parent" ref="596750588"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">352</int> + <reference key="object" ref="960678392"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="515308735"/> + </object> + <reference key="parent" ref="448510093"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">350</int> + <reference key="object" ref="515308735"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="709074847"/> + <reference ref="201731424"/> + <reference ref="86150604"/> + <reference ref="477203622"/> + <reference ref="57246850"/> + <reference ref="298603383"/> + <reference ref="418227126"/> + <reference ref="1039016593"/> + </object> + <reference key="parent" ref="960678392"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">371</int> + <reference key="object" ref="418227126"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1016069354"/> + </object> + <reference key="parent" ref="515308735"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">372</int> + <reference key="object" ref="1039016593"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="624655599"/> + </object> + <reference key="parent" ref="515308735"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">382</int> + <reference key="object" ref="709074847"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="633115429"/> + </object> + <reference key="parent" ref="515308735"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">385</int> + <reference key="object" ref="201731424"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="930265681"/> + </object> + <reference key="parent" ref="515308735"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">386</int> + <reference key="object" ref="86150604"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="311969422"/> + </object> + <reference key="parent" ref="515308735"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">541</int> + <reference key="object" ref="477203622"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="631531164"/> + </object> + <reference key="parent" ref="515308735"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">543</int> + <reference key="object" ref="298603383"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="761107402"/> + </object> + <reference key="parent" ref="515308735"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">353</int> + <reference key="object" ref="348328898"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="300811574"/> + </object> + <reference key="parent" ref="448510093"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">354</int> + <reference key="object" ref="300811574"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="989050925"/> + <reference ref="700826966"/> + <reference ref="168436707"/> + <reference ref="363817195"/> + <reference ref="223835729"/> + </object> + <reference key="parent" ref="348328898"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">374</int> + <reference key="object" ref="989050925"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="189594322"/> + </object> + <reference key="parent" ref="300811574"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">375</int> + <reference key="object" ref="700826966"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="489340979"/> + </object> + <reference key="parent" ref="300811574"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">376</int> + <reference key="object" ref="168436707"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="53243865"/> + </object> + <reference key="parent" ref="300811574"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">377</int> + <reference key="object" ref="363817195"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="390084685"/> + </object> + <reference key="parent" ref="300811574"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">379</int> + <reference key="object" ref="223835729"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="283628678"/> + </object> + <reference key="parent" ref="300811574"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">285</int> + <reference key="object" ref="604417141"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="85544634"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">EditPrograms</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">286</int> + <reference key="object" ref="85544634"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1063387772"/> + <reference ref="758204686"/> + <reference ref="671954382"/> + <reference ref="492358940"/> + </object> + <reference key="parent" ref="604417141"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">423</int> + <reference key="object" ref="294137138"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="318286212"/> + <reference ref="511651072"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">DockMenu</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">524</int> + <reference key="object" ref="318286212"/> + <reference key="parent" ref="294137138"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">526</int> + <reference key="object" ref="511651072"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="48278059"/> + </object> + <reference key="parent" ref="294137138"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">527</int> + <reference key="object" ref="48278059"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1032342329"/> + <reference ref="563798000"/> + </object> + <reference key="parent" ref="511651072"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">532</int> + <reference key="object" ref="1032342329"/> + <reference key="parent" ref="48278059"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">533</int> + <reference key="object" ref="563798000"/> + <reference key="parent" ref="48278059"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100363</int> + <reference key="object" ref="990762273"/> + <reference key="parent" ref="119157981"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100364</int> + <reference key="object" ref="391919450"/> + <reference key="parent" ref="443008216"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100365</int> + <reference key="object" ref="649334366"/> + <reference key="parent" ref="282885445"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100368</int> + <reference key="object" ref="940564599"/> + <reference key="parent" ref="842100515"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100369</int> + <reference key="object" ref="666057093"/> + <reference key="parent" ref="31160162"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100370</int> + <reference key="object" ref="967619578"/> + <reference key="parent" ref="179949713"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100371</int> + <reference key="object" ref="1016069354"/> + <reference key="parent" ref="418227126"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100372</int> + <reference key="object" ref="624655599"/> + <reference key="parent" ref="1039016593"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100382</int> + <reference key="object" ref="633115429"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="341113515"/> + </object> + <reference key="parent" ref="709074847"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100385</int> + <reference key="object" ref="930265681"/> + <reference key="parent" ref="201731424"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100386</int> + <reference key="object" ref="311969422"/> + <reference key="parent" ref="86150604"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100541</int> + <reference key="object" ref="631531164"/> + <reference key="parent" ref="477203622"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100543</int> + <reference key="object" ref="761107402"/> + <reference key="parent" ref="298603383"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100374</int> + <reference key="object" ref="189594322"/> + <reference key="parent" ref="989050925"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100375</int> + <reference key="object" ref="489340979"/> + <reference key="parent" ref="700826966"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100376</int> + <reference key="object" ref="53243865"/> + <reference key="parent" ref="168436707"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100377</int> + <reference key="object" ref="390084685"/> + <reference key="parent" ref="363817195"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100379</int> + <reference key="object" ref="283628678"/> + <reference key="parent" ref="223835729"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">380</int> + <reference key="object" ref="341113515"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="759499526"/> + <reference ref="616492372"/> + <reference ref="543935434"/> + <reference ref="836673018"/> + </object> + <reference key="parent" ref="633115429"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">435</int> + <reference key="object" ref="759499526"/> + <reference key="parent" ref="341113515"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">384</int> + <reference key="object" ref="616492372"/> + <reference key="parent" ref="341113515"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">383</int> + <reference key="object" ref="543935434"/> + <reference key="parent" ref="341113515"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">381</int> + <reference key="object" ref="836673018"/> + <reference key="parent" ref="341113515"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">295</int> + <reference key="object" ref="1063387772"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="792419186"/> + <reference ref="17278747"/> + <reference ref="842897584"/> + <reference ref="905092943"/> + </object> + <reference key="parent" ref="85544634"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300295</int> + <reference key="object" ref="792419186"/> + <reference key="parent" ref="1063387772"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">200295</int> + <reference key="object" ref="17278747"/> + <reference key="parent" ref="1063387772"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100295</int> + <reference key="object" ref="842897584"/> + <reference key="parent" ref="1063387772"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">296</int> + <reference key="object" ref="905092943"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="242608782"/> + <reference ref="938444323"/> + <reference ref="84282687"/> + </object> + <reference key="parent" ref="1063387772"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">535</int> + <reference key="object" ref="242608782"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="34714764"/> + </object> + <reference key="parent" ref="905092943"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">575</int> + <reference key="object" ref="34714764"/> + <reference key="parent" ref="242608782"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">298</int> + <reference key="object" ref="938444323"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="825378892"/> + </object> + <reference key="parent" ref="905092943"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">573</int> + <reference key="object" ref="825378892"/> + <reference key="parent" ref="938444323"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">297</int> + <reference key="object" ref="84282687"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="432610585"/> + </object> + <reference key="parent" ref="905092943"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">574</int> + <reference key="object" ref="432610585"/> + <reference key="parent" ref="84282687"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">310</int> + <reference key="object" ref="758204686"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1025474039"/> + </object> + <reference key="parent" ref="85544634"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100310</int> + <reference key="object" ref="1025474039"/> + <reference key="parent" ref="758204686"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">292</int> + <reference key="object" ref="671954382"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="143554520"/> + </object> + <reference key="parent" ref="85544634"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100292</int> + <reference key="object" ref="143554520"/> + <reference key="parent" ref="671954382"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">293</int> + <reference key="object" ref="492358940"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="8201128"/> + </object> + <reference key="parent" ref="85544634"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">100293</int> + <reference key="object" ref="8201128"/> + <reference key="parent" ref="492358940"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300330</int> + <reference key="object" ref="444952046"/> + <reference key="parent" ref="96874957"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300337</int> + <reference key="object" ref="10973343"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="184765684"/> + </object> + <reference key="parent" ref="448510093"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300338</int> + <reference key="object" ref="184765684"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="657659108"/> + <reference ref="290578835"/> + <reference ref="992839333"/> + <reference ref="138261120"/> + <reference ref="128352289"/> + <reference ref="57161931"/> + </object> + <reference key="parent" ref="10973343"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300358</int> + <reference key="object" ref="290578835"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="399127858"/> + </object> + <reference key="parent" ref="184765684"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300359</int> + <reference key="object" ref="657659108"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="259618205"/> + </object> + <reference key="parent" ref="184765684"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300360</int> + <reference key="object" ref="259618205"/> + <reference key="parent" ref="657659108"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300361</int> + <reference key="object" ref="399127858"/> + <reference key="parent" ref="290578835"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300362</int> + <reference key="object" ref="992839333"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="959555182"/> + </object> + <reference key="parent" ref="184765684"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300363</int> + <reference key="object" ref="959555182"/> + <reference key="parent" ref="992839333"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300364</int> + <reference key="object" ref="138261120"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="183409141"/> + </object> + <reference key="parent" ref="184765684"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300365</int> + <reference key="object" ref="183409141"/> + <reference key="parent" ref="138261120"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300368</int> + <reference key="object" ref="128352289"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="556463187"/> + </object> + <reference key="parent" ref="184765684"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300369</int> + <reference key="object" ref="556463187"/> + <reference key="parent" ref="128352289"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300370</int> + <reference key="object" ref="57161931"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="989804990"/> + </object> + <reference key="parent" ref="184765684"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300371</int> + <reference key="object" ref="989804990"/> + <reference key="parent" ref="57161931"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300421</int> + <reference key="object" ref="723450037"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="408298283"/> + </object> + <reference key="parent" ref="448510093"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300422</int> + <reference key="object" ref="408298283"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="878106058"/> + <reference ref="386152084"/> + <reference ref="487809555"/> + <reference ref="620944856"/> + <reference ref="477050998"/> + <reference ref="765780304"/> + <reference ref="1002778833"/> + <reference ref="522511724"/> + </object> + <reference key="parent" ref="723450037"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300423</int> + <reference key="object" ref="386152084"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="572508492"/> + </object> + <reference key="parent" ref="408298283"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300424</int> + <reference key="object" ref="878106058"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="718083688"/> + </object> + <reference key="parent" ref="408298283"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300440</int> + <reference key="object" ref="718083688"/> + <reference key="parent" ref="878106058"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300441</int> + <reference key="object" ref="572508492"/> + <reference key="parent" ref="386152084"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300447</int> + <reference key="object" ref="477050998"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="501304422"/> + </object> + <reference key="parent" ref="408298283"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300450</int> + <reference key="object" ref="501304422"/> + <reference key="parent" ref="477050998"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300451</int> + <reference key="object" ref="765780304"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="510771323"/> + </object> + <reference key="parent" ref="408298283"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300452</int> + <reference key="object" ref="510771323"/> + <reference key="parent" ref="765780304"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300453</int> + <reference key="object" ref="487809555"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="619977658"/> + </object> + <reference key="parent" ref="408298283"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300454</int> + <reference key="object" ref="619977658"/> + <reference key="parent" ref="487809555"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300455</int> + <reference key="object" ref="620944856"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="461823902"/> + </object> + <reference key="parent" ref="408298283"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300456</int> + <reference key="object" ref="461823902"/> + <reference key="parent" ref="620944856"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300457</int> + <reference key="object" ref="1002778833"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="897099877"/> + </object> + <reference key="parent" ref="408298283"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300458</int> + <reference key="object" ref="897099877"/> + <reference key="parent" ref="1002778833"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300459</int> + <reference key="object" ref="522511724"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="994587858"/> + </object> + <reference key="parent" ref="408298283"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300460</int> + <reference key="object" ref="994587858"/> + <reference key="parent" ref="522511724"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300472</int> + <reference key="object" ref="57246850"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="917248662"/> + </object> + <reference key="parent" ref="515308735"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">300473</int> + <reference key="object" ref="917248662"/> + <reference key="parent" ref="57246850"/> + </object> + </object> + </object> + <object class="NSMutableDictionary" key="flattenedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>-3.IBPluginDependency</string> + <string>-3.ImportedFromIB2</string> + <string>100292.IBPluginDependency</string> + <string>100293.IBPluginDependency</string> + <string>100295.IBPluginDependency</string> + <string>100295.IBShouldRemoveOnLegacySave</string> + <string>100310.IBPluginDependency</string> + <string>100363.IBPluginDependency</string> + <string>100364.IBPluginDependency</string> + <string>100365.IBPluginDependency</string> + <string>100368.IBPluginDependency</string> + <string>100369.IBPluginDependency</string> + <string>100370.IBPluginDependency</string> + <string>100371.IBPluginDependency</string> + <string>100372.IBPluginDependency</string> + <string>100374.IBPluginDependency</string> + <string>100375.IBPluginDependency</string> + <string>100376.IBPluginDependency</string> + <string>100377.IBPluginDependency</string> + <string>100379.IBPluginDependency</string> + <string>100382.IBPluginDependency</string> + <string>100385.IBPluginDependency</string> + <string>100386.IBPluginDependency</string> + <string>100541.IBPluginDependency</string> + <string>100543.IBPluginDependency</string> + <string>129.IBPluginDependency</string> + <string>129.ImportedFromIB2</string> + <string>130.IBPluginDependency</string> + <string>130.ImportedFromIB2</string> + <string>131.IBPluginDependency</string> + <string>131.ImportedFromIB2</string> + <string>134.IBPluginDependency</string> + <string>134.ImportedFromIB2</string> + <string>136.IBPluginDependency</string> + <string>136.ImportedFromIB2</string> + <string>143.IBPluginDependency</string> + <string>143.ImportedFromIB2</string> + <string>144.IBPluginDependency</string> + <string>144.ImportedFromIB2</string> + <string>145.IBPluginDependency</string> + <string>145.ImportedFromIB2</string> + <string>149.IBPluginDependency</string> + <string>149.ImportedFromIB2</string> + <string>150.IBPluginDependency</string> + <string>150.ImportedFromIB2</string> + <string>157.IBPluginDependency</string> + <string>157.ImportedFromIB2</string> + <string>163.IBPluginDependency</string> + <string>163.ImportedFromIB2</string> + <string>169.IBEditorWindowLastContentRect</string> + <string>169.IBPluginDependency</string> + <string>169.ImportedFromIB2</string> + <string>169.editorWindowContentRectSynchronizationRect</string> + <string>19.IBPluginDependency</string> + <string>19.ImportedFromIB2</string> + <string>196.ImportedFromIB2</string> + <string>200295.IBPluginDependency</string> + <string>200295.IBShouldRemoveOnLegacySave</string> + <string>203.IBPluginDependency</string> + <string>203.ImportedFromIB2</string> + <string>204.IBPluginDependency</string> + <string>204.ImportedFromIB2</string> + <string>23.IBPluginDependency</string> + <string>23.ImportedFromIB2</string> + <string>24.IBEditorWindowLastContentRect</string> + <string>24.IBPluginDependency</string> + <string>24.ImportedFromIB2</string> + <string>24.editorWindowContentRectSynchronizationRect</string> + <string>244.IBEditorWindowLastContentRect</string> + <string>244.IBPluginDependency</string> + <string>244.IBViewEditorWindowController.showingLayoutRectangles</string> + <string>244.IBWindowTemplateEditedContentRect</string> + <string>244.ImportedFromIB2</string> + <string>244.editorWindowContentRectSynchronizationRect</string> + <string>244.windowTemplate.hasMaxSize</string> + <string>244.windowTemplate.hasMinSize</string> + <string>244.windowTemplate.maxSize</string> + <string>244.windowTemplate.minSize</string> + <string>245.IBPluginDependency</string> + <string>245.ImportedFromIB2</string> + <string>269.IBPluginDependency</string> + <string>269.ImportedFromIB2</string> + <string>270.IBEditorWindowLastContentRect</string> + <string>270.IBPluginDependency</string> + <string>270.ImportedFromIB2</string> + <string>270.editorWindowContentRectSynchronizationRect</string> + <string>272.IBPluginDependency</string> + <string>272.ImportedFromIB2</string> + <string>285.IBEditorWindowLastContentRect</string> + <string>285.IBPluginDependency</string> + <string>285.IBViewEditorWindowController.showingBoundsRectangles</string> + <string>285.IBViewEditorWindowController.showingLayoutRectangles</string> + <string>285.IBWindowTemplateEditedContentRect</string> + <string>285.ImportedFromIB2</string> + <string>285.editorWindowContentRectSynchronizationRect</string> + <string>285.windowTemplate.hasMaxSize</string> + <string>285.windowTemplate.hasMinSize</string> + <string>285.windowTemplate.maxSize</string> + <string>285.windowTemplate.minSize</string> + <string>286.IBPluginDependency</string> + <string>286.ImportedFromIB2</string> + <string>29.IBEditorWindowLastContentRect</string> + <string>29.IBPluginDependency</string> + <string>29.ImportedFromIB2</string> + <string>29.editorWindowContentRectSynchronizationRect</string> + <string>292.IBPluginDependency</string> + <string>292.ImportedFromIB2</string> + <string>293.IBPluginDependency</string> + <string>293.ImportedFromIB2</string> + <string>295.IBPluginDependency</string> + <string>295.ImportedFromIB2</string> + <string>296.IBPluginDependency</string> + <string>296.ImportedFromIB2</string> + <string>297.IBPluginDependency</string> + <string>297.ImportedFromIB2</string> + <string>298.IBPluginDependency</string> + <string>298.ImportedFromIB2</string> + <string>300295.IBPluginDependency</string> + <string>300295.IBShouldRemoveOnLegacySave</string> + <string>300330.IBPluginDependency</string> + <string>300330.ImportedFromIB2</string> + <string>300337.IBPluginDependency</string> + <string>300337.ImportedFromIB2</string> + <string>300338.IBPluginDependency</string> + <string>300338.ImportedFromIB2</string> + <string>300358.IBPluginDependency</string> + <string>300358.ImportedFromIB2</string> + <string>300359.IBPluginDependency</string> + <string>300359.ImportedFromIB2</string> + <string>300360.IBPluginDependency</string> + <string>300361.IBPluginDependency</string> + <string>300362.IBPluginDependency</string> + <string>300362.ImportedFromIB2</string> + <string>300363.IBPluginDependency</string> + <string>300364.IBPluginDependency</string> + <string>300364.ImportedFromIB2</string> + <string>300365.IBPluginDependency</string> + <string>300368.IBPluginDependency</string> + <string>300368.ImportedFromIB2</string> + <string>300369.IBPluginDependency</string> + <string>300370.IBPluginDependency</string> + <string>300370.ImportedFromIB2</string> + <string>300371.IBPluginDependency</string> + <string>300421.IBPluginDependency</string> + <string>300421.ImportedFromIB2</string> + <string>300422.IBPluginDependency</string> + <string>300422.ImportedFromIB2</string> + <string>300423.IBPluginDependency</string> + <string>300423.ImportedFromIB2</string> + <string>300424.IBPluginDependency</string> + <string>300424.ImportedFromIB2</string> + <string>300440.IBPluginDependency</string> + <string>300441.IBPluginDependency</string> + <string>300447.IBPluginDependency</string> + <string>300447.ImportedFromIB2</string> + <string>300450.IBPluginDependency</string> + <string>300451.IBPluginDependency</string> + <string>300451.ImportedFromIB2</string> + <string>300452.IBPluginDependency</string> + <string>300453.IBPluginDependency</string> + <string>300453.ImportedFromIB2</string> + <string>300454.IBPluginDependency</string> + <string>300455.IBPluginDependency</string> + <string>300455.ImportedFromIB2</string> + <string>300456.IBPluginDependency</string> + <string>300457.IBPluginDependency</string> + <string>300457.ImportedFromIB2</string> + <string>300458.IBPluginDependency</string> + <string>300459.IBPluginDependency</string> + <string>300459.ImportedFromIB2</string> + <string>300460.IBPluginDependency</string> + <string>300472.IBPluginDependency</string> + <string>300472.ImportedFromIB2</string> + <string>300473.IBPluginDependency</string> + <string>305.IBPluginDependency</string> + <string>305.ImportedFromIB2</string> + <string>310.IBPluginDependency</string> + <string>310.ImportedFromIB2</string> + <string>348.IBPluginDependency</string> + <string>348.ImportedFromIB2</string> + <string>349.IBPluginDependency</string> + <string>349.ImportedFromIB2</string> + <string>350.IBPluginDependency</string> + <string>350.ImportedFromIB2</string> + <string>351.IBPluginDependency</string> + <string>351.ImportedFromIB2</string> + <string>352.IBPluginDependency</string> + <string>352.ImportedFromIB2</string> + <string>353.IBPluginDependency</string> + <string>353.ImportedFromIB2</string> + <string>354.IBPluginDependency</string> + <string>354.ImportedFromIB2</string> + <string>363.IBPluginDependency</string> + <string>363.ImportedFromIB2</string> + <string>364.IBPluginDependency</string> + <string>364.ImportedFromIB2</string> + <string>365.IBPluginDependency</string> + <string>365.ImportedFromIB2</string> + <string>368.IBPluginDependency</string> + <string>368.ImportedFromIB2</string> + <string>369.IBPluginDependency</string> + <string>369.ImportedFromIB2</string> + <string>370.IBPluginDependency</string> + <string>370.ImportedFromIB2</string> + <string>371.IBPluginDependency</string> + <string>371.ImportedFromIB2</string> + <string>372.IBPluginDependency</string> + <string>372.ImportedFromIB2</string> + <string>374.IBPluginDependency</string> + <string>374.ImportedFromIB2</string> + <string>375.IBPluginDependency</string> + <string>375.ImportedFromIB2</string> + <string>376.IBPluginDependency</string> + <string>376.ImportedFromIB2</string> + <string>377.IBPluginDependency</string> + <string>377.ImportedFromIB2</string> + <string>379.IBPluginDependency</string> + <string>379.ImportedFromIB2</string> + <string>380.IBEditorWindowLastContentRect</string> + <string>380.IBPluginDependency</string> + <string>380.ImportedFromIB2</string> + <string>381.IBPluginDependency</string> + <string>381.ImportedFromIB2</string> + <string>382.IBPluginDependency</string> + <string>382.ImportedFromIB2</string> + <string>383.IBPluginDependency</string> + <string>383.ImportedFromIB2</string> + <string>384.IBPluginDependency</string> + <string>384.ImportedFromIB2</string> + <string>385.IBPluginDependency</string> + <string>385.ImportedFromIB2</string> + <string>386.IBPluginDependency</string> + <string>386.ImportedFromIB2</string> + <string>419.IBPluginDependency</string> + <string>419.ImportedFromIB2</string> + <string>420.IBPluginDependency</string> + <string>420.ImportedFromIB2</string> + <string>421.IBPluginDependency</string> + <string>421.ImportedFromIB2</string> + <string>423.IBPluginDependency</string> + <string>423.ImportedFromIB2</string> + <string>435.IBPluginDependency</string> + <string>435.ImportedFromIB2</string> + <string>5.IBPluginDependency</string> + <string>5.ImportedFromIB2</string> + <string>524.IBPluginDependency</string> + <string>524.ImportedFromIB2</string> + <string>526.IBPluginDependency</string> + <string>526.ImportedFromIB2</string> + <string>527.IBPluginDependency</string> + <string>527.ImportedFromIB2</string> + <string>532.IBPluginDependency</string> + <string>532.ImportedFromIB2</string> + <string>533.IBPluginDependency</string> + <string>533.ImportedFromIB2</string> + <string>535.IBPluginDependency</string> + <string>535.ImportedFromIB2</string> + <string>536.IBPluginDependency</string> + <string>536.ImportedFromIB2</string> + <string>537.IBPluginDependency</string> + <string>537.ImportedFromIB2</string> + <string>538.IBPluginDependency</string> + <string>538.ImportedFromIB2</string> + <string>541.IBPluginDependency</string> + <string>541.ImportedFromIB2</string> + <string>543.IBPluginDependency</string> + <string>543.ImportedFromIB2</string> + <string>544.IBPluginDependency</string> + <string>544.ImportedFromIB2</string> + <string>545.IBPluginDependency</string> + <string>545.ImportedFromIB2</string> + <string>56.IBPluginDependency</string> + <string>56.ImportedFromIB2</string> + <string>57.IBEditorWindowLastContentRect</string> + <string>57.IBPluginDependency</string> + <string>57.ImportedFromIB2</string> + <string>57.editorWindowContentRectSynchronizationRect</string> + <string>573.IBPluginDependency</string> + <string>573.ImportedFromIB2</string> + <string>574.IBPluginDependency</string> + <string>574.ImportedFromIB2</string> + <string>575.IBPluginDependency</string> + <string>575.ImportedFromIB2</string> + <string>58.IBPluginDependency</string> + <string>58.ImportedFromIB2</string> + <string>92.IBPluginDependency</string> + <string>92.ImportedFromIB2</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{168, 821}, {113, 23}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{202, 626}, {154, 153}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{349, 858}, {315, 153}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{271, 666}, {301, 153}}</string> + <string>{{537, 464}, {484, 308}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES"/> + <string>{{537, 464}, {484, 308}}</string> + <integer value="1"/> + <string>{{184, 290}, {481, 345}}</string> + <integer value="0"/> + <integer value="1"/> + <string>{3.40282e+38, 3.40282e+38}</string> + <string>{320, 240}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{58, 803}, {155, 33}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{100, 746}, {155, 33}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{339, 212}, {454, 271}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <integer value="1"/> + <string>{{339, 212}, {454, 271}}</string> + <integer value="1"/> + <string>{{433, 406}, {486, 327}}</string> + <integer value="0"/> + <integer value="1"/> + <string>{3.40282e+38, 3.40282e+38}</string> + <string>{320, 240}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{145, 1011}, {274, 20}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{67, 819}, {336, 20}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{787, 632}, {152, 83}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{20, 641}, {218, 203}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{79, 616}, {218, 203}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + </object> + </object> + <object class="NSMutableDictionary" key="unlocalizedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="activeLocalization"/> + <object class="NSMutableDictionary" key="localizations"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="sourceID"/> + <int key="maxID">300475</int> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"> + <object class="NSMutableArray" key="referencedPartialClassDescriptions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">FirstResponder</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSFormatter</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">X11Controller</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> + </object> + </object> + <int key="IBDocument.localizationMode">0</int> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> + <integer value="1050" key="NS.object.0"/> + </object> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> + <integer value="3000" key="NS.object.0"/> + </object> + <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> + <string key="IBDocument.LastKnownRelativeProjectPath">../X11.xcodeproj</string> + <int key="IBDocument.defaultPropertyAccessControl">3</int> + </data> +</archive> diff --git a/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib Binary files differnew file mode 100644 index 000000000..08c879639 --- /dev/null +++ b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings Binary files differindex dfe842313..e40b4d126 100644 --- a/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/da.lproj/locversion.plist b/hw/xquartz/bundle/Resources/da.lproj/locversion.plist index 830e3a7e5..9ca0dff29 100644 --- a/hw/xquartz/bundle/Resources/da.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/da.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>da</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib index 4b87938d1..2810e5269 100644 --- a/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">729</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">729</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -341,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -397,7 +386,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <nil key="NSNextResponder"/> @@ -438,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="926625722"> + <object class="NSCustomResource" key="NSNormalImage" id="48310192"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -521,7 +510,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -560,7 +549,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -599,7 +588,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -706,7 +695,6 @@ ZW4uCg</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -762,7 +750,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -784,7 +772,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -839,7 +827,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -877,7 +865,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -899,7 +887,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -921,7 +909,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -943,7 +931,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1013,7 +1001,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1051,7 +1039,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1089,7 +1077,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1140,7 +1128,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1162,7 +1150,7 @@ ZW4uCg</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="926625722"/> + <reference key="NSNormalImage" ref="48310192"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1244,7 +1232,7 @@ ZW4uCg</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1257,7 +1245,7 @@ ZW4uCg</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1557,7 +1545,7 @@ ZW4uCg</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1980,14 +1968,6 @@ ZW4uCg</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2232,7 +2212,6 @@ ZW4uCg</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3037,11 +3016,6 @@ ZW4uCg</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3423,8 +3397,6 @@ ZW4uCg</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3657,7 +3629,7 @@ ZW4uCg</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> @@ -3720,8 +3692,6 @@ ZW4uCg</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> diff --git a/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib Binary files differindex df8c01bf4..e0c669aa2 100644 --- a/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings Binary files differindex 7135063cc..f7c621915 100644 --- a/hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/fi.lproj/locversion.plist b/hw/xquartz/bundle/Resources/fi.lproj/locversion.plist index b0894cfb0..a14e32970 100644 --- a/hw/xquartz/bundle/Resources/fi.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/fi.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>fi</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib index 808633e02..a67e3d769 100644 --- a/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib @@ -2,17 +2,16 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">728</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">10A432</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1038</string> + <string key="IBDocument.HIToolboxVersion">437.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">728</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="348"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -238,7 +237,7 @@ <reference key="NSMixedImage" ref="351811234"/> <string key="NSAction">submenuAction:</string> <object class="NSMenu" key="NSSubmenu" id="526778998"> - <string key="NSTitle">Muokkaus</string> + <string key="NSTitle">Muokkaa</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="185296989"> @@ -342,24 +341,13 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> </object> <object class="NSMenuItem" id="551174276"> <reference key="NSMenu" ref="524015605"/> - <string key="NSTitle">Ohjeet</string> + <string key="NSTitle">Ohje</string> <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> @@ -367,12 +355,12 @@ <reference key="NSMixedImage" ref="351811234"/> <string key="NSAction">submenuAction:</string> <object class="NSMenu" key="NSSubmenu" id="511848303"> - <string key="NSTitle">Ohjeet</string> + <string key="NSTitle">Ohje</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="504984881"> <reference key="NSMenu" ref="511848303"/> - <string key="NSTitle">X11-ohjeet</string> + <string key="NSTitle">X11-ohje</string> <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> @@ -398,7 +386,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <reference key="NSNextResponder"/> @@ -410,6 +398,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{13, 10}, {604, 307}}</string> <reference key="NSSuperview" ref="941366957"/> + <reference key="NSWindow"/> <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTabViewItem" id="287591690"> @@ -426,6 +415,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 225}, {402, 18}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="990762273"> <int key="NSCellFlags">67239424</int> @@ -439,7 +429,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="752669876"> + <object class="NSCustomResource" key="NSNormalImage" id="160062581"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -457,6 +447,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 78}, {488, 28}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="391919450"> <int key="NSCellFlags">67239424</int> @@ -475,7 +466,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor" id="590688762"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> </object> </object> <object class="NSColor" key="NSTextColor" id="930815747"> @@ -494,12 +485,13 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 177}, {488, 42}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="649334366"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> <string type="base64-UTF8" key="NSContents">QWt0aXZvaSBoaWlyZW4ga2Vza2ktIHRhaSBvaWtlYSBwYWluaWtlIHBpdMOkbcOkbGzDpCBPcHRpby0g -dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> +dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgbmFwc2F1dGV0dGFlc3NhLgo</string> <reference key="NSSupport" ref="26"/> <string key="NSPlaceholderString"/> <reference key="NSControlView" ref="282885445"/> @@ -512,6 +504,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 112}, {402, 18}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="940564599"> <int key="NSCellFlags">67239424</int> @@ -521,7 +514,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -534,6 +527,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 141}, {385, 14}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="666057093"> <int key="NSCellFlags">67239424</int> @@ -551,6 +545,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 161}, {402, 18}}</string> <reference key="NSSuperview" ref="596750588"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="967619578"> <int key="NSCellFlags">67239424</int> @@ -560,7 +555,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -571,6 +566,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> </object> <string key="NSFrame">{{10, 33}, {584, 261}}</string> <reference key="NSSuperview" ref="448510093"/> + <reference key="NSWindow"/> </object> <string key="NSLabel">Syöte</string> <reference key="NSColor" ref="57160303"/> @@ -599,7 +595,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -706,7 +702,6 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -762,7 +757,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -784,7 +779,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -828,7 +823,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSButton" id="878106058"> <reference key="NSNextResponder" ref="408298283"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{11, 237}, {409, 23}}</string> + <string key="NSFrame">{{1, 237}, {409, 23}}</string> <reference key="NSSuperview" ref="408298283"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="718083688"> @@ -839,7 +834,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -850,7 +845,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSTextField" id="386152084"> <reference key="NSNextResponder" ref="408298283"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{30, 189}, {534, 42}}</string> + <string key="NSFrame">{{19, 189}, {534, 42}}</string> <reference key="NSSuperview" ref="408298283"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="572508492"> @@ -866,7 +861,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSButton" id="477050998"> <reference key="NSNextResponder" ref="408298283"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{28, 102}, {410, 18}}</string> + <string key="NSFrame">{{11, 102}, {410, 18}}</string> <reference key="NSSuperview" ref="408298283"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="501304422"> @@ -877,7 +872,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -888,18 +883,18 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSButton" id="765780304"> <reference key="NSNextResponder" ref="408298283"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{28, 69}, {553, 18}}</string> + <string key="NSFrame">{{11, 69}, {572, 18}}</string> <reference key="NSSuperview" ref="408298283"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="510771323"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Päivitä X11:n ensisijainen valinta (keskiosoitus), kun Mac OS X:n leikepöytä muuttuu</string> + <string key="NSContents">Päivitä X11:n ensisijainen valinta (keskinapsautus), kun Mac OS X:n leikepöytä muuttuu</string> <reference key="NSSupport" ref="463863101"/> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -910,7 +905,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSButton" id="1002778833"> <reference key="NSNextResponder" ref="408298283"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{28, 33}, {409, 23}}</string> + <string key="NSFrame">{{11, 33}, {409, 23}}</string> <reference key="NSSuperview" ref="408298283"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="897099877"> @@ -921,7 +916,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -932,7 +927,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSButton" id="487809555"> <reference key="NSNextResponder" ref="408298283"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{28, 165}, {438, 18}}</string> + <string key="NSFrame">{{11, 165}, {438, 18}}</string> <reference key="NSSuperview" ref="408298283"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="619977658"> @@ -943,7 +938,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -954,7 +949,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSTextField" id="620944856"> <reference key="NSNextResponder" ref="408298283"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{42, 131}, {522, 28}}</string> + <string key="NSFrame">{{25, 131}, {522, 28}}</string> <reference key="NSSuperview" ref="408298283"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="461823902"> @@ -970,7 +965,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSTextField" id="522511724"> <reference key="NSNextResponder" ref="408298283"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{42, 2}, {522, 28}}</string> + <string key="NSFrame">{{25, 2}, {522, 28}}</string> <reference key="NSSuperview" ref="408298283"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="994587858"> @@ -1002,18 +997,18 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSButton" id="657659108"> <reference key="NSNextResponder" ref="184765684"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{15, 227}, {299, 18}}</string> + <string key="NSFrame">{{15, 227}, {318, 18}}</string> <reference key="NSSuperview" ref="184765684"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="259618205"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Huomioi osoitukset ei-aktiivisiin ikkunoihin</string> + <string key="NSContents">Huomioi napsautukset ei-aktiivisiin ikkunoihin</string> <reference key="NSSupport" ref="463863101"/> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1030,7 +1025,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSTextFieldCell" key="NSCell" id="399127858"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Kun käytössä, ei-aktiivisen ikkunan osoittaminen saa hiiren osoituksen kulkemaan kyseiselle ikkunalle sen aktivoimisen lisäksi.</string> + <string key="NSContents">Kun käytössä, ei-aktiivisen ikkunan napsauttaminen saa hiiren napsautuksen kulkemaan kyseiselle ikkunalle sen aktivoimisen lisäksi.</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="290578835"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -1051,7 +1046,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1089,7 +1084,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1140,7 +1135,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1162,7 +1157,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="752669876"/> + <reference key="NSNormalImage" ref="160062581"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1242,10 +1237,11 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> </object> <string key="NSFrameSize">{625, 323}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1258,7 +1254,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1357,7 +1353,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSSupport" ref="26"/> <object class="NSColor" key="NSBackgroundColor" id="113872566"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes> + <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes> </object> <object class="NSColor" key="NSTextColor" id="249576247"> <int key="NSColorSpace">6</int> @@ -1479,7 +1475,6 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> </object> <string key="NSFrame">{{1, 17}, {301, 198}}</string> <reference key="NSSuperview" ref="1063387772"/> - <reference key="NSNextKeyView" ref="905092943"/> <reference key="NSDocView" ref="905092943"/> <reference key="NSBGColor" ref="812484075"/> <int key="NScvFlags">4</int> @@ -1491,7 +1486,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="NSSuperview" ref="1063387772"/> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.99492380000000002</double> + <double key="NSPercent">0.99492377042770386</double> </object> <object class="NSScroller" id="17278747"> <reference key="NSNextResponder" ref="1063387772"/> @@ -1501,7 +1496,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.68852460000000004</double> + <double key="NSPercent">0.68852460384368896</double> </object> <object class="NSClipView" id="672307654"> <reference key="NSNextResponder" ref="1063387772"/> @@ -1512,7 +1507,6 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> </object> <string key="NSFrame">{{1, 0}, {301, 17}}</string> <reference key="NSSuperview" ref="1063387772"/> - <reference key="NSNextKeyView" ref="792419186"/> <reference key="NSDocView" ref="792419186"/> <reference key="NSBGColor" ref="812484075"/> <int key="NScvFlags">4</int> @@ -1521,7 +1515,6 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> </object> <string key="NSFrame">{{20, 20}, {318, 231}}</string> <reference key="NSSuperview" ref="85544634"/> - <reference key="NSNextKeyView" ref="580565898"/> <int key="NSsFlags">50</int> <reference key="NSVScroller" ref="842897584"/> <reference key="NSHScroller" ref="17278747"/> @@ -1558,7 +1551,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1981,14 +1974,6 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2233,7 +2218,6 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3038,11 +3022,6 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3164,13 +3143,13 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="878106058"/> + <reference ref="386152084"/> <reference ref="487809555"/> <reference ref="620944856"/> <reference ref="477050998"/> <reference ref="765780304"/> <reference ref="1002778833"/> <reference ref="522511724"/> - <reference ref="386152084"/> </object> <reference key="parent" ref="723450037"/> </object> @@ -3316,6 +3295,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <string>100363.IBPluginDependency</string> <string>100364.IBPluginDependency</string> <string>100365.IBPluginDependency</string> + <string>100365.object.labelIdentifier</string> <string>100368.IBPluginDependency</string> <string>100369.IBPluginDependency</string> <string>100370.IBPluginDependency</string> @@ -3359,6 +3339,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <string>169.IBPluginDependency</string> <string>169.ImportedFromIB2</string> <string>169.editorWindowContentRectSynchronizationRect</string> + <string>169.object.labelIdentifier</string> <string>19.IBPluginDependency</string> <string>19.ImportedFromIB2</string> <string>196.ImportedFromIB2</string> @@ -3424,8 +3405,6 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3434,8 +3413,11 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <string>300358.ImportedFromIB2</string> <string>300359.IBPluginDependency</string> <string>300359.ImportedFromIB2</string> + <string>300359.object.labelIdentifier</string> <string>300360.IBPluginDependency</string> + <string>300360.object.labelIdentifier</string> <string>300361.IBPluginDependency</string> + <string>300361.object.labelIdentifier</string> <string>300362.IBPluginDependency</string> <string>300362.ImportedFromIB2</string> <string>300363.IBPluginDependency</string> @@ -3547,10 +3529,14 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <string>386.ImportedFromIB2</string> <string>419.IBPluginDependency</string> <string>419.ImportedFromIB2</string> + <string>419.object.labelIdentifier</string> <string>420.IBPluginDependency</string> <string>420.ImportedFromIB2</string> + <string>420.object.labelIdentifier</string> <string>421.IBPluginDependency</string> <string>421.ImportedFromIB2</string> + <string>421.object.labelIdentifier</string> + <string>423.IBEditorWindowLastContentRect</string> <string>423.IBPluginDependency</string> <string>423.ImportedFromIB2</string> <string>435.IBPluginDependency</string> @@ -3612,6 +3598,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3655,6 +3642,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{202, 626}, {154, 153}}</string> + <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <integer value="1"/> @@ -3666,13 +3654,13 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> - <string>{{437, 683}, {625, 323}}</string> + <string>{{437, 533}, {625, 323}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{437, 683}, {625, 323}}</string> + <string>{{437, 533}, {625, 323}}</string> <integer value="1"/> <string>{{184, 290}, {481, 345}}</string> <integer value="0"/> @@ -3689,11 +3677,11 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <string>{{100, 746}, {155, 33}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{68, 585}, {454, 271}}</string> + <string>{{68, 585}, {469, 271}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <integer value="1"/> - <string>{{68, 585}, {454, 271}}</string> + <string>{{68, 585}, {469, 271}}</string> <integer value="1"/> <string>{{433, 406}, {486, 327}}</string> <integer value="0"/> @@ -3702,7 +3690,7 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <string>{320, 240}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{145, 1011}, {336, 20}}</string> + <string>{{145, 836}, {344, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{67, 819}, {336, 20}}</string> @@ -3728,10 +3716,11 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3843,10 +3832,14 @@ dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <string>IBBuiltInLabel-Red</string> + <string>{{525, 477}, {128, 33}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib Binary files differindex e444ebf40..b84872e19 100644 --- a/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings Binary files differindex 33e0da528..60c9f8830 100644 --- a/hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/ko.lproj/locversion.plist b/hw/xquartz/bundle/Resources/ko.lproj/locversion.plist index a51ab9384..832fcb47e 100644 --- a/hw/xquartz/bundle/Resources/ko.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/ko.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>ko</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib index 1272b74fa..5ed9b42fe 100644 --- a/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">729</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">729</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -341,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -397,7 +386,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <nil key="NSNextResponder"/> @@ -438,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="1052652531"> + <object class="NSCustomResource" key="NSNormalImage" id="1046483745"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -521,7 +510,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -560,7 +549,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -599,7 +588,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -706,7 +695,6 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -762,7 +750,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -784,7 +772,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -839,7 +827,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -877,7 +865,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -899,7 +887,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -921,7 +909,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -943,7 +931,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1013,7 +1001,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1051,7 +1039,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1089,7 +1077,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1140,7 +1128,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1162,7 +1150,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="1052652531"/> + <reference key="NSNormalImage" ref="1046483745"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1244,7 +1232,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1257,7 +1245,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1557,7 +1545,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1980,14 +1968,6 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2232,7 +2212,6 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3037,11 +3016,6 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3423,8 +3397,6 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3657,7 +3629,7 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> @@ -3720,8 +3692,6 @@ pbTqs6Ag7J6I7Jy87Iut7Iuc7JikLgo</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> diff --git a/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib Binary files differindex f8d3ac4b0..f60e5d4e7 100644 --- a/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings Binary files differindex 68d86fd78..506282a4e 100644 --- a/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/no.lproj/locversion.plist b/hw/xquartz/bundle/Resources/no.lproj/locversion.plist index 1686e3ff2..e4d6608b9 100644 --- a/hw/xquartz/bundle/Resources/no.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/no.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>no</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib index 8b624e0ba..73faf775e 100644 --- a/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">729</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">729</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -341,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -397,7 +386,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <nil key="NSNextResponder"/> @@ -438,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="261155123"> + <object class="NSCustomResource" key="NSNormalImage" id="1038019362"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -520,7 +509,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -559,7 +548,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -598,7 +587,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -705,7 +694,6 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -761,7 +749,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -783,7 +771,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -838,7 +826,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -876,7 +864,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -898,7 +886,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -920,7 +908,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -942,7 +930,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1012,7 +1000,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1050,7 +1038,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1088,7 +1076,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1139,7 +1127,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1161,7 +1149,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="261155123"/> + <reference key="NSNormalImage" ref="1038019362"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1243,7 +1231,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1256,7 +1244,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1556,7 +1544,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1979,14 +1967,6 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2231,7 +2211,6 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3036,11 +3015,6 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3422,8 +3396,6 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3656,7 +3628,7 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> @@ -3719,8 +3691,6 @@ IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> diff --git a/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib Binary files differindex 562302f71..30933f438 100644 --- a/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings Binary files differindex 9a709d306..fe1ebfedd 100644 --- a/hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist b/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist index 74cab979a..90966d8d7 100644 --- a/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>pl</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib index c6ccb24ce..1428ba68d 100644 --- a/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">729</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">729</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -341,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -397,7 +386,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <nil key="NSNextResponder"/> @@ -438,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="574619022"> + <object class="NSCustomResource" key="NSNormalImage" id="971413174"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -460,7 +449,7 @@ <object class="NSTextFieldCell" key="NSCell" id="391919450"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Gdy włączone, równoważniki klawiszowe paska menu mogą kolidować z programami X11 używającymi modyfikatora Meta.</string> + <string key="NSContents">Równoważniki klawiszowe paska menu będą mogły kolidować z programami X11 używającymi modyfikatora Meta.</string> <object class="NSFont" key="NSSupport" id="26"> <string key="NSName">LucidaGrande</string> <double key="NSSize">11</double> @@ -520,7 +509,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -559,7 +548,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -598,7 +587,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -705,7 +694,6 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -761,7 +749,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -783,7 +771,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -838,7 +826,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -876,7 +864,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -898,7 +886,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -920,7 +908,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -942,7 +930,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1012,7 +1000,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1029,7 +1017,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <object class="NSTextFieldCell" key="NSCell" id="399127858"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Gdy włączone, kliknięcie nieaktywnego okna powoduje jego uaktywnienie i przeniesienie do niego fokusu.</string> + <string key="NSContents">Lliknięcie nieaktywnego okna będzie powodowało jego uaktywnienie i przeniesienie do niego fokusu.</string> <reference key="NSSupport" ref="26"/> <string key="NSPlaceholderString"/> <reference key="NSControlView" ref="290578835"/> @@ -1051,7 +1039,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1090,7 +1078,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1107,7 +1095,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <object class="NSTextFieldCell" key="NSCell" id="989804990"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Gdy włączone, otwarcie nowego okna X11 powoduje umieszczenie programu X11.app na wierzchu (zamiast Finder.app, Terminal.app itd.).</string> + <string key="NSContents">Otwarcie nowego okna X11 będzie powodowało umieszczenie programu X11.app na wierzchu (zamiast Finder.app, Terminal.app itd.).</string> <reference key="NSSupport" ref="26"/> <string key="NSPlaceholderString"/> <reference key="NSControlView" ref="57161931"/> @@ -1142,7 +1130,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1159,12 +1147,12 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <object class="NSButtonCell" key="NSCell" id="489340979"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Pozwól na połączenia od klientów sieciowych</string> + <string key="NSContents">Pozwalaj na połączenia od klientów sieciowych</string> <reference key="NSSupport" ref="463863101"/> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="574619022"/> + <reference key="NSNormalImage" ref="971413174"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1246,7 +1234,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1254,12 +1242,12 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <int key="NSWindowBacking">2</int> <string key="NSWindowRect">{{333, 380}, {454, 271}}</string> <int key="NSWTFlags">1350041600</int> - <string key="NSWindowTitle">Menu programu X11</string> + <string key="NSWindowTitle">Menu programów X11</string> <string key="NSWindowClass">NSPanel</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1562,7 +1550,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1985,14 +1973,6 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2237,7 +2217,6 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3042,11 +3021,6 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3428,8 +3402,6 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3662,7 +3634,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> @@ -3725,8 +3697,6 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> diff --git a/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib Binary files differindex d9aedb230..e20f6bf99 100644 --- a/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings Binary files differindex 8cd9fecef..026c9db6e 100644 --- a/hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist b/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist index 57f20c518..9c2dbad4b 100644 --- a/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>pt</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib index 8d3829d76..7d11f48eb 100644 --- a/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">729</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">729</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -341,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -397,7 +386,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <nil key="NSNextResponder"/> @@ -438,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="213987313"> + <object class="NSCustomResource" key="NSNormalImage" id="619225576"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -521,7 +510,7 @@ ZS4KA</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -560,7 +549,7 @@ ZS4KA</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -599,7 +588,7 @@ ZS4KA</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -706,7 +695,6 @@ ZS4KA</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -762,7 +750,7 @@ ZS4KA</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -784,7 +772,7 @@ ZS4KA</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -839,7 +827,7 @@ ZS4KA</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -877,7 +865,7 @@ ZS4KA</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -899,7 +887,7 @@ ZS4KA</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -921,7 +909,7 @@ ZS4KA</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -943,7 +931,7 @@ ZS4KA</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1013,7 +1001,7 @@ ZS4KA</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1051,7 +1039,7 @@ ZS4KA</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1089,7 +1077,7 @@ ZS4KA</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1140,7 +1128,7 @@ ZS4KA</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1162,7 +1150,7 @@ ZS4KA</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="213987313"/> + <reference key="NSNormalImage" ref="619225576"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1244,7 +1232,7 @@ ZS4KA</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1257,7 +1245,7 @@ ZS4KA</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1557,7 +1545,7 @@ ZS4KA</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1980,14 +1968,6 @@ ZS4KA</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2232,7 +2212,6 @@ ZS4KA</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3037,11 +3016,6 @@ ZS4KA</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3423,8 +3397,6 @@ ZS4KA</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3657,7 +3629,7 @@ ZS4KA</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> @@ -3720,8 +3692,6 @@ ZS4KA</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> diff --git a/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib Binary files differindex 3dbd44f7a..5f08c8bf2 100644 --- a/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings Binary files differindex 72d22b5d6..74bd3a0dc 100644 --- a/hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist b/hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist index e60ce65f6..42ca3d2ff 100644 --- a/hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>pt_PT</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib index a5d3cdda6..d2b7c017c 100644 --- a/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib @@ -2,17 +2,16 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">728</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">728</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="348"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -342,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -398,10 +386,10 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -439,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="893401365"> + <object class="NSCustomResource" key="NSNormalImage" id="668135692"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -521,7 +509,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -560,7 +548,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -599,7 +587,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -706,7 +694,6 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -762,7 +749,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -784,7 +771,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -839,7 +826,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -856,7 +843,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <object class="NSTextFieldCell" key="NSCell" id="572508492"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Activa o item de menu "copiar" e permite a sincronização entre a área de colagem do OS X e os buffers CLIPBOARD e PRIMARY do X11.</string> + <string key="NSContents">Activa o elemento de menu "copiar" e permite a sincronização entre a área de colagem do OS X e os buffers CLIPBOARD e PRIMARY do X11.</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="386152084"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -877,7 +864,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -899,7 +886,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -921,7 +908,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -943,7 +930,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1013,7 +1000,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1051,7 +1038,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1089,7 +1076,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1140,7 +1127,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1162,7 +1149,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="893401365"/> + <reference key="NSNormalImage" ref="668135692"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1241,11 +1228,10 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> </object> </object> <string key="NSFrameSize">{633, 308}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1258,7 +1244,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1501,7 +1487,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.97894736842105268</double> + <double key="NSPercent">0.68852460000000004</double> </object> <object class="NSClipView" id="672307654"> <reference key="NSNextResponder" ref="1063387772"/> @@ -1558,7 +1544,7 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1981,14 +1967,6 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2233,7 +2211,6 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3038,11 +3015,6 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3376,7 +3348,6 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <string>24.editorWindowContentRectSynchronizationRect</string> <string>244.IBEditorWindowLastContentRect</string> <string>244.IBPluginDependency</string> - <string>244.IBViewEditorWindowController.showingLayoutRectangles</string> <string>244.IBWindowTemplateEditedContentRect</string> <string>244.ImportedFromIB2</string> <string>244.editorWindowContentRectSynchronizationRect</string> @@ -3425,8 +3396,6 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3461,27 +3430,19 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <string>300441.IBPluginDependency</string> <string>300447.IBPluginDependency</string> <string>300447.ImportedFromIB2</string> - <string>300447.object.labelIdentifier</string> <string>300450.IBPluginDependency</string> - <string>300450.object.labelIdentifier</string> <string>300451.IBPluginDependency</string> <string>300451.ImportedFromIB2</string> - <string>300451.object.labelIdentifier</string> <string>300452.IBPluginDependency</string> - <string>300452.object.labelIdentifier</string> <string>300453.IBPluginDependency</string> <string>300453.ImportedFromIB2</string> - <string>300453.object.labelIdentifier</string> <string>300454.IBPluginDependency</string> - <string>300454.object.labelIdentifier</string> <string>300455.IBPluginDependency</string> <string>300455.ImportedFromIB2</string> <string>300456.IBPluginDependency</string> <string>300457.IBPluginDependency</string> <string>300457.ImportedFromIB2</string> - <string>300457.object.labelIdentifier</string> <string>300458.IBPluginDependency</string> - <string>300458.object.labelIdentifier</string> <string>300459.IBPluginDependency</string> <string>300459.ImportedFromIB2</string> <string>300460.IBPluginDependency</string> @@ -3667,14 +3628,13 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> - <string>{{437, 698}, {633, 308}}</string> + <string>{{437, 749}, {484, 308}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>{{437, 698}, {633, 308}}</string> + <string>{{437, 749}, {484, 308}}</string> <integer value="1"/> <string>{{184, 290}, {481, 345}}</string> <integer value="0"/> @@ -3731,8 +3691,6 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3758,27 +3716,19 @@ cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib Binary files differindex e48620b80..ff75065ec 100644 --- a/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings Binary files differindex f172a8f72..dde9c3dce 100644 --- a/hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/ru.lproj/locversion.plist b/hw/xquartz/bundle/Resources/ru.lproj/locversion.plist index b1f5ddb2f..6e924f4de 100644 --- a/hw/xquartz/bundle/Resources/ru.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/ru.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>ru</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib index 6b3771de6..c900cef44 100644 --- a/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib @@ -2,17 +2,16 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">728</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">728</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="348"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -342,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -398,10 +386,10 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -439,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="72767360"> + <object class="NSCustomResource" key="NSNormalImage" id="703778113"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -522,7 +510,7 @@ <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -561,7 +549,7 @@ <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -600,7 +588,7 @@ <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -707,7 +695,6 @@ <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -763,7 +750,7 @@ <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -785,7 +772,7 @@ <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -840,7 +827,7 @@ <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -878,7 +865,7 @@ <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -900,7 +887,7 @@ <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -922,7 +909,7 @@ <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -944,7 +931,7 @@ <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1014,7 +1001,7 @@ <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1052,7 +1039,7 @@ <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1090,7 +1077,7 @@ <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1141,7 +1128,7 @@ <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1163,7 +1150,7 @@ <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="72767360"/> + <reference key="NSNormalImage" ref="703778113"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1242,11 +1229,10 @@ </object> </object> <string key="NSFrameSize">{604, 308}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1259,7 +1245,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1559,7 +1545,7 @@ </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1982,14 +1968,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2234,7 +2212,6 @@ <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3039,11 +3016,6 @@ <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3377,7 +3349,6 @@ <string>24.editorWindowContentRectSynchronizationRect</string> <string>244.IBEditorWindowLastContentRect</string> <string>244.IBPluginDependency</string> - <string>244.IBViewEditorWindowController.showingLayoutRectangles</string> <string>244.IBWindowTemplateEditedContentRect</string> <string>244.ImportedFromIB2</string> <string>244.editorWindowContentRectSynchronizationRect</string> @@ -3426,8 +3397,6 @@ <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3462,27 +3431,19 @@ <string>300441.IBPluginDependency</string> <string>300447.IBPluginDependency</string> <string>300447.ImportedFromIB2</string> - <string>300447.object.labelIdentifier</string> <string>300450.IBPluginDependency</string> - <string>300450.object.labelIdentifier</string> <string>300451.IBPluginDependency</string> <string>300451.ImportedFromIB2</string> - <string>300451.object.labelIdentifier</string> <string>300452.IBPluginDependency</string> - <string>300452.object.labelIdentifier</string> <string>300453.IBPluginDependency</string> <string>300453.ImportedFromIB2</string> - <string>300453.object.labelIdentifier</string> <string>300454.IBPluginDependency</string> - <string>300454.object.labelIdentifier</string> <string>300455.IBPluginDependency</string> <string>300455.ImportedFromIB2</string> <string>300456.IBPluginDependency</string> <string>300457.IBPluginDependency</string> <string>300457.ImportedFromIB2</string> - <string>300457.object.labelIdentifier</string> <string>300458.IBPluginDependency</string> - <string>300458.object.labelIdentifier</string> <string>300459.IBPluginDependency</string> <string>300459.ImportedFromIB2</string> <string>300460.IBPluginDependency</string> @@ -3533,7 +3494,6 @@ <string>377.ImportedFromIB2</string> <string>379.IBPluginDependency</string> <string>379.ImportedFromIB2</string> - <string>380.IBEditorWindowLastContentRect</string> <string>380.IBPluginDependency</string> <string>380.ImportedFromIB2</string> <string>381.IBPluginDependency</string> @@ -3669,14 +3629,13 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> - <string>{{437, 698}, {604, 308}}</string> + <string>{{437, 749}, {484, 308}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>{{437, 698}, {604, 308}}</string> + <string>{{437, 749}, {484, 308}}</string> <integer value="1"/> <string>{{184, 290}, {481, 345}}</string> <integer value="0"/> @@ -3733,8 +3692,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3760,27 +3717,19 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>IBBuiltInLabel-Red</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3831,7 +3780,6 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{519, 865}, {145, 83}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib Binary files differindex 5e11dcc78..0342bb5de 100644 --- a/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings Binary files differindex ccd68d059..c0cbdfb9b 100644 --- a/hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist b/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist index 7e6fd5bb3..6d62b54d2 100644 --- a/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>sv</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib index 3e6241a3d..a6a828905 100644 --- a/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">729</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">729</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -341,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -397,7 +386,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <nil key="NSNextResponder"/> @@ -438,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="885900096"> + <object class="NSCustomResource" key="NSNormalImage" id="66151180"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -520,7 +509,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -559,7 +548,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -598,7 +587,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -705,7 +694,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -761,7 +749,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -783,7 +771,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -838,7 +826,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -876,7 +864,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -898,7 +886,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -920,7 +908,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -942,7 +930,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1012,7 +1000,7 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1053,7 +1041,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1092,7 +1080,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1144,7 +1132,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1166,7 +1154,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="885900096"/> + <reference key="NSNormalImage" ref="66151180"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1248,7 +1236,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1261,7 +1249,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1564,7 +1552,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1987,14 +1975,6 @@ cmthIGlubmVow6VsbGV0Lgo</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2239,7 +2219,6 @@ cmthIGlubmVow6VsbGV0Lgo</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3044,11 +3023,6 @@ cmthIGlubmVow6VsbGV0Lgo</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3430,8 +3404,6 @@ cmthIGlubmVow6VsbGV0Lgo</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3664,7 +3636,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> @@ -3727,8 +3699,6 @@ cmthIGlubmVow6VsbGV0Lgo</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> diff --git a/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib Binary files differindex 897aefa80..122483d6e 100644 --- a/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings Binary files differindex 8be59dade..7706fe541 100644 --- a/hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist b/hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist index 5313c8d82..85fa1f2a6 100644 --- a/hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>zh_CN</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib index f70d086fd..4ef22f024 100644 --- a/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">729</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">729</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -314,7 +314,7 @@ </object> <object class="NSMenuItem" id="369641893"> <reference key="NSMenu" ref="96874957"/> - <string key="NSTitle">循环显示窗口</string> + <string key="NSTitle">反向循环显示窗口</string> <string key="NSKeyEquiv">~</string> <int key="NSKeyEquivModMask">1179914</int> <int key="NSMnemonicLoc">2147483647</int> @@ -341,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -397,7 +386,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <nil key="NSNextResponder"/> @@ -438,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="944667249"> + <object class="NSCustomResource" key="NSNormalImage" id="1053615529"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -520,7 +509,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -559,7 +548,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -598,7 +587,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -705,7 +694,6 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -761,7 +749,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -783,7 +771,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -838,7 +826,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -876,7 +864,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -898,7 +886,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -920,7 +908,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -942,7 +930,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1012,7 +1000,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1050,7 +1038,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1088,7 +1076,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1139,7 +1127,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1161,7 +1149,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="944667249"/> + <reference key="NSNormalImage" ref="1053615529"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1243,7 +1231,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1256,7 +1244,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1559,7 +1547,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1982,14 +1970,6 @@ moTpvKDmoIfmjInplK7jgIIKA</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2234,7 +2214,6 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3039,11 +3018,6 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3425,8 +3399,6 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3659,7 +3631,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> @@ -3722,8 +3694,6 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib Binary files differindex 663ae241e..6ceb04350 100644 --- a/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings Binary files differindex ba09668c0..2bce6475f 100644 --- a/hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings +++ b/hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist b/hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist index db3447988..5c24adfb9 100644 --- a/hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>84.1</string> + <string>93</string> <key>LprojLocale</key> <string>zh_TW</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>85</string> + <string>93</string> </dict> </plist> diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib index abfdeccc4..04ec5ce2d 100644 --- a/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A354</string> - <string key="IBDocument.InterfaceBuilderVersion">729</string> - <string key="IBDocument.AppKitVersion">1019</string> - <string key="IBDocument.HIToolboxVersion">421.00</string> + <string key="IBDocument.SystemVersion">11A79a</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1059</string> + <string key="IBDocument.HIToolboxVersion">478.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">729</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -341,17 +341,6 @@ <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> </object> - <object class="NSMenuItem" id="444952046"> - <reference key="NSMenu" ref="96874957"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="531645050"/> - <reference key="NSMixedImage" ref="351811234"/> - </object> </object> <string key="NSName">_NSWindowsMenu</string> </object> @@ -397,7 +386,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <nil key="NSNextResponder"/> @@ -438,7 +427,7 @@ <reference key="NSControlView" ref="119157981"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="339780660"> + <object class="NSCustomResource" key="NSNormalImage" id="35143543"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSSwitch</string> </object> @@ -520,7 +509,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="842100515"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -559,7 +548,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="179949713"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -598,7 +587,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="418227126"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -705,7 +694,6 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSTarget" ref="633115429"/> </object> </object> - <reference key="NSMenuFont" ref="463863101"/> </object> <int key="NSPreferredEdge">3</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -761,7 +749,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="477203622"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -783,7 +771,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="57246850"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -838,7 +826,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="878106058"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -876,7 +864,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="477050998"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -898,7 +886,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="765780304"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -920,7 +908,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="1002778833"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -937,12 +925,12 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <object class="NSButtonCell" key="NSCell" id="619977658"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">當“剪貼板”更改時更新 CLIPBOARD</string> + <string key="NSContents">當 CLIPBOARD 更改時更新“剪貼板”</string> <reference key="NSSupport" ref="463863101"/> <reference key="NSControlView" ref="487809555"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1012,7 +1000,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="657659108"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1050,7 +1038,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="992839333"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1088,7 +1076,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="128352289"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1139,7 +1127,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="989050925"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1161,7 +1149,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="NSControlView" ref="700826966"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="339780660"/> + <reference key="NSNormalImage" ref="35143543"/> <reference key="NSAlternateImage" ref="391434389"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -1243,7 +1231,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1256,7 +1244,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> <nil key="NSNextResponder"/> @@ -1556,7 +1544,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -1979,14 +1967,6 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">window_separator</string> - <reference key="source" ref="485884620"/> - <reference key="destination" ref="444952046"/> - </object> - <int key="connectionID">300331</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">menu</string> <reference key="source" ref="815810918"/> <reference key="destination" ref="524015605"/> @@ -2231,7 +2211,6 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference ref="1036389925"/> <reference ref="369641893"/> <reference ref="155085383"/> - <reference ref="444952046"/> <reference ref="984461797"/> <reference ref="280172320"/> </object> @@ -3036,11 +3015,6 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <reference key="parent" ref="492358940"/> </object> <object class="IBObjectRecord"> - <int key="objectID">300330</int> - <reference key="object" ref="444952046"/> - <reference key="parent" ref="96874957"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">300337</int> <reference key="object" ref="10973343"/> <object class="NSMutableArray" key="children"> @@ -3422,8 +3396,6 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <string>298.ImportedFromIB2</string> <string>300295.IBPluginDependency</string> <string>300295.IBShouldRemoveOnLegacySave</string> - <string>300330.IBPluginDependency</string> - <string>300330.ImportedFromIB2</string> <string>300337.IBPluginDependency</string> <string>300337.ImportedFromIB2</string> <string>300338.IBPluginDependency</string> @@ -3656,7 +3628,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{349, 858}, {315, 153}}</string> + <string>{{349, 868}, {315, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{271, 666}, {301, 153}}</string> @@ -3719,8 +3691,6 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib Binary files differindex 12c5a14e8..b65ef07e2 100644 --- a/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index d3f448820..1fb158b26 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -240,11 +240,9 @@ static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv return FALSE; } -#ifdef RENDER if (! fbPictureInit(pScreen, 0, 0)) { return FALSE; } -#endif #ifdef MITSHM ShmRegisterFbFuncs(pScreen); diff --git a/hw/xquartz/doc/Makefile.am b/hw/xquartz/doc/Makefile.am index 7310de353..6c68c845e 100644 --- a/hw/xquartz/doc/Makefile.am +++ b/hw/xquartz/doc/Makefile.am @@ -7,6 +7,8 @@ CLEANFILES = $(appman_PROCESSED) $(appman_DATA) include $(top_srcdir)/cpprules.in +MANDEFS += -D__laucnd_id_prefix__=$(LAUNCHD_ID_PREFIX) + .man.$(APP_MAN_SUFFIX): $(AM_V_at)cp $< $@ diff --git a/hw/xquartz/doc/Xquartz.man.pre b/hw/xquartz/doc/Xquartz.man.pre index 04bbee30c..447194740 100644 --- a/hw/xquartz/doc/Xquartz.man.pre +++ b/hw/xquartz/doc/Xquartz.man.pre @@ -16,69 +16,72 @@ OS X handles the desktop background. .SH CUSTOMIZATION \fIXquartz\fP can be customized using the defaults(1) command. The available options are: .TP 8 -.B defaults write org.x.X11 enable_fake_buttons -boolean true +.B defaults write __laucnd_id_prefix__.X11 enable_fake_buttons -boolean true Emulates a 3 button mouse using modifier keys. By default, the Command modifier is used to emulate button 2 and Option is used for button 3. Thus, clicking the first mouse button while holding down Command will act like clicking button 2. Holding down Option will simulate button 3. .TP 8 -.B defaults write org.x.X11 fake_button2 \fImodifiers\fP +.B defaults write __laucnd_id_prefix__.X11 fake_button2 \fImodifiers\fP Change the modifier keys used to emulate the second mouse button. By default, Command is used to emulate the second button. Any combination of the following modifier names may be used: {l,r,}shift, {l,r,}option, {l,r,}control, {l,r,}command, fn .TP 8 -.B defaults write org.x.X11 fake_button3 \fImodifiers\fP +.B defaults write __laucnd_id_prefix__.X11 fake_button3 \fImodifiers\fP Change the modifier keys used to emulate the second mouse button. By default, Command is used to emulate the second button. Any combination of the following modifier names may be used: {l,r,}shift, {l,r,}option, {l,r,}control, {l,r,}command, fn .TP 8 -.B defaults write org.x.X11 fullscreen_hotkeys -boolean true +.B defaults write __laucnd_id_prefix__.X11 fullscreen_hotkeys -boolean true Enable OSX hotkeys while in fullscreen .TP 8 -.B defaults write org.x.X11 fullscreen_menu -boolean true +.B defaults write __laucnd_id_prefix__.X11 fullscreen_menu -boolean true Show the OSX menu while in fullscreen .TP 8 -.B defaults write org.x.X11 no_quit_alert -boolean true +.B defaults write __laucnd_id_prefix__.X11 no_quit_alert -boolean true Disables the alert dialog displayed when attempting to quit X11. .TP 8 -.B defaults write org.x.X11 no_auth -boolean true +.B defaults write __laucnd_id_prefix__.X11 no_auth -boolean true Stops the X server requiring that clients authenticate themselves when connecting. See Xsecurity(__miscmansuffix__). .TP 8 -.B defaults write org.x.X11 nolisten_tcp -boolean false +.B defaults write __laucnd_id_prefix__.X11 nolisten_tcp -boolean false This will tell the server to listen and accept TCP connections. Doing this without enabling xauth is a possible security concern. See Xsecurity(__miscmansuffix__). .TP 8 -.B defaults write org.x.X11 enable_system_beep -boolean false +.B defaults write __laucnd_id_prefix__.X11 enable_system_beep -boolean false Don't use the standard system beep effect for X11 alerts. .TP 8 -.B defaults write org.x.X11 enable_key_equivalents -boolean false +.B defaults write __laucnd_id_prefix__.X11 enable_key_equivalents -boolean false Disable menu keyboard equivalents while X11 windows are focused. .TP 8 -.B defaults write org.x.X11 depth \fIdepth\fP +.B defaults write __laucnd_id_prefix__.X11 depth \fIdepth\fP Specifies the color bit depth to use. Currently only 15, and 24 color bits per pixel are supported. If not specified, or a value of -1 is specified, defaults to the depth of the main display. .TP 8 -.B defaults write org.x.X11 sync_keymap -boolean true +.B defaults write __laucnd_id_prefix__.X11 sync_keymap -boolean true Keep the X11 keymap up to date with the OSX system keymap. .TP 8 -.B defaults write org.x.X11 sync_pasteboard -boolean true +.B defaults write __laucnd_id_prefix__.X11 option_sends_alt -boolean true +The Option key will send Alt_L and Alt_R instead of Mode_switch. +.TP 8 +.B defaults write __laucnd_id_prefix__.X11 sync_pasteboard -boolean true Enable syncing between the OSX pasteboard and clipboard/primary selection buffers in X11. This option needs to be true for any of the other pasteboard sync options to have an effect. .TP 8 -.B defaults write org.x.X11 sync_pasteboard_to_clipboard -boolean true +.B defaults write __laucnd_id_prefix__.X11 sync_pasteboard_to_clipboard -boolean true Update the X11 CLIPBOARD when the OSX NSPasteboard is updated. .TP 8 -.B defaults write org.x.X11 sync_pasteboard_to_primary -boolean true +.B defaults write __laucnd_id_prefix__.X11 sync_pasteboard_to_primary -boolean true Update the the X11 PRIMARY buffer when the OSX NSPasteboard is updated. .TP 8 -.B defaults write org.x.X11 sync_clipboard_to_pasteboard -boolean true +.B defaults write __laucnd_id_prefix__.X11 sync_clipboard_to_pasteboard -boolean true Update the the OSX NSPasteboard when the X11 CLIPBOARD is updated. Note that enabling this option causes the clipboard synchronization to act as a clipboard manager in X11. This makes it impossible to use xclipboard, klipper, or any other such clipboard managers. If you want to use any of these programs, you must disable this option. .TP 8 -.B defaults write org.x.X11 sync_primary_on_select -boolean true +.B defaults write __laucnd_id_prefix__.X11 sync_primary_on_select -boolean true This option defaults to false and is provided only "for experts." It updates the NSPasteboard whenever a new X11 selection is made (rather than requiring you to hit cmd-c to copy the selection to the NSPasteboard). Since the X11 protocol does not require applications to send notification when they change selection, this might not work in all cases (if you run into this problem, try selecting text in another application first, then selecting the text you want). .TP 8 -.B defaults write org.x.X11 enable_test_extensions -boolean true +.B defaults write __laucnd_id_prefix__.X11 enable_test_extensions -boolean true This option defaults to false and is only accessible through the command line. Enable this option to turn on the DEC-XTRAP, RECORD, and XTEST extensions in the server. .SH OPTIONS .PP diff --git a/hw/xquartz/mach-startup/launchd_fd.h b/hw/xquartz/mach-startup/launchd_fd.h index 5083fae21..12caf7193 100644 --- a/hw/xquartz/mach-startup/launchd_fd.h +++ b/hw/xquartz/mach-startup/launchd_fd.h @@ -33,4 +33,4 @@ int launchd_display_fd(void); -#endif /* _XQUARTZ_LAUNCHD_FD_H_ */
\ No newline at end of file +#endif /* _XQUARTZ_LAUNCHD_FD_H_ */ diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index a611854e7..a8c0d4b47 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -79,6 +79,7 @@ int aquaMenuBarHeight = 0; QuartzModeProcsPtr quartzProcs = NULL; const char *quartzOpenGLBundle = NULL; int quartzFullscreenDisableHotkeys = TRUE; +int quartzOptionSendsAlt = FALSE; #if defined(RANDR) && !defined(FAKE_RANDR) Bool QuartzRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) { diff --git a/hw/xquartz/quartzCommon.h b/hw/xquartz/quartzCommon.h index 1c0eeba9c..8ab70f22a 100644 --- a/hw/xquartz/quartzCommon.h +++ b/hw/xquartz/quartzCommon.h @@ -60,6 +60,7 @@ extern int focusOnNewWindow; extern int quartzUseAGL; extern int quartzEnableKeyEquivalents; extern int quartzFullscreenDisableHotkeys; +extern int quartzOptionSendsAlt; // Other shared data extern int quartzServerVisible; diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c index a4a0b08bd..745333f03 100644 --- a/hw/xquartz/quartzKeyboard.c +++ b/hw/xquartz/quartzKeyboard.c @@ -39,6 +39,7 @@ #define HACK_MISSING 1 #define HACK_KEYPAD 1 +#define HACK_BLACKLIST 1 #include <unistd.h> #include <stdio.h> @@ -49,6 +50,7 @@ #include "quartzCommon.h" #include "darwin.h" +#include "darwinEvents.h" #include "quartzKeyboard.h" #include "quartzAudio.h" @@ -83,6 +85,7 @@ enum { #define UKEYSYM(u) ((u) | 0x01000000) +#if HACK_MISSING /* Table of keycode->keysym mappings we use to fallback on for important keys that are often not in the Unicode mapping. */ @@ -117,7 +120,9 @@ const static struct { {107, XK_F14}, {113, XK_F15}, }; +#endif +#if HACK_KEYPAD /* Table of keycode->old,new-keysym mappings we use to fixup the numeric keypad entries. */ @@ -143,6 +148,17 @@ const static struct { {91, XK_8, XK_KP_8}, {92, XK_9, XK_KP_9}, }; +#endif + +#if HACK_BLACKLIST +/* <rdar://problem/7824370> wine notepad produces wrong characters on shift+arrow + * http://xquartz.macosforge.org/trac/ticket/295 + * http://developer.apple.com/legacy/mac/library/documentation/mac/Text/Text-579.html + * + * legacy Mac keycodes for arrow keys that shift-modify to math symbols + */ +const static unsigned short keycode_blacklist[] = {66, 70, 72, 77}; +#endif /* Table mapping normal keysyms to their dead equivalents. FIXME: all the unicode keysyms (apart from circumflex) were guessed. */ @@ -176,6 +192,12 @@ const static struct { {UKEYSYM (0x31b), XK_dead_horn}, /* COMBINING HORN */ }; +typedef struct darwinKeyboardInfo_struct { + CARD8 modMap[MAP_LENGTH]; + KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY]; + unsigned char modifierKeycodes[32][2]; +} darwinKeyboardInfo; + darwinKeyboardInfo keyInfo; pthread_mutex_t keyInfo_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -240,7 +262,8 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) { case XK_Alt_L: info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i; info->modMap[MIN_KEYCODE + i] = Mod1Mask; - *k = XK_Mode_switch; // Yes, this is ugly. This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor. + if(!quartzOptionSendsAlt) + *k = XK_Mode_switch; // Yes, this is ugly. This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor. break; case XK_Alt_R: @@ -249,7 +272,8 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) { #else info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i; #endif - *k = XK_Mode_switch; // Yes, this is ugly. This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor. + if(!quartzOptionSendsAlt) + *k = XK_Mode_switch; // Yes, this is ugly. This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor. info->modMap[MIN_KEYCODE + i] = Mod1Mask; break; @@ -632,7 +656,7 @@ static KeySym make_dead_key(KeySym in) { return in; } -Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) { +static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) { #if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050 KeyboardLayoutRef key_layout; int is_uchr = 1; @@ -772,34 +796,55 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) { if (k[3] == k[2]) k[3] = NoSymbol; if (k[1] == k[0]) k[1] = NoSymbol; if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol; + if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol; } +#if HACK_MISSING /* Fix up some things that are normally missing.. */ - - if (HACK_MISSING) { - for (i = 0; i < sizeof (known_keys) / sizeof (known_keys[0]); i++) { - k = info->keyMap + known_keys[i].keycode * GLYPHS_PER_KEY; - - if (k[0] == NoSymbol && k[1] == NoSymbol - && k[2] == NoSymbol && k[3] == NoSymbol) - k[0] = known_keys[i].keysym; - } + + for (i = 0; i < sizeof (known_keys) / sizeof (known_keys[0]); i++) { + k = info->keyMap + known_keys[i].keycode * GLYPHS_PER_KEY; + + if ( k[0] == NoSymbol && k[1] == NoSymbol + && k[2] == NoSymbol && k[3] == NoSymbol) + k[0] = known_keys[i].keysym; } - +#endif + +#if HACK_KEYPAD /* And some more things. We find the right symbols for the numeric - keypad, but not the KP_ keysyms. So try to convert known keycodes. */ - - if (HACK_KEYPAD) { - for (i = 0; i < sizeof (known_numeric_keys) - / sizeof (known_numeric_keys[0]); i++) { - k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY; - - if (k[0] == known_numeric_keys[i].normal) - k[0] = known_numeric_keys[i].keypad; - } + keypad, but not the KP_ keysyms. So try to convert known keycodes. */ + for (i = 0; i < sizeof (known_numeric_keys) / sizeof (known_numeric_keys[0]); i++) { + k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY; + + if (k[0] == known_numeric_keys[i].normal) + k[0] = known_numeric_keys[i].keypad; } +#endif + +#if HACK_BLACKLIST + for (i = 0; i < sizeof (keycode_blacklist) / sizeof (keycode_blacklist[0]); i++) { + k = info->keyMap + keycode_blacklist[i] * GLYPHS_PER_KEY; + k[0] = k[1] = k[2] = k[3] = NoSymbol; + } +#endif DarwinBuildModifierMaps(info); return TRUE; } + +Bool QuartsResyncKeymap(Bool sendDDXEvent) { + Bool retval; + /* Update keyInfo */ + pthread_mutex_lock(&keyInfo_mutex); + memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap)); + retval = QuartzReadSystemKeymap(&keyInfo); + pthread_mutex_unlock(&keyInfo_mutex); + + /* Tell server thread to deal with new keyInfo */ + if(sendDDXEvent) + DarwinSendDDXEvent(kXquartzReloadKeymap, 0); + + return retval; +} diff --git a/hw/xquartz/quartzKeyboard.h b/hw/xquartz/quartzKeyboard.h index 1aaec6ef2..1151a0035 100644 --- a/hw/xquartz/quartzKeyboard.h +++ b/hw/xquartz/quartzKeyboard.h @@ -41,18 +41,10 @@ #define MIN_KEYCODE XkbMinLegalKeyCode // unfortunately, this isn't 0... #define MAX_KEYCODE NUM_KEYCODES + MIN_KEYCODE - 1 -typedef struct darwinKeyboardInfo_struct { - CARD8 modMap[MAP_LENGTH]; - KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY]; - unsigned char modifierKeycodes[32][2]; -} darwinKeyboardInfo; - /* These functions need to be implemented by Xquartz, XDarwin, etc. */ -Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info); +Bool QuartsResyncKeymap(Bool sendDDXEvent); /* Provided for darwinEvents.c */ -extern darwinKeyboardInfo keyInfo; -extern pthread_mutex_t keyInfo_mutex; void DarwinKeyboardReloadHandler(void); int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide); int DarwinModifierNXKeyToNXKeycode(int key, int side); diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 99506b237..002b14581 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -157,9 +157,7 @@ static PixmapFormatRec g_PixmapFormats[] = { { 15, 16, BITMAP_SCANLINE_PAD }, { 16, 16, BITMAP_SCANLINE_PAD }, { 24, 32, BITMAP_SCANLINE_PAD }, -#ifdef RENDER { 32, 32, BITMAP_SCANLINE_PAD } -#endif }; const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]); diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 0069c85dd..fdf9ff2b2 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -183,10 +183,8 @@ #include "fb.h" #include "rootless.h" -#ifdef RENDER #include "mipict.h" #include "picturestr.h" -#endif #ifdef RANDR #include "randrstr.h" diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index c8cd64625..953548ec7 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -390,14 +390,12 @@ winFinishScreenInitFB (int index, pScreen->blockData = pScreen; pScreen->wakeupData = pScreen; -#ifdef RENDER /* Render extension initialization, calls miPictureInit */ if (!fbPictureInit (pScreen, NULL, 0)) { ErrorF ("winFinishScreenInitFB - fbPictureInit () failed\n"); return FALSE; } -#endif #ifdef RANDR /* Initialize resize and rotate support */ |