svn merge ^/branches/released .

1 files changed, 14 insertions, 7 deletions

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 d081118d1..430a58303 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">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>