#
# patch "ChangeLog"
#  from [fbd80aada2885f96ba1c0ef9ce570a7adbb4acf9]
#    to [639e6205c99a48af4058c6b130fe46899e8ee10c]
#
# patch "commands.cc"
#  from [955dd5e1875687643de10a3adecb339afb320727]
#    to [37a1d2bbf284e391290eb97ade60915aa281a22e]
#
========================================================================
--- ChangeLog	fbd80aada2885f96ba1c0ef9ce570a7adbb4acf9
+++ ChangeLog	639e6205c99a48af4058c6b130fe46899e8ee10c
@@ -1,3 +1,7 @@
+2005-09-06  Benoît Dejean  <address@hidden>
+
+	* commands.cc: No i18n for cert_revision_changelog.
+
 2005-09-05  Benoît Dejean  <address@hidden>

 	* commands.cc: Fixed some strings (added ' around revisions).
========================================================================
--- commands.cc	955dd5e1875687643de10a3adecb339afb320727
+++ commands.cc	37a1d2bbf284e391290eb97ade60915aa281a22e
@@ -1046,7 +1046,7 @@
     cert_revision_in_branch(inv_id, branchname, app, dbw);
     cert_revision_date_now(inv_id, app, dbw);
     cert_revision_author_default(inv_id, app, dbw);
-    cert_revision_changelog(inv_id, (F("disapproval of revision '%s'") % r).str(), app, dbw);
+    cert_revision_changelog(inv_id, (boost::format("disapproval of revision '%s'") % r).str(), app, dbw);
     guard.commit();
   }
 }
@@ -3081,8 +3081,8 @@
       packet_db_writer dbw(app);
       cert_revision_in_branch(merged, app.branch_name(), app, dbw);

-      string log = (F("merge of %s\n"
-                      "     and %s\n") % left % right).str();
+      string log = (boost::format("merge of %s\n"
+                                  "     and %s\n") % left % right).str();
       cert_revision_changelog(merged, log, app, dbw);

       guard.commit();
@@ -3165,8 +3165,8 @@

       cert_revision_in_branch(merged, idx(args, 1)(), app, dbw);

-      string log = (F("propagate from branch '%s' (head %s)\n"
-                      "            to branch '%s' (head %s)\n")
+      string log = (boost::format("propagate from branch '%s' (head %s)\n"
+                                  "            to branch '%s' (head %s)\n")
                     % idx(args, 0) % (*src_i)
                     % idx(args, 1) % (*dst_i)).str();

@@ -3231,10 +3231,10 @@

   cert_revision_in_branch(merged, branch, app, dbw);

-  string log = (F("explicit_merge of %s\n"
-                  "              and %s\n"
-                  "   using ancestor %s\n"
-                  "        to branch '%s'\n")
+  string log = (boost::format("explicit_merge of '%s'\n"
+                              "              and '%s'\n"
+                              "   using ancestor '%s'\n"
+                              "        to branch '%s'\n")
                 % left % right % ancestor % branch).str();

   cert_revision_changelog(merged, log, app, dbw);