adium-1.4 3421:af11f6a029c9: Merge default into facebook-xmpp

commits at adium.im commits at adium.im
Wed Mar 16 16:02:29 UTC 2011


details:	http://hg.adium.im/adium-1.4/rev/af11f6a029c9
revision:	3421:af11f6a029c9
branch:		facebook-xmpp
author:		Colin Barrett <colin at springsandstruts.com>
date:		Wed Mar 16 09:02:11 2011 -0700

Merge default into facebook-xmpp

diffs (truncated from 23076 to 1000 lines):

diff -r c3c7a69e75ee -r af11f6a029c9 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Tue Mar 15 22:01:45 2011 -0700
+++ b/Adium.xcodeproj/project.pbxproj	Wed Mar 16 09:02:11 2011 -0700
@@ -3693,7 +3693,6 @@
 		34D000C50957918000DCB678 /* ContactListRecentImages.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ContactListRecentImages.nib; path = Resources/ContactListRecentImages.nib; sourceTree = "<group>"; };
 		34D001E50958868000DCB678 /* AIMenuItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMenuItemView.h; path = Source/AIMenuItemView.h; sourceTree = "<group>"; };
 		34D001E60958868000DCB678 /* AIMenuItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMenuItemView.m; path = Source/AIMenuItemView.m; sourceTree = "<group>"; };
-		34D007B0095964EF00DCB678 /* NSIPRecentPicture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSIPRecentPicture.h; path = Source/NSIPRecentPicture.h; sourceTree = "<group>"; };
 		34D007D9095966E200DCB678 /* AIContactListRecentImagesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIContactListRecentImagesWindowController.m; path = Source/AIContactListRecentImagesWindowController.m; sourceTree = "<group>"; };
 		34D007DA095966E200DCB678 /* AIContactListRecentImagesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIContactListRecentImagesWindowController.h; path = Source/AIContactListRecentImagesWindowController.h; sourceTree = "<group>"; };
 		34D0F9C80954E70100DCB678 /* AIContactListImagePicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIContactListImagePicker.h; path = Source/AIContactListImagePicker.h; sourceTree = "<group>"; };
@@ -5803,7 +5802,6 @@
 		34607EF209B22933000DB3D2 /* User Icon Changing */ = {
 			isa = PBXGroup;
 			children = (
-				34D007B0095964EF00DCB678 /* NSIPRecentPicture.h */,
 				3489506A0CDE0CC5002FEB4D /* IKRecentPicture.h */,
 				34D0F9C80954E70100DCB678 /* AIContactListImagePicker.h */,
 				34D0F9C90954E70100DCB678 /* AIContactListImagePicker.m */,
diff -r c3c7a69e75ee -r af11f6a029c9 AdiumHelp/pgs/Accounts-iTunesIntegration.html
--- a/AdiumHelp/pgs/Accounts-iTunesIntegration.html	Tue Mar 15 22:01:45 2011 -0700
+++ b/AdiumHelp/pgs/Accounts-iTunesIntegration.html	Wed Mar 16 09:02:11 2011 -0700
@@ -92,8 +92,8 @@
 				<td>The track name of the current song.</td>
 				</tr>
 				<tr>
-				<td>%%_composer</td>
-				<td>The track name of the current song.</td>
+				<td>%_composer</td>
+				<td>The composer of the current song.</td>
 				</tr>
 				<tr>
 				<td>%_iTMS</td>
diff -r c3c7a69e75ee -r af11f6a029c9 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Tue Mar 15 22:01:45 2011 -0700
+++ b/ChangeLogs/Changes.txt	Wed Mar 16 09:02:11 2011 -0700
@@ -1,11 +1,14 @@
 				Adium Version History
 				-----------------------
-Version 1.4.2 (X/X/201X)
- * Updated to libpurple 2.x.x. Highlights of applicable changes:
-   * 
+Version 1.4.2 (X/X/2011)
+ * Updated to libpurple 2.7.11. Highlights of applicable changes:
+   * MSN: Fixed bug that prevented adding contacts to your contact list in certain circumstances. (#14965)
+   * MSN: Added support for MSNP16 including multiple points of presence (MPOP) which allows multiple simultaneous sign-ins and which should resolve connection problems involving the "Signed in from another location" error. (#13654)
+   * MSN: Fixed crash related to Direct Connections. (#14650)
+   * ICQ: Fixed a bug where some contacts from your contact list might not show up. Affected non-English users the most. (#14901)
 
  Logging
-  * Added a "Log only certain accounts" setting to Adium's "General" preferences. (#8)
+  * Added a "Log only certain accounts" setting to Adium's "General" preferences. (#8, #14522)
   * Added a "Log secure chats" setting to Adium's "General" preferences. (#94)
   * Renamed "Save opened chats when quitting" setting to "Reopen chats from last time on startup" for clarity. (#14651)
 
@@ -15,7 +18,12 @@
   * Mockie: new mention and focus indicators. (#14420)
   * Fixed Renkoo to not scroll to bottom on new content regardless of scroll position. (#14331)
   * Fixed Stockholm's breaking with RTL text. (#10403)
-  * Fixed iChat emoticons in Snow Leopard on case-sensitive file systems. (#14936) 
+  * Fixed message time popup intefering with copy and paste (#14361)
+  * Fixed iChat emoticons in Snow Leopard on case-sensitive file systems. (#14936)
+
+ Facebook
+  * Changed Adium's Facebook account option to connect via the official XMPP API.
+    * 
 
  ICQ
   * Fixed ICQ disconnections going unnoticed. (#14229)
@@ -24,6 +32,9 @@
  IRC
   * Fixed a crash related to Cyrillic nicknames in IRC. (#13351)
 
+ MSN
+  * Added a preference to enable/disable MSN Direct Connections. (#14602)
+
  XMPP
   * Double confirmation is now required to delete and unregister an XMPP account. (#14357)
   * Fixed xmpp:-urls without a user part opening chats with (null)@... (#14908).
@@ -33,12 +44,16 @@
   * Fixed a bug causing a switching of user profiles following Adium updates. (#14432)
   * Fixed 1.4.1 regression of arrows not showing up in the Events tables of the Preference pane and the Get Info pane for active events. (#14629)
   * Fixed a hang that occurred when required parts of loaded message styles were missing. (#7438)
+  * Fixed bookmark icons not updating when changing icon sets. (#13221)
+  * Fixed two memory leaks. (Adrian Godoroja) (#15047)
   * Fixed "Remove Link" showing up twice in the input box's context menu on 10.6. (Shawn Khan) (#14454)
   * Fixed 1.4 regression where selection of the active voice in the "Speak Event" and "Speak Text" contact alert actions failed. (#14574)
-  * Fixed positioning of selected icon in Recent Icons not being reapplied when icon is reselected. (#9908)
+  * Fixed positioning of selected icon in Recent Icons not being reapplied when icon is reselected. (Adrian Godoroja) (#9908)
 
  Localisation
-  * Updated the Localizable.strings files, adding missing translatable strings/nibs. (#14588)
+  * Updated the Localizable.strings files, adding missing translatable strings/nibs. (#14588, #14582)
+  * Updated and improved German localisation.
+  * Updated and improved Dutch localisation.
   * Updated Swedish localisation. (#14993)
   * Fixed an issue in the Czech localisation. (#14586)
 
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/AIUtilities Framework/Resources/de.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/de.lproj/Localizable.strings has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/Adium Framework/Resources/de.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/de.lproj/Localizable.strings has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/Adium Framework/Resources/nl.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/nl.lproj/Localizable.strings has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/Adium Framework/Source/AIListOutlineView.h
--- a/Frameworks/Adium Framework/Source/AIListOutlineView.h	Tue Mar 15 22:01:45 2011 -0700
+++ b/Frameworks/Adium Framework/Source/AIListOutlineView.h	Wed Mar 16 09:02:11 2011 -0700
@@ -55,8 +55,6 @@
 
 @property (readonly, nonatomic) NSInteger desiredHeight;
 @property (readonly, nonatomic) NSInteger desiredWidth;
-- (void)setMinimumDesiredWidth:(int)inMinimumDesiredWidth;
-- (void)setDesiredHeightPadding:(int)inPadding;
 
 //Contact menu
 @property (readonly, nonatomic) AIListObject *listObject;
@@ -71,10 +69,17 @@
  */
 @property (readonly, nonatomic) int indexOfFirstVisibleListContact;
 
+- (void)setMinimumDesiredWidth:(int)inMinimumDesiredWidth;
+- (void)setDesiredHeightPadding:(int)inPadding;
+
 @end
 
 @interface AIListOutlineView (AIListOutlineView_Drawing)
 
+ at property (readwrite, nonatomic, retain) NSColor *backgroundColor;
+ at property (readwrite, nonatomic, retain) NSColor *highlightColor;
+ at property (readwrite, nonatomic, retain) NSColor *alternatingRowColor;
+
 //Shadows
 - (void)setUpdateShadowsWhileDrawing:(BOOL)update;
 
@@ -83,8 +88,5 @@
 - (void)setBackgroundStyle:(AIBackgroundStyle)inBackgroundStyle;
 - (void)setBackgroundOpacity:(float)opacity forWindowStyle:(AIContactListWindowStyle)windowStyle;
 - (void)setBackgroundFade:(float)fade;
- at property (readwrite, nonatomic, retain) NSColor *backgroundColor;
- at property (readwrite, nonatomic, retain) NSColor *highlightColor;
- at property (readwrite, nonatomic, retain) NSColor *alternatingRowColor;
 
 @end
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/Adium Framework/Source/AIListOutlineView.m
--- a/Frameworks/Adium Framework/Source/AIListOutlineView.m	Tue Mar 15 22:01:45 2011 -0700
+++ b/Frameworks/Adium Framework/Source/AIListOutlineView.m	Wed Mar 16 09:02:11 2011 -0700
@@ -88,6 +88,11 @@
 	
 	[backgroundImage release];
 	[backgroundColor release];
+	[_backgroundColorWithOpacity release];
+	[highlightColor release];
+	[rowColor release];
+	[_rowColorWithOpacity release];
+
 	[self unregisterDraggedTypes];
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 	
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Headers/account.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/account.h	Tue Mar 15 22:01:45 2011 -0700
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/account.h	Wed Mar 16 09:02:11 2011 -0700
@@ -143,6 +143,7 @@
 	 * buddies are added to your permit list.  Currently we have to
 	 * iterate through the entire list if we want to check if someone
 	 * is permitted or denied.  We should do this for 3.0.0.
+	 * Or maybe use a GTree.
 	 */
 	GSList *permit;             /**< Permit list.                           */
 	GSList *deny;               /**< Deny list.                             */
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Headers/chat.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/chat.h	Tue Mar 15 22:01:45 2011 -0700
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/chat.h	Wed Mar 16 09:02:11 2011 -0700
@@ -52,6 +52,7 @@
 	void *config_dialog_handle;
 	GHashTable *members;
 	gboolean left;
+	time_t joined;
 } JabberChat;
 
 GList *jabber_chat_info(PurpleConnection *gc);
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Headers/cipher.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/cipher.h	Tue Mar 15 22:01:45 2011 -0700
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/cipher.h	Wed Mar 16 09:02:11 2011 -0700
@@ -28,6 +28,7 @@
 #define PURPLE_CIPHER_H
 
 #include <glib.h>
+#include <string.h>
 
 #define PURPLE_CIPHER(obj)			((PurpleCipher *)(obj))			/**< PurpleCipher typecast helper			*/
 #define PURPLE_CIPHER_OPS(obj)		((PurpleCipherOps *)(obj))		/**< PurpleCipherInfo typecase helper		*/
@@ -129,9 +130,7 @@
 	void (*set_key_with_len)(PurpleCipherContext *context, const guchar *key, size_t len);
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*****************************************************************************/
 /** @name PurpleCipher API													 */
@@ -498,8 +497,6 @@
 
 /*@}*/
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* PURPLE_CIPHER_H */
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Headers/libgadu.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/libgadu.h	Tue Mar 15 22:01:45 2011 -0700
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/libgadu.h	Wed Mar 16 09:02:11 2011 -0700
@@ -117,7 +117,7 @@
 typedef unsigned short uint16_t;
 typedef unsigned int   uint32_t;
 
-#if !defined(__CYGWIN__) && !defined(__SunOS)
+#if !defined(__CYGWIN__) && !defined(__SunOS) && !defined(_INCLUDE_HPUX_SOURCE)
 #define __int8_t_defined
 typedef   signed char    int8_t;
 typedef   signed short  int16_t;
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h	Tue Mar 15 22:01:45 2011 -0700
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h	Wed Mar 16 09:02:11 2011 -0700
@@ -6,7 +6,7 @@
 
 G_BEGIN_DECLS
 
-/* VOID:POINTER,POINTER,OBJECT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:1) */
+/* VOID:POINTER,POINTER,OBJECT (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:1) */
 extern void purple_smarshal_VOID__POINTER_POINTER_OBJECT (GClosure     *closure,
                                                           GValue       *return_value,
                                                           guint         n_param_values,
@@ -14,7 +14,7 @@
                                                           gpointer      invocation_hint,
                                                           gpointer      marshal_data);
 
-/* BOOLEAN:OBJECT,POINTER,STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:2) */
+/* BOOLEAN:OBJECT,POINTER,STRING (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:2) */
 extern void purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING (GClosure     *closure,
                                                             GValue       *return_value,
                                                             guint         n_param_values,
@@ -22,7 +22,7 @@
                                                             gpointer      invocation_hint,
                                                             gpointer      marshal_data);
 
-/* VOID:STRING,STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:3) */
+/* VOID:STRING,STRING (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:3) */
 extern void purple_smarshal_VOID__STRING_STRING (GClosure     *closure,
                                                  GValue       *return_value,
                                                  guint         n_param_values,
@@ -30,7 +30,7 @@
                                                  gpointer      invocation_hint,
                                                  gpointer      marshal_data);
 
-/* VOID:STRING,STRING,DOUBLE (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:4) */
+/* VOID:STRING,STRING,DOUBLE (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:4) */
 extern void purple_smarshal_VOID__STRING_STRING_DOUBLE (GClosure     *closure,
                                                         GValue       *return_value,
                                                         guint         n_param_values,
@@ -38,7 +38,7 @@
                                                         gpointer      invocation_hint,
                                                         gpointer      marshal_data);
 
-/* VOID:ENUM,STRING,STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:5) */
+/* VOID:ENUM,STRING,STRING (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:5) */
 extern void purple_smarshal_VOID__ENUM_STRING_STRING (GClosure     *closure,
                                                       GValue       *return_value,
                                                       guint         n_param_values,
@@ -46,7 +46,7 @@
                                                       gpointer      invocation_hint,
                                                       gpointer      marshal_data);
 
-/* VOID:ENUM,STRING,STRING,BOOLEAN (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:6) */
+/* VOID:ENUM,STRING,STRING,BOOLEAN (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:6) */
 extern void purple_smarshal_VOID__ENUM_STRING_STRING_BOOLEAN (GClosure     *closure,
                                                               GValue       *return_value,
                                                               guint         n_param_values,
@@ -54,7 +54,7 @@
                                                               gpointer      invocation_hint,
                                                               gpointer      marshal_data);
 
-/* VOID:FLAGS,FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:7) */
+/* VOID:FLAGS,FLAGS (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:7) */
 extern void purple_smarshal_VOID__FLAGS_FLAGS (GClosure     *closure,
                                                GValue       *return_value,
                                                guint         n_param_values,
@@ -62,7 +62,7 @@
                                                gpointer      invocation_hint,
                                                gpointer      marshal_data);
 
-/* VOID:STRING,STRING,OBJECT,OBJECT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:8) */
+/* VOID:STRING,STRING,OBJECT,OBJECT (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:8) */
 extern void purple_smarshal_VOID__STRING_STRING_OBJECT_OBJECT (GClosure     *closure,
                                                                GValue       *return_value,
                                                                guint         n_param_values,
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Headers/version.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/version.h	Tue Mar 15 22:01:45 2011 -0700
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/version.h	Wed Mar 16 09:02:11 2011 -0700
@@ -29,7 +29,7 @@
 /** The minor version of the running libpurple. */
 #define PURPLE_MINOR_VERSION (7)
 /** The micro version of the running libpurple. */
-#define PURPLE_MICRO_VERSION (10)
+#define PURPLE_MICRO_VERSION (11)
 
 #define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \
 									 ((y) < PURPLE_MINOR_VERSION || \
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Resources/cs/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0/Resources/cs/LC_MESSAGES/pidgin.mo has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Resources/de/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0/Resources/de/LC_MESSAGES/pidgin.mo has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Resources/it/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0/Resources/it/LC_MESSAGES/pidgin.mo has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Resources/nl/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0/Resources/nl/LC_MESSAGES/pidgin.mo has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Resources/pl/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0/Resources/pl/LC_MESSAGES/pidgin.mo has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Resources/sk/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0/Resources/sk/LC_MESSAGES/pidgin.mo has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Resources/sl/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0/Resources/sl/LC_MESSAGES/pidgin.mo has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Resources/uk/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0/Resources/uk/LC_MESSAGES/pidgin.mo has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Resources/zh_CN/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0/Resources/zh_CN/LC_MESSAGES/pidgin.mo has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/Resources/zh_TW/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0/Resources/zh_TW/LC_MESSAGES/pidgin.mo has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Frameworks/libpurple.framework/Versions/0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0/libpurple has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Plugins/Purple Service/de.lproj/DCPurpleJabberJoinChatView.nib/designable.nib
--- a/Plugins/Purple Service/de.lproj/DCPurpleJabberJoinChatView.nib/designable.nib	Tue Mar 15 22:01:45 2011 -0700
+++ b/Plugins/Purple Service/de.lproj/DCPurpleJabberJoinChatView.nib/designable.nib	Wed Mar 16 09:02:11 2011 -0700
@@ -2,19 +2,22 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">732</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.SystemVersion">10J567</string>
+		<string key="IBDocument.InterfaceBuilderVersion">823</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.HIToolboxVersion">462.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>
+			<string key="NS.object.0">823</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"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="566472592">
 			<object class="NSCustomObject" id="567886539">
 				<string key="NSClassName">DCGaimJabberJoinChatViewController</string>
@@ -84,7 +87,7 @@
 								<string key="NSColorName">controlColor</string>
 								<object class="NSColor" key="NSColor">
 									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 								</object>
 							</object>
 							<object class="NSColor" key="NSTextColor" id="741467272">
@@ -187,7 +190,7 @@
 						<object class="NSTextFieldCell" key="NSCell" id="1071921958">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Passwort:</string>
+							<string key="NSContents">Kennwort:</string>
 							<reference key="NSSupport" ref="892156985"/>
 							<reference key="NSControlView" ref="354725630"/>
 							<reference key="NSBackgroundColor" ref="233968069"/>
@@ -741,6 +744,32 @@
 						<string key="textField_roomName">NSTextField</string>
 						<string key="textField_server">NSTextField</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="textField_handle">
+							<string key="name">textField_handle</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_inviteMessage">
+							<string key="name">textField_inviteMessage</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_inviteUsers">
+							<string key="name">textField_inviteUsers</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_password">
+							<string key="name">textField_password</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_roomName">
+							<string key="name">textField_roomName</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_server">
+							<string key="name">textField_server</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -753,11 +782,35 @@
 						<string key="closeWindow:">id</string>
 						<string key="joinChat:">id</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="closeWindow:">
+							<string key="name">closeWindow:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="joinChat:">
+							<string key="name">joinChat:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="popUp_service">NSPopUpButton</string>
 						<string key="view">NSView</string>
 						<string key="view_customView">NSView</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="popUp_service">
+							<string key="name">popUp_service</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view">
+							<string key="name">view</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_customView">
+							<string key="name">view_customView</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -774,6 +827,7 @@
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<integer value="1060" key="NS.object.0"/>
diff -r c3c7a69e75ee -r af11f6a029c9 Plugins/Purple Service/de.lproj/DCPurpleJabberJoinChatView.nib/keyedobjects.nib
Binary file Plugins/Purple Service/de.lproj/DCPurpleJabberJoinChatView.nib/keyedobjects.nib has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Plugins/Purple Service/de.lproj/ESIRCAccountView.nib/designable.nib
--- a/Plugins/Purple Service/de.lproj/ESIRCAccountView.nib/designable.nib	Tue Mar 15 22:01:45 2011 -0700
+++ b/Plugins/Purple Service/de.lproj/ESIRCAccountView.nib/designable.nib	Wed Mar 16 09:02:11 2011 -0700
@@ -2,19 +2,22 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">732</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.SystemVersion">10J567</string>
+		<string key="IBDocument.InterfaceBuilderVersion">823</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.HIToolboxVersion">462.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>
+			<string key="NS.object.0">823</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"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="828227930">
 			<object class="NSCustomObject" id="768648039">
 				<string key="NSClassName">ESIRCAccountViewController</string>
@@ -38,7 +41,7 @@
 						<object class="NSTextFieldCell" key="NSCell" id="976286373">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Passwort:</string>
+							<string key="NSContents">Kennwort:</string>
 							<object class="NSFont" key="NSSupport" id="934440942">
 								<string key="NSName">LucidaGrande</string>
 								<double key="NSSize">13</double>
@@ -51,7 +54,7 @@
 								<string key="NSColorName">controlColor</string>
 								<object class="NSColor" key="NSColor" id="830791987">
 									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 								</object>
 							</object>
 							<object class="NSColor" key="NSTextColor" id="299185369">
@@ -1150,6 +1153,13 @@
 						<string key="NS.key.0">changedPreference:</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">changedPreference:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">changedPreference:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="checkBox_checkMail">NSButton</string>
 						<string key="checkBox_sendTyping">NSButton</string>
@@ -1174,6 +1184,96 @@
 						<string key="view_profile">NSView</string>
 						<string key="view_setup">NSView</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="checkBox_checkMail">
+							<string key="name">checkBox_checkMail</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkBox_sendTyping">
+							<string key="name">checkBox_sendTyping</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_alias">
+							<string key="name">label_alias</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_encryption">
+							<string key="name">label_encryption</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_password">
+							<string key="name">label_password</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_port">
+							<string key="name">label_port</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_server">
+							<string key="name">label_server</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_typing">
+							<string key="name">label_typing</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="popUp_encryption">
+							<string key="name">popUp_encryption</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="progressIndicator_registering">
+							<string key="name">progressIndicator_registering</string>
+							<string key="candidateClassName">NSProgressIndicator</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_accountUID">
+							<string key="name">textField_accountUID</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_accountUIDLabel">
+							<string key="name">textField_accountUIDLabel</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_alias">
+							<string key="name">textField_alias</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_connectHost">
+							<string key="name">textField_connectHost</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_connectPort">
+							<string key="name">textField_connectPort</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_password">
+							<string key="name">textField_password</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_registering">
+							<string key="name">textField_registering</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_auxiliaryTabView">
+							<string key="name">view_auxiliaryTabView</string>
+							<string key="candidateClassName">NSTabView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_options">
+							<string key="name">view_options</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_privacy">
+							<string key="name">view_privacy</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_profile">
+							<string key="name">view_profile</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_setup">
+							<string key="name">view_setup</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -1190,6 +1290,32 @@
 						<string key="textView_commands">NSTextView</string>
 						<string key="textfield_Nick">NSTextField</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="checkbox_useSSL">
+							<string key="name">checkbox_useSSL</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="popUp_encoding">
+							<string key="name">popUp_encoding</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_realname">
+							<string key="name">textField_realname</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_username">
+							<string key="name">textField_username</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textView_commands">
+							<string key="name">textView_commands</string>
+							<string key="candidateClassName">NSTextView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textfield_Nick">
+							<string key="name">textfield_Nick</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -1236,6 +1362,28 @@
 						<string key="toggleFindPanel:">id</string>
 						<string key="willAdjustSubviews:">RBSplitView</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="adiumPrint:">
+							<string key="name">adiumPrint:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="didAdjustSubviews:">
+							<string key="name">didAdjustSubviews:</string>
+							<string key="candidateClassName">RBSplitView</string>
+						</object>
+						<object class="IBActionInfo" key="prefsWindowWillClose:">
+							<string key="name">prefsWindowWillClose:</string>
+							<string key="candidateClassName">SS_PrefsController</string>
+						</object>
+						<object class="IBActionInfo" key="toggleFindPanel:">
+							<string key="name">toggleFindPanel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="willAdjustSubviews:">
+							<string key="name">willAdjustSubviews:</string>
+							<string key="candidateClassName">RBSplitView</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -1256,6 +1404,13 @@
 						<string key="NS.key.0">checkBox_broadcastMusic</string>
 						<string key="NS.object.0">NSButton</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">checkBox_broadcastMusic</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">checkBox_broadcastMusic</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -1276,6 +1431,13 @@
 						<string key="NS.key.0">delegate</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">delegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -1288,6 +1450,13 @@
 						<string key="NS.key.0">delegate</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">delegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -1296,6 +1465,7 @@
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<integer value="1050" key="NS.object.0"/>
@@ -1303,5 +1473,10 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<string key="IBDocument.LastKnownRelativeProjectPath">../../Adium.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{9, 8}</string>
+			<string key="NSMenuMixedState">{7, 2}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
 	</data>
 </archive>
diff -r c3c7a69e75ee -r af11f6a029c9 Plugins/Purple Service/de.lproj/ESIRCAccountView.nib/keyedobjects.nib
Binary file Plugins/Purple Service/de.lproj/ESIRCAccountView.nib/keyedobjects.nib has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Plugins/Purple Service/de.lproj/ESPurpleGaduGaduAccountView.nib/designable.nib
--- a/Plugins/Purple Service/de.lproj/ESPurpleGaduGaduAccountView.nib/designable.nib	Tue Mar 15 22:01:45 2011 -0700
+++ b/Plugins/Purple Service/de.lproj/ESPurpleGaduGaduAccountView.nib/designable.nib	Wed Mar 16 09:02:11 2011 -0700
@@ -2,19 +2,22 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">732</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.SystemVersion">10J567</string>
+		<string key="IBDocument.InterfaceBuilderVersion">823</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.HIToolboxVersion">462.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>
+			<string key="NS.object.0">823</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"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="102762818">
 			<object class="NSCustomObject" id="30441549">
 				<string key="NSClassName">ESPurpleGaduGaduAccountViewController</string>
@@ -104,7 +107,7 @@
 								<string key="NSColorName">controlColor</string>
 								<object class="NSColor" key="NSColor">
 									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 								</object>
 							</object>
 							<object class="NSColor" key="NSTextColor" id="487469397">
@@ -138,7 +141,7 @@
 						<object class="NSTextFieldCell" key="NSCell" id="1023197820">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Passwort:</string>
+							<string key="NSContents">Kennwort:</string>
 							<reference key="NSSupport" ref="808606890"/>
 							<reference key="NSControlView" ref="359073255"/>
 							<reference key="NSBackgroundColor" ref="194751472"/>
@@ -512,6 +515,13 @@
 						<string key="NS.key.0">changedPreference:</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">changedPreference:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">changedPreference:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="checkBox_checkMail">NSButton</string>
 						<string key="checkBox_sendTyping">NSButton</string>
@@ -534,6 +544,88 @@
 						<string key="view_profile">NSView</string>
 						<string key="view_setup">NSView</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="checkBox_checkMail">
+							<string key="name">checkBox_checkMail</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="checkBox_sendTyping">
+							<string key="name">checkBox_sendTyping</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_alias">
+							<string key="name">label_alias</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_encryption">
+							<string key="name">label_encryption</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_password">
+							<string key="name">label_password</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_port">
+							<string key="name">label_port</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_server">
+							<string key="name">label_server</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label_typing">
+							<string key="name">label_typing</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="popUp_encryption">
+							<string key="name">popUp_encryption</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_accountUID">
+							<string key="name">textField_accountUID</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_accountUIDLabel">
+							<string key="name">textField_accountUIDLabel</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_alias">
+							<string key="name">textField_alias</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_connectHost">
+							<string key="name">textField_connectHost</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_connectPort">
+							<string key="name">textField_connectPort</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textField_password">
+							<string key="name">textField_password</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_auxiliaryTabView">
+							<string key="name">view_auxiliaryTabView</string>
+							<string key="candidateClassName">NSTabView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_options">
+							<string key="name">view_options</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_privacy">
+							<string key="name">view_privacy</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_profile">
+							<string key="name">view_profile</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_setup">
+							<string key="name">view_setup</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -554,6 +646,13 @@
 						<string key="NS.key.0">registerNewAccount:</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">registerNewAccount:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">registerNewAccount:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -578,6 +677,7 @@
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<integer value="1060" key="NS.object.0"/>
@@ -585,5 +685,9 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{9, 8}</string>
+			<string key="NSMenuMixedState">{7, 2}</string>
+		</dictionary>
 	</data>
 </archive>
diff -r c3c7a69e75ee -r af11f6a029c9 Plugins/Purple Service/de.lproj/ESPurpleGaduGaduAccountView.nib/keyedobjects.nib
Binary file Plugins/Purple Service/de.lproj/ESPurpleGaduGaduAccountView.nib/keyedobjects.nib has changed
diff -r c3c7a69e75ee -r af11f6a029c9 Plugins/Purple Service/de.lproj/ESPurpleJabberAccountView.nib/designable.nib
--- a/Plugins/Purple Service/de.lproj/ESPurpleJabberAccountView.nib/designable.nib	Tue Mar 15 22:01:45 2011 -0700
+++ b/Plugins/Purple Service/de.lproj/ESPurpleJabberAccountView.nib/designable.nib	Wed Mar 16 09:02:11 2011 -0700
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">804</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.SystemVersion">10J567</string>
+		<string key="IBDocument.InterfaceBuilderVersion">823</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.HIToolboxVersion">462.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">804</string>
+			<string key="NS.object.0">823</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -46,7 +46,7 @@
 						<object class="NSTextFieldCell" key="NSCell" id="763478478">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Passwort:</string>
+							<string key="NSContents">Kennwort:</string>
 							<object class="NSFont" key="NSSupport" id="745543233">
 								<string key="NSName">LucidaGrande</string>
 								<double key="NSSize">13</double>
@@ -59,7 +59,7 @@
 								<string key="NSColorName">controlColor</string>
 								<object class="NSColor" key="NSColor" id="835004027">
 									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 								</object>
 							</object>
 							<object class="NSColor" key="NSTextColor" id="564835922">
@@ -251,13 +251,13 @@
 					<object class="NSButton" id="767871570">
 						<reference key="NSNextResponder" ref="881248978"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{180, 159}, {244, 18}}</string>
+						<string key="NSFrame">{{180, 159}, {317, 18}}</string>
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="355466928">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">0</int>
-							<string key="NSContents">Nach neuen E-Mails suchen</string>
+							<string key="NSContents">Benachrichtigungen für neue E-Mails</string>
 							<reference key="NSSupport" ref="745543233"/>
 							<reference key="NSControlView" ref="767871570"/>
 							<int key="NSButtonFlags">1211912703</int>
@@ -362,7 +362,7 @@
 						<object class="NSTextFieldCell" key="NSCell" id="275398507">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Proxy für Datentransfer:</string>
+							<string key="NSContents">Proxy für Dateiübertragung:</string>
 							<reference key="NSSupport" ref="745543233"/>
 							<reference key="NSControlView" ref="1071692987"/>
 							<reference key="NSBackgroundColor" ref="701108434"/>




More information about the commits mailing list