adium 5223:c436f536180f: Added tag adium-1.5.4 for changeset 5ef...
commits at adium.im
commits at adium.im
Sat Nov 10 11:50:12 UTC 2012
details: http://hg.adium.im/adium/rev/c436f536180f
revision: 5223:c436f536180f
branch: adium-1.5.4
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Sat Nov 10 12:45:04 2012 +0100
Added tag adium-1.5.4 for changeset 5efcd11df694
Subject: adium 5224:c4b1a0ac3257: Added tag 1.5.4 for changeset c436f536180f
details: http://hg.adium.im/adium/rev/c4b1a0ac3257
revision: 5224:c4b1a0ac3257
branch: adium-1.5.4
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Sat Nov 10 12:45:34 2012 +0100
Added tag 1.5.4 for changeset c436f536180f
Subject: adium 5225:18dead2e660f: Added tag 1.5.3 for changeset c9b03688370c
details: http://hg.adium.im/adium/rev/18dead2e660f
revision: 5225:18dead2e660f
branch: adium-1.5.3
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Sat Nov 10 12:46:02 2012 +0100
Added tag 1.5.3 for changeset c9b03688370c
diffs (truncated from 384123 to 1000 lines):
diff -r 5efcd11df694 -r 18dead2e660f .hgtags
--- a/.hgtags Sun Nov 04 23:43:44 2012 +0100
+++ b/.hgtags Sat Nov 10 12:46:02 2012 +0100
@@ -1,1 +1,2 @@
4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5
+c9b03688370c2887d956130319c8da537354d373 1.5.3
diff -r 5efcd11df694 -r 18dead2e660f Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Nov 04 23:43:44 2012 +0100
+++ b/Adium.xcodeproj/project.pbxproj Sat Nov 10 12:46:02 2012 +0100
@@ -1389,13 +1389,7 @@
6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; };
6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
6EC1685006C170A000F9FAD3 /* InviteToChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.nib */; };
- 7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
- 7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
- 76731DE215F90538007728C3 /* libgcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; };
- 76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
- 76731DE415F9057F007728C3 /* libgcrypt.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; };
- 76731DE515F90582007728C3 /* libgpgerror.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
76889DEB12D3CA17007AEF00 /* get-info.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEA12D3CA17007AEF00 /* get-info.tiff */; };
76889DEF12D3CA40007AEF00 /* Personal.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEE12D3CA40007AEF00 /* Personal.tiff */; };
76C1AF9C125A906A00D269A9 /* AIAdiumURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C1AF9B125A906A00D269A9 /* AIAdiumURLProtocol.m */; };
@@ -1457,6 +1451,7 @@
9E124DEC07D34C7300AA91C5 /* CBGrowlAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E124DE807D34C7300AA91C5 /* CBGrowlAlertDetailPane.m */; };
9E124DEE07D34C7400AA91C5 /* NEHGrowlPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E124DEA07D34C7300AA91C5 /* NEHGrowlPlugin.m */; };
9E124DF107D34C9100AA91C5 /* GrowlAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9E124DEF07D34C9000AA91C5 /* GrowlAlert.xib */; };
+ 9E124DF207D34C9100AA91C5 /* events-growl-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 9E124DF007D34C9000AA91C5 /* events-growl-alert.tiff */; };
9E125C6607D3571400AA91C5 /* ESBlockingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E125C6407D3571400AA91C5 /* ESBlockingPlugin.m */; };
9E1E1DFD0A96741500E16DFC /* LMX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E1E1DFC0A96741500E16DFC /* LMX.framework */; };
9E1E1E270A96770C00E16DFC /* LMX.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 9E1E1DFC0A96741500E16DFC /* LMX.framework */; };
@@ -1471,7 +1466,6 @@
C4D29CC40C3C2E3C001545A2 /* BGICImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC00C3C2E3C001545A2 /* BGICImportController.m */; };
C4D29CC60C3C2E3C001545A2 /* BGICLogImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */; };
C4D29CC80C3C2E49001545A2 /* ICImport.nib in Resources */ = {isa = PBXBuildFile; fileRef = C4D29CC70C3C2E49001545A2 /* ICImport.nib */; };
- C6BC7F9B15DD666600C5FF52 /* events-notification.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C6BC7F9A15DD666600C5FF52 /* events-notification.tiff */; };
D10A3A2B122C61EF003B5A7E /* msg-source-destination.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D10A3A2A122C61EF003B5A7E /* msg-source-destination.tiff */; };
EE147A6D0896B18800A21377 /* ABSearch.png in Resources */ = {isa = PBXBuildFile; fileRef = EE147A6C0896B18700A21377 /* ABSearch.png */; };
EE147A790896B32400A21377 /* ABSearch.nib in Resources */ = {isa = PBXBuildFile; fileRef = EE147A780896B32400A21377 /* ABSearch.nib */; };
@@ -1643,14 +1637,11 @@
11EE1CD00CDD01120097F246 /* libgmodule.framework in Copy Frameworks */,
11EE1CD10CDD01120097F246 /* libgobject.framework in Copy Frameworks */,
11EE1CD20CDD01120097F246 /* libgthread.framework in Copy Frameworks */,
- 7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */,
11EE1CD30CDD01120097F246 /* libintl.framework in Copy Frameworks */,
11EE1CD40CDD01120097F246 /* libmeanwhile.framework in Copy Frameworks */,
11EE1CD50CDD01120097F246 /* libpurple.framework in Copy Frameworks */,
EE5754ED0B3D7A7A00100989 /* Sparkle.framework in Copy Frameworks */,
377ED0220AE95D7D00CB7BDF /* PSMTabBarControl.framework in Copy Frameworks */,
- 76731DE515F90582007728C3 /* libgpgerror.framework in Copy Frameworks */,
- 76731DE415F9057F007728C3 /* libgcrypt.framework in Copy Frameworks */,
9E1E1E270A96770C00E16DFC /* LMX.framework in Copy Frameworks */,
9719C92F1530EE4800217FBE /* FriBidi.framework in Copy Frameworks */,
9719C9301530EE4800217FBE /* ShortcutRecorder.framework in Copy Frameworks */,
@@ -3542,8 +3533,6 @@
34D369ED08E7544D00E15E40 /* AIColorPickerSliders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIColorPickerSliders.h; path = "Frameworks/Adium Framework/Source/AIColorPickerSliders.h"; sourceTree = "<group>"; };
34D369EE08E7544D00E15E40 /* AIColorPickerSliders.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIColorPickerSliders.m; path = "Frameworks/Adium Framework/Source/AIColorPickerSliders.m"; sourceTree = "<group>"; };
34D43504051ADC10003B2F21 /* DualWindowDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = DualWindowDefaults.plist; path = "Plugins/Dual Window Interface/DualWindowDefaults.plist"; sourceTree = "<group>"; };
- 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "ChatCyclingDefaults-Old.plist"; path = "Resources/ChatCyclingDefaults-Old.plist"; sourceTree = "<group>"; };
- 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = ChatCyclingDefaults.plist; path = Resources/ChatCyclingDefaults.plist; sourceTree = "<group>"; };
34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookXMPPAccount.h; path = "Plugins/Purple Service/AIFacebookXMPPAccount.h"; sourceTree = "<group>"; };
34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIFacebookXMPPAccount.m; path = "Plugins/Purple Service/AIFacebookXMPPAccount.m"; sourceTree = "<group>"; };
34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookXMPPAccountViewController.h; path = "Plugins/Purple Service/AIFacebookXMPPAccountViewController.h"; sourceTree = "<group>"; };
@@ -4531,11 +4520,8 @@
6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvIncomingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m; sourceTree = SOURCE_ROOT; };
6FB330A30C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EKEzvOutgoingFileTransfer.h; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.h; sourceTree = SOURCE_ROOT; };
6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
- 7664EAA4162E086A008CF995 /* libffi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libffi.framework; path = Frameworks/libffi.framework; sourceTree = "<group>"; };
766ABAB41306D1020049FFB7 /* AIUnreadMessagesTooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnreadMessagesTooltip.h; path = Source/AIUnreadMessagesTooltip.h; sourceTree = "<group>"; };
766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIUnreadMessagesTooltip.m; path = Source/AIUnreadMessagesTooltip.m; sourceTree = "<group>"; };
- 76731DE015F90538007728C3 /* libgcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgcrypt.framework; path = Frameworks/libgcrypt.framework; sourceTree = "<group>"; };
- 76731DE115F90538007728C3 /* libgpgerror.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgpgerror.framework; path = Frameworks/libgpgerror.framework; sourceTree = "<group>"; };
76889DEA12D3CA17007AEF00 /* get-info.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info.tiff"; path = "Resources/get-info.tiff"; sourceTree = "<group>"; };
76889DEE12D3CA40007AEF00 /* Personal.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Personal.tiff; path = Resources/Personal.tiff; sourceTree = "<group>"; };
76C1AF9A125A906A00D269A9 /* AIAdiumURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdiumURLProtocol.h; path = "Plugins/WebKit Message View/AIAdiumURLProtocol.h"; sourceTree = "<group>"; };
@@ -4613,6 +4599,7 @@
9E124DE907D34C7300AA91C5 /* NEHGrowlPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NEHGrowlPlugin.h; path = Source/NEHGrowlPlugin.h; sourceTree = "<group>"; };
9E124DEA07D34C7300AA91C5 /* NEHGrowlPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NEHGrowlPlugin.m; path = Source/NEHGrowlPlugin.m; sourceTree = "<group>"; };
9E124DEF07D34C9000AA91C5 /* GrowlAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = GrowlAlert.xib; path = Resources/GrowlAlert.xib; sourceTree = "<group>"; };
+ 9E124DF007D34C9000AA91C5 /* events-growl-alert.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-growl-alert.tiff"; path = "Resources/events-growl-alert.tiff"; sourceTree = "<group>"; };
9E125C6307D3571400AA91C5 /* ESBlockingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESBlockingPlugin.h; path = Source/ESBlockingPlugin.h; sourceTree = "<group>"; };
9E125C6407D3571400AA91C5 /* ESBlockingPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESBlockingPlugin.m; path = Source/ESBlockingPlugin.m; sourceTree = "<group>"; };
9E1E1DFC0A96741500E16DFC /* LMX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LMX.framework; path = Frameworks/LMX.framework; sourceTree = "<group>"; };
@@ -4647,7 +4634,6 @@
C4D29CC10C3C2E3C001545A2 /* BGICLogImportController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BGICLogImportController.h; path = Source/BGICLogImportController.h; sourceTree = SOURCE_ROOT; };
C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = BGICLogImportController.m; path = Source/BGICLogImportController.m; sourceTree = SOURCE_ROOT; };
C4D29CC70C3C2E49001545A2 /* ICImport.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ICImport.nib; path = Resources/ICImport.nib; sourceTree = SOURCE_ROOT; };
- C6BC7F9A15DD666600C5FF52 /* events-notification.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-notification.tiff"; path = "Resources/events-notification.tiff"; sourceTree = "<group>"; };
D10A3A2A122C61EF003B5A7E /* msg-source-destination.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-source-destination.tiff"; path = "Resources/msg-source-destination.tiff"; sourceTree = "<group>"; };
D182F1B411DFF23700E33AE2 /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D182F1B611DFF23700E33AE2 /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/schema.strings; sourceTree = "<group>"; };
@@ -4886,9 +4872,6 @@
34C846AF101E515900140B4B /* QTKit.framework in Frameworks */,
9719C92C1530EDF700217FBE /* FriBidi.framework in Frameworks */,
9719C92E1530EE0C00217FBE /* ShortcutRecorder.framework in Frameworks */,
- 76731DE215F90538007728C3 /* libgcrypt.framework in Frameworks */,
- 76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */,
- 7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6783,8 +6766,6 @@
children = (
34BFE20007E8E11500AD984D /* AIChatCyclingPlugin.m */,
34BFE20107E8E11500AD984D /* AIChatCyclingPlugin.h */,
- 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */,
- 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */,
);
name = "Chat Cycling";
sourceTree = "<group>";
@@ -7359,10 +7340,10 @@
children = (
9E124DE707D34C7300AA91C5 /* CBGrowlAlertDetailPane.h */,
9E124DE807D34C7300AA91C5 /* CBGrowlAlertDetailPane.m */,
+ 9E124DEF07D34C9000AA91C5 /* GrowlAlert.xib */,
+ 9E124DF007D34C9000AA91C5 /* events-growl-alert.tiff */,
9E124DE907D34C7300AA91C5 /* NEHGrowlPlugin.h */,
9E124DEA07D34C7300AA91C5 /* NEHGrowlPlugin.m */,
- 9E124DEF07D34C9000AA91C5 /* GrowlAlert.xib */,
- C6BC7F9A15DD666600C5FF52 /* events-notification.tiff */,
);
name = Growl;
sourceTree = "<group>";
@@ -8246,9 +8227,6 @@
979AA6A914D59EF3008730DF /* Others */ = {
isa = PBXGroup;
children = (
- 7664EAA4162E086A008CF995 /* libffi.framework */,
- 76731DE015F90538007728C3 /* libgcrypt.framework */,
- 76731DE115F90538007728C3 /* libgpgerror.framework */,
3496A8E707CE6CA30055BBAB /* AutoHyperlinks.framework.xcodeproj */,
9719C92B1530EDF700217FBE /* FriBidi.framework */,
7E9A8CB2104DEBC400F210CC /* Growl.framework */,
@@ -9670,6 +9648,7 @@
342838EE07D2D004004F01C9 /* Shared Dock Icon Images in Resources */,
4BB5B78207D2DC4900CFE06F /* pref-status.tiff in Resources */,
9E124DF107D34C9100AA91C5 /* GrowlAlert.xib in Resources */,
+ 9E124DF207D34C9100AA91C5 /* events-growl-alert.tiff in Resources */,
34A6F68507D65D6200972830 /* GeneralPreferences.nib in Resources */,
34A6FB2607D6F97B00972830 /* EventSoundContactAlert.nib in Resources */,
34A6FB2D07D6F98600972830 /* events-sound-alert.tiff in Resources */,
@@ -9826,7 +9805,6 @@
7EC033B214590E0700CF24FB /* MessageWindow.xib in Resources */,
97F7B38014E29BC500A0F6F8 /* facebook-small.png in Resources */,
97F7B38114E29BC500A0F6F8 /* facebook.png in Resources */,
- C6BC7F9B15DD666600C5FF52 /* events-notification.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r 5efcd11df694 -r 18dead2e660f AdiumHelp/pgs/Messaging-SendingMessages.html
--- a/AdiumHelp/pgs/Messaging-SendingMessages.html Sun Nov 04 23:43:44 2012 +0100
+++ b/AdiumHelp/pgs/Messaging-SendingMessages.html Sat Nov 10 12:46:02 2012 +0100
@@ -57,22 +57,6 @@
<p>Adium doesn't natively support direct HTML entry; you will need the <a class="ext_link" href="http://xtras.adium.im/index.php?a=xtras&xtra_id=1260">Raw HTML</a> script from the AdiumXtras website.</p>
</div>
</div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Push/pop</h3>
- </div>
- <div class="taskboxtext">
- <p>Adium can buffer text which you might send as a message later.</p>
- <ul>
- <li>To buffer something you have typed press ctrl-down (^↓). Pressing ctrl-up (^↑) displays the buffered text. You can buffer multiple bits of text. The ctrl-option-down/up (^⌥↓, ^⌥↑) and ctrl-cmd-down/up (^⌘↓, ^⌘↑) shortcuts also work, respectively.</li>
- <li>ctrl-s (^s) swaps the input line with the top of the stack, i.e. the text you text you buffered last. crtl-opt-s (^⌥s) and ctrl-cmd-s (^⌘s) also work.
- </ul>
- <p>Adium buffers previously sent messages</p>
- <ul>
- <li>Use option-up (⌥↑) to scroll through messages you have sent.</li>
- </ul>
- </div>
- </div>
</div>
<script type="text/javascript" src="../js/help.js"></script>
</body>
diff -r 5efcd11df694 -r 18dead2e660f ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Sun Nov 04 23:43:44 2012 +0100
+++ b/ChangeLogs/Changes.txt Sat Nov 10 12:46:02 2012 +0100
@@ -1,18 +1,5 @@
Adium Version History
-----------------------
-Version 1.5.4 (11/4/2012)
- * Updated the included Growl SDK to 2.0, adding support for Notification Center on 10.8 if Growl is not installed. (#15867)
- * Updated libotr to 3.2.1, fixing a security vulnerability. (#16122)
- * Updated libpurple to 2.10.6.
- * Changed the default tab switching shortcuts for new users to Control-Tab/Control-Shift-Tab, to match Safari. (#16102)
- * Improved disk usage: limit the tracking of the "last seen" time to contacts who are on your contact list.
- * Fixed a problem where accepting a group chat invite on Sametime 8.5.1 would crash Adium. (Jonathan Rice and Jere Krischel) (#16114)
- * Fixed a problem where accepting a group chat invite on HipChat's XMPP server would crash Adium. (#16007)
- * Fixed a problem preventing Adium from executing Applescripts when Gatekeeper is enabled.
- * Added routines to make Secure Transport (on 10.8 and above) work around buggy TLS implementations in certain older XMPP servers. (#16081)
- * Updated translations: British English, Czech, Danish (#16196), Dutch (#16220), French (#16207), Italian (#16218), Norwegian (Bokmål) (#16219), Portuguese (Portugal) (#16211), Slovakian (#16194), Turkish.
-
-
Version 1.5.3 (8/12/2012)
* Fixed another problem with the transcript viewer causing search to fail when closing and reopening the window. (#13586, #15699)
* Fixed a problem with iTunes 10.6.3 on Mac OS X 10.6.8 causing the chat window's toolbar to break. (#16046)
@@ -22,7 +9,7 @@
* Icons set for group chat bookmarks will now show up on the tab bar in the chat window. (Andreas Marienborg) (#14484)
* Fixed tables not being declared as such via VoiceOver. (Marco Zehe) (#16085)
* Fixed a problem with emoticons scaling disproportionately in the yMous message style when using OS X 10.8.
- * Improved memory usage slightly.
+ * Improved memory use slightly.
Version 1.5.2 (7/21/2012)
diff -r 5efcd11df694 -r 18dead2e660f Copyright.txt
--- a/Copyright.txt Sun Nov 04 23:43:44 2012 +0100
+++ b/Copyright.txt Sat Nov 10 12:46:02 2012 +0100
@@ -62,7 +62,6 @@
Eitan Konigsburg
Alexander Kolov
Ian Krieg
-Jere Krischel
Thomas Kunze
Gayle Laakmann
Scott Lamb
@@ -93,7 +92,6 @@
Matthew Plough
Stephen Poprocki
Xavid Pretzer
-Jonathan Rice
Eric Richie
Eion Robb
Jesse Rusak
diff -r 5efcd11df694 -r 18dead2e660f Dependencies/build.sh
--- a/Dependencies/build.sh Sun Nov 04 23:43:44 2012 +0100
+++ b/Dependencies/build.sh Sat Nov 10 12:46:02 2012 +0100
@@ -162,8 +162,8 @@
eval `$DEVELOPER/usr/bin/pump --startup`
else
# Try to find the right gcc, even when XCode4 is installed
- export CC="xcrun clang"
- export CXX="xcrun clang"
+ export CC="gcc"
+ export CXX="gcc"
export CCAS="$CC"
export OBJC="$CC"
fi
diff -r 5efcd11df694 -r 18dead2e660f Dependencies/patches/Meanwhile-glib_headers.diff
--- a/Dependencies/patches/Meanwhile-glib_headers.diff Sun Nov 04 23:43:44 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,257 +0,0 @@
-diff -r -u meanwhile-1.0.2-orig/samples/logging_proxy.c meanwhile-1.0.2/samples/logging_proxy.c
---- meanwhile-1.0.2-orig/samples/logging_proxy.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/samples/logging_proxy.c 2012-10-16 22:02:36.000000000 +0200
-@@ -25,7 +25,6 @@
- #include <unistd.h>
-
- #include <glib.h>
--#include <glib/glist.h>
-
- #include <mw_cipher.h>
- #include <mw_common.h>
-diff -r -u meanwhile-1.0.2-orig/samples/login_server.c meanwhile-1.0.2/samples/login_server.c
---- meanwhile-1.0.2-orig/samples/login_server.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/samples/login_server.c 2012-10-16 22:02:23.000000000 +0200
-@@ -19,7 +19,6 @@
- #include <unistd.h>
-
- #include <glib.h>
--#include <glib/glist.h>
-
- #include <mw_cipher.h>
- #include <mw_common.h>
-diff -r -u meanwhile-1.0.2-orig/samples/nocipher_proxy.c meanwhile-1.0.2/samples/nocipher_proxy.c
---- meanwhile-1.0.2-orig/samples/nocipher_proxy.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/samples/nocipher_proxy.c 2012-10-16 22:02:56.000000000 +0200
-@@ -29,7 +29,6 @@
- #include <unistd.h>
-
- #include <glib.h>
--#include <glib/glist.h>
-
- #include <mw_common.h>
- #include <mw_message.h>
-diff -r -u meanwhile-1.0.2-orig/samples/redirect_server.c meanwhile-1.0.2/samples/redirect_server.c
---- meanwhile-1.0.2-orig/samples/redirect_server.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/samples/redirect_server.c 2012-10-16 22:02:48.000000000 +0200
-@@ -22,7 +22,6 @@
- #include <unistd.h>
-
- #include <glib.h>
--#include <glib/glist.h>
-
- #include <mw_common.h>
- #include <mw_message.h>
-diff -r -u meanwhile-1.0.2-orig/src/channel.c meanwhile-1.0.2/src/channel.c
---- meanwhile-1.0.2-orig/src/channel.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/channel.c 2012-10-16 22:03:01.000000000 +0200
-@@ -19,8 +19,6 @@
- */
-
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
- #include <string.h>
-
- #include "mw_channel.h"
-diff -r -u meanwhile-1.0.2-orig/src/mw_debug.c meanwhile-1.0.2/src/mw_debug.c
---- meanwhile-1.0.2-orig/src/mw_debug.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/mw_debug.c 2012-10-16 22:03:06.000000000 +0200
-@@ -19,7 +19,7 @@
- */
-
-
--#include <glib/gstring.h>
-+#include <glib.h>
-
- #include "mw_debug.h"
-
-diff -r -u meanwhile-1.0.2-orig/src/mw_message.h meanwhile-1.0.2/src/mw_message.h
---- meanwhile-1.0.2-orig/src/mw_message.h 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/mw_message.h 2012-10-16 22:03:09.000000000 +0200
-@@ -22,7 +22,7 @@
- #define _MW_MESSAGE_H
-
-
--#include <glib/glist.h>
-+#include <glib.h>
- #include "mw_common.h"
-
-
-diff -r -u meanwhile-1.0.2-orig/src/mw_srvc_conf.h meanwhile-1.0.2/src/mw_srvc_conf.h
---- meanwhile-1.0.2-orig/src/mw_srvc_conf.h 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/mw_srvc_conf.h 2012-10-16 22:03:17.000000000 +0200
-@@ -22,7 +22,7 @@
- #define _MW_SRVC_CONF_H
-
-
--#include <glib/glist.h>
-+#include <glib.h>
- #include "mw_common.h"
-
-
-diff -r -u meanwhile-1.0.2-orig/src/mw_srvc_dir.h meanwhile-1.0.2/src/mw_srvc_dir.h
---- meanwhile-1.0.2-orig/src/mw_srvc_dir.h 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/mw_srvc_dir.h 2012-10-16 22:03:35.000000000 +0200
-@@ -22,7 +22,6 @@
-
-
- #include <glib.h>
--#include <glib/glist.h>
-
-
- #ifdef __cplusplus
-diff -r -u meanwhile-1.0.2-orig/src/mw_srvc_place.h meanwhile-1.0.2/src/mw_srvc_place.h
---- meanwhile-1.0.2-orig/src/mw_srvc_place.h 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/mw_srvc_place.h 2012-10-16 22:03:40.000000000 +0200
-@@ -22,7 +22,7 @@
- #define _MW_SRVC_PLACE_H
-
-
--#include <glib/glist.h>
-+#include <glib.h>
- #include "mw_common.h"
-
-
-diff -r -u meanwhile-1.0.2-orig/src/mw_srvc_resolve.h meanwhile-1.0.2/src/mw_srvc_resolve.h
---- meanwhile-1.0.2-orig/src/mw_srvc_resolve.h 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/mw_srvc_resolve.h 2012-10-16 22:03:44.000000000 +0200
-@@ -23,7 +23,6 @@
-
-
- #include <glib.h>
--#include <glib/glist.h>
-
-
- #ifdef __cplusplus
-diff -r -u meanwhile-1.0.2-orig/src/mw_st_list.h meanwhile-1.0.2/src/mw_st_list.h
---- meanwhile-1.0.2-orig/src/mw_st_list.h 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/mw_st_list.h 2012-10-16 22:03:48.000000000 +0200
-@@ -30,7 +30,6 @@
-
-
- #include <glib.h>
--#include <glib/glist.h>
- #include "mw_common.h"
-
-
-diff -r -u meanwhile-1.0.2-orig/src/mw_util.h meanwhile-1.0.2/src/mw_util.h
---- meanwhile-1.0.2-orig/src/mw_util.h 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/mw_util.h 2012-10-16 22:03:51.000000000 +0200
-@@ -23,8 +23,6 @@
-
-
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
-
-
- #define map_guint_new() \
-diff -r -u meanwhile-1.0.2-orig/src/srvc_aware.c meanwhile-1.0.2/src/srvc_aware.c
---- meanwhile-1.0.2-orig/src/srvc_aware.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/srvc_aware.c 2012-10-16 22:03:58.000000000 +0200
-@@ -19,8 +19,6 @@
- */
-
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
- #include <string.h>
-
- #include "mw_channel.h"
-diff -r -u meanwhile-1.0.2-orig/src/srvc_conf.c meanwhile-1.0.2/src/srvc_conf.c
---- meanwhile-1.0.2-orig/src/srvc_conf.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/srvc_conf.c 2012-10-16 22:04:01.000000000 +0200
-@@ -19,8 +19,6 @@
- */
-
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -r -u meanwhile-1.0.2-orig/src/srvc_dir.c meanwhile-1.0.2/src/srvc_dir.c
---- meanwhile-1.0.2-orig/src/srvc_dir.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/srvc_dir.c 2012-10-16 22:04:07.000000000 +0200
-@@ -18,7 +18,7 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include <glib/ghash.h>
-+#include <glib.h>
-
- #include "mw_channel.h"
- #include "mw_common.h"
-diff -r -u meanwhile-1.0.2-orig/src/srvc_ft.c meanwhile-1.0.2/src/srvc_ft.c
---- meanwhile-1.0.2-orig/src/srvc_ft.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/srvc_ft.c 2012-10-16 22:04:12.000000000 +0200
-@@ -19,7 +19,7 @@
- */
-
-
--#include <glib/glist.h>
-+#include <glib.h>
-
- #include "mw_channel.h"
- #include "mw_common.h"
-diff -r -u meanwhile-1.0.2-orig/src/srvc_im.c meanwhile-1.0.2/src/srvc_im.c
---- meanwhile-1.0.2-orig/src/srvc_im.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/srvc_im.c 2012-10-16 22:04:18.000000000 +0200
-@@ -19,7 +19,6 @@
- */
-
- #include <glib.h>
--#include <glib/glist.h>
- #include <string.h>
-
- #include "mw_channel.h"
-diff -r -u meanwhile-1.0.2-orig/src/srvc_place.c meanwhile-1.0.2/src/srvc_place.c
---- meanwhile-1.0.2-orig/src/srvc_place.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/srvc_place.c 2012-10-16 22:04:23.000000000 +0200
-@@ -19,8 +19,6 @@
- */
-
- #include <glib.h>
--#include <glib/ghash.h>
--#include <glib/glist.h>
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -r -u meanwhile-1.0.2-orig/src/srvc_resolve.c meanwhile-1.0.2/src/srvc_resolve.c
---- meanwhile-1.0.2-orig/src/srvc_resolve.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/srvc_resolve.c 2012-10-16 22:04:27.000000000 +0200
-@@ -18,7 +18,7 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include <glib/ghash.h>
-+#include <glib.h>
-
- #include "mw_channel.h"
- #include "mw_common.h"
-diff -r -u meanwhile-1.0.2-orig/src/srvc_store.c meanwhile-1.0.2/src/srvc_store.c
---- meanwhile-1.0.2-orig/src/srvc_store.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/srvc_store.c 2012-10-16 22:04:31.000000000 +0200
-@@ -18,7 +18,7 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include <glib/glist.h>
-+#include <glib.h>
-
- #include "mw_channel.h"
- #include "mw_debug.h"
-diff -r -u meanwhile-1.0.2-orig/src/st_list.c meanwhile-1.0.2/src/st_list.c
---- meanwhile-1.0.2-orig/src/st_list.c 2012-10-16 22:02:02.000000000 +0200
-+++ meanwhile-1.0.2/src/st_list.c 2012-10-16 22:04:36.000000000 +0200
-@@ -20,7 +20,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#include <glib/gstring.h>
-+#include <glib.h>
-
- #include "mw_debug.h"
- #include "mw_util.h"
-
diff -r 5efcd11df694 -r 18dead2e660f Dependencies/patches/Meanwhile-session.c.diff
--- a/Dependencies/patches/Meanwhile-session.c.diff Sun Nov 04 23:43:44 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- src/session.c 2005-12-15 14:11:47.000000000 -0600
-+++ src/session.c 2012-08-22 08:40:54.043701375 -0500
-@@ -448,6 +448,8 @@
- property_set(s, mwSession_SERVER_VER_MAJOR, GPOINTER(msg->major), NULL);
- property_set(s, mwSession_SERVER_VER_MINOR, GPOINTER(msg->minor), NULL);
-
-+ g_info("Sametime server version (major/minor): 0x%x / 0x%x", msg->major, msg->minor);
-+
- /* compose the login message */
- log = (struct mwMsgLogin *) mwMessage_new(mwMessage_LOGIN);
- log->login_type = GUINT(property_get(s, mwSession_CLIENT_TYPE_ID));
\ No newline at end of file
diff -r 5efcd11df694 -r 18dead2e660f Dependencies/patches/Meanwhile-srvc_place.c.diff
--- a/Dependencies/patches/Meanwhile-srvc_place.c.diff Sun Nov 04 23:43:44 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
---- src/srvc_place.c 2005-12-02 18:00:29.000000000 -0800
-+++ src/srvc_place.c 2012-08-21 19:39:32.000000000 -0700
-@@ -39,6 +39,16 @@
- #define PROTOCOL_TYPE 0x00
- #define PROTOCOL_VER 0x05
-
-+/*
-+ As of Sametime ~v8.5, there's a slightly different group chat invite message.
-+ This identifies the earliest server version using the new format. Currently,
-+ it's set for 8.5.1. If other people are having issues, we'll need to decrease
-+ this to their version.
-+*/
-+#define NEW_FORMAT_SERVER_VER_MAJOR 0x001e
-+#define NEW_FORMAT_SERVER_VER_MINOR 0x213f
-+
-+#define GUINT(val) (GPOINTER_TO_UINT((val)))
-
- enum incoming_msg {
- msg_in_JOIN_RESPONSE = 0x0000, /* ? */
-@@ -165,6 +175,7 @@
- guint16 login_type;
- guint32 unknown_a;
- guint32 unknown_b;
-+ char *extraname;
- };
-
-
-@@ -189,6 +200,7 @@
- mwIdBlock_clear(&p->idb);
- g_free(p->login_id);
- g_free(p->name);
-+ g_free(p->extraname);
- g_free(p);
- }
-
-@@ -394,6 +406,9 @@
- guint16_get(b, &pm->login_type);
- guint32_get(b, &pm->unknown_a);
- guint32_get(b, &pm->unknown_b);
-+ /* TODO: Since the Notes upgrade, an extra name string is sent to
-+ recv_SECTION_LIST(). It might be sent here, but since we're only
-+ parsing one user, it probably doesn't matter here. */
-
- PUT_MEMBER(place, pm);
- if(srvc->handler && srvc->handler->peerJoined)
-@@ -519,8 +534,18 @@
-
- static int recv_SECTION_LIST(struct mwPlace *place,
- struct mwGetBuffer *b) {
-- int ret = 0;
-+ int ret = 0, major, minor;
- guint32 sec, count;
-+ struct mwSession *session;
-+ gboolean newMsgFormat;
-+
-+ /* Check the server version to see if the message uses the new format */
-+ session = mwService_getSession(MW_SERVICE(place->service));
-+ major = GUINT(mwSession_getProperty(session, mwSession_SERVER_VER_MAJOR));
-+ minor = GUINT(mwSession_getProperty(session, mwSession_SERVER_VER_MINOR));
-+ newMsgFormat = (major == NEW_FORMAT_SERVER_VER_MAJOR
-+ && minor >= NEW_FORMAT_SERVER_VER_MINOR)
-+ || major > NEW_FORMAT_SERVER_VER_MAJOR;
-
- mwGetBuffer_advance(b, 4);
- guint32_get(b, &sec);
-@@ -545,6 +570,10 @@
- guint32_get(b, &m->unknown_a);
- guint32_get(b, &m->unknown_b);
-
-+ if(newMsgFormat) {
-+ mwString_get(b, &m->extraname);
-+ }
-+
- PUT_MEMBER(place, m);
- }
-
-@@ -1072,4 +1101,4 @@
- void mwPlace_removeClientData(struct mwPlace *place) {
- g_return_if_fail(place != NULL);
- mw_datum_clear(&place->client_data);
--}
-+}
diff -r 5efcd11df694 -r 18dead2e660f Dependencies/patches/gettext-Makefile.in.diff
--- a/Dependencies/patches/gettext-Makefile.in.diff Sun Nov 04 23:43:44 2012 +0100
+++ b/Dependencies/patches/gettext-Makefile.in.diff Sat Nov 10 12:46:02 2012 +0100
@@ -1,11 +1,11 @@
---- gettext-tools/Makefile.in.orig 2010-06-03 16:38:55.000000000 -0500
-+++ gettext-tools/Makefile.in 2010-06-04 01:16:07.000000000 -0500
-@@ -1248,7 +1248,7 @@
+--- gettext-tools/Makefile.in 2010-11-14 21:31:55.000000000 -0800
++++ gettext-tools/Makefile.in.orig 2006-11-27 09:34:56.000000000 -0800
+@@ -484,7 +484,7 @@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
-+SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles m4
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
+-SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
++SUBDIRS = intl gnulib-lib libgrep libuniname src libgettextpo po projects m4
# Allow users to use "gnulib-tool --update".
diff -r 5efcd11df694 -r 18dead2e660f Dependencies/phases/build_dependencies.sh
--- a/Dependencies/phases/build_dependencies.sh Sun Nov 04 23:43:44 2012 +0100
+++ b/Dependencies/phases/build_dependencies.sh Sat Nov 10 12:46:02 2012 +0100
@@ -140,11 +140,6 @@
# The provided libtool ignores our Universal Binary-makin' flags
fwdpatch "$ROOTDIR/patches/Meanwhile-ltmain.sh.diff" -p0 || true
-
- # Fixes accepting group chat invites from the standard Sametime client.
- # Thanks to Jere Krischel and Jonathan Rice.
- fwdpatch "$ROOTDIR/patches/Meanwhile-srvc_place.c.diff" -p0 || true
- fwdpatch "$ROOTDIR/patches/Meanwhile-session.c.diff" -p0 || true
if needsconfigure $@; then
(
@@ -178,8 +173,6 @@
revpatch "$ROOTDIR/patches/Meanwhile-st_list.c.diff" -p0
revpatch "$ROOTDIR/patches/Meanwhile-common.c.diff" -p0
revpatch "$ROOTDIR/patches/Meanwhile-srvc_ft.c.diff" -p0
- revpatch "$ROOTDIR/patches/Meanwhile-srvc_place.c.diff" -p0
- revpatch "$ROOTDIR/patches/Meanwhile-session.c.diff" -p0
quiet popd
}
diff -r 5efcd11df694 -r 18dead2e660f Frameworks/AIUtilities Framework/Resources/cs.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/cs.lproj/Localizable.strings has changed
diff -r 5efcd11df694 -r 18dead2e660f Frameworks/AIUtilities Framework/Resources/da.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/da.lproj/Localizable.strings has changed
diff -r 5efcd11df694 -r 18dead2e660f Frameworks/AIUtilities Framework/Resources/fr.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/fr.lproj/Localizable.strings has changed
diff -r 5efcd11df694 -r 18dead2e660f Frameworks/AIUtilities Framework/Resources/nb.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/nb.lproj/Localizable.strings has changed
diff -r 5efcd11df694 -r 18dead2e660f Frameworks/AIUtilities Framework/Resources/nl.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/nl.lproj/Localizable.strings has changed
diff -r 5efcd11df694 -r 18dead2e660f Frameworks/AIUtilities Framework/Resources/pt_PT.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/pt_PT.lproj/Localizable.strings has changed
diff -r 5efcd11df694 -r 18dead2e660f Frameworks/AIUtilities Framework/Resources/sk_SK.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/sk_SK.lproj/Localizable.strings has changed
diff -r 5efcd11df694 -r 18dead2e660f Frameworks/AIUtilities Framework/Resources/tr.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/tr.lproj/Localizable.strings has changed
diff -r 5efcd11df694 -r 18dead2e660f Frameworks/Adium Framework/Resources/cs.lproj/EditStateSheet.nib/designable.nib
--- a/Frameworks/Adium Framework/Resources/cs.lproj/EditStateSheet.nib/designable.nib Sun Nov 04 23:43:44 2012 +0100
+++ b/Frameworks/Adium Framework/Resources/cs.lproj/EditStateSheet.nib/designable.nib Sat Nov 10 12:46:02 2012 +0100
@@ -2,32 +2,32 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1070</int>
- <string key="IBDocument.SystemVersion">11G63</string>
- <string key="IBDocument.InterfaceBuilderVersion">2843</string>
- <string key="IBDocument.AppKitVersion">1138.51</string>
- <string key="IBDocument.HIToolboxVersion">569.00</string>
+ <string key="IBDocument.SystemVersion">12A154q</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2429</string>
+ <string key="IBDocument.AppKitVersion">1162.3</string>
+ <string key="IBDocument.HIToolboxVersion">604.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2843</string>
+ <string key="NS.object.0">2429</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>NSStepperCell</string>
+ <string>NSPopUpButtonCell</string>
+ <string>NSScroller</string>
+ <string>NSPopUpButton</string>
+ <string>NSButton</string>
+ <string>NSMenu</string>
+ <string>NSScrollView</string>
+ <string>NSButtonCell</string>
+ <string>NSTextFieldCell</string>
<string>NSBox</string>
- <string>NSButton</string>
- <string>NSButtonCell</string>
+ <string>NSMenuItem</string>
<string>NSCustomObject</string>
- <string>NSMenu</string>
- <string>NSMenuItem</string>
- <string>NSPopUpButton</string>
- <string>NSPopUpButtonCell</string>
- <string>NSScrollView</string>
- <string>NSScroller</string>
- <string>NSStepper</string>
- <string>NSStepperCell</string>
- <string>NSTextField</string>
- <string>NSTextFieldCell</string>
<string>NSTextView</string>
<string>NSView</string>
<string>NSWindowTemplate</string>
+ <string>NSStepper</string>
+ <string>NSTextField</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -49,7 +49,7 @@
<object class="NSWindowTemplate" id="423516752">
<int key="NSWindowStyleMask">3</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{297, 228}, {403, 529}}</string>
+ <string key="NSWindowRect">{{297, 228}, {403, 496}}</string>
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">Vlastní stav</string>
<string key="NSWindowClass">NSWindow</string>
@@ -68,7 +68,6 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{305, 12}, {84, 32}}</string>
<reference key="NSSuperview" ref="509876344"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="727255828">
<int key="NSCellFlags">67108864</int>
@@ -92,13 +91,13 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="454589821">
<reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{221, 12}, {84, 32}}</string>
<reference key="NSSuperview" ref="509876344"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="732367146">
<int key="NSCellFlags">67108864</int>
@@ -114,18 +113,18 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="1015368611">
<reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{12, 140}, {347, 18}}</string>
+ <string key="NSFrame">{{12, 107}, {347, 18}}</string>
<reference key="NSSuperview" ref="509876344"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="215150478">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Přejít do stavu „Nepřítomen“ ihned za:</string>
+ <string key="NSContents">Přejít do stavu nepřítomen ihned</string>
<reference key="NSSupport" ref="321541240"/>
<reference key="NSControlView" ref="1015368611"/>
<int key="NSButtonFlags">1211912448</int>
@@ -142,13 +141,13 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="762602674">
<reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{12, 285}, {373, 18}}</string>
+ <string key="NSFrame">{{12, 252}, {373, 18}}</string>
<reference key="NSSuperview" ref="509876344"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="950289041">
<int key="NSCellFlags">67108864</int>
@@ -165,18 +164,18 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="873668146">
<reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{35, 263}, {350, 18}}</string>
+ <string key="NSFrame">{{35, 230}, {350, 18}}</string>
<reference key="NSSuperview" ref="509876344"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1020350936">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Vlastní automatická odpověď:</string>
+ <string key="NSContents">S vlastní automatickou odpovědí:</string>
<reference key="NSSupport" ref="321541240"/>
<reference key="NSControlView" ref="873668146"/>
<int key="NSButtonFlags">1211912448</int>
@@ -188,6 +187,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSScrollView" id="459354381">
<reference key="NSNextResponder" ref="509876344"/>
@@ -200,28 +200,8 @@
<object class="NSTextView" id="159678567">
<reference key="NSNextResponder" ref="891957801"/>
<int key="NSvFlags">2322</int>
- <set class="NSMutableSet" key="NSDragTypes">
- <string>Apple HTML pasteboard type</string>
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>Apple URL pasteboard type</string>
- <string>CorePasteboardFlavorType 0x6D6F6F76</string>
- <string>NSColor pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NSStringPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT RTFD pasteboard type</string>
- <string>NeXT Rich Text Format v1.0 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- <string>NeXT font pasteboard type</string>
- <string>NeXT ruler pasteboard type</string>
- <string>WebURLsWithTitlesPboardType</string>
- <string>public.url</string>
- </set>
- <string key="NSFrameSize">{344, 14}</string>
+ <string key="NSFrame">{{0, 77}, {344, 14}}</string>
<reference key="NSSuperview" ref="891957801"/>
- <reference key="NSWindow"/>
<object class="NSTextContainer" key="NSTextContainer" id="1027022442">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -292,7 +272,6 @@
</array>
<string key="NSFrame">{{1, 1}, {344, 91}}</string>
<reference key="NSSuperview" ref="459354381"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="159678567"/>
<reference key="NSDocView" ref="159678567"/>
<reference key="NSBGColor" ref="911429596"/>
@@ -306,10 +285,14 @@
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAAAHCAFUqgBVKsAAAAwdVQUqwaEQeIRGJRGFlYqwWLQ+JxuOQpVRmEx2RROKwOQyOUQSPyaUym
-SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAOAQAAAwAA
+SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAPAQAAAwAA
AAEAEAAAAQEAAwAAAAEAEAAAAQIAAwAAAAIACAAIAQMAAwAAAAEABQAAAQYAAwAAAAEAAQAAAREABAAA
AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA
-AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
+AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABArwAAQAAAMQAAAEqAAAAADx4
+OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4K
+ICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50
+YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+
+CjwveDp4bXBtZXRhPgo</bytes>
</object>
</object>
</array>
@@ -327,7 +310,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-30, 1}, {15, 91}}</string>
<reference key="NSSuperview" ref="459354381"/>
- <reference key="NSWindow"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="459354381"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
@@ -337,7 +320,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="459354381"/>
- <reference key="NSWindow"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="459354381"/>
<string key="NSAction">_doScroller:</string>
@@ -345,14 +328,16 @@
<double key="NSPercent">0.94565218687057495</double>
</object>
</array>
- <string key="NSFrame">{{37, 164}, {346, 93}}</string>
+ <string key="NSFrame">{{37, 131}, {346, 93}}</string>
<reference key="NSSuperview" ref="509876344"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="891957801"/>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="809775435"/>
<reference key="NSHScroller" ref="534678362"/>
<reference key="NSContentView" ref="891957801"/>
+ <double key="NSMinMagnification">0.25</double>
+ <double key="NSMaxMagnification">4</double>
+ <double key="NMagnification">1</double>
</object>
<object class="NSBox" id="763791491">
<reference key="NSNextResponder" ref="509876344"/>
@@ -367,7 +352,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{129, -3}, {19, 28}}</string>
<reference key="NSSuperview" ref="80424508"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="1022260684">
<int key="NSCellFlags">67954720</int>
@@ -384,13 +368,13 @@
<bool key="NSValueWraps">YES</bool>
<bool key="NSAutorepeat">YES</bool>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="1069301758">
<reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{105, 0}, {25, 22}}</string>
<reference key="NSSuperview" ref="80424508"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="108012993">
<int key="NSCellFlags">-1804565439</int>
@@ -412,13 +396,13 @@
<reference key="NSColor" ref="486934647"/>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="519940975">
<reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{150, 3}, {94, 17}}</string>
<reference key="NSSuperview" ref="80424508"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="556586308">
<int key="NSCellFlags">67142656</int>
@@ -439,13 +423,13 @@
<reference key="NSColor" ref="486934647"/>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSStepper" id="437797315">
<reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{24, -3}, {19, 28}}</string>
<reference key="NSSuperview" ref="80424508"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="845689701">
<int key="NSCellFlags">67954720</int>
@@ -457,13 +441,13 @@
<bool key="NSValueWraps">YES</bool>
<bool key="NSAutorepeat">YES</bool>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="30081493">
<reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{45, 3}, {42, 17}}</string>
<reference key="NSSuperview" ref="80424508"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="710160508">
<int key="NSCellFlags">67142656</int>
@@ -474,13 +458,13 @@
<reference key="NSBackgroundColor" ref="793674802"/>
<reference key="NSTextColor" ref="969039322"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="330136588">
<reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrameSize">{25, 22}</string>
<reference key="NSSuperview" ref="80424508"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="347985311">
<int key="NSCellFlags">-1804565439</int>
@@ -492,16 +476,15 @@
<reference key="NSBackgroundColor" ref="616743529"/>
<reference key="NSTextColor" ref="1062485171"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{330, 22}</string>
<reference key="NSSuperview" ref="763791491"/>
More information about the commits
mailing list