From 32b41bb72e33dbc7d0933cc01de7b906874f1868 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Tue, 18 Mar 2008 22:11:43 +0000
Subject: [PATCH] more string folding

---
 macosx/CreatorWindowController.m         |   6 +++---
 macosx/DragOverlayWindow.m               |   6 +++---
 macosx/English.lproj/Localizable.strings | Bin 55288 -> 55156 bytes
 macosx/InfoWindowController.m            |  12 +++++++-----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/macosx/CreatorWindowController.m b/macosx/CreatorWindowController.m
index bc522c034..a2aff28f9 100644
--- a/macosx/CreatorWindowController.m
+++ b/macosx/CreatorWindowController.m
@@ -122,10 +122,10 @@
         NSString * fileString;
         int count = fInfo->fileCount;
         if (count != 1)
-            fileString = [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Create torrent -> info"), count];
+            fileString = [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Create torrent -> info"), count];
         else
-            fileString = NSLocalizedString(@"1 File, ", "Create torrent -> info");
-        statusString = [fileString stringByAppendingString: statusString];
+            fileString = NSLocalizedString(@"1 File", "Create torrent -> info");
+        statusString = [NSString stringWithFormat: @"%@, %@", fileString, statusString];
     }
     [fStatusField setStringValue: statusString];
     
diff --git a/macosx/DragOverlayWindow.m b/macosx/DragOverlayWindow.m
index 12f2db05a..a0104c08d 100644
--- a/macosx/DragOverlayWindow.m
+++ b/macosx/DragOverlayWindow.m
@@ -118,10 +118,10 @@
     {
         NSString * fileString;
         if (fileCount == 1)
-            fileString = NSLocalizedString(@"1 File, ", "Drag overlay -> torrents");
+            fileString = NSLocalizedString(@"1 File", "Drag overlay -> torrents");
         else
-            fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Drag overlay -> torrents"), fileCount];
-        secondString = [fileString stringByAppendingString: secondString];
+            fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Drag overlay -> torrents"), fileCount];
+        secondString = [NSString stringWithFormat: @"%@, %@", fileString, secondString];
     }
     
     NSImage * icon;
diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings
index db7d07aadf03bfcec006a61a9937db8f2916ac16..906ba9347d49015986193aba252059a0a090ef14 100644
GIT binary patch
delta 197
zcmeydp83l<<_#Y>CUZ>ZnS3BkVe&mbnaN`OW}827FtJQFV3vYPh)wR|wVC`xLT&Os
zUXIBwk`|MX@fJ;fCnPZ0hmUKr4=>;30|I`V8~9T=Cx4JrnY=(!08MeyWD!XNu$%y|
z(B=lI2KC7w9AqXhD3X}0<J>VhU?$&W1*aR6oP;K?$Pt;Wr6RKVj<c8^P`+uhK!L*K
gI470K358OV4T=IL^As8Y#f>KKE0)+ir#L1B0J$hilmGw#

delta 277
zcmeyej`_!W<_#Y>CSPE&*u0GM6!T;mHMz<ABseBZ2?|W!#%DD7jDx~t8A*xBS(8<O
z;sTRj_)ATGAnG;wfB*}x8$%{T4nrzKF@p|+!sPvY(##-Qky#Um3TaMRX+s7Th7<+`
z1{A#vstiU9DwEAQ%_mO~FxhOzpTY@u2p1RE<Y|%yI2_`^Z-`_V$ohqn;$UZNTyG5a
z2vGm#KavgVlcs7+_H(*0xyEtNW&>wCy~zSaeUm>FDoidYmzaE~fNS!E!i3H9ims&q
E0GqZ}-2eap

diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 58c7c6c1f..7ae24a4a0 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -222,8 +222,10 @@ typedef enum
                 fileCount += [torrent fileCount];
             }
             
-            [fBasicInfoField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%d Files, %@ Total",
-                                    "Inspector -> above tabs -> selected torrents"), fileCount, [NSString stringForFileSize: size]]];
+            [fBasicInfoField setStringValue: [NSString stringWithFormat: @"%@, %@",
+                [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Inspector -> selected torrents"), fileCount],
+                [NSString stringWithFormat: NSLocalizedString(@"%@ Total", "Inspector -> selected torrents"),
+                [NSString stringForFileSize: size]]]];
             [fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes",
                                             "Inspector -> above tabs -> selected torrents"), size]];
         }
@@ -362,11 +364,11 @@ typedef enum
             NSString * fileString;
             int fileCount = [torrent fileCount];
             if (fileCount == 1)
-                fileString = NSLocalizedString(@"1 File, ", "Inspector -> above tabs -> selected torrents");
+                fileString = NSLocalizedString(@"1 File", "Inspector -> above tabs -> selected torrents");
             else
-                fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files, ",
+                fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files",
                                 "Inspector -> above tabs -> selected torrents"), fileCount];
-            basicString = [fileString stringByAppendingString: basicString];
+            basicString = [NSString stringWithFormat: @"%@, %@", fileString, basicString];
         }
         [fBasicInfoField setStringValue: basicString];
         [fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes",