#
# patch "ChangeLog"
#  from [8ff0065b623415fa93d1db719cd00a55c21a07d1]
#    to [523c8ab59c2d22a33c90b0054187a1602c096875]
#
# patch "commands.cc"
#  from [070e8916520a3fac640ca73ad770f848fc1e4c39]
#    to [98677594640c4f9e40d52276d6374bb63414dfad]
#
# patch "monotone.cc"
#  from [25377c90318075893420d6062e3471d6c14cd084]
#    to [69c76898ed9e7ba5139a6409aa236615ca083ff2]
#
========================================================================
--- ChangeLog	8ff0065b623415fa93d1db719cd00a55c21a07d1
+++ ChangeLog	523c8ab59c2d22a33c90b0054187a1602c096875
@@ -1,3 +1,8 @@
+2005-08-20  Benoît Dejean  <address@hidden>
+
+	* monotone.cc (cpp_main): setlocale(LC_ALL).
+	* commands.cc (dropkey): Unify warning into a single string.
+
 2005-08-20  Nathaniel Smith  <address@hidden>

 	* contrib/monoprof.sh (test_commit): Kernel tarball unpacks to
========================================================================
--- commands.cc	070e8916520a3fac640ca73ad770f848fc1e4c39
+++ commands.cc	98677594640c4f9e40d52276d6374bb63414dfad
@@ -834,9 +834,9 @@
   if (app.db.private_key_exists(ident))
     {
       P(F("dropping private key '%s' from database\n\n") % ident);
-      W(F("the private key data may not have been erased from the"));
-      W(F("database. it is recommended that you use 'db dump' and"));
-      W(F("'db load' to be sure."));
+      W(F("the private key data may not have been erased from the\n"
+          "database. it is recommended that you use 'db dump' and\n"
+          "'db load' to be sure."));
       app.db.delete_private_key(ident);
       key_deleted = true;
     }
========================================================================
--- monotone.cc	25377c90318075893420d6062e3471d6c14cd084
+++ monotone.cc	69c76898ed9e7ba5139a6409aa236615ca083ff2
@@ -235,8 +235,7 @@

   // go-go gadget i18n

-  setlocale(LC_CTYPE, "");
-  setlocale(LC_MESSAGES, "");
+  setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);

@@ -257,9 +256,8 @@
     L(F("command line: %s\n") % cmdline_ss.str());
   }

-  L(F("set locale: LC_CTYPE=%s, LC_MESSAGES=%s\n")
-    % (setlocale(LC_CTYPE, NULL) == NULL ? "n/a" : setlocale(LC_CTYPE, NULL))
-    % (setlocale(LC_MESSAGES, NULL) == NULL ? "n/a" : setlocale(LC_MESSAGES, NULL)));
+  L(F("set locale: LC_ALL=%s\n")
+    % (setlocale(LC_ALL, NULL) == NULL ? "n/a" : setlocale(LC_ALL, NULL)));

   // Set up secure memory allocation etc
   Botan::Init::initialize();