diff options
author | Keith Packard <keithp@keithp.com> | 2010-11-24 11:46:18 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-11-24 11:46:18 -0800 |
commit | 400ddf2f58ce673c74d4e8ee829729cd3c75f8c9 (patch) | |
tree | 1150b751b38007f6f9b4511cd563b6fec352b0bf /hw | |
parent | 7250f078c12fd20d5ac9150f54495926e5121461 (diff) | |
parent | e074f745a80b87d1d82fb39489d7f35163d7552a (diff) |
Merge remote branch 'jeremyhu/master'
Diffstat (limited to 'hw')
24 files changed, 212 insertions, 273 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 8f4f23ff3..c3563b6b5 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -1023,6 +1023,34 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe } #endif +#ifdef DEBUG_UNTRUSTED_POINTER_DELTA +static const char *untrusted_str(NSEvent *e) { + switch([e type]) { + case NSScrollWheel: + return "NSScrollWheel"; + case NSTabletPoint: + return "NSTabletPoint"; + case NSOtherMouseDown: + return "NSOtherMouseDown"; + case NSOtherMouseUp: + return "NSOtherMouseUp"; + case NSLeftMouseDown: + return "NSLeftMouseDown"; + case NSLeftMouseUp: + return "NSLeftMouseUp"; + default: + switch([e subtype]) { + case NSTabletPointEventSubtype: + return "NSTabletPointEventSubtype"; + case NSTabletProximityEventSubtype: + return "NSTabletProximityEventSubtype"; + default: + return "Other"; + } + } +} +#endif + - (void) sendX11NSEvent:(NSEvent *)e { NSPoint location = NSZeroPoint, tilt = NSZeroPoint; int ev_button, ev_type; @@ -1060,6 +1088,10 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe // The deltaXY for scroll events correspond to the scroll delta, not the pointer delta // <rdar://problem/7989690> deltaXY for wheel events are being sent as mouse movement hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSScrollWheel; + +#ifdef DEBUG_UNTRUSTED_POINTER_DELTA + hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSLeftMouseDown || [e type] == NSLeftMouseUp; +#endif if (window != nil) { NSRect frame = [window frame]; @@ -1068,8 +1100,22 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe location.y += frame.origin.y; lastpt = location; } else if(hasUntrustedPointerDelta) { +#ifdef DEBUG_UNTRUSTED_POINTER_DELTA + ErrorF("--- Begin Event Debug ---\n"); + ErrorF("Event type: %s\n", untrusted_str(e)); + ErrorF("old lastpt: (%0.2f, %0.2f)\n", lastpt.x, lastpt.y); + ErrorF(" delta: (%0.2f, %0.2f)\n", [e deltaX], -[e deltaY]); + ErrorF(" location: (%0.2f, %0.2f)\n", lastpt.x + [e deltaX], lastpt.y - [e deltaY]); + ErrorF("workaround: (%0.2f, %0.2f)\n", [e locationInWindow].x, [e locationInWindow].y); + ErrorF("--- End Event Debug ---\n"); + + location.x = lastpt.x + [e deltaX]; + location.y = lastpt.y - [e deltaY]; + lastpt = [e locationInWindow]; +#else location = [e locationInWindow]; lastpt = location; +#endif } else { location.x = lastpt.x + [e deltaX]; location.y = lastpt.y - [e deltaY]; diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist b/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist index c648282a2..72d75140a 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>97</string> + <string>99</string> <key>LprojLocale</key> <string>es</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>97</string> + <string>99</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 19e139bb7..3afc950fb 100644 --- a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib @@ -2,15 +2,18 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <data> <int key="IBDocument.SystemTarget">1040</int> - <string key="IBDocument.SystemVersion">11A79a</string> - <string key="IBDocument.InterfaceBuilderVersion">784</string> - <string key="IBDocument.AppKitVersion">1059</string> - <string key="IBDocument.HIToolboxVersion">478.00</string> + <string key="IBDocument.SystemVersion">11A194b</string> + <string key="IBDocument.InterfaceBuilderVersion">787</string> + <string key="IBDocument.AppKitVersion">1079</string> + <string key="IBDocument.HIToolboxVersion">502.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">784</string> + <string key="NS.object.0">787</string> </object> - <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/> + <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"> + <integer value="286"/> + <integer value="244"/> + </array> <array key="IBDocument.PluginDependencies"> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </array> @@ -366,7 +369,8 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> + <nil key="NSUserInterfaceItemIdentifier"/> + <string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> <reference key="NSNextResponder"/> @@ -377,7 +381,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{13, 10}, {593, 292}}</string> <reference key="NSSuperview" ref="941366957"/> - <reference key="NSWindow"/> <array class="NSMutableArray" key="NSTabViewItems"> <object class="NSTabViewItem" id="287591690"> <object class="NSMutableString" key="NSIdentifier"> @@ -392,7 +395,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 215}, {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> @@ -424,7 +426,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 65}, {501, 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> @@ -443,7 +444,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"> @@ -462,7 +463,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 181}, {501, 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> @@ -481,7 +481,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 99}, {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> @@ -504,7 +503,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 123}, {501, 28}}</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> @@ -522,7 +520,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 157}, {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> @@ -545,7 +542,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 7}, {501, 28}}</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> @@ -562,7 +558,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 41}, {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> @@ -583,7 +578,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin </array> <string key="NSFrame">{{10, 33}, {573, 246}}</string> <reference key="NSSuperview" ref="448510093"/> - <reference key="NSWindow"/> </object> <string key="NSLabel">Entrada</string> <reference key="NSColor" ref="57160303"/> @@ -1248,11 +1242,10 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin </array> <string key="NSFrameSize">{619, 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">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> + <string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1265,10 +1258,11 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> + <nil key="NSUserInterfaceItemIdentifier"/> + <string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <array class="NSMutableArray" key="NSSubviews"> <object class="NSButton" id="671954382"> @@ -1350,7 +1344,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin </object> <array class="NSMutableArray" key="NSTableColumns"> <object class="NSTableColumn" id="938444323"> - <double key="NSWidth">121.73100280761719</double> + <double key="NSWidth">105</double> <double key="NSMinWidth">62.730998992919922</double> <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> @@ -1360,7 +1354,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <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> @@ -1417,7 +1411,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <string key="NSHeaderToolTip"/> </object> <object class="NSTableColumn" id="242608782"> - <double key="NSWidth">82</double> + <double key="NSWidth">99</double> <double key="NSMinWidth">10</double> <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> @@ -1497,7 +1491,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <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 +1501,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <int key="NSsFlags">1</int> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.96474358974358976</double> + <double key="NSPercent">0.96474361419677734</double> </object> <object class="NSClipView" id="672307654"> <reference key="NSNextResponder" ref="1063387772"/> @@ -1532,6 +1526,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin <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"> @@ -1559,10 +1554,11 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin </object> </array> <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.7976931348623157e+308, 1.7976931348623157e+308}</string> + <string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> 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 806c0e84a..4626ac776 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/locversion.plist b/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist index 627fb3ea7..c8e77aa60 100644 --- a/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist +++ b/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist @@ -3,12 +3,12 @@ <plist version="1.0"> <dict> <key>LprojCompatibleVersion</key> - <string>98</string> + <string>100</string> <key>LprojLocale</key> <string>ar</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>98</string> + <string>100</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 index 8bc6b618d..52ebeefb7 100644 --- a/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib +++ b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib @@ -367,7 +367,7 @@ <characters key="NS.bytes">View</characters> </object> <nil key="NSUserInterfaceItemIdentifier"/> - <string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</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"/> @@ -459,7 +459,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor" id="590688762"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> <object class="NSColor" key="NSTextColor" id="930815747"> @@ -508,7 +508,7 @@ </array> <string key="NSFrame">{{10, 33}, {438, 246}}</string> </object> - <string key="NSLabel">أمان</string> + <string key="NSLabel">الأمان</string> <reference key="NSColor" ref="57160303"/> <reference key="NSTabView" ref="448510093"/> </object> @@ -637,7 +637,7 @@ </array> <string key="NSFrame">{{10, 33}, {438, 246}}</string> </object> - <string key="NSLabel">Windows</string> + <string key="NSLabel">نوافذ</string> <reference key="NSColor" ref="57160303"/> <reference key="NSTabView" ref="448510093"/> </object> @@ -853,7 +853,7 @@ <object class="NSTextFieldCell" key="NSCell" id="624655599"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">71303296</int> - <string key="NSContents">تستخدم إشارات X11 الصوتية تنبيه النظام القياسي، كما هو محدد في لوحة تفضيلات النظام لمؤثرات الصوت.</string> + <string key="NSContents">تستخدم إشارات X11 الصوتية التنبيه القياسي للنظام، كما هو محدد في لوحة تفضيلات النظام لمؤثرات الصوت.</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="1039016593"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -908,7 +908,7 @@ <reference ref="616492372"/> <object class="NSMenuItem" id="759499526"> <reference key="NSMenu" ref="341113515"/> - <string key="NSTitle">256 لونًا</string> + <string key="NSTitle">٢٥٦ لونًا</string> <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> @@ -1035,7 +1035,7 @@ <object class="NSTextFieldCell" key="NSCell" id="761107402"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">71303296</int> - <string key="NSContents">تمكين نافذة X11 الجذري. استخدم ضغط مفاتيح الأوامر-الاختيار-A لدخول ومغادرة وضع ملء الشاشة.</string> + <string key="NSContents">تمكين نافذة X11 root. استخدم ضغط مفاتيح الأوامر-الاختيار-A لدخول ومغادرة وضع ملء الشاشة.</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="298603383"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -1145,7 +1145,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <object class="NSTextFieldCell" key="NSCell" id="666057093"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">71303296</int> - <string key="NSContents">السماح بكتابة تغييرات قائمة الإدخال فوق مخطط مفاتيح X11 الحالي.</string> + <string key="NSContents">السماح لتغييرات قائمة الإدخال بالكتابة فوق مخطط مفاتيح X11 الحالي.</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="31160162"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -1183,7 +1183,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <object class="NSTextFieldCell" key="NSCell" id="617441821"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">71303296</int> - <string key="NSContents">عند التمكين، مفاتيح الخيار إرسال Alt_L و Alt_R X11 علامات المفتاح بدلًا من Mode_switch.</string> + <string key="NSContents">عند تمكينها، تقوم مفاتيح الاختيار بإرسال علامات المفتاح Alt_L و Alt_R X11 بدلًا من Mode_switch.</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="278155937"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -1199,7 +1199,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <object class="NSButtonCell" key="NSCell" id="67728988"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">67108992</int> - <string key="NSContents">مفاتيح الخيار إرسال Alt_L و Alt_R</string> + <string key="NSContents">مفاتيح الاختيار تقوم بإرسال Alt_L و Alt_R</string> <reference key="NSSupport" ref="463863101"/> <reference key="NSControlView" ref="406291430"/> <int key="NSButtonFlags">1210864127</int> @@ -1216,7 +1216,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <string key="NSFrame">{{10, 33}, {438, 246}}</string> <reference key="NSSuperview" ref="448510093"/> </object> - <string key="NSLabel">إدخال</string> + <string key="NSLabel">الإدخال</string> <reference key="NSColor" ref="57160303"/> <reference key="NSTabView" ref="448510093"/> </object> @@ -1235,7 +1235,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF </object> <string key="NSScreenRect">{{0, 0}, {1280, 938}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1249,10 +1249,10 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <characters key="NS.bytes">View</characters> </object> <nil key="NSUserInterfaceItemIdentifier"/> - <string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string> + <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <array class="NSMutableArray" key="NSSubviews"> <object class="NSButton" id="671954382"> @@ -1260,7 +1260,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <int key="NSvFlags">268</int> <string key="NSFrame">{{14, 191}, {100, 32}}</string> <reference key="NSSuperview" ref="85544634"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="143554520"> <int key="NSCellFlags">67239424</int> @@ -1288,7 +1287,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <int key="NSvFlags">268</int> <string key="NSFrame">{{14, 159}, {100, 32}}</string> <reference key="NSSuperview" ref="85544634"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="8201128"> <int key="NSCellFlags">67239424</int> @@ -1320,14 +1318,12 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <int key="NSvFlags">256</int> <string key="NSFrameSize">{301, 198}</string> <reference key="NSSuperview" ref="580565898"/> - <reference key="NSWindow"/> <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="NSWindow"/> <reference key="NSTableView" ref="905092943"/> </object> <object class="_NSCornerView" key="NSCornerView" id="898633680"> @@ -1335,7 +1331,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <int key="NSvFlags">256</int> <string key="NSFrame">{{302, 0}, {16, 17}}</string> <reference key="NSSuperview" ref="1063387772"/> - <reference key="NSWindow"/> </object> <array class="NSMutableArray" key="NSTableColumns"> <object class="NSTableColumn" id="242608782"> @@ -1468,7 +1463,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF </array> <string key="NSFrame">{{1, 17}, {301, 198}}</string> <reference key="NSSuperview" ref="1063387772"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="905092943"/> <reference key="NSDocView" ref="905092943"/> <reference key="NSBGColor" ref="812484075"/> @@ -1479,7 +1473,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <int key="NSvFlags">256</int> <string key="NSFrame">{{302, 17}, {15, 198}}</string> <reference key="NSSuperview" ref="1063387772"/> - <reference key="NSWindow"/> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">0.99492377042770386</double> @@ -1489,7 +1482,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <int key="NSvFlags">256</int> <string key="NSFrame">{{1, 215}, {301, 15}}</string> <reference key="NSSuperview" ref="1063387772"/> - <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="1063387772"/> <string key="NSAction">_doScroller:</string> @@ -1503,7 +1495,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF </array> <string key="NSFrame">{{1, 0}, {301, 17}}</string> <reference key="NSSuperview" ref="1063387772"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="792419186"/> <reference key="NSDocView" ref="792419186"/> <reference key="NSBGColor" ref="812484075"/> @@ -1513,14 +1504,12 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF </array> <string key="NSFrame">{{116, 20}, {318, 231}}</string> <reference key="NSSuperview" ref="85544634"/> - <reference key="NSWindow"/> <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"> @@ -1528,7 +1517,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF <int key="NSvFlags">268</int> <string key="NSFrame">{{14, 223}, {100, 32}}</string> <reference key="NSSuperview" ref="85544634"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1025474039"> <int key="NSCellFlags">-2080244224</int> @@ -1549,12 +1537,10 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF </object> </array> <string key="NSFrameSize">{454, 271}</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.4028235e+38, 3.4028235e+38}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> 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 differindex f86a5b9f2..97032d978 100644 --- a/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib +++ b/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib diff --git a/hw/xquartz/bundle/Resources/da.lproj/locversion.plist b/hw/xquartz/bundle/Resources/da.lproj/locversion.plist index c565c6f71..0a247b5e5 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>97</string> + <string>100</string> <key>LprojLocale</key> <string>da</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>97</string> + <string>100</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 087c79245..3224c69f6 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="8.00"> <data> <int key="IBDocument.SystemTarget">1040</int> - <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> + <string key="IBDocument.SystemVersion">11A194b</string> + <string key="IBDocument.InterfaceBuilderVersion">787</string> + <string key="IBDocument.AppKitVersion">1079</string> + <string key="IBDocument.HIToolboxVersion">502.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">732</string> + <string key="NS.object.0">787</string> </object> <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/> <array key="IBDocument.PluginDependencies"> @@ -366,6 +366,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> @@ -1067,7 +1068,7 @@ ZW4uCg</string> <object class="NSTextFieldCell" key="NSCell" id="183409141"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Fokus i X11-vinduet følger markøren</string> + <string key="NSContents">Fokus i X11-vinduet følger markøren.</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="138261120"/> <reference key="NSBackgroundColor" ref="57160303"/> @@ -1254,6 +1255,7 @@ ZW4uCg</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> @@ -1518,7 +1520,6 @@ ZW4uCg</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"> @@ -3572,6 +3573,7 @@ ZW4uCg</string> </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"/> @@ -3579,5 +3581,10 @@ ZW4uCg</string> <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> + <string key="NSSwitch">{15, 15}</string> + </dictionary> </data> </archive> 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 e5f27d575..918cbc465 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/pl.lproj/locversion.plist b/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist index 6dc0d45c1..58baaa0f6 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>97</string> + <string>100</string> <key>LprojLocale</key> <string>pl</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>97</string> + <string>100</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 dca6bb2bf..89cf79086 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="8.00"> <data> <int key="IBDocument.SystemTarget">1040</int> - <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> + <string key="IBDocument.SystemVersion">11A194b</string> + <string key="IBDocument.InterfaceBuilderVersion">787</string> + <string key="IBDocument.AppKitVersion">1079</string> + <string key="IBDocument.HIToolboxVersion">502.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">732</string> + <string key="NS.object.0">787</string> </object> <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/> <array key="IBDocument.PluginDependencies"> @@ -257,7 +257,7 @@ </object> <object class="NSMenuItem" id="677652931"> <reference key="NSMenu" ref="96874957"/> - <string key="NSTitle">Miniaturka</string> + <string key="NSTitle">Minimalizuj okno</string> <string key="NSKeyEquiv">m</string> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> @@ -366,6 +366,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="941366957"> @@ -1028,7 +1029,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <object class="NSTextFieldCell" key="NSCell" id="399127858"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Lliknięcie nieaktywnego okna będzie powodowało jego uaktywnienie i przeniesienie do niego fokusu.</string> + <string key="NSContents">Kliknię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"/> @@ -1256,6 +1257,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> @@ -1523,7 +1525,6 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</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"> @@ -3583,6 +3584,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> </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"/> @@ -3590,5 +3592,10 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string> <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> + <string key="NSSwitch">{15, 15}</string> + </dictionary> </data> </archive> 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 d9672ee6a..62f4065f6 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/locversion.plist b/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist index 3b46498b4..45ac16e53 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>97</string> + <string>100</string> <key>LprojLocale</key> <string>pt</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>97</string> + <string>100</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 ea9f5f321..693ea24bc 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="8.00"> <data> <int key="IBDocument.SystemTarget">1040</int> - <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> + <string key="IBDocument.SystemVersion">11A194b</string> + <string key="IBDocument.InterfaceBuilderVersion">787</string> + <string key="IBDocument.AppKitVersion">1079</string> + <string key="IBDocument.HIToolboxVersion">502.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">732</string> + <string key="NS.object.0">787</string> </object> <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/> <array key="IBDocument.PluginDependencies"> @@ -296,8 +296,8 @@ <object class="NSMenuItem" id="369641893"> <reference key="NSMenu" ref="96874957"/> <string key="NSTitle">Percorrer Janelas no Sentido Inverso</string> - <string key="NSKeyEquiv">~</string> - <int key="NSKeyEquivModMask">1179914</int> + <string key="NSKeyEquiv">`</string> + <int key="NSKeyEquivModMask">1179648</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="531645050"/> <reference key="NSMixedImage" ref="351811234"/> @@ -315,7 +315,7 @@ </object> <object class="NSMenuItem" id="276216762"> <reference key="NSMenu" ref="96874957"/> - <string key="NSTitle">Trazer Tudo para Frente</string> + <string key="NSTitle">Trazer Todas Para a Frente</string> <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> @@ -366,10 +366,11 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> + <nil key="NSUserInterfaceItemIdentifier"/> + <string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+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> <array class="NSMutableArray" key="NSSubviews"> <object class="NSTabView" id="448510093"> @@ -377,6 +378,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{13, 10}, {618, 292}}</string> <reference key="NSSuperview" ref="941366957"/> + <reference key="NSWindow"/> <array class="NSMutableArray" key="NSTabViewItems"> <object class="NSTabViewItem" id="287591690"> <object class="NSMutableString" key="NSIdentifier"> @@ -389,8 +391,9 @@ <object class="NSButton" id="119157981"> <reference key="NSNextResponder" ref="596750588"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{18, 210}, {402, 18}}</string> + <string key="NSFrame">{{18, 214}, {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> @@ -422,6 +425,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 60}, {548, 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> @@ -440,7 +444,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"> @@ -457,8 +461,9 @@ <object class="NSTextField" id="282885445"> <reference key="NSNextResponder" ref="596750588"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{36, 162}, {548, 42}}</string> + <string key="NSFrame">{{36, 166}, {548, 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> @@ -478,6 +483,7 @@ ZS4KA</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> @@ -498,13 +504,14 @@ ZS4KA</string> <object class="NSTextField" id="31160162"> <reference key="NSNextResponder" ref="596750588"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{36, 126}, {548, 14}}</string> + <string key="NSFrame">{{36, 121}, {548, 28}}</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> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Permitir que as mudanças no menu de entrada sobreescrevam o mapa do teclado atual do X11.</string> + <string key="NSContents">Permite que as alterações feitas no menu de leiautes de teclado sobrescrevam o mapa de teclado atual do X11.</string> <reference key="NSSupport" ref="26"/> <string key="NSPlaceholderString"/> <reference key="NSControlView" ref="31160162"/> @@ -515,8 +522,9 @@ ZS4KA</string> <object class="NSButton" id="179949713"> <reference key="NSNextResponder" ref="596750588"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{18, 146}, {402, 18}}</string> + <string key="NSFrame">{{18, 153}, {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> @@ -537,8 +545,9 @@ ZS4KA</string> <object class="NSTextField" id="278155937"> <reference key="NSNextResponder" ref="596750588"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{36, -1}, {385, 31}}</string> + <string key="NSFrame">{{36, -1}, {548, 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> @@ -555,6 +564,7 @@ ZS4KA</string> <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> @@ -575,6 +585,7 @@ ZS4KA</string> </array> <string key="NSFrame">{{10, 33}, {598, 246}}</string> <reference key="NSSuperview" ref="448510093"/> + <reference key="NSWindow"/> </object> <string key="NSLabel">Entrada</string> <reference key="NSColor" ref="57160303"/> @@ -1238,10 +1249,12 @@ ZS4KA</string> </object> </array> <string key="NSFrameSize">{644, 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">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> + <string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1254,10 +1267,11 @@ ZS4KA</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> + <nil key="NSUserInterfaceItemIdentifier"/> + <string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string> <string key="NSWindowContentMinSize">{320, 240}</string> <object class="NSView" key="NSWindowView" id="85544634"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <array class="NSMutableArray" key="NSSubviews"> <object class="NSButton" id="671954382"> @@ -1265,6 +1279,7 @@ ZS4KA</string> <int key="NSvFlags">265</int> <string key="NSFrame">{{372, 191}, {132, 32}}</string> <reference key="NSSuperview" ref="85544634"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="143554520"> <int key="NSCellFlags">67239424</int> @@ -1292,6 +1307,7 @@ ZS4KA</string> <int key="NSvFlags">265</int> <string key="NSFrame">{{372, 159}, {132, 32}}</string> <reference key="NSSuperview" ref="85544634"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="8201128"> <int key="NSCellFlags">67239424</int> @@ -1323,12 +1339,14 @@ ZS4KA</string> <int key="NSvFlags">256</int> <string key="NSFrameSize">{333, 198}</string> <reference key="NSSuperview" ref="580565898"/> + <reference key="NSWindow"/> <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">{333, 17}</string> <reference key="NSSuperview" ref="672307654"/> + <reference key="NSWindow"/> <reference key="NSTableView" ref="905092943"/> </object> <object class="_NSCornerView" key="NSCornerView" id="898633680"> @@ -1336,11 +1354,12 @@ ZS4KA</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{334, 0}, {16, 17}}</string> <reference key="NSSuperview" ref="1063387772"/> + <reference key="NSWindow"/> </object> <array class="NSMutableArray" key="NSTableColumns"> <object class="NSTableColumn" id="938444323"> - <double key="NSWidth">132.73099999999999</double> - <double key="NSMinWidth">62.731000000000002</double> + <double key="NSWidth">132.73100280761719</double> + <double key="NSMinWidth">62.730998992919922</double> <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> <int key="NSCellFlags">75628096</int> @@ -1349,7 +1368,7 @@ ZS4KA</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> @@ -1471,6 +1490,7 @@ ZS4KA</string> </array> <string key="NSFrame">{{1, 17}, {333, 198}}</string> <reference key="NSSuperview" ref="1063387772"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="905092943"/> <reference key="NSDocView" ref="905092943"/> <reference key="NSBGColor" ref="812484075"/> @@ -1481,19 +1501,21 @@ ZS4KA</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{334, 17}, {15, 198}}</string> <reference key="NSSuperview" ref="1063387772"/> + <reference key="NSWindow"/> <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"/> <int key="NSvFlags">256</int> <string key="NSFrame">{{1, 215}, {333, 15}}</string> <reference key="NSSuperview" ref="1063387772"/> + <reference key="NSWindow"/> <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"/> @@ -1503,6 +1525,7 @@ ZS4KA</string> </array> <string key="NSFrame">{{1, 0}, {333, 17}}</string> <reference key="NSSuperview" ref="1063387772"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="792419186"/> <reference key="NSDocView" ref="792419186"/> <reference key="NSBGColor" ref="812484075"/> @@ -1512,6 +1535,7 @@ ZS4KA</string> </array> <string key="NSFrame">{{20, 20}, {350, 231}}</string> <reference key="NSSuperview" ref="85544634"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="580565898"/> <int key="NSsFlags">50</int> <reference key="NSVScroller" ref="842897584"/> @@ -1526,6 +1550,7 @@ ZS4KA</string> <int key="NSvFlags">265</int> <string key="NSFrame">{{372, 223}, {132, 32}}</string> <reference key="NSSuperview" ref="85544634"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1025474039"> <int key="NSCellFlags">-2080244224</int> @@ -1546,10 +1571,12 @@ ZS4KA</string> </object> </array> <string key="NSFrameSize">{519, 271}</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.7976931348623157e+308, 1.7976931348623157e+308}</string> + <string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> @@ -3259,6 +3286,7 @@ ZS4KA</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="100369.object.labelIdentifier">IBBuiltInLabel-Red</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> @@ -3315,9 +3343,9 @@ ZS4KA</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.IBEditorWindowLastContentRect">{{507, 548}, {644, 308}}</string> <string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="244.IBWindowTemplateEditedContentRect">{{507, 565}, {484, 308}}</string> + <string key="244.IBWindowTemplateEditedContentRect">{{507, 548}, {644, 308}}</string> <integer value="1" key="244.ImportedFromIB2"/> <string key="244.editorWindowContentRectSynchronizationRect">{{184, 290}, {481, 345}}</string> <integer value="0" key="244.windowTemplate.hasMaxSize"/> @@ -3334,11 +3362,11 @@ ZS4KA</string> <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.IBEditorWindowLastContentRect">{{68, 585}, {519, 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> + <string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {519, 271}}</string> <integer value="1" key="285.ImportedFromIB2"/> <string key="285.editorWindowContentRectSynchronizationRect">{{433, 406}, {486, 327}}</string> <integer value="0" key="285.windowTemplate.hasMaxSize"/> @@ -3347,7 +3375,7 @@ ZS4KA</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.IBEditorWindowLastContentRect">{{145, 836}, {337, 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> @@ -3452,6 +3480,7 @@ ZS4KA</string> <integer value="1" key="368.ImportedFromIB2"/> <string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1" key="369.ImportedFromIB2"/> + <string key="369.object.labelIdentifier">IBBuiltInLabel-Red</string> <string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1" key="370.ImportedFromIB2"/> <string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3572,6 +3601,7 @@ ZS4KA</string> </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"/> @@ -3579,5 +3609,10 @@ ZS4KA</string> <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> + <string key="NSSwitch">{15, 15}</string> + </dictionary> </data> </archive> 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 1b68c4588..d84701f2e 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/sv.lproj/locversion.plist b/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist index 43e790ad5..8c7691512 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>97</string> + <string>99</string> <key>LprojLocale</key> <string>sv</string> <key>LprojRevisionLevel</key> <string>1</string> <key>LprojVersion</key> - <string>97</string> + <string>99</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 601aca4ba..16e06436f 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="8.00"> <data> <int key="IBDocument.SystemTarget">1040</int> - <string key="IBDocument.SystemVersion">11A79a</string> - <string key="IBDocument.InterfaceBuilderVersion">784</string> - <string key="IBDocument.AppKitVersion">1059</string> - <string key="IBDocument.HIToolboxVersion">478.00</string> + <string key="IBDocument.SystemVersion">11A194b</string> + <string key="IBDocument.InterfaceBuilderVersion">787</string> + <string key="IBDocument.AppKitVersion">1079</string> + <string key="IBDocument.HIToolboxVersion">502.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">784</string> + <string key="NS.object.0">787</string> </object> <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/> <array key="IBDocument.PluginDependencies"> @@ -366,10 +366,11 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string> + <nil key="NSUserInterfaceItemIdentifier"/> + <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> <array class="NSMutableArray" key="NSSubviews"> <object class="NSTabView" id="448510093"> @@ -377,7 +378,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{13, 10}, {458, 292}}</string> <reference key="NSSuperview" ref="941366957"/> - <reference key="NSWindow"/> <array class="NSMutableArray" key="NSTabViewItems"> <object class="NSTabViewItem" id="287591690"> <object class="NSMutableString" key="NSIdentifier"> @@ -392,7 +392,6 @@ <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> @@ -424,7 +423,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 56}, {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> @@ -443,7 +441,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor" id="590688762"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> <object class="NSColor" key="NSTextColor" id="930815747"> @@ -462,7 +460,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 164}, {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> @@ -481,7 +478,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 91}, {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> @@ -504,12 +500,11 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 116}, {400, 29}}</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> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Tillåter att ändringar i indatamenyn skriver över de befintliga X11-tangentkopplingarna.</string> + <string key="NSContents">Tillåter att ändringar i inmatningsmenyn skriver över de befintliga X11-tangentkopplingarna.</string> <reference key="NSSupport" ref="26"/> <string key="NSPlaceholderString"/> <reference key="NSControlView" ref="31160162"/> @@ -522,7 +517,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 149}, {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> @@ -545,7 +539,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <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> @@ -562,7 +555,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> <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> @@ -583,7 +575,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string> </array> <string key="NSFrame">{{10, 33}, {438, 246}}</string> <reference key="NSSuperview" ref="448510093"/> - <reference key="NSWindow"/> </object> <string key="NSLabel">Indata</string> <reference key="NSColor" ref="57160303"/> @@ -1252,12 +1243,10 @@ cmthIGlubmVow6VsbGV0Lgo</string> </object> </array> <string key="NSFrameSize">{484, 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">{3.4028235e+38, 3.4028235e+38}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_prefs</string> </object> <object class="NSWindowTemplate" id="604417141"> @@ -1270,7 +1259,8 @@ cmthIGlubmVow6VsbGV0Lgo</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string> + <nil key="NSUserInterfaceItemIdentifier"/> + <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"/> @@ -1490,6 +1480,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> </array> <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> @@ -1521,6 +1512,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> </array> <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> @@ -1529,12 +1521,12 @@ cmthIGlubmVow6VsbGV0Lgo</string> </array> <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"/> <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"> @@ -1565,7 +1557,7 @@ cmthIGlubmVow6VsbGV0Lgo</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{320, 262}</string> - <string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string> + <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSFrameAutosaveName">x11_apps</string> </object> <object class="NSMenu" id="294137138"> 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 c623b1ad8..5b17831b9 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/main.nib/designable.nib b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib index 13cf11e0d..8e86061fa 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 @@ -960,7 +960,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string> <object class="NSTextFieldCell" key="NSCell" id="461823902"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string key="NSContents">如果您想要使用 xclipboard、klipper 或其他任何 X11 夹纸板管理程序,请停用此选项。</string> + <string key="NSContents">如果您想要使用 xclipboard、klipper 或其他任何 X11 剪切板管理程序,请停用此选项。</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="620944856"/> <reference key="NSBackgroundColor" ref="57160303"/> 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 d8f5f8b75..e422e43f7 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/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh index c85b21765..58d5f6abf 100755 --- a/hw/xquartz/bundle/mk_bundke.sh +++ b/hw/xquartz/bundle/mk_bundke.sh @@ -8,6 +8,7 @@ BUNDLE_ROOT=$3 localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW" for lang in ${localities} ; do + [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj ] && rm -rf ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1 @@ -16,7 +17,7 @@ for lang in ${localities} ; do done done -install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib//designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib +install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib/designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib install -m 644 ${SRCDIR}/Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources install -m 644 ${BUILDDIR}/Info.plist ${BUNDLE_ROOT}/Contents diff --git a/hw/xquartz/darwinXinput.c b/hw/xquartz/darwinXinput.c index 15d9c5258..8bb83ca37 100644 --- a/hw/xquartz/darwinXinput.c +++ b/hw/xquartz/darwinXinput.c @@ -63,25 +63,6 @@ SOFTWARE. #include "XIstubs.h" #include "darwin.h" -/*********************************************************************** - * - * Caller: ProcXCloseDevice - * - * Take care of implementation-dependent details of closing a device. - * Some implementations may actually close the device, others may just - * remove this clients interest in that device. - * - * The default implementation is to do nothing (assume all input devices - * are initialized during X server initialization and kept open). - * - */ - -void -CloseInputDevice(DeviceIntPtr d, ClientPtr client) -{ - DEBUG_LOG("CloseInputDevice(%p, %p)\n", d, client); -} - /**************************************************************************** * * Caller: ProcXSetDeviceMode diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c index 0d2c51a2a..3474d27a7 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -89,14 +89,6 @@ static x_hash_table *surface_hash; /* maps surface ids -> drawablePrivs */ static Bool DRIFreePixmapImp(DrawablePtr pDrawable); -/* FIXME: don't hardcode this? */ -#define CG_INFO_FILE "/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/Info-macos.plist" - -/* Corresponds to SU Jaguar Green */ -#define CG_REQUIRED_MAJOR 1 -#define CG_REQUIRED_MINOR 157 -#define CG_REQUIRED_MICRO 11 - typedef struct { DrawablePtr pDrawable; int refCount; @@ -109,96 +101,6 @@ typedef struct { void *buffer; } DRIPixmapBuffer, *DRIPixmapBufferPtr; -/* Returns version as major.minor.micro in 10.10.10 fixed form */ -static unsigned int -get_cg_version (void) -{ - static unsigned int version; - - FILE *fh; - char *ptr; - - if (version != 0) - return version; - - /* I tried CFBundleGetVersion, but it returns zero, so.. */ - - fh = fopen (CG_INFO_FILE, "r"); - if (fh != NULL) - { - char buf[256]; - - while (fgets (buf, sizeof (buf), fh) != NULL) - { - unsigned char c; - - if (!strstr (buf, "<key>CFBundleShortVersionString</key>") - || fgets (buf, sizeof (buf), fh) == NULL) - { - continue; - } - - ptr = strstr (buf, "<string>"); - if (ptr == NULL) - continue; - - ptr += strlen ("<string>"); - - /* Now PTR points to "MAJOR.MINOR.MICRO". */ - - version = 0; - - again: - switch ((c = *ptr++)) - { - case '.': - version = version * 1024; - goto again; - - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - version = ((version & ~0x3ff) - + (version & 0x3ff) * 10 + (c - '0')); - goto again; - } - break; - } - - fclose (fh); - } - - return version; -} - -static Bool -test_cg_version (unsigned int major, unsigned int minor, unsigned int micro) -{ - unsigned int cg_ver = get_cg_version (); - - unsigned int cg_major = (cg_ver >> 20) & 0x3ff; - unsigned int cg_minor = (cg_ver >> 10) & 0x3ff; - unsigned int cg_micro = cg_ver & 0x3ff; - - if (cg_major > major) - return TRUE; - else if (cg_major < major) - return FALSE; - - /* cg_major == major */ - - if (cg_minor > minor) - return TRUE; - else if (cg_minor < minor) - return FALSE; - - /* cg_minor == minor */ - - if (cg_micro < micro) - return FALSE; - - return TRUE; -} - Bool DRIScreenInit(ScreenPtr pScreen) { @@ -224,20 +126,6 @@ DRIScreenInit(ScreenPtr pScreen) pDRIPriv->directRenderingSupport = TRUE; pDRIPriv->nrWindows = 0; - /* Need recent cg for window access update */ - if (!test_cg_version (CG_REQUIRED_MAJOR, - CG_REQUIRED_MINOR, - CG_REQUIRED_MICRO)) - { - ErrorF ("[DRI] disabled direct rendering; requires CoreGraphics %d.%d.%d\n", - CG_REQUIRED_MAJOR, CG_REQUIRED_MINOR, CG_REQUIRED_MICRO); - - pDRIPriv->directRenderingSupport = FALSE; - - /* Note we don't nuke the dri private, since we need it for - managing indirect surfaces. */ - } - /* Initialize drawable tables */ for (i = 0; i < DRI_MAX_DRAWABLES; i++) { pDRIPriv->DRIDrawables[i] = NULL; |