Changeset 3283

Timestamp:

Oct 4, 2007, 3:45:52 AM (15 years ago)

Author:

livings124

Message:

rename en to English (other languages will be changed to i18n names by the next release, though)

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• Transmission.xcodeproj/project.pbxproj (modified) (11 diffs)
• macosx/Controller.m (modified) (1 diff)
• macosx/English.lproj (moved) (moved from trunk/macosx/en.lproj)
• macosx/Torrent.m (modified) (1 diff)

trunk/NEWS

@@ -12 +12 @@
    + Inspector can be resized vertically in Peers and Files tabs
    + Optimizations to decrease memory usage
-   + Various smaller interface improvements
+   + Various smaller interface additions and improvements
 
 0.82 (2007/09/09)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -498 +498 @@
                 A2D4F0820A915F6600890C32 /* RedDot.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = RedDot.tiff; path = macosx/Images/RedDot.tiff; sourceTree = "<group>"; };
                 A2D4F0840A915F7200890C32 /* GreenDot.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GreenDot.tiff; path = macosx/Images/GreenDot.tiff; sourceTree = "<group>"; };
+                A2D688850CB4984B009BEC3A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/MainMenu.nib; sourceTree = "<group>"; };
+                A2D688A70CB4986A009BEC3A /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = macosx/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+                A2D688AB0CB49889009BEC3A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/InfoWindow.nib; sourceTree = "<group>"; };
+                A2D688D20CB498AA009BEC3A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/MessageWindow.nib; sourceTree = "<group>"; };
+                A2D688EB0CB498BE009BEC3A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/PrefsWindow.nib; sourceTree = "<group>"; };
+                A2D689100CB498F2009BEC3A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/Creator.nib; sourceTree = "<group>"; };
+                A2D6891B0CB4990E009BEC3A /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = macosx/English.lproj/Localizable.strings; sourceTree = "<group>"; };
                 A2DF37040C220D03006523C1 /* CreatorWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CreatorWindowController.h; path = macosx/CreatorWindowController.h; sourceTree = "<group>"; };
                 A2DF37050C220D03006523C1 /* CreatorWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CreatorWindowController.m; path = macosx/CreatorWindowController.m; sourceTree = "<group>"; };
@@ -505 +512 @@
                 A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButton.png; path = macosx/Images/SpeedLimitButton.png; sourceTree = "<group>"; };
                 A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
-                A2FA34610CA323EA00C432EE /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = macosx/en.lproj/Creator.nib; sourceTree = "<group>"; };
-                A2FA34620CA323EA00C432EE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = macosx/en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-                A2FA34630CA323EA00C432EE /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = macosx/en.lproj/InfoWindow.nib; sourceTree = "<group>"; };
-                A2FA34640CA323EA00C432EE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = macosx/en.lproj/Localizable.strings; sourceTree = "<group>"; };
-                A2FA34650CA323EA00C432EE /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = macosx/en.lproj/MainMenu.nib; sourceTree = "<group>"; };
-                A2FA34660CA323EA00C432EE /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = macosx/en.lproj/MessageWindow.nib; sourceTree = "<group>"; };
-                A2FA34670CA323EA00C432EE /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = macosx/en.lproj/PrefsWindow.nib; sourceTree = "<group>"; };
                 A2FB057C0BFEB6800095564D /* DragOverlayView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DragOverlayView.h; path = macosx/DragOverlayView.h; sourceTree = "<group>"; };
                 A2FB057D0BFEB6800095564D /* DragOverlayView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DragOverlayView.m; path = macosx/DragOverlayView.m; sourceTree = "<group>"; };
@@ -1589 +1589 @@
                         isa = PBXVariantGroup;
                         children = (
+                                A2D688A70CB4986A009BEC3A /* English */,
                                 A22BC9AE0C5C505200F5FB72 /* Korean */,
                                 A22BCA2E0C5D5CDA00F5FB72 /* Italian */,
@@ -1594 +1595 @@
                                 A22A7EBC0C627FC200E30364 /* Greek */,
                                 A26039FE0C6338FB00F5FDFD /* Spanish */,
-                                A2FA34620CA323EA00C432EE /* en */,
                         );
                         name = InfoPlist.strings;
@@ -1602 +1602 @@
                         isa = PBXVariantGroup;
                         children = (
-                                A2FA34650CA323EA00C432EE /* en */,
+                                A2D688850CB4984B009BEC3A /* English */,
                                 A22BC9B10C5C505200F5FB72 /* Korean */,
                                 A22BCA310C5D5CDA00F5FB72 /* Italian */,
@@ -1616 +1616 @@
                         isa = PBXVariantGroup;
                         children = (
-                                A2FA34630CA323EA00C432EE /* en */,
+                                A2D688AB0CB49889009BEC3A /* English */,
                                 A22BC9AF0C5C505200F5FB72 /* Korean */,
                                 A22BCA2F0C5D5CDA00F5FB72 /* Italian */,
@@ -1630 +1630 @@
                         isa = PBXVariantGroup;
                         children = (
-                                A2FA34660CA323EA00C432EE /* en */,
+                                A2D688D20CB498AA009BEC3A /* English */,
                                 A22BC9B20C5C505300F5FB72 /* Korean */,
                                 A22BCA320C5D5CDA00F5FB72 /* Italian */,
@@ -1644 +1644 @@
                         isa = PBXVariantGroup;
                         children = (
+                                A2D6891B0CB4990E009BEC3A /* English */,
                                 A22BC9B00C5C505200F5FB72 /* Korean */,
                                 A22BCA300C5D5CDA00F5FB72 /* Italian */,
@@ -1650 +1651 @@
                                 A2603A000C6338FB00F5FDFD /* Spanish */,
                                 A2C19EDD0C676F5200E0B235 /* French */,
-                                A2FA34640CA323EA00C432EE /* en */,
                         );
                         name = Localizable.strings;
@@ -1658 +1658 @@
                         isa = PBXVariantGroup;
                         children = (
-                                A2FA34670CA323EA00C432EE /* en */,
+                                A2D688EB0CB498BE009BEC3A /* English */,
                                 A22BC9B30C5C505300F5FB72 /* Korean */,
                                 A22BCA330C5D5CDA00F5FB72 /* Italian */,
@@ -1672 +1672 @@
                         isa = PBXVariantGroup;
                         children = (
-                                A2FA34610CA323EA00C432EE /* en */,
+                                A2D689100CB498F2009BEC3A /* English */,
                                 A2AE68360C628A58008753C9 /* Korean */,
                                 A2AE68370C628A5E008753C9 /* Italian */,

trunk/macosx/Controller.m

@@ -167 +167 @@
         fDefaults = [NSUserDefaults standardUserDefaults];
         
+        #warning move nib names to individual classes
         fMessageController = [[MessageWindowController alloc] initWithWindowNibName: @"MessageWindow"];
         fInfoController = [[InfoWindowController alloc] initWithWindowNibName: @"InfoWindow"];

trunk/macosx/Torrent.m

@@ -805 +805 @@
         dic = [NSMutableDictionary dictionaryWithObjectsAndKeys:
             [NSNumber numberWithInt: peer->from], @"From",
-            [NSString stringWithCString: (char *) peer->addr encoding: NSUTF8StringEncoding], @"IP",
+            [NSString stringWithCString: (char *)peer->addr encoding: NSUTF8StringEncoding], @"IP",
             [NSNumber numberWithInt: peer->port], @"Port",
             [NSNumber numberWithFloat: peer->progress], @"Progress",