Changeset 4097

Timestamp:

Dec 8, 2007, 8:17:25 PM (15 years ago)

Author:

livings124

Message:

update message log and strings file

Location:

trunk/macosx

Files:

• English.lproj/Localizable.strings (modified) (4 diffs)
• MessageWindowController.m (modified) (1 diff)

trunk/macosx/English.lproj/Localizable.strings

@@ -178 +178 @@
 "Always Download" = "Always Download";
 
+/* All toolbar item -> label */
+"Apply All" = "Apply All";
+
+/* Selected toolbar item -> label */
+"Apply Selected" = "Apply Selected";
+
 /* inspector -> peer table -> header tool tip */
 "Available" = "Available";
@@ -297 +303 @@
 "Encrypted Connection" = "Encrypted Connection";
 
-/* Torrent -> status string */
-"Error" = "Error";
-
 /* Ratio invalid
    Transfer speed invalid */
 "error" = "error";
+
+/* Torrent -> status string */
+"Error" = "Error";
 
 /* Torrent -> status string */
@@ -415 +421 @@
 "Open" = "Open";
 
+/* Open toolbar item -> palette label */
+"Open Torrent Files" = "Open Torrent Files";
+
 /* Open toolbar item -> tooltip */
 "Open torrent files" = "Open torrent files";
 
-/* Open toolbar item -> palette label */
-"Open Torrent Files" = "Open Torrent Files";
-
 /* Inspector -> title */
 "Options" = "Options";
 
-/* Pause toolbar item -> label */
-"Pause" = "Pause";
-
-/* Pause All toolbar item -> label */
+/* All toolbar item -> palette label */
+"Pause / Resume All" = "Pause / Resume All";
+
+/* Selected toolbar item -> palette label */
+"Pause / Resume Selected" = "Pause / Resume Selected";
+
+/* All toolbar item -> label */
 "Pause All" = "Pause All";
 
-/* Pause All toolbar item -> tooltip */
+/* All toolbar item -> tooltip */
 "Pause all transfers" = "Pause all transfers";
 
-/* Pause toolbar item -> palette label */
+/* Selected toolbar item -> label */
 "Pause Selected" = "Pause Selected";
 
-/* Pause toolbar item -> tooltip */
+/* Selected toolbar item -> tooltip */
 "Pause selected transfers" = "Pause selected transfers";
 
@@ -514 +523 @@
 "Requesting data from peer" = "Requesting data from peer";
 
-/* Resume toolbar item -> label */
-"Resume" = "Resume";
-
-/* Resume All toolbar item -> label */
+/* All toolbar item -> label */
 "Resume All" = "Resume All";
 
-/* Resume All toolbar item -> tooltip */
+/* All toolbar item -> tooltip */
 "Resume all transfers" = "Resume all transfers";
 
-/* Resume toolbar item -> palette label */
+/* Selected toolbar item -> label */
 "Resume Selected" = "Resume Selected";
 
-/* Resume toolbar item -> tooltip */
+/* Selected toolbar item -> tooltip */
 "Resume selected transfers" = "Resume selected transfers";
 

trunk/macosx/MessageWindowController.m

@@ -331 +331 @@
     }
     
-    NSString * fileString, * file = [message objectForKey: @"File"];
-    if ((file = [message objectForKey: @"File"]))
-        fileString = [NSString stringWithFormat: @" %@:%d", [message objectForKey: @"File"],
-                                        [[message objectForKey: @"Line"] intValue]];
-    else
-        fileString = @"";
+    NSString * file = [message objectForKey: @"File"],
+        * fileString = file ? [NSString stringWithFormat: @" %@:%@", [message objectForKey: @"File"], [message objectForKey: @"Line"]]
+                            : @"";
     
     return [NSString stringWithFormat: @"%@%@ [%@] %@", [message objectForKey: @"Date"], fileString, level,