#
# patch "ChangeLog"
#  from [454aaf61ef5f95530006dada3b0a6a7539288e04]
#    to [68e455558962e53a6aea80d36687a063d743a218]
#
# patch "commands.cc"
#  from [720e9964a40d2b0f31f885e7360501d0aa5f185c]
#    to [8e9f4827f51c3c05412852b0b31c5ac069071a1d]
#
# patch "netsync.cc"
#  from [7722aed87080027bef960c2730859dc7cd5fa7e2]
#    to [8900815176fbb4ebcf97203f1d13f9e30eab272a]
#
========================================================================
--- ChangeLog	454aaf61ef5f95530006dada3b0a6a7539288e04
+++ ChangeLog	68e455558962e53a6aea80d36687a063d743a218
@@ -1,3 +1,8 @@
+2005-09-03  Benoît Dejean  <address@hidden>
+
+	* commands.cc (ls_certs):
+	* netsync.cc (load_data): Merged strings.
+
 2005-09-01  Benoît Dejean  <address@hidden>

 	* commands.cc: Merged one more "no such revision '%s'" string.
========================================================================
--- commands.cc	720e9964a40d2b0f31f885e7360501d0aa5f185c
+++ commands.cc	8e9f4827f51c3c05412852b0b31c5ac069071a1d
@@ -524,7 +524,7 @@
       {
         if (checked.find(idx(certs, i).key) == checked.end() &&
             !app.db.public_key_exists(idx(certs, i).key))
-          P(F("warning: no public key '%s' found in database\n")
+          P(F("no public key '%s' found in database")
             % idx(certs, i).key);
         checked.insert(idx(certs, i).key);
       }
========================================================================
--- netsync.cc	7722aed87080027bef960c2730859dc7cd5fa7e2
+++ netsync.cc	8900815176fbb4ebcf97203f1d13f9e30eab272a
@@ -2191,7 +2191,7 @@
         }
       else
         {
-          throw bad_decode(F("public key '%s' does not exist in our database") % hitem);
+          throw bad_decode(F("no public key '%s' found in database") % hitem);
         }
       break;