adium 4431:b6aa79491fa8: Localize this string.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/b6aa79491fa8
revision:	4431:b6aa79491fa8
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Fri Dec 23 00:28:37 2011 -0500

Localize this string.
Subject: adium 4432:e80fc203ad64: Correct the user list's size calculation by verifying the allowed width after the minimum is set. Fixes #15577

details:	http://hg.adium.im/adium/rev/e80fc203ad64
revision:	4432:e80fc203ad64
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Fri Dec 23 16:12:23 2011 -0500

Correct the user list's size calculation by verifying the allowed width after the minimum is set. Fixes #15577
Subject: adium 4433:4c0fee2504ef: Adjust the user list's divider colour by three points which'll fix #15567 and make mathuaerknedam happy.

details:	http://hg.adium.im/adium/rev/4c0fee2504ef
revision:	4433:4c0fee2504ef
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Fri Dec 23 16:21:31 2011 -0500

Adjust the user list's divider colour by three points which'll fix #15567 and make mathuaerknedam happy.

diffs (88 lines):

diff -r e3d43cf30b43 -r 4c0fee2504ef Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m	Fri Dec 23 21:30:18 2011 +0100
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m	Fri Dec 23 16:21:31 2011 -0500
@@ -1274,13 +1274,13 @@
 - (CGFloat)_userListViewDividerPositionIgnoringUserMinimum:(BOOL)ignoreUserMinimum
 {
 	CGFloat splitViewWidth = splitView_verticalSplit.frame.size.width;
-	CGFloat allowedWidth = (splitViewWidth / 2) - [splitView_verticalSplit dividerThickness];
+	CGFloat allowedWidth = AIfloor(splitViewWidth / 2) - [splitView_verticalSplit dividerThickness];
 	CGFloat width = ignoreUserMinimum ? USER_LIST_DEFAULT_WIDTH : userListMinWidth;
 	
+	if (width < USER_LIST_DEFAULT_WIDTH)
+		width = USER_LIST_DEFAULT_WIDTH;
 	if (width > allowedWidth)
 		width = allowedWidth;
-	else if (width < USER_LIST_DEFAULT_WIDTH)
-		width = USER_LIST_DEFAULT_WIDTH;
 	
 	if (userListOnRight)
 		return splitViewWidth - width;
diff -r e3d43cf30b43 -r 4c0fee2504ef Plugins/Dual Window Interface/MessageView.xib
--- a/Plugins/Dual Window Interface/MessageView.xib	Fri Dec 23 21:30:18 2011 +0100
+++ b/Plugins/Dual Window Interface/MessageView.xib	Fri Dec 23 16:21:31 2011 -0500
@@ -147,7 +147,7 @@
 																						<string key="NSFrameSize">{345, 264}</string>
 																						<reference key="NSSuperview" ref="916213062"/>
 																						<reference key="NSWindow"/>
-																						<reference key="NSNextKeyView" ref="881321079"/>
+																						<reference key="NSNextKeyView" ref="944644976"/>
 																					</object>
 																				</array>
 																				<string key="NSFrameSize">{345, 264}</string>
@@ -194,7 +194,7 @@
 																		<string key="NSFrameSize">{345, 264}</string>
 																		<reference key="NSSuperview" ref="1034558317"/>
 																		<reference key="NSWindow"/>
-																		<reference key="NSNextKeyView" ref="916213062"/>
+																		<reference key="NSNextKeyView" ref="881321079"/>
 																		<int key="NSsFlags">133120</int>
 																		<reference key="NSVScroller" ref="881321079"/>
 																		<reference key="NSHScroller" ref="657097854"/>
@@ -225,7 +225,7 @@
 																						<string key="NSFrameSize">{344, 18}</string>
 																						<reference key="NSSuperview" ref="382054263"/>
 																						<reference key="NSWindow"/>
-																						<reference key="NSNextKeyView" ref="559917187"/>
+																						<reference key="NSNextKeyView" ref="949636887"/>
 																						<string key="NSClassName">AIMessageEntryTextView</string>
 																						<string key="NSExtension">NSTextView</string>
 																					</object>
@@ -266,7 +266,7 @@
 																		<string key="NSFrameSize">{345, 38}</string>
 																		<reference key="NSSuperview" ref="944644976"/>
 																		<reference key="NSWindow"/>
-																		<reference key="NSNextKeyView" ref="382054263"/>
+																		<reference key="NSNextKeyView" ref="559917187"/>
 																		<int key="NSsFlags">133648</int>
 																		<reference key="NSVScroller" ref="949636887"/>
 																		<reference key="NSHScroller" ref="559917187"/>
@@ -342,7 +342,7 @@
 																<bool key="NSTransparent">NO</bool>
 																<object class="NSColor" key="NSBorderColor2">
 																	<int key="NSColorSpace">1</int>
-																	<bytes key="NSRGB">MC42NTg4MjM1Mjk0IDAuNjU4ODIzNTI5NCAwLjY1ODgyMzUyOTQAA</bytes>
+																	<bytes key="NSRGB">MC42NDcwNTg4MjM1IDAuNjQ3MDU4ODIzNSAwLjY0NzA1ODgyMzUAA</bytes>
 																</object>
 															</object>
 															<object class="NSTextField" id="657371372">
@@ -351,6 +351,7 @@
 																<string key="NSFrame">{{35, 3}, {84, 14}}</string>
 																<reference key="NSSuperview" ref="561723111"/>
 																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSTextFieldCell" key="NSCell" id="864763355">
 																	<int key="NSCellFlags">68288064</int>
diff -r e3d43cf30b43 -r 4c0fee2504ef Source/AIXMLChatlogConverter.m
--- a/Source/AIXMLChatlogConverter.m	Fri Dec 23 21:30:18 2011 +0100
+++ b/Source/AIXMLChatlogConverter.m	Fri Dec 23 16:21:31 2011 -0500
@@ -109,7 +109,7 @@
         result = [converter readData:xmlData withOptions:options retrying:NO];
     } @catch (NSException *e) {
         NSLog(@"Error \"%@\" parsing log file at %@.", e, filePath);
-        return [[[NSAttributedString alloc] initWithString:@"Sorry, there was an error parsing this transcript. It may be corrupt."] autorelease];
+        return [[[NSAttributedString alloc] initWithString:AILocalizedString(@"Sorry, there was an error parsing this transcript. It may be corrupt.", nil)] autorelease];
     }
     return result;
 }