#
# patch "ChangeLog"
#  from [62849fc5365d13a37008da533fbda5b92f92fbd9]
#    to [973cd3894dedea02f195bf4bf9232a504cdc1082]
#
# patch "commands.cc"
#  from [3176e0a5397306096cf3ad3da067252881ddb413]
#    to [161856b13e6c22b444c56d6399b170722e37d687]
#
========================================================================
--- ChangeLog	62849fc5365d13a37008da533fbda5b92f92fbd9
+++ ChangeLog	973cd3894dedea02f195bf4bf9232a504cdc1082
@@ -1,3 +1,8 @@
+2005-08-30  Benoît Dejean  <address@hidden>
+
+	* commands.cc (ls_certs): Reworked for i18n.
+	(CMD(commit)): Merged 2 strings.
+
 2005-08-30  Matthew Gregan  <address@hidden>

 	* revision.cc (ensure_parents_loaded): Don't reuse an iterator
========================================================================
--- commands.cc	3176e0a5397306096cf3ad3da067252881ddb413
+++ commands.cc	161856b13e6c22b444c56d6399b170722e37d687
@@ -563,6 +563,21 @@
   // particular.
   sort(certs.begin(), certs.end());

+  string str     = _("Key   : %s\n"
+                     "Sig   : %s\n"
+                     "Name  : %s\n"
+                     "Value : %s\n");
+  string extra_str = "      : %s\n";
+
+  string::size_type colon_pos = str.find(':');
+
+  if (colon_pos != string::npos)
+    {
+      string substr(str, 0, colon_pos);
+      colon_pos = length(substr);
+      extra_str = string(colon_pos, ' ') + ": %s\n";
+    }
+
   for (size_t i = 0; i < certs.size(); ++i)
     {
       cert_status status = check_cert(app, idx(certs, i));
@@ -582,13 +597,13 @@
       switch (status)
         {
         case cert_ok:
-          stat = "ok";
+          stat = _("ok");
           break;
         case cert_bad:
-          stat = "bad";
+          stat = _("bad");
           break;
         case cert_unknown:
-          stat = "unknown";
+          stat = _("unknown");
           break;
         }

@@ -596,14 +611,15 @@
       split_into_lines(washed, lines);
       I(lines.size() > 0);

-      cout << "-----------------------------------------------------------------" << endl
-           << "Key   : " << idx(certs, i).key() << endl
-           << "Sig   : " << stat << endl
-           << "Name  : " << idx(certs, i).name() << endl
-           << "Value : " << idx(lines, 0) << endl;
+      cout << std::string(guess_terminal_width(), '-') << '\n'
+           << boost::format(str)
+        % idx(certs, i).key()
+        % stat
+        % idx(certs, i).name()
+        % idx(lines, 0);

       for (size_t i = 1; i < lines.size(); ++i)
-        cout << "      : " << idx(lines, i) << endl;
+        cout << boost::format(extra_str) % idx(lines, i);
     }

   if (certs.size() > 0)
@@ -2328,8 +2344,10 @@
   guess_branch(edge_old_revision(rs.edges.begin()), app, branchname);

   P(F("beginning commit on branch '%s'\n") % branchname);
-  L(F("new manifest %s\n") % rs.new_manifest);
-  L(F("new revision %s\n") % rid);
+  L(F("new manifest '%s'\n"
+      "new revision '%s'\n")
+    % rs.new_manifest
+    % rid);

   // can't have both a --message and a --message-file ...
   N(app.message().length() == 0 || app.message_file().length() == 0,