diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 3b55c94c3..0674d252d 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -117,6 +117,8 @@ A28E1DBA0CFFD41800E16385 /* BottomBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A28E1DB80CFFD41800E16385 /* BottomBarView.m */; }; A28E1E160D00574A00E16385 /* ActionPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A28E1E150D00574A00E16385 /* ActionPopUpButton.m */; }; A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A2912C520A2956E80097A0CA /* PrefsWindow.nib */; }; + A29AF4F70D01BADC00D097EC /* DownArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = A29AF4F60D01BADC00D097EC /* DownArrow.png */; }; + A29AF4F90D01BAEB00D097EC /* UpArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = A29AF4F80D01BAEB00D097EC /* UpArrow.png */; }; A29B0C270BD15FEF0006F230 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = A2F8951E0A2D4BA500ED2127 /* Credits.rtf */; }; A29C8B370ACC6EB3000ED9F9 /* PortChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = A29C8B350ACC6EB3000ED9F9 /* PortChecker.m */; }; A2A1CB7A0BF29D5500AE959F /* PeerProgressIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1CB780BF29D5500AE959F /* PeerProgressIndicatorCell.m */; }; @@ -477,6 +479,8 @@ A28E1DDF0CFFD8EC00E16385 /* ButtonToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ButtonToolbarItem.h; path = macosx/ButtonToolbarItem.h; sourceTree = ""; }; A28E1E140D00574A00E16385 /* ActionPopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActionPopUpButton.h; path = macosx/ActionPopUpButton.h; sourceTree = ""; }; A28E1E150D00574A00E16385 /* ActionPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ActionPopUpButton.m; path = macosx/ActionPopUpButton.m; sourceTree = ""; }; + A29AF4F60D01BADC00D097EC /* DownArrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownArrow.png; path = macosx/Images/DownArrow.png; sourceTree = ""; }; + A29AF4F80D01BAEB00D097EC /* UpArrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = UpArrow.png; path = macosx/Images/UpArrow.png; sourceTree = ""; }; A29C8B340ACC6EB3000ED9F9 /* PortChecker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PortChecker.h; path = macosx/PortChecker.h; sourceTree = ""; }; A29C8B350ACC6EB3000ED9F9 /* PortChecker.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PortChecker.m; path = macosx/PortChecker.m; sourceTree = ""; }; A2A1CB770BF29D5500AE959F /* PeerProgressIndicatorCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PeerProgressIndicatorCell.h; path = macosx/PeerProgressIndicatorCell.h; sourceTree = ""; }; @@ -847,6 +851,8 @@ A2FB06950BFF484A0095564D /* Globe.png */, A261A8250C6A0D68003BAFDA /* Error.png */, A2F1511F0CD438BA001F3B0E /* Lock.png */, + A29AF4F80D01BAEB00D097EC /* UpArrow.png */, + A29AF4F60D01BADC00D097EC /* DownArrow.png */, A2F151150CD438A4001F3B0E /* YellowDot.png */, A2F151160CD438A4001F3B0E /* RedDot.png */, A2F151170CD438A4001F3B0E /* GreenDot.png */, @@ -1499,6 +1505,8 @@ A22D3AA80D00D1790079CFED /* TurtleGraphite.png in Resources */, A22D3AAE0D00D22A0079CFED /* ActionPopUp.png in Resources */, A22D3ABA0D00D31F0079CFED /* BottomBackInactive.png in Resources */, + A29AF4F70D01BADC00D097EC /* DownArrow.png in Resources */, + A29AF4F90D01BAEB00D097EC /* UpArrow.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/macosx/Controller.m b/macosx/Controller.m index c10385c01..4e87b7389 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1403,10 +1403,8 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi float downloadRate, uploadRate; tr_torrentRates(fLib, & downloadRate, & uploadRate); - [fTotalDLField setStringValue: [NSLocalizedString(@"DL: ", "Status bar -> total download") - stringByAppendingString: [NSString stringForSpeed: downloadRate]]]; - [fTotalULField setStringValue: [NSLocalizedString(@"UL: ", "Status bar -> total upload") - stringByAppendingString: [NSString stringForSpeed: uploadRate]]]; + [fTotalDLField setStringValue: [NSString stringForSpeed: downloadRate]]; + [fTotalULField setStringValue: [NSString stringForSpeed: uploadRate]]; } } diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib index 26f07bec1..91e9c4f5b 100644 --- a/macosx/English.lproj/MainMenu.nib/info.nib +++ b/macosx/English.lproj/MainMenu.nib/info.nib @@ -10,7 +10,8 @@ 5 IBOpenObjects - 2 + 1480 + 21 IBSystem Version 9B18 diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib index 4a037a29b..bdbdc7a7c 100644 Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/macosx/Images/DownArrow.png b/macosx/Images/DownArrow.png new file mode 100644 index 000000000..d5aea4e72 Binary files /dev/null and b/macosx/Images/DownArrow.png differ diff --git a/macosx/Images/UpArrow.png b/macosx/Images/UpArrow.png new file mode 100644 index 000000000..1914528c4 Binary files /dev/null and b/macosx/Images/UpArrow.png differ