Changeset 3505

Timestamp:

12/30/06 01:00:55 (2 years ago)

Author:

timothy

Message:

Adding NAT traversal support using either UPnP or NAT-PMP. There is new setting in the file transfer preferences to disable this feature. The library we used is a stripped down version of libtransmission (http://transmission.m0k.org). #949

Files:

• trunk/Chat Core.xcodeproj/project.pbxproj (modified) (5 diffs)
• trunk/Chat Core/MVFileTransfer.h (modified) (1 diff)
• trunk/Chat Core/MVFileTransfer.m (modified) (2 diffs)
• trunk/Chat Core/MVIRCFileTransfer.h (modified) (5 diffs)
• trunk/Chat Core/MVIRCFileTransfer.m (modified) (14 diffs)
• trunk/Chat Core/Transmission.h (added)
• trunk/Controllers/MVFileTransferController.m (modified) (2 diffs)
• trunk/Frameworks/frameworks.tar.gz (modified) (previous)
• trunk/Languages/Dutch.lproj/Credits.rtf (modified) (11 diffs)
• trunk/Languages/Dutch.lproj/JVFileTransferPreferences.nib/classes.nib (modified) (1 diff)
• trunk/Languages/Dutch.lproj/JVFileTransferPreferences.nib/info.nib (modified) (1 diff)
• trunk/Languages/Dutch.lproj/JVFileTransferPreferences.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/English.lproj/Credits.rtf (modified) (11 diffs)
• trunk/Languages/English.lproj/JVFileTransferPreferences.nib/classes.nib (modified) (1 diff)
• trunk/Languages/English.lproj/JVFileTransferPreferences.nib/info.nib (modified) (3 diffs)
• trunk/Languages/English.lproj/JVFileTransferPreferences.nib/keyedobjects.nib (added)
• trunk/Languages/French.lproj/Credits.rtf (modified) (11 diffs)
• trunk/Languages/French.lproj/JVFileTransferPreferences.nib/classes.nib (modified) (1 diff)
• trunk/Languages/French.lproj/JVFileTransferPreferences.nib/info.nib (modified) (2 diffs)
• trunk/Languages/French.lproj/JVFileTransferPreferences.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/German.lproj/Credits.rtf (modified) (10 diffs)
• trunk/Languages/German.lproj/JVFileTransferPreferences.nib/classes.nib (modified) (1 diff)
• trunk/Languages/German.lproj/JVFileTransferPreferences.nib/info.nib (modified) (2 diffs)
• trunk/Languages/German.lproj/JVFileTransferPreferences.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/Italian.lproj/Credits.rtf (modified) (11 diffs)
• trunk/Languages/Italian.lproj/JVFileTransferPreferences.nib/classes.nib (modified) (1 diff)
• trunk/Languages/Italian.lproj/JVFileTransferPreferences.nib/info.nib (modified) (2 diffs)
• trunk/Languages/Italian.lproj/JVFileTransferPreferences.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/Spanish.lproj/Credits.rtf (modified) (11 diffs)
• trunk/Languages/Spanish.lproj/JVFileTransferPreferences.nib/classes.nib (modified) (1 diff)
• trunk/Languages/Spanish.lproj/JVFileTransferPreferences.nib/info.nib (modified) (2 diffs)
• trunk/Languages/Spanish.lproj/JVFileTransferPreferences.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/pt_PT.lproj/Credits.rtf (modified) (11 diffs)
• trunk/Languages/pt_PT.lproj/JVFileTransferPreferences.nib/classes.nib (modified) (1 diff)
• trunk/Languages/pt_PT.lproj/JVFileTransferPreferences.nib/info.nib (modified) (2 diffs)
• trunk/Languages/pt_PT.lproj/JVFileTransferPreferences.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/zh_TW.lproj/Credits.rtf (modified) (19 diffs)
• trunk/Languages/zh_TW.lproj/JVFileTransferPreferences.nib/classes.nib (modified) (1 diff)
• trunk/Languages/zh_TW.lproj/JVFileTransferPreferences.nib/info.nib (modified) (1 diff)
• trunk/Languages/zh_TW.lproj/JVFileTransferPreferences.nib/keyedobjects.nib (modified) (previous)
• trunk/Preferences/JVFileTransferPreferences.h (modified) (1 diff)
• trunk/Preferences/JVFileTransferPreferences.m (modified) (2 diffs)
• trunk/Resources/info.colloquy.plist (modified) (1 diff)
• trunk/Settings/Common Settings.xcconfig (modified) (1 diff)

trunk/Chat Core.xcodeproj/project.pbxproj

@@ -8 +8 @@
-
-/* Begin PBXBuildFile section */
+                1C11689A0B45F98700F57D2C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C1168990B45F98700F57D2C /* libtransmission.a */; };
-                1C11B7A109C27AC800789814 /* BSD License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1C11B7A009C27AC800789814 /* BSD License.txt */; };
-                1C3D55BC05A4CBBE00F25F5E /* NSNumberAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C3D55BA05A4CBBE00F25F5E /* NSNumberAdditions.m */; };
@@ -68 +69 @@
-                089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-                1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+                1C1168990B45F98700F57D2C /* libtransmission.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtransmission.a; path = Frameworks/libtransmission.a; sourceTree = "<group>"; };
+                1C1168CC0B45FA4700F57D2C /* Transmission.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Transmission.h; path = "Chat Core/Transmission.h"; sourceTree = "<group>"; };
-                1C11B7A009C27AC800789814 /* BSD License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "BSD License.txt"; path = "Resources/BSD License.txt"; sourceTree = "<group>"; };
-                1C2EF7EB0427A40B00000102 /* MVChatPluginManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVChatPluginManager.h; path = "Chat Core/MVChatPluginManager.h"; sourceTree = "<group>"; };
@@ -149 +152 @@
-                                1CEEB173095BE3A000166A54 /* CoreServices.framework in Frameworks */,
-                                1C8AAF2B09D6A0A100CF29EB /* AGRegex.framework in Frameworks */,
+                                1C11689A0B45F98700F57D2C /* libtransmission.a in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -186 +190 @@
-                                1C5A233E06FA4FEE00A51F10 /* libsilcclient.framework */,
-                                1C8AAF2609D6A0A100CF29EB /* AGRegex.framework */,
+                                1C1168990B45F98700F57D2C /* libtransmission.a */,
-                        );
-                        name = "Linked Frameworks";
@@ -272 +277 @@
-                                1CD6290D096118B900BD1DD2 /* InterThreadMessaging.m */,
-                                1CD6290C096118B900BD1DD2 /* InterThreadMessaging.h */,
+                                1C1168CC0B45FA4700F57D2C /* Transmission.h */,
-                        );
-                        name = "Sources & Headers";

trunk/Chat Core/MVFileTransfer.h

@@ -42 +42 @@
-+ (void) setFileTransferPortRange:(NSRange) range;
-+ (NSRange) fileTransferPortRange;
+
++ (void) setAutoPortMappingEnabled:(BOOL) enable;
++ (BOOL) isAutoPortMappingEnabled;
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5

trunk/Chat Core/MVFileTransfer.m

@@ -15 +15 @@
-
-static NSRange portRange = { 1024, 24 };
+static BOOL autoPortMapping = YES;
-
-@implementation MVFileTransfer
@@ -23 +24 @@
-+ (NSRange) fileTransferPortRange {
-        return portRange;
+}
+
++ (void) setAutoPortMappingEnabled:(BOOL) enable {
+        autoPortMapping = enable;
+}
+
++ (BOOL) isAutoPortMappingEnabled {
+        return autoPortMapping;
-}
-

trunk/Chat Core/MVIRCFileTransfer.h

@@ -1 +1 @@
-#import "MVFileTransfer.h"
-#import "MVFileTransferPrivate.h"
+#import "Transmission.h"
-
-@class AsyncSocket;
@@ -7 +8 @@
-        AsyncSocket *_connection;
-        AsyncSocket *_acceptConnection;
+        tr_natpmp_t *_natpmp;
+        tr_upnp_t *_upnp;
-        NSThread *_connectionThread;
-        NSFileHandle *_fileHandle;
@@ -21 +24 @@
-- (void) _finish;
-- (unsigned int) _passiveIdentifier;
+- (void) _setUPnP:(tr_upnp_t *) upnp;
+- (void) _setNATPMP:(tr_natpmp_t *) natpmp;
-@end
-
@@ -28 +33 @@
-        AsyncSocket *_connection;
-        AsyncSocket *_acceptConnection;
+        tr_natpmp_t *_natpmp;
+        tr_upnp_t *_upnp;
-        NSThread *_connectionThread;
-        NSFileHandle *_fileHandle;
@@ -43 +50 @@
-- (unsigned int) _passiveIdentifier;
-- (void) _setFileNameQuoted:(unsigned int) quoted;
+- (void) _setUPnP:(tr_upnp_t *) upnp;
+- (void) _setNATPMP:(tr_natpmp_t *) natpmp;
-@end

trunk/Chat Core/MVIRCFileTransfer.m

@@ -7 +7 @@
-#import "AsyncSocket.h"
-#import "InterThreadMessaging.h"
+#import "Transmission.h"
-
-#define DCCPacketSize 4096
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        unsigned int port = ports.location;
-        BOOL success = NO;
@@ -18 +43 @@
-                        break;
-                } else {
+                        [connection disconnect];
-                        if( port == 0 ) break;
-                        [connection disconnect];
-                        if( ++port > NSMaxRange( ports ) )
-                                port = 0; // just use a random port since the user defined range is in use
+                }
+        }
+
+        if( success && [[transfer class] isAutoPortMappingEnabled] ) {
+                tr_msgInit();
+                tr_setMessageLevel( 3 );
+
+                static tr_fd_t *fd = NULL;
+                if( ! fd ) fd = tr_fdInit();
+                if( fd ) {
+                        tr_upnp_t *upnp = tr_upnpInit( fd );
+                        tr_upnpStart( upnp );
+                        tr_upnpForwardPort( upnp, port );
+                        [transfer _setUPnP:upnp];
+
+                        tr_natpmp_t *natpmp = tr_natpmpInit( fd );
+                        tr_natpmpStart( natpmp );
+                        tr_natpmpForwardPort( natpmp, port );
+                        [transfer _setNATPMP:natpmp];
+
+                        NSDate *mappingStart = [NSDate date];
+                        int status = 0;
+                        do {
+                                tr_upnpPulse( upnp );
+                                tr_natpmpPulse( natpmp );
+                                status = natTraversalStatus( upnp, natpmp );
+                        } while( ( status == TR_NAT_TRAVERSAL_MAPPING || status == TR_NAT_TRAVERSAL_NOTFOUND )
+                                           && ABS( [mappingStart timeIntervalSinceNow] ) < 5. ); 
-                }
-        }
@@ -75 +128 @@
-        [_connection disconnect];
-        [_fileHandle closeFile];
+
+        if( _upnp ) tr_upnpClose( _upnp );
+        _upnp = NULL;
+
+        if( _natpmp ) tr_natpmpClose( _natpmp );
+        _natpmp = NULL;
+
-        [super finalize];
-}
@@ -95 +155 @@
-        [old closeFile];
-        [old release];
+
+        if( _upnp ) tr_upnpClose( _upnp );
+        _upnp = NULL;
+
+        if( _natpmp ) tr_natpmpClose( _natpmp );
+        _natpmp = NULL;
-
-        _connectionThread = nil;
@@ -212 +278 @@
-        _acceptConnection = [[AsyncSocket allocWithZone:nil] initWithDelegate:self];
-
-
+self, 
-
-        if( success ) {
@@ -242 +308 @@
-        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector( _finish ) object:nil];       
-
+        if( _upnp ) tr_upnpClose( _upnp );
+        if( _natpmp ) tr_natpmpClose( _natpmp );
+
-        id old = _acceptConnection;
-        _acceptConnection = nil;
@@ -271 +340 @@
-        BOOL active = YES;
-        while( active && ! _done ) {
+                if( _upnp ) tr_upnpPulse( _upnp );
+                if( _natpmp ) tr_natpmpPulse( _natpmp );
+
-                NSDate *timeout = [[NSDate allocWithZone:nil] initWithTimeIntervalSinceNow:5.];
-                active = [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:timeout];
@@ -295 +367 @@
-        [super _setStartOffset:newStartOffset];
-}
+
+- (void) _setUPnP:(tr_upnp_t *) upnp {
+        _upnp = upnp;
+}
+
+- (void) _setNATPMP:(tr_natpmp_t *) natpmp {
+        _natpmp = natpmp;
+}
-@end
-
@@ -305 +385 @@
-        [_fileHandle closeFile];
-        [_fileHandle synchronizeFile];
+
+        if( _upnp ) tr_upnpClose( _upnp );
+        _upnp = NULL;
+
+        if( _natpmp ) tr_natpmpClose( _natpmp );
+        _natpmp = NULL;
-
-        [super finalize];
@@ -327 +413 @@
-        [old closeFile];
-        [old release];
+
+        if( _upnp ) tr_upnpClose( _upnp );
+        _upnp = NULL;
+
+        if( _natpmp ) tr_natpmpClose( _natpmp );
+        _natpmp = NULL;
-
-        _connectionThread = nil;
@@ -476 +568 @@
-        _acceptConnection = [[AsyncSocket allocWithZone:nil] initWithDelegate:self];
-
-
+self, 
-
-        if( success ) {
@@ -489 +581 @@
-- (void) _finish {
-        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector( _finish ) object:nil];       
+
+        if( _upnp ) tr_upnpClose( _upnp );
+        if( _natpmp ) tr_natpmpClose( _natpmp );
-
-        id old = _connection;
@@ -519 +614 @@
-        BOOL active = YES;
-        while( active && ! _done ) {
+                if( _upnp ) tr_upnpPulse( _upnp );
+                if( _natpmp ) tr_natpmpPulse( _natpmp );
+
-                NSDate *timeout = [[NSDate allocWithZone:nil] initWithTimeIntervalSinceNow:5.];
-                active = [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:timeout];
@@ -550 +648 @@
-        _fileNameQuoted = quoted;
-}
+
+- (void) _setUPnP:(tr_upnp_t *) upnp {
+        _upnp = upnp;
+}
+
+- (void) _setNATPMP:(tr_natpmp_t *) natpmp {
+        _natpmp = natpmp;
+}
-@end

trunk/Controllers/MVFileTransferController.m

@@ -140 +140 @@
-}
-
-+ (void) _setFileTransferPortRange {
-        NSRange range = NSRangeFromString( [[NSUserDefaults standardUserDefaults] stringForKey:@"JVFileTransferPortRange"] );
-        [MVFileTransfer setFileTransferPortRange:range];
-}
-
-#pragma mark -
-
@@ -157 +152 @@
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _fileTransferError: ) name:MVFileTransferErrorOccurredNotification object:nil];
-
-
+
+
+
+
+
-
-                _safeFileExtentions = [[NSSet allocWithZone:nil] initWithObjects:@"jpg",@"jpeg",@"gif",@"png",@"tif",@"tiff",@"psd",@"pdf",@"txt",@"rtf",@"html",@"htm",@"swf",@"mp3",@"wma",@"wmv",@"ogg",@"ogm",@"mov",@"mpg",@"mpeg",@"m1v",@"m2v",@"mp4",@"avi",@"vob",@"avi",@"asx",@"asf",@"pls",@"m3u",@"rmp",@"aif",@"aiff",@"aifc",@"wav",@"wave",@"m4a",@"m4p",@"m4b",@"dmg",@"udif",@"ndif",@"dart",@"sparseimage",@"cdr",@"dvdr",@"iso",@"img",@"toast",@"rar",@"sit",@"sitx",@"bin",@"hqx",@"zip",@"gz",@"tgz",@"tar",@"bz",@"bz2",@"tbz",@"z",@"taz",@"uu",@"uue",@"colloquytranscript",@"torrent",nil];

trunk/Languages/Dutch.lproj/Credits.rtf

@@ -1 @@
-
-
-
+
+
-{\colortbl;\red255\green255\blue255;\red19\green16\blue255;}
-\vieww9000\viewh8400\viewkind0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-\f0\b\fs24 \cf0 Ontwikkeling & Ontwerp
-f1\
+
-\pard\li359\fi-359\ql\qnatural
-
-2
-1
-
-
-2
+1
+0
+
+
+1
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
@@ -21 +19 @@
-
-\fs24 \cf0 IRC chatmotor
-f1\
-
-
-f3\
-2
+
+
+
+
+1
-\'a9 2003-2005 Timothy Hatcher onder de GPL v. 2\
-\'a9 2006 Timothy Hatcher onder de BSD License\
@@ -35 +33 @@
-
-\fs24 \cf0 SILC chatmotor
-f1\
-
-
-f3\
-2
+
+
+
+
+1
-\'a9 1997-2004 SILC Project onder de GPL v. 2\
-\'a9 2005-2006 SILC Project onder de GPL & BSD License\
@@ -51 +49 @@
-
-\fs24 \cf0 XML & XSLT motor
-f1\
-
-
-f3\
-2
-.
+
+
+
+
+1
+
-Zie de MIT-licentie voor meer details.\cf2 \ul \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://xmlsoft.org"}}{\fldrslt \cf2 \ulnone http://xmlsoft.org}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
@@ -67 +81 @@
-
-\fs24 \cf0 Reguliere-expressiekader
-f1\
-
-
-f3\
-2
+
+
+
+
+1
-\'a9 2002-2003 Aram Greenman onder de BSD-licentie\
-Zie de BSD-licentie voor meer details.\cf2 \ul \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://sf.net/projects/agkit"}}{\fldrslt \cf2 \ulnone http://sf.net/projects/agkit}}
-f4\
-
-
-3
+
+
+
+0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-\fs20 \cf0 Perl Compatible Regular Expressions library
-2
+1
-\'a9 1997-2006 Philip Hazel, University of Cambridge\
-Zie de PCRE-licentie voor meer details.\cf2 \ul \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://pcre.org"}}{\fldrslt \cf2 \ulnone http://pcre.org}}
-f4\
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
@@ -95 +109 @@
-
-\fs24 \cf0 Vensters met tabbladen
-f1\
-
-
-f3\
-2
+
+
+
+
+1
-\'a9 2001-2006 Adam Iser onder de GPL\
-Zie de GNU Public License versie 2 voor meer details.\cf2 \ul \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://adiumx.com"}}{\fldrslt \cf2 \ulnone http://adiumx.com}}
-f4\
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
@@ -113 +127 @@
-\pard\pardeftab720\ql\qnatural
-
-2
+1
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 Phil Larson\
@@ -135 +149 @@
-
-\fs24 \cf0 Colloquy.info hosting
-f1\
-
-
-2
-1
-
-
-f0\
+
+
+
+1
+0
+
+
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-\fs24 \cf0 Colloquy.info domeinnaam
-f1\
+
-\pard\li359\fi-359\ql\qnatural
-
-2
-1
-
-
-f0\
+1
+0
+
+
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
@@ -159 +173 @@
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-2
+1
-Duits: Alexander Kempgen\
-Nederlands: Wouter Goossens\
@@ -176 +190 @@
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-2
+1
-Jorge Salvador Caffarena\
-James Cox\
@@ -182 +196 @@
-Adam Downes\
-Josh Gibbs
-1
+0
-\pard\tx0\tx1120\tx2240\tx3360\tx4480\tx5600\tx6720\tx7840\tx8960\tx10080\tx11200\tx12320\tx13440\tx14560\tx15680\tx16800\tx17920\tx19040\tx20160\tx21280\tx22400\tx23520\tx24640\tx25760\tx26880\tx28000\tx29120\tx30240\tx31360\tx32480\tx33600\tx34720\ql\qnatural
-
-2
+1
-Charles Hartman\
-Steve Klingsporn\

trunk/Languages/Dutch.lproj/JVFileTransferPreferences.nib/classes.nib

@@ -3 +3 @@
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-
+AutoOpenPorts = id; change
-            CLASS = JVFileTransferPreferences; 
-            LANGUAGE = ObjC; 
-
+
+
+
+
+
+
-            SUPERCLASS = NSPreferencesModule; 
-        }, 

trunk/Languages/Dutch.lproj/JVFileTransferPreferences.nib/info.nib

@@ -4 +4 @@
-<dict>
-        <key>IBDocumentLocation</key>
-37 113 356 240 0 0 1024 746
+104 383 356 240 0 0 1440 878
-        <key>IBEditorPositions</key>
-        <dict>
-                <key>5</key>
-66 330 545 367 0 0 1024 746
+447 398 545 403 0 0 1440 878
-        </dict>
-        <key>IBFramework Version</key>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        <key>IBSystem Version</key>
-8C46
+9A321
-</dict>
-</plist>

trunk/Languages/English.lproj/Credits.rtf

@@ -1 @@
-
-
-
+
+
-{\colortbl;\red255\green255\blue255;\red19\green16\blue255;}
-\vieww9000\viewh8400\viewkind0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-\f0\b\fs24 \cf0 Engineering & Design
-f1\
+
-\pard\li359\fi-359\ql\qnatural
-
-2
-1
-
-
-2
+1
+0
+
+
+1
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
@@ -21 +19 @@
-
-\fs24 \cf0 IRC Chat Engine
-f1\
-
-
-f3\
-2
+
+
+
+
+1
-\'a9 2003-2005 Timothy Hatcher under the GPL v. 2\
-\'a9 2006 Timothy Hatcher under the BSD License\
@@ -35 +33 @@
-
-\fs24 \cf0 SILC Chat Engine
-f1\
-
-
-f3\
-2
+
+
+
+
+1
-\'a9 1997-2004 SILC Project under the GPL v. 2\
-
-
-
+
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://silcnet.org"}}{\fldrslt \cf2 \ulnone http://silcnet.org}}\ulnone \
@@ -52 +49 @@
-
-\fs24 \cf0 XML & XSLT Engine
-f1\
-
-
-f3\
-2
+
+
+
+
+1
-\'a9 1998-2006 Daniel Veillard under the MIT License\
-See the MIT License for more details.\cf2 \ul \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://xmlsoft.org"}}{\fldrslt \cf2 \ulnone http://xmlsoft.org}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
@@ -68 +81 @@
-
-\fs24 \cf0 Regular Expression Framework
-f1\
-
-
-f3\
-2
+
+
+
+
+1
-\'a9 2002-2003 Aram Greenman under the BSD License\
-See the BSD License for more details.\cf2 \ul \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://sf.net/projects/agkit"}}{\fldrslt \cf2 \ulnone http://sf.net/projects/agkit}}
-f4\
-
-
-3
+
+
+
+0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-\fs20 \cf0 Perl Compatible Regular Expressions library
-2
+1
-\'a9 1997-2006 Philip Hazel, University of Cambridge\
-See the PCRE License for more details.\cf2 \ul \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://pcre.org"}}{\fldrslt \cf2 \ulnone http://pcre.org}}
-f4\
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
@@ -96 +109 @@
-
-\fs24 \cf0 Tabbed Windows
-f1\
-
-
-f3\
-2
+
+
+
+
+1
-\'a9 2001-2006 Adam Iser under the GPL.\
-See the GNU Public License v. 2 for more details.\cf2 \ul \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://adiumx.com"}}{\fldrslt \cf2 \ulnone http://adiumx.com}}
-f4\
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
@@ -114 +127 @@
-\pard\pardeftab720\ql\qnatural
-
-2
+1
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 Phil Larson\
@@ -136 +149 @@
-
-\fs24 \cf0 Colloquy.info Hosting
-f1\
-
-
-2
-1
-
-
-f0\
+
+
+
+1
+0
+
+
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-\fs24 \cf0 Colloquy.info Domain Name
-f1\
+
-\pard\li359\fi-359\ql\qnatural
-
-2
-1
-
-
-f0\
+1
+0
+
+
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
@@ -160 +173 @@
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-2
+1
-German: Alexander Kempgen\
-Dutch: Wouter Goossens\
@@ -177 +190 @@
-\pard\tx560\tx1120\tx1680\tx224