# 
# patch "ChangeLog"
#  from [f88eb466956b04642c1d0e32298abfeba5b46d2d]
#    to [6c05c248e9453a8de1a116bfad5f71df9b11c76d]
# 
# patch "netsync.cc"
#  from [d1db1316c8a727e34dc4f285bc20d1beed0c8fc7]
#    to [d73ec460c4c3fd85eb6c5098180185e470714227]
# 
========================================================================
--- ChangeLog	f88eb466956b04642c1d0e32298abfeba5b46d2d
+++ ChangeLog	6c05c248e9453a8de1a116bfad5f71df9b11c76d
@@ -1,5 +1,10 @@
 2005-08-22  Nathaniel Smith  <address@hidden>
 
+	* netsync.cc (process_error_cmd, run_netsync_protocol): Remove
+	some newlines to avoid translation noise.
+
+2005-08-22  Nathaniel Smith  <address@hidden>
+
 	* po/LINGUAS, po/ja.po: Remove ja translation again, it seems to
 	be corrupt.
 
========================================================================
--- netsync.cc	d1db1316c8a727e34dc4f285bc20d1beed0c8fc7
+++ netsync.cc	d73ec460c4c3fd85eb6c5098180185e470714227
@@ -1678,7 +1678,7 @@
 bool 
 session::process_error_cmd(string const & errmsg) 
 {
-  throw bad_decode(F("received network error: %s\n") % errmsg);
+  throw bad_decode(F("received network error: %s") % errmsg);
 }
 
 bool 
@@ -3810,7 +3810,7 @@
   catch (Netxx::Exception & e)
     {      
       end_platform_netsync();
-      throw oops((F("network error: %s\n") % e.what()).str());;
+      throw oops((F("network error: %s") % e.what()).str());;
     }
   end_platform_netsync();
 }