adium 5264:e2a7e2302def: Merged adium-1.6 into libotr4.0.0

commits at adium.im commits at adium.im
Tue Jan 22 21:22:00 UTC 2013


details:	http://hg.adium.im/adium/rev/e2a7e2302def
revision:	5264:e2a7e2302def
branch:		libotr4.0.0
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Tue Jan 22 22:19:25 2013 +0100

Merged adium-1.6 into libotr4.0.0

diffs (truncated from 369531 to 1000 lines):

diff -r 4ef1521096c4 -r e2a7e2302def .hgtags
--- a/.hgtags	Thu Oct 18 01:47:06 2012 +0200
+++ b/.hgtags	Tue Jan 22 22:19:25 2013 +0100
@@ -1,3 +1,4 @@
 4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5
 64b4f46272118a2d4d721123fbcb9f485913ff35 1.5.1
 8d4ed0d28f89a09c3deb3b4b1952e21cd4a5e563 1.5.2
+c436f536180fc12b1c2f70ae31e29a2b32b4529f 1.5.4
diff -r 4ef1521096c4 -r e2a7e2302def Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Thu Oct 18 01:47:06 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj	Tue Jan 22 22:19:25 2013 +0100
@@ -107,7 +107,6 @@
 		112E7FA60FC86BB400657119 /* AITwitterActionsHTMLFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 112E7FA50FC86BB400657119 /* AITwitterActionsHTMLFilter.m */; };
 		1130EA99109B445500FB3454 /* pref-defaultclient.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA98109B445500FB3454 /* pref-defaultclient.tiff */; };
 		1130EA9D109B445D00FB3454 /* pref-mention.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9B109B445D00FB3454 /* pref-mention.tiff */; };
-		1130EA9E109B445D00FB3454 /* pref-messagealerts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9C109B445D00FB3454 /* pref-messagealerts.tiff */; };
 		113891830F6B6AFF00A7D7DC /* AILaconicaService.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891820F6B6AFF00A7D7DC /* AILaconicaService.m */; };
 		1138918A0F6B6B2800A7D7DC /* AILaconicaAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891890F6B6B2800A7D7DC /* AILaconicaAccount.m */; };
 		1138918D0F6B6B3F00A7D7DC /* AILaconicaPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1138918C0F6B6B3F00A7D7DC /* AILaconicaPlugin.m */; };
@@ -239,12 +238,9 @@
 		3419DE750A81042F00C3FC68 /* ContactPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326607CBD598006466F2 /* ContactPrefs.plist */; };
 		3419DE760A81042F00C3FC68 /* default-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326707CBD598006466F2 /* default-icon.png */; };
 		3419DE770A81042F00C3FC68 /* DockPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326207CBD598006466F2 /* DockPrefs.plist */; };
-		3419DE780A81042F00C3FC68 /* emoticon32.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3428B33E0815E1FB00C0D3DC /* emoticon32.tiff */; };
-		3419DE790A81042F00C3FC68 /* emoticon32_transparent.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F590608199746001F733C /* emoticon32_transparent.tiff */; };
 		3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B995D9092A832700E31E91 /* FontPanelAccessoryView.xib */; };
 		3419DE7C0A81042F00C3FC68 /* lock-locked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF53007A62EB100B92233 /* lock-locked.tiff */; };
 		3419DE7D0A81042F00C3FC68 /* lock-unlocked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF52607A62EB000B92233 /* lock-unlocked.tiff */; };
-		3419DE7E0A81042F00C3FC68 /* remove.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 347E787507CA975900350507 /* remove.tiff */; };
 		3419DE7F0A81042F00C3FC68 /* msg-send-file.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326307CBD598006466F2 /* msg-send-file.tiff */; };
 		3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */; };
 		3419DF3B0A8119BF00C3FC68 /* AICalendarDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 340D0A000A7DD1F40059A3AF /* AICalendarDate.m */; };
@@ -323,7 +319,7 @@
 		345DA0680CA09AD0009F1989 /* Statuses.strings in Resources */ = {isa = PBXBuildFile; fileRef = 345DA0660CA09AD0009F1989 /* Statuses.strings */; };
 		345EE2DF0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 345EE2DD0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m */; };
 		345F566B08178356001F733C /* AdiumServiceIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F566A08178356001F733C /* AdiumServiceIcons.icns */; };
-		345F57400817FF80001F733C /* pref-contactList.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F573F0817FF80001F733C /* pref-contactList.tiff */; };
+		345F57400817FF80001F733C /* pref-contact-list.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F573F0817FF80001F733C /* pref-contact-list.tiff */; };
 		345F583E08197E74001F733C /* AdiumStatusIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F583D08197E74001F733C /* AdiumStatusIcons.icns */; };
 		345F58C7081990FF001F733C /* msg-log-viewer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F58C6081990FF001F733C /* msg-log-viewer.tiff */; };
 		34607EE909B228FE000DB3D2 /* AIContactListNameButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607EE709B228FE000DB3D2 /* AIContactListNameButton.m */; };
@@ -356,7 +352,6 @@
 		347E39DC0A98AA4A00961B0E /* missing_image.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E39DB0A98AA4A00961B0E /* missing_image.png */; };
 		347E77F407CA94FF00350507 /* ESAccountEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E77F207CA94FE00350507 /* ESAccountEvents.m */; };
 		347E781407CA961300350507 /* ESUserIconHandlingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */; };
-		347E781A07CA962100350507 /* events-contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E781907CA962100350507 /* events-contact.png */; };
 		347E782907CA964600350507 /* AIContactSortSelectionPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */; };
 		347E782A07CA964700350507 /* ESContactSortConfigurationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */; };
 		347E783407CA967100350507 /* SortingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E783307CA967100350507 /* SortingDefaults.plist */; };
@@ -610,7 +605,7 @@
 		34C91BBB0CA8909700740974 /* AIContentNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C91BB90CA8909700740974 /* AIContentNotification.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34C91BBC0CA8909700740974 /* AIContentNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C91BBA0CA8909700740974 /* AIContentNotification.m */; };
 		34CA15530CAFDFB2009AA5E3 /* sidebarActionWidget.png in Resources */ = {isa = PBXBuildFile; fileRef = 34CA15520CAFDFB2009AA5E3 /* sidebarActionWidget.png */; };
-		34CA22300A671BEF00B11032 /* PersonalPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA222F0A671BEF00B11032 /* PersonalPreferences.xib */; };
+		34CA22300A671BEF00B11032 /* ProfilePreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA222F0A671BEF00B11032 /* ProfilePreferences.xib */; };
 		34CAA3FB0BD3998E00AE92DC /* ESPurpleAIMAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41C08086D9100E27095 /* ESPurpleAIMAccountView.xib */; };
 		34CF9DF5085B8B7900D87E37 /* ESiTunesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34CF9DF3085B8B7900D87E37 /* ESiTunesPlugin.m */; };
 		34D073CA0B1E1A4400D63DF2 /* ESPurpleDotMacAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B387EB807199FE5004DE713 /* ESPurpleDotMacAccountViewController.m */; };
@@ -626,9 +621,9 @@
 		34D073D60B1E1A5000D63DF2 /* PurpleDefaultsMac.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76472E07A07A340021CCD7 /* PurpleDefaultsMac.plist */; };
 		34D073D70B1E1A5000D63DF2 /* PurpleDefaultsAIM.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7635A507A0581D0021CCD7 /* PurpleDefaultsAIM.plist */; };
 		34D0F9CB0954E70100DCB678 /* AIContactListImagePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0F9C90954E70100DCB678 /* AIContactListImagePicker.m */; };
-		34D0FDD20956186200DCB678 /* ESPersonalPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD00956186200DCB678 /* ESPersonalPreferencesPlugin.m */; };
-		34D0FDD80956187700DCB678 /* ESPersonalPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD60956187700DCB678 /* ESPersonalPreferences.m */; };
-		34D0FF8509569FE500DCB678 /* PersonalPreferencesDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */; };
+		34D0FDD20956186200DCB678 /* ESProfilePreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD00956186200DCB678 /* ESProfilePreferencesPlugin.m */; };
+		34D0FDD80956187700DCB678 /* ESProfilePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD60956187700DCB678 /* ESProfilePreferences.m */; };
+		34D0FF8509569FE500DCB678 /* ProfilePreferencesDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D0FF8409569FE500DCB678 /* ProfilePreferencesDefaults.plist */; };
 		34D8153A13B663650022C8C4 /* AIFacebookXMPPAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */; };
 		34D8153B13B663650022C8C4 /* AIFacebookXMPPAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */; };
 		34D8153D13B663650022C8C4 /* AIFacebookXMPPAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */; };
@@ -659,7 +654,6 @@
 		34D8333307CBD741006466F2 /* events-applescript-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8333107CBD741006466F2 /* events-applescript-alert.tiff */; };
 		34D8333B07CBD758006466F2 /* ESApplescriptContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333707CBD758006466F2 /* ESApplescriptContactAlertPlugin.m */; };
 		34D8333C07CBD758006466F2 /* ESPanelApplescriptDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333807CBD758006466F2 /* ESPanelApplescriptDetailPane.m */; };
-		34D8337107CBD808006466F2 /* pref-general.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336807CBD807006466F2 /* pref-general.tif */; };
 		34D8337407CBD808006466F2 /* pref-file-transfer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336B07CBD807006466F2 /* pref-file-transfer.tiff */; };
 		34D8337507CBD808006466F2 /* pref-events.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336C07CBD807006466F2 /* pref-events.tiff */; };
 		34D8337707CBD808006466F2 /* pref-advanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336E07CBD807006466F2 /* pref-advanced.tiff */; };
@@ -995,14 +989,11 @@
 		4BAE6D3D07CFA0BC007E2820 /* AIAppearancePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6D3B07CFA0BC007E2820 /* AIAppearancePreferences.m */; };
 		4BAE6D4307CFA0CB007E2820 /* AIAppearancePreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6D4107CFA0CB007E2820 /* AIAppearancePreferencesPlugin.m */; };
 		4BB1E493067F2EAC00D1DB86 /* Scripts in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BB1E47D067F2E9F00D1DB86 /* Scripts */; };
-		4BB2EB220D88D76100CA7A7D /* timestamp32.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB2EB200D88D76100CA7A7D /* timestamp32.tiff */; };
-		4BB2EB230D88D76100CA7A7D /* timestamp32_transparent.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB2EB210D88D76100CA7A7D /* timestamp32_transparent.tiff */; };
 		4BB5B78207D2DC4900CFE06F /* pref-status.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB5B78107D2DC4900CFE06F /* pref-status.tiff */; };
 		4BB9972B083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99727083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.m */; };
 		4BB9972D083D1A5F006ACD6F /* SMContactListShowDetailsPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99729083D1A5F006ACD6F /* SMContactListShowDetailsPane.m */; };
 		4BB9972F083D1A74006ACD6F /* ContactListShowBehavior.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BB9972E083D1A74006ACD6F /* ContactListShowBehavior.xib */; };
 		4BCAB5F307B59967006641B9 /* EditAccountSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAB5F007B59967006641B9 /* EditAccountSheet.xib */; };
-		4BCAC4D907B59B2E006641B9 /* AddressBook.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4D807B59B2E006641B9 /* AddressBook.tiff */; };
 		4BCAC4E607B59B65006641B9 /* Alias Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4E307B59B65006641B9 /* Alias Defaults.plist */; };
 		4BCAC4E707B59B65006641B9 /* Display Format Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4E407B59B65006641B9 /* Display Format Defaults.plist */; };
 		4BCAC56D07B5A31A006641B9 /* Sounds in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC56C07B5A31A006641B9 /* Sounds */; };
@@ -1019,7 +1010,7 @@
 		4BD6753606001E0F0049CAF7 /* AIMessageTabViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BACB70203C8CB5E00A8010A /* AIMessageTabViewItem.m */; };
 		4BD6753806001E100049CAF7 /* AIMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F570A5CE03704D3D01A8010A /* AIMessageViewController.m */; };
 		4BD6753A06001E110049CAF7 /* AIMessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5793982033E756E01A8010A /* AIMessageWindowController.m */; };
-		4BD6753E06001E140049CAF7 /* AIAccountSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B25494703F6A32700A8010A /* AIAccountSelectionView.m */; };
+		4BD6753E06001E140049CAF7 /* AITopBarGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B25494703F6A32700A8010A /* AITopBarGradientView.m */; };
 		4BD6755406001E1E0049CAF7 /* DualWindowDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D43504051ADC10003B2F21 /* DualWindowDefaults.plist */; };
 		4BD6756B06001E320049CAF7 /* EventSoundDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BA5325D050FC5E800A8010A /* EventSoundDefaults.plist */; };
 		4BD6758206001E430049CAF7 /* ErrorMessageHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 40AC0EEC03B5BF1000A80202 /* ErrorMessageHandlerPlugin.m */; };
@@ -1032,7 +1023,7 @@
 		4BE9FFE8055981AB00359B15 /* Adium.pch in Resources */ = {isa = PBXBuildFile; fileRef = 4BE9FFE7055981AB00359B15 /* Adium.pch */; };
 		4BF2EA3F067CB7A200743318 /* Emoticons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BF2E194067CAE9200743318 /* Emoticons */; };
 		4BF2EA40067CB7A200743318 /* Message Styles in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BF2E6B3067CB70E00743318 /* Message Styles */; };
-		4BF3CB4207D1771E00A8112A /* pref-appearance.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CB4107D1771E00A8112A /* pref-appearance.tiff */; };
+		4BF3CB4207D1771E00A8112A /* pref-icons.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CB4107D1771E00A8112A /* pref-icons.tiff */; };
 		4BF3CBED07D192F500A8112A /* pref-accounts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CBEC07D192F500A8112A /* pref-accounts.tiff */; };
 		4BF98DCD06D149EE00E8781D /* ContactStatusColoringDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B31E8C404C46A9100A8010A /* ContactStatusColoringDefaults.plist */; };
 		4BFC2E7907E357F00063D70C /* emoticonBlank.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BFC2E7807E357F00063D70C /* emoticonBlank.png */; };
@@ -1044,7 +1035,6 @@
 		4F1CB6320D640D7F0073A1E6 /* AIEventsInspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1CB6310D640D7F0073A1E6 /* AIEventsInspectorPane.m */; };
 		4F1CB6390D640D900073A1E6 /* AIEventsInspectorPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB6350D640D8F0073A1E6 /* AIEventsInspectorPane.xib */; };
 		4F1CB63A0D640D900073A1E6 /* AIInfoInspectorPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB6360D640D900073A1E6 /* AIInfoInspectorPane.xib */; };
-		4F1CB63F0D640DA40073A1E6 /* get-info-address-book.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63B0D640DA40073A1E6 /* get-info-address-book.tiff */; };
 		4F1CB6400D640DA40073A1E6 /* get-info-advanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63C0D640DA40073A1E6 /* get-info-advanced.tiff */; };
 		4F1CB6410D640DA40073A1E6 /* get-info-events.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63D0D640DA40073A1E6 /* get-info-events.tiff */; };
 		4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.xib */; };
@@ -1052,9 +1042,8 @@
 		5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.m */; };
 		5A1E3A1214DCE60400724574 /* Preferences-Xtras.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */; };
 		5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.xib */; };
-		5A27FA7D14A272330063489D /* pref-messagehistory.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7914A272330063489D /* pref-messagehistory.png */; };
 		5A27FA7E14A272330063489D /* pref-messagestyle.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7A14A272330063489D /* pref-messagestyle.png */; };
-		5A27FA8014A272330063489D /* pref-windowhandling.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7C14A272330063489D /* pref-windowhandling.png */; };
+		5A44595E169143130078AB0A /* AIPreferenceCVPrototypeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A445957169118C60078AB0A /* AIPreferenceCVPrototypeView.m */; };
 		5A4BD41D13F855B000A4D3F7 /* SearchTerms.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD41B13F855B000A4D3F7 /* SearchTerms.plist */; };
 		5A4BD41E13F8568100A4D3F7 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5ACF27331392C585004B6AEF /* Preferences.xib */; };
 		5A4BD43313F856E300A4D3F7 /* Preferences-AddressBookIntegration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */; };
@@ -1073,6 +1062,8 @@
 		5A5F601D12962EC0007A2232 /* AISegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F601A12962D06007A2232 /* AISegmentedControl.m */; };
 		5A5F601E12962ECE007A2232 /* AISegmentedControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A5F601912962D06007A2232 /* AISegmentedControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5A5F8BBD12D560E400019727 /* AIDockNameOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F8BBC12D560E400019727 /* AIDockNameOverlay.m */; };
+		5A6298DF1682BD9100F51DED /* AIAdvancedPreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */; };
+		5A6298E31682BD9D00F51DED /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5A799674133C3D6F0005AC6A /* MessageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1FEA601334549300C14951 /* MessageView.xib */; };
 		5A804FEA12BE9E84007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
 		5A80508512BE9F00007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
@@ -1359,17 +1350,28 @@
 		6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; };
 		6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
 		6EC1685006C170A000F9FAD3 /* InviteToChatWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.xib */; };
+		761D58801636C60100210B12 /* AINewMessageTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D587F1636C60100210B12 /* AINewMessageTableView.m */; };
+		761D58831636EDE100210B12 /* AINewMessageTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */; };
+		761D58861636F94300210B12 /* AINewMessageSearchField.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58851636F94200210B12 /* AINewMessageSearchField.m */; };
 		765F5D67162F30E800C57904 /* AIOTRSMPSecretAnswerWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 765F5D65162F30E800C57904 /* AIOTRSMPSecretAnswerWindowController.m */; };
 		765F5D6F162F357E00C57904 /* AIOTRSMPSecretAnswerWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5D6E162F357E00C57904 /* AIOTRSMPSecretAnswerWindowController.xib */; };
 		765F5D71162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5D70162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib */; };
 		765F5D74162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 765F5D73162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m */; };
+		765F5DC51635934400C57904 /* AIRejoinGroupChatTopBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */; };
+		7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
+		7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
 		766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
 		76731DE215F90538007728C3 /* libgcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; };
 		76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
 		76731DE415F9057F007728C3 /* libgcrypt.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; };
 		76731DE515F90582007728C3 /* libgpgerror.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
+		767870E41634045D00BD0E4D /* AIMessageViewTopBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 767870E31634045C00BD0E4D /* AIMessageViewTopBarController.m */; };
 		76889DEB12D3CA17007AEF00 /* get-info.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEA12D3CA17007AEF00 /* get-info.tiff */; };
-		76889DEF12D3CA40007AEF00 /* Personal.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEE12D3CA40007AEF00 /* Personal.tiff */; };
+		76A79E0B16349477007A0497 /* AIGroupChat.h in Headers */ = {isa = PBXBuildFile; fileRef = 76A79E0916349477007A0497 /* AIGroupChat.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		76A79E0C16349477007A0497 /* AIGroupChat.m in Sources */ = {isa = PBXBuildFile; fileRef = 76A79E0A16349477007A0497 /* AIGroupChat.m */; };
+		76AA110C1635585E00A6EC4B /* AIAccountSelectionTopBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76AA11091635585E00A6EC4B /* AIAccountSelectionTopBar.xib */; };
+		76AA110D1635585E00A6EC4B /* AIAccountSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76AA110B1635585E00A6EC4B /* AIAccountSelectionViewController.m */; };
+		76AA1110163558B200A6EC4B /* AIRejoinGroupChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76AA110F163558B200A6EC4B /* AIRejoinGroupChatViewController.m */; };
 		76C1AF9C125A906A00D269A9 /* AIAdiumURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C1AF9B125A906A00D269A9 /* AIAdiumURLProtocol.m */; };
 		76FF925A14B524B40043E23B /* AIIRCConsoleController.h in Headers */ = {isa = PBXBuildFile; fileRef = 76FF925814B524B40043E23B /* AIIRCConsoleController.h */; };
 		76FF925B14B524B40043E23B /* AIIRCConsoleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76FF925914B524B40043E23B /* AIIRCConsoleController.m */; };
@@ -1446,7 +1448,22 @@
 		C4D29CC40C3C2E3C001545A2 /* BGICImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC00C3C2E3C001545A2 /* BGICImportController.m */; };
 		C4D29CC60C3C2E3C001545A2 /* BGICLogImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */; };
 		C4D29CC80C3C2E49001545A2 /* ICImport.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4D29CC70C3C2E49001545A2 /* ICImport.xib */; };
+		C613B07B1640AABB006683FF /* get-info-profile.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0791640AABB006683FF /* get-info-profile.tiff */; };
+		C613B0BD1640B226006683FF /* get-info-address-book.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0BC1640B226006683FF /* get-info-address-book.tiff */; };
+		C613B0F01640B6DD006683FF /* emoticon-sleep.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0EE1640B6DD006683FF /* emoticon-sleep.tiff */; };
+		C613B0F11640B6DD006683FF /* emoticon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0EF1640B6DD006683FF /* emoticon.tiff */; };
+		C613B0F41640B6F5006683FF /* transcripts-timestamp-in.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0F21640B6F5006683FF /* transcripts-timestamp-in.tiff */; };
+		C613B0F51640B6F5006683FF /* transcripts-timestamp-out.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0F31640B6F5006683FF /* transcripts-timestamp-out.tiff */; };
+		C613B0F71640B70B006683FF /* transcripts-remove.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0F61640B70B006683FF /* transcripts-remove.tiff */; };
+		C613B1091640BF91006683FF /* pref-window-handling.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B1081640BF91006683FF /* pref-window-handling.tiff */; };
+		C613B10B1640BFE7006683FF /* pref-address-book.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B10A1640BFE7006683FF /* pref-address-book.tiff */; };
+		C613B10D1640C09A006683FF /* pref-message-alerts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B10C1640C09A006683FF /* pref-message-alerts.tiff */; };
+		C613B10F1640C0DE006683FF /* pref-general.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B10E1640C0DE006683FF /* pref-general.tiff */; };
+		C613B1111640C370006683FF /* pref-profile.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B1101640C370006683FF /* pref-profile.tiff */; };
+		C613B143164112B3006683FF /* events-dock-name.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B142164112B3006683FF /* events-dock-name.tiff */; };
+		C613B1451641210B006683FF /* events-contact.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B1441641210B006683FF /* events-contact.tiff */; };
 		C61AFA9A15DD43C80001EDEF /* AboutDialog_bg at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C61AFA9915DD43C80001EDEF /* AboutDialog_bg at 2x.png */; };
+		C63BF3BE1637605400FF162B /* SRSnapback at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C63BF3BD1637605400FF162B /* SRSnapback at 2x.png */; };
 		C699374B15F75FB2007EFFA0 /* stackImage at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C647215515F75E3700206892 /* stackImage at 2x.png */; };
 		C6A42A8015C5B7290032FAB3 /* FTProgressReveal_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7415C5B7290032FAB3 /* FTProgressReveal_Selected.png */; };
 		C6A42A8115C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7515C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png */; };
@@ -1664,6 +1681,7 @@
 				11EE1CD00CDD01120097F246 /* libgmodule.framework in Copy Frameworks */,
 				11EE1CD10CDD01120097F246 /* libgobject.framework in Copy Frameworks */,
 				11EE1CD20CDD01120097F246 /* libgthread.framework in Copy Frameworks */,
+				7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */,
 				11EE1CD30CDD01120097F246 /* libintl.framework in Copy Frameworks */,
 				11EE1CD40CDD01120097F246 /* libmeanwhile.framework in Copy Frameworks */,
 				11EE1CD50CDD01120097F246 /* libpurple.framework in Copy Frameworks */,
@@ -1795,7 +1813,6 @@
 		112E7FA50FC86BB400657119 /* AITwitterActionsHTMLFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITwitterActionsHTMLFilter.m; path = "Plugins/Twitter Plugin/AITwitterActionsHTMLFilter.m"; sourceTree = "<group>"; };
 		1130EA98109B445500FB3454 /* pref-defaultclient.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-defaultclient.tiff"; path = "Resources/pref-defaultclient.tiff"; sourceTree = "<group>"; };
 		1130EA9B109B445D00FB3454 /* pref-mention.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-mention.tiff"; path = "Resources/pref-mention.tiff"; sourceTree = "<group>"; };
-		1130EA9C109B445D00FB3454 /* pref-messagealerts.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-messagealerts.tiff"; path = "Resources/pref-messagealerts.tiff"; sourceTree = "<group>"; };
 		113891810F6B6AFF00A7D7DC /* AILaconicaService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AILaconicaService.h; path = "Plugins/Twitter Plugin/AILaconicaService.h"; sourceTree = "<group>"; };
 		113891820F6B6AFF00A7D7DC /* AILaconicaService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AILaconicaService.m; path = "Plugins/Twitter Plugin/AILaconicaService.m"; sourceTree = "<group>"; };
 		113891880F6B6B2800A7D7DC /* AILaconicaAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AILaconicaAccount.h; path = "Plugins/Twitter Plugin/AILaconicaAccount.h"; sourceTree = "<group>"; };
@@ -2165,7 +2182,7 @@
 		341EC8BE0D3C2BA9007216A2 /* sl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sl; path = "Frameworks/Adium Framework/Resources/sl.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		341EC8BF0D3C2BA9007216A2 /* sl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sl; path = Resources/sl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		341EC8C20D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sl; path = Resources/sl.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
-		341EC8C30D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sl; path = Resources/sl.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		341EC8C30D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sl; path = Resources/sl.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		341EC8C40D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sl; path = Resources/sl.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
 		341EC8C50D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = folder; name = sl; path = "Resources/sl.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		341EC8C60D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sl; path = Resources/sl.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -2198,7 +2215,7 @@
 		34208D160D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = "Frameworks/Adium Framework/Resources/fr_CA.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34208D180D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = Resources/fr_CA.lproj/Localizable.strings; sourceTree = "<group>"; };
 		34208D1B0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fr_CA; path = Resources/fr_CA.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
-		34208D1C0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fr_CA; path = Resources/fr_CA.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		34208D1C0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr_CA; path = Resources/fr_CA.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		34208D1D0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fr_CA; path = Resources/fr_CA.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
 		34208D1E0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fr_CA; path = "Resources/fr_CA.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		34208D1F0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = Resources/fr_CA.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -2239,7 +2256,6 @@
 		3428328607D2643F004F01C9 /* ESStatusPreferences.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESStatusPreferences.h; path = Source/ESStatusPreferences.h; sourceTree = "<group>"; };
 		3428328707D2643F004F01C9 /* ESStatusPreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESStatusPreferencesPlugin.m; path = Source/ESStatusPreferencesPlugin.m; sourceTree = "<group>"; };
 		342838ED07D2D004004F01C9 /* Shared Dock Icon Images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Shared Dock Icon Images"; path = "Resources/Shared Dock Icon Images"; sourceTree = "<group>"; };
-		3428B33E0815E1FB00C0D3DC /* emoticon32.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = emoticon32.tiff; path = Resources/emoticon32.tiff; sourceTree = "<group>"; };
 		342910CA07AE228600C815F6 /* AIEmoticonPackPreviewTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIEmoticonPackPreviewTableView.h; path = Plugins/Emoticons/AIEmoticonPackPreviewTableView.h; sourceTree = "<group>"; };
 		342910CB07AE228600C815F6 /* AIEmoticonPackPreviewTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIEmoticonPackPreviewTableView.m; path = Plugins/Emoticons/AIEmoticonPackPreviewTableView.m; sourceTree = "<group>"; };
 		342928080628BB4200BB9217 /* ESPurpleYahooAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESPurpleYahooAccountViewController.h; path = "Plugins/Purple Service/ESPurpleYahooAccountViewController.h"; sourceTree = "<group>"; };
@@ -2323,7 +2339,7 @@
 		342F9E550B552628000D5FC2 /* fi */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fi; path = Resources/fi.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
 		342F9E560B552628000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fi; path = "Resources/fi.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		342F9E580B552628000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fi; path = Resources/fi.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
-		342F9E590B552628000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fi; path = Resources/fi.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		342F9E590B552628000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fi; path = Resources/fi.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		342F9E5A0B552629000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fi; path = Resources/fi.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
 		342F9E5E0B55262A000D5FC2 /* fi */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fi; path = Resources/fi.lproj/Localizable.strings; sourceTree = "<group>"; };
 		342F9E600B55262B000D5FC2 /* fi */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fi; path = "Plugins/Purple Service/Resources/fi.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -2509,7 +2525,7 @@
 		345076AF0E106F5E00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = "Plugins/Purple Service/Resources/en_GB.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		345076B00E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = Resources/en_GB.lproj/Localizable.strings; sourceTree = "<group>"; };
 		345076B30E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_GB; path = Resources/en_GB.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
-		345076B40E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_GB; path = Resources/en_GB.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		345076B40E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en_GB; path = Resources/en_GB.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		345076B50E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_GB; path = Resources/en_GB.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
 		345076B60E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = folder; name = en_GB; path = "Resources/en_GB.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		345076B70E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = Resources/en_GB.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -2541,7 +2557,7 @@
 		345076ED0E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_PT; path = "Plugins/Purple Service/Resources/pt_PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		345076EE0E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_PT; path = Resources/pt_PT.lproj/Localizable.strings; sourceTree = "<group>"; };
 		345076F10E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pt_PT; path = Resources/pt_PT.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
-		345076F20E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pt_PT; path = Resources/pt_PT.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		345076F20E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_PT; path = Resources/pt_PT.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		345076F30E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pt_PT; path = Resources/pt_PT.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
 		345076F40E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = folder; name = pt_PT; path = "Resources/pt_PT.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		345076F50E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_PT; path = Resources/pt_PT.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -2662,7 +2678,7 @@
 		345EE2DC0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContactInfoImageViewWithImagePicker.h; path = Source/AIContactInfoImageViewWithImagePicker.h; sourceTree = "<group>"; };
 		345EE2DD0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIContactInfoImageViewWithImagePicker.m; path = Source/AIContactInfoImageViewWithImagePicker.m; sourceTree = "<group>"; };
 		345F566A08178356001F733C /* AdiumServiceIcons.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = AdiumServiceIcons.icns; path = Resources/AdiumServiceIcons.icns; sourceTree = "<group>"; };
-		345F573F0817FF80001F733C /* pref-contactList.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-contactList.tiff"; path = "Resources/pref-contactList.tiff"; sourceTree = "<group>"; };
+		345F573F0817FF80001F733C /* pref-contact-list.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-contact-list.tiff"; path = "Resources/pref-contact-list.tiff"; sourceTree = "<group>"; };
 		345F583D08197E74001F733C /* AdiumStatusIcons.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = AdiumStatusIcons.icns; path = Resources/AdiumStatusIcons.icns; sourceTree = "<group>"; };
 		345F586308198E7F001F733C /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = nl; path = Resources/nl.lproj/AccountProxy.xib; sourceTree = "<group>"; };
 		345F586408198E87001F733C /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = de; path = Resources/de.lproj/AccountProxy.xib; sourceTree = "<group>"; };
@@ -2670,7 +2686,6 @@
 		345F589A08198F15001F733C /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = de; path = Resources/de.lproj/ListThemeSheet.xib; sourceTree = "<group>"; };
 		345F589C08198F15001F733C /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = de; path = Resources/de.lproj/StatusSortConfiguration.xib; sourceTree = "<group>"; };
 		345F58C6081990FF001F733C /* msg-log-viewer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-log-viewer.tiff"; path = "Resources/msg-log-viewer.tiff"; sourceTree = "<group>"; };
-		345F590608199746001F733C /* emoticon32_transparent.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = emoticon32_transparent.tiff; path = Resources/emoticon32_transparent.tiff; sourceTree = "<group>"; };
 		345F5B97081AC4F1001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_TW; path = Resources/zh_TW.lproj/AccountProxy.xib; sourceTree = "<group>"; };
 		345F5B99081AC4F1001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_TW; path = "Plugins/Purple Service/Resources/zh_TW.lproj/DCPurpleJabberJoinChatView.xib"; sourceTree = "<group>"; };
 		345F5B9A081AC4F1001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_TW; path = "Plugins/Purple Service/Resources/zh_TW.lproj/DCPurpleMeanwhileJoinChatView.xib"; sourceTree = "<group>"; };
@@ -2706,7 +2721,7 @@
 		3461621206FB482C009181D8 /* ESChatUserListController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESChatUserListController.m; path = "Plugins/Dual Window Interface/ESChatUserListController.m"; sourceTree = "<group>"; };
 		3461621306FB482D009181D8 /* UserList Layout.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = "UserList Layout.plist"; path = "Plugins/Dual Window Interface/UserList Layout.plist"; sourceTree = "<group>"; };
 		346196F10D31607500763051 /* SRSnapback.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SRSnapback.png; path = Resources/SRSnapback.png; sourceTree = "<group>"; };
-		34636E4C0BC9A90600AD57AD /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pt; path = Resources/pt.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		34636E4C0BC9A90600AD57AD /* pt */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt; path = Resources/pt.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		346371050BCA0A5400AD57AD /* AIMessageTabSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageTabSplitView.h; path = Source/AIMessageTabSplitView.h; sourceTree = "<group>"; };
 		346371060BCA0A5400AD57AD /* AIMessageTabSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageTabSplitView.m; path = Source/AIMessageTabSplitView.m; sourceTree = "<group>"; };
 		3465228E08371921009565FE /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_CN; path = "Plugins/Purple Service/Resources/zh_CN.lproj/ESPurpleAIMAccountView.xib"; sourceTree = "<group>"; };
@@ -2796,9 +2811,9 @@
 		346545CA0C8F73000046ED68 /* AMPurpleJabberAdHocPing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AMPurpleJabberAdHocPing.m; path = "Plugins/Purple Service/AMPurpleJabberAdHocPing.m"; sourceTree = "<group>"; };
 		346935D30BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFileTransferProgressOutlineView.h; path = Source/AIFileTransferProgressOutlineView.h; sourceTree = "<group>"; };
 		346935D40BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIFileTransferProgressOutlineView.m; path = Source/AIFileTransferProgressOutlineView.m; sourceTree = "<group>"; };
-		34695FA20A89BA2B00E3B0D0 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_TW; path = Resources/zh_TW.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34695FA30A89BA3600E3B0D0 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_CN; path = Resources/zh_CN.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34695FA40A89BA5800E3B0D0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = tr; path = Resources/tr.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		34695FA20A89BA2B00E3B0D0 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_TW; path = Resources/zh_TW.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34695FA30A89BA3600E3B0D0 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = Resources/zh_CN.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34695FA40A89BA5800E3B0D0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = tr; path = Resources/tr.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		346BA33C0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESGlobalEventsPreferencesPlugin.h; path = Source/ESGlobalEventsPreferencesPlugin.h; sourceTree = "<group>"; };
 		346BA33D0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESGlobalEventsPreferencesPlugin.m; path = Source/ESGlobalEventsPreferencesPlugin.m; sourceTree = "<group>"; };
 		346BA3420774C2D200628F06 /* ESGlobalEventsPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESGlobalEventsPreferences.h; path = Source/ESGlobalEventsPreferences.h; sourceTree = "<group>"; };
@@ -2834,7 +2849,7 @@
 		346C9C130E70E1F7002314EE /* hu */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = hu; path = Resources/hu.lproj/Localizable.strings; sourceTree = "<group>"; };
 		346C9C150E70E1F7002314EE /* hu */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = hu; path = "Plugins/Purple Service/Resources/hu.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		346C9C180E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = hu; path = Resources/hu.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
-		346C9C190E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = hu; path = Resources/hu.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		346C9C190E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hu; path = Resources/hu.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		346C9C1A0E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = hu; path = Resources/hu.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
 		346C9C1B0E70E1F8002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = folder; name = hu; path = "Resources/hu.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		346C9C1C0E70E1F8002314EE /* hu */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = hu; path = Resources/hu.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -2877,7 +2892,6 @@
 		347E77F207CA94FE00350507 /* ESAccountEvents.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESAccountEvents.m; path = Source/ESAccountEvents.m; sourceTree = "<group>"; };
 		347E781107CA961300350507 /* ESUserIconHandlingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESUserIconHandlingPlugin.h; path = Source/ESUserIconHandlingPlugin.h; sourceTree = "<group>"; };
 		347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESUserIconHandlingPlugin.m; path = Source/ESUserIconHandlingPlugin.m; sourceTree = "<group>"; };
-		347E781907CA962100350507 /* events-contact.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "events-contact.png"; path = "Resources/events-contact.png"; sourceTree = "<group>"; };
 		347E782407CA964600350507 /* ESContactSortConfigurationWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESContactSortConfigurationWindowController.h; path = Source/ESContactSortConfigurationWindowController.h; sourceTree = "<group>"; };
 		347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIContactSortSelectionPlugin.m; path = Source/AIContactSortSelectionPlugin.m; sourceTree = "<group>"; };
 		347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESContactSortConfigurationWindowController.m; path = Source/ESContactSortConfigurationWindowController.m; sourceTree = "<group>"; };
@@ -2892,7 +2906,6 @@
 		347E786907CA972100350507 /* AddContact.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AddContact.xib; path = Resources/AddContact.xib; sourceTree = "<group>"; };
 		347E786A07CA972100350507 /* AddGroup.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AddGroup.xib; path = Resources/AddGroup.xib; sourceTree = "<group>"; };
 		347E787207CA975900350507 /* msg-add-contact.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-add-contact.tiff"; path = "Resources/msg-add-contact.tiff"; sourceTree = "<group>"; };
-		347E787507CA975900350507 /* remove.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = remove.tiff; path = Resources/remove.tiff; sourceTree = "<group>"; };
 		347E788707CA978D00350507 /* CBActionSupportPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CBActionSupportPlugin.m; path = Source/CBActionSupportPlugin.m; sourceTree = "<group>"; };
 		347E788807CA978D00350507 /* CBActionSupportPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CBActionSupportPlugin.h; path = Source/CBActionSupportPlugin.h; sourceTree = "<group>"; };
 		347E790D07CAA51400350507 /* AIManualSort.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIManualSort.m; path = Source/AIManualSort.m; sourceTree = "<group>"; };
@@ -3199,7 +3212,7 @@
 		34B1FCDE0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = el_GR; path = "Plugins/Purple Service/Resources/el_GR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34B1FCDF0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = el_GR; path = Resources/el_GR.lproj/Localizable.strings; sourceTree = "<group>"; };
 		34B1FCE20F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = el_GR; path = Resources/el_GR.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
-		34B1FCE30F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = el_GR; path = Resources/el_GR.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		34B1FCE30F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = el_GR; path = Resources/el_GR.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		34B1FCE40F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = el_GR; path = Resources/el_GR.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
 		34B1FCE50F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = folder; name = el_GR; path = "Resources/el_GR.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		34B1FCE60F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = el_GR; path = Resources/el_GR.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -3354,19 +3367,19 @@
 		34C91BBA0CA8909700740974 /* AIContentNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIContentNotification.m; path = "Frameworks/Adium Framework/Source/AIContentNotification.m"; sourceTree = "<group>"; };
 		34C9EC40099FA2A8007ECAB3 /* DefaultBlockedStatusIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DefaultBlockedStatusIcon.png; path = "Frameworks/Adium Framework/DefaultBlockedStatusIcon.png"; sourceTree = "<group>"; };
 		34CA15520CAFDFB2009AA5E3 /* sidebarActionWidget.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = sidebarActionWidget.png; path = Resources/sidebarActionWidget.png; sourceTree = "<group>"; };
-		34CA23990A671E0E00B11032 /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ca; path = Resources/ca.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA239A0A671E1500B11032 /* cs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = cs; path = Resources/cs.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA239B0A671E2100B11032 /* da */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = da; path = Resources/da.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA239C0A671E2F00B11032 /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = nl; path = Resources/nl.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA239D0A671E3C00B11032 /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fr; path = Resources/fr.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA239E0A671E4500B11032 /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = de; path = Resources/de.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA239F0A671E5000B11032 /* is */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = is; path = Resources/is.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA23A00A671E6400B11032 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = it; path = Resources/it.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA23A10A671E7200B11032 /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ja; path = Resources/ja.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA23A20A671E8500B11032 /* nb */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = nb; path = Resources/nb.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA23A30A671E9000B11032 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ru; path = Resources/ru.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA23A40A671E9B00B11032 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sv; path = Resources/sv.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34CA23A50A6723A200B11032 /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pl; path = Resources/pl.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		34CA23990A671E0E00B11032 /* ca */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ca; path = Resources/ca.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA239A0A671E1500B11032 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = Resources/cs.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA239B0A671E2100B11032 /* da */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = da; path = Resources/da.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA239C0A671E2F00B11032 /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = Resources/nl.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA239D0A671E3C00B11032 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = Resources/fr.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA239E0A671E4500B11032 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = Resources/de.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA239F0A671E5000B11032 /* is */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = is; path = Resources/is.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA23A00A671E6400B11032 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = Resources/it.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA23A10A671E7200B11032 /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = Resources/ja.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA23A20A671E8500B11032 /* nb */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nb; path = Resources/nb.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA23A30A671E9000B11032 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = Resources/ru.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA23A40A671E9B00B11032 /* sv */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sv; path = Resources/sv.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34CA23A50A6723A200B11032 /* pl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pl; path = Resources/pl.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		34CAA4B00BD3A75B00AE92DC /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fr; path = "Plugins/Purple Service/Resources/fr.lproj/ESPurpleSimpleAccountView.xib"; sourceTree = "<group>"; };
 		34CAA4B40BD3A76C00AE92DC /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ca; path = "Plugins/Purple Service/Resources/ca.lproj/ESPurpleSimpleAccountView.xib"; sourceTree = "<group>"; };
 		34CAA4B50BD3A76E00AE92DC /* cs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = cs; path = "Plugins/Purple Service/Resources/cs.lproj/ESPurpleSimpleAccountView.xib"; sourceTree = "<group>"; };
@@ -3389,12 +3402,12 @@
 		34CF9DF3085B8B7900D87E37 /* ESiTunesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESiTunesPlugin.m; path = Source/ESiTunesPlugin.m; sourceTree = "<group>"; };
 		34D0F9C80954E70100DCB678 /* AIContactListImagePicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIContactListImagePicker.h; path = Source/AIContactListImagePicker.h; sourceTree = "<group>"; };
 		34D0F9C90954E70100DCB678 /* AIContactListImagePicker.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIContactListImagePicker.m; path = Source/AIContactListImagePicker.m; sourceTree = "<group>"; };
-		34D0FDCF0956186200DCB678 /* ESPersonalPreferencesPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPersonalPreferencesPlugin.h; path = Source/ESPersonalPreferencesPlugin.h; sourceTree = "<group>"; };
-		34D0FDD00956186200DCB678 /* ESPersonalPreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESPersonalPreferencesPlugin.m; path = Source/ESPersonalPreferencesPlugin.m; sourceTree = "<group>"; };
-		34D0FDD50956187700DCB678 /* ESPersonalPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPersonalPreferences.h; path = Source/ESPersonalPreferences.h; sourceTree = "<group>"; };
-		34D0FDD60956187700DCB678 /* ESPersonalPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESPersonalPreferences.m; path = Source/ESPersonalPreferences.m; sourceTree = "<group>"; };
-		34D0FE3C09561E3800DCB678 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = Resources/en.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
-		34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PersonalPreferencesDefaults.plist; path = Resources/PersonalPreferencesDefaults.plist; sourceTree = "<group>"; };
+		34D0FDCF0956186200DCB678 /* ESProfilePreferencesPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESProfilePreferencesPlugin.h; path = Source/ESProfilePreferencesPlugin.h; sourceTree = "<group>"; };
+		34D0FDD00956186200DCB678 /* ESProfilePreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESProfilePreferencesPlugin.m; path = Source/ESProfilePreferencesPlugin.m; sourceTree = "<group>"; };
+		34D0FDD50956187700DCB678 /* ESProfilePreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESProfilePreferences.h; path = Source/ESProfilePreferences.h; sourceTree = "<group>"; };
+		34D0FDD60956187700DCB678 /* ESProfilePreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESProfilePreferences.m; path = Source/ESProfilePreferences.m; sourceTree = "<group>"; };
+		34D0FE3C09561E3800DCB678 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = Resources/en.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+		34D0FF8409569FE500DCB678 /* ProfilePreferencesDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = ProfilePreferencesDefaults.plist; path = Resources/ProfilePreferencesDefaults.plist; sourceTree = "<group>"; };
 		34D188DB0760F0F50075A380 /* AILocalizationControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AILocalizationControl.m; path = "Frameworks/Adium Framework/Source/AILocalizationControl.m"; sourceTree = "<group>"; };
 		34D1897D076114C00075A380 /* AILocalizationButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AILocalizationButton.h; path = "Frameworks/Adium Framework/Source/AILocalizationButton.h"; sourceTree = "<group>"; };
 		34D1897E076114C00075A380 /* AILocalizationButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AILocalizationButton.m; path = "Frameworks/Adium Framework/Source/AILocalizationButton.m"; sourceTree = "<group>"; };
@@ -3447,7 +3460,6 @@
 		34D8333907CBD758006466F2 /* ESPanelApplescriptDetailPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESPanelApplescriptDetailPane.h; path = Source/ESPanelApplescriptDetailPane.h; sourceTree = "<group>"; };
 		34D8333A07CBD758006466F2 /* ESApplescriptContactAlertPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESApplescriptContactAlertPlugin.h; path = Source/ESApplescriptContactAlertPlugin.h; sourceTree = "<group>"; };
 		34D8336707CBD807006466F2 /* pref-messages.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-messages.tiff"; path = "Resources/pref-messages.tiff"; sourceTree = "<group>"; };
-		34D8336807CBD807006466F2 /* pref-general.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-general.tif"; path = "Resources/pref-general.tif"; sourceTree = "<group>"; };
 		34D8336B07CBD807006466F2 /* pref-file-transfer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-file-transfer.tiff"; path = "Resources/pref-file-transfer.tiff"; sourceTree = "<group>"; };
 		34D8336C07CBD807006466F2 /* pref-events.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-events.tiff"; path = "Resources/pref-events.tiff"; sourceTree = "<group>"; };
 		34D8336E07CBD807006466F2 /* pref-advanced.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-advanced.tiff"; path = "Resources/pref-advanced.tiff"; sourceTree = "<group>"; };
@@ -3466,7 +3478,7 @@
 		34E0103307B956F6000DF265 /* ESPurpleNotifyEmailController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESPurpleNotifyEmailController.h; path = "Plugins/Purple Service/ESPurpleNotifyEmailController.h"; sourceTree = "<group>"; };
 		34E0EA0707CC53EC00A82198 /* NewMessagePrompt.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = NewMessagePrompt.xib; path = Resources/NewMessagePrompt.xib; sourceTree = "<group>"; };
 		34E0EA0B07CC53FE00A82198 /* AINewMessagePanelPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AINewMessagePanelPlugin.m; path = Source/AINewMessagePanelPlugin.m; sourceTree = "<group>"; };
-		34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AINewMessagePromptController.m; path = Source/AINewMessagePromptController.m; sourceTree = "<group>"; };
+		34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessagePromptController.m; path = Source/AINewMessagePromptController.m; sourceTree = "<group>"; };
 		34E0EA0D07CC53FE00A82198 /* AINewMessagePanelPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AINewMessagePanelPlugin.h; path = Source/AINewMessagePanelPlugin.h; sourceTree = "<group>"; };
 		34E0EA0E07CC53FE00A82198 /* AINewMessagePromptController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AINewMessagePromptController.h; path = Source/AINewMessagePromptController.h; sourceTree = "<group>"; };
 		34E0EB8D07CD349200A82198 /* ESPurpleAIMAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPurpleAIMAccount.h; path = "Plugins/Purple Service/ESPurpleAIMAccount.h"; sourceTree = "<group>"; };
@@ -3685,8 +3697,8 @@
 		4B191D890611C10800E8A4E7 /* ReadMe.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = ReadMe.rtf; sourceTree = "<group>"; };
 		4B22E15C085CAE2E001864DE /* AIAbstractListObjectMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIAbstractListObjectMenu.h; path = "Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.h"; sourceTree = "<group>"; };
 		4B22E15D085CAE2F001864DE /* AIAbstractListObjectMenu.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIAbstractListObjectMenu.m; path = "Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m"; sourceTree = "<group>"; };
-		4B25494603F6A32700A8010A /* AIAccountSelectionView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIAccountSelectionView.h; path = "Plugins/Dual Window Interface/AIAccountSelectionView.h"; sourceTree = "<group>"; };
-		4B25494703F6A32700A8010A /* AIAccountSelectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAccountSelectionView.m; path = "Plugins/Dual Window Interface/AIAccountSelectionView.m"; sourceTree = "<group>"; };
+		4B25494603F6A32700A8010A /* AITopBarGradientView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AITopBarGradientView.h; path = "Plugins/Dual Window Interface/AITopBarGradientView.h"; sourceTree = "<group>"; };
+		4B25494703F6A32700A8010A /* AITopBarGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITopBarGradientView.m; path = "Plugins/Dual Window Interface/AITopBarGradientView.m"; sourceTree = "<group>"; };
 		4B28DDAB0599FED200343093 /* AIAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIAccountViewController.h; path = "Frameworks/Adium Framework/Source/AIAccountViewController.h"; sourceTree = "<group>"; };
 		4B28DDAC0599FED200343093 /* AIAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIAccountViewController.m; path = "Frameworks/Adium Framework/Source/AIAccountViewController.m"; sourceTree = "<group>"; };
 		4B292D3007A9C8E100C5F882 /* AIStatusController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIStatusController.h; path = Source/AIStatusController.h; sourceTree = "<group>"; };
@@ -3799,8 +3811,6 @@
 		4BAFD5E806E00D1700FF7FBC /* Service Icons */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Service Icons"; path = "Resources/Service Icons"; sourceTree = "<group>"; };
 		4BB19298079EE90900DAA523 /* PurpleDefaultsJabber.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = PurpleDefaultsJabber.plist; path = "Plugins/Purple Service/PurpleDefaultsJabber.plist"; sourceTree = "<group>"; };
 		4BB1E47D067F2E9F00D1DB86 /* Scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Scripts; path = Resources/Scripts; sourceTree = "<group>"; };
-		4BB2EB200D88D76100CA7A7D /* timestamp32.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = timestamp32.tiff; path = Resources/timestamp32.tiff; sourceTree = "<group>"; };
-		4BB2EB210D88D76100CA7A7D /* timestamp32_transparent.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = timestamp32_transparent.tiff; path = Resources/timestamp32_transparent.tiff; sourceTree = "<group>"; };
 		4BB5B78107D2DC4900CFE06F /* pref-status.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-status.tiff"; path = "Resources/pref-status.tiff"; sourceTree = "<group>"; };
 		4BB99726083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SMContactListShowBehaviorPlugin.h; path = Source/SMContactListShowBehaviorPlugin.h; sourceTree = SOURCE_ROOT; };
 		4BB99727083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SMContactListShowBehaviorPlugin.m; path = Source/SMContactListShowBehaviorPlugin.m; sourceTree = SOURCE_ROOT; };
@@ -3820,7 +3830,6 @@
 		4BC5A5DA0764F75B0080ECF7 /* LocalVideoWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = LocalVideoWindow.xib; path = "Plugins/Video Chat Interface/LocalVideoWindow.xib"; sourceTree = "<group>"; };
 		4BCAB5EF07B59967006641B9 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = Resources/en.lproj/AccountProxy.xib; sourceTree = "<group>"; };
 		4BCAB5F007B59967006641B9 /* EditAccountSheet.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = EditAccountSheet.xib; path = Resources/EditAccountSheet.xib; sourceTree = "<group>"; };
-		4BCAC4D807B59B2E006641B9 /* AddressBook.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AddressBook.tiff; path = Resources/AddressBook.tiff; sourceTree = "<group>"; };
 		4BCAC4E207B59B65006641B9 /* AB Display Format Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = "AB Display Format Defaults.plist"; path = "Frameworks/Adium Framework/Resources/AB Display Format Defaults.plist"; sourceTree = "<group>"; };
 		4BCAC4E307B59B65006641B9 /* Alias Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = "Alias Defaults.plist"; path = "Resources/Alias Defaults.plist"; sourceTree = "<group>"; };
 		4BCAC4E407B59B65006641B9 /* Display Format Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = "Display Format Defaults.plist"; path = "Resources/Display Format Defaults.plist"; sourceTree = "<group>"; };
@@ -3851,7 +3860,7 @@
 		4BE9FFE7055981AB00359B15 /* Adium.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Adium.pch; sourceTree = SOURCE_ROOT; };
 		4BF2E194067CAE9200743318 /* Emoticons */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Emoticons; path = Resources/Emoticons; sourceTree = "<group>"; };
 		4BF2E6B3067CB70E00743318 /* Message Styles */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Message Styles"; path = "Resources/Message Styles"; sourceTree = "<group>"; };
-		4BF3CB4107D1771E00A8112A /* pref-appearance.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-appearance.tiff"; path = "Resources/pref-appearance.tiff"; sourceTree = "<group>"; };
+		4BF3CB4107D1771E00A8112A /* pref-icons.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-icons.tiff"; path = "Resources/pref-icons.tiff"; sourceTree = "<group>"; };
 		4BF3CBEC07D192F500A8112A /* pref-accounts.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-accounts.tiff"; path = "Resources/pref-accounts.tiff"; sourceTree = "<group>"; };
 		4BF5BA10042F3CB200A8010A /* AIListContact.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIListContact.h; path = "Frameworks/Adium Framework/Source/AIListContact.h"; sourceTree = "<group>"; };
 		4BF5BA11042F3CB200A8010A /* AIListContact.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIListContact.m; path = "Frameworks/Adium Framework/Source/AIListContact.m"; sourceTree = "<group>"; };
@@ -3877,7 +3886,6 @@
 		4F1CB6310D640D7F0073A1E6 /* AIEventsInspectorPane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIEventsInspectorPane.m; path = Source/AIEventsInspectorPane.m; sourceTree = "<group>"; };
 		4F1CB6350D640D8F0073A1E6 /* AIEventsInspectorPane.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AIEventsInspectorPane.xib; path = Resources/AIEventsInspectorPane.xib; sourceTree = "<group>"; };
 		4F1CB6360D640D900073A1E6 /* AIInfoInspectorPane.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AIInfoInspectorPane.xib; path = Resources/AIInfoInspectorPane.xib; sourceTree = "<group>"; };
-		4F1CB63B0D640DA40073A1E6 /* get-info-address-book.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-address-book.tiff"; path = "Resources/get-info-address-book.tiff"; sourceTree = "<group>"; };
 		4F1CB63C0D640DA40073A1E6 /* get-info-advanced.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-advanced.tiff"; path = "Resources/get-info-advanced.tiff"; sourceTree = "<group>"; };
 		4F1CB63D0D640DA40073A1E6 /* get-info-events.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-events.tiff"; path = "Resources/get-info-events.tiff"; sourceTree = "<group>"; };
 		4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ContactInfoInspector.xib; path = Resources/ContactInfoInspector.xib; sourceTree = "<group>"; };
@@ -3890,9 +3898,9 @@
 		5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-Xtras.xib"; path = "Resources/Preferences-Xtras.xib"; sourceTree = "<group>"; };
 		5A1FEA601334549300C14951 /* MessageView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MessageView.xib; path = "Plugins/Dual Window Interface/MessageView.xib"; sourceTree = "<group>"; };
 		5A22D6E114834F44004E15F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/AIFacebookXMPPAccountView.xib"; sourceTree = "<group>"; };
-		5A27FA7914A272330063489D /* pref-messagehistory.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-messagehistory.png"; path = "Resources/pref-messagehistory.png"; sourceTree = "<group>"; };
 		5A27FA7A14A272330063489D /* pref-messagestyle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-messagestyle.png"; path = "Resources/pref-messagestyle.png"; sourceTree = "<group>"; };
-		5A27FA7C14A272330063489D /* pref-windowhandling.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-windowhandling.png"; path = "Resources/pref-windowhandling.png"; sourceTree = "<group>"; };
+		5A445956169118C60078AB0A /* AIPreferenceCVPrototypeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPreferenceCVPrototypeView.h; path = Source/AIPreferenceCVPrototypeView.h; sourceTree = "<group>"; };
+		5A445957169118C60078AB0A /* AIPreferenceCVPrototypeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIPreferenceCVPrototypeView.m; path = Source/AIPreferenceCVPrototypeView.m; sourceTree = "<group>"; };
 		5A4BD41C13F855B000A4D3F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = en; path = Resources/en.lproj/SearchTerms.plist; sourceTree = "<group>"; };
 		5A4BD47213F858EE00A4D3F7 /* Preferences-ContactList.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-ContactList.xib"; path = "Resources/Preferences-ContactList.xib"; sourceTree = "<group>"; };
 		5A4BD48813F859EF00A4D3F7 /* Preferences-WindowHandling.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-WindowHandling.xib"; path = "Resources/Preferences-WindowHandling.xib"; sourceTree = "<group>"; };
@@ -3940,7 +3948,7 @@
 		5A7642C411E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = "Frameworks/Adium Framework/Resources/sk_SK.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		5A7642C511E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = "Plugins/Purple Service/Resources/sk_SK.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		5A7642C811E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sk_SK; path = Resources/sk_SK.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
-		5A7642C911E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sk_SK; path = Resources/sk_SK.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		5A7642C911E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sk_SK; path = Resources/sk_SK.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		5A7642CA11E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sk_SK; path = Resources/sk_SK.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
 		5A7642CB11E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = folder; name = sk_SK; path = "Resources/sk_SK.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		5A7642CC11E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = Resources/sk_SK.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -3981,7 +3989,7 @@
 		5A80CCA2121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = "Plugins/Purple Service/Resources/uk.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		5A80CCA3121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5A80CCA6121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = uk; path = Resources/uk.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
-		5A80CCA7121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = uk; path = Resources/uk.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		5A80CCA7121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = Resources/uk.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		5A80CCA8121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = uk; path = Resources/uk.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
 		5A80CCA9121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = folder; name = uk; path = "Resources/uk.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		5A80CCAA121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = Resources/uk.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -4337,7 +4345,7 @@
 		63EA6407094BB9A9009C8453 /* AIStatusIconPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIStatusIconPreviewController.m; path = Source/AIStatusIconPreviewController.m; sourceTree = "<group>"; };
 		661561630D84AEEC004B7946 /* AIContactHidingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContactHidingController.h; path = "Frameworks/Adium Framework/Source/AIContactHidingController.h"; sourceTree = "<group>"; };
 		661561640D84AEEC004B7946 /* AIContactHidingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIContactHidingController.m; path = "Frameworks/Adium Framework/Source/AIContactHidingController.m"; sourceTree = "<group>"; };
-		6CE795BD0A6F9CEE00FF3217 /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = es; path = Resources/es.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		6CE795BD0A6F9CEE00FF3217 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = Resources/es.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		6CF42677057763E100F27FAA /* ESContactAlertsController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESContactAlertsController.h; path = Source/ESContactAlertsController.h; sourceTree = "<group>"; };
 		6CF42678057763E200F27FAA /* ESContactAlertsController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESContactAlertsController.m; path = Source/ESContactAlertsController.m; sourceTree = "<group>"; };
 		6E4D960606B73979005235E9 /* DCJoinChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DCJoinChatViewController.h; path = "Frameworks/Adium Framework/Source/DCJoinChatViewController.h"; sourceTree = "<group>"; };
@@ -4388,18 +4396,34 @@
 		6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvIncomingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m; sourceTree = SOURCE_ROOT; };
 		6FB330A30C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EKEzvOutgoingFileTransfer.h; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.h; sourceTree = SOURCE_ROOT; };
 		6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
+		761D587E1636C60100210B12 /* AINewMessageTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageTableView.h; path = Source/AINewMessageTableView.h; sourceTree = "<group>"; };
+		761D587F1636C60100210B12 /* AINewMessageTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessageTableView.m; path = Source/AINewMessageTableView.m; sourceTree = "<group>"; };
+		761D58811636EDE100210B12 /* AINewMessageTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageTextFieldCell.h; path = Source/AINewMessageTextFieldCell.h; sourceTree = "<group>"; };
+		761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessageTextFieldCell.m; path = Source/AINewMessageTextFieldCell.m; sourceTree = "<group>"; };
+		761D58841636F94200210B12 /* AINewMessageSearchField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageSearchField.h; path = Source/AINewMessageSearchField.h; sourceTree = "<group>"; };
+		761D58851636F94200210B12 /* AINewMessageSearchField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessageSearchField.m; path = Source/AINewMessageSearchField.m; sourceTree = "<group>"; };
 		765F5D64162F30E800C57904 /* AIOTRSMPSecretAnswerWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIOTRSMPSecretAnswerWindowController.h; path = Source/AIOTRSMPSecretAnswerWindowController.h; sourceTree = "<group>"; };
 		765F5D65162F30E800C57904 /* AIOTRSMPSecretAnswerWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIOTRSMPSecretAnswerWindowController.m; path = Source/AIOTRSMPSecretAnswerWindowController.m; sourceTree = "<group>"; };
 		765F5D6E162F357E00C57904 /* AIOTRSMPSecretAnswerWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AIOTRSMPSecretAnswerWindowController.xib; path = Resources/AIOTRSMPSecretAnswerWindowController.xib; sourceTree = "<group>"; };
 		765F5D70162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AIOTRSMPSharedSecretWindowController.xib; path = Resources/AIOTRSMPSharedSecretWindowController.xib; sourceTree = "<group>"; };
 		765F5D72162F48FA00C57904 /* AIOTRSMPSharedSecretWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIOTRSMPSharedSecretWindowController.h; path = Source/AIOTRSMPSharedSecretWindowController.h; sourceTree = "<group>"; };
 		765F5D73162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIOTRSMPSharedSecretWindowController.m; path = Source/AIOTRSMPSharedSecretWindowController.m; sourceTree = "<group>"; };
+		765F5DC61635934400C57904 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/AIRejoinGroupChatTopBar.xib; sourceTree = "<group>"; };
+		7664EAA4162E086A008CF995 /* libffi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libffi.framework; path = Frameworks/libffi.framework; sourceTree = "<group>"; };
 		766ABAB41306D1020049FFB7 /* AIUnreadMessagesTooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnreadMessagesTooltip.h; path = Source/AIUnreadMessagesTooltip.h; sourceTree = "<group>"; };
 		766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIUnreadMessagesTooltip.m; path = Source/AIUnreadMessagesTooltip.m; sourceTree = "<group>"; };
 		76731DE015F90538007728C3 /* libgcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgcrypt.framework; path = Frameworks/libgcrypt.framework; sourceTree = "<group>"; };
 		76731DE115F90538007728C3 /* libgpgerror.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgpgerror.framework; path = Frameworks/libgpgerror.framework; sourceTree = "<group>"; };
+		767870E21634045C00BD0E4D /* AIMessageViewTopBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageViewTopBarController.h; path = Source/AIMessageViewTopBarController.h; sourceTree = "<group>"; };
+		767870E31634045C00BD0E4D /* AIMessageViewTopBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageViewTopBarController.m; path = Source/AIMessageViewTopBarController.m; sourceTree = "<group>"; };
 		76889DEA12D3CA17007AEF00 /* get-info.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info.tiff"; path = "Resources/get-info.tiff"; sourceTree = "<group>"; };
-		76889DEE12D3CA40007AEF00 /* Personal.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Personal.tiff; path = Resources/Personal.tiff; sourceTree = "<group>"; };
+		76A79E0916349477007A0497 /* AIGroupChat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGroupChat.h; path = "Frameworks/Adium Framework/Source/AIGroupChat.h"; sourceTree = "<group>"; };
+		76A79E0A16349477007A0497 /* AIGroupChat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGroupChat.m; path = "Frameworks/Adium Framework/Source/AIGroupChat.m"; sourceTree = "<group>"; };
+		76AA11091635585E00A6EC4B /* AIAccountSelectionTopBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AIAccountSelectionTopBar.xib; path = "Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib"; sourceTree = "<group>"; };
+		76AA110A1635585E00A6EC4B /* AIAccountSelectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAccountSelectionViewController.h; path = "Plugins/Dual Window Interface/AIAccountSelectionViewController.h"; sourceTree = "<group>"; };
+		76AA110B1635585E00A6EC4B /* AIAccountSelectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAccountSelectionViewController.m; path = "Plugins/Dual Window Interface/AIAccountSelectionViewController.m"; sourceTree = "<group>"; };
+		76AA110E163558B200A6EC4B /* AIRejoinGroupChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIRejoinGroupChatViewController.h; path = "Plugins/Dual Window Interface/AIRejoinGroupChatViewController.h"; sourceTree = "<group>"; };
+		76AA110F163558B200A6EC4B /* AIRejoinGroupChatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRejoinGroupChatViewController.m; path = "Plugins/Dual Window Interface/AIRejoinGroupChatViewController.m"; sourceTree = "<group>"; };
 		76C1AF9A125A906A00D269A9 /* AIAdiumURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdiumURLProtocol.h; path = "Plugins/WebKit Message View/AIAdiumURLProtocol.h"; sourceTree = "<group>"; };
 		76C1AF9B125A906A00D269A9 /* AIAdiumURLProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAdiumURLProtocol.m; path = "Plugins/WebKit Message View/AIAdiumURLProtocol.m"; sourceTree = "<group>"; };
 		76FF925814B524B40043E23B /* AIIRCConsoleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIIRCConsoleController.h; path = "Plugins/Purple Service/AIIRCConsoleController.h"; sourceTree = "<group>"; };
@@ -4513,7 +4537,22 @@
 		C4D29CC10C3C2E3C001545A2 /* BGICLogImportController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BGICLogImportController.h; path = Source/BGICLogImportController.h; sourceTree = SOURCE_ROOT; };
 		C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = BGICLogImportController.m; path = Source/BGICLogImportController.m; sourceTree = SOURCE_ROOT; };
 		C4D29CC70C3C2E49001545A2 /* ICImport.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ICImport.xib; path = Resources/ICImport.xib; sourceTree = SOURCE_ROOT; };
+		C613B0791640AABB006683FF /* get-info-profile.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-profile.tiff"; path = "Resources/get-info-profile.tiff"; sourceTree = "<group>"; };
+		C613B0BC1640B226006683FF /* get-info-address-book.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-address-book.tiff"; path = "Resources/get-info-address-book.tiff"; sourceTree = "<group>"; };
+		C613B0EE1640B6DD006683FF /* emoticon-sleep.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "emoticon-sleep.tiff"; path = "Resources/emoticon-sleep.tiff"; sourceTree = "<group>"; };
+		C613B0EF1640B6DD006683FF /* emoticon.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = emoticon.tiff; path = Resources/emoticon.tiff; sourceTree = "<group>"; };
+		C613B0F21640B6F5006683FF /* transcripts-timestamp-in.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "transcripts-timestamp-in.tiff"; path = "Resources/transcripts-timestamp-in.tiff"; sourceTree = "<group>"; };
+		C613B0F31640B6F5006683FF /* transcripts-timestamp-out.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "transcripts-timestamp-out.tiff"; path = "Resources/transcripts-timestamp-out.tiff"; sourceTree = "<group>"; };
+		C613B0F61640B70B006683FF /* transcripts-remove.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "transcripts-remove.tiff"; path = "Resources/transcripts-remove.tiff"; sourceTree = "<group>"; };
+		C613B1081640BF91006683FF /* pref-window-handling.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-window-handling.tiff"; path = "Resources/pref-window-handling.tiff"; sourceTree = "<group>"; };
+		C613B10A1640BFE7006683FF /* pref-address-book.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-address-book.tiff"; path = "Resources/pref-address-book.tiff"; sourceTree = "<group>"; };
+		C613B10C1640C09A006683FF /* pref-message-alerts.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-message-alerts.tiff"; path = "Resources/pref-message-alerts.tiff"; sourceTree = "<group>"; };
+		C613B10E1640C0DE006683FF /* pref-general.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-general.tiff"; path = "Resources/pref-general.tiff"; sourceTree = "<group>"; };
+		C613B1101640C370006683FF /* pref-profile.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-profile.tiff"; path = "Resources/pref-profile.tiff"; sourceTree = "<group>"; };
+		C613B142164112B3006683FF /* events-dock-name.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-dock-name.tiff"; path = "Resources/events-dock-name.tiff"; sourceTree = "<group>"; };
+		C613B1441641210B006683FF /* events-contact.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-contact.tiff"; path = "Resources/events-contact.tiff"; sourceTree = "<group>"; };
 		C61AFA9915DD43C80001EDEF /* AboutDialog_bg at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "AboutDialog_bg at 2x.png"; path = "Resources/AboutDialog_bg at 2x.png"; sourceTree = "<group>"; };
+		C63BF3BD1637605400FF162B /* SRSnapback at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "SRSnapback at 2x.png"; path = "Resources/SRSnapback at 2x.png"; sourceTree = "<group>"; };
 		C647215515F75E3700206892 /* stackImage at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "stackImage at 2x.png"; path = "Frameworks/Adium Framework/stackImage at 2x.png"; sourceTree = "<group>"; };
 		C6A42A7415C5B7290032FAB3 /* FTProgressReveal_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressReveal_Selected.png; path = Resources/FTProgressReveal_Selected.png; sourceTree = "<group>"; };
 		C6A42A7515C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressReveal_Selected at 2x.png"; path = "Resources/FTProgressReveal_Selected at 2x.png"; sourceTree = "<group>"; };
@@ -4598,7 +4637,7 @@
 		D1C1FA4414995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_AU; path = Resources/en_AU.lproj/Localizable.strings; sourceTree = "<group>"; };
 		D1C1FA4514995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_AU; path = "Frameworks/Adium Framework/Resources/en_AU.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		D1C1FA4714995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_AU; path = Resources/en_AU.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
-		D1C1FA4814995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_AU; path = Resources/en_AU.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+		D1C1FA4814995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en_AU; path = Resources/en_AU.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
 		D1C1FA4914995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_AU; path = Resources/en_AU.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
 		D1C1FA4A14995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = folder; name = en_AU; path = "Resources/en_AU.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
 		D1C1FA4B14995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_AU; path = Resources/en_AU.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -4792,6 +4831,7 @@
 				9719C92E1530EE0C00217FBE /* ShortcutRecorder.framework in Frameworks */,
 				76731DE215F90538007728C3 /* libgcrypt.framework in Frameworks */,
 				76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */,
+				7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5135,9 +5175,9 @@
 		34086A1005E5E17B00ABB759 /* User Icon Handling */ = {
 			isa = PBXGroup;
 			children = (
+				C613B1441641210B006683FF /* events-contact.tiff */,
 				347E781107CA961300350507 /* ESUserIconHandlingPlugin.h */,
 				347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */,
-				347E781907CA962100350507 /* events-contact.png */,
 			);
 			name = "User Icon Handling";
 			sourceTree = "<group>";
@@ -5285,7 +5325,6 @@
 				5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */,
 				34E2A2EC07B018B1006735BC /* ESAddressBookIntegrationAdvancedPreferences.h */,
 				34E2A2EF07B018B2006735BC /* ESAddressBookIntegrationAdvancedPreferences.m */,
-				4BCAC4D807B59B2E006641B9 /* AddressBook.tiff */,
 			);
 			name = "Address Book Integration";
 			sourceTree = "<group>";
@@ -6203,17 +6242,17 @@
 			name = "iTunes Now Playing";
 			sourceTree = "<group>";
 		};
-		34D0FDCB095612F800DCB678 /* Personal Preferences */ = {
-			isa = PBXGroup;
-			children = (
-				34D0FDCF0956186200DCB678 /* ESPersonalPreferencesPlugin.h */,
-				34D0FDD00956186200DCB678 /* ESPersonalPreferencesPlugin.m */,
-				34D0FDD50956187700DCB678 /* ESPersonalPreferences.h */,
-				34D0FDD60956187700DCB678 /* ESPersonalPreferences.m */,
-				34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */,
-				34CA222F0A671BEF00B11032 /* PersonalPreferences.xib */,
-			);
-			name = "Personal Preferences";
+		34D0FDCB095612F800DCB678 /* Profile Preferences */ = {
+			isa = PBXGroup;
+			children = (
+				34D0FDCF0956186200DCB678 /* ESProfilePreferencesPlugin.h */,
+				34D0FDD00956186200DCB678 /* ESProfilePreferencesPlugin.m */,
+				34D0FDD50956187700DCB678 /* ESProfilePreferences.h */,
+				34D0FDD60956187700DCB678 /* ESProfilePreferences.m */,
+				34D0FF8409569FE500DCB678 /* ProfilePreferencesDefaults.plist */,
+				34CA222F0A671BEF00B11032 /* ProfilePreferences.xib */,
+			);
+			name = "Profile Preferences";
 			sourceTree = "<group>";
 		};
 		34D18983076114D20075A380 /* Localization Assistance */ = {
@@ -6375,7 +6414,7 @@
 				F510B76D03339ED501A8010A /* Account Menu */,
 				34C188A006CAB36400FF5FF9 /* Account Network Connectivity */,
 				4B1332140459B9A000A8010A /* Dock Account Status */,
-				34D0FDCB095612F800DCB678 /* Personal Preferences */,
+				34D0FDCB095612F800DCB678 /* Profile Preferences */,
 			);
 			name = Accounts;
 			sourceTree = "<group>";
@@ -6407,6 +6446,10 @@
 		34E6BBE50A78083A0076D7F0 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				C613B0F21640B6F5006683FF /* transcripts-timestamp-in.tiff */,
+				C613B0F31640B6F5006683FF /* transcripts-timestamp-out.tiff */,
+				C613B0EE1640B6DD006683FF /* emoticon-sleep.tiff */,
+				C613B0EF1640B6DD006683FF /* emoticon.tiff */,
 				34D8326107CBD598006466F2 /* AccountPrefs.plist */,
 				317D83670E89F40500298BDB /* msg-bookmark-chat.tiff */,
 				34D8327507CBD5B3006466F2 /* BuiltInStatusStates.plist */,
@@ -6414,15 +6457,11 @@
 				34D8326707CBD598006466F2 /* default-icon.png */,
 				C6EE433D15C0A9BC00A4B96C /* default-icon at 2x.png */,
 				34D8326207CBD598006466F2 /* DockPrefs.plist */,
-				3428B33E0815E1FB00C0D3DC /* emoticon32.tiff */,
-				345F590608199746001F733C /* emoticon32_transparent.tiff */,
 				34B995D9092A832700E31E91 /* FontPanelAccessoryView.xib */,
 				34DFF53007A62EB100B92233 /* lock-locked.tiff */,
 				34DFF52607A62EB000B92233 /* lock-unlocked.tiff */,
-				347E787507CA975900350507 /* remove.tiff */,
+				C613B0F61640B70B006683FF /* transcripts-remove.tiff */,
 				34D8326307CBD598006466F2 /* msg-send-file.tiff */,
-				4BB2EB200D88D76100CA7A7D /* timestamp32.tiff */,
-				4BB2EB210D88D76100CA7A7D /* timestamp32_transparent.tiff */,
 				34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */,
 			);
 			name = Resources;
@@ -6446,6 +6485,8 @@
 				F57938BB033E739101A8010A /* AIPreferenceWindowController.m */,
 				344839970BC8644C0083723B /* AIAdvancedPreferencesPlugin.h */,
 				344839980BC8644C0083723B /* AIAdvancedPreferencesPlugin.m */,
+				5A445956169118C60078AB0A /* AIPreferenceCVPrototypeView.h */,
+				5A445957169118C60078AB0A /* AIPreferenceCVPrototypeView.m */,
 			);
 			name = Preferences;
 			sourceTree = "<group>";
@@ -6681,6 +6722,7 @@
 		4B18A51F0459F89300A8010A /* Contact and Chat Dock Overlays */ = {
 			isa = PBXGroup;
 			children = (
+				C613B142164112B3006683FF /* events-dock-name.tiff */,
 				5A5F8BBB12D560E400019727 /* AIDockNameOverlay.h */,
 				5A5F8BBC12D560E400019727 /* AIDockNameOverlay.m */,
 			);
@@ -6814,10 +6856,16 @@
 			isa = PBXGroup;
 			children = (
 				34E0EA0B07CC53FE00A82198 /* AINewMessagePanelPlugin.m */,
-				34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */,
 				34E0EA0D07CC53FE00A82198 /* AINewMessagePanelPlugin.h */,
 				34E0EA0E07CC53FE00A82198 /* AINewMessagePromptController.h */,
+				34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */,
 				34E0EA0707CC53EC00A82198 /* NewMessagePrompt.xib */,
+				761D587E1636C60100210B12 /* AINewMessageTableView.h */,
+				761D587F1636C60100210B12 /* AINewMessageTableView.m */,
+				761D58811636EDE100210B12 /* AINewMessageTextFieldCell.h */,
+				761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */,
+				761D58841636F94200210B12 /* AINewMessageSearchField.h */,
+				761D58851636F94200210B12 /* AINewMessageSearchField.m */,
 			);
 			name = "New Message Panel";
 			sourceTree = "<group>";
@@ -7074,8 +7122,14 @@
 		4BCFEC5803F5718700A8010A /* Other */ = {
 			isa = PBXGroup;
 			children = (
-				4B25494603F6A32700A8010A /* AIAccountSelectionView.h */,
-				4B25494703F6A32700A8010A /* AIAccountSelectionView.m */,
+				4B25494603F6A32700A8010A /* AITopBarGradientView.h */,
+				4B25494703F6A32700A8010A /* AITopBarGradientView.m */,
+				76AA11091635585E00A6EC4B /* AIAccountSelectionTopBar.xib */,
+				76AA110A1635585E00A6EC4B /* AIAccountSelectionViewController.h */,
+				76AA110B1635585E00A6EC4B /* AIAccountSelectionViewController.m */,
+				76AA110E163558B200A6EC4B /* AIRejoinGroupChatViewController.h */,
+				76AA110F163558B200A6EC4B /* AIRejoinGroupChatViewController.m */,
+				765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */,
 			);
 			name = Other;
 			sourceTree = "<group>";
@@ -8174,6 +8228,7 @@
 		979AA6A914D59EF3008730DF /* Others */ = {
 			isa = PBXGroup;
 			children = (
+				7664EAA4162E086A008CF995 /* libffi.framework */,
 				76731DE015F90538007728C3 /* libgcrypt.framework */,
 				76731DE115F90538007728C3 /* libgpgerror.framework */,
 				3496A8E707CE6CA30055BBAB /* AutoHyperlinks.framework.xcodeproj */,
@@ -8222,25 +8277,25 @@
 		9C82689903D9B23F00F1D4AF /* Icons */ = {
 			isa = PBXGroup;
 			children = (
-				5A27FA7914A272330063489D /* pref-messagehistory.png */,
+				C613B10E1640C0DE006683FF /* pref-general.tiff */,
+				C613B1101640C370006683FF /* pref-profile.tiff */,
+				C613B10C1640C09A006683FF /* pref-message-alerts.tiff */,
+				C613B10A1640BFE7006683FF /* pref-address-book.tiff */,
 				5A27FA7A14A272330063489D /* pref-messagestyle.png */,
-				5A27FA7C14A272330063489D /* pref-windowhandling.png */,
+				C613B1081640BF91006683FF /* pref-window-handling.tiff */,
 				D10A3A2A122C61EF003B5A7E /* msg-source-destination.tiff */,
 				4BF3CBEC07D192F500A8112A /* pref-accounts.tiff */,
 				34D8336E07CBD807006466F2 /* pref-advanced.tiff */,
-				4BF3CB4107D1771E00A8112A /* pref-appearance.tiff */,
+				4BF3CB4107D1771E00A8112A /* pref-icons.tiff */,
 				11AE5554109CC88C0074BDC2 /* pref-confirmations.tiff */,
-				345F573F0817FF80001F733C /* pref-contactList.tiff */,
+				345F573F0817FF80001F733C /* pref-contact-list.tiff */,
 				1130EA98109B445500FB3454 /* pref-defaultclient.tiff */,
 				34D8336C07CBD807006466F2 /* pref-events.tiff */,
 				34D8336B07CBD807006466F2 /* pref-file-transfer.tiff */,
-				34D8336807CBD807006466F2 /* pref-general.tif */,
 				1130EA9B109B445D00FB3454 /* pref-mention.tiff */,
-				1130EA9C109B445D00FB3454 /* pref-messagealerts.tiff */,
 				34D8336707CBD807006466F2 /* pref-messages.tiff */,
 				4BB5B78107D2DC4900CFE06F /* pref-status.tiff */,
 				4BAE6C9407CF94C4007E2820 /* events-message.tiff */,
-				76889DEE12D3CA40007AEF00 /* Personal.tiff */,
 				34D832A507CBD62B006466F2 /* AdiumEmoticonset.icns */,
 				073475F00C4C9632009ACC43 /* AdiumMenuBarIcons.icns */,
 				34D832A607CBD62B006466F2 /* AdiumScripts.icns */,
@@ -8568,6 +8623,8 @@
 				63B0EC9A0F8FBB660062476B /* AIProxyListObject.m */,
 				34111A5D06BE1B370005AF5C /* ESObjectWithProperties.h */,
 				34111A5E06BE1B370005AF5C /* ESObjectWithProperties.m */,
+				76A79E0916349477007A0497 /* AIGroupChat.h */,
+				76A79E0A16349477007A0497 /* AIGroupChat.m */,
 			);
 			name = "Contacts & Chats";
 			sourceTree = "<group>";
@@ -8674,6 +8731,8 @@
 				348C47150D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.h */,
 				348C47160D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m */,
 				5A1FEA601334549300C14951 /* MessageView.xib */,
+				767870E21634045C00BD0E4D /* AIMessageViewTopBarController.h */,
+				767870E31634045C00BD0E4D /* AIMessageViewTopBarController.m */,
 			);
 			name = Messages;
 			sourceTree = "<group>";
@@ -8768,6 +8827,8 @@
 		F5CDCE460350758501A8010A /* Contact Info Window */ = {
 			isa = PBXGroup;
 			children = (
+				C613B0BC1640B226006683FF /* get-info-address-book.tiff */,
+				C613B0791640AABB006683FF /* get-info-profile.tiff */,
 				34E6C5640A791BAF0076D7F0 /* AIContactInfoWindowPlugin.h */,
 				34E6C5650A791BAF0076D7F0 /* AIContactInfoWindowPlugin.m */,
 				F570A59803704B6101A8010A /* AIContactInfoWindowController.h */,
@@ -8792,10 +8853,10 @@
 				343ECBED0971B18E00349098 /* ShowContactInfoPrompt.xib */,
 				345EE2DC0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.h */,
 				345EE2DD0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m */,
-				4F1CB63B0D640DA40073A1E6 /* get-info-address-book.tiff */,
 				4F1CB63C0D640DA40073A1E6 /* get-info-advanced.tiff */,
 				4F1CB63D0D640DA40073A1E6 /* get-info-events.tiff */,
 				346196F10D31607500763051 /* SRSnapback.png */,
+				C63BF3BD1637605400FF162B /* SRSnapback at 2x.png */,
 				76889DEA12D3CA17007AEF00 /* get-info.tiff */,
 			);
 			name = "Contact Info Window";
@@ -9061,6 +9122,8 @@
 				112B47670F82E0FC00690E84 /* AIXtraInfo.h in Headers */,
 				34F17FCE0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h in Headers */,
 				63B0EC9D0F8FBB660062476B /* AIProxyListObject.h in Headers */,
+				76A79E0B16349477007A0497 /* AIGroupChat.h in Headers */,
+				5A6298E31682BD9D00F51DED /* AIAdvancedPreferencePane.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9320,7 +9383,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = AI;
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0450;
 				ORGANIZATIONNAME = "The Adium Team";
 			};
 			buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
@@ -9515,7 +9578,6 @@
 				346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */,
 				349C30790867ADA3000BF883 /* AdiumApplescriptRunner in Resources */,
 				34E0EA0807CC53ED00A82198 /* NewMessagePrompt.xib in Resources */,
-				347E781A07CA962100350507 /* events-contact.png in Resources */,
 				347E783407CA967100350507 /* SortingDefaults.plist in Resources */,
 				347E786C07CA972100350507 /* AddGroup.xib in Resources */,
 				347E787807CA975900350507 /* msg-add-contact.tiff in Resources */,
@@ -9545,7 +9607,6 @@
 				34D8332B07CBD72A006466F2 /* ContactCountingDisplayDefaults.plist in Resources */,
 				34D8333207CBD741006466F2 /* ApplescriptContactAlert.xib in Resources */,
 				34D8333307CBD741006466F2 /* events-applescript-alert.tiff in Resources */,
-				34D8337107CBD808006466F2 /* pref-general.tif in Resources */,
 				34D8337407CBD808006466F2 /* pref-file-transfer.tiff in Resources */,
 				34D8337507CBD808006466F2 /* pref-events.tiff in Resources */,
 				34D8337707CBD808006466F2 /* pref-advanced.tiff in Resources */,
@@ -9574,7 +9635,6 @@
 				34C14D5107A8BA00003CC138 /* EmoticonPackPreview.xib in Resources */,
 				343EB3FE08086D2F00E27095 /* AccountProxy.xib in Resources */,
 				4BCAB5F307B59967006641B9 /* EditAccountSheet.xib in Resources */,
-				4BCAC4D907B59B2E006641B9 /* AddressBook.tiff in Resources */,
 				4BCAC4E607B59B65006641B9 /* Alias Defaults.plist in Resources */,
 				4BCAC4E707B59B65006641B9 /* Display Format Defaults.plist in Resources */,
 				4BCAC56D07B5A31A006641B9 /* Sounds in Resources */,
@@ -9586,7 +9646,7 @@
 				4BAE6C4C07CF941C007E2820 /* events-dock-alert.tiff in Resources */,
 				4BAE6C4D07CF941C007E2820 /* DockBehaviorContactAlert.xib in Resources */,
 				4BAE6C9507CF94C4007E2820 /* events-message.tiff in Resources */,
-				4BF3CB4207D1771E00A8112A /* pref-appearance.tiff in Resources */,
+				4BF3CB4207D1771E00A8112A /* pref-icons.tiff in Resources */,
 				4BF3CBED07D192F500A8112A /* pref-accounts.tiff in Resources */,
 				4B08399C07D235190034A001 /* DockIconSelectionSheet.xib in Resources */,
 				342838EE07D2D004004F01C9 /* Shared Dock Icon Images in Resources */,
@@ -9609,7 +9669,7 @@
 				34F4677B080F49C5007800AB /* Safari.png in Resources */,
 				345ACC970811C20F008E4D22 /* AwayStatusWindow.xib in Resources */,
 				345F566B08178356001F733C /* AdiumServiceIcons.icns in Resources */,
-				345F57400817FF80001F733C /* pref-contactList.tiff in Resources */,
+				345F57400817FF80001F733C /* pref-contact-list.tiff in Resources */,
 				345F583E08197E74001F733C /* AdiumStatusIcons.icns in Resources */,
 				345F58C7081990FF001F733C /* msg-log-viewer.tiff in Resources */,
 				0779934F08221D9700F698DC /* Service Icons in Resources */,
@@ -9626,8 +9686,8 @@
 				07632BF30949E10B00FFABD8 /* ListThemeSheet.xib in Resources */,
 				63336E15094AB81300970871 /* XtraInfoView.xib in Resources */,
 				63EA63DD094BB79A009C8453 /* StatusIconPreviewView.xib in Resources */,
-				34CA22300A671BEF00B11032 /* PersonalPreferences.xib in Resources */,
-				34D0FF8509569FE500DCB678 /* PersonalPreferencesDefaults.plist in Resources */,
+				34CA22300A671BEF00B11032 /* ProfilePreferences.xib in Resources */,
+				34D0FF8509569FE500DCB678 /* ProfilePreferencesDefaults.plist in Resources */,
 				341BD5700965EC3500CF83F5 /* OTRFingerprintDetailsWindow.xib in Resources */,
 				341BD5710965EC3500CF83F5 /* OTRPrivateKeyGenerationWindow.xib in Resources */,
 				349710DD096C4C7700699948 /* Buttons.strings in Resources */,
@@ -9653,12 +9713,9 @@
 				3419DE750A81042F00C3FC68 /* ContactPrefs.plist in Resources */,
 				3419DE760A81042F00C3FC68 /* default-icon.png in Resources */,
 				3419DE770A81042F00C3FC68 /* DockPrefs.plist in Resources */,
-				3419DE780A81042F00C3FC68 /* emoticon32.tiff in Resources */,
-				3419DE790A81042F00C3FC68 /* emoticon32_transparent.tiff in Resources */,
 				3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.xib in Resources */,
 				3419DE7C0A81042F00C3FC68 /* lock-locked.tiff in Resources */,
 				3419DE7D0A81042F00C3FC68 /* lock-unlocked.tiff in Resources */,
-				3419DE7E0A81042F00C3FC68 /* remove.tiff in Resources */,
 				3419DE7F0A81042F00C3FC68 /* msg-send-file.tiff in Resources */,
 				3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */,
 				34DC13050A81417700D710F3 /* LoginSelect.xib in Resources */,
@@ -9678,12 +9735,9 @@
 				346196F20D31607500763051 /* SRSnapback.png in Resources */,
 				4F1CB6390D640D900073A1E6 /* AIEventsInspectorPane.xib in Resources */,
 				4F1CB63A0D640D900073A1E6 /* AIInfoInspectorPane.xib in Resources */,
-				4F1CB63F0D640DA40073A1E6 /* get-info-address-book.tiff in Resources */,
 				4F1CB6400D640DA40073A1E6 /* get-info-advanced.tiff in Resources */,
 				4F1CB6410D640DA40073A1E6 /* get-info-events.tiff in Resources */,
 				4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.xib in Resources */,
-				4BB2EB220D88D76100CA7A7D /* timestamp32.tiff in Resources */,
-				4BB2EB230D88D76100CA7A7D /* timestamp32_transparent.tiff in Resources */,
 				34A1AEE90DFD4BFE00AC78CF /* AIAddressBookInspectorPane.xib in Resources */,
 				34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.xib in Resources */,
 				317D83680E89F40500298BDB /* msg-bookmark-chat.tiff in Resources */,
@@ -9702,13 +9756,11 @@
 				11BE29640FCCA8DA000E6A10 /* ImageUploaderProgress.xib in Resources */,
 				1130EA99109B445500FB3454 /* pref-defaultclient.tiff in Resources */,
 				1130EA9D109B445D00FB3454 /* pref-mention.tiff in Resources */,
-				1130EA9E109B445D00FB3454 /* pref-messagealerts.tiff in Resources */,
 				11AE5555109CC88C0074BDC2 /* pref-confirmations.tiff in Resources */,
 				5A9A9F8B11F295EB00328DF9 /* events-do-nothing.tiff in Resources */,
 				D10A3A2B122C61EF003B5A7E /* msg-source-destination.tiff in Resources */,
 				34333FF3127F6E77007050E8 /* TemporaryIRCAccountWindow.xib in Resources */,
 				76889DEB12D3CA17007AEF00 /* get-info.tiff in Resources */,
-				76889DEF12D3CA40007AEF00 /* Personal.tiff in Resources */,
 				1154F50A12E1476900B8CA27 /* AILogByAccountWindow.xib in Resources */,
 				97AF5CF413191E9A00550C41 /* ContactListChangeUserPictureMenu.xib in Resources */,
 				9722ABC813257D7F00CAB486 /* ContactListWindow.xib in Resources */,
@@ -9731,9 +9783,7 @@
 				5A4BD56A13F86B7E00A4D3F7 /* Preferences-Icons.xib in Resources */,
 				5A4BD57F13F86BC500A4D3F7 /* Preferences-General.xib in Resources */,
 				7EC033B214590E0700CF24FB /* MessageWindow.xib in Resources */,
-				5A27FA7D14A272330063489D /* pref-messagehistory.png in Resources */,
 				5A27FA7E14A272330063489D /* pref-messagestyle.png in Resources */,
-				5A27FA8014A272330063489D /* pref-windowhandling.png in Resources */,
 				5A1E3A1214DCE60400724574 /* Preferences-Xtras.xib in Resources */,
 				5A8F637614DD1B21008412C8 /* Preferences-Privacy.xib in Resources */,
 				97F7B38014E29BC500A0F6F8 /* facebook-small.png in Resources */,
@@ -9787,6 +9837,23 @@
 				C6BC7F9B15DD666600C5FF52 /* events-notification.tiff in Resources */,
 				765F5D6F162F357E00C57904 /* AIOTRSMPSecretAnswerWindowController.xib in Resources */,
 				765F5D71162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib in Resources */,
+				76AA110C1635585E00A6EC4B /* AIAccountSelectionTopBar.xib in Resources */,
+				765F5DC51635934400C57904 /* AIRejoinGroupChatTopBar.xib in Resources */,
+				C63BF3BE1637605400FF162B /* SRSnapback at 2x.png in Resources */,
+				C613B07B1640AABB006683FF /* get-info-profile.tiff in Resources */,
+				C613B0BD1640B226006683FF /* get-info-address-book.tiff in Resources */,
+				C613B0F01640B6DD006683FF /* emoticon-sleep.tiff in Resources */,
+				C613B0F11640B6DD006683FF /* emoticon.tiff in Resources */,
+				C613B0F41640B6F5006683FF /* transcripts-timestamp-in.tiff in Resources */,
+				C613B0F51640B6F5006683FF /* transcripts-timestamp-out.tiff in Resources */,
+				C613B0F71640B70B006683FF /* transcripts-remove.tiff in Resources */,
+				C613B1091640BF91006683FF /* pref-window-handling.tiff in Resources */,
+				C613B10B1640BFE7006683FF /* pref-address-book.tiff in Resources */,
+				C613B10D1640C09A006683FF /* pref-message-alerts.tiff in Resources */,
+				C613B10F1640C0DE006683FF /* pref-general.tiff in Resources */,
+				C613B1111640C370006683FF /* pref-profile.tiff in Resources */,
+				C613B143164112B3006683FF /* events-dock-name.tiff in Resources */,
+				C613B1451641210B006683FF /* events-contact.tiff in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -10150,7 +10217,7 @@
 				4BD6753606001E0F0049CAF7 /* AIMessageTabViewItem.m in Sources */,
 				4BD6753806001E100049CAF7 /* AIMessageViewController.m in Sources */,
 				4BD6753A06001E110049CAF7 /* AIMessageWindowController.m in Sources */,
-				4BD6753E06001E140049CAF7 /* AIAccountSelectionView.m in Sources */,
+				4BD6753E06001E140049CAF7 /* AITopBarGradientView.m in Sources */,
 				4BD6758206001E430049CAF7 /* ErrorMessageHandlerPlugin.m in Sources */,
 				4BD6758406001E440049CAF7 /* ErrorMessageWindowController.m in Sources */,
 				4BAA1B550632EF0000D8B92C /* ESPanelAlertDetailPane.m in Sources */,
@@ -10260,8 +10327,8 @@
 				63EA62F0094B8705009C8453 /* AIXtraInfoController.m in Sources */,
 				63EA6409094BB9A9009C8453 /* AIStatusIconPreviewController.m in Sources */,
 				34D0F9CB0954E70100DCB678 /* AIContactListImagePicker.m in Sources */,
-				34D0FDD20956186200DCB678 /* ESPersonalPreferencesPlugin.m in Sources */,
-				34D0FDD80956187700DCB678 /* ESPersonalPreferences.m in Sources */,
+				34D0FDD20956186200DCB678 /* ESProfilePreferencesPlugin.m in Sources */,
+				34D0FDD80956187700DCB678 /* ESProfilePreferences.m in Sources */,
 				341BCF850961354D00CF83F5 /* AIMessageWindow.m in Sources */,
 				341BCF870961354D00CF83F5 /* AIClickThroughThemeDocumentButton.m in Sources */,
 				341BD55D0965E97F00CF83F5 /* ESOTRPreferences.m in Sources */,
@@ -10438,6 +10505,13 @@
 				5A5EC831154649140043FFAA /* AIPreferenceCollectionItem.m in Sources */,
 				765F5D67162F30E800C57904 /* AIOTRSMPSecretAnswerWindowController.m in Sources */,
 				765F5D74162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m in Sources */,
+				767870E41634045D00BD0E4D /* AIMessageViewTopBarController.m in Sources */,
+				76AA110D1635585E00A6EC4B /* AIAccountSelectionViewController.m in Sources */,
+				76AA1110163558B200A6EC4B /* AIRejoinGroupChatViewController.m in Sources */,
+				761D58801636C60100210B12 /* AINewMessageTableView.m in Sources */,
+				761D58831636EDE100210B12 /* AINewMessageTextFieldCell.m in Sources */,
+				761D58861636F94300210B12 /* AINewMessageSearchField.m in Sources */,
+				5A44595E169143130078AB0A /* AIPreferenceCVPrototypeView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -10546,6 +10620,8 @@
 				63B0EC9C0F8FBB660062476B /* AIProxyListObject.m in Sources */,
 				76FF926814B62AB80043E23B /* AIConsoleController.m in Sources */,
 				5AEE60011602BAE200304672 /* AIBoolToControlTextColorTransformer.m in Sources */,
+				76A79E0C16349477007A0497 /* AIGroupChat.m in Sources */,
+				5A6298DF1682BD9100F51DED /* AIAdvancedPreferencePane.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -11980,7 +12056,7 @@
 			name = AIAdvancedInspectorPane.xib;
 			sourceTree = "<group>";
 		};
-		34CA222F0A671BEF00B11032 /* PersonalPreferences.xib */ = {
+		34CA222F0A671BEF00B11032 /* ProfilePreferences.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
 				34D0FE3C09561E3800DCB678 /* en */,
@@ -12013,7 +12089,7 @@
 				5A80CCA7121F5A7B00D0670A /* uk */,
 				D1C1FA4814995D98008C94EB /* en_AU */,
 			);
-			name = PersonalPreferences.xib;
+			name = ProfilePreferences.xib;
 			sourceTree = "<group>";
 		};
 		34F144420BA8FF3B000473DE /* EmoticonNames.strings */ = {
@@ -12189,6 +12265,15 @@
 			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
+		765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				765F5DC61635934400C57904 /* en */,
+			);
+			name = AIRejoinGroupChatTopBar.xib;
+			path = "Plugins/Dual Window Interface";
+			sourceTree = "<group>";
+		};




More information about the commits mailing list