#
# patch "ChangeLog"
#  from [03dcab1512b00c64f0d156c71cf92b10c186aa81]
#    to [ecdd08f637ad17c3a77ace5216874f31d08ffa07]
#
# patch "netsync.cc"
#  from [d3b17d5f347bc85bba79e1db4b77268e7983f8b7]
#    to [79d1d19c7c6521d9d641939c11f2a8a492a74249]
#
========================================================================
--- ChangeLog	03dcab1512b00c64f0d156c71cf92b10c186aa81
+++ ChangeLog	ecdd08f637ad17c3a77ace5216874f31d08ffa07
@@ -1,5 +1,9 @@
 2005-09-25  Benoît Dejean  <address@hidden>

+	* netsync.cc: 3 more i18n strings.
+
+2005-09-25  Benoît Dejean  <address@hidden>
+
 	* cert.cc (cert_signable_text): F() vs. boost::format.
 	* lua.cc (monotone_guess_binary_file_contents_for_lua),
 	(monotone_include_for_lua), (monotone_includedir_for_lua):
========================================================================
--- netsync.cc	d3b17d5f347bc85bba79e1db4b77268e7983f8b7
+++ netsync.cc	79d1d19c7c6521d9d641939c11f2a8a492a74249
@@ -2086,8 +2086,8 @@
   // nb. this->role is our role, the server is in the opposite role
   L(F("received 'confirm' netcmd from server '%s' for pattern '%s' exclude '%s' in %s mode\n")
     % their_key_hash % our_include_pattern % our_exclude_pattern
-    % (this->role == source_and_sink_role ? "source and sink" :
-       (this->role == source_role ? "sink" : "source")));
+    % (this->role == source_and_sink_role ? _("source and sink") :
+       (this->role == source_role ? _("sink") : _("source"))));

   // check their signature
   if (app.db.public_key_exists(their_key_hash))
@@ -3067,8 +3067,8 @@
         L(F("received 'anonymous' netcmd from client for pattern '%s' excluding '%s' "
             "in %s mode\n")
           % their_include_pattern % their_exclude_pattern
-          % (role == source_and_sink_role ? "source and sink" :
-             (role == source_role ? "source " : "sink")));
+          % (role == source_and_sink_role ? _("source and sink") :
+             (role == source_role ? _("source") : _("sink"))));

         set_session_key(hmac_key_encrypted);
         if (!process_anonymous_cmd(role, their_include_pattern, their_exclude_pattern))
@@ -3098,8 +3098,8 @@
         L(F("received 'auth(hmac)' netcmd from client '%s' for pattern '%s' "
             "exclude '%s' in %s mode with nonce1 '%s'\n")
           % their_key_hash % their_include_pattern % their_exclude_pattern
-          % (role == source_and_sink_role ? "source and sink" :
-             (role == source_role ? "source " : "sink"))
+          % (role == source_and_sink_role ? _("source and sink") :
+             (role == source_role ? _("source") : _("sink")))
           % hnonce1);

         set_session_key(hmac_key_encrypted);