Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/specs/libX11/CH11.xml
	mesalib/src/glsl/main.cpp
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/get.c
	mesalib/src/mesa/main/texcompress.c
	mesalib/src/mesa/main/texparam.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	pixman/pixman/pixman-fast-path.c
	pixman/pixman/pixman-fast-path.h
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.h
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist
	xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
	xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist
	xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
	xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist
	xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
	xorg-server/hw/xquartz/darwinEvents.c
	xorg-server/hw/xquartz/darwinEvents.h
	xorg-server/hw/xquartz/man/Xquartz.man
	xorg-server/hw/xquartz/xpr/dri.c
	xorg-server/xkeyboard-config/symbols/ee

4 files changed, 280 insertions, 376 deletions

diff --git a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings
index e40b4d126..5e27e7022 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings
+++ b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings
diff --git a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/locversion.plist b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/locversion.plist
index de5508ec1..5208df7fe 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/locversion.plist
+++ b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/locversion.plist
@@ -3,12 +3,12 @@
 <plist version="1.0">
 <dict>
 	<key>LprojCompatibleVersion</key>
-	<string>101</string>
+	<string>106.3</string>
 	<key>LprojLocale</key>
 	<string>da</string>
 	<key>LprojRevisionLevel</key>
 	<string>1</string>
 	<key>LprojVersion</key>
-	<string>101</string>
+	<string>106.3</string>
 </dict>
 </plist>
diff --git a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib
index fb13cdcdf..f3a3eda13 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib
+++ b/xorg-server/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">11A289</string>
-		<string key="IBDocument.InterfaceBuilderVersion">851</string>
-		<string key="IBDocument.AppKitVersion">1094.2</string>
-		<string key="IBDocument.HIToolboxVersion">521.00</string>
+		<string key="IBDocument.SystemVersion">11A444d</string>
+		<string key="IBDocument.InterfaceBuilderVersion">905</string>
+		<string key="IBDocument.AppKitVersion">1119.1</string>
+		<string key="IBDocument.HIToolboxVersion">555.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">851</string>
+			<string key="NS.object.0">905</string>
 		</object>
 		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
 		<array key="IBDocument.PluginDependencies">
@@ -137,7 +137,7 @@
 								</object>
 								<object class="NSMenuItem" id="206802571">
 									<reference key="NSMenu" ref="576521955"/>
-									<string key="NSTitle">Skul andre</string>
+									<string key="NSTitle">Skjul andre</string>
 									<string key="NSKeyEquiv">h</string>
 									<int key="NSKeyEquivModMask">1572864</int>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -300,7 +300,7 @@
 									<reference key="NSMenu" ref="96874957"/>
 									<string key="NSTitle">Gennemgå vinduer modsat</string>
 									<string key="NSKeyEquiv">&gt;</string>
-									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSKeyEquivModMask">1179648</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
 									<reference key="NSMixedImage" ref="351811234"/>
@@ -362,7 +362,7 @@
 			<object class="NSWindowTemplate" id="124913468">
 				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{319, 328}, {484, 308}}</string>
+				<string key="NSWindowRect">{{319, 328}, {484, 341.0390625}}</string>
 				<int key="NSWTFlags">1350041600</int>
 				<string key="NSWindowTitle">X11-indstillinger</string>
 				<string key="NSWindowClass">NSPanel</string>
@@ -378,8 +378,8 @@
 					<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>
+							<int key="NSvFlags">274</int>
+							<string key="NSFrame">{{13, 10}, {458, 325}}</string>
 							<reference key="NSSuperview" ref="941366957"/>
 							<array class="NSMutableArray" key="NSTabViewItems">
 								<object class="NSTabViewItem" id="287591690">
@@ -387,14 +387,15 @@
 										<characters key="NS.bytes">1</characters>
 									</object>
 									<object class="NSView" key="NSView" id="596750588">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="448510093"/>
 										<int key="NSvFlags">256</int>
 										<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>
+												<string key="NSFrame">{{18, 243}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="179949713"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="990762273">
 													<int key="NSCellFlags">67239424</int>
@@ -403,12 +404,12 @@
 													<object class="NSFont" key="NSSupport" id="463863101">
 														<string key="NSName">LucidaGrande</string>
 														<double key="NSSize">13</double>
-														<int key="NSfFlags">1044</int>
+														<int key="NSfFlags">1040</int>
 													</object>
 													<reference key="NSControlView" ref="119157981"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<object class="NSCustomResource" key="NSNormalImage" id="374778334">
+													<object class="NSCustomResource" key="NSNormalImage" id="279802947">
 														<string key="NSClassName">NSImage</string>
 														<string key="NSResourceName">NSSwitch</string>
 													</object>
@@ -424,8 +425,9 @@
 											<object class="NSTextField" id="443008216">
 												<reference key="NSNextResponder" ref="596750588"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 63}, {355, 28}}</string>
+												<string key="NSFrame">{{36, 96}, {355, 28}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="406291430"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="391919450">
 													<int key="NSCellFlags">67239424</int>
@@ -434,7 +436,7 @@
 													<object class="NSFont" key="NSSupport" id="26">
 														<string key="NSName">LucidaGrande</string>
 														<double key="NSSize">11</double>
-														<int key="NSfFlags">3100</int>
+														<int key="NSfFlags">3088</int>
 													</object>
 													<string key="NSPlaceholderString"/>
 													<reference key="NSControlView" ref="443008216"/>
@@ -461,8 +463,9 @@
 											<object class="NSTextField" id="282885445">
 												<reference key="NSNextResponder" ref="596750588"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 162}, {385, 42}}</string>
+												<string key="NSFrame">{{36, 195}, {385, 42}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="31160162"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="649334366">
 													<int key="NSCellFlags">67239424</int>
@@ -480,8 +483,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="842100515">
 												<reference key="NSNextResponder" ref="596750588"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 97}, {402, 18}}</string>
+												<string key="NSFrame">{{18, 130}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="443008216"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="940564599">
 													<int key="NSCellFlags">67239424</int>
@@ -491,7 +495,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="842100515"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -502,8 +506,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="31160162">
 												<reference key="NSNextResponder" ref="596750588"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 126}, {385, 14}}</string>
+												<string key="NSFrame">{{36, 159}, {385, 14}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="842100515"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="666057093">
 													<int key="NSCellFlags">67239424</int>
@@ -519,8 +524,9 @@ ZW4uCg</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, 179}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="282885445"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="967619578">
 													<int key="NSCellFlags">67239424</int>
@@ -530,7 +536,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="179949713"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -541,8 +547,9 @@ ZW4uCg</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, 32}, {385, 31}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="863505041"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="617441821">
 													<int key="NSCellFlags">67239424</int>
@@ -557,8 +564,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="406291430">
 												<reference key="NSNextResponder" ref="596750588"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 36}, {402, 18}}</string>
+												<string key="NSFrame">{{18, 69}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="278155937"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="67728988">
 													<int key="NSCellFlags">67239424</int>
@@ -568,7 +576,30 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="406291430"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
+													<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="863505041">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 8}, {418, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="1016286396">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Rul altid i den samme retning som fingerens bevægelse</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="863505041"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -577,7 +608,9 @@ ZW4uCg</string>
 												</object>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
+										<string key="NSFrame">{{10, 33}, {438, 279}}</string>
+										<reference key="NSSuperview" ref="448510093"/>
+										<reference key="NSNextKeyView" ref="119157981"/>
 									</object>
 									<string key="NSLabel">Indtastning</string>
 									<reference key="NSColor" ref="57160303"/>
@@ -588,14 +621,15 @@ ZW4uCg</string>
 										<characters key="NS.bytes">2</characters>
 									</object>
 									<object class="NSView" key="NSView" id="515308735">
-										<reference key="NSNextResponder" ref="448510093"/>
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSPopUpButton" id="709074847">
 												<reference key="NSNextResponder" ref="515308735"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{70, 202}, {128, 26}}</string>
+												<string key="NSFrame">{{69, 234}, {128, 26}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="86150604"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="633115429">
 													<int key="NSCellFlags">-2076049856</int>
@@ -682,8 +716,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="201731424">
 												<reference key="NSNextResponder" ref="515308735"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{17, 205}, {55, 20}}</string>
+												<string key="NSFrame">{{17, 238}, {55, 20}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="709074847"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="930265681">
 													<int key="NSCellFlags">67239424</int>
@@ -699,8 +734,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="86150604">
 												<reference key="NSNextResponder" ref="515308735"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 183}, {392, 14}}</string>
+												<string key="NSFrame">{{36, 216}, {392, 14}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="477203622"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="311969422">
 													<int key="NSCellFlags">67239424</int>
@@ -716,8 +752,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="477203622">
 												<reference key="NSNextResponder" ref="515308735"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 149}, {409, 23}}</string>
+												<string key="NSFrame">{{18, 182}, {409, 23}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="298603383"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="631531164">
 													<int key="NSCellFlags">67239424</int>
@@ -727,7 +764,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="477203622"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -738,18 +775,19 @@ ZW4uCg</string>
 											<object class="NSButton" id="57246850">
 												<reference key="NSNextResponder" ref="515308735"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{37, 83}, {383, 23}}</string>
+												<string key="NSFrame">{{37, 116}, {383, 23}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="331853183"/>
 												<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">Vis automatisk menulinjen, når der bruges fuld skærm</string>
+													<string key="NSContents">Tillad adgang til menulinjen ved fuld skærm</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="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -760,8 +798,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="298603383">
 												<reference key="NSNextResponder" ref="515308735"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 115}, {351, 28}}</string>
+												<string key="NSFrame">{{36, 148}, {351, 28}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="57246850"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="761107402">
 													<int key="NSCellFlags">67239424</int>
@@ -774,9 +813,26 @@ ZW4uCg</string>
 													<reference key="NSTextColor" ref="930815747"/>
 												</object>
 											</object>
+											<object class="NSTextField" id="331853183">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{54, 79}, {362, 31}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="1042813110">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Menulinjen bliver synlig, når musens markør anbringes øverst på den primære skærm.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="331853183"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
-										<reference key="NSSuperview" ref="448510093"/>
+										<string key="NSFrame">{{10, 33}, {438, 279}}</string>
+										<reference key="NSNextKeyView" ref="201731424"/>
 									</object>
 									<string key="NSLabel">Resultat</string>
 									<reference key="NSColor" ref="57160303"/>
@@ -793,8 +849,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="878106058">
 												<reference key="NSNextResponder" ref="408298283"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{13, 222}, {409, 23}}</string>
+												<string key="NSFrame">{{13, 255}, {409, 23}}</string>
 												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="386152084"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="718083688">
 													<int key="NSCellFlags">67239424</int>
@@ -804,7 +861,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="878106058"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -815,8 +872,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="386152084">
 												<reference key="NSNextResponder" ref="408298283"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{31, 188}, {392, 28}}</string>
+												<string key="NSFrame">{{31, 221}, {392, 28}}</string>
 												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="487809555"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="572508492">
 													<int key="NSCellFlags">67239424</int>
@@ -831,8 +889,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="477050998">
 												<reference key="NSNextResponder" ref="408298283"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{29, 96}, {398, 23}}</string>
+												<string key="NSFrame">{{29, 129}, {398, 23}}</string>
 												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="765780304"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="501304422">
 													<int key="NSCellFlags">67239424</int>
@@ -842,7 +901,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="477050998"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -853,8 +912,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="765780304">
 												<reference key="NSNextResponder" ref="408298283"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{29, 71}, {400, 23}}</string>
+												<string key="NSFrame">{{29, 104}, {400, 23}}</string>
 												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="1002778833"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="510771323">
 													<int key="NSCellFlags">67239424</int>
@@ -864,7 +924,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="765780304"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -875,8 +935,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="1002778833">
 												<reference key="NSNextResponder" ref="408298283"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{29, 51}, {404, 18}}</string>
+												<string key="NSFrame">{{29, 84}, {404, 18}}</string>
 												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="522511724"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="897099877">
 													<int key="NSCellFlags">67239424</int>
@@ -886,7 +947,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="1002778833"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -897,8 +958,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="487809555">
 												<reference key="NSNextResponder" ref="408298283"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{29, 159}, {398, 23}}</string>
+												<string key="NSFrame">{{29, 192}, {398, 23}}</string>
 												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="620944856"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="619977658">
 													<int key="NSCellFlags">67239424</int>
@@ -908,7 +970,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="487809555"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -919,8 +981,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="620944856">
 												<reference key="NSNextResponder" ref="408298283"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{43, 125}, {385, 28}}</string>
+												<string key="NSFrame">{{43, 158}, {385, 28}}</string>
 												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="477050998"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="461823902">
 													<int key="NSCellFlags">67239424</int>
@@ -935,8 +998,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="522511724">
 												<reference key="NSNextResponder" ref="408298283"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{43, 14}, {385, 28}}</string>
+												<string key="NSFrame">{{43, 47}, {385, 28}}</string>
 												<reference key="NSSuperview" ref="408298283"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="994587858">
 													<int key="NSCellFlags">67239424</int>
@@ -949,7 +1013,8 @@ ZW4uCg</string>
 												</object>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
+										<string key="NSFrame">{{10, 33}, {438, 279}}</string>
+										<reference key="NSNextKeyView" ref="878106058"/>
 									</object>
 									<string key="NSLabel">Opslagstavle</string>
 									<reference key="NSColor" ref="57160303"/>
@@ -966,8 +1031,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="657659108">
 												<reference key="NSNextResponder" ref="184765684"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 212}, {402, 18}}</string>
+												<string key="NSFrame">{{15, 245}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="290578835"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="259618205">
 													<int key="NSCellFlags">67239424</int>
@@ -977,7 +1043,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="657659108"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -988,8 +1054,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="290578835">
 												<reference key="NSNextResponder" ref="184765684"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{23, 175}, {390, 31}}</string>
+												<string key="NSFrame">{{23, 208}, {390, 31}}</string>
 												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="992839333"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="399127858">
 													<int key="NSCellFlags">67239424</int>
@@ -1004,8 +1071,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="992839333">
 												<reference key="NSNextResponder" ref="184765684"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 151}, {402, 18}}</string>
+												<string key="NSFrame">{{15, 184}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="138261120"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="959555182">
 													<int key="NSCellFlags">67239424</int>
@@ -1015,7 +1083,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="992839333"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -1026,8 +1094,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="138261120">
 												<reference key="NSNextResponder" ref="184765684"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{23, 128}, {385, 17}}</string>
+												<string key="NSFrame">{{23, 161}, {385, 17}}</string>
 												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="128352289"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="183409141">
 													<int key="NSCellFlags">67239424</int>
@@ -1042,8 +1111,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="128352289">
 												<reference key="NSNextResponder" ref="184765684"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 107}, {402, 18}}</string>
+												<string key="NSFrame">{{15, 140}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="57161931"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="556463187">
 													<int key="NSCellFlags">67239424</int>
@@ -1053,7 +1123,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="128352289"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -1064,8 +1134,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="57161931">
 												<reference key="NSNextResponder" ref="184765684"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{23, 59}, {390, 42}}</string>
+												<string key="NSFrame">{{23, 92}, {390, 42}}</string>
 												<reference key="NSSuperview" ref="184765684"/>
+												<reference key="NSNextKeyView" ref="448510093"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="989804990">
 													<int key="NSCellFlags">67239424</int>
@@ -1078,7 +1149,8 @@ ZW4uCg</string>
 												</object>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
+										<string key="NSFrame">{{10, 33}, {438, 279}}</string>
+										<reference key="NSNextKeyView" ref="657659108"/>
 									</object>
 									<string key="NSLabel">Vinduer</string>
 									<reference key="NSColor" ref="57160303"/>
@@ -1092,8 +1164,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="989050925">
 												<reference key="NSNextResponder" ref="300811574"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 210}, {402, 18}}</string>
+												<string key="NSFrame">{{18, 243}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="168436707"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="189594322">
 													<int key="NSCellFlags">67239424</int>
@@ -1103,7 +1176,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="989050925"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -1114,8 +1187,9 @@ ZW4uCg</string>
 											<object class="NSButton" id="700826966">
 												<reference key="NSNextResponder" ref="300811574"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 133}, {402, 18}}</string>
+												<string key="NSFrame">{{18, 166}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="363817195"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="489340979">
 													<int key="NSCellFlags">67239424</int>
@@ -1125,7 +1199,7 @@ ZW4uCg</string>
 													<reference key="NSControlView" ref="700826966"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="374778334"/>
+													<reference key="NSNormalImage" ref="279802947"/>
 													<reference key="NSAlternateImage" ref="391434389"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -1136,8 +1210,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="168436707">
 												<reference key="NSNextResponder" ref="300811574"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 162}, {379, 42}}</string>
+												<string key="NSFrame">{{36, 195}, {379, 42}}</string>
 												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="700826966"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="53243865">
 													<int key="NSCellFlags">67239424</int>
@@ -1153,8 +1228,9 @@ ZW4uCg</string>
 											<object class="NSTextField" id="363817195">
 												<reference key="NSNextResponder" ref="300811574"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 85}, {380, 42}}</string>
+												<string key="NSFrame">{{36, 118}, {380, 42}}</string>
 												<reference key="NSSuperview" ref="300811574"/>
+												<reference key="NSNextKeyView" ref="223835729"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="390084685">
 													<int key="NSCellFlags">67239424</int>
@@ -1170,7 +1246,7 @@ ZW4uCg</string>
 											<object class="NSTextField" id="223835729">
 												<reference key="NSNextResponder" ref="300811574"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{20, -16}, {404, 14}}</string>
+												<string key="NSFrame">{{17, 17}, {404, 14}}</string>
 												<reference key="NSSuperview" ref="300811574"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="283628678">
@@ -1185,29 +1261,32 @@ ZW4uCg</string>
 												</object>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
+										<string key="NSFrame">{{10, 33}, {438, 279}}</string>
+										<reference key="NSNextKeyView" ref="989050925"/>
 									</object>
 									<string key="NSLabel">Sikkerhed</string>
 									<reference key="NSColor" ref="57160303"/>
 									<reference key="NSTabView" ref="448510093"/>
 								</object>
 							</array>
-							<reference key="NSSelectedTabViewItem" ref="960678392"/>
+							<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>
 							<array class="NSMutableArray" key="NSSubviews">
-								<reference ref="515308735"/>
+								<reference ref="596750588"/>
 							</array>
 						</object>
 					</array>
-					<string key="NSFrameSize">{484, 308}</string>
+					<string key="NSFrameSize">{484, 341}</string>
+					<reference key="NSNextKeyView" ref="448510093"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{320, 262}</string>
 				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
 				<string key="NSFrameAutosaveName">x11_prefs</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSWindowTemplate" id="604417141">
 				<int key="NSWindowStyleMask">11</int>
@@ -1287,13 +1366,13 @@ ZW4uCg</string>
 										<object class="NSTableView" id="905092943">
 											<reference key="NSNextResponder" ref="580565898"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{301, 198}</string>
+											<string key="NSFrameSize">{316, 213}</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>
+												<string key="NSFrameSize">{316, 17}</string>
 												<reference key="NSSuperview" ref="672307654"/>
 												<reference key="NSTableView" ref="905092943"/>
 											</object>
@@ -1305,7 +1384,7 @@ ZW4uCg</string>
 											</object>
 											<array class="NSMutableArray" key="NSTableColumns">
 												<object class="NSTableColumn" id="938444323">
-													<double key="NSWidth">122.73100280761719</double>
+													<double key="NSWidth">127.73100280761719</double>
 													<double key="NSMinWidth">62.730998992919922</double>
 													<double key="NSMaxWidth">1000</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1343,7 +1422,7 @@ ZW4uCg</string>
 													<reference key="NSTableView" ref="905092943"/>
 												</object>
 												<object class="NSTableColumn" id="84282687">
-													<double key="NSWidth">100</double>
+													<double key="NSWidth">105</double>
 													<double key="NSMinWidth">40</double>
 													<double key="NSMaxWidth">1000</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1370,7 +1449,7 @@ ZW4uCg</string>
 													<reference key="NSTableView" ref="905092943"/>
 												</object>
 												<object class="NSTableColumn" id="242608782">
-													<double key="NSWidth">69</double>
+													<double key="NSWidth">74</double>
 													<double key="NSMinWidth">10</double>
 													<double key="NSMaxWidth">1000</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1436,7 +1515,7 @@ ZW4uCg</string>
 											<int key="NSTableViewGroupRowStyle">1</int>
 										</object>
 									</array>
-									<string key="NSFrame">{{1, 17}, {301, 198}}</string>
+									<string key="NSFrame">{{1, 17}, {316, 213}}</string>
 									<reference key="NSSuperview" ref="1063387772"/>
 									<reference key="NSNextKeyView" ref="905092943"/>
 									<reference key="NSDocView" ref="905092943"/>
@@ -1446,7 +1525,7 @@ ZW4uCg</string>
 								<object class="NSScroller" id="842897584">
 									<reference key="NSNextResponder" ref="1063387772"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{302, 17}, {15, 198}}</string>
+									<string key="NSFrame">{{302, 17}, {15, 213}}</string>
 									<reference key="NSSuperview" ref="1063387772"/>
 									<reference key="NSTarget" ref="1063387772"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1455,7 +1534,7 @@ ZW4uCg</string>
 								<object class="NSScroller" id="17278747">
 									<reference key="NSNextResponder" ref="1063387772"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{1, 215}, {301, 15}}</string>
+									<string key="NSFrame">{{1, 215}, {316, 15}}</string>
 									<reference key="NSSuperview" ref="1063387772"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="1063387772"/>
@@ -1513,10 +1592,11 @@ ZW4uCg</string>
 					</array>
 					<string key="NSFrameSize">{454, 271}</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{320, 262}</string>
 				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
 				<string key="NSFrameAutosaveName">x11_apps</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSMenu" id="294137138">
 				<string key="NSTitle">Menu</string>
@@ -2117,6 +2197,30 @@ ZW4uCg</string>
 					</object>
 					<int key="connectionID">300481</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="863505041"/>
+					</object>
+					<int key="connectionID">300484</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen_menu_text</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="331853183"/>
+					</object>
+					<int key="connectionID">300489</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">scroll_in_device_direction</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="863505041"/>
+					</object>
+					<int key="connectionID">300490</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -2439,6 +2543,7 @@ ZW4uCg</string>
 							<reference ref="179949713"/>
 							<reference ref="278155937"/>
 							<reference ref="406291430"/>
+							<reference ref="863505041"/>
 						</array>
 						<reference key="parent" ref="287591690"/>
 					</object>
@@ -2508,6 +2613,7 @@ ZW4uCg</string>
 							<reference ref="477203622"/>
 							<reference ref="57246850"/>
 							<reference ref="298603383"/>
+							<reference ref="331853183"/>
 						</array>
 						<reference key="parent" ref="960678392"/>
 					</object>
@@ -3166,6 +3272,32 @@ ZW4uCg</string>
 						<reference key="object" ref="617441821"/>
 						<reference key="parent" ref="278155937"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300482</int>
+						<reference key="object" ref="863505041"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1016286396"/>
+						</array>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300483</int>
+						<reference key="object" ref="1016286396"/>
+						<reference key="parent" ref="863505041"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300487</int>
+						<reference key="object" ref="331853183"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1042813110"/>
+						</array>
+						<reference key="parent" ref="515308735"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300488</int>
+						<reference key="object" ref="1042813110"/>
+						<reference key="parent" ref="331853183"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -3235,17 +3367,18 @@ ZW4uCg</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, 515}, {484, 341}}</string>
 				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="244.IBWindowTemplateEditedContentRect">{{507, 565}, {484, 308}}</string>
+				<string key="244.IBWindowTemplateEditedContentRect">{{507, 515}, {484, 341}}</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.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<boolean value="YES" key="244.windowTemplate.hasMinSize"/>
+				<string key="244.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</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="245.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="269.ImportedFromIB2"/>
 				<string key="270.IBEditorWindowLastContentRect">{{58, 803}, {155, 33}}</string>
@@ -3261,9 +3394,9 @@ ZW4uCg</string>
 				<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.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<boolean value="YES" key="285.windowTemplate.hasMinSize"/>
+				<string key="285.windowTemplate.maxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
 				<string key="285.windowTemplate.minSize">{320, 240}</string>
 				<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="286.ImportedFromIB2"/>
@@ -3289,115 +3422,163 @@ ZW4uCg</string>
 				<integer value="1" key="300337.ImportedFromIB2"/>
 				<string key="300338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="300338.ImportedFromIB2"/>
+				<string key="300338.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="300358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="300358.ImportedFromIB2"/>
+				<string key="300358.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="300359.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="300359.ImportedFromIB2"/>
+				<string key="300359.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300362.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300364.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300368.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300370.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300422.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="300423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="300423.ImportedFromIB2"/>
+				<string key="300423.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="300424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="300424.ImportedFromIB2"/>
+				<string key="300424.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300447.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300451.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300453.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300455.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300457.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300459.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="300472.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="300473.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300473.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="300476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="300476.ImportedFromIB2"/>
+				<string key="300476.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="300477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="300477.ImportedFromIB2"/>
+				<string key="300477.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="300478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="300479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300482.ImportedFromIB2"/>
+				<string key="300482.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300483.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300483.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1" key="300487.ImportedFromIB2"/>
+				<string key="300487.object.labelIdentifier">IBBuiltInLabel-Red</string>
+				<string key="300488.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300488.object.labelIdentifier">IBBuiltInLabel-Red</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="348.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="350.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="351.ImportedFromIB2"/>
+				<string key="351.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="354.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="363.ImportedFromIB2"/>
+				<string key="363.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="364.ImportedFromIB2"/>
+				<string key="364.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="365.ImportedFromIB2"/>
+				<string key="365.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="368.ImportedFromIB2"/>
+				<string key="368.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="370.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="374.ImportedFromIB2"/>
+				<string key="374.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="375.ImportedFromIB2"/>
+				<string key="375.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="376.ImportedFromIB2"/>
+				<string key="376.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="377.ImportedFromIB2"/>
+				<string key="377.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="379.ImportedFromIB2"/>
+				<string key="379.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="382.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<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="385.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="386.ImportedFromIB2"/>
+				<string key="386.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="419.ImportedFromIB2"/>
 				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3428,10 +3609,13 @@ ZW4uCg</string>
 				<integer value="1" key="537.ImportedFromIB2"/>
 				<string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="538.ImportedFromIB2"/>
+				<string key="538.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="541.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="541.ImportedFromIB2"/>
+				<string key="541.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="543.ImportedFromIB2"/>
+				<string key="543.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="544.ImportedFromIB2"/>
 				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3457,289 +3641,9 @@ ZW4uCg</string>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">300481</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<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>
-			</array>
-			<array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
-				<object class="IBPartialClassDescription">
-					<string key="className">X11Controller</string>
-					<string key="superclassName">NSObject</string>
-					<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="actionInfosByName">
-						<object class="IBActionInfo" key="apps_table_delete:">
-							<string key="name">apps_table_delete:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="apps_table_done:">
-							<string key="name">apps_table_done:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="apps_table_duplicate:">
-							<string key="name">apps_table_duplicate:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="apps_table_new:">
-							<string key="name">apps_table_new:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="apps_table_show:">
-							<string key="name">apps_table_show:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="bring_to_front:">
-							<string key="name">bring_to_front:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="close_window:">
-							<string key="name">close_window:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="enable_fullscreen_changed:">
-							<string key="name">enable_fullscreen_changed:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="minimize_window:">
-							<string key="name">minimize_window:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="next_window:">
-							<string key="name">next_window:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="prefs_changed:">
-							<string key="name">prefs_changed:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="prefs_show:">
-							<string key="name">prefs_show:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="previous_window:">
-							<string key="name">previous_window:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="quit:">
-							<string key="name">quit:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="toggle_fullscreen:">
-							<string key="name">toggle_fullscreen:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="x11_help:">
-							<string key="name">x11_help:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="zoom_window:">
-							<string key="name">zoom_window:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</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>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="apps_separator">
-							<string key="name">apps_separator</string>
-							<string key="candidateClassName">NSMenuItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="apps_table">
-							<string key="name">apps_table</string>
-							<string key="candidateClassName">NSTableView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="click_through">
-							<string key="name">click_through</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="copy_menu_item">
-							<string key="name">copy_menu_item</string>
-							<string key="candidateClassName">NSMenuItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="depth">
-							<string key="name">depth</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dock_apps_menu">
-							<string key="name">dock_apps_menu</string>
-							<string key="candidateClassName">NSMenu</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dock_menu">
-							<string key="name">dock_menu</string>
-							<string key="candidateClassName">NSMenu</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dock_window_separator">
-							<string key="name">dock_window_separator</string>
-							<string key="candidateClassName">NSMenuItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="enable_auth">
-							<string key="name">enable_auth</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="enable_fullscreen">
-							<string key="name">enable_fullscreen</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="enable_fullscreen_menu">
-							<string key="name">enable_fullscreen_menu</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="enable_keyequivs">
-							<string key="name">enable_keyequivs</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="enable_tcp">
-							<string key="name">enable_tcp</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fake_buttons">
-							<string key="name">fake_buttons</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="focus_follows_mouse">
-							<string key="name">focus_follows_mouse</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="focus_on_new_window">
-							<string key="name">focus_on_new_window</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="option_sends_alt">
-							<string key="name">option_sends_alt</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="prefs_panel">
-							<string key="name">prefs_panel</string>
-							<string key="candidateClassName">NSPanel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sync_clipboard_to_pasteboard">
-							<string key="name">sync_clipboard_to_pasteboard</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sync_keymap">
-							<string key="name">sync_keymap</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sync_pasteboard">
-							<string key="name">sync_pasteboard</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sync_pasteboard_to_clipboard">
-							<string key="name">sync_pasteboard_to_clipboard</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sync_pasteboard_to_primary">
-							<string key="name">sync_pasteboard_to_primary</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sync_primary_immediately">
-							<string key="name">sync_primary_immediately</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sync_text1">
-							<string key="name">sync_text1</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sync_text2">
-							<string key="name">sync_text2</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="toggle_fullscreen_item">
-							<string key="name">toggle_fullscreen_item</string>
-							<string key="candidateClassName">NSMenuItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="use_sysbeep">
-							<string key="name">use_sysbeep</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window_separator">
-							<string key="name">window_separator</string>
-							<string key="candidateClassName">NSMenuItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="x11_about_item">
-							<string key="name">x11_about_item</string>
-							<string key="candidateClassName">NSMenuItem</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBDocumentRelativeSource</string>
-						<string key="minorKey">../../../X11Controller.h</string>
-					</object>
-				</object>
-			</array>
+			<int key="maxID">300490</int>
 		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
@@ -3747,7 +3651,7 @@ ZW4uCg</string>
 			<integer value="1040" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../X11.xcodeproj</string>
+		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="NSMenuCheckmark">{9, 8}</string>
diff --git a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib
index eefa1cf65..659abbf9e 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib