# 
# patch "commands.cc"
#  from [2546adbbe28ab041dcdbfeaf41afb0d5897e882c]
#    to [58d51ff542cfdf33b63786b609e17dbaebccfc4f]
# 
# patch "mt_version.cc"
#  from [bf917fae94832801560d66220ee0722624b25c65]
#    to [558f0c7cdaf10ff3352dc4a114e767b1f007b856]
# 
========================================================================
--- commands.cc	2546adbbe28ab041dcdbfeaf41afb0d5897e882c
+++ commands.cc	58d51ff542cfdf33b63786b609e17dbaebccfc4f
@@ -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"
+          "database. it is recommended that you use 'db dump' and"
+          "'db load' to be sure."));
       app.db.delete_private_key(ident);
       key_deleted = true;
     }
@@ -1870,10 +1870,10 @@
   packet_db_writer dbw(app, true);
   size_t count = read_packets(cin, dbw);
   N(count != 0, F("no packets found on stdin"));
-  if (count == 1)
-    P(F("read 1 packet\n"));
-  else
-    P(F("read %d packets\n") % count);
+
+  P(F(ngettext("read %d packet\n",
+               "read %d packets\n",
+               count)) % count);
 }
 
 
========================================================================
--- mt_version.cc	bf917fae94832801560d66220ee0722624b25c65
+++ mt_version.cc	558f0c7cdaf10ff3352dc4a114e767b1f007b856
@@ -15,12 +15,13 @@
 #include "mt_version.hh"
 #include "package_revision.h"
 #include "package_full_revision.h"
+#include "sanity.hh"
 
 void
 print_version()
 {
   std::cout << PACKAGE_STRING
-            << " (base revision: " << package_revision_constant << ")" << std::endl;
+	    << F(" (base revision: %s)\n") % package_revision_constant;
 }
 
 void
@@ -29,8 +30,7 @@
   print_version();
   std::string s;
   get_system_flavour(s);
-  std::cout << "Running on: " << s << std::endl;
-  std::cout << "Changes since base revision:" << std::endl
-            << package_full_revision_constant;
+  std::cout << F("Running on: %s\n") % s
+	    << F("Changes since base revision: %s\n") % package_full_revision_constant;
 }