From 8850f7b070c9f4901022b6cde28f51c7ada65cde Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Fri, 22 Feb 2008 15:39:20 +0000
Subject: [PATCH] update strings file

---
 macosx/English.lproj/Localizable.strings | Bin 53962 -> 53210 bytes
 macosx/NSStringAdditions.m               |   2 +-
 macosx/Torrent.m                         |   7 +++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings
index 4979c2e615e595a11fb17496b0739454c84b68aa..8cf8561a279699b75940a8ec7469c5978223a1bc 100644
GIT binary patch
delta 203
zcmX@Ll=;?t<_))a*h?5P8FCp?CnvH>PnP2~nj9r6vH1^g85636Ajjl=0!o_;1cew;
zB#sH`O*S~rH+h1b-sBGwY@1IBtDq>@tRs4b6-kHW<W<sKlYOL>CLd5#nLL5-#^z5l
zB8*TY@+K>sW}B=h!8KV-E@$$C-CUbF<ZFy4CsgZgRtVlu0%A-yIKejgi?|SD$Yfp#
L>CG38|Kb7wluJX}

delta 491
zcmcaLpZU~M<_))aCQlGnU@c-OWyqU+kWqB<yAvFffAN@1b}$f|eBp!|kj-bTz@W-t
zz+l9X!l1yA!BE7Y1f*?&SP3X@$e;oiPhm)8sAMPximC!ts!aaKFFsj8SYopqZy6I7
zEAH^?z^%B$&t-^gMJ_`oLmpO3K$gQS2o#i@ED&fi`5(8`<S>CFSnRM8G=SS-CCI}L
zwPW%}A#r(_vmtgt%>;X-m?4!RdGh(gvXc#@^)@dP)MA7gviXD1HC8P4Jd=R?MbZ%H
zK1fg?`v~an$?qjZ5iS4*PMna=WC1>o$**`%Z03^^VVs=M!8R#?WAYm5yvg?t^8szo
zo7}g9Yx1|nTATf3f{cN#uu^sf20#%*J`h`h!ygt8NaB+p@@Y?YP!rjF&VNJ6<_AZ9
GaRC6qaflQE

diff --git a/macosx/NSStringAdditions.m b/macosx/NSStringAdditions.m
index cf60a6b03..538411cbf 100644
--- a/macosx/NSStringAdditions.m
+++ b/macosx/NSStringAdditions.m
@@ -104,7 +104,7 @@
 
 + (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds
 {
-    return [NSString timeString: seconds showSeconds:showSeconds maxDigits: INT_MAX];
+    return [NSString timeString: seconds showSeconds:showSeconds maxDigits: UINT_MAX];
 }
 
 + (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds maxDigits: (NSUInteger) max
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 7c732198e..615211584 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -992,11 +992,10 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     
     if ([self isError])
     {
+        string = NSLocalizedString(@"Error", "Torrent -> status string");
         NSString * errorString = [self errorMessage];
-        if (!errorString || [errorString isEqualToString: @""])
-            string = NSLocalizedString(@"Error", "Torrent -> status string");
-        else
-            string = [NSLocalizedString(@"Error: ", "Torrent -> status string") stringByAppendingString: errorString];
+        if (errorString && ![errorString isEqualToString: @""])
+            string = [NSString stringWithFormat: @"%@: %@", string, errorString];
     }
     else
     {