adium 5434:d83e2b960213: Cleared up some text in the initial "Do...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/d83e2b960213
revision:	5434:d83e2b960213
branch:		libotr4.0.0
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Thu Apr 25 00:01:14 2013 +0200

Cleared up some text in the initial "Do you want to accept x's fingerprint?" window. Make clear this is about an encrypted conversation first. Also, the default button is now "Verify Later".

diffs (78 lines):

diff -r d2138e2c5e50 -r d83e2b960213 Source/ESOTRUnknownFingerprintController.m
--- a/Source/ESOTRUnknownFingerprintController.m	Wed Apr 24 22:31:35 2013 +0200
+++ b/Source/ESOTRUnknownFingerprintController.m	Thu Apr 25 00:01:14 2013 +0200
@@ -39,22 +39,20 @@
 	NSString	*messageString;
 	AIAccount	*account = [responseInfo objectForKey:@"AIAccount"];
 	NSString	*who = [responseInfo objectForKey:@"who"];
-	NSString	*ourHash = [responseInfo objectForKey:@"Our Fingerprint"];
 	NSString	*theirHash = [responseInfo objectForKey:@"Their Fingerprint"];
 	
 	messageString = [NSString stringWithFormat:
-		AILocalizedString(@"%@ has sent you (%@) an unknown encryption fingerprint.\n\n"
-						  "Fingerprint for you: %@\n\n"
-						  "Purported fingerprint for %@: %@\n\n"
-						  "Accept this fingerprint as verified?",nil),
+		AILocalizedString(@"%@ wants to start an encrypted conversation with you (%@).\n\n"
+						  @"However, for this chat to be securely encrypted, you should verify their identity by checking their fingerprint. For the best security, it is recommended to use a different form of communication to do this.\n\n"
+						  @"Purported fingerprint for %@:\n\n%@\n\n"
+						  @"Have you verified this fingerprint to be correct?",nil),
 		who,
 		account.formattedUID,
-		ourHash,
 		who,
 		theirHash];
 	
-	[self showFingerprintPromptWithMessageString:messageString 
-									acceptButton:AILocalizedString(@"Accept",nil)
+	[self showFingerprintPromptWithMessageString:messageString
+									acceptButton:AILocalizedString(@"Yes",nil)
 									  denyButton:AILocalizedString(@"Verify Later",nil)
 									responseInfo:responseInfo];
 }
@@ -99,8 +97,8 @@
 	}
 	
 	ESTextAndButtonsWindowController *textAndButtonsWindowController = [[ESTextAndButtonsWindowController alloc] initWithTitle:AILocalizedString(@"OTR Fingerprint Verification",nil)
-																												 defaultButton:acceptButton
-																											   alternateButton:denyButton
+																												 defaultButton:denyButton
+																											   alternateButton:acceptButton
 																												   otherButton:AILocalizedString(@"Help", nil)
 																												   suppression:nil
 																											 withMessageHeader:nil
@@ -124,10 +122,12 @@
 		if (returnCode == AITextAndButtonsOtherReturn) {
 			NSString			*who = [userInfo objectForKey:@"who"];
 			
-			NSString *message = [NSString stringWithFormat:AILocalizedString(@"A fingerprint is a unique identifier "
-																			 "that you should use to verify the identity of %@.\n\nTo verify the fingerprint, contact %@ via some "
-																			 "other authenticated channel such as the telephone or GPG-signed email. "
-																			 "Each of you should tell your fingerprint to the other.", nil),
+			NSString *message = [NSString stringWithFormat:AILocalizedString(@"A fingerprint is a unique cryptographic identifier "
+																			 @"that you can use to verify the identity of %@. "
+																			 @"If the fingerprint you see matches their actualy fingerprint, you know nobody else can listen in on your chat.\n\n"
+																			 @"To verify the fingerprint, contact %@ via some "
+																			 @"other authenticated channel such as the telephone or GPG-signed email. "
+																			 @"Each of you should tell your fingerprint to the other.", nil),
 				who,
 				who];
 			
@@ -135,7 +135,7 @@
 																  defaultButton:nil
 																alternateButton:nil
 																	otherButton:nil
-															  withMessageHeader:AILocalizedString(@"Fingerprint Help", nil)
+															  withMessageHeader:AILocalizedString(@"What is a fingerprint?", nil)
 																	 andMessage:[[[NSAttributedString alloc] initWithString:message] autorelease]
 																		 target:self
 																	   userInfo:nil];
@@ -145,7 +145,7 @@
 			shouldCloseWindow = NO;
 			
 		} else {
-			fingerprintAccepted = ((returnCode == AITextAndButtonsDefaultReturn) ? YES : NO);
+			fingerprintAccepted = ((returnCode == AITextAndButtonsDefaultReturn) ? NO : YES);
 			
 			[self unknownFingerprintResponseInfo:userInfo
 									 wasAccepted:fingerprintAccepted];