adium-1.4 3447:bf9b33ac3a50: Some nib fixes and a minor correcti...

commits at adium.im commits at adium.im
Wed Mar 23 12:20:33 UTC 2011


details:	http://hg.adium.im/adium-1.4/rev/bf9b33ac3a50
revision:	3447:bf9b33ac3a50
branch:		(none)
author:		Robert Vehse
date:		Wed Mar 23 13:13:49 2011 +0100

Some nib fixes and a minor correction for the Norwegian (nb) translation. Fixes #14951.

Actual translation still needs to be done for 1.4.2, I don't speak the language.

diffs (truncated from 6148 to 1000 lines):

diff -r a06b10bc455f -r bf9b33ac3a50 Frameworks/Adium Framework/Resources/nb.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/nb.lproj/Localizable.strings has changed
diff -r a06b10bc455f -r bf9b33ac3a50 Plugins/Purple Service/nb.lproj/ESPurpleMSNAccountView.nib/designable.nib
--- a/Plugins/Purple Service/nb.lproj/ESPurpleMSNAccountView.nib/designable.nib	Tue Mar 22 13:02:11 2011 -0500
+++ b/Plugins/Purple Service/nb.lproj/ESPurpleMSNAccountView.nib/designable.nib	Wed Mar 23 13:13:49 2011 +0100
@@ -2,64 +2,61 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.SystemVersion">10J567</string>
+		<string key="IBDocument.InterfaceBuilderVersion">823</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.HIToolboxVersion">462.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">740</string>
+			<string key="NS.object.0">823</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="216"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="107822799">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="853521580">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="674491556">
+			<object class="NSCustomObject" id="84427413">
 				<string key="NSClassName">ESPurpleMSNAccountViewController</string>
 			</object>
-			<object class="NSCustomObject" id="102067569">
+			<object class="NSCustomObject" id="211964800">
 				<string key="NSClassName">FirstResponder</string>
 			</object>
-			<object class="NSCustomObject" id="817869263">
+			<object class="NSCustomObject" id="364081841">
 				<string key="NSClassName">NSApplication</string>
 			</object>
-			<object class="NSCustomView" id="695654134">
-				<nil key="NSNextResponder"/>
+			<object class="NSCustomView" id="987778157">
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">258</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSTextField" id="691232556">
-						<reference key="NSNextResponder" ref="695654134"/>
+					<object class="NSTextField" id="672533645">
+						<reference key="NSNextResponder" ref="987778157"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{386, 71}, {51, 22}}</string>
-						<reference key="NSSuperview" ref="695654134"/>
+						<string key="NSFrame">{{386, 85}, {51, 22}}</string>
+						<reference key="NSSuperview" ref="987778157"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="1037491667">
+						<object class="NSTextFieldCell" key="NSCell" id="1053985207">
 							<int key="NSCellFlags">-1804468671</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
-							<object class="NSFont" key="NSSupport" id="773717919">
+							<object class="NSFont" key="NSSupport" id="203652881">
 								<string key="NSName">LucidaGrande</string>
 								<double key="NSSize">13</double>
 								<int key="NSfFlags">1044</int>
 							</object>
-							<reference key="NSControlView" ref="691232556"/>
+							<reference key="NSControlView" ref="672533645"/>
 							<bool key="NSDrawsBackground">YES</bool>
-							<object class="NSColor" key="NSBackgroundColor" id="58261473">
+							<object class="NSColor" key="NSBackgroundColor" id="665020971">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">textBackgroundColor</string>
@@ -68,30 +65,31 @@
 									<bytes key="NSWhite">MQA</bytes>
 								</object>
 							</object>
-							<object class="NSColor" key="NSTextColor" id="88425169">
+							<object class="NSColor" key="NSTextColor" id="294483566">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">textColor</string>
-								<object class="NSColor" key="NSColor" id="183971087">
+								<object class="NSColor" key="NSColor" id="279655428">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MAA</bytes>
 								</object>
 							</object>
 						</object>
 					</object>
-					<object class="NSTextField" id="143378707">
-						<reference key="NSNextResponder" ref="695654134"/>
+					<object class="NSTextField" id="853146678">
+						<reference key="NSNextResponder" ref="987778157"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{-3, 73}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="695654134"/>
+						<string key="NSFrame">{{-3, 87}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="987778157"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="31141707">
+						<object class="NSTextFieldCell" key="NSCell" id="876984772">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">PÃ¥loggingstjener:</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="143378707"/>
-							<object class="NSColor" key="NSBackgroundColor" id="706697366">
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="853146678"/>
+							<object class="NSColor" key="NSBackgroundColor" id="1023139906">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">controlColor</string>
@@ -100,50 +98,52 @@
 									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 								</object>
 							</object>
-							<object class="NSColor" key="NSTextColor" id="675726656">
+							<object class="NSColor" key="NSTextColor" id="766502189">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">controlTextColor</string>
-								<reference key="NSColor" ref="183971087"/>
+								<reference key="NSColor" ref="279655428"/>
 							</object>
 						</object>
 					</object>
-					<object class="NSTextField" id="1002817960">
-						<reference key="NSNextResponder" ref="695654134"/>
+					<object class="NSTextField" id="946163408">
+						<reference key="NSNextResponder" ref="987778157"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{142, 71}, {200, 22}}</string>
-						<reference key="NSSuperview" ref="695654134"/>
+						<string key="NSFrame">{{142, 85}, {200, 22}}</string>
+						<reference key="NSSuperview" ref="987778157"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="876129737">
+						<object class="NSTextFieldCell" key="NSCell" id="658562409">
 							<int key="NSCellFlags">-1804468671</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="1002817960"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="946163408"/>
 							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="58261473"/>
-							<reference key="NSTextColor" ref="88425169"/>
+							<reference key="NSBackgroundColor" ref="665020971"/>
+							<reference key="NSTextColor" ref="294483566"/>
 						</object>
 					</object>
-					<object class="NSButton" id="1435578">
-						<reference key="NSNextResponder" ref="695654134"/>
+					<object class="NSButton" id="486517429">
+						<reference key="NSNextResponder" ref="987778157"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{140, 23}, {121, 18}}</string>
-						<reference key="NSSuperview" ref="695654134"/>
+						<string key="NSFrame">{{140, 21}, {273, 18}}</string>
+						<reference key="NSSuperview" ref="987778157"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="52173014">
+						<object class="NSButtonCell" key="NSCell" id="466760812">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Se etter ny post</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="1435578"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="486517429"/>
 							<int key="NSButtonFlags">1211912703</int>
 							<int key="NSButtonFlags2">2</int>
-							<object class="NSCustomResource" key="NSNormalImage" id="152795917">
+							<object class="NSCustomResource" key="NSNormalImage" id="604409695">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSSwitch</string>
 							</object>
-							<object class="NSButtonImageSource" key="NSAlternateImage" id="767278970">
+							<object class="NSButtonImageSource" key="NSAlternateImage" id="626014304">
 								<string key="NSImageName">NSSwitch</string>
 							</object>
 							<string key="NSAlternateContents"/>
@@ -152,92 +152,120 @@
 							<int key="NSPeriodicInterval">25</int>
 						</object>
 					</object>
-					<object class="NSTextField" id="354014424">
-						<reference key="NSNextResponder" ref="695654134"/>
+					<object class="NSTextField" id="910587385">
+						<reference key="NSNextResponder" ref="987778157"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{86, 24}, {51, 17}}</string>
-						<reference key="NSSuperview" ref="695654134"/>
+						<string key="NSFrame">{{-3, 22}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="987778157"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="32576285">
+						<object class="NSTextFieldCell" key="NSCell" id="713828334">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">E-post:</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="354014424"/>
-							<reference key="NSBackgroundColor" ref="706697366"/>
-							<reference key="NSTextColor" ref="675726656"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="910587385"/>
+							<reference key="NSBackgroundColor" ref="1023139906"/>
+							<reference key="NSTextColor" ref="766502189"/>
 						</object>
 					</object>
-					<object class="NSTextField" id="321978605">
-						<reference key="NSNextResponder" ref="695654134"/>
+					<object class="NSTextField" id="652196950">
+						<reference key="NSNextResponder" ref="987778157"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{347, 73}, {34, 17}}</string>
-						<reference key="NSSuperview" ref="695654134"/>
+						<string key="NSFrame">{{347, 87}, {34, 17}}</string>
+						<reference key="NSSuperview" ref="987778157"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="156400338">
+						<object class="NSTextFieldCell" key="NSCell" id="607958492">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Port:</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="321978605"/>
-							<reference key="NSBackgroundColor" ref="706697366"/>
-							<reference key="NSTextColor" ref="675726656"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="652196950"/>
+							<reference key="NSBackgroundColor" ref="1023139906"/>
+							<reference key="NSTextColor" ref="766502189"/>
 						</object>
 					</object>
-					<object class="NSButton" id="831145425">
-						<reference key="NSNextResponder" ref="695654134"/>
+					<object class="NSButton" id="674012297">
+						<reference key="NSNextResponder" ref="987778157"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{140, 47}, {143, 18}}</string>
-						<reference key="NSSuperview" ref="695654134"/>
+						<string key="NSFrame">{{140, 41}, {273, 18}}</string>
+						<reference key="NSSuperview" ref="987778157"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="758869380">
+						<object class="NSButtonCell" key="NSCell" id="763927873">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">0</int>
-							<string key="NSContents">Koble til med HTTP</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="831145425"/>
+							<string key="NSContents">Allow direct connections</string>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="674012297"/>
 							<int key="NSButtonFlags">1211912703</int>
 							<int key="NSButtonFlags2">2</int>
-							<reference key="NSNormalImage" ref="152795917"/>
-							<reference key="NSAlternateImage" ref="767278970"/>
+							<reference key="NSNormalImage" ref="604409695"/>
+							<reference key="NSAlternateImage" ref="626014304"/>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
 					</object>
-					<object class="NSTextField" id="145166493">
-						<reference key="NSNextResponder" ref="695654134"/>
+					<object class="NSButton" id="468308595">
+						<reference key="NSNextResponder" ref="987778157"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{140, 61}, {273, 18}}</string>
+						<reference key="NSSuperview" ref="987778157"/>
+						<reference key="NSWindow"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="159519178">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">0</int>
+							<string key="NSContents">Koble til med HTTP</string>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="468308595"/>
+							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags2">2</int>
+							<reference key="NSNormalImage" ref="604409695"/>
+							<reference key="NSAlternateImage" ref="626014304"/>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+					</object>
+					<object class="NSTextField" id="669300653">
+						<reference key="NSNextResponder" ref="987778157"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{45, 0}, {92, 17}}</string>
-						<reference key="NSSuperview" ref="695654134"/>
+						<string key="NSFrame">{{45, 2}, {92, 17}}</string>
+						<reference key="NSSuperview" ref="987778157"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="708301941">
+						<object class="NSTextFieldCell" key="NSCell" id="292281462">
 							<int key="NSCellFlags">68288064</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents">Humørikoner:</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="145166493"/>
-							<reference key="NSBackgroundColor" ref="706697366"/>
-							<reference key="NSTextColor" ref="675726656"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="669300653"/>
+							<reference key="NSBackgroundColor" ref="1023139906"/>
+							<reference key="NSTextColor" ref="766502189"/>
 						</object>
 					</object>
-					<object class="NSButton" id="746090214">
-						<reference key="NSNextResponder" ref="695654134"/>
+					<object class="NSButton" id="1045257930">
+						<reference key="NSNextResponder" ref="987778157"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{140, -1}, {218, 18}}</string>
-						<reference key="NSSuperview" ref="695654134"/>
+						<string key="NSFrame">{{140, 1}, {218, 18}}</string>
+						<reference key="NSSuperview" ref="987778157"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="478377944">
+						<object class="NSButtonCell" key="NSCell" id="208228965">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Vis egendefinerte humørikoner</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="746090214"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="1045257930"/>
 							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSNormalImage" ref="152795917"/>
-							<reference key="NSAlternateImage" ref="767278970"/>
+							<int key="NSButtonFlags2">130</int>
+							<reference key="NSNormalImage" ref="604409695"/>
+							<reference key="NSAlternateImage" ref="626014304"/>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
 							<int key="NSPeriodicDelay">200</int>
@@ -245,126 +273,132 @@
 						</object>
 					</object>
 				</object>
-				<string key="NSFrameSize">{437, 93}</string>
+				<string key="NSFrameSize">{437, 107}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 				<string key="NSExtension">NSResponder</string>
 			</object>
-			<object class="NSCustomView" id="256210914">
-				<nil key="NSNextResponder"/>
+			<object class="NSCustomView" id="340825438">
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">258</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSTextField" id="128288771">
-						<reference key="NSNextResponder" ref="256210914"/>
+					<object class="NSTextField" id="906415127">
+						<reference key="NSNextResponder" ref="340825438"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{0, 20}, {340, 59}}</string>
-						<reference key="NSSuperview" ref="256210914"/>
+						<reference key="NSSuperview" ref="340825438"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="861096858">
+						<object class="NSTextFieldCell" key="NSCell" id="676534562">
 							<int key="NSCellFlags">-1805517311</int>
 							<int key="NSCellFlags2">4194304</int>
 							<string key="NSContents"/>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="128288771"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="906415127"/>
 							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="58261473"/>
-							<reference key="NSTextColor" ref="88425169"/>
+							<reference key="NSBackgroundColor" ref="665020971"/>
+							<reference key="NSTextColor" ref="294483566"/>
 						</object>
 					</object>
-					<object class="NSTextField" id="302901330">
-						<reference key="NSNextResponder" ref="256210914"/>
+					<object class="NSTextField" id="899124232">
+						<reference key="NSNextResponder" ref="340825438"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{-3, 87}, {97, 17}}</string>
-						<reference key="NSSuperview" ref="256210914"/>
+						<reference key="NSSuperview" ref="340825438"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="516270983">
+						<object class="NSTextFieldCell" key="NSCell" id="918294766">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">4194304</int>
 							<string key="NSContents">Visningsnavn:</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="302901330"/>
-							<reference key="NSBackgroundColor" ref="706697366"/>
-							<reference key="NSTextColor" ref="675726656"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="899124232"/>
+							<reference key="NSBackgroundColor" ref="1023139906"/>
+							<reference key="NSTextColor" ref="766502189"/>
 						</object>
 					</object>
 				</object>
 				<string key="NSFrameSize">{341, 104}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 				<string key="NSExtension">NSResponder</string>
 			</object>
-			<object class="NSCustomView" id="715075962">
-				<nil key="NSNextResponder"/>
+			<object class="NSCustomView" id="660609079">
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSButton" id="762666446">
-						<reference key="NSNextResponder" ref="715075962"/>
+					<object class="NSButton" id="777769653">
+						<reference key="NSNextResponder" ref="660609079"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{89, 24}, {187, 18}}</string>
-						<reference key="NSSuperview" ref="715075962"/>
+						<reference key="NSSuperview" ref="660609079"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="171913091">
+						<object class="NSButtonCell" key="NSCell" id="359484703">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">La andre vite at du skriver</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="762666446"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="777769653"/>
 							<int key="NSButtonFlags">1211912703</int>
 							<int key="NSButtonFlags2">2</int>
-							<reference key="NSNormalImage" ref="152795917"/>
-							<reference key="NSAlternateImage" ref="767278970"/>
+							<reference key="NSNormalImage" ref="604409695"/>
+							<reference key="NSAlternateImage" ref="626014304"/>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
 					</object>
-					<object class="NSTextField" id="290399946">
-						<reference key="NSNextResponder" ref="715075962"/>
+					<object class="NSTextField" id="34022822">
+						<reference key="NSNextResponder" ref="660609079"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{34, 25}, {52, 17}}</string>
-						<reference key="NSSuperview" ref="715075962"/>
+						<reference key="NSSuperview" ref="660609079"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="661436476">
+						<object class="NSTextFieldCell" key="NSCell" id="889808873">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Skriver:</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="290399946"/>
-							<reference key="NSBackgroundColor" ref="706697366"/>
-							<reference key="NSTextColor" ref="675726656"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="34022822"/>
+							<reference key="NSBackgroundColor" ref="1023139906"/>
+							<reference key="NSTextColor" ref="766502189"/>
 						</object>
 					</object>
-					<object class="NSTextField" id="1061899483">
-						<reference key="NSNextResponder" ref="715075962"/>
+					<object class="NSTextField" id="960859079">
+						<reference key="NSNextResponder" ref="660609079"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{11, 54}, {75, 17}}</string>
-						<reference key="NSSuperview" ref="715075962"/>
+						<reference key="NSSuperview" ref="660609079"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="533443249">
+						<object class="NSTextFieldCell" key="NSCell" id="1017359000">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Kryptering:</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="1061899483"/>
-							<reference key="NSBackgroundColor" ref="706697366"/>
-							<reference key="NSTextColor" ref="675726656"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="960859079"/>
+							<reference key="NSBackgroundColor" ref="1023139906"/>
+							<reference key="NSTextColor" ref="766502189"/>
 						</object>
 					</object>
-					<object class="NSPopUpButton" id="619090371">
-						<reference key="NSNextResponder" ref="715075962"/>
+					<object class="NSPopUpButton" id="491368502">
+						<reference key="NSNextResponder" ref="660609079"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{88, 48}, {307, 26}}</string>
-						<reference key="NSSuperview" ref="715075962"/>
+						<reference key="NSSuperview" ref="660609079"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="1042860054">
+						<object class="NSPopUpButtonCell" key="NSCell" id="518527611">
 							<int key="NSCellFlags">-2076049856</int>
 							<int key="NSCellFlags2">1024</int>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="619090371"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="491368502"/>
 							<int key="NSButtonFlags">109199615</int>
 							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="773717919"/>
+							<reference key="NSAlternateImage" ref="203652881"/>
 							<object class="NSMutableString" key="NSAlternateContents">
 								<characters key="NS.bytes"/>
 							</object>
@@ -373,8 +407,8 @@
 							</object>
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="1052581245">
-								<reference key="NSMenu" ref="462554471"/>
+							<object class="NSMenuItem" key="NSMenuItem" id="485637590">
+								<reference key="NSMenu" ref="636663395"/>
 								<string key="NSTitle">Item1</string>
 								<string key="NSKeyEquiv"/>
 								<int key="NSKeyEquivModMask">1048576</int>
@@ -389,16 +423,16 @@
 									<string key="NSResourceName">NSMenuMixedState</string>
 								</object>
 								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="1042860054"/>
+								<reference key="NSTarget" ref="518527611"/>
 							</object>
 							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="462554471">
+							<object class="NSMenu" key="NSMenu" id="636663395">
 								<object class="NSMutableString" key="NSTitle">
 									<characters key="NS.bytes">OtherViews</characters>
 								</object>
 								<object class="NSMutableArray" key="NSMenuItems">
 									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="1052581245"/>
+									<reference ref="485637590"/>
 								</object>
 							</object>
 							<int key="NSPreferredEdge">3</int>
@@ -407,38 +441,38 @@
 							<int key="NSArrowPosition">1</int>
 						</object>
 					</object>
-					<object class="NSTextField" id="162292022">
-						<reference key="NSNextResponder" ref="715075962"/>
+					<object class="NSTextField" id="977913741">
+						<reference key="NSNextResponder" ref="660609079"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{33, 0}, {53, 17}}</string>
-						<reference key="NSSuperview" ref="715075962"/>
+						<string key="NSFrame">{{11, 0}, {75, 17}}</string>
+						<reference key="NSSuperview" ref="660609079"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="428123005">
+						<object class="NSTextFieldCell" key="NSCell" id="192156008">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Musikk:</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="162292022"/>
-							<reference key="NSBackgroundColor" ref="706697366"/>
-							<reference key="NSTextColor" ref="675726656"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="977913741"/>
+							<reference key="NSBackgroundColor" ref="1023139906"/>
+							<reference key="NSTextColor" ref="766502189"/>
 						</object>
 					</object>
-					<object class="NSButton" id="402093473">
-						<reference key="NSNextResponder" ref="715075962"/>
+					<object class="NSButton" id="432561945">
+						<reference key="NSNextResponder" ref="660609079"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{89, -1}, {218, 18}}</string>
-						<reference key="NSSuperview" ref="715075962"/>
+						<reference key="NSSuperview" ref="660609079"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="789722249">
+						<object class="NSButtonCell" key="NSCell" id="715189282">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">La andre vite hva iTunes spiller</string>
-							<reference key="NSSupport" ref="773717919"/>
-							<reference key="NSControlView" ref="402093473"/>
+							<reference key="NSSupport" ref="203652881"/>
+							<reference key="NSControlView" ref="432561945"/>
 							<int key="NSButtonFlags">1211912703</int>
 							<int key="NSButtonFlags2">2</int>
-							<reference key="NSNormalImage" ref="152795917"/>
-							<reference key="NSAlternateImage" ref="767278970"/>
+							<reference key="NSNormalImage" ref="604409695"/>
+							<reference key="NSAlternateImage" ref="626014304"/>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
 							<int key="NSPeriodicDelay">200</int>
@@ -447,6 +481,7 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{392, 72}</string>
+				<reference key="NSSuperview"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
@@ -459,570 +494,611 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_profile</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="256210914"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="340825438"/>
 					</object>
 					<int key="connectionID">204</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_alias</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="128288771"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="906415127"/>
 					</object>
 					<int key="connectionID">205</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="128288771"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="906415127"/>
 					</object>
 					<int key="connectionID">206</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_options</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="695654134"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="987778157"/>
 					</object>
 					<int key="connectionID">207</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_connectHost</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="1002817960"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="946163408"/>
 					</object>
 					<int key="connectionID">208</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_connectPort</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="691232556"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="672533645"/>
 					</object>
 					<int key="connectionID">209</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">checkBox_HTTPConnectMethod</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="831145425"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="468308595"/>
 					</object>
 					<int key="connectionID">210</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">checkBox_checkMail</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="1435578"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="486517429"/>
 					</object>
 					<int key="connectionID">211</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="1435578"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="486517429"/>
 					</object>
 					<int key="connectionID">212</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="831145425"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="468308595"/>
 					</object>
 					<int key="connectionID">213</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="691232556"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="672533645"/>
 					</object>
 					<int key="connectionID">214</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="1002817960"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="946163408"/>
 					</object>
 					<int key="connectionID">215</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_privacy</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="715075962"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="660609079"/>
 					</object>
 					<int key="connectionID">217</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">nextKeyView</string>
-						<reference key="source" ref="619090371"/>
-						<reference key="destination" ref="290399946"/>
+						<reference key="source" ref="491368502"/>
+						<reference key="destination" ref="34022822"/>
 					</object>
 					<int key="connectionID">226</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">nextKeyView</string>
-						<reference key="source" ref="762666446"/>
-						<reference key="destination" ref="162292022"/>
+						<reference key="source" ref="777769653"/>
+						<reference key="destination" ref="977913741"/>
 					</object>
 					<int key="connectionID">227</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">nextKeyView</string>
-						<reference key="source" ref="290399946"/>
-						<reference key="destination" ref="762666446"/>
+						<reference key="source" ref="34022822"/>
+						<reference key="destination" ref="777769653"/>
 					</object>
 					<int key="connectionID">228</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_anchorToRightSide</string>
-						<reference key="source" ref="1061899483"/>
-						<reference key="destination" ref="619090371"/>
+						<reference key="source" ref="960859079"/>
+						<reference key="destination" ref="491368502"/>
 					</object>
 					<int key="connectionID">229</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_anchorToRightSide</string>
-						<reference key="source" ref="290399946"/>
-						<reference key="destination" ref="762666446"/>
+						<reference key="source" ref="34022822"/>
+						<reference key="destination" ref="777769653"/>
 					</object>
 					<int key="connectionID">230</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_anchorToLeftSide</string>
-						<reference key="source" ref="762666446"/>
-						<reference key="destination" ref="290399946"/>
+						<reference key="source" ref="777769653"/>
+						<reference key="destination" ref="34022822"/>
 					</object>
 					<int key="connectionID">231</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">nextKeyView</string>
-						<reference key="source" ref="162292022"/>
-						<reference key="destination" ref="402093473"/>
+						<reference key="source" ref="977913741"/>
+						<reference key="destination" ref="432561945"/>
 					</object>
 					<int key="connectionID">232</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">nextKeyView</string>
-						<reference key="source" ref="1061899483"/>
-						<reference key="destination" ref="619090371"/>
+						<reference key="source" ref="960859079"/>
+						<reference key="destination" ref="491368502"/>
 					</object>
 					<int key="connectionID">233</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">label_encryption</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="1061899483"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="960859079"/>
 					</object>
 					<int key="connectionID">234</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">label_typing</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="290399946"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="34022822"/>
 					</object>
 					<int key="connectionID">235</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">popUp_encryption</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="619090371"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="491368502"/>
 					</object>
 					<int key="connectionID">236</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">checkBox_sendTyping</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="762666446"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="777769653"/>
 					</object>
 					<int key="connectionID">237</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">checkBox_broadcastMusic</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="402093473"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="432561945"/>
 					</object>
 					<int key="connectionID">238</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="619090371"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="491368502"/>
 					</object>
 					<int key="connectionID">239</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="762666446"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="777769653"/>
 					</object>
 					<int key="connectionID">240</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="402093473"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="432561945"/>
 					</object>
 					<int key="connectionID">241</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">checkBox_displayCustomEmoticons</string>
-						<reference key="source" ref="674491556"/>
-						<reference key="destination" ref="746090214"/>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="1045257930"/>
 					</object>
 					<int key="connectionID">282</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">checkbox_AllowDirectConnections</string>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="674012297"/>
+					</object>
+					<int key="connectionID">305</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changedPreference:</string>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="674012297"/>
+					</object>
+					<int key="connectionID">306</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">checkbox_allowDirectConnections</string>
+						<reference key="source" ref="84427413"/>
+						<reference key="destination" ref="674012297"/>
+					</object>
+					<int key="connectionID">307</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
-						<reference key="children" ref="853521580"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="children" ref="107822799"/>
 						<nil key="parent"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-2</int>
-						<reference key="object" ref="674491556"/>
+						<reference key="object" ref="84427413"/>




More information about the commits mailing list