#
# patch "ChangeLog"
#  from [50802639ded49c79d2f4bbfa018f0adb56206858]
#    to [2c317bf9f24509c9cf8a705ef5a360316918de18]
#
# patch "database.cc"
#  from [04b7bf7f3d9722bb194a0623a339babc83d95c74]
#    to [83c0e4fe4b672da030bc50966c118ac0c2c98017]
#
# patch "database_check.cc"
#  from [415b63b94a1150b3aff78b9e7fa512e0141577e8]
#    to [c6145a7b639d6a67fd63c3816af36e67ada5144b]
#
# patch "netsync.cc"
#  from [8900815176fbb4ebcf97203f1d13f9e30eab272a]
#    to [e1c2726ff08eb0cc2c7a40cb5b391517d4f2fa95]
#
# patch "po/POTFILES.in"
#  from [0f66018918c56534036a8a549e3b81fb12a9c4b6]
#    to [bd06ee5116d53df04a0065e56e3a6ef2b7837d8c]
#
# patch "po/POTFILES.skip"
#  from [8d5f6c3d6059a2c943f11a6208ead30399dca3c7]
#    to [61bc7af140315b993cde1192087564ea2105250d]
#
# patch "rcs_import.cc"
#  from [22646283896c3db9024ffa6b1f57dd8d76c6598c]
#    to [e01d4dc824657c684430fdf98d0132a1298f10d3]
#
========================================================================
--- ChangeLog	50802639ded49c79d2f4bbfa018f0adb56206858
+++ ChangeLog	2c317bf9f24509c9cf8a705ef5a360316918de18
@@ -1,3 +1,12 @@
+2005-09-11  Benoît Dejean  <address@hidden>
+
+	* database.cc
+	* database_check.cc
+	* netsync.cc
+	* po/POTFILES.in
+	* po/POTFILES.skip
+	* rcs_import.cc: More i18n strings.
+
 2005-09-07  Jim Meyering  <address@hidden>
 	
 	* tests/t_rename_dir_cross_level.at: When invoking mv to rename
========================================================================
--- database.cc	04b7bf7f3d9722bb194a0623a339babc83d95c74
+++ database.cc	83c0e4fe4b672da030bc50966c118ac0c2c98017
@@ -480,9 +480,9 @@
 database::rehash()
 {
   transaction_guard guard(*this);
-  ticker mcerts("mcerts", "m", 1);
-  ticker pubkeys("pubkeys", "+", 1);
-  ticker privkeys("privkeys", "!", 1);
+  ticker mcerts(_("mcerts"), "m", 1);
+  ticker pubkeys(_("pubkeys"), "+", 1);
+  ticker privkeys(_("privkeys"), "!", 1);

   {
     // rehash all mcerts
========================================================================
--- database_check.cc	415b63b94a1150b3aff78b9e7fa512e0141577e8
+++ database_check.cc	c6145a7b639d6a67fd63c3816af36e67ada5144b
@@ -108,7 +108,7 @@
   app.db.get_file_ids(files);
   L(F("checking %d files\n") % files.size());

-  ticker ticks("files", "f", files.size()/70+1);
+  ticker ticks(_("files"), "f", files.size()/70+1);

   for (std::set<file_id>::const_iterator i = files.begin();
        i != files.end(); ++i)
@@ -133,7 +133,7 @@
   app.db.get_manifest_ids(manifests);
   L(F("checking %d manifests\n") % manifests.size());

-  ticker ticks("manifests", "m", manifests.size()/70+1);
+  ticker ticks(_("manifests"), "m", manifests.size()/70+1);

   for (std::set<manifest_id>::const_iterator i = manifests.begin();
        i != manifests.end(); ++i)
@@ -189,7 +189,7 @@
   app.db.get_revision_ids(revisions);
   L(F("checking %d revisions\n") % revisions.size());

-  ticker ticks("revisions", "r", revisions.size()/70+1);
+  ticker ticks(_("revisions"), "r", revisions.size()/70+1);

   for (std::set<revision_id>::const_iterator i = revisions.begin();
        i != revisions.end(); ++i)
@@ -288,7 +288,7 @@
   app.db.get_revision_ancestry(graph);
   L(F("checking %d ancestry edges\n") % graph.size());

-  ticker ticks("ancestry", "a", graph.size()/70+1);
+  ticker ticks(_("ancestry"), "a", graph.size()/70+1);

   // checked revision has set of parents
   // graph has revision and associated parents
@@ -321,7 +321,7 @@

   L(F("checking %d public keys\n") % pubkeys.size());

-  ticker ticks("keys", "k", 1);
+  ticker ticks(_("keys"), "k", 1);

   for (std::vector<rsa_keypair_id>::const_iterator i = pubkeys.begin();
        i != pubkeys.end(); ++i)
@@ -347,7 +347,7 @@

   L(F("checking %d revision certs\n") % certs.size());

-  ticker ticks("certs", "c", certs.size()/70+1);
+  ticker ticks(_("certs"), "c", certs.size()/70+1);

   for (std::vector< revision<cert> >::const_iterator i = certs.begin();
        i != certs.end(); ++i)
@@ -377,7 +377,7 @@
 {
   L(F("checking local history of %d revisions\n") % checked_revisions.size());

-  ticker ticks("revisions", "r", 1);
+  ticker ticks(_("revisions"), "r", 1);

   for (std::map<revision_id, checked_revision>::iterator
          i = checked_revisions.begin(); i != checked_revisions.end(); ++i)
========================================================================
--- netsync.cc	8900815176fbb4ebcf97203f1d13f9e30eab272a
+++ netsync.cc	e1c2726ff08eb0cc2c7a40cb5b391517d4f2fa95
@@ -658,34 +658,34 @@
 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
-      revision_checked_ticker.reset(new ticker(_("revs written"), "w", 1));
+      revision_checked_ticker.reset(new ticker(N_("revs written"), "w", 1));
       // 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_checked_ticker.reset(new ticker(_("revs written"), "w", 1));
+      revision_checked_ticker.reset(new ticker(N_("revs written"), "w", 1));
       // 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));
     }
 }

========================================================================
--- po/POTFILES.in	0f66018918c56534036a8a549e3b81fb12a9c4b6
+++ po/POTFILES.in	bd06ee5116d53df04a0065e56e3a6ef2b7837d8c
@@ -13,6 +13,7 @@
 constants.cc
 constants.hh
 cycle_detector.hh
+database_check.cc
 database.cc
 database.hh
 diff_patch.cc
========================================================================
--- po/POTFILES.skip	8d5f6c3d6059a2c943f11a6208ead30399dca3c7
+++ po/POTFILES.skip	61bc7af140315b993cde1192087564ea2105250d
@@ -1,3 +1,4 @@
+contrib/ciabot_monotone.py
 idna/nfkc.c
 popt/popt.c
 popt/popthelp.c
========================================================================
--- rcs_import.cc	22646283896c3db9024ffa6b1f57dd8d76c6598c
+++ rcs_import.cc	e01d4dc824657c684430fdf98d0132a1298f10d3
@@ -1255,8 +1255,8 @@

   I(cvs.stk.size() == 1);

-  ticker n_revs("revisions", "r", 1);
-  ticker n_manifests("manifests", "m", 1);
+  ticker n_revs(_("revisions"), "r", 1);
+  ticker n_manifests(_("manifests"), "m", 1);

   while (cvs.branches.size() > 0)
     {
@@ -1281,7 +1281,7 @@

   // now we have a "last" rev for each tag
   {
-    ticker n_tags("tags", "t", 1);
+    ticker n_tags(_("tags"), "t", 1);
     packet_db_writer dbw(app);
     transaction_guard guard(app.db);
     for (map<unsigned long, pair<time_t, revision_id> >::const_iterator i = cvs.resolved_tags.begin();