#
# patch "ChangeLog"
#  from [76a9d7c9e289c41612f727ea7a4db7badf08b61f]
#    to [461b11131a6b0c58b6f4824251ecb7ce5fefbb5b]
#
# patch "commands.cc"
#  from [b75ae98b66194cf6f9b57362f0611796590485d1]
#    to [611a904707f4957ddf3057a43f4b66ac5b90c217]
#
# patch "mt_version.cc"
#  from [bf917fae94832801560d66220ee0722624b25c65]
#    to [e6d938fa9efac0de2a87d083c7bac094bd25babd]
#
========================================================================
--- ChangeLog	76a9d7c9e289c41612f727ea7a4db7badf08b61f
+++ ChangeLog	461b11131a6b0c58b6f4824251ecb7ce5fefbb5b
@@ -1,5 +1,12 @@
 2005-08-22  Nathaniel Smith  <address@hidden>

+	* commands.cc (read): Use FP (thanks to Benoît Dejean for
+	catch).
+	* mt_version.cc (print_version, print_full_version): Mark more
+	strings for i18n (also thanks to Benoît Dejean).
+	
+2005-08-22  Nathaniel Smith  <address@hidden>
+
 	* commands.cc (commands): Revert previous changes, xgettext is
 	buggy.
 	Mark every CMD() string argument with _().
========================================================================
--- commands.cc	b75ae98b66194cf6f9b57362f0611796590485d1
+++ commands.cc	611a904707f4957ddf3057a43f4b66ac5b90c217
@@ -1879,10 +1879,7 @@
   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(FP("read %d packet", "read %d packets", count) % count);
 }


========================================================================
--- mt_version.cc	bf917fae94832801560d66220ee0722624b25c65
+++ mt_version.cc	e6d938fa9efac0de2a87d083c7bac094bd25babd
@@ -19,8 +19,9 @@
 void
 print_version()
 {
-  std::cout << PACKAGE_STRING
-            << " (base revision: " << package_revision_constant << ")" << std::endl;
+  std::cout << (F("%s (base revision: %s)")
+                % PACKAGE_STRING % package_revision_constant)
+            << std::endl;
 }

 void
@@ -29,8 +30,8 @@
   print_version();
   std::string s;
   get_system_flavour(s);
-  std::cout << "Running on: " << s << std::endl;
-  std::cout << "Changes since base revision:" << std::endl
+  std::cout << F("Running on: %s" % s) << std::endl;
+  std::cout << F("Changes since base revision:") << std::endl
             << package_full_revision_constant;
 }