#
# patch "ChangeLog"
#  from [8327086e1740e727d83ac409f5ae88c95d9d445c]
#    to [6b139b6baa2f9a343d3798585b9b988a5d096f2a]
#
# patch "commands.cc"
#  from [12f20a9dce89088ee2089c495cd56a0adde51af7]
#    to [a51fe27426368a95bc8d587c2cc631e3c78ea736]
#
========================================================================
--- ChangeLog	8327086e1740e727d83ac409f5ae88c95d9d445c
+++ ChangeLog	6b139b6baa2f9a343d3798585b9b988a5d096f2a
@@ -1,5 +1,10 @@
 2005-08-25  Benoît Dejean  <address@hidden>

+	* commands.cc (CMD(lca)): One more string for i18n.
+	(CMD(trusted)): Merged all strings.
+
+2005-08-25  Benoît Dejean  <address@hidden>
+
 	* po/fr.po: Updated French translation.

 2005-08-25  Benoît Dejean  <address@hidden>
========================================================================
--- commands.cc	12f20a9dce89088ee2089c495cd56a0adde51af7
+++ commands.cc	a51fe27426368a95bc8d587c2cc631e3c78ea736
@@ -952,14 +952,21 @@
   bool trusted = app.lua.hook_get_revision_cert_trust(signers, ident,
                                                       name, value);

-  cout << "if a cert on: " << ident << endl
-       << "with key: " << name << endl
-       << "and value: " << value << endl
-       << "was signed by: ";
-  for (set<rsa_keypair_id>::const_iterator i = signers.begin(); i != signers.end(); ++i)
-    cout << *i << " ";
-  cout << endl
-       << "it would be: " << (trusted ? "trusted" : "UNtrusted") << endl;
+
+  ostringstream all_signers;
+  copy(signers.begin(), signers.end(),
+       ostream_iterator<rsa_keypair_id>(all_signers, " "));
+
+  cout << F("if a cert on: %s\n"
+            "with key: %s\n"
+            "and value: %s\n"
+            "was signed by: %s\n"
+            "it would be: %s\n")
+    % ident
+    % name
+    % value
+    % all_signers.str()
+    % (trusted ? _("trusted") : _("UNtrusted"));
 }

 CMD(tag, N_("review"), N_("REVISION TAGNAME"),
@@ -2734,7 +2741,7 @@
   if (find_least_common_ancestor(left, right, anc, app))
     std::cout << describe_revision(app, anc) << std::endl;
   else
-    std::cout << "no common ancestor found" << std::endl;
+    std::cout << _("no common ancestor found") << std::endl;
 }