#
# patch "ChangeLog"
#  from [f119869c4fccae4bc126688d540d833890641703]
#    to [3a2345fc6a54f3e2e20c50da572852a27b5afd29]
#
# patch "netsync.cc"
#  from [c4933c5062e859a98b69e9dfa872b45a5be919da]
#    to [d3b17d5f347bc85bba79e1db4b77268e7983f8b7]
#
========================================================================
--- ChangeLog	f119869c4fccae4bc126688d540d833890641703
+++ ChangeLog	3a2345fc6a54f3e2e20c50da572852a27b5afd29
@@ -1,5 +1,11 @@
 2005-09-22  Benoît Dejean  <address@hidden>

+	* netsync.cc: Reverted changes
+	from f0a632bf14468b6e03a488d6f1a64ef18b61d04c
+	to   4f7f638954c79c54460d04c3be111acad8b26dd3
+
+2005-09-22  Benoît Dejean  <address@hidden>
+
 	* lua.cc (monotone_gettext_for_lua): New function.
 	* po/POTFILES.in: Added std_hooks.lua.
 	* std_hooks.lua: One more string for i18n.
========================================================================
--- netsync.cc	c4933c5062e859a98b69e9dfa872b45a5be919da
+++ netsync.cc	d3b17d5f347bc85bba79e1db4b77268e7983f8b7
@@ -661,34 +661,34 @@
 session::setup_client_tickers()
 {
   // xgettext: please use short message and try to avoid multibytes chars
-  byte_in_ticker.reset(new ticker(N_("bytes in"), ">", 1024, true));
+  byte_in_ticker.reset(new ticker(_("bytes in"), ">", 1024, true));
   // xgettext: please use short message and try to avoid multibytes chars
-  byte_out_ticker.reset(new ticker(N_("bytes out"), "<", 1024, true));
+  byte_out_ticker.reset(new ticker(_("bytes out"), "<", 1024, true));
   if (role == sink_role)
     {
       // xgettext: please use short message and try to avoid multibytes chars
-      revision_checked_ticker.reset(new ticker(N_("revs written"), "w", 1));
+      revision_checked_ticker.reset(new ticker(_("revs written"), "w", 1));
       // xgettext: please use short message and try to avoid multibytes chars
-      cert_in_ticker.reset(new ticker(N_("certs in"), "c", 3));
+      cert_in_ticker.reset(new ticker(_("certs in"), "c", 3));
       // xgettext: please use short message and try to avoid multibytes chars
-      revision_in_ticker.reset(new ticker(N_("revs in"), "r", 1));
+      revision_in_ticker.reset(new ticker(_("revs in"), "r", 1));
     }
   else if (role == source_role)
     {
       // xgettext: please use short message and try to avoid multibytes chars
-      cert_out_ticker.reset(new ticker(N_("certs out"), "C", 3));
+      cert_out_ticker.reset(new ticker(_("certs out"), "C", 3));
       // xgettext: please use short message and try to avoid multibytes chars
-      revision_out_ticker.reset(new ticker(N_("revs out"), "R", 1));
+      revision_out_ticker.reset(new ticker(_("revs out"), "R", 1));
     }
   else
     {
       I(role == source_and_sink_role);
       // xgettext: please use short message and try to avoid multibytes chars
-      revision_checked_ticker.reset(new ticker(N_("revs written"), "w", 1));
+      revision_checked_ticker.reset(new ticker(_("revs written"), "w", 1));
       // xgettext: please use short message and try to avoid multibytes chars
-      revision_in_ticker.reset(new ticker(N_("revs in"), "r", 1));
+      revision_in_ticker.reset(new ticker(_("revs in"), "r", 1));
       // xgettext: please use short message and try to avoid multibytes chars
-      revision_out_ticker.reset(new ticker(N_("revs out"), "R", 1));
+      revision_out_ticker.reset(new ticker(_("revs out"), "R", 1));
     }
 }