fix pluralization of "got 1 peer"

diff --git a/NEWS b/NEWS
index f78ceddb3c2277fa591af0d43f156153ddfce2c8..18ec794fc9a2856551fbdc43ada86dc2ff326dd1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,85 +1,5 @@
-=== Transmission 1.80 (In Development) ===
+=== Transmission 1.80 (2010/MM/DD) ===
 [http://trac.transmissionbt.com/query?milestone=1.80&group=component&groupdesc=1&order=severity All tickets closed by this release]
-
-=== Transmission 1.80 beta 4 (2010/01/04) ===
-==== All Platforms ====
-  * Fix potential data loss by maliciously-crafted .torrent files
-  * Fix 1.80b2 bug in the libcurl glue code
-  * Fix 1.80b1 bug that could download too many torrent pieces
-  * Fix 1.80b1 bug with sending metadata to other peers
-  * Fix 1.80b1 crash in tr_fdSocketClose()
-  * Fix 1.80b1 crash when editing a torrent's trackers
-  * Fix minor display bug with zero-sized files in a torrent
-  * Fix "too many open files" issue in some environments
-  * Fix minor compiler warnings and tarball packaging issues
-  * Add an OS hint to not cache torrent files during torrent verification
-==== Mac ====
-  * Simplified Chinese localization
-  * Updated remaining 1.76 localizations except Turkish
-==== GTK+ ====
-  * Minor HiG improvements
-==== Web Client ====
-  * Show version information in the preferences dialog
-
-=== Transmission 1.77 (2010/01/04) ===
-[http://trac.transmissionbt.com/query?milestone=1.77&group=component&groupdesc=1&order=severity All tickets closed by this release]
-This is a maintenance release for OSes that bundle Transmission and are frozen at 1.7x.
-Users are encouraged to try the latest release (1.80 beta 4), which also has these fixes.
-==== All Platforms ====
-  * Fix potential data loss by maliciously-crafted .torrent files
-  * Fix minor build issues and packaging issues on various platforms
-  * Fix 1.7x error that could unpause or repause a torrent on startup
-  * Minor CPU speedups
-==== GTK+ ====
-  * Fix crash on shutdown
-  * Fix GIcon memory leak
-
-
-=== Transmission 1.80 beta 3 (2009/12/15) ===
-==== All Platforms ====
-  * Tracker announcement improvements
-  * Encrypted handshakes to peers now use less CPU
-  * Filter out spurious IP addresses obtained through LTEP
-  * Fix 1.80 beta 1 crash in magnet links when serving metadata to peers
-  * Fix 1.80 beta 1 bug that caused peer lists to be lost over time
-  * Fix 1.80 beta 1 bug that caused duplicate block downloads from peers
-  * Fix 1.80 beta 1 bug that incorrectly displayed some scrapes as failed
-  * Updated DHT library
-  * Fix minor memory leaks
-==== Mac ====
-  * Fix favicons in the tracker inspector tab
-  * Fix 1.80 beta 1 potential crash when removing trackers
-  * Fix 1.80 beta 1 crash when removing data files
-  * Fix 1.80 beta 1 issue with revealing the window when clicking on the dock icon
-  * German localization
-  * Various interface tweaks
-==== GTK+ ====
-  * Fix 1.80 beta 1 crash in the torrent properties dialog
-==== Web Client ====
-  * Ensure the context menu goes away when clicking on torrents
-  * Fix bug where the context menu could extend past the window's right or bottom edge
-
-=== Transmission 1.80 beta 2 (2009/12/10) ===
-==== All Platforms ====
-  * Fix 1.80 beta 1 tracker connection / announce bug
-  * Fix 1.80 beta 1 crash "Assertion failed: (a->byteCount == b->byteCount)" 
-  * Fix 1.80 beta 1 crash when being controlled by transmission-remote-dotnet
-  * Fix 1.80 beta 1 crash when a malformed magnet link is given to Transmission
-  * Better prefetching of local data that's being uploaded to peers
-==== Mac ====
-  * Fix 1.80 beta 1 IPv6 port check issue on Snow Leopard
-  * Fix 1.80 beta 1 bug when pasting a URL into the torrent window
-  * Updated Spanish, Italian, and Brazilian Portuguese localizations
-==== GTK+ ====
-  * Fix 1.80 beta 1 bug in "Copy Magnet Link to Clipboard" on non-GNOME desktops
-  * Support org.gnome.SessionManager interface for inhibiting hibernation
-  * Minor GNOME HIG improvements
-==== Web Client ====
-  * Fix the turtle drop-down in IE
-  * Add "Start When Added" checkbox when adding torrents
-  * Add Select All / Deselect All buttons
-
-=== Transmission 1.80 beta 1 (2009/12/03) ===
 ==== All Platforms ====
   * Magnet link support
   * If a torrent has multiple tracker tiers, announce to them in parallel
@@ -88,13 +8,19 @@ Users are encouraged to try the latest release (1.80 beta 4), which also has the
   * Append .part to incomplete files
   * Improved IPv6 support
   * Faster management of very large peer lists
-  * When seeding, prefetch the data we upload
-  * IPv6 support for the DHT (dht 0.12) 
+  * IPv6 support for the DHT (dht-0.13) 
   * Improved DHT bootstrapping
   * Improved PEX support
+  * Better prefetching of data
+  * Protect against potential data loss by maliciously-crafted torrent files
   * Brand-new torrents with no downloaded data don't have to wait in the "Verify Local Data" queue
+  * Encrypted handshakes to peers now use less CPU
+  * Fix "too many open files" issue in some environments
+  * Filter out spurious IP addresses obtained through LTEP
   * Fix potential crash on shutdown when port forwarding is disabled
-  * Various bug fixes and performance tweaks
+  * Fix 1.7x error that could unpause or repause a torrent on startup
+  * Add an OS hint to not cache torrent files during torrent verification
+  * Various smaller bug fixes and performance tweaks
   * Add first-time user prompt as per the proposed "Informed P2P User Act"
 ==== Mac ====
   * Redesigned trackers inspector tab with favicons and copy-paste functionality (paste lists of multiple trackers)
@@ -103,19 +29,40 @@ Users are encouraged to try the latest release (1.80 beta 4), which also has the
   * Moving data and incomplete folder are now handled by libtransmission
   * Improved reveal in Finder functionality on Snow Leopard
   * Various smaller behavior and interface tweaks
+  * German and Simplified Chinese localizations
+  * Removed Turkish localization because of lack of localizer
 ==== GTK+ ====
   * When creating a torrent, make it easier to auto-add that new torrent
   * Added support for adding torrents by URL
   * Add optional "download complete" sound using the XDG sound naming spec
+  * Support org.gnome.SessionManager interface for inhibiting hibernation
   * New statusbar "Ratio" icon submitted by jimmac
   * Fix minor memory leaks
+  * Minor GNOME HIG improvements
 ==== Daemon ====
   * Reload settings.json when receiving SIGHUP
   * When running as a daemon, send log messages to syslog
   * transmission-remote now allows per-torrent speed limits to be set
 ==== Web Client ====
-  * Add speed limit "turtle mode" support to the web client
+  * Add speed limit "turtle mode" support
   * Double-clicking a torrent opens/closes the torrent inspector
+  * Add "Start When Added" checkbox when adding torrents
+  * Add Select All / Deselect All buttons to the file inspector
+  * Add version information in the preferences dialog
+  * Ensure the context menu goes away when clicking on torrents
+  * Fix bug where the context menu could extend past the window's right or bottom edge
+  * Fix the turtle drop-down in IE
+
+=== Transmission 1.77 (2010/01/04) ===
+[http://trac.transmissionbt.com/query?milestone=1.77&group=component&groupdesc=1&order=severity All tickets closed by this release]
+==== All Platforms ====
+  * Protect against potential data loss by maliciously-crafted torrent files
+  * Fix minor build issues and packaging issues on various platforms
+  * Fix 1.7x error that could unpause or repause a torrent on startup
+  * Minor CPU speedups
+==== GTK+ ====
+  * Fix crash on shutdown
+  * Fix GIcon memory leak
 
 === Transmission 1.76 (2009/10/24) ===
 [http://trac.transmissionbt.com/query?milestone=1.76&group=component&groupdesc=1&order=severity All tickets closed by this release]

diff --git a/macosx/InfoTabButtonCell.m b/macosx/InfoTabButtonCell.m
index 4e0a596be5da78c27545ef55324137b6737f4ce1..6100d7ea4291f59186f859ce900c4d8d74296245 100644 (file)
--- a/macosx/InfoTabButtonCell.m
+++ b/macosx/InfoTabButtonCell.m
@@ -32,7 +32,7 @@
     
     NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
     [nc addObserver: self selector: @selector(updateControlTint:)
-        name: NSControlTintDidChangeNotification object: nil];
+        name: NSControlTintDidChangeNotification object: NSApp];
     
     fSelected = NO;
 }

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 5942103f6b25a7a9bd6669947e6270c5f5235297..8dc02e52c202babaf0a0de202c5da2653f069dc5 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -634,10 +634,10 @@ int trashDataFile(const char * filename)
     trackerStructs[oldTrackerCount].announce = (char *)[tracker UTF8String];
     trackerStructs[oldTrackerCount].tier = trackerStructs[oldTrackerCount-1].tier + 1;
     
-    const BOOL ok = tr_torrentSetAnnounceList(fHandle, trackerStructs, oldTrackerCount+1);
+    const BOOL success = tr_torrentSetAnnounceList(fHandle, trackerStructs, oldTrackerCount+1);
     tr_free(trackerStructs);
     
-    return ok;
+    return success;
 }
 
 - (void) removeTrackersAtIndexes: (NSIndexSet *) removeIndexes
@@ -654,8 +654,8 @@ int trashDataFile(const char * filename)
     for (NSUInteger oldIndex = [indexes firstIndex]; oldIndex != NSNotFound; oldIndex = [indexes indexGreaterThanIndex: oldIndex])
         trackerStructs[newCount++] = fInfo->trackers[oldIndex];
     
-    const BOOL ok = tr_torrentSetAnnounceList(fHandle, trackerStructs, newCount);
-    NSAssert1(ok, @"Removing tracker addresses failed");
+    const BOOL success = tr_torrentSetAnnounceList(fHandle, trackerStructs, newCount);
+    NSAssert(success, @"Removing tracker addresses failed");
     
     tr_free(trackerStructs);
 }

diff --git a/macosx/TrackerNode.m b/macosx/TrackerNode.m
index be1480e685e111082368dc08dd60f67519c01fe3..6646c84ff4fbb35e5b3574336937e15fbe13052f 100644 (file)
--- a/macosx/TrackerNode.m
+++ b/macosx/TrackerNode.m
@@ -108,7 +108,12 @@
         baseString = [NSLocalizedString(@"Last Announce", "Tracker last announce") stringByAppendingFormat: @": %@", dateString];
         if (fStat.hasAnnounced && fStat.lastAnnounceSucceeded)
         {
-            NSString * peerString = [NSString stringWithFormat: NSLocalizedString(@"got %d peers", "Tracker last announce"),
+            #warning after 1.8 fix ugly hack
+            NSString * peerString;
+            if (fStat.lastAnnouncePeerCount == 1 && [[[NSLocale currentLocale] localeIdentifier] hasPrefix: @"en_"])
+                peerString = NSLocalizedString(@"got 1 peer", "Tracker last announce");
+            else
+                peerString = [NSString stringWithFormat: NSLocalizedString(@"got %d peers", "Tracker last announce"),
                                         fStat.lastAnnouncePeerCount];
             baseString = [baseString stringByAppendingFormat: @" (%@)", peerString];
         }