adium 3393:5d2ec2ab326d: Improved the upgrade path for the new w...

commits at adium.im commits at adium.im
Thu Oct 21 02:03:38 UTC 2010


details:	http://hg.adium.im/adium/rev/5d2ec2ab326d
revision:	3393:5d2ec2ab326d
author:		Evan Schoenberg
date:		Wed Oct 20 19:40:27 2010 -0500

Improved the upgrade path for the new webkit message styles and style identifiers to be nondestructive; we now carry the users previous style-specific preferences with us into Adium 1.4 rather than ignoring them.
(transplanted from 0e061cd60338c0af5c1a881c18d580c169f57973)
Subject: adium 3394:3f18e741e951: Resolved merge

details:	http://hg.adium.im/adium/rev/3f18e741e951
revision:	3394:3f18e741e951
author:		Evan Schoenberg
date:		Wed Oct 20 21:03:24 2010 -0500

Resolved merge

diffs (truncated from 18126 to 1000 lines):

diff -r 1203627d51a9 -r 3f18e741e951 Frameworks/Adium Framework/Resources/da.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/da.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 1203627d51a9 -r 3f18e741e951 Frameworks/Adium Framework/Resources/de.lproj/EditStateSheet.nib/designable.nib
--- a/Frameworks/Adium Framework/Resources/de.lproj/EditStateSheet.nib/designable.nib	Mon Oct 18 01:30:18 2010 -0500
+++ b/Frameworks/Adium Framework/Resources/de.lproj/EditStateSheet.nib/designable.nib	Wed Oct 20 21:03:24 2010 -0500
@@ -2,19 +2,22 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">732</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.SystemVersion">10F569</string>
+		<string key="IBDocument.InterfaceBuilderVersion">804</string>
+		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.HIToolboxVersion">461.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">804</string>
 		</object>
 		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="846910406">
 			<object class="NSCustomObject" id="716114149">
 				<string key="NSClassName">AIEditStateWindowController</string>
@@ -38,7 +41,7 @@
 				<string key="NSWindowContentMaxSize">{403, 477}</string>
 				<string key="NSWindowContentMinSize">{403, 477}</string>
 				<object class="NSView" key="NSWindowView" id="1065385407">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSButton" id="1068146121">
@@ -46,6 +49,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{305, 12}, {84, 32}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1019619694">
 								<int key="NSCellFlags">67239424</int>
@@ -75,6 +79,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{197, 12}, {108, 32}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="964828726">
 								<int key="NSCellFlags">67239424</int>
@@ -96,6 +101,7 @@
 							<int key="NSvFlags">264</int>
 							<string key="NSFrame">{{12, 132}, {205, 18}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="335985447">
 								<int key="NSCellFlags">67239424</int>
@@ -123,6 +129,7 @@
 							<int key="NSvFlags">264</int>
 							<string key="NSFrame">{{12, 277}, {350, 18}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="350048418">
 								<int key="NSCellFlags">67239424</int>
@@ -143,13 +150,14 @@
 						<object class="NSButton" id="559655578">
 							<reference key="NSNextResponder" ref="1065385407"/>
 							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{35, 255}, {190, 18}}</string>
+							<string key="NSFrame">{{35, 255}, {268, 18}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="151349818">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Mit einer eigenen Nachricht:</string>
+								<string key="NSContents">Mit einer eigenen Nachricht antworten:</string>
 								<reference key="NSSupport" ref="237327143"/>
 								<reference key="NSControlView" ref="559655578"/>
 								<int key="NSButtonFlags">1211912703</int>
@@ -180,7 +188,6 @@
 												<string>Apple PNG pasteboard type</string>
 												<string>Apple URL pasteboard type</string>
 												<string>CorePasteboardFlavorType 0x6D6F6F76</string>
-												<string>CorePasteboardFlavorType 0x75726C20</string>
 												<string>NSColor pasteboard type</string>
 												<string>NSFilenamesPboardType</string>
 												<string>NSStringPboardType</string>
@@ -195,6 +202,7 @@
 											</set>
 											<string key="NSFrameSize">{344, 14}</string>
 											<reference key="NSSuperview" ref="254261526"/>
+											<reference key="NSWindow"/>
 											<object class="NSTextContainer" key="NSTextContainer" id="990345555">
 												<object class="NSLayoutManager" key="NSLayoutManager">
 													<object class="NSTextStorage" key="NSTextStorage">
@@ -263,6 +271,7 @@
 									</array>
 									<string key="NSFrame">{{1, 1}, {344, 91}}</string>
 									<reference key="NSSuperview" ref="663456420"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="315651679"/>
 									<reference key="NSDocView" ref="315651679"/>
 									<reference key="NSBGColor" ref="86902175"/>
@@ -277,6 +286,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-30, 1}, {15, 91}}</string>
 									<reference key="NSSuperview" ref="663456420"/>
+									<reference key="NSWindow"/>
 									<reference key="NSTarget" ref="663456420"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSCurValue">1</double>
@@ -286,6 +296,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="663456420"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="663456420"/>
 									<string key="NSAction">_doScroller:</string>
@@ -295,6 +306,7 @@
 							</array>
 							<string key="NSFrame">{{37, 156}, {346, 93}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="254261526"/>
 							<int key="NSsFlags">530</int>
 							<reference key="NSVScroller" ref="658391474"/>
@@ -314,6 +326,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{129, -3}, {19, 28}}</string>
 											<reference key="NSSuperview" ref="146093115"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSStepperCell" key="NSCell" id="402280946">
 												<int key="NSCellFlags">68025888</int>
@@ -336,6 +349,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{105, 0}, {25, 22}}</string>
 											<reference key="NSSuperview" ref="146093115"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="1071193800">
 												<int key="NSCellFlags">-1804468671</int>
@@ -363,6 +377,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{150, 3}, {94, 17}}</string>
 											<reference key="NSSuperview" ref="146093115"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="867963307">
 												<int key="NSCellFlags">67239424</int>
@@ -389,6 +404,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{24, -3}, {19, 28}}</string>
 											<reference key="NSSuperview" ref="146093115"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSStepperCell" key="NSCell" id="161854434">
 												<int key="NSCellFlags">68025888</int>
@@ -406,6 +422,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{45, 3}, {52, 17}}</string>
 											<reference key="NSSuperview" ref="146093115"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="1062791278">
 												<int key="NSCellFlags">67239424</int>
@@ -422,6 +439,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrameSize">{25, 22}</string>
 											<reference key="NSSuperview" ref="146093115"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="877901541">
 												<int key="NSCellFlags">-1804468671</int>
@@ -437,10 +455,12 @@
 									</array>
 									<string key="NSFrameSize">{330, 22}</string>
 									<reference key="NSSuperview" ref="781082785"/>
+									<reference key="NSWindow"/>
 								</object>
 							</array>
 							<string key="NSFrame">{{37, 104}, {330, 22}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -485,7 +505,6 @@
 																<string>Apple PNG pasteboard type</string>
 																<string>Apple URL pasteboard type</string>
 																<string>CorePasteboardFlavorType 0x6D6F6F76</string>
-																<string>CorePasteboardFlavorType 0x75726C20</string>
 																<string>NSColor pasteboard type</string>
 																<string>NSFilenamesPboardType</string>
 																<string>NSStringPboardType</string>
@@ -500,6 +519,7 @@
 															</set>
 															<string key="NSFrameSize">{355, 14}</string>
 															<reference key="NSSuperview" ref="10780363"/>
+															<reference key="NSWindow"/>
 															<object class="NSTextContainer" key="NSTextContainer" id="541321471">
 																<object class="NSLayoutManager" key="NSLayoutManager">
 																	<object class="NSTextStorage" key="NSTextStorage">
@@ -537,12 +557,13 @@
 															</object>
 															<int key="NSTVFlags">6</int>
 															<string key="NSMaxSize">{712, 1e+07}</string>
-															<string key="NSMinize">{355, 0}</string>
+															<string key="NSMinize">{326, 0}</string>
 															<nil key="NSDelegate"/>
 														</object>
 													</array>
 													<string key="NSFrame">{{1, 1}, {355, 91}}</string>
 													<reference key="NSSuperview" ref="130797257"/>
+													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="562818864"/>
 													<reference key="NSDocView" ref="562818864"/>
 													<reference key="NSBGColor" ref="86902175"/>
@@ -554,6 +575,7 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{-30, 1}, {15, 91}}</string>
 													<reference key="NSSuperview" ref="130797257"/>
+													<reference key="NSWindow"/>
 													<reference key="NSTarget" ref="130797257"/>
 													<string key="NSAction">_doScroller:</string>
 													<double key="NSCurValue">1</double>
@@ -563,6 +585,7 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 													<reference key="NSSuperview" ref="130797257"/>
+													<reference key="NSWindow"/>
 													<int key="NSsFlags">1</int>
 													<reference key="NSTarget" ref="130797257"/>
 													<string key="NSAction">_doScroller:</string>
@@ -572,6 +595,7 @@
 											</array>
 											<string key="NSFrame">{{17, 2}, {357, 93}}</string>
 											<reference key="NSSuperview" ref="447759904"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="10780363"/>
 											<int key="NSsFlags">530</int>
 											<reference key="NSVScroller" ref="1039075175"/>
@@ -583,6 +607,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{2, 103}, {322, 17}}</string>
 											<reference key="NSSuperview" ref="447759904"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="1008920718">
 												<int key="NSCellFlags">67239424</int>
@@ -597,10 +622,12 @@
 									</array>
 									<string key="NSFrameSize">{390, 119}</string>
 									<reference key="NSSuperview" ref="971830426"/>
+									<reference key="NSWindow"/>
 								</object>
 							</array>
 							<string key="NSFrame">{{9, 309}, {390, 119}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -624,6 +651,7 @@
 							<int key="NSvFlags">264</int>
 							<string key="NSFrame">{{14, 468}, {369, 5}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -646,6 +674,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{12, 21}, {171, 18}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="832423869">
 								<int key="NSCellFlags">67239424</int>
@@ -674,8 +703,9 @@
 										<object class="NSTextField" id="833315313">
 											<reference key="NSNextResponder" ref="50728617"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{57, 3}, {325, 22}}</string>
+											<string key="NSFrame">{{50, 3}, {332, 22}}</string>
 											<reference key="NSSuperview" ref="50728617"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="1049360614">
 												<int key="NSCellFlags">-1804468671</int>
@@ -691,8 +721,9 @@
 										<object class="NSTextField" id="1065341301">
 											<reference key="NSNextResponder" ref="50728617"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{13, 5}, {39, 17}}</string>
+											<string key="NSFrame">{{13, 5}, {32, 17}}</string>
 											<reference key="NSSuperview" ref="50728617"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="1036426768">
 												<int key="NSCellFlags">67239424</int>
@@ -707,10 +738,12 @@
 									</array>
 									<string key="NSFrameSize">{395, 30}</string>
 									<reference key="NSSuperview" ref="919249186"/>
+									<reference key="NSWindow"/>
 								</object>
 							</array>
 							<string key="NSFrame">{{-2, 480}, {395, 30}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -742,6 +775,7 @@
 											<int key="NSvFlags">264</int>
 											<string key="NSFrame">{{77, 1}, {311, 26}}</string>
 											<reference key="NSSuperview" ref="847067284"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="90378382">
 												<int key="NSCellFlags">-2076049856</int>
@@ -817,6 +851,7 @@
 											<int key="NSvFlags">264</int>
 											<string key="NSFrame">{{13, 3}, {62, 20}}</string>
 											<reference key="NSSuperview" ref="847067284"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="814255934">
 												<int key="NSCellFlags">67239424</int>
@@ -831,10 +866,12 @@
 									</array>
 									<string key="NSFrameSize">{401, 27}</string>
 									<reference key="NSSuperview" ref="9941232"/>
+									<reference key="NSWindow"/>
 								</object>
 							</array>
 							<string key="NSFrame">{{-2, 433}, {401, 27}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -858,6 +895,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{12, 72}, {73, 18}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="151945613">
 								<int key="NSCellFlags">67239424</int>
@@ -880,6 +918,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{12, 47}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="1065385407"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="817235690">
 								<int key="NSCellFlags">67239424</int>
@@ -899,6 +938,8 @@
 						</object>
 					</array>
 					<string key="NSFrameSize">{403, 521}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1024, 746}}</string>
 				<string key="NSMinSize">{403, 499}</string>
@@ -1788,6 +1829,9 @@
 				<boolean value="YES" key="10.ImportedFromIB2"/>
 				<string key="11.CustomClassName">AIAutoScrollView</string>
 				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSAffineTransform" key="11.IBViewBoundsToFrameTransform">
+					<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwroAAA</bytes>
+				</object>
 				<boolean value="YES" key="11.ImportedFromIB2"/>
 				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="12.ImportedFromIB2"/>
@@ -1844,10 +1888,16 @@
 				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="24.ImportedFromIB2"/>
 				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSAffineTransform" key="25.IBViewBoundsToFrameTransform">
+					<bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwaAAAA</bytes>
+				</object>
 				<boolean value="YES" key="25.ImportedFromIB2"/>
 				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="26.ImportedFromIB2"/>
 				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSAffineTransform" key="27.IBViewBoundsToFrameTransform">
+					<bytes key="NSTransformStruct">P4AAAL+AAABAAAAAwuwAAA</bytes>
+				</object>
 				<boolean value="YES" key="27.ImportedFromIB2"/>
 				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="28.ImportedFromIB2"/>
@@ -1866,6 +1916,9 @@
 				<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="34.ImportedFromIB2"/>
 				<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSAffineTransform" key="35.IBViewBoundsToFrameTransform">
+					<bytes key="NSTransformStruct">P4AAAL+AAABCDAAAw4eAAA</bytes>
+				</object>
 				<boolean value="YES" key="35.ImportedFromIB2"/>
 				<string key="36.CustomClassName">AILocalizationTextField</string>
 				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1873,6 +1926,9 @@
 				<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="37.ImportedFromIB2"/>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSAffineTransform" key="5.IBViewBoundsToFrameTransform">
+					<bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwagAAA</bytes>
+				</object>
 				<boolean value="YES" key="5.ImportedFromIB2"/>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="6.ImportedFromIB2"/>
@@ -1884,9 +1940,9 @@
 				<boolean value="YES" key="76.ImportedFromIB2"/>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="8.ImportedFromIB2"/>
-				<string key="9.IBEditorWindowLastContentRect">{{693, 54}, {403, 521}}</string>
+				<string key="9.IBEditorWindowLastContentRect">{{442, 115}, {403, 521}}</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="9.IBWindowTemplateEditedContentRect">{{693, 54}, {403, 521}}</string>
+				<string key="9.IBWindowTemplateEditedContentRect">{{442, 115}, {403, 521}}</string>
 				<boolean value="YES" key="9.ImportedFromIB2"/>
 				<boolean value="YES" key="9.windowTemplate.hasMaxSize"/>
 				<boolean value="YES" key="9.windowTemplate.hasMinSize"/>
@@ -1919,6 +1975,20 @@
 						<string key="okay:">id</string>
 						<string key="statusControlChanged:">id</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="okay:">
+							<string key="name">okay:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="statusControlChanged:">
+							<string key="name">statusControlChanged:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="box_idle">NSBox</string>
 						<string key="box_separatorLine">NSBox</string>
@@ -1948,6 +2018,116 @@
 						<string key="textView_autoReply">AISendingTextView</string>
 						<string key="textView_statusMessage">AISendingTextView</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="box_idle">
+							<string key="name">box_idle</string>
+							<string key="candidateClassName">NSBox</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="box_separatorLine">
+							<string key="name">box_separatorLine</string>
+							<string key="candidateClassName">NSBox</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="box_state">
+							<string key="name">box_state</string>
+							<string key="candidateClassName">NSBox</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="box_statusMessage">
+							<string key="name">box_statusMessage</string>
+							<string key="candidateClassName">NSBox</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="box_title">
+							<string key="name">box_title</string>
+							<string key="candidateClassName">NSBox</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkBox_cancel">
+							<string key="name">checkBox_cancel</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkBox_muteSounds">
+							<string key="name">checkBox_muteSounds</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkBox_okay">
+							<string key="name">checkBox_okay</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkBox_save">
+							<string key="name">checkBox_save</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkBox_silenceGrowl">
+							<string key="name">checkBox_silenceGrowl</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkbox_autoReply">
+							<string key="name">checkbox_autoReply</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkbox_customAutoReply">
+							<string key="name">checkbox_customAutoReply</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkbox_idle">
+							<string key="name">checkbox_idle</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_state">
+							<string key="name">label_state</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_statusMessage">
+							<string key="name">label_statusMessage</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_title">
+							<string key="name">label_title</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="popUp_state">
+							<string key="name">popUp_state</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="scrollView_autoReply">
+							<string key="name">scrollView_autoReply</string>
+							<string key="candidateClassName">AIAutoScrollView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="scrollView_statusMessage">
+							<string key="name">scrollView_statusMessage</string>
+							<string key="candidateClassName">AIAutoScrollView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="stepper_idleHours">
+							<string key="name">stepper_idleHours</string>
+							<string key="candidateClassName">NSStepper</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="stepper_idleMinutes">
+							<string key="name">stepper_idleMinutes</string>
+							<string key="candidateClassName">NSStepper</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="target">
+							<string key="name">target</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_idleHours">
+							<string key="name">textField_idleHours</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_idleMinutes">
+							<string key="name">textField_idleMinutes</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_title">
+							<string key="name">textField_title</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textView_autoReply">
+							<string key="name">textView_autoReply</string>
+							<string key="candidateClassName">AISendingTextView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textView_statusMessage">
+							<string key="name">textView_statusMessage</string>
+							<string key="candidateClassName">AISendingTextView</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -1962,6 +2142,24 @@
 						<string key="window_anchorOnLeftSide">NSWindow</string>
 						<string key="window_anchorOnRightSide">NSWindow</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
+							<string key="name">view_anchorToLeftSide</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_anchorToRightSide">
+							<string key="name">view_anchorToRightSide</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
+							<string key="name">window_anchorOnLeftSide</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
+							<string key="name">window_anchorOnRightSide</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -1975,6 +2173,20 @@
 						<string key="scrollPageDown:">id</string>
 						<string key="scrollPageUp:">id</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="pasteAsRichText:">
+							<string key="name">pasteAsRichText:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="scrollPageDown:">
+							<string key="name">scrollPageDown:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="scrollPageUp:">
+							<string key="name">scrollPageUp:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -1987,10 +2199,24 @@
 						<string key="NS.key.0">sendContent:</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">sendContent:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">sendContent:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<string key="NS.key.0">target</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">target</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">target</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -2011,6 +2237,13 @@
 						<string key="NS.key.0">closeWindow:</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">closeWindow:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">closeWindow:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -2057,6 +2290,28 @@
 						<string key="toggleFindPanel:">id</string>
 						<string key="willAdjustSubviews:">RBSplitView</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="adiumPrint:">
+							<string key="name">adiumPrint:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="didAdjustSubviews:">
+							<string key="name">didAdjustSubviews:</string>
+							<string key="candidateClassName">RBSplitView</string>
+						</object>
+						<object class="IBActionInfo" key="prefsWindowWillClose:">
+							<string key="name">prefsWindowWillClose:</string>
+							<string key="candidateClassName">SS_PrefsController</string>
+						</object>
+						<object class="IBActionInfo" key="toggleFindPanel:">
+							<string key="name">toggleFindPanel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="willAdjustSubviews:">
+							<string key="name">willAdjustSubviews:</string>
+							<string key="candidateClassName">RBSplitView</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -2101,6 +2356,13 @@
 						<string key="NS.key.0">delegate</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">delegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -2113,6 +2375,13 @@
 						<string key="NS.key.0">delegate</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">delegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -2121,6 +2390,7 @@
 			</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="1050" key="NS.object.0"/>
@@ -2128,5 +2398,10 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<string key="IBDocument.LastKnownRelativeProjectPath">../../../../Adium.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{9, 8}</string>
+			<string key="NSMenuMixedState">{7, 2}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
 	</data>
 </archive>
diff -r 1203627d51a9 -r 3f18e741e951 Frameworks/Adium Framework/Resources/de.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/de.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 1203627d51a9 -r 3f18e741e951 Frameworks/Adium Framework/Resources/de.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/de.lproj/Localizable.strings has changed
diff -r 1203627d51a9 -r 3f18e741e951 Frameworks/Adium Framework/Resources/pt_PT.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/pt_PT.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 1203627d51a9 -r 3f18e741e951 Frameworks/Adium Framework/Resources/sk_SK.lproj/EditStateSheet.nib/designable.nib
--- a/Frameworks/Adium Framework/Resources/sk_SK.lproj/EditStateSheet.nib/designable.nib	Mon Oct 18 01:30:18 2010 -0500
+++ b/Frameworks/Adium Framework/Resources/sk_SK.lproj/EditStateSheet.nib/designable.nib	Wed Oct 20 21:03:24 2010 -0500
@@ -2,16 +2,17 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10D573</string>
-		<string key="IBDocument.InterfaceBuilderVersion">762</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
-		<string key="IBDocument.HIToolboxVersion">460.00</string>
+		<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>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">762</string>
+			<string key="NS.object.0">740</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="6"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -42,7 +43,7 @@
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{576, 117}, {403, 521}}</string>
 				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">Vlastný Status</string>
+				<string key="NSWindowTitle">Custom Status</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
@@ -50,7 +51,7 @@
 				<string key="NSWindowContentMaxSize">{403, 527}</string>
 				<string key="NSWindowContentMinSize">{403, 477}</string>
 				<object class="NSView" key="NSWindowView" id="509876344">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -92,7 +93,7 @@
 							<object class="NSButtonCell" key="NSCell" id="732367146">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Zrušiť</string>
+								<string key="NSContents">Cancel</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSControlView" ref="454589821"/>
 								<int key="NSButtonFlags">-2038284033</int>
@@ -113,7 +114,7 @@
 							<object class="NSButtonCell" key="NSCell" id="215150478">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Byť preč okamžite</string>
+								<string key="NSContents">Appear Idle Immediately</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSControlView" ref="1015368611"/>
 								<int key="NSButtonFlags">1211912703</int>
@@ -140,12 +141,11 @@
 							<object class="NSButtonCell" key="NSCell" id="950289041">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Automatická odpoveď</string>
+								<string key="NSContents">Auto-reply</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSControlView" ref="762602674"/>
 								<int key="NSButtonFlags">1211912703</int>
 								<int key="NSButtonFlags2">2</int>
-								<reference key="NSNormalImage" ref="970152037"/>
 								<reference key="NSAlternateImage" ref="522635332"/>
 								<string key="NSAlternateContents"/>
 								<string key="NSKeyEquivalent"/>
@@ -162,12 +162,11 @@
 							<object class="NSButtonCell" key="NSCell" id="1020350936">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">S vlastnou automatickou odpoveďou:</string>
+								<string key="NSContents">With a custom auto-reply message:</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSControlView" ref="873668146"/>
 								<int key="NSButtonFlags">1211912703</int>
 								<int key="NSButtonFlags2">2</int>
-								<reference key="NSNormalImage" ref="970152037"/>
 								<reference key="NSAlternateImage" ref="522635332"/>
 								<string key="NSAlternateContents"/>
 								<string key="NSKeyEquivalent"/>
@@ -407,7 +406,7 @@
 											<object class="NSTextFieldCell" key="NSCell" id="556586308">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">4194304</int>
-												<string key="NSContents">Minúty</string>
+												<string key="NSContents">Minutes</string>
 												<reference key="NSSupport" ref="321541240"/>
 												<reference key="NSControlView" ref="519940975"/>
 												<object class="NSColor" key="NSBackgroundColor" id="793674802">
@@ -450,7 +449,7 @@
 											<object class="NSTextFieldCell" key="NSCell" id="710160508">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">4194304</int>
-												<string key="NSContents">Hodiny</string>
+												<string key="NSContents">Hours</string>
 												<reference key="NSSupport" ref="321541240"/>
 												<reference key="NSControlView" ref="30081493"/>
 												<reference key="NSBackgroundColor" ref="793674802"/>
@@ -485,7 +484,7 @@
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Titul</string>
+								<string key="NSContents">Title</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSBackgroundColor" ref="616743529"/>
 								<object class="NSColor" key="NSTextColor">
@@ -654,7 +653,7 @@
 											<object class="NSTextFieldCell" key="NSCell" id="711168837">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">4194304</int>
-												<string key="NSContents">Status správa:</string>
+												<string key="NSContents">Status Message:</string>
 												<reference key="NSSupport" ref="321541240"/>
 												<reference key="NSControlView" ref="611038104"/>
 												<reference key="NSBackgroundColor" ref="793674802"/>
@@ -672,7 +671,7 @@
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Titul</string>
+								<string key="NSContents">Title</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSBackgroundColor" ref="616743529"/>
 								<object class="NSColor" key="NSTextColor">
@@ -695,7 +694,7 @@
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Schránka</string>
+								<string key="NSContents">Box</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSBackgroundColor" ref="616743529"/>
 								<object class="NSColor" key="NSTextColor">
@@ -717,12 +716,11 @@
 							<object class="NSButtonCell" key="NSCell" id="491604206">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Uložiť vlastný status</string>
+								<string key="NSContents">Save Custom Status</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSControlView" ref="916540914"/>
 								<int key="NSButtonFlags">1211912703</int>
 								<int key="NSButtonFlags2">2</int>
-								<reference key="NSNormalImage" ref="970152037"/>
 								<reference key="NSAlternateImage" ref="522635332"/>
 								<string key="NSAlternateContents"/>
 								<string key="NSKeyEquivalent"/>
@@ -766,7 +764,7 @@
 											<object class="NSTextFieldCell" key="NSCell" id="577178631">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">4194304</int>
-												<string key="NSContents">Titul:</string>
+												<string key="NSContents">Title:</string>
 												<reference key="NSSupport" ref="321541240"/>
 												<reference key="NSControlView" ref="345202850"/>
 												<reference key="NSBackgroundColor" ref="793674802"/>
@@ -784,7 +782,7 @@
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Titul</string>
+								<string key="NSContents">Title</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSBackgroundColor" ref="616743529"/>
 								<object class="NSColor" key="NSTextColor">
@@ -832,7 +830,7 @@
 												<int key="NSPeriodicInterval">75</int>
 												<object class="NSMenuItem" key="NSMenuItem" id="229194320">
 													<reference key="NSMenu" ref="939222959"/>
-													<string key="NSTitle">Vec1</string>
+													<string key="NSTitle">Item1</string>
 													<string key="NSKeyEquiv"/>
 													<int key="NSKeyEquivModMask">1048576</int>
 													<int key="NSMnemonicLoc">2147483647</int>
@@ -850,13 +848,15 @@
 												</object>
 												<bool key="NSMenuItemRespectAlignment">YES</bool>
 												<object class="NSMenu" key="NSMenu" id="939222959">
-													<string key="NSTitle">InéZobrazenie</string>
+													<object class="NSMutableString" key="NSTitle">
+														<characters key="NS.bytes">OtherViews</characters>
+													</object>
 													<object class="NSMutableArray" key="NSMenuItems">
 														<bool key="EncodedWithXMLCoder">YES</bool>
 														<reference ref="229194320"/>
 														<object class="NSMenuItem" id="606728467">
 															<reference key="NSMenu" ref="939222959"/>
-															<string key="NSTitle">Vec2</string>
+															<string key="NSTitle">Item2</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
@@ -867,7 +867,7 @@
 														</object>
 														<object class="NSMenuItem" id="623303723">
 															<reference key="NSMenu" ref="939222959"/>
-															<string key="NSTitle">Vec3</string>
+															<string key="NSTitle">Item3</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
@@ -893,7 +893,7 @@
 											<object class="NSTextFieldCell" key="NSCell" id="701667450">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">71303168</int>
-												<string type="base64-UTF8" key="NSContents">U3RhdjoKA</string>
+												<string type="base64-UTF8" key="NSContents">U3RhdGU6Cg</string>
 												<reference key="NSSupport" ref="321541240"/>
 												<reference key="NSControlView" ref="124491817"/>
 												<reference key="NSBackgroundColor" ref="793674802"/>
@@ -911,7 +911,7 @@
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Titul</string>
+								<string key="NSContents">Title</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSBackgroundColor" ref="616743529"/>
 								<object class="NSColor" key="NSTextColor">
@@ -934,7 +934,7 @@
 							<object class="NSButtonCell" key="NSCell" id="575166235">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Vypnúť zvuk</string>
+								<string key="NSContents">Mute Sounds</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSControlView" ref="225696218"/>
 								<int key="NSButtonFlags">1211912703</int>
@@ -956,7 +956,7 @@
 							<object class="NSButtonCell" key="NSCell" id="211386456">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Vypnúť Growl notifikácie</string>
+								<string key="NSContents">Silence Growl</string>
 								<reference key="NSSupport" ref="321541240"/>
 								<reference key="NSControlView" ref="113233166"/>
 								<int key="NSButtonFlags">1211912703</int>
@@ -971,6 +971,7 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{403, 521}</string>
+					<reference key="NSSuperview"/>
 				</object>




More information about the commits mailing list