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 db7d07aad..906ba9347 100644
Binary files a/macosx/English.lproj/Localizable.strings and b/macosx/English.lproj/Localizable.strings differ
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",