#
#
# patch "ChangeLog"
#  from [cd2b2f2767adbbe748ea50de40972d80effdd57f]
#    to [428fa4b4c88b4b5bd153258040295561a7affc1e]
#
# patch "annotate.cc"
#  from [a275b753f2a4bc209825371eae5c6b17eebc233d]
#    to [70b0c534d5e0e001530c307130255af3f2aff402]
#
# patch "netsync.cc"
#  from [b570c84be31b69947360e3e58bbd9e635bdb5a48]
#    to [976872ee6fdd486c92367f0f9328abf442cb747d]
#
============================================================
--- ChangeLog	cd2b2f2767adbbe748ea50de40972d80effdd57f
+++ ChangeLog	428fa4b4c88b4b5bd153258040295561a7affc1e
@@ -1,5 +1,10 @@
 2006-04-08  Nathaniel Smith  <address@hidden>

+	* netsync.cc, annotate.cc: Turn all ticker labels from _() to
+	N_(), to match Benoît's changes to the ticker class.
+
+2006-04-08  Nathaniel Smith  <address@hidden>
+
 	* AUTHORS: Add Thomas Keller.

 2006-04-08  Nathaniel Smith  <address@hidden>
============================================================
--- annotate.cc	a275b753f2a4bc209825371eae5c6b17eebc233d
+++ annotate.cc	70b0c534d5e0e001530c307130255af3f2aff402
@@ -787,7 +787,7 @@
   annotate_node_work workunit(acp, lineage, rid, file_node->self); //, fpath);
   nodes_to_process.push_back(workunit);

-  std::auto_ptr<ticker> revs_ticker(new ticker(_("revs done"), "r", 1));
+  std::auto_ptr<ticker> revs_ticker(new ticker(N_("revs done"), "r", 1));
   revs_ticker->set_total(paths_to_nodes.size() + 1);
   while (nodes_to_process.size() && !acp->is_complete())
     {
============================================================
--- netsync.cc	b570c84be31b69947360e3e58bbd9e635bdb5a48
+++ netsync.cc	976872ee6fdd486c92367f0f9328abf442cb747d
@@ -705,30 +705,30 @@
 session::setup_client_tickers()
 {
   // xgettext: please use short message and try to avoid multibytes chars
-  byte_in_ticker.reset(new ticker(_("bytes in"), ">", 1024, true));
+  byte_in_ticker.reset(new ticker(N_("bytes in"), ">", 1024, true));
   // xgettext: please use short message and try to avoid multibytes chars
-  byte_out_ticker.reset(new ticker(_("bytes out"), "<", 1024, true));
+  byte_out_ticker.reset(new ticker(N_("bytes out"), "<", 1024, true));
   if (role == sink_role)
     {
       // xgettext: please use short message and try to avoid multibytes chars
-      cert_in_ticker.reset(new ticker(_("certs in"), "c", 3));
+      cert_in_ticker.reset(new ticker(N_("certs in"), "c", 3));
       // xgettext: please use short message and try to avoid multibytes chars
-      revision_in_ticker.reset(new ticker(_("revs in"), "r", 1));
+      revision_in_ticker.reset(new ticker(N_("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(_("certs out"), "C", 3));
+      cert_out_ticker.reset(new ticker(N_("certs out"), "C", 3));
       // xgettext: please use short message and try to avoid multibytes chars
-      revision_out_ticker.reset(new ticker(_("revs out"), "R", 1));
+      revision_out_ticker.reset(new ticker(N_("revs out"), "R", 1));
     }
   else
     {
       I(role == source_and_sink_role);
       // xgettext: please use short message and try to avoid multibytes chars
-      revision_in_ticker.reset(new ticker(_("revs in"), "r", 1));
+      revision_in_ticker.reset(new ticker(N_("revs in"), "r", 1));
       // xgettext: please use short message and try to avoid multibytes chars
-      revision_out_ticker.reset(new ticker(_("revs out"), "R", 1));
+      revision_out_ticker.reset(new ticker(N_("revs out"), "R", 1));
     }
 }

@@ -2794,11 +2794,11 @@
     L(FL("including branch %s") % *i);

   // xgettext: please use short message and try to avoid multibytes chars
-  ticker revisions_ticker(_("revisions"), "r", 64);
+  ticker revisions_ticker(N_("revisions"), "r", 64);
   // xgettext: please use short message and try to avoid multibytes chars
-  ticker certs_ticker(_("certificates"), "c", 256);
+  ticker certs_ticker(N_("certificates"), "c", 256);
   // xgettext: please use short message and try to avoid multibytes chars
-  ticker keys_ticker(_("keys"), "k", 1);
+  ticker keys_ticker(N_("keys"), "k", 1);

   set<revision_id> revision_ids;
   set<rsa_keypair_id> inserted_keys;