adium/adium
merge from default (one day this will go the other way)
+0
-24
+0
-41
+237
-150
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+28
-9
+57
-50
+1
-1
+0
-0
+0
-0
+0
-0
+1
-1
+1
-1
+2
-0
+7
-0
+2
-2
+1
-1
+61
-20
+332
-169
+7
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+6
-6
+1
-1
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+2225
-0
+0
-0
+0
-0
+0
-0
+0
-2225
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+1
-3
+6
-17
+2
-1
+24
-0
+41
-0
+1
-1
+29
-5
+1
-1
+7
-7
+1
-1
+8
-8
+2
-1
+1
-1
+3
-1
+0
-1
+1
-4
+1
-1
+1
-1
+1
-1
+1
-1
+0
-2
+2
-1
+21
-27
+2
-6
+10
-18
+20
-21
+67
-65
+2626
-0
+0
-0
+1
-1
+22
-11
+2
-2
+263
-176
+2
-2
+0
-34
+0
-504
+0
-730
+0
-236
+0
-234
+0
-1081
+0
-49
+0
-133
+0
-21
+0
-75
+0
-7010
+0
-161
+0
-1459
+0
-107
+0
-103
+0
-1566
+0
-22648
+0
-207
+0
-529
+0
-81
+0
-1453
+0
-282
+0
-10
+0
-145
+0
-145
+0
-236
+0
-15
+0
-209
+0
-139
+0
-7
+0
-307
+0
-56
+0
-111
+0
-58
+0
-230
+0
-58
+0
-232
+0
-58
+0
-87
+0
-58
+0
-124
+0
-58
+0
-105
+0
-59
+0
-100
+0
-46
+0
-46
+0
-271
+0
-141
+0
-566
+0
-108
+0
-62
+0
-68
+0
-5588
+0
-4019
+0
-372
+0
-126
+0
-331
+0
-21
+0
-74
+0
-377
+0
-1268
+0
-187
+0
-213
+0
-145
+0
-2
+0
-323
+0
-6496
+0
-357
+0
-347
+0
-47
+0
-71
+0
-14
+0
-14
+0
-26
+0
-26
+0
-17
+0
-17
+0
-14
+0
-14
+0
-550
+0
-25
+0
-16351
+0
-301
+0
-9
+40
-0
+504
-0
+894
-0
+703
-0
+291
-0
+750
-0
+76
-0
+750
-0
+52
-0
+153
-0
+30
-0
+88
-0
+8982
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+556
-0
+25
-0
+556
-0
+285
-0
+17
-0
+35
-0
+622
-0
+1268
-0
+187
-0
+213
-0
+145
-0
+2
-0
+161
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+8
-0
+542
-0
+43
-0
+542
-0
+342
-0
+72
-0
+116
-0
+64
-0
+223
-0
+64
-0
+81
-0
+64
-0
+120
-0
+64
-0
+60
-0
+126
-0
+68
-0
+237
-0
+118
-0
+1542
-0
+109
-0
+104
-0
+868
-0
+2094
-0
+1677
-0
+16375
-0
+211
-0
+589
-0
+477
-0
+63
-0
+477
-0
+94
-0
+41
-0
+118
-0
+116
-0
+128
-0
+83
-0
+79
-0
+92
-0
+64
-0
+160
-0
+168
-0
+110
-0
+110
-0
+152
-0
+120
-0
+157
-0
+40
-0
+74
-0
+92
-0
+206
-0
+40
-0
+54
-0
+56
-0
+85
-0
+67
-0
+95
-0
+13
-0
+13
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+590
-0
+125
-0
+590
-0
+310
-0
+367
-0
+360
-0
+249
-0
+206
-0
+443
-0
+50
-0
+362
-0
+588
-0
+15
-0
+19336
-0
+519
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+1
-0
+22
-0
+643
-0
+82
-0
+643
-0
+94
-0
+205
-0
+5532
-0
+61
-0
+190
-0
+113
-0
+193
-0
+88
-0
+3
-0
+98
-0
+125
-0
+389
-0
+992
-0
+149
-0
+130
-0
+26
-0
+26
-0
+314
-0
+243
-0
+3
-0
+78
-0
+50
-0
+118
-0
+258
-0
+193
-0
+81
-0
+140
-0
+96
-0
+94
-0
+376
-0
+69
-0
+78
-0
+163
-0
+14
-0
+105
-0
+105
-0
+26
-0
+73
-0
+4488
-0
+59
-0
+97
-0
+1148
-0
+157
-0
+8896
-0
+8406
-0
+367
-0
+1
-0
+467
-0
+38
-0
+467
-0
+74
-0
+14
-0
+14
-0
+26
-0
+26
-0
+17
-0
+17
-0
+14
-0
+14
-0
+7
-0
+7
-0
+326
-6
+107
-119
+1830
-660
+182
-61
+0
-0
+16
-0
+3
-0
+1
-1
+2
-2
+0
-0
+0
-0
+16
-0
+54
-0
+132
-0
+0
-0
+13
-0
+4273
-0
+52
-0
+136
-0
+35
-0
+267
-0
+26
-0
+72
-0
+38
-0
+245
-0
+28
-0
+13
-0
+0
-0
+20
-0
+20
-0
+9
-0
+15
-0
+13
-0
+17
-0
+0
-0
+0
-0
+0
-0
+0
-35
+0
-0
+0
-19
+0
-0
+0
-38
+0
-10
+0
-20
+0
-4085
+0
-25
+0
-20
+0
-617
+0
-20
+0
-39
+0
-143
+0
-30
+0
-63
+0
-7
+0
-0
+0
-36
+0
-107
+0
-33
+0
-66
+0
-34
+3
-0
+1235
-0
+0
-0
+560
-0
+0
-0
+28
-0
+52
-0
+9
-0
+14
-0
+45
-0
+24
-0
+294
-0
+8
-0
+28
-0
+781
-213
+13
-28
+79
-64
+2
-0
+69
-5
+2
-1
+49
-55
+7
-1
+84
-3
+5
-3
+46
-49
+0
-0
+0
-0
+0
-0
+11
-6
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+4
-4
+1
-1
+1
-1
+1
-1
+18
-7
+1
-1
+34
-14
+1
-1
+2
-1
+10
-15
+5
-5
+1
-1
+2
-2
+2
-2
+0
-3
+1
-1
+13
-13
+1
-1
+6
-3
+1
-1
+1
-3
+1
-1
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+619
-0
+0
-0
+775
-0
+0
-0
+402
-0
+0
-0
+508
-0
+0
-0
+484
-0
+0
-0
+446
-0
+0
-0
+1376
-0
+0
-0
+1185
-0
+0
-0
+594
-0
+0
-0
+1220
-0
+0
-0
+3648
-0
+0
-0
+1727
-0
+0
-0
+727
-0
+0
-0
+543
-0
+0
-0
+1074
-0
+0
-0
+633
-0
+0
-0
+1104
-0
+0
-0
+0
-0
+0
-619
+0
-0
+0
-775
+0
-0
+0
-402
+0
-0
+0
-508
+0
-0
+0
-484
+0
-0
+0
-446
+0
-0
+0
-1376
+0
-0
+0
-1185
+0
-0
+0
-594
+0
-0
+0
-1220
+0
-0
+0
-3648
+0
-0
+0
-1727
+0
-0
+0
-727
+0
-0
+0
-543
+0
-0
+0
-1074
+0
-0
+0
-633
+0
-0
+0
-1104
+0
-0
+0
-0
+1
-1
+4
-3
+0
-0
+2489
-0
+0
-0
+0
-2489
+0
-0
+1
-0
+14
-3
+1
-1
+3
-1
+1
-1
+0
-0
+2127
-0
+0
-0
+0
-2127
+0
-0
+1
-1
+2
-2
+17
-16
+3
-3
+7
-7
+0
-0
+0
-0
+1
-1
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+1
-1
+1
-1
+2
-2
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+45
-20
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+1231
-0
+0
-0
+1040
-0
+0
-0
+2053
-0
+0
-0
+0
-0
+1942
-0
+0
-0
+1311
-0
+0
-0
+0
-0
+1931
-0
+0
-0
+0
-0
+3373
-0
+0
-0
+3922
-0
+0
-0
+0
-0
+897
-0
+0
-0
+754
-0
+0
-0
+998
-0
+0
-0
+749
-0
+0
-0
+0
-0
+1893
-0
+0
-0
+1464
-0
+0
-0
+0
-0
+0
-1231
+0
-0
+0
-1040
+0
-0
+0
-0
+0
-1311
+0
-0
+0
-0
+0
-0
+0
-3373
+0
-0
+0
-3922
+0
-0
+0
-0
+0
-754
+0
-0
+0
-998
+0
-0
+0
-749
+0
-0
+0
-0
+0
-1464
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+3
-3
+6
-6
+6
-6
+1
-0
+7
-7
+3
-1
+4
-3
+1
-1
+13
-12
+1
-3
+1
-1
+1
-1
+14
-7
+3
-1
+9
-15
+1
-1
+5
-5
+5
-4
+2
-1
+13
-13
+2
-1
+13
-13
+16
-14
+1
-1
+2
-4
+24
-29
+2
-1
+25
-29
+1
-1
+20
-14
+1
-1
+1
-1
+4
-4
+1
-1
+8
-5
+11
-10
+1
-1
+1
-1
+1
-1
+9
-3
+10
-10
+0
-2
+1
-0
+1
-1
+2
-1
+9
-14
+1
-1
+2
-2
+12
-11
+5
-0
+14
-16
+1
-1
+6
-1
+1
-0
+1
-1
+6
-6
+1
-1
+2
-2
+2
-2
+2
-2
+1
-3
+2
-2
+6
-4
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
+++ b/Adium.xcodeproj/project.pbxproj Sun Feb 05 17:30:13 2012 -0500
@@ -663,7 +663,7 @@
34D8154213B663650022C8C4 /* AIFacebookXMPPService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153813B663650022C8C4 /* AIFacebookXMPPService.h */; };
34D8154313B663650022C8C4 /* AIFacebookXMPPService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153913B663650022C8C4 /* AIFacebookXMPPService.m */; };
34D8154613B663700022C8C4 /* JSONKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154413B663700022C8C4 /* JSONKit.h */; };
+ 34D8154713B663700022C8C4 /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154513B663700022C8C4 /* JSONKit.m */; settings = {COMPILER_FLAGS = "-DNS_BLOCK_ASSERTIONS"; }; };
34D8154D13B663A80022C8C4 /* auth_fb.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154913B663A80022C8C4 /* auth_fb.c */; };
34D8154E13B663A80022C8C4 /* auth_fb.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154A13B663A80022C8C4 /* auth_fb.h */; };
34D8154F13B663A80022C8C4 /* fbapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154B13B663A80022C8C4 /* fbapi.c */; };
@@ -1114,7 +1114,7 @@
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 */; };
5A94397B1279ECB800FDD81D /* AIImgurImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A94397A1279ECB800FDD81D /* AIImgurImageUploader.m */; };
5A9A9F8911F2951400328DF9 /* AIDoNothingContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8811F2951400328DF9 /* AIDoNothingContactAlertPlugin.m */; };
5A9A9F8B11F295EB00328DF9 /* Stop sign.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8A11F295EB00328DF9 /* Stop sign.png */; };
@@ -1445,8 +1445,8 @@
9718DF46136A2C5200013760 /* AIImageCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9718DF44136A2C5200013760 /* AIImageCollectionView.m */; };
9722ABC813257D7F00CAB486 /* ContactListWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9722ABC713257D7F00CAB486 /* ContactListWindow.xib */; };
9760D24613E49A560031FA1A /* AboutDialog_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 9760D24513E49A560031FA1A /* AboutDialog_bg.png */; };
+ 979AA6A714D59DC8008730DF /* AIBoolToControlTextColorTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = 979AA6A514D59DC8008730DF /* AIBoolToControlTextColorTransformer.h */; settings = {ATTRIBUTES = (); }; };
+ 979AA6A814D59DC8008730DF /* AIBoolToControlTextColorTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 979AA6A614D59DC8008730DF /* AIBoolToControlTextColorTransformer.m */; };
97AF5CDB13191DE200550C41 /* AIContactListUserPictureMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 97AF5CDA13191DE200550C41 /* AIContactListUserPictureMenuController.m */; };
97AF5CF413191E9A00550C41 /* ContactListChangeUserPictureMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 97AF5CF313191E9A00550C41 /* ContactListChangeUserPictureMenu.xib */; };
97E4B4FF13E7490000A8BA53 /* AboutDialog_transp_btm.png in Resources */ = {isa = PBXBuildFile; fileRef = 97E4B4FB13E7490000A8BA53 /* AboutDialog_transp_btm.png */; };
@@ -1623,6 +1623,41 @@
@@ -3253,10 +3288,6 @@
34B82C80085A85D800864531 /* AIChatController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIChatController.m; path = Source/AIChatController.m; sourceTree = "<group>"; };
34B82C89085A87B000864531 /* AdiumMessageEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AdiumMessageEvents.h; path = Source/AdiumMessageEvents.h; sourceTree = "<group>"; };
34B82C8A085A87B000864531 /* AdiumMessageEvents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AdiumMessageEvents.m; path = Source/AdiumMessageEvents.m; sourceTree = "<group>"; };
34B9194A062DEC29004F1223 /* AIPurpleAIMAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIPurpleAIMAccountViewController.m; path = "Plugins/Purple Service/AIPurpleAIMAccountViewController.m"; sourceTree = "<group>"; };
34B9194B062DEC29004F1223 /* AIPurpleAIMAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIPurpleAIMAccountViewController.h; path = "Plugins/Purple Service/AIPurpleAIMAccountViewController.h"; sourceTree = "<group>"; };
34B9197F062DEC99004F1223 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = "Plugins/Purple Service/en.lproj/ESPurpleAIMAccountView.nib"; sourceTree = "<group>"; };
@@ -3968,45 +3999,44 @@
5A7645BB11E0486300E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sk_SK; path = "Plugins/Twitter Plugin/sk_SK.lproj/AITwitterAccountView.nib"; sourceTree = "<group>"; };
5A76477F11E04B8400E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sk_SK; path = "Frameworks/Adium Framework/Resources/sk_SK.lproj/EditStateSheet.nib"; sourceTree = "<group>"; };
5A76478911E04B8F00E5E0AF /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/Localizable.strings; sourceTree = "<group>"; };
+ 5A80CC83121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = Resources/uk.lproj/AccountProxy.nib; sourceTree = "<group>"; };
+ 5A80CC84121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = Resources/uk.lproj/AIAdvancedInspectorPane.nib; sourceTree = "<group>"; };
+ 5A80CC85121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Twitter Plugin/uk.lproj/AITwitterAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC87121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = Resources/uk.lproj/Buttons.strings; sourceTree = "<group>"; };
+ 5A80CC88121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/DCPurpleJabberJoinChatView.nib"; sourceTree = "<group>"; };
+ 5A80CC89121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/DCPurpleMeanwhileJoinChatView.nib"; sourceTree = "<group>"; };
+ 5A80CC8A121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/DCPurpleOscarJoinChatView.nib"; sourceTree = "<group>"; };
+ 5A80CC8B121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/DCPurpleYahooJoinChatView.nib"; sourceTree = "<group>"; };
+ 5A80CC8C121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/DCPurpleZephyrJoinChatView.nib"; sourceTree = "<group>"; };
+ 5A80CC8E121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Frameworks/Adium Framework/Resources/uk.lproj/EditStateSheet.nib"; sourceTree = "<group>"; };
+ 5A80CC8F121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = "Frameworks/Adium Framework/Resources/uk.lproj/EmoticonNames.strings"; sourceTree = "<group>"; };
+ 5A80CC90121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = Resources/uk.lproj/ESFileTransferProgressView.nib; sourceTree = "<group>"; };
+ 5A80CC91121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESIRCAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC92121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESPurpleAIMAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC93121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESPurpleGaduGaduAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC94121F5A7A00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESPurpleICQAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC95121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESPurpleJabberAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC96121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESPurpleMeanwhileAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC97121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESPurpleMSNAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC98121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESPurpleNovellAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC99121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESPurpleSimpleAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC9A121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESPurpleYahooAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC9B121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/ESPurpleZephyrAccountView.nib"; sourceTree = "<group>"; };
+ 5A80CC9D121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = Resources/uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 5A80CC9E121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = Resources/uk.lproj/ListLayoutSheet.nib; sourceTree = "<group>"; };
+ 5A80CC9F121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = Resources/uk.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
+ 5A80CCA0121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = Resources/uk.lproj/Localizable.strings; sourceTree = "<group>"; };
+ 5A80CCA1121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = "Frameworks/Adium Framework/Resources/uk.lproj/Localizable.strings"; sourceTree = "<group>"; };
+ 5A80CCA2121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = "Plugins/Purple Service/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.nib; name = uk; path = Resources/uk.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
+ 5A80CCA7121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = Resources/uk.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
+ 5A80CCA8121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = Resources/uk.lproj/ProxyPasswordPrompt.nib; 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>"; };
+ 5A80CCAB121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = Resources/uk.lproj/Statuses.strings; sourceTree = "<group>"; };
+ 5A80CCAD121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = Resources/uk.lproj/StatusSortConfiguration.nib; sourceTree = "<group>"; };
+ 5A80CCAE121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/WebKit Message View/uk.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
5A9439791279ECB800FDD81D /* AIImgurImageUploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIImgurImageUploader.h; path = "Plugins/Image Uploading Plugin/AIImgurImageUploader.h"; sourceTree = "<group>"; };
5A94397A1279ECB800FDD81D /* AIImgurImageUploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIImgurImageUploader.m; path = "Plugins/Image Uploading Plugin/AIImgurImageUploader.m"; sourceTree = "<group>"; };
5A9A9F8711F2951400328DF9 /* AIDoNothingContactAlertPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIDoNothingContactAlertPlugin.h; sourceTree = "<group>"; };
@@ -4420,7 +4450,6 @@
7E1E8176063A3EEC00EB00F7 /* AIContextMenuTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIContextMenuTextView.h; path = "Frameworks/Adium Framework/Source/AIContextMenuTextView.h"; sourceTree = "<group>"; };
7E1E8177063A3EEC00EB00F7 /* AIContextMenuTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIContextMenuTextView.m; path = "Frameworks/Adium Framework/Source/AIContextMenuTextView.m"; sourceTree = "<group>"; };
7E6F8A93105611B700C6D80D /* libotr.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libotr.framework; path = Frameworks/libotr.framework; sourceTree = "<group>"; };
7E824CCE06387FAF00813072 /* LinkEditor.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = LinkEditor.nib; path = Resources/LinkEditor.nib; sourceTree = SOURCE_ROOT; };
7E824CD106387FAF00813072 /* SHAutoValidatingTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SHAutoValidatingTextView.h; sourceTree = "<group>"; };
7E824CD206387FAF00813072 /* SHAutoValidatingTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SHAutoValidatingTextView.m; sourceTree = "<group>"; };
@@ -4428,21 +4457,9 @@
7E824CD406387FAF00813072 /* SHLinkEditorWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SHLinkEditorWindowController.m; sourceTree = "<group>"; };
7E824CDB06387FAF00813072 /* SHLinkManagementPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SHLinkManagementPlugin.h; sourceTree = "<group>"; };
7E824CDC06387FAF00813072 /* SHLinkManagementPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SHLinkManagementPlugin.m; sourceTree = "<group>"; };
7E959ACF10E3187000C26397 /* AIMathCompatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMathCompatibility.h; path = "Frameworks/AIUtilities Framework/Source/AIMathCompatibility.h"; sourceTree = "<group>"; };
7E9A8CB2104DEBC400F210CC /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = Frameworks/Growl.framework; sourceTree = "<group>"; };
7EC033B114590E0700CF24FB /* MessageWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MessageWindow.xib; path = "Plugins/Dual Window Interface/MessageWindow.xib"; sourceTree = "<group>"; };
811033500CDE170B00EC6038 /* ssl-cdsa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "ssl-cdsa.c"; sourceTree = "<group>"; };
811035170CDE783800EC6038 /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = /System/Library/Frameworks/SecurityInterface.framework; sourceTree = "<absolute>"; };
811036160CDE8A2500EC6038 /* AIPurpleCertificateViewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPurpleCertificateViewer.h; path = "Plugins/Purple Service/AIPurpleCertificateViewer.h"; sourceTree = "<group>"; };
@@ -4475,8 +4492,17 @@
9718DF44136A2C5200013760 /* AIImageCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIImageCollectionView.m; path = "Frameworks/AIUtilities Framework/Source/AIImageCollectionView.m"; sourceTree = "<group>"; };
9722ABC713257D7F00CAB486 /* ContactListWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ContactListWindow.xib; path = Resources/ContactListWindow.xib; sourceTree = "<group>"; };
9760D24513E49A560031FA1A /* AboutDialog_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AboutDialog_bg.png; path = Resources/AboutDialog_bg.png; sourceTree = "<group>"; };
+ 979AA68E14D59C21008730DF /* ShortcutRecorder.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ShortcutRecorder.xcodeproj; path = Frameworks/ShortcutRecorder/ShortcutRecorder.xcodeproj; sourceTree = "<group>"; };
+ 979AA6A514D59DC8008730DF /* AIBoolToControlTextColorTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIBoolToControlTextColorTransformer.h; path = "Frameworks/Adium Framework/Source/AIBoolToControlTextColorTransformer.h"; sourceTree = "<group>"; };
+ 979AA6A614D59DC8008730DF /* AIBoolToControlTextColorTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIBoolToControlTextColorTransformer.m; path = "Frameworks/Adium Framework/Source/AIBoolToControlTextColorTransformer.m"; sourceTree = "<group>"; };
+ 979AA6B214D5A452008730DF /* libglib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libglib.framework; path = Frameworks/libglib.framework; sourceTree = "<group>"; };
+ 979AA6B314D5A452008730DF /* libgmodule.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgmodule.framework; path = Frameworks/libgmodule.framework; sourceTree = "<group>"; };
+ 979AA6B414D5A452008730DF /* libgobject.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgobject.framework; path = Frameworks/libgobject.framework; sourceTree = "<group>"; };
+ 979AA6B514D5A452008730DF /* libgthread.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgthread.framework; path = Frameworks/libgthread.framework; sourceTree = "<group>"; };
+ 979AA6B614D5A452008730DF /* libintl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libintl.framework; path = Frameworks/libintl.framework; sourceTree = "<group>"; };
+ 979AA6B714D5A452008730DF /* libjson-glib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "libjson-glib.framework"; path = "Frameworks/libjson-glib.framework"; sourceTree = "<group>"; };
+ 979AA6B814D5A452008730DF /* libmeanwhile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libmeanwhile.framework; path = Frameworks/libmeanwhile.framework; sourceTree = "<group>"; };
+ 979AA6B914D5A452008730DF /* libpurple.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpurple.framework; path = Frameworks/libpurple.framework; sourceTree = "<group>"; };
97AF5CD913191DE200550C41 /* AIContactListUserPictureMenuController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContactListUserPictureMenuController.h; path = Source/AIContactListUserPictureMenuController.h; sourceTree = "<group>"; };
97AF5CDA13191DE200550C41 /* AIContactListUserPictureMenuController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIContactListUserPictureMenuController.m; path = Source/AIContactListUserPictureMenuController.m; sourceTree = "<group>"; };
97AF5CF313191E9A00550C41 /* ContactListChangeUserPictureMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ContactListChangeUserPictureMenu.xib; path = Resources/ContactListChangeUserPictureMenu.xib; sourceTree = "<group>"; };
@@ -4595,7 +4621,7 @@
D1C1FA6F14995E80008C94EB /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_CN; path = "Plugins/Purple Service/zh_CN.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
D1C1FA7014995E84008C94EB /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = "Plugins/Purple Service/zh_TW.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
D1C1FA7114995E88008C94EB /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sk_SK; path = "Plugins/Purple Service/sk_SK.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
+ D1C1FA7214995E8E008C94EB /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/uk.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
D1F92AE214C3A6F6009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/DCPurpleJabberJoinChatView.nib"; sourceTree = "<group>"; };
D1F92AE414C3A70E009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleJabberAccountView.nib"; sourceTree = "<group>"; };
D1F92AEE14C3A72C009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleAIMAccountView.nib"; sourceTree = "<group>"; };
@@ -4869,23 +4895,6 @@
@@ -5075,30 +5084,8 @@
@@ -5492,8 +5479,8 @@
@@ -6121,7 +6108,6 @@
@@ -8160,6 +8146,65 @@
@@ -8998,7 +9043,7 @@
@@ -9302,7 +9347,7 @@
@@ -9316,6 +9361,10 @@
@@ -9369,6 +9418,41 @@
@@ -9711,7 +9795,7 @@
@@ -10471,7 +10555,7 @@
@@ -10684,7 +10768,7 @@
@@ -10720,7 +10804,7 @@
@@ -10756,7 +10840,7 @@
@@ -10792,7 +10876,7 @@
@@ -10828,7 +10912,7 @@
@@ -10864,7 +10948,7 @@
@@ -10900,7 +10984,7 @@
@@ -10935,7 +11019,7 @@
@@ -10972,7 +11056,7 @@
@@ -11008,7 +11092,7 @@
@@ -11044,7 +11128,7 @@
@@ -11079,7 +11163,7 @@
@@ -11115,7 +11199,7 @@
@@ -11151,7 +11235,7 @@
@@ -11187,7 +11271,7 @@
@@ -11223,7 +11307,7 @@
@@ -11259,7 +11343,7 @@
@@ -11295,7 +11379,7 @@
@@ -11331,7 +11415,7 @@
@@ -11367,7 +11451,7 @@
@@ -11402,7 +11486,7 @@
@@ -11438,7 +11522,7 @@
@@ -11474,7 +11558,7 @@
@@ -11510,7 +11594,7 @@
@@ -11546,7 +11630,7 @@
@@ -11582,7 +11666,7 @@
@@ -11619,7 +11703,7 @@
@@ -11655,7 +11739,7 @@
@@ -11690,7 +11774,7 @@
@@ -11727,7 +11811,7 @@
@@ -11763,7 +11847,7 @@
@@ -11798,7 +11882,7 @@
@@ -11835,7 +11919,7 @@
@@ -11871,7 +11955,7 @@
@@ -11907,7 +11991,7 @@
@@ -11943,7 +12027,7 @@
@@ -11979,7 +12063,7 @@
@@ -12016,7 +12100,7 @@
@@ -12117,7 +12201,7 @@
@@ -12293,6 +12377,7 @@
@@ -12306,6 +12391,7 @@
@@ -12322,6 +12408,7 @@
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-DockIcons.html Sun Feb 05 17:30:13 2012 -0500
@@ -39,7 +39,7 @@
+ <p>More dock icons are available at the <a class="ext_link" href="http://xtras.adium.im/">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .AdiumIcon file that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put it into the correct place for you.</p>
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-EmoticonSets.html Sun Feb 05 17:30:13 2012 -0500
@@ -39,7 +39,7 @@
+ <p>More emoticon sets are available at the <a class="ext_link" href="http://xtras.adium.im/">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .AdiumEmoticonSet file that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put it into the correct place for you.
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-ListLayouts.html Sun Feb 05 17:30:13 2012 -0500
@@ -45,7 +45,7 @@
+ <p>More list layouts are available at the <a class="ext_link" href="http://xtras.adium.im/">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .ListLayout file that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put it into the correct place for you.</p>
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-ListTheme.html Sun Feb 05 17:30:13 2012 -0500
@@ -48,7 +48,7 @@
+ <p>More list themes are available at the <a class="ext_link" href="http://xtras.adium.im/">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .ListLayout file that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put it into the correct place for you.</p>
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-MenuBarIcons.html Sun Feb 05 17:30:13 2012 -0500
@@ -35,7 +35,7 @@
+ <p>More menu bar icons are available at the <a class="ext_link" href="http://xtras.adium.im/">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .AdiumMenuBarIcons file that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put it into the correct place for you.</p>
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-ServiceIcons.html Sun Feb 05 17:30:13 2012 -0500
@@ -34,7 +34,7 @@
+ <p>More emoticon sets are available at the <a class="ext_link" href="http://xtras.adium.im/">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .AdiumServiceIcons file that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put the Xtra into the correct place for you.</p>
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-SoundSets.html Sun Feb 05 17:30:13 2012 -0500
@@ -38,7 +38,7 @@
+ <p>More sound sets are available at the <a class="ext_link" href="http://xtras.adium.im/">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .AdiumSoundSet file that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put it into the correct place for you.</p>
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Sun Feb 05 17:30:13 2012 -0500
@@ -23,7 +23,7 @@
+ <p>To install an Xtra from the <a class="ext_link" href="http://xtras.adium.im/">AdiumXtras website</a>, click the install link on the Xtra's webpage. To install an extra that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put the Xtra into the correct place for you.</p>
+++ b/AdiumHelp/pgs/ContactList-ContactList.html Sun Feb 05 17:30:13 2012 -0500
@@ -57,7 +57,7 @@
+ <p>The contact list shows <a href="ContactList-StatusIcons.html">status icons</a> by default. Its appearance -- including what is displayed in it -- can be configured in many different ways via the Appearance Preferences. Select from built-in list layouts and color themes, download user-created ones from <a href="http://xtras.adium.im">AdiumXtras</a>, or create your own by clicking the Customize buttons there.</p>
+++ b/AdiumHelp/pgs/Messaging-MessageView.html Sun Feb 05 17:30:13 2012 -0500
@@ -40,7 +40,7 @@
+ <p>Hundreds of additional message styles are available from the <a class="ext_link" href="http://xtras.adium.im/">Adium Xtras site</a>, and can be installed by clicking the install link on the Xtra's page. To install a message style that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put it into the correct place for you.</p>
+++ b/AdiumHelp/pgs/Messaging-SendingMessages.html Sun Feb 05 17:30:13 2012 -0500
@@ -54,7 +54,7 @@
+++ b/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html Sun Feb 05 17:30:13 2012 -0500
@@ -32,7 +32,7 @@
+ <p>Yes: The third-party <a href="http://xtras.adium.im/index.php?a=xtras&xtra_id=5011">Skype Plugin</a> allows Adium to use the <a class="ext_link" href="https://developer.skype.com/Docs/ApiDoc">Skype API</a> to display your Skype contacts within Adium and let you chat with them via text-based instant messaging. By the nature of the Skype API, it requires that the Skype program be installed and running.</p>
<p>No: It's not supported natively within Adium (i.e., without a plugin). The library that we use to support most protocols, <a href="http://trac.adium.im/wiki/LibPurple">libpurple</a>, doesn't support Skype at all right now, not even for chat. Until it does Adium most likely won't, either.</p>
<p>Keep in mind that Skype is a proprietary, closed protocol, so it must be reverse-engineered before third-party clients like Pidgin and Adium can use it. Protocols like OSCAR (which AIM and ICQ are based on) and MSN have already been reverse-engineered, but they're much older than Skype, and reverse-engineering is hard. It will take a long time and won't happen at all unless someone chooses to take interest in it and dedicate significant time to the effort.</p>
+++ b/AdiumHelp/pgs/Miscellaneous-SupportOtherOS.html Sun Feb 05 17:30:13 2012 -0500
@@ -40,7 +40,7 @@
<p>If you're using <a class="ext_link" href="http://www.gtk.org/">GTK+</a>, we recommend <a class="ext_link" href="http://pidgin.im/">Pidgin</a>. Adium uses Pidgin's core (libpurple) for most protocols.</p>
+ <p>If you're using <a class="ext_link" href="http://www.kde.org/">KDE</a>, we recommend <a class="ext_link" href="http://kopete.kde.org/">Kopete</a>. Kopete even works with <a href="http://xtras.adium.im/index.php?a=search&cat_id=5">Adium message view styles</a>.</p>
+++ b/ChangeLogs/Changes Between Betas.txt Sun Feb 05 17:30:13 2012 -0500
@@ -1,17 +1,36 @@
+ * Fixed the contact list appearing in a wrong position at startup on Mac OS X Lion (#15341, #15480).
+ * Restored LiveJournal connectivity by removing the hard-coded server name, they have an SRV record now.
+ * Fixed hang which could occur when receiving a message and opening the Transcript Viewer at the same time.
+++ b/ChangeLogs/Changes.txt Sun Feb 05 17:30:13 2012 -0500
@@ -1,8 +1,8 @@