adium-1.4 2738:b820c57cac38: Backed out changeset 791780625051

commits at adium.im commits at adium.im
Fri Nov 6 17:37:26 UTC 2009


details:	http://hg.adium.im/adium-1.4/rev/b820c57cac38
revision:	2738:b820c57cac38
author:		Zachary West <zacw at adium.im>
date:		Fri Nov 06 12:37:12 2009 -0500

Backed out changeset 791780625051

This is causing regressions in a few other locations. Backing out for the next beta to investigate after. Refs #13221.
Subject: adium-1.4 2739:b3aa403eb202: Merge.

details:	http://hg.adium.im/adium-1.4/rev/b3aa403eb202
revision:	2739:b3aa403eb202
author:		Zachary West <zacw at adium.im>
date:		Fri Nov 06 12:37:21 2009 -0500

Merge.

diffs (truncated from 71409 to 1000 lines):

diff -r 791780625051 -r b3aa403eb202 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Wed Oct 28 21:04:52 2009 -0400
+++ b/Adium.xcodeproj/project.pbxproj	Fri Nov 06 12:37:21 2009 -0500
@@ -108,6 +108,9 @@
 		112B4A250F83194700690E84 /* AIMentionAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 112B4A240F83194700690E84 /* AIMentionAdvancedPreferences.m */; };
 		112B4A3E0F831A4400690E84 /* AIMentionAdvancedPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 112B4A3D0F831A4400690E84 /* AIMentionAdvancedPreferences.nib */; };
 		112E7FA60FC86BB400657119 /* AITwitterActionsHTMLFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 112E7FA50FC86BB400657119 /* AITwitterActionsHTMLFilter.m */; };
+		1130EA99109B445500FB3454 /* pref-defaultclient.png in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA98109B445500FB3454 /* pref-defaultclient.png */; };
+		1130EA9D109B445D00FB3454 /* pref-mention.png in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9B109B445D00FB3454 /* pref-mention.png */; };
+		1130EA9E109B445D00FB3454 /* pref-messagealerts.png in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9C109B445D00FB3454 /* pref-messagealerts.png */; };
 		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 */; };
@@ -160,6 +163,8 @@
 		11AA1EFA0BCAE9C3003DDA66 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11AA1EF90BCAE9C3003DDA66 /* Quartz.framework */; };
 		11AE53610F68CE3300BE8077 /* AIPurpleOscarAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 11AE52000F68CA5000BE8077 /* AIPurpleOscarAccountViewController.h */; };
 		11AE53620F68CE3300BE8077 /* AIPurpleOscarAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11AE52010F68CA5000BE8077 /* AIPurpleOscarAccountViewController.m */; };
+		11AE5555109CC88C0074BDC2 /* pref-confirmations.png in Resources */ = {isa = PBXBuildFile; fileRef = 11AE5554109CC88C0074BDC2 /* pref-confirmations.png */; };
+		11AE5587109CCCC30074BDC2 /* irc-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 11AE5575109CCC950074BDC2 /* irc-small.png */; };
 		11BD73AE0F5A53EA007D438A /* facebook.png in Resources */ = {isa = PBXBuildFile; fileRef = 345D68950F1FD563002F2D01 /* facebook.png */; };
 		11BD73D30F5A54BB007D438A /* twitter-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D10F5A54BB007D438A /* twitter-small.png */; };
 		11BD73D40F5A54BB007D438A /* twitter.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D20F5A54BB007D438A /* twitter.png */; };
@@ -1139,7 +1144,6 @@
 		6318DBA40F8D93F200C5E584 /* SoulEdge.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C2DF00063498ED0018E5D2 /* SoulEdge.png */; };
 		6318DBA50F8D93F200C5E584 /* terminator.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C2DF01063498ED0018E5D2 /* terminator.png */; };
 		6318DBA60F8D93F200C5E584 /* Template.html in Resources */ = {isa = PBXBuildFile; fileRef = 4B03711506595A70008F5981 /* Template.html */; };
-		6318DBA70F8D93F200C5E584 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3402E07507CB0FAA0044F818 /* Localizable.strings */; };
 		6318DBB40F8D940A00C5E584 /* AIWebKitMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B539C5205EFD6FB00E5921A /* AIWebKitMessageViewController.m */; };
 		6318DBB50F8D940A00C5E584 /* AIWebKitMessageViewPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B539C4C05EFD6CD00E5921A /* AIWebKitMessageViewPlugin.m */; };
 		6318DBB60F8D940A00C5E584 /* ESWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 346C9A2405FFE3DF000F5A8A /* ESWebView.m */; };
@@ -1511,6 +1515,13 @@
 /* End PBXBuildRule section */
 
 /* Begin PBXContainerItemProxy section */
+		11F6CB2D109BC6AC0070022D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 34BD9DAF05314751000AB133;
+			remoteInfo = Adium.Framework;
+		};
 		31A763FA0DA570E9000AC729 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 3496A8E707CE6CA30055BBAB /* AutoHyperlinks.framework.xcodeproj */;
@@ -1854,6 +1865,9 @@
 		112B4A3D0F831A4400690E84 /* AIMentionAdvancedPreferences.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = AIMentionAdvancedPreferences.nib; path = Resources/AIMentionAdvancedPreferences.nib; sourceTree = "<group>"; };
 		112E7FA40FC86BB400657119 /* AITwitterActionsHTMLFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AITwitterActionsHTMLFilter.h; path = "Plugins/Twitter Plugin/AITwitterActionsHTMLFilter.h"; sourceTree = "<group>"; };
 		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.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-defaultclient.png"; path = "Resources/pref-defaultclient.png"; sourceTree = "<group>"; };
+		1130EA9B109B445D00FB3454 /* pref-mention.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-mention.png"; path = "Resources/pref-mention.png"; sourceTree = "<group>"; };
+		1130EA9C109B445D00FB3454 /* pref-messagealerts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-messagealerts.png"; path = "Resources/pref-messagealerts.png"; 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>"; };
@@ -1943,6 +1957,8 @@
 		11AA1EF90BCAE9C3003DDA66 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; };
 		11AE52000F68CA5000BE8077 /* AIPurpleOscarAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPurpleOscarAccountViewController.h; path = "Plugins/Purple Service/AIPurpleOscarAccountViewController.h"; sourceTree = "<group>"; };
 		11AE52010F68CA5000BE8077 /* AIPurpleOscarAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIPurpleOscarAccountViewController.m; path = "Plugins/Purple Service/AIPurpleOscarAccountViewController.m"; sourceTree = "<group>"; };
+		11AE5554109CC88C0074BDC2 /* pref-confirmations.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-confirmations.png"; path = "Resources/pref-confirmations.png"; sourceTree = "<group>"; };
+		11AE5575109CCC950074BDC2 /* irc-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "irc-small.png"; path = "Plugins/Purple Service/irc-small.png"; sourceTree = "<group>"; };
 		11BD73D10F5A54BB007D438A /* twitter-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "twitter-small.png"; path = "Plugins/Twitter Plugin/twitter-small.png"; sourceTree = "<group>"; };
 		11BD73D20F5A54BB007D438A /* twitter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = twitter.png; path = "Plugins/Twitter Plugin/twitter.png"; sourceTree = "<group>"; };
 		11BE28980FCC7C13000E6A10 /* AIPicImImageUploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPicImImageUploader.h; path = "Plugins/Image Uploading Plugin/AIPicImImageUploader.h"; sourceTree = "<group>"; };
@@ -2061,7 +2077,6 @@
 		3402E02D07CB0DBB0044F818 /* AboutBox.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = AboutBox.nib; path = Resources/AboutBox.nib; sourceTree = "<group>"; };
 		3402E03F07CB0E400044F818 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3402E04B07CB0EA70044F818 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = "Plugins/Purple Service/en.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		3402E06C07CB0F9D0044F818 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = "Plugins/WebKit Message View/en.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3403F4300D2EF01D006B08FB /* AIAddressBookUserIconSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAddressBookUserIconSource.h; path = "Frameworks/Adium Framework/Source/AIAddressBookUserIconSource.h"; sourceTree = "<group>"; };
 		3403F4310D2EF01D006B08FB /* AIAddressBookUserIconSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAddressBookUserIconSource.m; path = "Frameworks/Adium Framework/Source/AIAddressBookUserIconSource.m"; sourceTree = "<group>"; };
 		3403F4CE0D2EFE10006B08FB /* AIManuallySetUserIconSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIManuallySetUserIconSource.h; path = "Frameworks/Adium Framework/Source/AIManuallySetUserIconSource.h"; sourceTree = "<group>"; };
@@ -2094,7 +2109,6 @@
 		340580A2087EEFA200664D64 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = Resources/ru.lproj/ListLayoutSheet.nib; sourceTree = "<group>"; };
 		340580A3087EEFA200664D64 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = Resources/ru.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		340580A4087EEFA200664D64 /* ru */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ru; path = Resources/ru.lproj/Localizable.strings; sourceTree = "<group>"; };
-		340580A5087EEFA200664D64 /* ru */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ru; path = "Plugins/WebKit Message View/ru.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		340580A6087EEFA200664D64 /* ru */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ru; path = "Plugins/Purple Service/ru.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		340580A9087EEFA200664D64 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = Resources/ru.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
 		340580AA087EEFA200664D64 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = Resources/ru.lproj/ProxyPasswordPrompt.nib; sourceTree = "<group>"; };
@@ -2186,7 +2200,6 @@
 		3419E2F20A81451500C3FC68 /* pl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pl; path = "Frameworks/Adium Framework/Resources/pl.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3419E2F30A81451D00C3FC68 /* zh_CN */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_CN; path = "Frameworks/Adium Framework/Resources/zh_CN.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3419E2F40A81452400C3FC68 /* zh_TW */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_TW; path = "Frameworks/Adium Framework/Resources/zh_TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		3419E5950A86996000C3FC68 /* tr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = tr; path = "Plugins/WebKit Message View/tr.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3419E5960A86996200C3FC68 /* tr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = tr; path = Resources/tr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3419E5970A86996300C3FC68 /* tr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = tr; path = "Plugins/Purple Service/tr.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3419E7370A880AD300C3FC68 /* ESPurpleQQAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPurpleQQAccount.h; path = "Plugins/Purple Service/ESPurpleQQAccount.h"; sourceTree = "<group>"; };
@@ -2290,7 +2303,6 @@
 		34208D140D502D3F003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr_CA; path = Resources/fr_CA.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		34208D150D502D3F003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = "Plugins/Purple Service/fr_CA.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		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>"; };
-		34208D170D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = "Plugins/WebKit Message View/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>"; };
 		34208D190D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr_CA; path = Resources/fr_CA.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
 		34208D1A0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr_CA; path = Resources/fr_CA.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
@@ -2376,7 +2388,6 @@
 		342CE140085A08A100005C63 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = Resources/sv.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		342CE141085A08A100005C63 /* sv */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sv; path = Resources/sv.lproj/Localizable.strings; sourceTree = "<group>"; };
 		342CE143085A08A100005C63 /* sv */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sv; path = "Plugins/Purple Service/sv.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		342CE144085A08A100005C63 /* sv */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sv; path = "Plugins/WebKit Message View/sv.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		342CE146085A08A200005C63 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = Resources/sv.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
 		342CE147085A08A200005C63 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = Resources/sv.lproj/ProxyPasswordPrompt.nib; sourceTree = "<group>"; };
 		342CE148085A08A200005C63 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = Resources/sv.lproj/StatusPreferences.nib; sourceTree = "<group>"; };
@@ -2403,7 +2414,6 @@
 		342CE16B085A08C600005C63 /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ca; path = "Plugins/Purple Service/ca.lproj/ESPurpleZephyrAccountView.nib"; sourceTree = "<group>"; };
 		342CE16D085A08C700005C63 /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ca; path = Resources/ca.lproj/ListLayoutSheet.nib; sourceTree = "<group>"; };
 		342CE16E085A08C700005C63 /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ca; path = Resources/ca.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
-		342CE16F085A08C700005C63 /* ca */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ca; path = "Plugins/WebKit Message View/ca.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		342CE170085A08C700005C63 /* ca */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ca; path = "Plugins/Purple Service/ca.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		342CE171085A08C700005C63 /* ca */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ca; path = Resources/ca.lproj/Localizable.strings; sourceTree = "<group>"; };
 		342CE174085A08C700005C63 /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ca; path = Resources/ca.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
@@ -2444,7 +2454,6 @@
 		342F9E5B0B552629000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fi; path = Resources/fi.lproj/OTRPrefs.nib; 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/fi.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		342F9E610B55262B000D5FC2 /* fi */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fi; path = "Plugins/WebKit Message View/fi.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		342F9E630B55262B000D5FC2 /* fi */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fi; path = "Frameworks/Adium Framework/Resources/fi.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		342F9E640B55262B000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fi; path = Resources/fi.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		342F9E650B55262B000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fi; path = Resources/fi.lproj/ListLayoutSheet.nib; sourceTree = "<group>"; };
@@ -2526,7 +2535,6 @@
 		343BB63A0C96DC1100506F9B /* MySpace-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "MySpace-large.png"; path = "Plugins/Purple Service/MySpace-large.png"; sourceTree = "<group>"; };
 		343C45E20816C0FE00FF5FA7 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = "Plugins/WebKit Message View/it.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
 		343C45E50816C13300FF5FA7 /* nl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nl; path = Resources/nl.lproj/Localizable.strings; sourceTree = "<group>"; };
-		343C45E80816C13D00FF5FA7 /* nl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nl; path = "Plugins/WebKit Message View/nl.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		343C46040816CC6800FF5FA7 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = "Plugins/Purple Service/it.lproj/ESPurpleZephyrAccountView.nib"; sourceTree = "<group>"; };
 		343C46070816CC8000FF5FA7 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = "Plugins/Purple Service/it.lproj/DCPurpleZephyrJoinChatView.nib"; sourceTree = "<group>"; };
 		343C460A0816CC9500FF5FA7 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = "Plugins/Purple Service/it.lproj/ESPurpleYahooAccountView.nib"; sourceTree = "<group>"; };
@@ -2542,7 +2550,6 @@
 		343C461E0816CCFD00FF5FA7 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = "Plugins/Purple Service/it.lproj/ESPurpleAIMAccountView.nib"; sourceTree = "<group>"; };
 		343C461F0816CD0400FF5FA7 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = "Plugins/Purple Service/it.lproj/DCPurpleOscarJoinChatView.nib"; sourceTree = "<group>"; };
 		343C47760816FBDA00FF5FA7 /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = "Plugins/WebKit Message View/de.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
-		343C47790816FBE500FF5FA7 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = "Plugins/WebKit Message View/de.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		343EB4270808709E00E27095 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = Resources/en.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		343EC68F0809DD2900E27095 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = Resources/en.lproj/ListLayoutSheet.nib; sourceTree = "<group>"; };
 		343EC6C0096F7DEA00349098 /* StatusPreferencesAdvanced.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = StatusPreferencesAdvanced.nib; path = Resources/StatusPreferencesAdvanced.nib; sourceTree = "<group>"; };
@@ -2656,7 +2663,6 @@
 		345076AB0E106F5E00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = Resources/en_GB.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		345076AC0E106F5E00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_GB; path = Resources/en_GB.lproj/ListLayoutSheet.nib; sourceTree = "<group>"; };
 		345076AD0E106F5E00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_GB; path = Resources/en_GB.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
-		345076AE0E106F5E00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = "Plugins/WebKit Message View/en_GB.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		345076AF0E106F5E00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = "Plugins/Purple Service/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>"; };
 		345076B10E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_GB; path = Resources/en_GB.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
@@ -2697,7 +2703,6 @@
 		345076EC0E106FD600BF0883 /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt; path = Resources/pt.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		345076ED0E106FD600BF0883 /* pt */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt; path = "Plugins/Purple Service/pt.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		345076EE0E106FD600BF0883 /* pt */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt; path = Resources/pt.lproj/Localizable.strings; sourceTree = "<group>"; };
-		345076EF0E106FD600BF0883 /* pt */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt; path = "Plugins/WebKit Message View/pt.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		345076F00E106FD600BF0883 /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt; path = Resources/pt.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
 		345076F10E106FD600BF0883 /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt; path = Resources/pt.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
 		345076F20E106FD600BF0883 /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt; path = Resources/pt.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
@@ -2879,7 +2884,6 @@
 		345F5BA9081AC4F2001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = Resources/zh_TW.lproj/ListLayoutSheet.nib; sourceTree = "<group>"; };
 		345F5BAA081AC4F2001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = Resources/zh_TW.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		345F5BAB081AC4F2001F733C /* zh_TW */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_TW; path = Resources/zh_TW.lproj/Localizable.strings; sourceTree = "<group>"; };
-		345F5BAD081AC4F2001F733C /* zh_TW */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_TW; path = "Plugins/WebKit Message View/zh_TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		345F5BAF081AC4F2001F733C /* zh_TW */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_TW; path = "Plugins/Purple Service/zh_TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		345F5BB1081AC4F2001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = Resources/zh_TW.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
 		345F5BB2081AC4F3001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = Resources/zh_TW.lproj/ProxyPasswordPrompt.nib; sourceTree = "<group>"; };
@@ -2998,15 +3002,12 @@
 		34652313083719EF009565FE /* nb */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nb; path = Resources/nb.lproj/DualWindowMessageAdvanced.nib; sourceTree = "<group>"; };
 		34652315083719EF009565FE /* nb */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nb; path = "Plugins/Purple Service/nb.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34652316083719F0009565FE /* nb */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nb; path = Resources/nb.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		34652318083719F0009565FE /* nb */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nb; path = "Plugins/WebKit Message View/nb.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34652319083719F0009565FE /* nb */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nb; path = Resources/nb.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3465232C083719FF009565FE /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ja; path = "Frameworks/Adium Framework/Resources/ja.lproj/EditStateSheet.nib"; sourceTree = "<group>"; };
 		3465233E08371A0C009565FE /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ja; path = Resources/ja.lproj/StatusPreferences.nib; sourceTree = "<group>"; };
 		3465235208371A3F009565FE /* zh_CN */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_CN; path = Resources/zh_CN.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3465235308371A3F009565FE /* zh_CN */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_CN; path = "Plugins/Purple Service/zh_CN.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		3465235408371A40009565FE /* zh_CN */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_CN; path = "Plugins/WebKit Message View/zh_CN.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3465236508371A64009565FE /* cs */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = cs; path = "Plugins/Purple Service/cs.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		3465236608371A64009565FE /* cs */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = cs; path = "Plugins/WebKit Message View/cs.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3465236808371A65009565FE /* cs */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = cs; path = Resources/cs.lproj/Localizable.strings; sourceTree = "<group>"; };
 		346544D90C8F686B0046ED68 /* AMPurpleJabberXMLConsole.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = AMPurpleJabberXMLConsole.nib; path = "Plugins/Purple Service/AMPurpleJabberXMLConsole.nib"; sourceTree = "<group>"; };
 		346544DA0C8F686B0046ED68 /* AMPurpleJabberDiscoveryBrowser.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = AMPurpleJabberDiscoveryBrowser.nib; path = "Plugins/Purple Service/AMPurpleJabberDiscoveryBrowser.nib"; sourceTree = "<group>"; };
@@ -3060,7 +3061,6 @@
 		346C9C110E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = Resources/hu.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		346C9C120E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = "Frameworks/Adium Framework/Resources/hu.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		346C9C130E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = Resources/hu.lproj/Localizable.strings; sourceTree = "<group>"; };
-		346C9C140E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = "Plugins/WebKit Message View/hu.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		346C9C150E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = "Plugins/Purple Service/hu.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		346C9C160E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = Resources/hu.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
 		346C9C170E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = Resources/hu.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
@@ -3333,7 +3333,6 @@
 		34A30E9A08D8EE7B00697644 /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = es; path = Resources/es.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		34A30E9B08D8EE7B00697644 /* es */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = es; path = "Plugins/Purple Service/es.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34A30E9C08D8EE7B00697644 /* es */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = es; path = Resources/es.lproj/Localizable.strings; sourceTree = "<group>"; };
-		34A30E9D08D8EE7B00697644 /* es */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = es; path = "Plugins/WebKit Message View/es.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34A30EA008D8EE7B00697644 /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = es; path = Resources/es.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
 		34A30EA108D8EE7B00697644 /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = es; path = Resources/es.lproj/ProxyPasswordPrompt.nib; sourceTree = "<group>"; };
 		34A30EA208D8EE7B00697644 /* es */ = {isa = PBXFileReference; lastKnownFileType = folder; name = es; path = "Resources/es.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
@@ -3382,7 +3381,6 @@
 		34A81DB5093CE92200B0E93D /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pl; path = Resources/pl.lproj/ProxyPasswordPrompt.nib; sourceTree = "<group>"; };
 		34A81DB6093CE92200B0E93D /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pl; path = Resources/pl.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
 		34A81DBB093CE92200B0E93D /* pl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pl; path = Resources/pl.lproj/Localizable.strings; sourceTree = "<group>"; };
-		34A81DBC093CE92200B0E93D /* pl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pl; path = "Plugins/WebKit Message View/pl.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34A81DBD093CE92200B0E93D /* pl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pl; path = "Plugins/Purple Service/pl.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34A81DBE093CE92200B0E93D /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pl; path = Resources/pl.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		34A81DBF093CE92200B0E93D /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pl; path = Resources/pl.lproj/ListLayoutSheet.nib; sourceTree = "<group>"; };
@@ -3458,7 +3456,6 @@
 		34B1FCDA0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el_GR; path = Resources/el_GR.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		34B1FCDB0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = el_GR; path = Resources/el_GR.lproj/ListLayoutSheet.nib; sourceTree = "<group>"; };
 		34B1FCDC0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = el_GR; path = Resources/el_GR.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
-		34B1FCDD0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el_GR; path = "Plugins/WebKit Message View/el_GR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34B1FCDE0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el_GR; path = "Plugins/Purple Service/el_GR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34B1FCDF0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el_GR; path = Resources/el_GR.lproj/Localizable.strings; sourceTree = "<group>"; };
 		34B1FCE00F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = el_GR; path = Resources/el_GR.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
@@ -3499,7 +3496,6 @@
 		34B272050839E8E50092A5A0 /* is */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = is; path = "Plugins/WebKit Message View/is.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
 		34B272060839E8E50092A5A0 /* is */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = is; path = Resources/is.lproj/AccountProxy.nib; sourceTree = "<group>"; };
 		34B272160839E8FB0092A5A0 /* is */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = is; path = "Plugins/Purple Service/is.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		34B272170839E8FB0092A5A0 /* is */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = is; path = "Plugins/WebKit Message View/is.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34B272180839E8FB0092A5A0 /* is */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = is; path = Resources/is.lproj/Localizable.strings; sourceTree = "<group>"; };
 		34B3244309BA003C00029361 /* AILibpurplePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AILibpurplePlugin.h; path = "Plugins/Purple Service/AILibpurplePlugin.h"; sourceTree = "<group>"; };
 		34B324780CE4CCF400158D5F /* PurpleAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PurpleAccountViewController.h; path = "Plugins/Purple Service/PurpleAccountViewController.h"; sourceTree = "<group>"; };
@@ -3595,10 +3591,6 @@
 		34C2A4930821859800F3363F /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ja; path = "Plugins/Purple Service/ja.lproj/ESPurpleAIMAccountView.nib"; sourceTree = "<group>"; };
 		34C2A4940821859800F3363F /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ja; path = "Plugins/Purple Service/ja.lproj/DCPurpleZephyrJoinChatView.nib"; sourceTree = "<group>"; };
 		34C2A4950821859800F3363F /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ja; path = "Plugins/Purple Service/ja.lproj/ESPurpleNovellAccountView.nib"; sourceTree = "<group>"; };
-		34C2A4AC082185BE00F3363F /* ja */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ja; path = "Plugins/WebKit Message View/ja.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		34C2A4BB082185D700F3363F /* it */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = it; path = "Plugins/WebKit Message View/it.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		34C2A4D90821860900F3363F /* fr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr; path = "Plugins/WebKit Message View/fr.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		34C2A4EA0821861800F3363F /* da */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = da; path = "Plugins/WebKit Message View/da.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34C2CF85063340540018E5D2 /* PurpleMultilineRequestWindow.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = PurpleMultilineRequestWindow.nib; path = "Plugins/Purple Service/PurpleMultilineRequestWindow.nib"; sourceTree = "<group>"; };
 		34C2CF86063340540018E5D2 /* PurpleSinglelineRequestWindow.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = PurpleSinglelineRequestWindow.nib; path = "Plugins/Purple Service/PurpleSinglelineRequestWindow.nib"; sourceTree = "<group>"; };
 		34C2D70306338E2E0018E5D2 /* ESWebKitMessageViewPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESWebKitMessageViewPreferences.h; path = "Plugins/WebKit Message View/ESWebKitMessageViewPreferences.h"; sourceTree = "<group>"; };
@@ -3852,7 +3844,6 @@
 		34F13F450BA6D56E000473DE /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_BR; path = Resources/pt_BR.lproj/ListLayoutSheet.nib; sourceTree = "<group>"; };
 		34F13F460BA6D56E000473DE /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_BR; path = Resources/pt_BR.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		34F13F470BA6D56E000473DE /* pt_BR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_BR; path = "Plugins/Purple Service/pt_BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		34F13F480BA6D56E000473DE /* pt_BR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_BR; path = "Plugins/WebKit Message View/pt_BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34F13F490BA6D56E000473DE /* pt_BR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_BR; path = Resources/pt_BR.lproj/Localizable.strings; sourceTree = "<group>"; };
 		34F13F4A0BA6D56E000473DE /* pt_BR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_BR; path = "Frameworks/Adium Framework/Resources/pt_BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		34F13F4C0BA6D56E000473DE /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_BR; path = Resources/pt_BR.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
@@ -6069,6 +6060,7 @@
 				34E4CD510E68277D00D1B0DC /* ESIRCJoinChatView.nib */,
 				34E4CD500E68277D00D1B0DC /* ESIRCJoinChatViewController.h */,
 				34E4CD4F0E68277D00D1B0DC /* ESIRCJoinChatViewController.m */,
+				11AE5575109CCC950074BDC2 /* irc-small.png */,
 				34E4CD640E68279C00D1B0DC /* irc.png */,
 				34E4CD650E68279C00D1B0DC /* PurpleDefaultsIRC.plist */,
 			);
@@ -8323,10 +8315,14 @@
 				4BF3CBEC07D192F500A8112A /* pref-accounts.png */,
 				34D8336E07CBD807006466F2 /* pref-advanced.png */,
 				4BF3CB4107D1771E00A8112A /* pref-appearance.png */,
+				11AE5554109CC88C0074BDC2 /* pref-confirmations.png */,
 				345F573F0817FF80001F733C /* pref-contactList.png */,
+				1130EA98109B445500FB3454 /* pref-defaultclient.png */,
 				34D8336C07CBD807006466F2 /* pref-events.png */,
 				34D8336B07CBD807006466F2 /* pref-ft.png */,
 				34D8336807CBD807006466F2 /* pref-general.png */,
+				1130EA9B109B445D00FB3454 /* pref-mention.png */,
+				1130EA9C109B445D00FB3454 /* pref-messagealerts.png */,
 				34D8336707CBD807006466F2 /* pref-messages.png */,
 				347EAB2C09721D490090EA6E /* pref-personal.png */,
 				4BB5B78107D2DC4900CFE06F /* pref-status.png */,
@@ -8380,7 +8376,6 @@
 				4BD62D7F07CE8F240099EBA2 /* AIWebkitMessageViewStyle.m */,
 				34C2D70306338E2E0018E5D2 /* ESWebKitMessageViewPreferences.h */,
 				34C2D70406338E2E0018E5D2 /* ESWebKitMessageViewPreferences.m */,
-				3402E07507CB0FAA0044F818 /* Localizable.strings */,
 				34C2DBE5063449AF0018E5D2 /* Preview.plist */,
 				34C2DF00063498ED0018E5D2 /* SoulEdge.png */,
 				4B03711506595A70008F5981 /* Template.html */,
@@ -9352,6 +9347,7 @@
 				81F9D1DF0A7F81A5004A35BD /* PBXBuildRule */,
 			);
 			dependencies = (
+				11F6CB2E109BC6AC0070022D /* PBXTargetDependency */,
 				639DF9E30F97E687003C9A32 /* PBXTargetDependency */,
 				349C31630867D199000BF883 /* PBXTargetDependency */,
 				6329EFB50F9D33A600112489 /* PBXTargetDependency */,
@@ -9468,6 +9464,7 @@
 				hu,
 				el_GR,
 				English,
+				gy,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CocAIMe2 */;
 			projectDirPath = "";
@@ -9588,6 +9585,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				11AE5587109CCCC30074BDC2 /* irc-small.png in Resources */,
 				3485DB5F09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatView.nib in Resources */,
 				3485DB6209EBCE7400232CC4 /* ESPurpleGaduGaduAccountView.nib in Resources */,
 				3485DB6309EBCE7400232CC4 /* PurpleDefaultsGadu-Gadu.plist in Resources */,
@@ -9659,7 +9657,6 @@
 				6318DBA40F8D93F200C5E584 /* SoulEdge.png in Resources */,
 				6318DBA50F8D93F200C5E584 /* terminator.png in Resources */,
 				6318DBA60F8D93F200C5E584 /* Template.html in Resources */,
-				6318DBA70F8D93F200C5E584 /* Localizable.strings in Resources */,
 				9EF0DBFA09D944C200FBCC1E /* Resources/block.png in Resources */,
 				9EF0DBFB09D944C200FBCC1E /* Resources/unblock.png in Resources */,
 				346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */,
@@ -9904,6 +9901,10 @@
 				11A2F10A0FC8FC1A00C3F05C /* AIMessageAlertsAdvancedPreferences.nib in Resources */,
 				11BE29640FCCA8DA000E6A10 /* ImageUploaderProgress.nib in Resources */,
 				112939020FD5AC1B00FA8F53 /* AIConfirmationsAdvancedPreferences.nib in Resources */,
+				1130EA99109B445500FB3454 /* pref-defaultclient.png in Resources */,
+				1130EA9D109B445D00FB3454 /* pref-mention.png in Resources */,
+				1130EA9E109B445D00FB3454 /* pref-messagealerts.png in Resources */,
+				11AE5555109CC88C0074BDC2 /* pref-confirmations.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -10795,6 +10796,11 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		11F6CB2E109BC6AC0070022D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 34BD9DAF05314751000AB133 /* Adium.Framework */;
+			targetProxy = 11F6CB2D109BC6AC0070022D /* PBXContainerItemProxy */;
+		};
 		31A763FB0DA570E9000AC729 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = AutoHyperlinks.framework;
@@ -11156,38 +11162,6 @@
 			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
-		3402E07507CB0FAA0044F818 /* Localizable.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				3402E06C07CB0F9D0044F818 /* en */,
-				343C45E80816C13D00FF5FA7 /* nl */,
-				343C47790816FBE500FF5FA7 /* de */,
-				345F5BAD081AC4F2001F733C /* zh_TW */,
-				34C2A4AC082185BE00F3363F /* ja */,
-				34C2A4BB082185D700F3363F /* it */,
-				34C2A4D90821860900F3363F /* fr */,
-				34C2A4EA0821861800F3363F /* da */,
-				34652318083719F0009565FE /* nb */,
-				3465235408371A40009565FE /* zh_CN */,
-				3465236608371A64009565FE /* cs */,
-				34B272170839E8FB0092A5A0 /* is */,
-				342CE144085A08A100005C63 /* sv */,
-				342CE16F085A08C700005C63 /* ca */,
-				340580A5087EEFA200664D64 /* ru */,
-				34A30E9D08D8EE7B00697644 /* es */,
-				34A81DBC093CE92200B0E93D /* pl */,
-				3419E5950A86996000C3FC68 /* tr */,
-				342F9E610B55262B000D5FC2 /* fi */,
-				34F13F480BA6D56E000473DE /* pt_BR */,
-				34208D170D502D40003138D1 /* fr_CA */,
-				345076AE0E106F5E00BF0883 /* en_GB */,
-				345076EF0E106FD600BF0883 /* pt */,
-				346C9C140E70E1F7002314EE /* hu */,
-				34B1FCDD0F112BF600C7E952 /* el_GR */,
-			);
-			name = Localizable.strings;
-			sourceTree = "<group>";
-		};
 		34167FEC081D706200E35678 /* DualWindowMessageAdvanced.nib */ = {
 			isa = PBXVariantGroup;
 			children = (
diff -r 791780625051 -r b3aa403eb202 Frameworks/AIUtilities Framework/Resources/da.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/da.lproj/Localizable.strings has changed
diff -r 791780625051 -r b3aa403eb202 Frameworks/AIUtilities Framework/Resources/en.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/en.lproj/Localizable.strings has changed
diff -r 791780625051 -r b3aa403eb202 Frameworks/AIUtilities Framework/Resources/en.lproj/SecErrorMessages.strings
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/AIUtilities Framework/Resources/en.lproj/SecErrorMessages.strings	Fri Nov 06 12:37:21 2009 -0500
@@ -0,0 +1,1 @@
+ÿþ
\ No newline at end of file
diff -r 791780625051 -r b3aa403eb202 Frameworks/AIUtilities Framework/Resources/nl.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/nl.lproj/Localizable.strings has changed
diff -r 791780625051 -r b3aa403eb202 Frameworks/AIUtilities Framework/Resources/pl.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/pl.lproj/Localizable.strings has changed
diff -r 791780625051 -r b3aa403eb202 Frameworks/AIUtilities Framework/Source/AIImageAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageAdditions.m	Wed Oct 28 21:04:52 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIImageAdditions.m	Fri Nov 06 12:37:21 2009 -0500
@@ -53,10 +53,9 @@
 //Create and return an opaque bitmap image rep, replacing transparency with [NSColor whiteColor]
 - (NSBitmapImageRep *)opaqueBitmapImageRep
 {
-	NSImage			*tempImage;
-	NSEnumerator	*enumerator;
-	NSImageRep		*imageRep;
-	NSSize			size = [self size];
+	NSImage				*tempImage = nil;
+	NSBitmapImageRep	*imageRep = nil;
+	NSSize				size = [self size];
 	
 	//Work with a temporary image so we don't modify self
 	tempImage = [[[NSImage allocWithZone:[self zone]] initWithSize:size] autorelease];
@@ -75,10 +74,10 @@
 	[tempImage unlockFocus];
 	
 	//Find an NSBitmapImageRep from the temporary image
-	enumerator = [[tempImage representations] objectEnumerator];
-	while ((imageRep = [enumerator nextObject])) {
-		if ([imageRep isKindOfClass:[NSBitmapImageRep class]])
-			break;
+	for (NSImageRep *rep in tempImage.representations) {
+		if ([rep isKindOfClass:[NSBitmapImageRep class]]) {
+			imageRep = (NSBitmapImageRep *)rep;
+		}
 	}
 	
 	//Make one if necessary
@@ -86,7 +85,11 @@
 		imageRep = [NSBitmapImageRep imageRepWithData:[tempImage TIFFRepresentation]];
     }
 	
-	return (NSBitmapImageRep *)imageRep;
+	// 10.6 behavior: Drawing into a new image copies the display's color profile in.
+	// Remove the color profile so we don't bloat the image size.
+	[imageRep setProperty:NSImageColorSyncProfileData withValue:nil];
+	
+	return imageRep;
 }
 
 - (NSBitmapImageRep *)largestBitmapImageRep
diff -r 791780625051 -r b3aa403eb202 Frameworks/AIUtilities Framework/Source/AILeopardCompatibility.h
--- a/Frameworks/AIUtilities Framework/Source/AILeopardCompatibility.h	Wed Oct 28 21:04:52 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AILeopardCompatibility.h	Fri Nov 06 12:37:21 2009 -0500
@@ -36,6 +36,10 @@
 - (BOOL)isAutomaticSpellingCorrectionEnabled;
 - (void)toggleAutomaticSpellingCorrection:(id)sender;
 @end
+
+ at interface NSSpellChecker(NSSpellCheckerLeopardMethods)
+- (NSArray *)userPreferredLanguages;
+ at end
 #endif
 
 #else //Not compiling for 10.6
diff -r 791780625051 -r b3aa403eb202 Frameworks/AIUtilities Framework/Source/AIObjectAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIObjectAdditions.h	Wed Oct 28 21:04:52 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIObjectAdditions.h	Fri Nov 06 12:37:21 2009 -0500
@@ -29,10 +29,13 @@
 - (void)mainPerformSelector:(SEL)aSelector withObjects:(id)argument1, ... NS_REQUIRES_NIL_TERMINATION;
 
 - (void)mainPerformSelector:(SEL)aSelector withObject:(id)argument1 withObject:(id)argument2 withObject:(id)argument3 withObject:(id)argument4 waitUntilDone:(BOOL)flag;
+
 - (void)performSelector:(SEL)aSelector withObject:(id)argument1 withObject:(id)argument2 afterDelay:(NSTimeInterval)delay;
 
 - (void)performSelector:(SEL)aSelector withObject:(id)argument1 withObject:(id)argument2 withObject:(id)argument3 afterDelay:(NSTimeInterval)delay;
 - (void)performSelector:(SEL)aSelector withObject:(id)argument1 withObject:(id)argument2 withObject:(id)argument3;
 
+- (void)performSelector:(SEL)aSelector withObject:(id)argument1 withObject:(id)argument2 withObject:(id)argument3 withObject:(id)argument4 afterDelay:(NSTimeInterval)delay;
+
 - (void)handleInvocation:(NSInvocation *)anInvocation;
 @end
diff -r 791780625051 -r b3aa403eb202 Frameworks/AIUtilities Framework/Source/AIObjectAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIObjectAdditions.m	Wed Oct 28 21:04:52 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIObjectAdditions.m	Fri Nov 06 12:37:21 2009 -0500
@@ -261,6 +261,21 @@
 	[self performSelector:@selector(handleInvocation:) withObject:invocation];	
 }
 
+- (void)performSelector:(SEL)aSelector withObject:(id)argument1 withObject:(id)argument2 withObject:(id)argument3 withObject:(id)argument4 afterDelay:(NSTimeInterval)delay
+{
+	NSInvocation *invocation;
+	invocation = [NSInvocation invocationWithMethodSignature:[self methodSignatureForSelector:aSelector]];
+	
+	[invocation setSelector:aSelector];
+	[invocation setArgument:&argument1 atIndex:2];
+	[invocation setArgument:&argument2 atIndex:3];
+	[invocation setArgument:&argument3 atIndex:4];
+	[invocation setArgument:&argument4 atIndex:5];
+	[invocation retainArguments];
+	
+	[self performSelector:@selector(handleInvocation:) withObject:invocation afterDelay:delay];	
+}
+
 - (void)handleInvocation:(NSInvocation *)anInvocation
 {
 	[anInvocation invokeWithTarget:self];
diff -r 791780625051 -r b3aa403eb202 Frameworks/Adium Framework/Resources/Authorize.png
Binary file Frameworks/Adium Framework/Resources/Authorize.png has changed
diff -r 791780625051 -r b3aa403eb202 Frameworks/Adium Framework/Resources/Deny.png
Binary file Frameworks/Adium Framework/Resources/Deny.png has changed
diff -r 791780625051 -r b3aa403eb202 Frameworks/Adium Framework/Resources/Ignore.png
Binary file Frameworks/Adium Framework/Resources/Ignore.png has changed
diff -r 791780625051 -r b3aa403eb202 Frameworks/Adium Framework/Resources/da.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/da.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 791780625051 -r b3aa403eb202 Frameworks/Adium Framework/Resources/da.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/da.lproj/Localizable.strings has changed
diff -r 791780625051 -r b3aa403eb202 Frameworks/Adium Framework/Resources/nl.lproj/EditStateSheet.nib/designable.nib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Resources/nl.lproj/EditStateSheet.nib/designable.nib	Fri Nov 06 12:37:21 2009 -0500
@@ -0,0 +1,2108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1050</int>
+		<string key="IBDocument.SystemVersion">10B504</string>
+		<string key="IBDocument.InterfaceBuilderVersion">732</string>
+		<string key="IBDocument.AppKitVersion">1038.2</string>
+		<string key="IBDocument.HIToolboxVersion">437.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">732</string>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1019282992">
+			<object class="NSCustomObject" id="233291761">
+				<string key="NSClassName">AIEditStateWindowController</string>
+			</object>
+			<object class="NSCustomObject" id="563515176">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="332341367">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1040380465">
+				<int key="NSWindowStyleMask">3</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{576, 117}, {403, 521}}</string>
+				<int key="NSWTFlags">1886912512</int>
+				<string key="NSWindowTitle">Aangepaste status</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<string key="NSWindowContentMaxSize">{403, 527}</string>
+				<string key="NSWindowContentMinSize">{403, 477}</string>
+				<object class="NSView" key="NSWindowView" id="876432790">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="191170505">
+							<reference key="NSNextResponder" ref="876432790"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{305, 12}, {84, 32}}</string>
+							<reference key="NSSuperview" ref="876432790"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="359920265">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<object class="NSFont" key="NSSupport" id="1026200615">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="191170505"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">268435457</int>
+								<reference key="NSAlternateImage" ref="1026200615"/>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="216671085">
+							<reference key="NSNextResponder" ref="876432790"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{210, 12}, {95, 32}}</string>
+							<reference key="NSSuperview" ref="876432790"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="456805053">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Annuleer</string>
+								<reference key="NSSupport" ref="1026200615"/>
+								<reference key="NSControlView" ref="216671085"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="1026200615"/>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="543800414">
+							<reference key="NSNextResponder" ref="876432790"/>
+							<int key="NSvFlags">264</int>
+							<string key="NSFrame">{{13, 140}, {347, 18}}</string>
+							<reference key="NSSuperview" ref="876432790"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="463140982">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Verschijn onmiddellijk als inactief</string>
+								<reference key="NSSupport" ref="1026200615"/>
+								<reference key="NSControlView" ref="543800414"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">2</int>
+								<object class="NSCustomResource" key="NSNormalImage" id="273273375">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSSwitch</string>
+								</object>
+								<object class="NSButtonImageSource" key="NSAlternateImage" id="212182047">
+									<string key="NSImageName">NSSwitch</string>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="805353406">
+							<reference key="NSNextResponder" ref="876432790"/>
+							<int key="NSvFlags">264</int>
+							<string key="NSFrame">{{12, 283}, {373, 18}}</string>
+							<reference key="NSSuperview" ref="876432790"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="198216266">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Automatisch antwoord</string>
+								<reference key="NSSupport" ref="1026200615"/>
+								<reference key="NSControlView" ref="805353406"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">2</int>
+								<reference key="NSNormalImage" ref="273273375"/>
+								<reference key="NSAlternateImage" ref="212182047"/>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="163397801">
+							<reference key="NSNextResponder" ref="876432790"/>
+							<int key="NSvFlags">264</int>
+							<string key="NSFrame">{{35, 263}, {350, 18}}</string>
+							<reference key="NSSuperview" ref="876432790"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="362118882">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">met aangepast automatisch antwoord:</string>
+								<reference key="NSSupport" ref="1026200615"/>
+								<reference key="NSControlView" ref="163397801"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">2</int>
+								<reference key="NSNormalImage" ref="273273375"/>
+								<reference key="NSAlternateImage" ref="212182047"/>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSScrollView" id="300478702">
+							<reference key="NSNextResponder" ref="876432790"/>
+							<int key="NSvFlags">266</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="246654872">
+									<reference key="NSNextResponder" ref="300478702"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTextView" id="938866786">
+											<reference key="NSNextResponder" ref="246654872"/>
+											<int key="NSvFlags">2322</int>
+											<string key="NSFrameSize">{344, 91}</string>
+											<reference key="NSSuperview" ref="246654872"/>
+											<object class="NSTextContainer" key="NSTextContainer" id="520564703">
+												<object class="NSLayoutManager" key="NSLayoutManager">
+													<object class="NSTextStorage" key="NSTextStorage">
+														<object class="NSMutableString" key="NSString">
+															<characters key="NS.bytes"/>
+														</object>
+														<nil key="NSDelegate"/>
+													</object>
+													<array class="NSMutableArray" key="NSTextContainers">
+														<reference ref="520564703"/>
+													</array>
+													<int key="NSLMFlags">6</int>
+													<nil key="NSDelegate"/>
+												</object>
+												<reference key="NSTextView" ref="938866786"/>
+												<double key="NSWidth">344</double>
+												<int key="NSTCFlags">1</int>
+											</object>
+											<object class="NSTextViewSharedData" key="NSSharedData">
+												<int key="NSFlags">28647</int>
+												<int key="NSTextCheckingTypes">0</int>
+												<nil key="NSMarkedAttributes"/>
+												<object class="NSColor" key="NSBackgroundColor" id="607018370">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MQA</bytes>
+												</object>
+												<dictionary key="NSSelectedAttributes">
+													<object class="NSColor" key="NSBackgroundColor" id="870148911">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">selectedTextBackgroundColor</string>
+														<object class="NSColor" key="NSColor" id="182922982">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+														</object>
+													</object>
+													<object class="NSColor" key="NSColor" id="428435232">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">selectedTextColor</string>
+														<object class="NSColor" key="NSColor" id="1063947168">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MAA</bytes>
+														</object>
+													</object>
+												</dictionary>
+												<reference key="NSInsertionColor" ref="1063947168"/>
+												<dictionary key="NSLinkAttributes">
+													<object class="NSColor" key="NSColor" id="680998614">
+														<int key="NSColorSpace">1</int>
+														<bytes key="NSRGB">MCAwIDEAA</bytes>
+													</object>
+													<object class="NSCursor" key="NSCursor" id="96885788">
+														<string key="NSHotSpot">{8, -8}</string>
+														<int key="NSCursorType">13</int>
+													</object>
+													<integer value="1" key="NSUnderline"/>
+												</dictionary>
+												<nil key="NSDefaultParagraphStyle"/>
+											</object>
+											<int key="NSTVFlags">6</int>
+											<string key="NSMaxSize">{344, 1e+07}</string>
+											<nil key="NSDelegate"/>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 1}, {344, 91}}</string>
+									<reference key="NSSuperview" ref="300478702"/>
+									<reference key="NSNextKeyView" ref="938866786"/>
+									<reference key="NSDocView" ref="938866786"/>
+									<reference key="NSBGColor" ref="607018370"/>
+									<object class="NSCursor" key="NSCursor" id="675087106">
+										<string key="NSHotSpot">{4, -5}</string>
+										<int key="NSCursorType">1</int>
+									</object>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="591129939">
+									<reference key="NSNextResponder" ref="300478702"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{-30, 1}, {15, 91}}</string>
+									<reference key="NSSuperview" ref="300478702"/>
+									<reference key="NSTarget" ref="300478702"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSCurValue">1</double>
+								</object>
+								<object class="NSScroller" id="868993171">
+									<reference key="NSNextResponder" ref="300478702"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
+									<reference key="NSSuperview" ref="300478702"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="300478702"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSCurValue">1</double>
+									<double key="NSPercent">0.94565218687057495</double>
+								</object>
+							</array>
+							<string key="NSFrame">{{37, 164}, {346, 93}}</string>
+							<reference key="NSSuperview" ref="876432790"/>
+							<reference key="NSNextKeyView" ref="246654872"/>
+							<int key="NSsFlags">530</int>
+							<reference key="NSVScroller" ref="591129939"/>
+							<reference key="NSHScroller" ref="868993171"/>
+							<reference key="NSContentView" ref="246654872"/>
+						</object>
+						<object class="NSBox" id="169838637">
+							<reference key="NSNextResponder" ref="876432790"/>
+							<int key="NSvFlags">264</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="1003268650">
+									<reference key="NSNextResponder" ref="169838637"/>
+									<int key="NSvFlags">256</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSStepper" id="421353838">
+											<reference key="NSNextResponder" ref="1003268650"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{129, -3}, {19, 28}}</string>
+											<reference key="NSSuperview" ref="1003268650"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSStepperCell" key="NSCell" id="933054129">
+												<int key="NSCellFlags">68025888</int>
+												<int key="NSCellFlags2">0</int>
+												<object class="NSFont" key="NSSupport" id="179741470">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">12</double>
+													<int key="NSfFlags">16</int>
+												</object>
+												<reference key="NSControlView" ref="421353838"/>
+												<double key="NSValue">10</double>
+												<double key="NSMaxValue">59</double>
+												<double key="NSIncrement">1</double>
+												<bool key="NSValueWraps">YES</bool>
+												<bool key="NSAutorepeat">YES</bool>
+											</object>
+										</object>
+										<object class="NSTextField" id="918676603">
+											<reference key="NSNextResponder" ref="1003268650"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{105, 0}, {25, 22}}</string>
+											<reference key="NSSuperview" ref="1003268650"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="971947497">
+												<int key="NSCellFlags">-1804468671</int>
+												<int key="NSCellFlags2">4195328</int>
+												<string key="NSContents">10</string>
+												<reference key="NSSupport" ref="1026200615"/>
+												<reference key="NSControlView" ref="918676603"/>
+												<bool key="NSDrawsBackground">YES</bool>
+												<object class="NSColor" key="NSBackgroundColor" id="555028088">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">textBackgroundColor</string>
+													<reference key="NSColor" ref="607018370"/>
+												</object>
+												<object class="NSColor" key="NSTextColor" id="833533440">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">textColor</string>
+													<reference key="NSColor" ref="1063947168"/>
+												</object>
+											</object>
+										</object>
+										<object class="NSTextField" id="518440056">
+											<reference key="NSNextResponder" ref="1003268650"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{150, 3}, {94, 17}}</string>
+											<reference key="NSSuperview" ref="1003268650"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="414206310">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">Minuten</string>
+												<reference key="NSSupport" ref="1026200615"/>
+												<reference key="NSControlView" ref="518440056"/>
+												<object class="NSColor" key="NSBackgroundColor" id="33005391">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlColor</string>
+													<reference key="NSColor" ref="182922982"/>
+												</object>
+												<object class="NSColor" key="NSTextColor" id="936896377">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlTextColor</string>
+													<reference key="NSColor" ref="1063947168"/>
+												</object>
+											</object>
+										</object>
+										<object class="NSStepper" id="682989841">
+											<reference key="NSNextResponder" ref="1003268650"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{24, -3}, {19, 28}}</string>
+											<reference key="NSSuperview" ref="1003268650"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSStepperCell" key="NSCell" id="763984809">
+												<int key="NSCellFlags">68025888</int>
+												<int key="NSCellFlags2">0</int>
+												<reference key="NSSupport" ref="179741470"/>
+												<reference key="NSControlView" ref="682989841"/>
+												<double key="NSMaxValue">59</double>
+												<double key="NSIncrement">1</double>
+												<bool key="NSValueWraps">YES</bool>
+												<bool key="NSAutorepeat">YES</bool>
+											</object>
+										</object>
+										<object class="NSTextField" id="91589729">
+											<reference key="NSNextResponder" ref="1003268650"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{45, 3}, {42, 17}}</string>
+											<reference key="NSSuperview" ref="1003268650"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="380866192">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">Uren</string>
+												<reference key="NSSupport" ref="1026200615"/>
+												<reference key="NSControlView" ref="91589729"/>
+												<reference key="NSBackgroundColor" ref="33005391"/>
+												<reference key="NSTextColor" ref="936896377"/>
+											</object>
+										</object>
+										<object class="NSTextField" id="577517484">
+											<reference key="NSNextResponder" ref="1003268650"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrameSize">{25, 22}</string>
+											<reference key="NSSuperview" ref="1003268650"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="222355126">
+												<int key="NSCellFlags">-1804468671</int>
+												<int key="NSCellFlags2">4195328</int>
+												<string key="NSContents">0</string>
+												<reference key="NSSupport" ref="1026200615"/>
+												<reference key="NSControlView" ref="577517484"/>
+												<bool key="NSDrawsBackground">YES</bool>
+												<reference key="NSBackgroundColor" ref="555028088"/>
+												<reference key="NSTextColor" ref="833533440"/>
+											</object>
+										</object>
+									</array>
+									<string key="NSFrameSize">{330, 22}</string>
+									<reference key="NSSuperview" ref="169838637"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{37, 104}, {330, 22}}</string>
+							<reference key="NSSuperview" ref="876432790"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Titel</string>
+								<reference key="NSSupport" ref="1026200615"/>
+								<reference key="NSBackgroundColor" ref="555028088"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="1003268650"/>
+							<int key="NSBorderType">0</int>
+							<int key="NSBoxType">3</int>
+							<int key="NSTitlePosition">0</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSBox" id="380206451">
+							<reference key="NSNextResponder" ref="876432790"/>
+							<int key="NSvFlags">266</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="746197593">
+									<reference key="NSNextResponder" ref="380206451"/>
+									<int key="NSvFlags">256</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSScrollView" id="785992230">
+											<reference key="NSNextResponder" ref="746197593"/>
+											<int key="NSvFlags">264</int>
+											<array class="NSMutableArray" key="NSSubviews">
+												<object class="NSClipView" id="596876536">
+													<reference key="NSNextResponder" ref="785992230"/>
+													<int key="NSvFlags">2304</int>
+													<array class="NSMutableArray" key="NSSubviews">
+														<object class="NSTextView" id="517601813">
+															<reference key="NSNextResponder" ref="596876536"/>
+															<int key="NSvFlags">2322</int>
+															<string key="NSFrameSize">{355, 91}</string>
+															<reference key="NSSuperview" ref="596876536"/>
+															<object class="NSTextContainer" key="NSTextContainer" id="216254185">
+																<object class="NSLayoutManager" key="NSLayoutManager">
+																	<object class="NSTextStorage" key="NSTextStorage">
+																		<object class="NSMutableString" key="NSString">
+																			<characters key="NS.bytes"/>
+																		</object>
+																		<nil key="NSDelegate"/>
+																	</object>
+																	<array class="NSMutableArray" key="NSTextContainers">
+																		<reference ref="216254185"/>
+																	</array>
+																	<int key="NSLMFlags">6</int>
+																	<nil key="NSDelegate"/>
+																</object>
+																<reference key="NSTextView" ref="517601813"/>
+																<double key="NSWidth">355</double>
+																<int key="NSTCFlags">1</int>
+															</object>
+															<object class="NSTextViewSharedData" key="NSSharedData">
+																<int key="NSFlags">28647</int>
+																<int key="NSTextCheckingTypes">0</int>
+																<nil key="NSMarkedAttributes"/>
+																<reference key="NSBackgroundColor" ref="607018370"/>
+																<dictionary key="NSSelectedAttributes">
+																	<reference key="NSBackgroundColor" ref="870148911"/>
+																	<reference key="NSColor" ref="428435232"/>
+																</dictionary>
+																<reference key="NSInsertionColor" ref="1063947168"/>
+																<dictionary key="NSLinkAttributes">
+																	<reference key="NSColor" ref="680998614"/>
+																	<reference key="NSCursor" ref="96885788"/>
+																	<integer value="1" key="NSUnderline"/>
+																</dictionary>
+																<nil key="NSDefaultParagraphStyle"/>
+															</object>
+															<int key="NSTVFlags">6</int>
+															<string key="NSMaxSize">{355, 1e+07}</string>
+															<nil key="NSDelegate"/>
+														</object>
+													</array>
+													<string key="NSFrame">{{1, 1}, {355, 91}}</string>
+													<reference key="NSSuperview" ref="785992230"/>
+													<reference key="NSNextKeyView" ref="517601813"/>
+													<reference key="NSDocView" ref="517601813"/>
+													<reference key="NSBGColor" ref="607018370"/>
+													<reference key="NSCursor" ref="675087106"/>
+													<int key="NScvFlags">4</int>
+												</object>
+												<object class="NSScroller" id="127821492">
+													<reference key="NSNextResponder" ref="785992230"/>
+													<int key="NSvFlags">-2147483392</int>
+													<string key="NSFrame">{{-30, 1}, {15, 91}}</string>
+													<reference key="NSSuperview" ref="785992230"/>
+													<reference key="NSTarget" ref="785992230"/>
+													<string key="NSAction">_doScroller:</string>




More information about the commits mailing list