#
#
# patch "cmd_merging.cc"
#  from [0cf09c5346fe8f07d139d8ab4365a92cda8dd176]
#    to [9d5dd534dcf01048c51d70b9494d5c455d988644]
#
# patch "po/de.po"
#  from [47f21333a25876c71e10da8e6770f30705b70686]
#    to [1feddd32ebbfd302a8510c5d667682de0909ec85]
#
# patch "po/fr.po"
#  from [4023420bb7e1040a9359852d69b19654201c4396]
#    to [bc6e687ce5f93b8b33bc823dc19d18a879b10dd7]
#
# patch "po/it.po"
#  from [c43792e1289e6d6c8c2bbad030afab28d7700978]
#    to [008d67cc9a07706ebfd8fe0e0672d21ae55f29cf]
#
# patch "po/ja.po"
#  from [be680168510cd01818f1886624d49d8bff014123]
#    to [5b2a2f79c1265b794a1ba553c279e1f687a2c443]
#
# patch "po/pt_BR.po"
#  from [5b8fc28ad0037d7ee07bf8aad1a6f085d0e0f34f]
#    to [d6f06940859e9f18b33ea20e6525bfe9e0630113]
#
# patch "po/sv.po"
#  from [3c30314f0fcb405fdffd637d1416edeccd7ef25f]
#    to [f26b570bb75cfbca0f3a63c484500b8ae2c7f2ea]
#
============================================================
--- cmd_merging.cc	0cf09c5346fe8f07d139d8ab4365a92cda8dd176
+++ cmd_merging.cc	9d5dd534dcf01048c51d70b9494d5c455d988644
@@ -19,6 +19,7 @@
 #include "transforms.hh"
 #include "update.hh"
 #include "work.hh"
+#include "safe_map.hh"

 using std::cout;
 using std::map;
@@ -615,8 +616,8 @@
        "If one revision is given, applies the changes made in that revision\n"
        "compared to its parent.\n"
        "If two revisions are given, applies the changes made to get from the\n"
-       "first revision to the second.")
-    % OPT_REVISION)
+       "first revision to the second."),
+    OPT_REVISION)
 {
   if (args.size() > 0)
     throw usage(name);
@@ -625,7 +626,7 @@

   if (app.revision_selectors.size() == 1)
     {
-      to_rid = idx(app.revision_selectors, 0);
+      complete(app, idx(app.revision_selectors, 0)(), to_rid);
       std::set<revision_id> parents;
       app.db.get_revision_parents(to_rid, parents);
       N(parents.size() == 1,
@@ -638,8 +639,8 @@
     }
   else if (app.revision_selectors.size() == 2)
     {
-      from_rid = idx(app.revision_selectors, 0);
-      to_rid = idx(app.revision_selectors, 1);
+      complete(app, idx(app.revision_selectors, 0)(), from_rid);
+      complete(app, idx(app.revision_selectors, 1)(), to_rid);
     }
   else
     throw usage(name);
@@ -666,31 +667,41 @@
   // and take the cset from the workspace's base, and write that to _MTN/work

   // Get the FROM roster and markings
-  shared_ptr<roster_t> from_roster = new roster_t();
+  shared_ptr<roster_t> from_roster = shared_ptr<roster_t>(new roster_t());
   marking_map from_markings;
   app.db.get_roster(from_rid, *from_roster, from_markings);

-  // Get the TO roster
-  roster_t to_true_roster;
-  app.db.get_roster(to_rid, to_true_roster);
-
-  // Get the working roster and rid (and base, while we're at it)
-  revision_id working_rid, base_rid;
-  roster_t working_true_roster, base_roster;
-  get_unrestricted_working_revision_and_rosters(app, working_rev,
-                                                *base_roster,
-                                                working_true_roster);
-  // Find the rid
-  calculate_ident(working_rev, working_rid);
-  I(working_rev.edges.size() == 1);
-
-  // Get the csets
+  // Get the FROM->WORKING and FROM->TO csets, and also the base roster
+  // and working rid while we're at it
   cset from_to_working, from_to_to;
-  make_cset(*from_roster, working_true_roster, from_to_working);
-  make_cset(*from_roster, to_true_roster, from_to_to);
+  roster_t base_roster;
+  revision_id working_rid;
+  {
+    // Get the workspace stuff
+    temp_node_id_source nis;
+    revision_id working_rid;
+    roster_t working_true_roster, base_roster;
+    get_base_and_current_roster_shape(base_roster, working_true_roster,
+                                      nis, app);
+    update_current_roster_from_filesystem(working_true_roster, app);
+    make_cset(*from_roster, working_true_roster, from_to_working);
+    revision_id base_rid;
+    get_revision_id(base_rid);
+    revision_set working_rev;
+    make_revision_set(base_rid, base_roster, working_true_roster, working_rev);
+    calculate_ident(working_rev, working_rid);
+  }
+  {
+    // Get the TO roster
+    roster_t to_true_roster;
+    app.db.get_roster(to_rid, to_true_roster);
+    make_cset(*from_roster, to_true_roster, from_to_to);
+  }

   // Recreate the working and to rosters with renumbered nids and fake
-  // markings
+  // markings.  We have to go roster->cset->roster because our marking code
+  // works on csets, and we need our final roster and final markings to use
+  // compatible nids.
   temp_node_id_source nis;
   roster_t working_roster, to_roster;
   marking_map working_markings, to_markings;
============================================================
--- po/de.po	47f21333a25876c71e10da8e6770f30705b70686
+++ po/de.po	1feddd32ebbfd302a8510c5d667682de0909ec85
@@ -24,7 +24,7 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-03 22:15+0200\n"
+"POT-Creation-Date: 2006-07-05 22:56-0700\n"
 "PO-Revision-Date: 2006-07-03 23:42+0100\n"
 "Last-Translator: Thomas Keller <address@hidden>\n"
 "Language-Team: Deutsch <address@hidden>\n"
@@ -107,20 +107,23 @@
 #: cert.cc:157
 #, c-format
 msgid "trust function disliked %d signers of %s cert on manifest %s"
-msgstr "Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Manifest %s ab"
+msgstr ""
+"Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Manifest %s "
+"ab"

 #: cert.cc:214
 #, c-format
 msgid "trust function disliked %d signers of %s cert on revision %s"
-msgstr "Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Revision %s ab"
+msgstr ""
+"Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Revision %s "
+"ab"

 #: cert.cc:303
 #, c-format
 msgid "calculated cert hash '%s' does not match '%s'"
 msgstr "berechnete Zertifikatsprüfsumme '%s' stimmt nicht mit '%s' überein"

-#: cert.cc:379
-#: keys.cc:554
+#: cert.cc:379 keys.cc:554
 #, c-format
 msgid "no key pair '%s' found in key store '%s'"
 msgstr "kein Schlüsselpaar '%s' in Schlüsselbund '%s' gefunden"
@@ -141,22 +144,29 @@
 "pick one to use for signatures by adding '-k<keyname>' to your command"
 msgstr ""
 "Sie haben mehrere geheime Schlüssel.\n"
-"Um einen davon für die Erstellung von Signaturen auszuwählen, fügen Sie '-k<schluessel_name>' Ihrem Befehl hinzu."
+"Um einen davon für die Erstellung von Signaturen auszuwählen, fügen Sie '-"
+"k<schluessel_name>' Ihrem Befehl hinzu."

 #: cert.cc:478
 #, c-format
 msgid "no branch found for empty revision, please provide a branch name"
-msgstr "kein Zweig für leere Revision gefunden, bitte geben Sie einen Zweignamen an"
+msgstr ""
+"kein Zweig für leere Revision gefunden, bitte geben Sie einen Zweignamen an"

 #: cert.cc:487
 #, c-format
 msgid "no branch certs found for revision %s, please provide a branch name"
-msgstr "keine Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen Zweignamen an"
+msgstr ""
+"keine Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen "
+"Zweignamen an"

 #: cert.cc:491
 #, c-format
-msgid "multiple branch certs found for revision %s, please provide a branch name"
-msgstr "mehrere Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen Zweignamen an"
+msgid ""
+"multiple branch certs found for revision %s, please provide a branch name"
+msgstr ""
+"mehrere Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen "
+"Zweignamen an"

 #: cmd_automate.cc:205
 #, c-format
@@ -168,22 +178,16 @@
 msgid "Bad input to automate stdio"
 msgstr "Falsche Eingabe für 'automate stdio'"

-#: cmd_automate.cc:296
+#: cmd_automate.cc:301
 msgid "automation"
 msgstr "Automatisierung"

-#: cmd_automate.cc:297
+#: cmd_automate.cc:302
 msgid "automation interface"
 msgstr "Schnittstelle für die Automatisierung"

-#: cmd_db.cc:35
-#: cmd_diff_log.cc:404
-#: cmd_diff_log.cc:435
-#: cmd_diff_log.cc:437
-#: cmd_files.cc:102
-#: cmd_files.cc:164
-#: cmd_merging.cc:123
-#: cmd_ws_commit.cc:446
+#: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:435 cmd_diff_log.cc:437
+#: cmd_files.cc:102 cmd_files.cc:164 cmd_merging.cc:123 cmd_ws_commit.cc:446
 #: commands.cc:370
 #, c-format
 msgid "no such revision '%s'"
@@ -239,8 +243,7 @@
 msgid "The epoch must be %s characters"
 msgstr "Der Zeitraum muss %s Zeichen sein"

-#: cmd_db.cc:119
-#: cmd_db.cc:135
+#: cmd_db.cc:119 cmd_db.cc:135
 msgid "vars"
 msgstr "Variablen"

@@ -265,14 +268,8 @@
 msgid "no var with name %s in domain %s"
 msgstr "keine Variable mit dem Namen %s in der Domäne %s"

-#: cmd_db.cc:152
-#: cmd_diff_log.cc:348
-#: cmd_diff_log.cc:558
-#: cmd_files.cc:78
-#: cmd_files.cc:145
-#: cmd_list.cc:437
-#: cmd_merging.cc:569
-#: cmd_ws_commit.cc:322
+#: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:558 cmd_files.cc:78
+#: cmd_files.cc:145 cmd_list.cc:437 cmd_merging.cc:569 cmd_ws_commit.cc:322
 #: commands.cc:246
 msgid "informative"
 msgstr "Informativ"
@@ -290,12 +287,8 @@
 msgid "non-hex digits in partial id"
 msgstr "nicht-hexadezimale Zeichen in Teil-ID"

-#: cmd_diff_log.cc:348
-#: cmd_ws_commit.cc:53
-#: cmd_ws_commit.cc:224
-#: cmd_ws_commit.cc:251
-#: cmd_ws_commit.cc:322
-#: cmd_ws_commit.cc:613
+#: cmd_diff_log.cc:348 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224
+#: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:613
 msgid "[PATH]..."
 msgstr "[PFAD]..."

@@ -310,7 +303,8 @@
 msgstr ""
 "Zeige derzeitige Unterschiede auf stdout.\n"
 "Wenn eine Revision angegeben wurde, werden die Unterschiede zwischen dieser\n"
-"Revision und dem Arbeitsbereich angezeigt. Werden zwei Revisionen angegeben,\n"
+"Revision und dem Arbeitsbereich angezeigt. Werden zwei Revisionen "
+"angegeben,\n"
 "werden die Unterschiede zwischen beiden ausgegeben.\n"
 "Wenn kein Format angegeben wurde, wird standardmäßig 'unified' verwendet."

@@ -333,18 +327,20 @@

 #
 #: cmd_diff_log.cc:559
-msgid "print history in reverse order (filtering by 'FILE'). If one or more revisions are given, use them as a starting point."
-msgstr "gibt die Historie in umgekehrter Reihenfolge aus (gefiltert durch 'DATEI'). Wenn eine oder mehrere Revisionen übergeben wurden, werden diese als Ausgangspunkt genutzt."
+msgid ""
+"print history in reverse order (filtering by 'FILE'). If one or more "
+"revisions are given, use them as a starting point."
+msgstr ""
+"gibt die Historie in umgekehrter Reihenfolge aus (gefiltert durch 'DATEI'). "
+"Wenn eine oder mehrere Revisionen übergeben wurden, werden diese als "
+"Ausgangspunkt genutzt."

 #: cmd_diff_log.cc:621
 #, c-format
 msgid "only one of --last/--next allowed"
 msgstr "'--last' und '--next' sind nur einmal erlaubt"

-#: cmd_files.cc:28
-#: cmd_files.cc:41
-#: cmd_files.cc:121
-#: cmd_merging.cc:634
+#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:771
 #: cmd_othervcs.cc:15
 msgid "debug"
 msgstr "Debugging"
@@ -420,8 +416,7 @@
 msgid "write file from database to stdout"
 msgstr "schreibt Dateiinhalte aus der Datenbank nach stdout"

-#: cmd_files.cc:176
-#: cmd_files.cc:178
+#: cmd_files.cc:176 cmd_files.cc:178
 #, c-format
 msgid "no file '%s' found in revision '%s'"
 msgstr "keine Datei '%s' in Revision '%s' gefunden"
@@ -446,17 +441,12 @@
 msgid "expanded partial id '%s' to '%s'"
 msgstr "Habe Teil-ID '%s' nach '%s' erweitert"

-#: cmd_key_cert.cc:26
-#: cmd_key_cert.cc:52
-#: cmd_key_cert.cc:92
-#: cmd_key_cert.cc:113
-#: cmd_key_cert.cc:149
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
+#: cmd_key_cert.cc:113 cmd_key_cert.cc:149
 msgid "key and cert"
 msgstr "Schlüssel und Zertifikat"

-#: cmd_key_cert.cc:26
-#: cmd_key_cert.cc:52
-#: cmd_key_cert.cc:92
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
 msgid "KEYID"
 msgstr "Schlüssel-ID"

@@ -496,12 +486,18 @@
 #: cmd_key_cert.cc:84
 #, c-format
 msgid "public or private key '%s' does not exist in keystore or database"
-msgstr "öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund oder der Datenbank"
+msgstr ""
+"öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund "
+"oder der Datenbank"

 #: cmd_key_cert.cc:87
 #, c-format
-msgid "public or private key '%s' does not exist in keystore, and no database was specified"
-msgstr "öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund, und es wurde keine Datenbank angegeben."
+msgid ""
+"public or private key '%s' does not exist in keystore, and no database was "
+"specified"
+msgstr ""
+"öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund, "
+"und es wurde keine Datenbank angegeben."

 #: cmd_key_cert.cc:93
 msgid "change passphrase of a private RSA key"
@@ -560,11 +556,8 @@
 msgid "UNtrusted"
 msgstr "NICHT vertrauensvoll"

-#: cmd_key_cert.cc:196
-#: cmd_key_cert.cc:209
-#: cmd_key_cert.cc:222
-#: cmd_key_cert.cc:238
-#: cmd_ws_commit.cc:171
+#: cmd_key_cert.cc:196 cmd_key_cert.cc:209 cmd_key_cert.cc:222
+#: cmd_key_cert.cc:238 cmd_ws_commit.cc:171
 msgid "review"
 msgstr "Überprüfung"

@@ -584,8 +577,7 @@
 msgid "note the results of running a test on a revision"
 msgstr "beachten Sie die Ergebnisse "

-#: cmd_key_cert.cc:222
-#: cmd_ws_commit.cc:171
+#: cmd_key_cert.cc:222 cmd_ws_commit.cc:171
 msgid "REVISION"
 msgstr "REVISION"

@@ -616,8 +608,7 @@
 msgid "empty comment"
 msgstr "leerer Kommentar"

-#: cmd_list.cc:64
-#: cmd_list.cc:655
+#: cmd_list.cc:64 cmd_list.cc:655
 #, c-format
 msgid "no public key '%s' found in database"
 msgstr "Der öffentliche Schlüssel '%s' wurde nicht in der Datenbank gefunden."
@@ -713,14 +704,9 @@
 msgid "No such revision %s"
 msgstr "Revision %s nicht gefunden"

-#: cmd_merging.cc:53
-#: cmd_ws_commit.cc:53
-#: cmd_ws_commit.cc:224
-#: cmd_ws_commit.cc:251
-#: cmd_ws_commit.cc:278
-#: cmd_ws_commit.cc:303
-#: cmd_ws_commit.cc:515
-#: cmd_ws_commit.cc:613
+#: cmd_merging.cc:53 cmd_merging.cc:610 cmd_ws_commit.cc:53
+#: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278
+#: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613
 msgid "workspace"
 msgstr "Arbeitsbereich"

@@ -733,9 +719,11 @@
 "If not, update the workspace to the head of the branch."
 msgstr ""
 "Aktualisiere Arbeitsbereich.\n"
-"Dieses Kommando verändert Ihren Arbeitsbereich, sodass dieser auf einer anderen Revision basiert.\n"
+"Dieses Kommando verändert Ihren Arbeitsbereich, sodass dieser auf einer "
+"anderen Revision basiert.\n"
 "Noch nicht eingepflegte Änderungen bleiben dabei erhalten.\n"
-"Wenn eine Revision angegeben wurde, erfolgt die Aktualisierung zu dieser Revision.\n"
+"Wenn eine Revision angegeben wurde, erfolgt die Aktualisierung zu dieser "
+"Revision.\n"
 "Wenn nicht, dient der Kopf des Zweiges als Grundlage für die Aktualisierung."

 #: cmd_merging.cc:97
@@ -824,13 +812,8 @@
 msgid "updated to base revision %s"
 msgstr "aktualisiert auf gemeinsame Revision %s"

-#: cmd_merging.cc:299
-#: cmd_merging.cc:352
-#: cmd_merging.cc:363
-#: cmd_merging.cc:523
-#: cmd_merging.cc:610
-#: cmd_ws_commit.cc:385
-#: cmd_ws_commit.cc:851
+#: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523
+#: cmd_merging.cc:747 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851
 #: cmd_ws_commit.cc:872
 msgid "tree"
 msgstr "Baum"
@@ -839,16 +822,12 @@
 msgid "merge unmerged heads of branch"
 msgstr "führe nicht-zusammengeführte Köpfe des Zweigs zusammen"

-#: cmd_merging.cc:308
-#: cmd_merging.cc:618
+#: cmd_merging.cc:308 cmd_merging.cc:755
 #, c-format
 msgid "please specify a branch, with --branch=BRANCH"
 msgstr "bitte geben Sie einen Zweig mit '--branch=ZWEIG' an"

-#: cmd_merging.cc:312
-#: cmd_merging.cc:402
-#: cmd_merging.cc:405
-#: cmd_merging.cc:623
+#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:760
 #: cmd_ws_commit.cc:430
 #, c-format
 msgid "branch '%s' is empty"
@@ -869,18 +848,13 @@
 msgid "merging with revision %d / %d"
 msgstr "führe zusammen mit Revision %d / %d"

-#: cmd_merging.cc:328
-#: cmd_merging.cc:329
-#: cmd_merging.cc:412
-#: cmd_merging.cc:547
+#: cmd_merging.cc:328 cmd_merging.cc:329 cmd_merging.cc:412 cmd_merging.cc:547
 #: cmd_merging.cc:548
 #, c-format
 msgid "[source] %s"
 msgstr "[Quelle] %s"

-#: cmd_merging.cc:346
-#: cmd_merging.cc:519
-#: cmd_merging.cc:566
+#: cmd_merging.cc:346 cmd_merging.cc:519 cmd_merging.cc:566
 #, c-format
 msgid "[merged] %s"
 msgstr "[Zusammengeführt] %s"
@@ -896,7 +870,8 @@

 #: cmd_merging.cc:353
 msgid "merge from one branch to another asymmetrically"
-msgstr "asymmetrisches Zusammenführen von Änderungen eines Zweigs auf einem anderen"
+msgstr ""
+"asymmetrisches Zusammenführen von Änderungen eines Zweigs auf einem anderen"

 #: cmd_merging.cc:363
 msgid "SOURCE-BRANCH DEST-BRANCH DIR"
@@ -906,8 +881,7 @@
 msgid "merge one branch into a subdirectory in another branch"
 msgstr "überführe einen Zweig in ein Unterverzeichnis eines anderen Zweigs"

-#: cmd_merging.cc:403
-#: cmd_merging.cc:406
+#: cmd_merging.cc:403 cmd_merging.cc:406
 #, c-format
 msgid "branch '%s' is not merged"
 msgstr "Zweig '%s' ist nicht zusammengeführt"
@@ -948,15 +922,16 @@

 #: cmd_merging.cc:525
 msgid "merge two explicitly given revisions, placing result in given branch"
-msgstr "führt zwei gegebene Revisionen zusammen und erzeugt eine neue Revision im gegebenen Zweig"
+msgstr ""
+"führt zwei gegebene Revisionen zusammen und erzeugt eine neue Revision im "
+"gegebenen Zweig"

 #: cmd_merging.cc:540
 #, c-format
 msgid "%s and %s are the same revision, aborting"
 msgstr "%s und %s sind dieselben Revisionen, breche ab"

-#: cmd_merging.cc:542
-#: cmd_merging.cc:544
+#: cmd_merging.cc:542 cmd_merging.cc:544
 #, c-format
 msgid "%s is already an ancestor of %s"
 msgstr "%s ist bereits ein Vorfahre von %s"
@@ -966,11 +941,13 @@
 msgstr "REVISION REVISION"

 #: cmd_merging.cc:570
-msgid "Show what conflicts would need to be resolved to merge the given revisions."
-msgstr "Zeige, welche Konflikte beim Zusammenführen der gegebenen Revisionen behoben werden müssten."
+msgid ""
+"Show what conflicts would need to be resolved to merge the given revisions."
+msgstr ""
+"Zeige, welche Konflikte beim Zusammenführen der gegebenen Revisionen behoben "
+"werden müssten."

-#: cmd_merging.cc:580
-#: cmd_merging.cc:582
+#: cmd_merging.cc:580 cmd_merging.cc:582
 #, c-format
 msgid "%s is an ancestor of %s; no merge is needed."
 msgstr "%s ist ein Vorgänger von %s; kein Zusammenführen notwendig."
@@ -1005,25 +982,55 @@
 msgid "There are %s directory_loop_conflicts."
 msgstr "Es gibt %s directory_loop_conflicts."

-#: cmd_merging.cc:610
+#: cmd_merging.cc:611
+msgid ""
+"cherrypick changes from other parts of history into workspace.\n"
+"This command takes arbitrary changes made at any point in history,\n"
+"and applies them to your current workspace, as if you had made the\n"
+"edits by hand.\n"
+"If one revision is given, applies the changes made in that revision\n"
+"compared to its parent.\n"
+"If two revisions are given, applies the changes made to get from the\n"
+"first revision to the second."
+msgstr ""
+
+#: cmd_merging.cc:632
+#, c-format
+msgid ""
+"revision %s is a merge\n"
+"to apply the changes relative to one of its parents, use:\n"
+"  %s cherrypatch -r PARENT -r %s"
+msgstr ""
+
+#: cmd_merging.cc:649
+#, fuzzy, c-format
+msgid "no changes to apply"
+msgstr "keine Änderungen zum Einpflegen"
+
+#: cmd_merging.cc:740
+#, fuzzy, c-format
+msgid "applied changes to workspace"
+msgstr "Dateien zum Arbeitsbereich hinzufügen"
+
+#: cmd_merging.cc:747
 msgid "show unmerged head revisions of branch"
 msgstr "zeige nicht zusammengeführte Revisionen des Zweigs"

-#: cmd_merging.cc:625
+#: cmd_merging.cc:762
 #, c-format
 msgid "branch '%s' is currently merged:"
 msgstr "Zweig '%s' ist derzeit zusammengeführt:"

-#: cmd_merging.cc:627
+#: cmd_merging.cc:764
 #, c-format
 msgid "branch '%s' is currently unmerged:"
 msgstr "Zweig '%s' ist derzeit nicht zusammengeführt:"

-#: cmd_merging.cc:634
+#: cmd_merging.cc:771
 msgid "REVID"
 msgstr "REVISIONS_ID"

-#: cmd_merging.cc:635
+#: cmd_merging.cc:772
 msgid "dump the roster associated with the given REVID"
 msgstr "Exportiere den Katalog, welcher mit der gegebenen REVID verknüpft ist"

@@ -1042,8 +1049,7 @@
 msgid "no server given and no default server set"
 msgstr "kein Server angegeben und kein Standardserver gesetzt"

-#: cmd_netsync.cc:59
-#: cmd_netsync.cc:79
+#: cmd_netsync.cc:59 cmd_netsync.cc:79
 #, c-format
 msgid "no branch pattern given"
 msgstr "kein Zweigmuster gegeben"
@@ -1063,16 +1069,11 @@
 msgid "no branch pattern given and no default pattern set"
 msgstr "kein Zweigmuster gegeben und kein Standardmuster gesetzt"

-#: cmd_netsync.cc:97
-#: cmd_netsync.cc:112
-#: cmd_netsync.cc:126
-#: cmd_netsync.cc:173
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 cmd_netsync.cc:173
 msgid "network"
 msgstr "Netzwerk"

-#: cmd_netsync.cc:97
-#: cmd_netsync.cc:112
-#: cmd_netsync.cc:126
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126
 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
 msgstr "[ADRESSE[:PORTNUMMER] [MUSTER]]"

@@ -1087,11 +1088,14 @@
 #: cmd_netsync.cc:120
 #, c-format
 msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
-msgstr "hole Daten anonym; benutzen Sie -kSCHLÜSSELNAME, falls eine Authentifizierung benötigt wird"
+msgstr ""
+"hole Daten anonym; benutzen Sie -kSCHLÜSSELNAME, falls eine "
+"Authentifizierung benötigt wird"

 #: cmd_netsync.cc:127
 msgid "sync branches matching PATTERN with netsync server at ADDRESS"
-msgstr "synchronisiere Zweige, die auf MUSTER passen, mit netsync-Server auf ADRESSE"
+msgstr ""
+"synchronisiere Zweige, die auf MUSTER passen, mit netsync-Server auf ADRESSE"

 #: cmd_netsync.cc:149
 #, c-format
@@ -1113,13 +1117,19 @@

 #: cmd_netsync.cc:189
 #, c-format
-msgid "need permission to store persistent passphrase (see hook persist_phrase_ok())"
-msgstr "benötige Berechtigung, um Passwort persistent zu speichern (siehe Hook persist_phrase_ok())"
+msgid ""
+"need permission to store persistent passphrase (see hook persist_phrase_ok())"
+msgstr ""
+"benötige Berechtigung, um Passwort persistent zu speichern (siehe Hook "
+"persist_phrase_ok())"

 #: cmd_netsync.cc:195
 #, c-format
-msgid "The --no-transport-auth option is only permitted in combination with --stdio"
-msgstr "Die Option '--no-transport-auth' ist nur in Verbindung mit der Option '--stdio' erlaubt."
+msgid ""
+"The --no-transport-auth option is only permitted in combination with --stdio"
+msgstr ""
+"Die Option '--no-transport-auth' ist nur in Verbindung mit der Option '--"
+"stdio' erlaubt."

 #: cmd_othervcs.cc:15
 msgid "RCSFILE..."
@@ -1128,10 +1138,12 @@
 #: cmd_othervcs.cc:16
 msgid ""
 "parse versions in RCS files\n"
-"this command doesn't reconstruct or import revisions.you probably want cvs_import"
+"this command doesn't reconstruct or import revisions.you probably want "
+"cvs_import"
 msgstr ""
 "Analysiert Versionen in RCS-Dateien\n"
-"Durch dieses Kommando werden keine Revision rekonstrustuiert oder importiert. Sie meinen eventuell 'cvs_import'."
+"Durch dieses Kommando werden keine Revision rekonstrustuiert oder "
+"importiert. Sie meinen eventuell 'cvs_import'."

 #: cmd_othervcs.cc:32
 msgid "rcs"
@@ -1145,14 +1157,11 @@
 msgid "import all versions in CVS repository"
 msgstr "importierte alle Versionen des CVS-Depots"

-#: cmd_packet.cc:21
-#: cmd_packet.cc:50
-#: cmd_packet.cc:69
+#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69
 msgid "packet i/o"
 msgstr "Paket-I/O"

-#: cmd_packet.cc:21
-#: cmd_packet.cc:50
+#: cmd_packet.cc:21 cmd_packet.cc:50
 msgid "ID"
 msgstr "ID"

@@ -1172,7 +1181,8 @@
 #: cmd_packet.cc:59
 #, c-format
 msgid "public and private key '%s' do not exist in keystore"
-msgstr "öffentlicher und geheimer Schlüssel '%s' existieren nicht im Schlüsselbund"
+msgstr ""
+"öffentlicher und geheimer Schlüssel '%s' existieren nicht im Schlüsselbund"

 #: cmd_packet.cc:70
 msgid "read packets from files or stdin"
@@ -1212,7 +1222,8 @@

 #: cmd_ws_commit.cc:54
 msgid "revert file(s), dir(s) or entire workspace (\".\")"
-msgstr "setzt Dateien, Verzeichnisse oder den gesamten Arbeitsbereich ('.') zurück"
+msgstr ""
+"setzt Dateien, Verzeichnisse oder den gesamten Arbeitsbereich ('.') zurück"

 #: cmd_ws_commit.cc:137
 #, c-format
@@ -1297,12 +1308,13 @@
 "If no directory is given, the branch name will be used as directory"
 msgstr ""
 "Checkt eine Revision aus der Datenbank in ein Verzeichnis aus.\n"
-"Wenn eine Revision angegeben wird, ist diese die einzige, die ausgecheckt wird.\n"
+"Wenn eine Revision angegeben wird, ist diese die einzige, die ausgecheckt "
+"wird.\n"
 "Andernfalls wird der Kopf des Zweigs (gegeben oder implizit) ausgecheckt.\n"
-"Wenn kein Verzeichnis angegeben wird, wird der Zweigname als Verzeichnisname verwendet."
+"Wenn kein Verzeichnis angegeben wird, wird der Zweigname als Verzeichnisname "
+"verwendet."

-#: cmd_ws_commit.cc:406
-#: cmd_ws_commit.cc:425
+#: cmd_ws_commit.cc:406 cmd_ws_commit.cc:425
 #, c-format
 msgid "need --branch argument for branch-based checkout"
 msgstr "benötige '--branch'-Argument für zweig-basiertes auschecken"
@@ -1392,9 +1404,11 @@
 "perhaps move or delete _MTN/log,\n"
 "or remove --message/--message-file from the command line?"
 msgstr ""
-"_MTN/log ist nicht leer und ein Kommentar wurde über die Kommandozeile spezifiziert.\n"
+"_MTN/log ist nicht leer und ein Kommentar wurde über die Kommandozeile "
+"spezifiziert.\n"
 "Verschieben oder löschen Sie _MTN/log oder\n"
-"entfernen Sie das '--message'-/'--message-file'-Argument aus der Kommandozeile."
+"entfernen Sie das '--message'-/'--message-file'-Argument aus der "
+"Kommandozeile."

 #: cmd_ws_commit.cc:686
 #, c-format
@@ -1411,8 +1425,7 @@
 msgid "revision %s already in database"
 msgstr "Revision %s ist bereits in der Datenbank"

-#: cmd_ws_commit.cc:754
-#: cmd_ws_commit.cc:784
+#: cmd_ws_commit.cc:754 cmd_ws_commit.cc:784
 #, c-format
 msgid "file '%s' modified during commit, aborting"
 msgstr "Datei '%s' wurde während des Einpflegens geändert, breche ab"
@@ -1442,7 +1455,9 @@

 #: cmd_ws_commit.cc:852
 msgid "setup a new workspace directory, default to current"
-msgstr "Setzt einen neuen Arbeitsbereich auf (standardmäßig im derzeitigen Verzeichnis)"
+msgstr ""
+"Setzt einen neuen Arbeitsbereich auf (standardmäßig im derzeitigen "
+"Verzeichnis)"

 #: cmd_ws_commit.cc:858
 #, c-format
@@ -1453,10 +1468,10 @@
 msgid "refresh the inodeprint cache"
 msgstr "aktualisiere den 'inodeprint'-Cache"

-#: commands.cc:124
+#: commands.cc:124 commands.cc:225
 #, c-format
-msgid "unknown command '%s'\n"
-msgstr "unbekanntes Kommando '%s'\n"
+msgid "unknown command '%s'"
+msgstr "unbekanntes Kommando '%s'"

 #: commands.cc:135
 #, c-format
@@ -1467,11 +1482,6 @@
 msgid "commands:"
 msgstr "Kommandos:"

-#: commands.cc:225
-#, c-format
-msgid "unknown command '%s'"
-msgstr "unbekanntes Kommando '%s'"
-
 #: commands.cc:246
 msgid "command [ARGS...]"
 msgstr "Kommando [ARGUMENTE...]"
@@ -1535,9 +1545,7 @@
 msgid "markings"
 msgstr "Kennzeichen"

-#: database_check.cc:338
-#: netsync.cc:2980
-#: rcs_import.cc:1244
+#: database_check.cc:338 netsync.cc:2980 rcs_import.cc:1244
 msgid "revisions"
 msgstr "Revisionen"

@@ -1545,8 +1553,7 @@
 msgid "ancestry"
 msgstr "Vorfahren"

-#: database_check.cc:470
-#: netsync.cc:2984
+#: database_check.cc:470 netsync.cc:2984
 msgid "keys"
 msgstr "Schlüssel"

@@ -1591,8 +1598,12 @@

 #: database_check.cc:613
 #, c-format
-msgid "revision %s missing (%d revision references; %d cert references; %d parent references; %d child references; %d roster references)"
-msgstr "Revision %s fehlt (%d Revisions-Referenzen; %d Zertifikats-Referenzen; %d Eltern-Referenzen; %d Kind-Referenzen; %d Katalog-Referenzen)"
+msgid ""
+"revision %s missing (%d revision references; %d cert references; %d parent "
+"references; %d child references; %d roster references)"
+msgstr ""
+"Revision %s fehlt (%d Revisions-Referenzen; %d Zertifikats-Referenzen; %d "
+"Eltern-Referenzen; %d Kind-Referenzen; %d Katalog-Referenzen)"

 #: database_check.cc:621
 #, c-format
@@ -1627,12 +1638,15 @@
 #: database_check.cc:659
 #, c-format
 msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)"
-msgstr "Revision %s hat falsch zugeordnete Eltern (%d abstammende Eltern; %d Revisions-Referenzen)"
+msgstr ""
+"Revision %s hat falsch zugeordnete Eltern (%d abstammende Eltern; %d "
+"Revisions-Referenzen)"

 #: database_check.cc:668
 #, c-format
 msgid "revision %s mismatched children (%d ancestry children; %d parents)"
-msgstr "Revision %s hat falsch zugeordnete Kinder (%d abstammende Kinder; %d Eltern)"
+msgstr ""
+"Revision %s hat falsch zugeordnete Kinder (%d abstammende Kinder; %d Eltern)"

 #: database_check.cc:680
 #, c-format
@@ -1642,7 +1656,9 @@
 #: database_check.cc:687
 #, c-format
 msgid "revision %s is not parseable (perhaps with unnormalized paths?)"
-msgstr "Revision %s ist nicht analysierbar (eventuell mit nicht-normalisierten Pfaden?)"
+msgstr ""
+"Revision %s ist nicht analysierbar (eventuell mit nicht-normalisierten "
+"Pfaden?)"

 #: database_check.cc:694
 #, c-format
@@ -1657,7 +1673,8 @@
 #: database_check.cc:751
 #, c-format
 msgid "revision %s unchecked signature in %s cert from missing key %s"
-msgstr "Revision %s ungeprüfte Signatur in %s Zertifikat von fehlendem Schlüssel %s"
+msgstr ""
+"Revision %s ungeprüfte Signatur in %s Zertifikat von fehlendem Schlüssel %s"

 #: database_check.cc:759
 #, c-format
@@ -1672,7 +1689,9 @@
 #: database_check.cc:783
 #, c-format
 msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)"
-msgstr "Revision %s falsch zugeordnete Zertifikate (%d Autoren %d Daten %d Log-Einträge)"
+msgstr ""
+"Revision %s falsch zugeordnete Zertifikate (%d Autoren %d Daten %d Log-"
+"Einträge)"

 #: database_check.cc:870
 #, c-format
@@ -1777,7 +1796,9 @@
 #: database_check.cc:944
 #, c-format
 msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs"
-msgstr "Überprüfung beendet: %d Dateien; %d Kataloge; %d Revisionen; %d Schlüssel; %d Zertifikate"
+msgstr ""
+"Überprüfung beendet: %d Dateien; %d Kataloge; %d Revisionen; %d Schlüssel; %"
+"d Zertifikate"

 #: database_check.cc:950
 #, c-format
@@ -1810,7 +1831,8 @@
 "Schema der Datenbank %s passt nicht zu dieser Version von monotone\n"
 "Erwarte Schema %s, existierendes Schema %s\n"
 "Versuchen Sie '%s db migrate' um das Schema zu erneuern\n"
-"(Dieser Vorgang ist nicht umkehrbar; Sie sollten vorher eine Sicherung machen.)"
+"(Dieser Vorgang ist nicht umkehrbar; Sie sollten vorher eine Sicherung "
+"machen.)"

 #: database.cc:170
 #, c-format
@@ -1855,19 +1877,20 @@
 #: database.cc:252
 #, c-format
 msgid "database %s is not an sqlite version 3 file, try dump and reload"
-msgstr "Datenbank %s ist keine SQLite-Version-3-Datei, versuchen Sie ein Export und anschliessenden Import"
+msgstr ""
+"Datenbank %s ist keine SQLite-Version-3-Datei, versuchen Sie ein Export und "
+"anschliessenden Import"

-#: database.cc:281
-#: schema_migration.cc:200
+#: database.cc:281 schema_migration.cc:200
 msgid ""
 "make sure database and containing directory are writeable\n"
 "and you have not run out of disk space"
 msgstr ""
-"Stellen Sie sicher, dass die Datenbank und das umgebende Verzeichnis schreibbar sind\n"
+"Stellen Sie sicher, dass die Datenbank und das umgebende Verzeichnis "
+"schreibbar sind\n"
 "und das noch genügend Speicherplatz verfügbar ist."

-#: database.cc:287
-#: schema_migration.cc:205
+#: database.cc:287 schema_migration.cc:205
 #, c-format
 msgid ""
 "sqlite error: %s\n"
@@ -1884,10 +1907,12 @@
 #: database.cc:337
 #, c-format
 msgid ""
-"existing (possibly stale) journal file '%s' has same stem as new database '%s'\n"
+"existing (possibly stale) journal file '%s' has same stem as new database '%"
+"s'\n"
 "cancelling database creation"
 msgstr ""
-"Existierende Journal-Datei '%s' hat denselben Stamm wie die neue Datenbank '%s'\n"
+"Existierende Journal-Datei '%s' hat denselben Stamm wie die neue Datenbank '%"
+"s'\n"
 "Datenbankerstellung abgebrochen"

 #: database.cc:487
@@ -1994,22 +2019,22 @@
 msgid "could not open database '%s': %s"
 msgstr "Konnte Datenbank '%s' nicht öffnen: %s"

-#: diff_patch.cc:605
+#: diff_patch.cc:606
 #, c-format
 msgid "file '%s' does not exist in workspace"
 msgstr "Datei '%s' existiert nicht im Arbeitsbereich"

-#: diff_patch.cc:606
+#: diff_patch.cc:607
 #, c-format
 msgid "'%s' in workspace is a directory, not a file"
 msgstr "'%s' im Arbeitsbereich ist ein Verzeichnis, keine Datei"

-#: diff_patch.cc:610
+#: diff_patch.cc:611
 #, c-format
 msgid "file %s in workspace has id %s, wanted %s"
 msgstr "Datei %s im Arbeitsbereich hat die ID %s, erwartete %s"

-#: diff_patch.cc:731
+#: diff_patch.cc:732
 #, c-format
 msgid ""
 "help required for 3-way merge\n"
@@ -2024,8 +2049,7 @@
 "[         rechts] %s\n"
 "[zusammengeführt] %s\n"

-#: file_io.cc:175
-#: file_io.cc:182
+#: file_io.cc:175 file_io.cc:182
 #, c-format
 msgid ""
 "could not create directory '%s'\n"
@@ -2080,7 +2104,8 @@
 #: file_io.cc:228
 #, c-format
 msgid "directory to delete, '%s', is not a directory but a file"
-msgstr "das zu löschende Verzeichnis '%s' ist kein Verzeichnis, sondern eine Datei"
+msgstr ""
+"das zu löschende Verzeichnis '%s' ist kein Verzeichnis, sondern eine Datei"

 #: file_io.cc:235
 #, c-format
@@ -2105,10 +2130,10 @@
 #: file_io.cc:254
 #, c-format
 msgid "rename source file '%s' is a directory -- bug in monotone?"
-msgstr "Quelldatei für Umbenennung '%s ist ein Verzeichnis -- Fehler in monotone?"
+msgstr ""
+"Quelldatei für Umbenennung '%s ist ein Verzeichnis -- Fehler in monotone?"

-#: file_io.cc:257
-#: file_io.cc:270
+#: file_io.cc:257 file_io.cc:270
 #, c-format
 msgid "rename target '%s' already exists"
 msgstr "Zieldatei für Umbenennung '%s' existiert bereits"
@@ -2121,7 +2146,8 @@
 #: file_io.cc:267
 #, c-format
 msgid "rename source dir '%s' is a file -- bug in monotone?"
-msgstr "Quellverzeichnis für Umbenennung '%s ist eine Datei -- Fehler in monotone?"
+msgstr ""
+"Quellverzeichnis für Umbenennung '%s ist eine Datei -- Fehler in monotone?"

 #: file_io.cc:281
 #, c-format
@@ -2151,7 +2177,8 @@
 #: file_io.cc:371
 #, c-format
 msgid "file '%s' cannot be overwritten as data; it is a directory"
-msgstr "Datei %s kann nicht mit Daten überschrieben werden; sie ist ein Verzeichnis"
+msgstr ""
+"Datei %s kann nicht mit Daten überschrieben werden; sie ist ein Verzeichnis"

 #: file_io.cc:379
 #, c-format
@@ -2188,8 +2215,7 @@
 msgid "empty passphrases not allowed, try again"
 msgstr "leere Passwörter sind nicht erlaubt, versuchen Sie es noch einmal"

-#: keys.cc:128
-#: keys.cc:135
+#: keys.cc:128 keys.cc:135
 #, c-format
 msgid "too many failed passphrases"
 msgstr "Passwort zu oft falsch eingegeben"
@@ -2209,9 +2235,7 @@
 msgid "passphrase for '%s' is incorrect"
 msgstr "Passwort für '%s' ist nicht korrekt"

-#: lua.cc:555
-#: lua.cc:584
-#: lua.cc:599
+#: lua.cc:555 lua.cc:584 lua.cc:599
 #, c-format
 msgid "%s called with an invalid parameter"
 msgstr "%s wurde mit einem ungültigen Parameter aufgerufen"
@@ -2221,9 +2245,7 @@
 msgid "Directory '%s' does not exist"
 msgstr "Das Verzeichnis '%s' existiert nicht"

-#: lua.cc:603
-#: rcs_import.cc:1235
-#: work.cc:488
+#: lua.cc:603 rcs_import.cc:1235 work.cc:488
 #, c-format
 msgid "'%s' is not a directory"
 msgstr "'%s' ist kein Verzeichnis"
@@ -2270,7 +2292,9 @@

 #: monotone.cc:68
 msgid "set filename containing commit changelog message"
-msgstr "setze Dateinamen der Datei, die die Nachricht für die Änderungshistorie beinhaltet"
+msgstr ""
+"setze Dateinamen der Datei, die die Nachricht für die Änderungshistorie "
+"beinhaltet"

 #: monotone.cc:69
 msgid "override date/time for commit"
@@ -2362,7 +2386,9 @@

 #: monotone.cc:91
 msgid "when rosterifying, drop attrs entries with the given key"
-msgstr "während der Katalogisierung, entferne 'attrs'-Einträge mit dem gegebenen Schlüssel"
+msgstr ""
+"während der Katalogisierung, entferne 'attrs'-Einträge mit dem gegebenen "
+"Schlüssel"

 #: monotone.cc:92
 msgid "exclude files when printing logs"
@@ -2390,7 +2416,8 @@

 #: monotone.cc:106
 msgid "suppress warning, verbose, informational and progress messages"
-msgstr "unterdrücke Warnungen, wortreiche, informelle und Fortschrittsmeldungen"
+msgstr ""
+"unterdrücke Warnungen, wortreiche, informelle und Fortschrittsmeldungen"

 #: monotone.cc:107
 msgid "display help message"
@@ -2402,7 +2429,8 @@

 #: monotone.cc:109
 msgid "print detailed version number, then exit"
-msgstr "zeige detailierte Versionsinformationen an und beende dann das Programm"
+msgstr ""
+"zeige detailierte Versionsinformationen an und beende dann das Programm"

 #: monotone.cc:110
 msgid "insert command line arguments taken from the given file"
@@ -2434,7 +2462,8 @@

 #: monotone.cc:117
 msgid "limit search for workspace to specified root"
-msgstr "beschränke Suche nach der Arbeitsumgebung auf angegebene Verzeichniswurzel"
+msgstr ""
+"beschränke Suche nach der Arbeitsumgebung auf angegebene Verzeichniswurzel"

 #: monotone.cc:118
 msgid "verbose completion output"
@@ -2456,7 +2485,8 @@
 #: monotone.cc:233
 #, c-format
 msgid "weird error when stuffing arguments read from %s: %s\n"
-msgstr "seltsamer Fehler beim Zusammenpacken der gelesen Argumente von %s: %s\n"
+msgstr ""
+"seltsamer Fehler beim Zusammenpacken der gelesen Argumente von %s: %s\n"

 #: monotone.cc:330
 msgid "[OPTION...] command [ARGS...]\n"
@@ -2467,12 +2497,12 @@
 msgid "syntax error near the \"%s\" option: %s"
 msgstr "Syntaxfehler in der der Option \"%s\": %s"

-#: monotone.cc:635
+#: monotone.cc:629
 #, c-format
 msgid "%s %s doesn't use the option %s"
 msgstr "%s %s benutzt die Option %s nicht"

-#: monotone.cc:670
+#: monotone.cc:663
 #, c-format
 msgid "Options specific to '%s %s':"
 msgstr "Spezifische Optionen für '%s %s':"
@@ -2520,11 +2550,13 @@

 #: netcmd.cc:125
 msgid "the remote side has a newer, incompatible version of monotone"
-msgstr "der entfernte Rechner benutzt eine neuere, inkompatible Version von monotone"
+msgstr ""
+"der entfernte Rechner benutzt eine neuere, inkompatible Version von monotone"

 #: netcmd.cc:126
 msgid "the remote side has an older, incompatible version of monotone"
-msgstr "der entfernte Rechner benutzt eine ältere, inkompatible Version von monotone"
+msgstr ""
+"der entfernte Rechner benutzt eine ältere, inkompatible Version von monotone"

 #: netcmd.cc:136
 #, c-format
@@ -2540,20 +2572,17 @@
 "falsche HMAC Prüfsumme (bekam %s, benötigte %s)\n"
 "das bedeutet, das Daten bei der Übertragung beschädigt wurden\n"

-#: netcmd.cc:272
-#: netcmd.cc:318
+#: netcmd.cc:272 netcmd.cc:318
 #, c-format
 msgid "unknown role specifier %d"
 msgstr "unbekannter Rollenspezifikation %d"

-#: netio.hh:41
-#: netio.hh:59
+#: netio.hh:41 netio.hh:59
 #, c-format
 msgid "need %d bytes to decode %s at %d, only have %d"
 msgstr "benötige %d Bytes zum Dekodieren von %s auf %d, habe nur %d"

-#: netio.hh:87
-#: netio.hh:122
+#: netio.hh:87 netio.hh:122
 #, c-format
 msgid "uleb128 decode for '%s' into %d-byte datum overflowed"
 msgstr "uelb128 Dekodierung für '%s' in %d-Byte Datum ist übergelaufen"
@@ -2561,12 +2590,14 @@
 #: netio.hh:142
 #, c-format
 msgid "ran out of bytes reading uleb128 value for '%s' at pos %d"
-msgstr "nicht genügend Bytes zum Lesen vom uelb128 Wert von '%s' an Position %d"
+msgstr ""
+"nicht genügend Bytes zum Lesen vom uelb128 Wert von '%s' an Position %d"

 #: netio.hh:278
 #, c-format
 msgid "decoding variable length string of %d bytes for '%s', maximum is %d"
-msgstr "dekodiere Zeichenkette variabler Länge von %d Bytes für '%s', Maximum ist %d"
+msgstr ""
+"dekodiere Zeichenkette variabler Länge von %d Bytes für '%s', Maximum ist %d"

 #: netio.hh:333
 #, c-format
@@ -2590,8 +2621,7 @@
 msgid "certs in"
 msgstr "Zertifikate rein"

-#: netsync.cc:732
-#: netsync.cc:745
+#: netsync.cc:732 netsync.cc:745
 msgid "revs in"
 msgstr "Revisionen rein"

@@ -2599,8 +2629,7 @@
 msgid "certs out"
 msgstr "Zertifikate raus"

-#: netsync.cc:739
-#: netsync.cc:747
+#: netsync.cc:739 netsync.cc:747
 msgid "revs out"
 msgstr "Revisionen raus"

@@ -2630,7 +2659,8 @@
 "@ WARNUNG: SERVERIDENTIFIKATION HAT SICH GEÄNDERT         @\n"
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
 "ES IST MÖGLICH DAS JEMAND ETWAS BÖSES MACHT\n"
-"Es ist auch möglich, daß sich einfach nur der Server-Schlüssel geändert hat.\n"
+"Es ist auch möglich, daß sich einfach nur der Server-Schlüssel geändert "
+"hat.\n"
 "Der entfernte Rechner hat den Schlüssel %s gesendet,\n"
 "ich habe %s erwartet\n"
 "'%s unset %s %s' übergeht diese Prüfung."
@@ -2666,8 +2696,7 @@
 msgid "rejected attempt at anonymous connection while running as sink"
 msgstr "verweigerte anonyme Verbindung im Datensenke-Modus"

-#: netsync.cc:1374
-#: netsync.cc:1503
+#: netsync.cc:1374 netsync.cc:1503
 #, c-format
 msgid "not serving branch '%s'"
 msgstr "bediene Anfrage für Zweig '%s' nicht"
@@ -2699,12 +2728,17 @@

 #: netsync.cc:1489
 #, c-format
-msgid "denied '%s' read permission for '%s' excluding '%s' while running as pure sink"
-msgstr "verweigere '%s' Leseberechtigung für '%s' außer '%s' im reinen Datensenke-Modus"
+msgid ""
+"denied '%s' read permission for '%s' excluding '%s' while running as pure "
+"sink"
+msgstr ""
+"verweigere '%s' Leseberechtigung für '%s' außer '%s' im reinen Datensenke-"
+"Modus"

 #: netsync.cc:1509
 #, c-format
-msgid "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
+msgid ""
+"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
 msgstr "verweigerte '%s' Leseberechtigung für '%s' außer '%s' wegen Zweig '%s'"

 #: netsync.cc:1512
@@ -2719,8 +2753,12 @@

 #: netsync.cc:1531
 #, c-format
-msgid "denied '%s' write permission for '%s' excluding '%s' while running as pure source"
-msgstr "verweigere '%s' Schreibberechtigung für '%s' außer '%s' im reinen Datensenke-Modus"
+msgid ""
+"denied '%s' write permission for '%s' excluding '%s' while running as pure "
+"source"
+msgstr ""
+"verweigere '%s' Schreibberechtigung für '%s' außer '%s' im reinen Datensenke-"
+"Modus"

 #: netsync.cc:1539
 #, c-format
@@ -2760,12 +2798,15 @@
 #: netsync.cc:1870
 #, c-format
 msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
-msgstr "Falsch zugeordneter Zeitraum in Zweig %s. Server hat '%s', Client hat '%s'."
+msgstr ""
+"Falsch zugeordneter Zeitraum in Zweig %s. Server hat '%s', Client hat '%s'."

 #: netsync.cc:1888
 #, c-format
 msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
-msgstr "Prüfsummen-Check für öffentlichen Schlüssel '%s' (%s) fehlgeschlagen; benötigte '%s', bekam '%s'"
+msgstr ""
+"Prüfsummen-Check für öffentlichen Schlüssel '%s' (%s) fehlgeschlagen; "
+"benötigte '%s', bekam '%s'"

 #: netsync.cc:1902
 #, c-format
@@ -2777,18 +2818,15 @@
 msgid "Received warning from usher: %s"
 msgstr "Erhielt Warnung von 'usher': %s"

-#: netsync.cc:2051
-#: netsync.cc:2082
+#: netsync.cc:2051 netsync.cc:2082
 msgid "source and sink"
 msgstr "Datenquelle und -senke"

-#: netsync.cc:2052
-#: netsync.cc:2083
+#: netsync.cc:2052 netsync.cc:2083
 msgid "source"
 msgstr "Datenquelle"

-#: netsync.cc:2052
-#: netsync.cc:2083
+#: netsync.cc:2052 netsync.cc:2083
 msgid "sink"
 msgstr "Datensenke"

@@ -2797,8 +2835,7 @@
 msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
 msgstr "Eingabepuffer für Peer %s ist nach netcmd-Absendung übervoll\n"

-#: netsync.cc:2251
-#: netsync.cc:2350
+#: netsync.cc:2251 netsync.cc:2350
 #, c-format
 msgid "protocol error while processing peer %s: '%s'"
 msgstr "Protokoll-Fehler während der Bearbeitung von Peer %s: '%s'"
@@ -2816,12 +2853,14 @@
 #: netsync.cc:2365
 #, c-format
 msgid "timed out waiting for I/O with peer %s, disconnecting\n"
-msgstr "Zeitüberschreitung während Warten auf E/A mit Peer %s, trenne Verbindung\n"
+msgstr ""
+"Zeitüberschreitung während Warten auf E/A mit Peer %s, trenne Verbindung\n"

 #: netsync.cc:2388
 #, c-format
 msgid "processing failure while talking to peer %s, disconnecting\n"
-msgstr "Bearbeitungsfehler während Kommunikation mit Peer %s, trenne Verbindung\n"
+msgstr ""
+"Bearbeitungsfehler während Kommunikation mit Peer %s, trenne Verbindung\n"

 #: netsync.cc:2405
 #, c-format
@@ -2831,7 +2870,9 @@
 #: netsync.cc:2411
 #, c-format
 msgid "peer %s disconnected after we informed them of error"
-msgstr "Peer %s hat Verbindung getrennt, nachdem wir ihn vom Fehler unterrichtet haben"
+msgstr ""
+"Peer %s hat Verbindung getrennt, nachdem wir ihn vom Fehler unterrichtet "
+"haben"

 #: netsync.cc:2416
 #, c-format
@@ -2841,7 +2882,9 @@
 #: netsync.cc:2482
 #, c-format
 msgid "protocol error while processing peer %s: '%s', marking as bad"
-msgstr "Protokoll-Fehler während Bearbeitung des Peers %s: '%s', als ungültig markiert"
+msgstr ""
+"Protokoll-Fehler während Bearbeitung des Peers %s: '%s', als ungültig "
+"markiert"

 #: netsync.cc:2514
 #, c-format
@@ -2851,7 +2894,9 @@
 #: netsync.cc:2551
 #, c-format
 msgid "protocol error while processing peer %s: '%s', disconnecting"
-msgstr "Protokoll-Fehler während der Bearbeitung des Peers %s: '%s', trenne Verbindung"
+msgstr ""
+"Protokoll-Fehler während der Bearbeitung des Peers %s: '%s', trenne "
+"Verbindung"

 #: netsync.cc:2562
 #, c-format
@@ -2860,8 +2905,11 @@

 #: netsync.cc:2567
 #, c-format
-msgid "peer %s read failed in shutdown state (possibly client misreported error)\n"
-msgstr "Peer %s konnte nicht im 'shutdown state' gelesen werden (evtl. vom Client falsch berichteter Fehler)\n"
+msgid ""
+"peer %s read failed in shutdown state (possibly client misreported error)\n"
+msgstr ""
+"Peer %s konnte nicht im 'shutdown state' gelesen werden (evtl. vom Client "
+"falsch berichteter Fehler)\n"

 #: netsync.cc:2573
 #, c-format
@@ -2875,8 +2923,11 @@

 #: netsync.cc:2599
 #, c-format
-msgid "peer %s write failed in shutdown state (possibly client misreported error)\n"
-msgstr "Peer %s konnte nicht im 'shutdown state' geschrieben werden (evtl. vom Client falsch berichteter Fehler)\n"
+msgid ""
+"peer %s write failed in shutdown state (possibly client misreported error)\n"
+msgstr ""
+"Peer %s konnte nicht im 'shutdown state' geschrieben werden (evtl. vom "
+"Client falsch berichteter Fehler)\n"

 #: netsync.cc:2605
 #, c-format
@@ -2905,7 +2956,9 @@
 #: netsync.cc:2737
 #, c-format
 msgid "session limit %d reached, some connections will be refused\n"
-msgstr "Maximale Anzahl an Sitzungen %d erreicht, einige Verbindungen werden abgelehnt werden\n"
+msgstr ""
+"Maximale Anzahl an Sitzungen %d erreicht, einige Verbindungen werden "
+"abgelehnt werden\n"

 #: netsync.cc:2802
 #, c-format
@@ -2954,8 +3007,7 @@
 "Das 'exclude branch'-Muster beinhaltet ein Quotierungszeichen:\n"
 "%s\n"

-#: netsync.cc:3173
-#: netsync.cc:3177
+#: netsync.cc:3173 netsync.cc:3177
 #, c-format
 msgid "network error: %s"
 msgstr "Netzwerk-Fehler: %s"
@@ -2975,10 +3027,7 @@
 msgid "missing prerequisite revision '%s'"
 msgstr "fehlende vorausgesetzte Revision '%s'"

-#: packet.cc:140
-#: packet.cc:151
-#: packet.cc:167
-#: packet.cc:175
+#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175
 #, c-format
 msgid "dropping revision '%s'"
 msgstr "entferne Revision '%s'"
@@ -3011,7 +3060,8 @@
 #: packet.cc:226
 #, c-format
 msgid "key '%s' is not equal to key '%s' in database"
-msgstr "Schlüssel '%s' stimmt nicht mit dem Schlüssel '%s' in der Datenbank überein"
+msgstr ""
+"Schlüssel '%s' stimmt nicht mit dem Schlüssel '%s' in der Datenbank überein"

 #: packet.cc:350
 #, c-format
@@ -3060,7 +3110,8 @@
 "try importing a module instead, with 'cvs_import %s/<module_name>"
 msgstr ""
 "%s scheint das Wurzelverzeichnis eines CVS-Repositories zu sein\n"
-"versuchen Sie stattdessen, ein Modul zu importieren, mit 'cvs_import %s/<modul_name>"
+"versuchen Sie stattdessen, ein Modul zu importieren, mit 'cvs_import %s/"
+"<modul_name>"

 #: rcs_import.cc:1222
 #, c-format
@@ -3104,12 +3155,15 @@
 #: revision.cc:1010
 #, c-format
 msgid "Directory for path %s cannot be added, as there is a file in the way\n"
-msgstr "Verzeichnis für Pfad %s kann nicht hinzugefügt werden, da eine Datei im Weg ist\n"
+msgstr ""
+"Verzeichnis für Pfad %s kann nicht hinzugefügt werden, da eine Datei im Weg "
+"ist\n"

 #: revision.cc:1021
 #, c-format
 msgid "Path %s cannot be added, as there is a directory in the way"
-msgstr "Der Pfad %s kann nicht hinzugefügt werden, da ein Verzeichnis im Weg ist"
+msgstr ""
+"Der Pfad %s kann nicht hinzugefügt werden, da ein Verzeichnis im Weg ist"

 #: revision.cc:1024
 #, c-format
@@ -3125,14 +3179,19 @@
 "seriously, if you'd like to keep it, we're happy to figure out how)"
 msgstr ""
 "unbekanntes Attribut '%s' an Pfad '%s'\n"
-"bitte kontaktieren Sie %s, damit wir herausfinden können, wie dies migriert werden kann\n"
-"(wenn Ihnen das Attribut nicht wichtig ist, können Sie es über --drop-attr entfernen,\n"
-"nichtsdestotrotz würden wir gerne darüber bescheid wissen, um es dennoch migrierbar zu machen)"
+"bitte kontaktieren Sie %s, damit wir herausfinden können, wie dies migriert "
+"werden kann\n"
+"(wenn Ihnen das Attribut nicht wichtig ist, können Sie es über --drop-attr "
+"entfernen,\n"
+"nichtsdestotrotz würden wir gerne darüber bescheid wissen, um es dennoch "
+"migrierbar zu machen)"

 #: revision.cc:1423
 #, c-format
 msgid "converting existing revision graph to new roster-style revisions"
-msgstr "konvertiere existierenden Revisions-Graph für neue, katalogbasierte Revisionen"
+msgstr ""
+"konvertiere existierenden Revisions-Graph für neue, katalogbasierte "
+"Revisionen"

 #: revision.cc:1478
 #, c-format
@@ -3148,7 +3207,8 @@
 msgstr ""
 "Ich bin auf eine Revision mit einem mir unbekannten Format gestoßen ('%s').\n"
 "Ich kann lediglich das Format der Version '1' verstehen.\n"
-"Eine neuere Version von monotone wird benötigt, um diese Operation durchzuführen."
+"Eine neuere Version von monotone wird benötigt, um diese Operation "
+"durchzuführen."

 #: sanity.cc:135
 #, c-format
@@ -3236,7 +3296,8 @@
 #: schema_migration.cc:316
 #, c-format
 msgid "no migration performed; database schema already up-to-date at %s"
-msgstr "keine Migration durchgeführt; Datenbankschema ist bereits aktualisiert auf %s"
+msgstr ""
+"keine Migration durchgeführt; Datenbankschema ist bereits aktualisiert auf %s"

 #: schema_migration.cc:866
 #, c-format
@@ -3426,7 +3487,9 @@
 #: work.cc:468
 #, c-format
 msgid "proposed new root directory '%s' is not versioned or does not exist"
-msgstr "das neu vorgeschlagene Wurzelverzeichnis '%s' ist nicht unter Versionkontrolle oder existiert nicht"
+msgstr ""
+"das neu vorgeschlagene Wurzelverzeichnis '%s' ist nicht unter "
+"Versionkontrolle oder existiert nicht"

 #: work.cc:470
 #, c-format
@@ -3436,12 +3499,15 @@
 #: work.cc:475
 #, c-format
 msgid "proposed new root directory '%s' contains illegal path %s"
-msgstr "das neu vorgeschlagene Wurzelverzeichnis '%s' beinhaltet den ungültigen Pfad %s"
+msgstr ""
+"das neu vorgeschlagene Wurzelverzeichnis '%s' beinhaltet den ungültigen Pfad "
+"%s"

 #: work.cc:485
 #, c-format
 msgid "directory '%s' is not versioned or does not exist"
-msgstr "das Verzeichnis '%s' ist nicht unter Versionskontrolle oder existiert nicht"
+msgstr ""
+"das Verzeichnis '%s' ist nicht unter Versionskontrolle oder existiert nicht"

 #: work.cc:491
 #, c-format
@@ -3473,14 +3539,12 @@
 msgid "dropping %s"
 msgstr "entferne %s"

-#: work.cc:943
-#: work.cc:954
+#: work.cc:943 work.cc:954
 #, c-format
 msgid "path %s already exists"
 msgstr "Pfad %s existiert bereits"

-#: work.cc:976
-#: work.cc:1003
+#: work.cc:976 work.cc:1003
 #, c-format
 msgid "adding %s"
 msgstr "füge %s hinzu"
@@ -3508,13 +3572,17 @@
 #: work.cc:1040
 #, c-format
 msgid "content of file '%s' has changed, not overwriting"
-msgstr "Inhalt der Datei '%s' hat sich geändert, Datei wird nicht überschrieben"
+msgstr ""
+"Inhalt der Datei '%s' hat sich geändert, Datei wird nicht überschrieben"

 #: work.cc:1041
 #, c-format
 msgid "updating %s"
 msgstr "aktualisiere %s"

+#~ msgid "unknown command '%s'\n"
+#~ msgstr "unbekanntes Kommando '%s'\n"
+
 #~ msgid ""
 #~ "interface_version\n"
 #~ "heads [BRANCH]\n"
@@ -3571,4 +3639,3 @@
 #~ "packet_for_fdata DATEI_ID\n"
 #~ "packet_for_fdelta ALTE_DATEI NEUE_DATEI\n"
 #~ "keys\n"
-
============================================================
--- po/fr.po	4023420bb7e1040a9359852d69b19654201c4396
+++ po/fr.po	bc6e687ce5f93b8b33bc823dc19d18a879b10dd7
@@ -243,7 +243,7 @@
 msgstr ""
 "Project-Id-Version: monotone 0.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-15 17:13+0100\n"
+"POT-Creation-Date: 2006-07-05 22:56-0700\n"
 "PO-Revision-Date: 2006-03-15 17:13+0100\n"
 "Last-Translator: Benoît Dejean <address@hidden>\n"
 "Language-Team: Benoît Dejean <address@hidden>\n"
@@ -252,108 +252,103 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"

-#: ../app_state.cc:118
+#: app_state.cc:139
 #, c-format
 msgid "workspace required but not found%s%s"
 msgstr "espace de travail requis mais pas trouvé%s%s"

-#: ../app_state.cc:126
+#: app_state.cc:147
 #, c-format
 msgid "invalid directory ''"
 msgstr "dossier pas valable «»"

-#: ../app_state.cc:134
-#, c-format
-msgid "monotone bookkeeping directory '%s' already exists in '%s'\n"
+#: app_state.cc:155
+#, fuzzy, c-format
+msgid "monotone bookkeeping directory '%s' already exists in '%s'"
 msgstr "le dossier administratif « %s » existe déjà dans « %s »\n"

-#: ../app_state.cc:173 ../app_state.cc:188
+#: app_state.cc:236
 #, c-format
-msgid "unknown path '%s'\n"
-msgstr "chemin inconnu « %s »\n"
-
-#: ../app_state.cc:349
-#, c-format
 msgid "search root '%s' does not exist"
 msgstr "le racine de l'espace de travail « %s » n'existe pas"

-#: ../app_state.cc:350
+#: app_state.cc:237
 #, c-format
 msgid "search root '%s' is not a directory\n"
 msgstr "le racine de l'espace de travail « %s » n'est pas un dossier\n"

-#: ../app_state.cc:385
+#: app_state.cc:271
 #, c-format
 msgid "failed to parse date string '%s': %s"
 msgstr "échou de comprendre la date « %s » : %s"

-#: ../app_state.cc:399
+#: app_state.cc:286
 #, c-format
 msgid "negative depth not allowed\n"
 msgstr "profondeur négative interdite\n"

-#: ../app_state.cc:407
+#: app_state.cc:294
 #, c-format
-msgid "negative or zero last not allowed\n"
-msgstr "« last » négative ou zéro interdite\n"
+msgid "illegal argument to --last: cannot be zero or negative\n"
+msgstr ""

-#: ../app_state.cc:415
+#: app_state.cc:302
 #, c-format
-msgid "negative or zero next not allowed\n"
-msgstr "« next » négative ou zéro interdite\n"
+msgid "illegal argument to --next: cannot be zero or negative\n"
+msgstr ""

-#: ../app_state.cc:544
+#: app_state.cc:438
 #, c-format
 msgid "Failed to read options file %s"
 msgstr "La lecture du fichier d'options « %s » a échouée"

-#: ../app_state.cc:561
+#: app_state.cc:455
 #, c-format
 msgid "Failed to write options file %s"
 msgstr "L'écriture du fichier d'options « %s » a échouée"

-#: ../basic_io.cc:27
+#: basic_io.cc:33
 #, c-format
 msgid "error in %s:%d:%d:E: %s"
 msgstr "erreur dans %s:%d:%d:E : %s"

-#: ../cert.cc:58
-#, c-format
-msgid "ignoring bad signature by '%s' on '%s'\n"
+#: cert.cc:83
+#, fuzzy, c-format
+msgid "ignoring bad signature by '%s' on '%s'"
 msgstr "ignore mauvaise signature fait par « %s » sur « %s »\n"

-#: ../cert.cc:66
-#, c-format
-msgid "ignoring unknown signature by '%s' on '%s'\n"
+#: cert.cc:91
+#, fuzzy, c-format
+msgid "ignoring unknown signature by '%s' on '%s'"
 msgstr "ignore signature inconnue fait par « %s » sur « %s »\n"

-#: ../cert.cc:129
-#, c-format
-msgid "trust function disliked %d signers of %s cert on manifest %s\n"
+#: cert.cc:157
+#, fuzzy, c-format
+msgid "trust function disliked %d signers of %s cert on manifest %s"
 msgstr ""
 "function de confiance n'aimait pas %d signataires du certif %s dans le "
 "manifeste %s\n"

-#: ../cert.cc:182
-#, c-format
-msgid "trust function disliked %d signers of %s cert on revision %s\n"
+#: cert.cc:214
+#, fuzzy, c-format
+msgid "trust function disliked %d signers of %s cert on revision %s"
 msgstr ""
 "function de confiance n'aimait pas %d signataires du certif %s dans la "
 "révision %s\n"

-#: ../cert.cc:271
+#: cert.cc:303
 #, c-format
 msgid "calculated cert hash '%s' does not match '%s'"
 msgstr ""
 "la somme de contrôle calculée pour le certif, « %s », ne correspond pas à « %"
 "s »"

-#: ../cert.cc:347 ../keys.cc:532
+#: cert.cc:379 keys.cc:554
 #, c-format
 msgid "no key pair '%s' found in key store '%s'"
 msgstr "aucune paire de clefs « %s » dans l'entrepôt de clefs « %s »"

-#: ../cert.cc:424
+#: cert.cc:457
 #, c-format
 msgid ""
 "you have no private key to make signatures with\n"
@@ -362,7 +357,7 @@
 "vous n'avez pas de clef privé pour établir des signatures,\n"
 "vous avez sans doute besoin de faire « genkey <votre email> »"

-#: ../cert.cc:427
+#: cert.cc:460
 #, c-format
 msgid ""
 "you have multiple private keys\n"
@@ -372,21 +367,21 @@
 "choisissez-en une à utiliser pour vos signatures en ajoutant « -"
 "k<nomdeclef> » à votre commande"

-#: ../cert.cc:444
+#: cert.cc:478
 #, c-format
 msgid "no branch found for empty revision, please provide a branch name"
 msgstr ""
 "aucune branche trouvée pour la révision vide, veuillez donne le nom d'une "
 "branche"

-#: ../cert.cc:453
+#: cert.cc:487
 #, c-format
 msgid "no branch certs found for revision %s, please provide a branch name"
 msgstr ""
 "aucun certif de branche trouvé pour la révision %s, veuillez donne le nom "
 "d'une branche"

-#: ../cert.cc:457
+#: cert.cc:491
 #, c-format
 msgid ""
 "multiple branch certs found for revision %s, please provide a branch name"
@@ -394,210 +389,328 @@
 "multiples certifs de branche trouvés pour la révision %s, veuillez donne le "
 "nom d'une branche"

-#: ../commands.cc:165
+#: cmd_automate.cc:205
 #, c-format
-msgid "command '%s' has multiple ambiguous expansions:\n"
-msgstr "la commande « %s » a plusieurs expansions ambigües : \n"
+msgid "read from client failed with error code: %d"
+msgstr ""

-#: ../commands.cc:208
-msgid "commands:"
-msgstr "commandes :"
+#: cmd_automate.cc:248
+#, fuzzy, c-format
+msgid "Bad input to automate stdio"
+msgstr "mauvaise entrée à parse_basic_io"

-#: ../commands.cc:265
+#: cmd_automate.cc:301
+msgid "automation"
+msgstr "automatisation"
+
+#: cmd_automate.cc:302
+msgid "automation interface"
+msgstr "interface d'automatisation"
+
+#: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:435 cmd_diff_log.cc:437
+#: cmd_files.cc:102 cmd_files.cc:164 cmd_merging.cc:123 cmd_ws_commit.cc:446
+#: commands.cc:370
 #, c-format
-msgid "unknown command '%s'\n"
-msgstr "commande inconnue « %s »\n"
+msgid "no such revision '%s'"
+msgstr "aucune révision « %s »"

-#: ../commands.cc:325
+#: cmd_db.cc:41
 #, c-format
-msgid "pid file '%s' already exists"
-msgstr "le fichier pid « %s » existe déjà"
+msgid "revision %s already has children. We cannot kill it."
+msgstr "la révision %s a déjà des descendants. Impossible de la tuer."

-#: ../commands.cc:349 ../commands.cc:1358 ../commands.cc:1428
-#: ../commands.cc:1864 ../commands.cc:2710 ../commands.cc:3331
-#: ../commands.cc:3566 ../commands.cc:3605 ../commands.cc:3950
+#: cmd_db.cc:46
+msgid "database"
+msgstr "base de données"
+
+#: cmd_db.cc:47
+msgid ""
+"init\n"
+"info\n"
+"version\n"
+"dump\n"
+"load\n"
+"migrate\n"
+"execute\n"
+"kill_rev_locally ID\n"
+"kill_branch_certs_locally BRANCH\n"
+"kill_tag_locally TAG\n"
+"check\n"
+"changesetify\n"
+"rosterify\n"
+"set_epoch BRANCH EPOCH\n"
+msgstr ""
+"init\n"
+"info\n"
+"version\n"
+"dump\n"
+"load\n"
+"migrate\n"
+"execute\n"
+"kill_rev_locally ID\n"
+"kill_branch_certs_locally BRANCHE\n"
+"kill_tag_locally ÉTIQUETTE\n"
+"check\n"
+"changesetify\n"
+"rosterify\n"
+"set_epoch BRANCHE ÉPOQUE\n"
+
+#: cmd_db.cc:61
+msgid "manipulate database state"
+msgstr "manipule l'état de la base de données"
+
+#: cmd_db.cc:108
+#, c-format
+msgid "The epoch must be %s characters"
+msgstr ""
+
+#: cmd_db.cc:119 cmd_db.cc:135
+msgid "vars"
+msgstr "variables"
+
+#: cmd_db.cc:119
+msgid "DOMAIN NAME VALUE"
+msgstr "DOMAINE NOM VALEUR"
+
+#: cmd_db.cc:120
+msgid "set the database variable NAME to VALUE, in domain DOMAIN"
+msgstr ""
+"établir la variable NOM de la base de données dans le domaine DOMAINE avec "
+"la valeur VALEUR"
+
+#: cmd_db.cc:135
+msgid "DOMAIN NAME"
+msgstr "DOMAINE NOM VALEUR"
+
+#: cmd_db.cc:136
+msgid "remove the database variable NAME in domain DOMAIN"
+msgstr ""
+"supprimer la variable NOM de la base de données dans le domaine DOMAINE"
+
+#: cmd_db.cc:148
+#, c-format
+msgid "no var with name %s in domain %s"
+msgstr "aucune variable nommée %s dans le domaine %s"
+
+#: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:558 cmd_files.cc:78
+#: cmd_files.cc:145 cmd_list.cc:437 cmd_merging.cc:569 cmd_ws_commit.cc:322
+#: commands.cc:246
 msgid "informative"
 msgstr "information"

-#: ../commands.cc:349
-msgid "command [ARGS...]"
-msgstr "commande [ARGUMENTS...]"
+#: cmd_db.cc:152
+msgid "(revision|file|key) PARTIAL-ID"
+msgstr "(revision|file|key) ID-PARTIELLE"

-#: ../commands.cc:349
-msgid "display command help"
-msgstr "afficher l'aide de la commande"
+#: cmd_db.cc:153
+msgid "complete partial id"
+msgstr "remplis une identité partielle"

-#: ../commands.cc:428
+#: cmd_db.cc:162
+#, c-format
+msgid "non-hex digits in partial id"
+msgstr "chiffres non-héxadécimaux dans l'id partielle"
+
+#: cmd_diff_log.cc:348 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224
+#: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:613
+msgid "[PATH]..."
+msgstr "[CHEMIN]..."
+
+#: cmd_diff_log.cc:349
+#, fuzzy
 msgid ""
-"Enter a description of this change.\n"
-"Lines beginning with `MT:' are removed automatically.\n"
+"show current diffs on stdout.\n"
+"If one revision is given, the diff between the workspace and\n"
+"that revision is shown.  If two revisions are given, the diff\n"
+"between them is given. If no format is specified, unified\n"
+"is used by default."
 msgstr ""
-"Saisissez une description pour cette modification.\n"
-"Les lignes débutant par « MT: » sont supprimées automatiquement.\n"
+"affiche la différence actuelle sur la sortie standard.\n"
+"Si une révision est donnée, la différence entre l'espace de travail et\n"
+"cette révision est affichée.  Si deux révisions sont données, la\n"
+"différence entre eux est affichée.  Si aucun format n'est précisé,\n"
+"le format « unified » est employé par défaut."

-#: ../commands.cc:435
+#: cmd_diff_log.cc:365
 #, c-format
-msgid "edit of log message failed"
-msgstr "l'édition du message du journal a échouée"
+msgid ""
+"--diff-args requires --external\n"
+"try adding --external or removing --diff-args?"
+msgstr ""
+"--diff-args requiet --external\n"
+"essayez d'ajouter --external ou de retirer --diff-args ?"

-#: ../commands.cc:444
-msgid "note: "
-msgstr "note : "
+#: cmd_diff_log.cc:494
+msgid "no changes"
+msgstr "aucun changement"

-#: ../commands.cc:445
-#, c-format
+#: cmd_diff_log.cc:558
+msgid "[FILE] ..."
+msgstr "[FICHIER] ..."
+
+#: cmd_diff_log.cc:559
+#, fuzzy
 msgid ""
-"branch '%s' has multiple heads\n"
-"perhaps consider '%s merge'"
+"print history in reverse order (filtering by 'FILE'). If one or more "
+"revisions are given, use them as a starting point."
 msgstr ""
-"la branche « %s » a plusieurs heads\n"
-"vous devriez peut-être lancer « %s merge »"
+"Affiche l'histoire en sens inverse (filtré avec « FILE »).  Si une\n"
+"révision ou plus sont données, emploie-les comme débuts."

-#: ../commands.cc:506 ../commands.cc:782 ../commands.cc:1446
-#: ../commands.cc:1530 ../commands.cc:2760 ../commands.cc:2788
-#: ../commands.cc:2791 ../commands.cc:2927 ../commands.cc:3588
+#: cmd_diff_log.cc:621
 #, c-format
-msgid "no such revision '%s'"
-msgstr "aucune révision « %s »"
+msgid "only one of --last/--next allowed"
+msgstr "seul un de --last et --next est permit"

-#: ../commands.cc:513
-#, c-format
-msgid "expanding selection '%s'\n"
-msgstr "expansion de la sélection « %s »\n"
+#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:771
+#: cmd_othervcs.cc:15
+msgid "debug"
+msgstr "débogue"

-#: ../commands.cc:521
-#, c-format
-msgid "no match for selection '%s'"
-msgstr "aucune correspondance pour la sélection « %s »"
+#: cmd_files.cc:28
+msgid "load file contents into db"
+msgstr "charger le contenu du fichier dans la base de données"

-#: ../commands.cc:527
-#, c-format
-msgid "expanded to '%s'\n"
-msgstr "expansion à « %s »\n"
+#: cmd_files.cc:41
+msgid "<parent> <left> <right>"
+msgstr "<parent> <gauche> <droite>"

-#: ../commands.cc:544
-#, c-format
-msgid "selection '%s' has multiple ambiguous expansions: \n"
-msgstr "la sélection « %s » a plusieurs expansions ambigües : \n"
+#: cmd_files.cc:42
+msgid "merge 3 files and output result"
+msgstr "fusionne 3 fichiers et affiche le résultat"

-#: ../commands.cc:562
+#: cmd_files.cc:56
 #, c-format
-msgid "non-hex digits in id"
-msgstr "chiffre non-héxadécimal dans l'id"
+msgid "ancestor file id does not exist"
+msgstr "l'id du fichier de l'ancêtre n'existe pas"

-#: ../commands.cc:571
+#: cmd_files.cc:59
 #, c-format
-msgid "partial id '%s' does not have an expansion"
-msgstr "l'identité partielle « %s » n'a pas d'expansions"
+msgid "left file id does not exist"
+msgstr "l'id du fichier gauche n'existe pas"

-#: ../commands.cc:574
+#: cmd_files.cc:62
 #, c-format
-msgid "partial id '%s' has multiple ambiguous expansions:\n"
-msgstr "l'identité partielle « %s » a plusieurs expansions ambigües : \n"
+msgid "right file id does not exist"
+msgstr "l'id du fichier droit n'existe pas"

-#: ../commands.cc:581
+#: cmd_files.cc:73
 #, c-format
-msgid "expanded partial id '%s' to '%s'\n"
-msgstr "expansion de l'identité partielle « %s » à « %s »\n"
+msgid "merge failed"
+msgstr "la fusion a échouée"

-#: ../commands.cc:608 ../netsync.cc:1732
-#, c-format
-msgid "no public key '%s' found in database"
-msgstr "aucune clef publique « %s » dans la base de données"
+#: cmd_files.cc:78
+msgid "PATH"
+msgstr "CHEMIN"

-#: ../commands.cc:618
+#: cmd_files.cc:79
+msgid "print annotated copy of the file from REVISION"
+msgstr "affiche une copie annotée du fichier venant de RÉVISION"
+
+#: cmd_files.cc:100
 #, c-format
-msgid ""
-"Key   : %s\n"
-"Sig   : %s\n"
-"Name  : %s\n"
-"Value : %s\n"
-msgstr ""
-"Clé       : %s\n"
-"Signature : %s\n"
-"Nom       : %s\n"
-"Valeur    : %s\n"
+msgid "no revision for file '%s' in database"
+msgstr "aucune révision pour le fichier « %s » dans la base de données"

-#: ../commands.cc:652
-msgid "ok"
-msgstr "0K"
+#: cmd_files.cc:111
+#, fuzzy, c-format
+msgid "no such file '%s' in revision '%s'"
+msgstr "aucun fichier « %s » dans la révision « %s »\n"

-#: ../commands.cc:655
-msgid "bad"
-msgstr "mauvais"
+#: cmd_files.cc:114
+#, fuzzy, c-format
+msgid "'%s' in revision '%s' is not a file"
+msgstr "« %s » est un dossier, pas un fichier"

-#: ../commands.cc:658
-msgid "unknown"
-msgstr "inconnu"
+#: cmd_files.cc:121
+msgid "[PATH]"
+msgstr "[CHEMIN]"

-#: ../commands.cc:745
-#, c-format
-msgid "(*) - only in %s/"
-msgstr "(*) - uniquement dans %s/"
+#: cmd_files.cc:122
+msgid "calculate identity of PATH or stdin"
+msgstr "calculer l'identité du CHEMIN ou de l'entrée standard"

-#: ../commands.cc:768
+#: cmd_files.cc:146
+msgid "FILENAME"
+msgstr "FICHIER"
+
+#: cmd_files.cc:147
+msgid "write file from database to stdout"
+msgstr "écrire un fichier de la base de donnée sur la sortie standard"
+
+#: cmd_files.cc:176 cmd_files.cc:178
+#, fuzzy, c-format
+msgid "no file '%s' found in revision '%s'"
+msgstr "aucun fichier « %s » dans la révision « %s »\n"
+
+#: cmd.hh:87
 #, c-format
-msgid "no keys found\n"
-msgstr "aucune clef trouvée\n"
+msgid "non-hex digits in id"
+msgstr "chiffre non-héxadécimal dans l'id"

-#: ../commands.cc:770
+#: cmd.hh:96
 #, c-format
-msgid "no keys found matching '%s'\n"
-msgstr "aucune clef correspondant à « %s »\n"
+msgid "partial id '%s' does not have an expansion"
+msgstr "l'identité partielle « %s » n'a pas d'expansions"

-#: ../commands.cc:788
+#: cmd.hh:100
 #, c-format
-msgid "revision %s already has children. We cannot kill it."
-msgstr "la révision %s a déjà des descendants. Impossible de la tuer."
+msgid "partial id '%s' has multiple ambiguous expansions:\n"
+msgstr "l'identité partielle « %s » a plusieurs expansions ambigües : \n"

-#: ../commands.cc:928 ../commands.cc:952 ../commands.cc:989
-#: ../commands.cc:1010 ../commands.cc:1046
+#: cmd.hh:108
+#, fuzzy, c-format
+msgid "expanded partial id '%s' to '%s'"
+msgstr "expansion de l'identité partielle « %s » à « %s »\n"
+
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
+#: cmd_key_cert.cc:113 cmd_key_cert.cc:149
 msgid "key and cert"
 msgstr "clef et certif"

-#: ../commands.cc:928 ../commands.cc:952 ../commands.cc:989
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
 msgid "KEYID"
 msgstr "IDCLEF"

-#: ../commands.cc:928
+#: cmd_key_cert.cc:27
 msgid "generate an RSA key-pair"
 msgstr "générer une paire de clefs RSA"

-#: ../commands.cc:943
+#: cmd_key_cert.cc:42
 #, c-format
 msgid "key '%s' already exists"
 msgstr "la clef « %s » existe déjà"

-#: ../commands.cc:946
+#: cmd_key_cert.cc:45
 #, c-format
 msgid "generating key-pair '%s'"
 msgstr "génératio de la paire de clef « %s »"

-#: ../commands.cc:948
+#: cmd_key_cert.cc:47
 #, c-format
 msgid "storing key-pair '%s' in %s/"
 msgstr "sauvegarde la paire de clefs « %s » dans « %s »"

-#: ../commands.cc:952
+#: cmd_key_cert.cc:53
 msgid "drop a public and private key"
 msgstr "supprimer une clef publique et privée"

-#: ../commands.cc:966
-#, c-format
-msgid "dropping public key '%s' from database\n"
+#: cmd_key_cert.cc:67
+#, fuzzy, c-format
+msgid "dropping public key '%s' from database"
 msgstr "suppression de la clef publique « %s » de la base de données\n"

-#: ../commands.cc:976
-#, c-format
-msgid "dropping key pair '%s' from keystore\n"
+#: cmd_key_cert.cc:77
+#, fuzzy, c-format
+msgid "dropping key pair '%s' from keystore"
 msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs\n"

-#: ../commands.cc:983
+#: cmd_key_cert.cc:84
 #, c-format
 msgid "public or private key '%s' does not exist in keystore or database"
 msgstr "la clef publique ou privée « %s » n'existe pas dans la base de données"

-#: ../commands.cc:985
+#: cmd_key_cert.cc:87
 #, c-format
 msgid ""
 "public or private key '%s' does not exist in keystore, and no database was "
@@ -606,33 +719,33 @@
 "la clef publique ou privée « %s » n'existe pas dans l'entrepôt de clefs, et "
 "aucune base de données n'était précisée"

-#: ../commands.cc:990
+#: cmd_key_cert.cc:93
 msgid "change passphrase of a private RSA key"
 msgstr "changer la phrase de passe pour une clef RSA privée"

-#: ../commands.cc:1000
+#: cmd_key_cert.cc:103
 #, c-format
 msgid "key '%s' does not exist in the keystore"
 msgstr "la clef « %s » n'existe pas dans l'entrepôt de clefs"

-#: ../commands.cc:1007
-#, c-format
-msgid "passphrase changed\n"
+#: cmd_key_cert.cc:110
+#, fuzzy, c-format
+msgid "passphrase changed"
 msgstr "la phrase de passe à changée\n"

-#: ../commands.cc:1010
+#: cmd_key_cert.cc:113
 msgid "REVISION CERTNAME [CERTVAL]"
 msgstr "RÉVISION NOM_DE_CERTIF [VALEUR_DE_CERTIF]"

-#: ../commands.cc:1011
+#: cmd_key_cert.cc:114
 msgid "create a cert for a revision"
 msgstr "créer un certif pour une révision"

-#: ../commands.cc:1046
+#: cmd_key_cert.cc:150
 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
 msgstr "RÉVISION NOM VALEUR SIGNATAIRE1 [SIGNATAIRE2 [...]]"

-#: ../commands.cc:1047
+#: cmd_key_cert.cc:151
 msgid ""
 "test whether a hypothetical cert would be trusted\n"
 "by current settings"
@@ -640,7 +753,7 @@
 "test s'il est possible d'avoir confiance en un certif hypothétique\n"
 "avec les paramètres actuels"

-#: ../commands.cc:1080
+#: cmd_key_cert.cc:184
 #, c-format
 msgid ""
 "if a cert on: %s\n"
@@ -655,453 +768,576 @@
 "était signé par : %s\n"
 "il serait : %s\n"

-#: ../commands.cc:1089
+#: cmd_key_cert.cc:193
 msgid "trusted"
 msgstr "fiable"

-#: ../commands.cc:1089
+#: cmd_key_cert.cc:193
 msgid "UNtrusted"
 msgstr "NON-fiable"

-#: ../commands.cc:1092 ../commands.cc:1105 ../commands.cc:1118
-#: ../commands.cc:1135 ../commands.cc:1186
+#: cmd_key_cert.cc:196 cmd_key_cert.cc:209 cmd_key_cert.cc:222
+#: cmd_key_cert.cc:238 cmd_ws_commit.cc:171
 msgid "review"
 msgstr "examination"

-#: ../commands.cc:1092
+#: cmd_key_cert.cc:196
 msgid "REVISION TAGNAME"
 msgstr "RÉVISION ÉTIQUETTE"

-#: ../commands.cc:1093
+#: cmd_key_cert.cc:197
 #, fuzzy
 msgid "put a symbolic tag cert on a revision"
 msgstr "mettre une certif-étiquette symbolique sur une révision"

-#: ../commands.cc:1105
+#: cmd_key_cert.cc:209
 msgid "ID (pass|fail|true|false|yes|no|1|0)"
 msgstr "ID (pass|fail|true|false|yes|no|1|0)"

-#: ../commands.cc:1106
+#: cmd_key_cert.cc:210
 msgid "note the results of running a test on a revision"
 msgstr "note le résultat d'un test sur une révision"

-#: ../commands.cc:1118 ../commands.cc:1135
+#: cmd_key_cert.cc:222 cmd_ws_commit.cc:171
 msgid "REVISION"
 msgstr "RÉVISION"

-#: ../commands.cc:1119
+#: cmd_key_cert.cc:223
 msgid "approve of a particular revision"
 msgstr "approuver une révision particulière"

-#: ../commands.cc:1130
+#: cmd_key_cert.cc:234
 #, c-format
 msgid "need --branch argument for approval"
 msgstr "il faut un argument --branch pour approuver"

-#: ../commands.cc:1136
-msgid "disapprove of a particular revision"
-msgstr "désapprouver une révision en particulier"
-
-#: ../commands.cc:1149
-#, c-format
-msgid "revision '%s' has %d changesets, cannot invert\n"
-msgstr "la révision %s a %d ensembles de changement, je ne peux pas invertir\n"
-
-#: ../commands.cc:1153
-#, c-format
-msgid "need --branch argument for disapproval"
-msgstr "il faut un argument --branch pour désapprouver"
-
-#: ../commands.cc:1186
+#: cmd_key_cert.cc:238
 msgid "REVISION [COMMENT]"
 msgstr "RÉVISION [COMMENTAIRE]"

-#: ../commands.cc:1187
+#: cmd_key_cert.cc:239
 msgid "comment on a particular revision"
 msgstr "commenter une révision en particulier"

-#: ../commands.cc:1197
+#: cmd_key_cert.cc:249
 #, c-format
 msgid "edit comment failed"
 msgstr "l'édition du commentaire a échouée"

-#: ../commands.cc:1200
+#: cmd_key_cert.cc:252
 #, c-format
 msgid "empty comment"
 msgstr "commentaire vide"

-#: ../commands.cc:1213 ../commands.cc:1242 ../commands.cc:1267
-#: ../commands.cc:1292 ../commands.cc:2211 ../commands.cc:2329
-#: ../commands.cc:2863 ../commands.cc:3379
-msgid "workspace"
-msgstr "espace de travail"
+#: cmd_list.cc:64 cmd_list.cc:655
+#, c-format
+msgid "no public key '%s' found in database"
+msgstr "aucune clef publique « %s » dans la base de données"

-#: ../commands.cc:1213 ../commands.cc:1242 ../commands.cc:1358
-#: ../commands.cc:2329 ../commands.cc:2710 ../commands.cc:3379
-msgid "[PATH]..."
-msgstr "[CHEMIN]..."
+#: cmd_list.cc:74
+#, c-format
+msgid ""
+"Key   : %s\n"
+"Sig   : %s\n"
+"Name  : %s\n"
+"Value : %s\n"
+msgstr ""
+"Clé       : %s\n"
+"Signature : %s\n"
+"Nom       : %s\n"
+"Valeur    : %s\n"

-#: ../commands.cc:1214
-msgid "add files to workspace"
-msgstr "ajouter des fichiers à l'espace de travail"
+#: cmd_list.cc:108
+msgid "ok"
+msgstr "0K"

-#: ../commands.cc:1243
-msgid "drop files from workspace"
-msgstr "supprimer des fichiers de l'espace de travail"
+#: cmd_list.cc:111
+msgid "bad"
+msgstr "mauvais"

-#: ../commands.cc:1268
-msgid ""
-"SRC DEST\n"
-"SRC1 [SRC2 [...]] DEST_DIR"
-msgstr ""
-"SOURCE DESTINATION\n"
-"SOURCE1 [SOURCE2 [...]] DOSSIER_DESTINATION"
+#: cmd_list.cc:114
+msgid "unknown"
+msgstr "inconnu"

-#: ../commands.cc:1270
-msgid "rename entries in the workspace"
-msgstr "renommer des entrées dans l'espace de travail"
+#: cmd_list.cc:202
+#, c-format
+msgid "(*) - only in %s/"
+msgstr "(*) - uniquement dans %s/"

-#: ../commands.cc:1292
-msgid "NEW_ROOT PUT_OLD"
-msgstr "RACINE_NOUVELLE PLACE_ANCIENNE"
+#: cmd_list.cc:226
+#, fuzzy, c-format
+msgid "no keys found"
+msgstr "aucune clef trouvée\n"

-#: ../commands.cc:1293
+#: cmd_list.cc:228
+#, fuzzy, c-format
+msgid "no keys found matching '%s'"
+msgstr "aucune clef correspondant à « %s »\n"
+
+#: cmd_list.cc:275
+#, fuzzy, c-format
+msgid "no epoch for branch %s"
+msgstr "la branche %s n'a pas d'époque\n"
+
+#: cmd_list.cc:438
+#, fuzzy
 msgid ""
-"rename the root directory\n"
-"after this command, the directory that currently has the name NEW_ROOT\n"
-"will be the root directory, and the directory that is currently the root\n"
-"directory will have name PUT_OLD.\n"
-"Using --execute is strongly recommended."
+"certs ID\n"
+"keys [PATTERN]\n"
+"branches [PATTERN]\n"
+"epochs [BRANCH [...]]\n"
+"tags\n"
+"vars [DOMAIN]\n"
+"known\n"
+"unknown\n"
+"ignored\n"
+"missing\n"
+"changed"
 msgstr ""
-"change le nom de la racine\n"
-"après cette commande, le dossier actuallement nommé RACINE_NOUVELLE\n"
-"deviendra la racine, et le dossier qui est actuellement la racine\n"
-"deviendra le dossier appelé PLACE_ANCIENNE.\n"
-"Il est fortement recommandé d'employer --execute."
+"certs ID\n"
+"keys [MOTIF]\n"
+"branches\n"
+"epochs [BRANCHE [...]]\n"
+"tags\n"
+"vars [DOMAINE]\n"
+"known\n"
+"unknown\n"
+"ignored\n"
+"missing\n"
+"changed"

-#. fload and fmerge are simple commands for debugging the line
-#. merger.
-#: ../commands.cc:1312 ../commands.cc:1325 ../commands.cc:1405
-#: ../commands.cc:3486 ../commands.cc:3931
-msgid "debug"
-msgstr "débogue"
+#: cmd_list.cc:449
+#, fuzzy
+msgid ""
+"show database objects, or the current workspace manifest, \n"
+"or known, unknown, intentionally ignored, missing, or \n"
+"changed-state files"
+msgstr ""
+"montre des objets de base de données, ou le manifeste de l'espace de\n"
+"travail actuel, ou des fichiers connus, inconnus, intentionnellement\n"
+"ignorés, manquants ou changés"

-#: ../commands.cc:1312
-msgid "load file contents into db"
-msgstr "charger le contenu du fichier dans la base de données"
+#: cmd_list.cc:631
+#, fuzzy
+msgid "REV"
+msgstr "ID_RÉVISION"

-#: ../commands.cc:1325
-msgid "<parent> <left> <right>"
-msgstr "<parent> <gauche> <droite>"
+#: cmd_list.cc:641
+#, fuzzy, c-format
+msgid "No such revision %s"
+msgstr "aucune révision « %s »"

-#: ../commands.cc:1326
-msgid "merge 3 files and output result"
-msgstr "fusionne 3 fichiers et affiche le résultat"
+#: cmd_merging.cc:53 cmd_merging.cc:610 cmd_ws_commit.cc:53
+#: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278
+#: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613
+msgid "workspace"
+msgstr "espace de travail"

-#: ../commands.cc:1336
-#, c-format
-msgid "ancestor file id does not exist"
-msgstr "l'id du fichier de l'ancêtre n'existe pas"
+#: cmd_merging.cc:54
+msgid ""
+"update workspace.\n"
+"This command modifies your workspace to be based off of a\n"
+"different revision, preserving uncommitted changes as it does so.\n"
+"If a revision is given, update the workspace to that revision.\n"
+"If not, update the workspace to the head of the branch."
+msgstr ""
+"met à jour l'espace de travail.\n"
+"Cetta commande modifie vôtre espace de travail, basé sur une révision\n"
+"différent, tout en préservent les changements local non confiés.\n"
+"Si une révision est donnée, met à jour l'espace de travail basé sur\n"
+"cette révision.  Sinon, met à jour basé sur la révision d'entré de\n"
+"la branche actuelle."

-#: ../commands.cc:1339
+#: cmd_merging.cc:97
 #, c-format
-msgid "left file id does not exist"
-msgstr "l'id du fichier gauche n'existe pas"
+msgid "this workspace is a new project; cannot update"
+msgstr ""
+"cet espace de travail est un nouveau projet, impossible de mettre à jour"

-#: ../commands.cc:1342
-#, c-format
-msgid "right file id does not exist"
-msgstr "l'id du fichier droit n'existe pas"
+#: cmd_merging.cc:101
+#, fuzzy, c-format
+msgid "updating along branch '%s'"
+msgstr "la branche « %s » n'est pas servie"

-#: ../commands.cc:1353
+#: cmd_merging.cc:105
 #, c-format
-msgid "merge failed"
-msgstr "la fusion a échouée"
+msgid ""
+"your request matches no descendents of the current revision\n"
+"in fact, it doesn't even match the current revision\n"
+"maybe you want --revision=<rev on other branch>"
+msgstr ""
+"Vôtre demande ne correspond pas à un descendant de la révision\n"
+"actuelle.  Elle ne correspond même pas à la révision actuelle.\n"
+"Peut-être voulez-vous employer --revision=<révision d'une autre branche>?"

-#: ../commands.cc:1358
-msgid "show status of workspace"
-msgstr "afficher l'état de l'espace de travail"
+#: cmd_merging.cc:110
+#, fuzzy, c-format
+msgid "multiple update candidates:"
+msgstr "plusieurs candidats pour la mise à jour :\n"

-#: ../commands.cc:1405
-msgid "[PATH]"
-msgstr "[CHEMIN]"
+#: cmd_merging.cc:114
+#, fuzzy, c-format
+msgid "choose one with '%s update -r<id>'"
+msgstr "choisissez en un avec « %s update -r<id> »\n"

-#: ../commands.cc:1406
-msgid "calculate identity of PATH or stdin"
-msgstr "calculer l'identité du CHEMIN ou de l'entrée standard"
+#: cmd_merging.cc:115
+#, fuzzy, c-format
+msgid "multiple update candidates remain after selection"
+msgstr "il reste plusieurs candidats possible après la selection"

-#: ../commands.cc:1429
-msgid "FILENAME"
-msgstr "FICHIER"
+#: cmd_merging.cc:130
+#, fuzzy, c-format
+msgid "already up to date at %s"
+msgstr "déjà à jour en %s\n"

-#: ../commands.cc:1430
-msgid "write file from database to stdout"
-msgstr "écrire un fichier de la base de donnée sur la sortie standard"
+#: cmd_merging.cc:138
+#, fuzzy, c-format
+msgid "selected update target %s"
+msgstr "sélection de la cible %s pour la mise à jour\n"

-#: ../commands.cc:1458 ../commands.cc:1460 ../commands.cc:3597
-#, c-format
-msgid "no file '%s' found in revision '%s'\n"
-msgstr "aucun fichier « %s » dans la révision « %s »\n"
+#: cmd_merging.cc:162
+#, fuzzy, c-format
+msgid "target revision is not in current branch"
+msgstr "la révision actuelle n'existe pas"

-#. should merge support --message, --message-file?  It seems somewhat weird,
-#. since a single 'merge' command may perform arbitrarily many actual merges.
-#: ../commands.cc:1472 ../commands.cc:1601 ../commands.cc:3064
-#: ../commands.cc:3117 ../commands.cc:3128 ../commands.cc:3278
-#: ../commands.cc:3286 ../commands.cc:3840
-msgid "tree"
-msgstr "arborescence"
+#: cmd_merging.cc:170
+#, fuzzy, c-format
+msgid ""
+"target revision is in multiple branches:%s\n"
+"\n"
+"try again with explicit --branch"
+msgstr ""
+"la révision %s n'est pas membre de la branche %s\n"
+"éssayez de nouveau avec un --branch explicit\n"

-#: ../commands.cc:1472
-msgid "[DIRECTORY]\n"
-msgstr "[DOSSIER]\n"
+#: cmd_merging.cc:178
+#, fuzzy, c-format
+msgid "switching to branch %s"
+msgstr "commence à confier sur la branche « %s »\n"

-#: ../commands.cc:1473
+#: cmd_merging.cc:183
+#, c-format
 msgid ""
-"check out a revision from database into directory.\n"
-"If a revision is given, that's the one that will be checked out.\n"
-"Otherwise, it will be the head of the branch (given or implicit).\n"
-"If no directory is given, the branch name will be used as directory"
+"target revision not in any branch\n"
+"next commit will use branch %s"
 msgstr ""
-"récupère une révision depuis une base de données dans un dossier. Si une\n"
-"révision est spécifiée, c'est celle-ci qui sera récupérée. Sinon, il "
-"s'agira\n"
-"que la versionde de tête (spécifiée ou implicite).\n"
-"Si aucun nom de dossier n'est fourni, le nom de la branche sera utilisé\n"
-"comme nom de dossier"

-#. no checkout dir specified, use branch name for dir
-#. use branch head revision
-#: ../commands.cc:1492 ../commands.cc:1511
+#: cmd_merging.cc:288
 #, c-format
-msgid "need --branch argument for branch-based checkout"
-msgstr "il faut un argument --branch pour récupérer basé sur une branche"
+msgid "switched branch; next commit will use branch %s"
+msgstr ""

-#: ../commands.cc:1505
+#: cmd_merging.cc:289
+#, fuzzy, c-format
+msgid "updated to base revision %s"
+msgstr "mise à jour vers la révision de base %s\n"
+
+#: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523
+#: cmd_merging.cc:747 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851
+#: cmd_ws_commit.cc:872
+msgid "tree"
+msgstr "arborescence"
+
+#: cmd_merging.cc:299
+msgid "merge unmerged heads of branch"
+msgstr "fusionne les entrées de la branche non fusionnées"
+
+#: cmd_merging.cc:308 cmd_merging.cc:755
 #, c-format
-msgid "checkout directory '%s' already exists"
-msgstr "le fichier « %s » existe déjà"
+msgid "please specify a branch, with --branch=BRANCH"
+msgstr "veuillez préciser une branche avec --branch=BRANCHE"

-#: ../commands.cc:1514
+#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:760
+#: cmd_ws_commit.cc:430
 #, c-format
 msgid "branch '%s' is empty"
 msgstr "la branche « %s » est vide"

-#: ../commands.cc:1517
+#: cmd_merging.cc:315
 #, fuzzy, c-format
-msgid "branch %s has multiple heads:"
-msgstr "la branche %s a plusieurs entrées"
+msgid "branch '%s' is already merged"
+msgstr "la branche « %s » est fusionnée\n"

-#: ../commands.cc:1520
+#: cmd_merging.cc:323
 #, fuzzy, c-format
-msgid "choose one with '%s checkout -r<id>'"
-msgstr "choisissez en un avec « %s update -r<id> »\n"
+msgid "starting with revision 1 / %d"
+msgstr "en commencent avec la révision 1 / %d\n"

-#: ../commands.cc:1521
+#: cmd_merging.cc:327
+#, fuzzy, c-format
+msgid "merging with revision %d / %d"
+msgstr "fusionnent avec la révision %d / %d\n"
+
+#: cmd_merging.cc:328 cmd_merging.cc:329 cmd_merging.cc:412 cmd_merging.cc:547
+#: cmd_merging.cc:548
+#, fuzzy, c-format
+msgid "[source] %s"
+msgstr "[source] %s\n"
+
+#: cmd_merging.cc:346 cmd_merging.cc:519 cmd_merging.cc:566
+#, fuzzy, c-format
+msgid "[merged] %s"
+msgstr "[fusionné] %s\n"
+
+#: cmd_merging.cc:349
+#, fuzzy, c-format
+msgid "note: your workspaces have not been updated"
+msgstr "note: vos espaces de travail ne sont pas à jour\n"
+
+#: cmd_merging.cc:352
+msgid "SOURCE-BRANCH DEST-BRANCH"
+msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION"
+
+#: cmd_merging.cc:353
+msgid "merge from one branch to another asymmetrically"
+msgstr "fusionnez d'une branche à une autre asymétriquement"
+
+#: cmd_merging.cc:363
+msgid "SOURCE-BRANCH DEST-BRANCH DIR"
+msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION DOSSIER"
+
+#: cmd_merging.cc:364
+msgid "merge one branch into a subdirectory in another branch"
+msgstr "fusionnez une branche dans un sous-dossier d'une autre branche"
+
+#: cmd_merging.cc:403 cmd_merging.cc:406
+#, fuzzy, c-format
+msgid "branch '%s' is not merged"
+msgstr "la branche « %s » n'est pas fusionnée\n"
+
+#: cmd_merging.cc:411
+#, fuzzy, c-format
+msgid "propagating %s -> %s"
+msgstr "propage %s -> %s\n"
+
+#: cmd_merging.cc:413
+#, fuzzy, c-format
+msgid "[target] %s"
+msgstr "[cible] %s\n"
+
+#: cmd_merging.cc:418
+#, fuzzy, c-format
+msgid "branch '%s' is up-to-date with respect to branch '%s'"
+msgstr "la branche « %s » est à jour par rapport à la branche « %s »\n"
+
+#: cmd_merging.cc:420
+#, fuzzy, c-format
+msgid "no action taken"
+msgstr "rien n'est fait\n"
+
+#: cmd_merging.cc:424
+#, fuzzy, c-format
+msgid "no merge necessary; putting %s in branch '%s'"
+msgstr "fusion pas nécessaire; met %s dans la branch « %s »\n"
+
+#: cmd_merging.cc:462
 #, c-format
-msgid "branch %s has multiple heads"
-msgstr "la branche %s a plusieurs entrées"
+msgid "Path %s not found in destination tree."
+msgstr "Chemin %s pas trouvé dans l'arborescence de destination"

-#: ../commands.cc:1548
+#: cmd_merging.cc:524
+msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
+msgstr "RÉVISION-GAUCHE RÉVISION-DROITE BRANCHE-DESTINATION"
+
+#: cmd_merging.cc:525
+msgid "merge two explicitly given revisions, placing result in given branch"
+msgstr ""
+"fusionne deux révisions données explicitement et met le résultat dans la "
+"branche donnée"
+
+#: cmd_merging.cc:540
 #, c-format
-msgid "revision %s is not a member of branch %s\n"
-msgstr "la révision %s n'est pas membre de la branche %s\n"
+msgid "%s and %s are the same revision, aborting"
+msgstr "%s et %s sont la même révision, j'abandonne"

-#: ../commands.cc:1582
+#: cmd_merging.cc:542 cmd_merging.cc:544
 #, c-format
-msgid "no file %s found in database for %s"
-msgstr "aucun fichier « %s » trouvé dans la base de données pour %s"
+msgid "%s is already an ancestor of %s"
+msgstr "%s est déjà un ancêtre de %s"

-#: ../commands.cc:1601
-msgid "show unmerged head revisions of branch"
-msgstr "affiche les entrées non fusionné de la branche"
+#: cmd_merging.cc:569
+msgid "REV REV"
+msgstr "RÉV RÉV"

-#: ../commands.cc:1609 ../commands.cc:3073
+#: cmd_merging.cc:570
+msgid ""
+"Show what conflicts would need to be resolved to merge the given revisions."
+msgstr ""
+"Montre quels conflits auraient besoin d'être résolus l'ors d'une fusion des "
+"révisions données."
+
+#: cmd_merging.cc:580 cmd_merging.cc:582
+#, fuzzy, c-format
+msgid "%s is an ancestor of %s; no merge is needed."
+msgstr "%s est un ancêtre de %s; aucune fusion est nécessaire"
+
+#: cmd_merging.cc:596
 #, c-format
-msgid "please specify a branch, with --branch=BRANCH"
-msgstr "veuillez préciser une branche avec --branch=BRANCHE"
+msgid "There are %s node_name_conflicts."
+msgstr "Il y a %s node_name_conflicts."

-#: ../commands.cc:1614 ../commands.cc:3077 ../commands.cc:3166
-#: ../commands.cc:3169
+#: cmd_merging.cc:598
 #, c-format
-msgid "branch '%s' is empty\n"
-msgstr "la branche « %s » est vide\n"
+msgid "There are %s file_content_conflicts."
+msgstr "Il y a %s file_content_conflicts."

-#: ../commands.cc:1616
+#: cmd_merging.cc:600
 #, c-format
-msgid "branch '%s' is currently merged:\n"
-msgstr "la branche « %s » est actuellement fusionnée :\n"
+msgid "There are %s node_attr_conflicts."
+msgstr "Il y a %s node_attr_conflicts."

-#: ../commands.cc:1618
+#: cmd_merging.cc:602
 #, c-format
-msgid "branch '%s' is currently unmerged:\n"
-msgstr "la branche « %s » n'est actuellement pas fusionnée :\n"
+msgid "There are %s orphaned_node_conflicts."
+msgstr "Il y a %s orphaned_node_conflicts."

-#: ../commands.cc:1657
+#: cmd_merging.cc:604
 #, c-format
-msgid "no epoch for branch %s\n"
-msgstr "la branche %s n'a pas d'époque\n"
+msgid "There are %s rename_target_conflicts."
+msgstr "Il y a %s rename_target_conflicts."

-#: ../commands.cc:1865
+#: cmd_merging.cc:606
+#, c-format
+msgid "There are %s directory_loop_conflicts."
+msgstr "Il y a %s directory_loop_conflicts."
+
+#: cmd_merging.cc:611
 msgid ""
-"certs ID\n"
-"keys [PATTERN]\n"
-"branches\n"
-"epochs [BRANCH [...]]\n"
-"tags\n"
-"vars [DOMAIN]\n"
-"known\n"
-"unknown\n"
-"ignored\n"
-"missing\n"
-"changed"
+"cherrypick changes from other parts of history into workspace.\n"
+"This command takes arbitrary changes made at any point in history,\n"
+"and applies them to your current workspace, as if you had made the\n"
+"edits by hand.\n"
+"If one revision is given, applies the changes made in that revision\n"
+"compared to its parent.\n"
+"If two revisions are given, applies the changes made to get from the\n"
+"first revision to the second."
 msgstr ""
-"certs ID\n"
-"keys [MOTIF]\n"
-"branches\n"
-"epochs [BRANCHE [...]]\n"
-"tags\n"
-"vars [DOMAINE]\n"
-"known\n"
-"unknown\n"
-"ignored\n"
-"missing\n"
-"changed"

-#: ../commands.cc:1876
+#: cmd_merging.cc:632
+#, c-format
 msgid ""
-"show database objects, or the current workspace manifest, or known,\n"
-"unknown, intentionally ignored, missing, or changed state files"
+"revision %s is a merge\n"
+"to apply the changes relative to one of its parents, use:\n"
+"  %s cherrypatch -r PARENT -r %s"
 msgstr ""
-"montre des objets de base de données, ou le manifeste de l'espace de\n"
-"travail actuel, ou des fichiers connus, inconnus, intentionnellement\n"
-"ignorés, manquants ou changés"

-#: ../commands.cc:1914 ../commands.cc:1942 ../commands.cc:1960
-msgid "packet i/o"
-msgstr "e/s de paquets"
+#: cmd_merging.cc:649
+#, fuzzy, c-format
+msgid "no changes to apply"
+msgstr "aucun changement à confier\n"

-#: ../commands.cc:1914 ../commands.cc:1942
-msgid "ID"
-msgstr "ID"
+#: cmd_merging.cc:740
+#, fuzzy, c-format
+msgid "applied changes to workspace"
+msgstr "ajouter des fichiers à l'espace de travail"

-#: ../commands.cc:1914
-msgid "write public key packet to stdout"
-msgstr "écrire un pacquet pour un clef publique sur la sortie standard"
+#: cmd_merging.cc:747
+msgid "show unmerged head revisions of branch"
+msgstr "affiche les entrées non fusionné de la branche"

-#: ../commands.cc:1936
-#, c-format
-msgid "public key '%s' does not exist"
-msgstr "la clef publique « %s » n'existe pas"
+#: cmd_merging.cc:762
+#, fuzzy, c-format
+msgid "branch '%s' is currently merged:"
+msgstr "la branche « %s » est actuellement fusionnée :\n"

-#: ../commands.cc:1942
-msgid "write private key packet to stdout"
-msgstr "écrire un pacquet pour un clef privée sur la sortie standard"
+#: cmd_merging.cc:764
+#, fuzzy, c-format
+msgid "branch '%s' is currently unmerged:"
+msgstr "la branche « %s » n'est actuellement pas fusionnée :\n"

-#: ../commands.cc:1950
-#, c-format
-msgid "public and private key '%s' do not exist in keystore"
-msgstr ""
-"la clef publique ou privée « %s » n'existe pas dans l'entrepôt de clefs"
+#: cmd_merging.cc:771
+msgid "REVID"
+msgstr "ID_RÉVISION"

-#: ../commands.cc:1961
-msgid "read packets from files or stdin"
-msgstr "lecture des paquets depuis des fichiers ou l'entrée standard"
+#: cmd_merging.cc:772
+msgid "dump the roster associated with the given REVID"
+msgstr "décharge la list associée avec l'ID_RÉV donnée"

-#: ../commands.cc:1969
-#, c-format
-msgid "no packets found on stdin"
-msgstr "aucun paquet trouvé sur l'entrée standard"
-
-#: ../commands.cc:1980
-#, c-format
-msgid "no packets found in given file"
-msgid_plural "no packets found in given files"
-msgstr[0] "aucun paquet trouvé dans le fichier spécifié"
-msgstr[1] "aucun paquet trouvé dans les fichiers spécifiés"
-
-#: ../commands.cc:1984
-#, c-format
-msgid "read %d packet"
-msgid_plural "read %d packets"
-msgstr[0] "lu %d paquet"
-msgstr[1] "lu %d paquets"
-
-#: ../commands.cc:2013
-#, c-format
-msgid "setting default server to %s\n"
+#: cmd_netsync.cc:40
+#, fuzzy, c-format
+msgid "setting default server to %s"
 msgstr "mettant l'adresse par défaut du serveur à %s\n"

-#: ../commands.cc:2019
+#: cmd_netsync.cc:46
 #, c-format
 msgid "no hostname given"
 msgstr "aucun nom d'hôte fourni"

-#: ../commands.cc:2021
+#: cmd_netsync.cc:48
 #, c-format
 msgid "no server given and no default server set"
 msgstr "aucun serveur donné et aucun serveur établi comme défaut"

-#: ../commands.cc:2039
+#: cmd_netsync.cc:59 cmd_netsync.cc:79
 #, c-format
-msgid "setting default branch include pattern to '%s'\n"
+msgid "no branch pattern given"
+msgstr "aucun motif de branche fourni"
+
+#: cmd_netsync.cc:67
+#, fuzzy, c-format
+msgid "setting default branch include pattern to '%s'"
 msgstr "établi le motif de branche à inclure par défaut à « %s »\n"

-#: ../commands.cc:2045
-#, c-format
-msgid "setting default branch exclude pattern to '%s'\n"
+#: cmd_netsync.cc:73
+#, fuzzy, c-format
+msgid "setting default branch exclude pattern to '%s'"
 msgstr "établi le motif de branche à exclure par défaut à « %s »\n"

-#: ../commands.cc:2051
+#: cmd_netsync.cc:81
 #, c-format
-msgid "no branch pattern given"
-msgstr "aucun motif de branche fourni"
-
-#: ../commands.cc:2053
-#, c-format
 msgid "no branch pattern given and no default pattern set"
 msgstr "aucun motif de branche donné et aucun motif établi comme défaut"

-#: ../commands.cc:2069 ../commands.cc:2084 ../commands.cc:2098
-#: ../commands.cc:2113
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 cmd_netsync.cc:173
 msgid "network"
 msgstr "réseau"

-#: ../commands.cc:2069 ../commands.cc:2084 ../commands.cc:2098
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126
 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
 msgstr "[ADRESSE[:PORT] [MOTIF]]"

-#: ../commands.cc:2070
+#: cmd_netsync.cc:98
 msgid "push branches matching PATTERN to netsync server at ADDRESS"
 msgstr ""
 "envoie les branches correspondant au MOTIF au serveur netsync à l'ADRESSE"

-#: ../commands.cc:2085
+#: cmd_netsync.cc:113
 msgid "pull branches matching PATTERN from netsync server at ADDRESS"
 msgstr ""
 "récupère les branches correspondant au MOTIF du serveur netsync à ADRESSE"

-#: ../commands.cc:2092
-#, c-format
-msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
+#: cmd_netsync.cc:120
+#, fuzzy, c-format
+msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
 msgstr ""
 "récupération anonyme; utilisez -kNOMCLEF si vous avez besoin d'une "
 "authentification\n"

-#: ../commands.cc:2099
+#: cmd_netsync.cc:127
 msgid "sync branches matching PATTERN with netsync server at ADDRESS"
 msgstr ""
 "synchronise les branches correspondant au MOTIF au serveur netsync à ADRESSE"

-#: ../commands.cc:2113
+#: cmd_netsync.cc:149
+#, c-format
+msgid "pid file '%s' already exists"
+msgstr "le fichier pid « %s » existe déjà"
+
+#: cmd_netsync.cc:151
+#, fuzzy, c-format
+msgid "failed to create pid file '%s'"
+msgstr "La lecture du fichier d'options « %s » a échouée"
+
+#: cmd_netsync.cc:173
 msgid "PATTERN ..."
 msgstr "CHEMIN ..."

-#: ../commands.cc:2114
+#: cmd_netsync.cc:174
 msgid "serve the branches specified by PATTERNs to connecting clients"
 msgstr ""
 "servir les branches spécifiées par les MOTIFs aux clients qui se connectent"

-#: ../commands.cc:2127
+#: cmd_netsync.cc:189
 #, c-format
 msgid ""
 "need permission to store persistent passphrase (see hook persist_phrase_ok())"
@@ -1109,901 +1345,710 @@
 "il faut vôtre permission pour garder la phrase de passe de façon persistante "
 "(voyez la procédure automatique persiste_phrase_ok())"

-#: ../commands.cc:2139
-msgid "database"
-msgstr "base de données"
-
-#: ../commands.cc:2140
+#: cmd_netsync.cc:195
+#, c-format
 msgid ""
-"init\n"
-"info\n"
-"version\n"
-"dump\n"
-"load\n"
-"migrate\n"
-"execute\n"
-"kill_rev_locally ID\n"
-"kill_branch_certs_locally BRANCH\n"
-"kill_tag_locally TAG\n"
-"check\n"
-"changesetify\n"
-"rosterify\n"
-"set_epoch BRANCH EPOCH\n"
+"The --no-transport-auth option is only permitted in combination with --stdio"
 msgstr ""
-"init\n"
-"info\n"
-"version\n"
-"dump\n"
-"load\n"
-"migrate\n"
-"execute\n"
-"kill_rev_locally ID\n"
-"kill_branch_certs_locally BRANCHE\n"
-"kill_tag_locally ÉTIQUETTE\n"
-"check\n"
-"changesetify\n"
-"rosterify\n"
-"set_epoch BRANCHE ÉPOQUE\n"

-#: ../commands.cc:2154
-msgid "manipulate database state"
-msgstr "manipule l'état de la base de données"
+#: cmd_othervcs.cc:15
+msgid "RCSFILE..."
+msgstr "FICHIER_RCS..."

-#: ../commands.cc:2201
-#, c-format
-msgid "The epoch must be %s characters"
+#: cmd_othervcs.cc:16
+msgid ""
+"parse versions in RCS files\n"
+"this command doesn't reconstruct or import revisions.you probably want "
+"cvs_import"
 msgstr ""
+"analyse les versions dans des fichiers RCS\n"
+"cette command ne reconstruit ou n'importe pas des révisions.  Vous voulez\n"
+"probablement cvs_import"

-#: ../commands.cc:2211
-msgid ""
-"set PATH ATTR VALUE\n"
-"get PATH [ATTR]\n"
-"drop PATH [ATTR]"
-msgstr ""
-"set CHEMIN ATTR VALEUR\n"
-"get CHEMIN [ATTR]\n"
-"drop CHEMIN [ATTR]"
+#: cmd_othervcs.cc:32
+msgid "rcs"
+msgstr "rcs"

-#: ../commands.cc:2212
-msgid "set, get or drop file attributes"
-msgstr "établis, obtiens ou supprime des attributs de fichiers"
+#: cmd_othervcs.cc:32
+msgid "CVSROOT"
+msgstr "CVSROOT"

-#: ../commands.cc:2228
-#, c-format
-msgid "Unknown path '%s'"
-msgstr "Chemin inconnu « %s »"
+#: cmd_othervcs.cc:33
+msgid "import all versions in CVS repository"
+msgstr "importer toutes les versions d'un dépôt CVS"

-#: ../commands.cc:2257
-#, c-format
-msgid "Path '%s' does not have attribute '%s'\n"
-msgstr "Le chemin « %s » n'a pas d'attribut « %s »\n"
+#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69
+msgid "packet i/o"
+msgstr "e/s de paquets"

-#: ../commands.cc:2311
-#, c-format
-msgid "--message and --message-file are mutually exclusive"
-msgstr "--message et --message-file sont mutuellement exclusifs"
+#: cmd_packet.cc:21 cmd_packet.cc:50
+msgid "ID"
+msgstr "ID"

-#: ../commands.cc:2330
-msgid "commit workspace to database"
-msgstr "confie un espace de travail à la base de données"
+#: cmd_packet.cc:22
+msgid "write public key packet to stdout"
+msgstr "écrire un pacquet pour un clef publique sur la sortie standard"

-#: ../commands.cc:2348
+#: cmd_packet.cc:44
 #, c-format
-msgid "no changes to commit\n"
-msgstr "aucun changement à confier\n"
+msgid "public key '%s' does not exist"
+msgstr "la clef publique « %s » n'existe pas"

-#: ../commands.cc:2362
-#, fuzzy, c-format
-msgid "beginning commit on branch '%s'\n"
-msgstr "commence à confier sur la branche « %s »\n"
+#: cmd_packet.cc:51
+msgid "write private key packet to stdout"
+msgstr "écrire un pacquet pour un clef privée sur la sortie standard"

-#: ../commands.cc:2371
+#: cmd_packet.cc:59
 #, c-format
-msgid ""
-"MT/log is non-empty and log message was specified on command line\n"
-"perhaps move or delete MT/log,\n"
-"or remove --message/--message-file from the command line?"
+msgid "public and private key '%s' do not exist in keystore"
 msgstr ""
-"MT/log n'est pas vide et une entrée de journal a été donné sur la linge\n"
-"de commande\n"
-"veuillez déplacé ou supprimer MT/log,\n"
-"ou supprimer --message/--message-file de la linge de commande"
+"la clef publique ou privée « %s » n'existe pas dans l'entrepôt de clefs"

-#: ../commands.cc:2383
-#, fuzzy, c-format
-msgid "empty log message; commit canceled"
-msgstr "message du journal vide; confidence arrêtée"
+#: cmd_packet.cc:70
+msgid "read packets from files or stdin"
+msgstr "lecture des paquets depuis des fichiers ou l'entrée standard"

-#: ../commands.cc:2402
+#: cmd_packet.cc:78
 #, c-format
-msgid "log message rejected: %s\n"
-msgstr "entrée du journal rejetée: %s\n"
+msgid "no packets found on stdin"
+msgstr "aucun paquet trouvé sur l'entrée standard"

-#: ../commands.cc:2410
+#: cmd_packet.cc:90
 #, c-format
-msgid "revision %s already in database\n"
-msgstr "la révision %s est déjà dans la base de données\n"
+msgid "no packets found in given file"
+msgid_plural "no packets found in given files"
+msgstr[0] "aucun paquet trouvé dans le fichier spécifié"
+msgstr[1] "aucun paquet trouvé dans les fichiers spécifiés"

-#: ../commands.cc:2448 ../commands.cc:2465 ../commands.cc:2484
+#: cmd_packet.cc:94
 #, c-format
-msgid "file '%s' modified during commit, aborting"
-msgstr "le fichier « %s » a été modifié pendant le commit, interruption"
+msgid "read %d packet"
+msgid_plural "read %d packets"
+msgstr[0] "lu %d paquet"
+msgstr[1] "lu %d paquets"

-#: ../commands.cc:2510
-#, fuzzy, c-format
-msgid "committed revision %s\n"
-msgstr "révision %s confié\n"
-
-#: ../commands.cc:2516
-#, c-format
+#: cmd_ws_commit.cc:42
+#, fuzzy
 msgid ""
-"note: this revision creates divergence\n"
-"note: you may (or may not) wish to run '%s merge'"
+"Enter a description of this change.\n"
+"Lines beginning with `MTN:' are removed automatically.\n"
 msgstr ""
-"note: cette révision a créé une divergence\n"
-"note: peut-être (ou peut-être pas) voullez-vous exécuter « %s merge »"
+"Saisissez une description pour cette modification.\n"
+"Les lignes débutant par « MT: » sont supprimées automatiquement.\n"

-#: ../commands.cc:2711
-msgid ""
-"show current diffs on stdout.\n"
-"If one revision is given, the diff between the workspace and\n"
-"that revision is shown.  If two revisions are given, the diff between\n"
-"them is given.  If no format is specified, unified is used by default."
-msgstr ""
-"affiche la différence actuelle sur la sortie standard.\n"
-"Si une révision est donnée, la différence entre l'espace de travail et\n"
-"cette révision est affichée.  Si deux révisions sont données, la\n"
-"différence entre eux est affichée.  Si aucun format n'est précisé,\n"
-"le format « unified » est employé par défaut."
-
-#: ../commands.cc:2727
+#: cmd_ws_commit.cc:50
 #, c-format
-msgid ""
-"--diff-args requires --external\n"
-"try adding --external or removing --diff-args?"
-msgstr ""
-"--diff-args requiet --external\n"
-"essayez d'ajouter --external ou de retirer --diff-args ?"
+msgid "edit of log message failed"
+msgstr "l'édition du message du journal a échouée"

-#: ../commands.cc:2769
-#, c-format
-msgid "current revision has no ancestor"
-msgstr "la révision actuelle n'existe pas"
-
-#: ../commands.cc:2832
-msgid "no changes"
-msgstr "aucun changement"
-
-#: ../commands.cc:2864
-msgid ""
-"update workspace.\n"
-"This command modifies your workspace to be based off of a\n"
-"different revision, preserving uncommitted changes as it does so.\n"
-"If a revision is given, update the workspace to that revision.\n"
-"If not, update the workspace to the head of the branch."
+#: cmd_ws_commit.cc:54
+msgid "revert file(s), dir(s) or entire workspace (\".\")"
 msgstr ""
-"met à jour l'espace de travail.\n"
-"Cetta commande modifie vôtre espace de travail, basé sur une révision\n"
-"différent, tout en préservent les changements local non confiés.\n"
-"Si une révision est donnée, met à jour l'espace de travail basé sur\n"
-"cette révision.  Sinon, met à jour basé sur la révision d'entré de\n"
-"la branche actuelle."
+"retourne les fichiers, dossiers ou l'espace de travail en entier (\".\") à "
+"la révision de base"

-#: ../commands.cc:2902
+#: cmd_ws_commit.cc:137
 #, c-format
-msgid "this workspace is a new project; cannot update"
-msgstr ""
-"cet espace de travail est un nouveau projet, impossible de mettre à jour"
+msgid "reverting %s"
+msgstr "retourne %s à la révision de base"

-#: ../commands.cc:2909
+#: cmd_ws_commit.cc:141
 #, c-format
-msgid ""
-"your request matches no descendents of the current revision\n"
-"in fact, it doesn't even match the current revision\n"
-"maybe you want --revision=<rev on other branch>"
-msgstr ""
-"Vôtre demande ne correspond pas à un descendant de la révision\n"
-"actuelle.  Elle ne correspond même pas à la révision actuelle.\n"
-"Peut-être voulez-vous employer --revision=<révision d'une autre branche>?"
+msgid "no file version %s found in database for %s"
+msgstr "aucune version de fichier « %s » trouvé dans la base de données %s"

-#: ../commands.cc:2914
-#, fuzzy, c-format
-msgid "multiple update candidates:"
-msgstr "plusieurs candidats pour la mise à jour :\n"
-
-#: ../commands.cc:2918
-#, fuzzy, c-format
-msgid "choose one with '%s update -r<id>'"
-msgstr "choisissez en un avec « %s update -r<id> »\n"
-
-#: ../commands.cc:2919
-#, fuzzy, c-format
-msgid "multiple update candidates remain after selection"
-msgstr "il reste plusieurs candidats possible après la selection"
-
-#: ../commands.cc:2934
+#: cmd_ws_commit.cc:154
 #, c-format
-msgid "already up to date at %s\n"
-msgstr "déjà à jour en %s\n"
+msgid "recreating %s/"
+msgstr "re-crée %s/"

-#: ../commands.cc:2942
-#, c-format
-msgid "selected update target %s\n"
-msgstr "sélection de la cible %s pour la mise à jour\n"
+#: cmd_ws_commit.cc:172
+msgid "disapprove of a particular revision"
+msgstr "désapprouver une révision en particulier"

-#: ../commands.cc:2954
+#: cmd_ws_commit.cc:185
 #, c-format
-msgid ""
-"revision %s is not a member of branch %s\n"
-"try again with explicit --branch\n"
-msgstr ""
-"la révision %s n'est pas membre de la branche %s\n"
-"éssayez de nouveau avec un --branch explicit\n"
+msgid "revision '%s' has %d changesets, cannot invert\n"
+msgstr "la révision %s a %d ensembles de changement, je ne peux pas invertir\n"

-#: ../commands.cc:3054
+#: cmd_ws_commit.cc:189
 #, c-format
-msgid "updated to base revision %s\n"
-msgstr "mise à jour vers la révision de base %s\n"
+msgid "need --branch argument for disapproval"
+msgstr "il faut un argument --branch pour désapprouver"

-#: ../commands.cc:3064
-msgid "merge unmerged heads of branch"
-msgstr "fusionne les entrées de la branche non fusionnées"
+#: cmd_ws_commit.cc:225
+msgid "add files to workspace"
+msgstr "ajouter des fichiers à l'espace de travail"

-#: ../commands.cc:3080
-#, fuzzy, c-format
-msgid "branch '%s' is already merged\n"
-msgstr "la branche « %s » est fusionnée\n"
+#: cmd_ws_commit.cc:252
+msgid "drop files from workspace"
+msgstr "supprimer des fichiers de l'espace de travail"

-#: ../commands.cc:3088
-#, c-format
-msgid "starting with revision 1 / %d\n"
-msgstr "en commencent avec la révision 1 / %d\n"
+#: cmd_ws_commit.cc:279
+msgid ""
+"SRC DEST\n"
+"SRC1 [SRC2 [...]] DEST_DIR"
+msgstr ""
+"SOURCE DESTINATION\n"
+"SOURCE1 [SOURCE2 [...]] DOSSIER_DESTINATION"

-#: ../commands.cc:3092
-#, c-format
-msgid "merging with revision %d / %d\n"
-msgstr "fusionnent avec la révision %d / %d\n"
+#: cmd_ws_commit.cc:281
+msgid "rename entries in the workspace"
+msgstr "renommer des entrées dans l'espace de travail"

-#. Somewhat redundant, but consistent with output of plain "merge" command.
-#: ../commands.cc:3093 ../commands.cc:3094 ../commands.cc:3176
-#: ../commands.cc:3309 ../commands.cc:3310
-#, c-format
-msgid "[source] %s\n"
-msgstr "[source] %s\n"
+#: cmd_ws_commit.cc:303
+msgid "NEW_ROOT PUT_OLD"
+msgstr "RACINE_NOUVELLE PLACE_ANCIENNE"

-#: ../commands.cc:3111 ../commands.cc:3274 ../commands.cc:3328
-#, c-format
-msgid "[merged] %s\n"
-msgstr "[fusionné] %s\n"
+#: cmd_ws_commit.cc:304
+msgid ""
+"rename the root directory\n"
+"after this command, the directory that currently has the name NEW_ROOT\n"
+"will be the root directory, and the directory that is currently the root\n"
+"directory will have name PUT_OLD.\n"
+"Using --execute is strongly recommended."
+msgstr ""
+"change le nom de la racine\n"
+"après cette commande, le dossier actuallement nommé RACINE_NOUVELLE\n"
+"deviendra la racine, et le dossier qui est actuellement la racine\n"
+"deviendra le dossier appelé PLACE_ANCIENNE.\n"
+"Il est fortement recommandé d'employer --execute."

-#: ../commands.cc:3114
-#, c-format
-msgid "note: your workspaces have not been updated\n"
-msgstr "note: vos espaces de travail ne sont pas à jour\n"
+#: cmd_ws_commit.cc:323
+msgid "show status of workspace"
+msgstr "afficher l'état de l'espace de travail"

-#: ../commands.cc:3117
-msgid "SOURCE-BRANCH DEST-BRANCH"
-msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION"
+#: cmd_ws_commit.cc:385
+msgid "[DIRECTORY]\n"
+msgstr "[DOSSIER]\n"

-#: ../commands.cc:3118
-msgid "merge from one branch to another asymmetrically"
-msgstr "fusionnez d'une branche à une autre asymétriquement"
+#: cmd_ws_commit.cc:386
+msgid ""
+"check out a revision from database into directory.\n"
+"If a revision is given, that's the one that will be checked out.\n"
+"Otherwise, it will be the head of the branch (given or implicit).\n"
+"If no directory is given, the branch name will be used as directory"
+msgstr ""
+"récupère une révision depuis une base de données dans un dossier. Si une\n"
+"révision est spécifiée, c'est celle-ci qui sera récupérée. Sinon, il "
+"s'agira\n"
+"que la versionde de tête (spécifiée ou implicite).\n"
+"Si aucun nom de dossier n'est fourni, le nom de la branche sera utilisé\n"
+"comme nom de dossier"

-#: ../commands.cc:3128
-msgid "SOURCE-BRANCH DEST-BRANCH DIR"
-msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION DOSSIER"
-
-#: ../commands.cc:3129
-msgid "merge one branch into a subdirectory in another branch"
-msgstr "fusionnez une branche dans un sous-dossier d'une autre branche"
-
-#: ../commands.cc:3167 ../commands.cc:3170
+#: cmd_ws_commit.cc:406 cmd_ws_commit.cc:425
 #, c-format
-msgid "branch '%s' is not merged\n"
-msgstr "la branche « %s » n'est pas fusionnée\n"
+msgid "need --branch argument for branch-based checkout"
+msgstr "il faut un argument --branch pour récupérer basé sur une branche"

-#: ../commands.cc:3175
+#: cmd_ws_commit.cc:419
 #, c-format
-msgid "propagating %s -> %s\n"
-msgstr "propage %s -> %s\n"
+msgid "checkout directory '%s' already exists"
+msgstr "le fichier « %s » existe déjà"

-#: ../commands.cc:3177
-#, c-format
-msgid "[target] %s\n"
-msgstr "[cible] %s\n"
+#: cmd_ws_commit.cc:433
+#, fuzzy, c-format
+msgid "branch %s has multiple heads:"
+msgstr "la branche %s a plusieurs entrées"

-#: ../commands.cc:3182
-#, c-format
-msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
-msgstr "la branche « %s » est à jour par rapport à la branche « %s »\n"
+#: cmd_ws_commit.cc:436
+#, fuzzy, c-format
+msgid "choose one with '%s checkout -r<id>'"
+msgstr "choisissez en un avec « %s update -r<id> »\n"

-#: ../commands.cc:3184
+#: cmd_ws_commit.cc:437
 #, c-format
-msgid "no action taken\n"
-msgstr "rien n'est fait\n"
+msgid "branch %s has multiple heads"
+msgstr "la branche %s a plusieurs entrées"

-#: ../commands.cc:3188
-#, c-format
-msgid "no merge necessary; putting %s in branch '%s'\n"
-msgstr "fusion pas nécessaire; met %s dans la branch « %s »\n"
+#: cmd_ws_commit.cc:464
+#, fuzzy, c-format
+msgid "revision %s is not a member of branch %s"
+msgstr "la révision %s n'est pas membre de la branche %s\n"

-#: ../commands.cc:3224
+#: cmd_ws_commit.cc:497
 #, c-format
-msgid "Path %s not found in destination tree."
-msgstr "Chemin %s pas trouvé dans l'arborescence de destination"
+msgid "no file %s found in database for %s"
+msgstr "aucun fichier « %s » trouvé dans la base de données pour %s"

-#: ../commands.cc:3278
-msgid "refresh the inodeprint cache"
-msgstr "rafraîchir le cache d'inodeprint"
-
-#: ../commands.cc:3287
-msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
-msgstr "RÉVISION-GAUCHE RÉVISION-DROITE BRANCHE-DESTINATION"
-
-#: ../commands.cc:3288
-msgid "merge two explicitly given revisions, placing result in given branch"
+#: cmd_ws_commit.cc:515
+msgid ""
+"set PATH ATTR VALUE\n"
+"get PATH [ATTR]\n"
+"drop PATH [ATTR]"
 msgstr ""
-"fusionne deux révisions données explicitement et met le résultat dans la "
-"branche donnée"
+"set CHEMIN ATTR VALEUR\n"
+"get CHEMIN [ATTR]\n"
+"drop CHEMIN [ATTR]"

-#: ../commands.cc:3302
-#, c-format
-msgid "%s and %s are the same revision, aborting"
-msgstr "%s et %s sont la même révision, j'abandonne"
+#: cmd_ws_commit.cc:516
+msgid "set, get or drop file attributes"
+msgstr "établis, obtiens ou supprime des attributs de fichiers"

-#: ../commands.cc:3304 ../commands.cc:3306
+#: cmd_ws_commit.cc:533
 #, c-format
-msgid "%s is already an ancestor of %s"
-msgstr "%s est déjà un ancêtre de %s"
+msgid "Unknown path '%s'"
+msgstr "Chemin inconnu « %s »"

-#: ../commands.cc:3331
-msgid "(revision|file|key) PARTIAL-ID"
-msgstr "(revision|file|key) ID-PARTIELLE"
+#: cmd_ws_commit.cc:562
+#, c-format
+msgid "Path '%s' does not have attribute '%s'\n"
+msgstr "Le chemin « %s » n'a pas d'attribut « %s »\n"

-#: ../commands.cc:3332
-msgid "complete partial id"
-msgstr "remplis une identité partielle"
-
-#: ../commands.cc:3341
+#: cmd_ws_commit.cc:590
 #, c-format
-msgid "non-hex digits in partial id"
-msgstr "chiffres non-héxadécimaux dans l'id partielle"
-
-#: ../commands.cc:3380
-msgid "revert file(s), dir(s) or entire workspace (\".\")"
+msgid "No attributes for '%s'"
 msgstr ""
-"retourne les fichiers, dossiers ou l'espace de travail en entier (\".\") à "
-"la révision de base"

-#: ../commands.cc:3457
+#: cmd_ws_commit.cc:601
 #, c-format
-msgid "reverting %s"
-msgstr "retourne %s à la révision de base"
+msgid "No attribute '%s' on path '%s'"
+msgstr ""

-#: ../commands.cc:3461
-#, c-format
-msgid "no file version %s found in database for %s"
-msgstr "aucune version de fichier « %s » trouvé dans la base de données %s"
+#: cmd_ws_commit.cc:614
+msgid "commit workspace to database"
+msgstr "confie un espace de travail à la base de données"

-#: ../commands.cc:3474
-#, c-format
-msgid "recreating %s/"
-msgstr "re-crée %s/"
+#: cmd_ws_commit.cc:648
+#, fuzzy, c-format
+msgid "no changes to commit"
+msgstr "aucun changement à confier\n"

-#: ../commands.cc:3486
-msgid "RCSFILE..."
-msgstr "FICHIER_RCS..."
+#: cmd_ws_commit.cc:662
+#, fuzzy, c-format
+msgid "beginning commit on branch '%s'"
+msgstr "commence à confier sur la branche « %s »\n"

-#: ../commands.cc:3487
+#: cmd_ws_commit.cc:671
+#, fuzzy, c-format
 msgid ""
-"parse versions in RCS files\n"
-"this command doesn't reconstruct or import revisions.you probably want "
-"cvs_import"
+"_MTN/log is non-empty and log message was specified on command line\n"
+"perhaps move or delete _MTN/log,\n"
+"or remove --message/--message-file from the command line?"
 msgstr ""
-"analyse les versions dans des fichiers RCS\n"
-"cette command ne reconstruit ou n'importe pas des révisions.  Vous voulez\n"
-"probablement cvs_import"
+"MT/log n'est pas vide et une entrée de journal a été donné sur la linge\n"
+"de commande\n"
+"veuillez déplacé ou supprimer MT/log,\n"
+"ou supprimer --message/--message-file de la linge de commande"

-#: ../commands.cc:3503
-msgid "rcs"
-msgstr "rcs"
+#: cmd_ws_commit.cc:686
+#, fuzzy, c-format
+msgid "empty log message; commit canceled"
+msgstr "message du journal vide; confidence arrêtée"

-#: ../commands.cc:3503
-msgid "CVSROOT"
-msgstr "CVSROOT"
+#: cmd_ws_commit.cc:707
+#, fuzzy, c-format
+msgid "log message rejected: %s"
+msgstr "entrée du journal rejetée: %s\n"

-#: ../commands.cc:3503
-msgid "import all versions in CVS repository"
-msgstr "importer toutes les versions d'un dépôt CVS"
+#: cmd_ws_commit.cc:715
+#, fuzzy, c-format
+msgid "revision %s already in database"
+msgstr "la révision %s est déjà dans la base de données\n"

-#: ../commands.cc:3566
-msgid "PATH"
-msgstr "CHEMIN"
-
-#: ../commands.cc:3567
-msgid "print annotated copy of the file from REVISION"
-msgstr "affiche une copie annotée du fichier venant de RÉVISION"
-
-#: ../commands.cc:3587
+#: cmd_ws_commit.cc:754 cmd_ws_commit.cc:784
 #, c-format
-msgid "no revision for file '%s' in database"
-msgstr "aucune révision pour le fichier « %s » dans la base de données"
+msgid "file '%s' modified during commit, aborting"
+msgstr "le fichier « %s » a été modifié pendant le commit, interruption"

-#: ../commands.cc:3605
-msgid "[FILE] ..."
-msgstr "[FICHIER] ..."
+#: cmd_ws_commit.cc:766
+#, fuzzy, c-format
+msgid "Your database is missing version %s of file '%s'"
+msgstr "le sondage de la version de la base de données dans « %s » a échouée"

-#: ../commands.cc:3606
-msgid ""
-"print history in reverse order (filtering by 'FILE'). If one or more\n"
-"revisions are given, use them as a starting point."
-msgstr ""
-"Affiche l'histoire en sens inverse (filtré avec « FILE »).  Si une\n"
-"révision ou plus sont données, emploie-les comme débuts."
+#: cmd_ws_commit.cc:812
+#, fuzzy, c-format
+msgid "committed revision %s"
+msgstr "révision %s confié\n"

-#: ../commands.cc:3654
+#: cmd_ws_commit.cc:818
 #, c-format
-msgid "Unknown file '%s' for log command"
-msgstr "Fichier « %s » inconnu donnée à la commande log"
+msgid ""
+"note: this revision creates divergence\n"
+"note: you may (or may not) wish to run '%s merge'"
+msgstr ""
+"note: cette révision a créé une divergence\n"
+"note: peut-être (ou peut-être pas) voullez-vous exécuter « %s merge »"

-#: ../commands.cc:3672
-#, c-format
-msgid "only one of --last/--next allowed"
-msgstr "seul un de --last et --next est permit"
-
-#: ../commands.cc:3840
+#: cmd_ws_commit.cc:851
 msgid "[DIRECTORY]"
 msgstr "[DOSSIER]"

-#: ../commands.cc:3840
+#: cmd_ws_commit.cc:852
 msgid "setup a new workspace directory, default to current"
 msgstr ""
 "prépare un dossier pour une nouvelle copie de travail, emploie le dossier "
 "actuel comme défaut"

-#: ../commands.cc:3846
+#: cmd_ws_commit.cc:858
 #, c-format
 msgid "need --branch argument for setup"
 msgstr "setup a besoin d'un argument pour --branch"

-#: ../commands.cc:3860
-msgid "automation"
-msgstr "automatisation"
+#: cmd_ws_commit.cc:873
+msgid "refresh the inodeprint cache"
+msgstr "rafraîchir le cache d'inodeprint"

-#: ../commands.cc:3861
-#, fuzzy
-msgid ""
-"interface_version\n"
-"heads [BRANCH]\n"
-"ancestors REV1 [REV2 [REV3 [...]]]\n"
-"attributes [FILE]\n"
-"parents REV\n"
-"descendents REV1 [REV2 [REV3 [...]]]\n"
-"children REV\n"
-"graph\n"
-"erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n"
-"toposort [REV1 [REV2 [REV3 [...]]]]\n"
-"ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n"
-"leaves\n"
-"inventory\n"
-"stdio\n"
-"certs REV\n"
-"select SELECTOR\n"
-"get_file FILEID\n"
-"get_manifest_of [REVID]\n"
-"get_revision [REVID]\n"
-"packet_for_rdata REVID\n"
-"packets_for_certs REVID\n"
-"packet_for_fdata FILEID\n"
-"packet_for_fdelta OLD_FILE NEW_FILE\n"
-"keys\n"
-msgstr ""
-"interface_version\n"
-"heads [BRANCHE]\n"
-"ancestors RÉV1 [RÉV2 [RÉV3 [...]]]\n"
-"attributes [FICHIER]\n"
-"parents RÉV\n"
-"descendents RÉV1 [RÉV2 [RÉV3 [...]]]\n"
-"children RÉV\n"
-"graph\n"
-"erase_ancestors [RÉV1 [RÉV2 [RÉV3 [...]]]]\n"
-"toposort [RÉV1 [RÉV2 [RÉV3 [...]]]]\n"
-"ancestry_difference NOUVELLE_RÉV [ANCIENNE_RÉV1 [ANCIENNE_RÉV2 [...]]]\n"
-"leaves\n"
-"inventory\n"
-"stdio\n"
-"certs RÉV\n"
-"select SELECTEUR\n"
-"get_file ID_FICHIER\n"
-"get_manifest_of [ID_RÉV]\n"
-"get_revision [ID_RÉV]\n"
-"keys\n"
+#: commands.cc:124 commands.cc:225
+#, fuzzy, c-format
+msgid "unknown command '%s'"
+msgstr "commande inconnue « %s »\n"

-#: ../commands.cc:3885
-msgid "automation interface"
-msgstr "interface d'automatisation"
-
-#: ../commands.cc:3899 ../commands.cc:3915
-msgid "vars"
-msgstr "variables"
-
-#: ../commands.cc:3899
-msgid "DOMAIN NAME VALUE"
-msgstr "DOMAINE NOM VALEUR"
-
-#: ../commands.cc:3900
-msgid "set the database variable NAME to VALUE, in domain DOMAIN"
-msgstr ""
-"établir la variable NOM de la base de données dans le domaine DOMAINE avec "
-"la valeur VALEUR"
-
-#: ../commands.cc:3915
-msgid "DOMAIN NAME"
-msgstr "DOMAINE NOM VALEUR"
-
-#: ../commands.cc:3916
-msgid "remove the database variable NAME in domain DOMAIN"
-msgstr ""
-"supprimer la variable NOM de la base de données dans le domaine DOMAINE"
-
-#: ../commands.cc:3927
+#: commands.cc:135
 #, c-format
-msgid "no var with name %s in domain %s"
-msgstr "aucune variable nommée %s dans le domaine %s"
+msgid "command '%s' has multiple ambiguous expansions:\n"
+msgstr "la commande « %s » a plusieurs expansions ambigües : \n"

-#: ../commands.cc:3931
-msgid "REVID"
-msgstr "ID_RÉVISION"
+#: commands.cc:168
+msgid "commands:"
+msgstr "commandes :"

-#: ../commands.cc:3932
-msgid "dump the roster associated with the given REVID"
-msgstr "décharge la list associée avec l'ID_RÉV donnée"
+#: commands.cc:246
+msgid "command [ARGS...]"
+msgstr "commande [ARGUMENTS...]"

-#: ../commands.cc:3950
-msgid "REV REV"
-msgstr "RÉV RÉV"
+#: commands.cc:246
+msgid "display command help"
+msgstr "afficher l'aide de la commande"

-#: ../commands.cc:3950
-msgid ""
-"Show what conflicts would need to be resolved to merge the given revisions."
-msgstr ""
-"Montre quels conflits auraient besoin d'être résolus l'ors d'une fusion des "
-"révisions données."
+#: commands.cc:377
+#, fuzzy, c-format
+msgid "expanding selection '%s'"
+msgstr "expansion de la sélection « %s »\n"

-#: ../commands.cc:3959 ../commands.cc:3961
+#: commands.cc:385
 #, c-format
-msgid "%s in an ancestor of %s; no merge is needed."
-msgstr "%s est un ancêtre de %s; aucune fusion est nécessaire"
+msgid "no match for selection '%s'"
+msgstr "aucune correspondance pour la sélection « %s »"

-#: ../commands.cc:3975
-#, c-format
-msgid "There are %s node_name_conflicts."
-msgstr "Il y a %s node_name_conflicts."
+#: commands.cc:391
+#, fuzzy, c-format
+msgid "expanded to '%s'"
+msgstr "expansion à « %s »\n"

-#: ../commands.cc:3976
+#: commands.cc:408
 #, c-format
-msgid "There are %s file_content_conflicts."
-msgstr "Il y a %s file_content_conflicts."
+msgid "selection '%s' has multiple ambiguous expansions: \n"
+msgstr "la sélection « %s » a plusieurs expansions ambigües : \n"

-#: ../commands.cc:3977
-#, c-format
-msgid "There are %s node_attr_conflicts."
-msgstr "Il y a %s node_attr_conflicts."
+#: commands.cc:425
+msgid "note: "
+msgstr "note : "

-#: ../commands.cc:3978
+#: commands.cc:426
 #, c-format
-msgid "There are %s orphaned_node_conflicts."
-msgstr "Il y a %s orphaned_node_conflicts."
+msgid ""
+"branch '%s' has multiple heads\n"
+"perhaps consider '%s merge'"
+msgstr ""
+"la branche « %s » a plusieurs heads\n"
+"vous devriez peut-être lancer « %s merge »"

-#: ../commands.cc:3979
+#: commands.cc:444
 #, c-format
-msgid "There are %s rename_target_conflicts."
-msgstr "Il y a %s rename_target_conflicts."
+msgid "--message and --message-file are mutually exclusive"
+msgstr "--message et --message-file sont mutuellement exclusifs"

-#: ../commands.cc:3980
+#: database_check.cc:133
 #, c-format
-msgid "There are %s directory_loop_conflicts."
-msgstr "Il y a %s directory_loop_conflicts."
+msgid "file structure is corrupted; cannot check further"
+msgstr ""

-#: ../database_check.cc:125
+#: database_check.cc:144
 msgid "files"
 msgstr "fichiers"

-#: ../database_check.cc:154
+#: database_check.cc:173
 msgid "rosters"
 msgstr "listes"

-#: ../database_check.cc:221
+#: database_check.cc:240
 msgid "markings"
 msgstr "marquages"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../database_check.cc:319 ../database_check.cc:507 ../netsync.cc:2765
-#: ../rcs_import.cc:1226
+#: database_check.cc:338 netsync.cc:2980 rcs_import.cc:1244
 msgid "revisions"
 msgstr "révisions"

-#: ../database_check.cc:418
+#: database_check.cc:437
 msgid "ancestry"
 msgstr "ancêtre"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../database_check.cc:451 ../netsync.cc:2769
+#: database_check.cc:470 netsync.cc:2984
 msgid "keys"
 msgstr "clefs"

-#: ../database_check.cc:477
+#: database_check.cc:496
 msgid "certs"
 msgstr "certifs"

-#: ../database_check.cc:543
-#, c-format
-msgid "file %s missing (%d manifest references)\n"
+#: database_check.cc:533
+#, fuzzy, c-format
+msgid "file %s missing (%d manifest references)"
 msgstr "fichier %s manquant (%d références du manifeste)\n"

-#: ../database_check.cc:550
-#, c-format
-msgid "file %s unreferenced\n"
+#: database_check.cc:540
+#, fuzzy, c-format
+msgid "file %s unreferenced"
 msgstr "fichier %s non-référencé\n"

-#: ../database_check.cc:571
-#, c-format
-msgid "roster %s unreferenced\n"
+#: database_check.cc:561
+#, fuzzy, c-format
+msgid "roster %s unreferenced"
 msgstr "liste %s non-référencé\n"

-#: ../database_check.cc:577
-#, c-format
-msgid "roster %s incomplete (%d missing files)\n"
+#: database_check.cc:567
+#, fuzzy, c-format
+msgid "roster %s incomplete (%d missing files)"
 msgstr "liste %s incomplet (%d fichiers manquants)\n"

-#: ../database_check.cc:584
-#, c-format
-msgid "roster %s incomplete (%d missing revisions)\n"
+#: database_check.cc:574
+#, fuzzy, c-format
+msgid "roster %s incomplete (%d missing revisions)"
 msgstr "liste %s incomplet (%d révisions manquantes)\n"

-#: ../database_check.cc:591
-#, c-format
-msgid "roster %s is not parseable (perhaps with unnormalized paths?)\n"
+#: database_check.cc:581
+#, fuzzy, c-format
+msgid "roster %s is not parseable (perhaps with unnormalized paths?)"
 msgstr ""
 "liste %s n'est pas analysable (peut-être y-a-t'il des chemins non "
 "normalisé?)\n"

-#: ../database_check.cc:598
-#, c-format
-msgid "roster %s is not in normalized form\n"
+#: database_check.cc:588
+#, fuzzy, c-format
+msgid "roster %s is not in normalized form"
 msgstr "la liste %s n'est pas en forme normalisé\n"

-#: ../database_check.cc:623
-#, c-format
+#: database_check.cc:613
+#, fuzzy, c-format
 msgid ""
 "revision %s missing (%d revision references; %d cert references; %d parent "
-"references; %d child references; %d roster references)\n"
+"references; %d child references; %d roster references)"
 msgstr ""
 "révision %s manquante (%d révisions référencées; %d certifs référencés; %d "
 "parents référencés; %d enfants référencés; %d listes référencées)\n"

-#: ../database_check.cc:631
-#, c-format
-msgid "revision %s incomplete (%d missing manifests)\n"
+#: database_check.cc:621
+#, fuzzy, c-format
+msgid "revision %s incomplete (%d missing manifests)"
 msgstr "révision %s incomplète (%d manifestes manquants)\n"

-#: ../database_check.cc:638
-#, c-format
-msgid "revision %s incomplete (%d missing revisions)\n"
+#: database_check.cc:628
+#, fuzzy, c-format
+msgid "revision %s incomplete (%d missing revisions)"
 msgstr "révision %s incomplète (%d révisions manquantes)\n"

-#: ../database_check.cc:645
-#, c-format
-msgid "revision %s incomplete (missing roster link)\n"
+#: database_check.cc:635
+#, fuzzy, c-format
+msgid "revision %s incomplete (missing roster link)"
 msgstr "révision %s incomplète (le lien à la liste manque)\n"

-#: ../database_check.cc:651
-#, c-format
-msgid "revision %s incomplete (missing roster)\n"
+#: database_check.cc:641
+#, fuzzy, c-format
+msgid "revision %s incomplete (missing roster)"
 msgstr "révision %s incomplète (la liste manque)\n"

-#: ../database_check.cc:657
-#, c-format
-msgid "revision %s mismatched roster and manifest\n"
+#: database_check.cc:647
+#, fuzzy, c-format
+msgid "revision %s mismatched roster and manifest"
 msgstr ""
 "la liste et la manifeste de la révision %s ne s'entre-correspondent pas\n"

-#: ../database_check.cc:663
-#, c-format
-msgid "revision %s incomplete (incomplete roster)\n"
+#: database_check.cc:653
+#, fuzzy, c-format
+msgid "revision %s incomplete (incomplete roster)"
 msgstr "révision %s incomplète (liste incomplète)\n"

-#: ../database_check.cc:669
-#, c-format
-msgid ""
-"revision %s mismatched parents (%d ancestry parents; %d revision refs)\n"
+#: database_check.cc:659
+#, fuzzy, c-format
+msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)"
 msgstr ""
 "révision %s a des parents non-correspondents (%d parents; %d révision "
 "référencées)\n"

-#: ../database_check.cc:678
-#, c-format
-msgid "revision %s mismatched children (%d ancestry children; %d parents)\n"
+#: database_check.cc:668
+#, fuzzy, c-format
+msgid "revision %s mismatched children (%d ancestry children; %d parents)"
 msgstr ""
 "révision %s a des enfants non-correspondents (%d enfants; %d parents)\n"

-#: ../database_check.cc:690
-#, c-format
-msgid "revision %s has bad history (%s)\n"
+#: database_check.cc:680
+#, fuzzy, c-format
+msgid "revision %s has bad history (%s)"
 msgstr "la révision %s a une mauvaise histoire (%s)\n"

-#: ../database_check.cc:697
-#, c-format
-msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n"
+#: database_check.cc:687
+#, fuzzy, c-format
+msgid "revision %s is not parseable (perhaps with unnormalized paths?)"
 msgstr ""
 "la révision %s n'est pas analysable (peut-être a-t'elle des chemins non "
 "normalisé?)\n"

-#: ../database_check.cc:704
-#, c-format
-msgid "revision %s is not in normalized form\n"
+#: database_check.cc:694
+#, fuzzy, c-format
+msgid "revision %s is not in normalized form"
 msgstr "la révision %s n'est pas en forme normalisé\n"

-#: ../database_check.cc:728
-#, c-format
-msgid "key %s missing (signed %d certs)\n"
+#: database_check.cc:718
+#, fuzzy, c-format
+msgid "key %s missing (signed %d certs)"
 msgstr "la clef %s manque (elle a signé %d certifs)\n"

-#: ../database_check.cc:761
-#, c-format
-msgid "revision %s unchecked signature in %s cert from missing key %s\n"
+#: database_check.cc:751
+#, fuzzy, c-format
+msgid "revision %s unchecked signature in %s cert from missing key %s"
 msgstr ""
 "la révision %s a une signature non contrôlable dans le certif %s, faite avec "
 "une clef qui manque %s\n"

-#: ../database_check.cc:769
-#, c-format
-msgid "revision %s bad signature in %s cert from key %s\n"
+#: database_check.cc:759
+#, fuzzy, c-format
+msgid "revision %s bad signature in %s cert from key %s"
 msgstr ""
 "la révision %s a une mauvaise signature dans le certif %s, faite avec la "
 "clef %s\n"

-#: ../database_check.cc:784
-#, c-format
-msgid "revision %s missing %s cert\n"
+#: database_check.cc:774
+#, fuzzy, c-format
+msgid "revision %s missing %s cert"
 msgstr "la révision %s manque le certif %s\n"

-#: ../database_check.cc:793
-#, c-format
-msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)\n"
+#: database_check.cc:783
+#, fuzzy, c-format
+msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)"
 msgstr ""
 "révision %s a des certifs non-correspondents (%d auteurs %d dates %d entrées "
 "de journal)\n"

-#: ../database_check.cc:874
-#, c-format
-msgid "%d missing files\n"
+#: database_check.cc:870
+#, fuzzy, c-format
+msgid "%d missing files"
 msgstr "%d fichiers manquants\n"

-#: ../database_check.cc:876
-#, c-format
-msgid "%d unreferenced files\n"
+#: database_check.cc:872
+#, fuzzy, c-format
+msgid "%d unreferenced files"
 msgstr "%d fichiers non-référencés\n"

-#: ../database_check.cc:879
-#, c-format
-msgid "%d unreferenced rosters\n"
+#: database_check.cc:875
+#, fuzzy, c-format
+msgid "%d unreferenced rosters"
 msgstr "%d listes non-référencés\n"

-#: ../database_check.cc:881
-#, c-format
-msgid "%d incomplete rosters\n"
+#: database_check.cc:877
+#, fuzzy, c-format
+msgid "%d incomplete rosters"
 msgstr "%d listes incomplets\n"

-#: ../database_check.cc:883
-#, c-format
-msgid "%d rosters not parseable (perhaps with invalid paths)\n"
+#: database_check.cc:879
+#, fuzzy, c-format
+msgid "%d rosters not parseable (perhaps with invalid paths)"
 msgstr ""
 "%d listes non analysable (peut-être ont-ils des chemins pas valable?)\n"

-#: ../database_check.cc:886
-#, c-format
-msgid "%d rosters not in normalized form\n"
+#: database_check.cc:882
+#, fuzzy, c-format
+msgid "%d rosters not in normalized form"
 msgstr "%d listes pas en forme normalisé\n"

-#: ../database_check.cc:889
-#, c-format
-msgid "%d missing revisions\n"
+#: database_check.cc:885
+#, fuzzy, c-format
+msgid "%d missing revisions"
 msgstr "%d révisions manquantes\n"

-#: ../database_check.cc:891
-#, c-format
-msgid "%d incomplete revisions\n"
+#: database_check.cc:887
+#, fuzzy, c-format
+msgid "%d incomplete revisions"
 msgstr "%d revisions incomplètes\n"

-#: ../database_check.cc:893
-#, c-format
-msgid "%d mismatched parents\n"
+#: database_check.cc:889
+#, fuzzy, c-format
+msgid "%d mismatched parents"
 msgstr "%d parents non correspondents\n"

-#: ../database_check.cc:895
-#, c-format
-msgid "%d mismatched children\n"
+#: database_check.cc:891
+#, fuzzy, c-format
+msgid "%d mismatched children"
 msgstr "%d enfants non correspondents\n"

-#: ../database_check.cc:897
-#, c-format
-msgid "%d revisions with bad history\n"
+#: database_check.cc:893
+#, fuzzy, c-format
+msgid "%d revisions with bad history"
 msgstr "%d révisions avec une mauvaise histoire\n"

-#: ../database_check.cc:899
-#, c-format
-msgid "%d revisions not parseable (perhaps with invalid paths)\n"
+#: database_check.cc:895
+#, fuzzy, c-format
+msgid "%d revisions not parseable (perhaps with invalid paths)"
 msgstr ""
 "%d révisions non analysable (peut-être ont-ils des chemins pas valable?)\n"

-#: ../database_check.cc:902
-#, c-format
-msgid "%d revisions not in normalized form\n"
+#: database_check.cc:898
+#, fuzzy, c-format
+msgid "%d revisions not in normalized form"
 msgstr "%d révisions non normalisés\n"

-#: ../database_check.cc:906
-#, c-format
-msgid "%d unreferenced roster links\n"
+#: database_check.cc:902
+#, fuzzy, c-format
+msgid "%d unreferenced roster links"
 msgstr "%d liens à liste non-référencés\n"

-#: ../database_check.cc:909
-#, c-format
-msgid "%d missing rosters\n"
+#: database_check.cc:905
+#, fuzzy, c-format
+msgid "%d missing rosters"
 msgstr "%d listes manquantes\n"

-#: ../database_check.cc:913
-#, c-format
-msgid "%d missing keys\n"
+#: database_check.cc:909
+#, fuzzy, c-format
+msgid "%d missing keys"
 msgstr "%d clefs manquantes\n"

-#: ../database_check.cc:916
-#, c-format
-msgid "%d missing certs\n"
+#: database_check.cc:912
+#, fuzzy, c-format
+msgid "%d missing certs"
 msgstr "%d certifs manquants\n"

-#: ../database_check.cc:918
-#, c-format
-msgid "%d mismatched certs\n"
+#: database_check.cc:914
+#, fuzzy, c-format
+msgid "%d mismatched certs"
 msgstr "%d certifs non correspondaets\n"

-#: ../database_check.cc:920
-#, c-format
-msgid "%d unchecked signatures due to missing keys\n"
+#: database_check.cc:916
+#, fuzzy, c-format
+msgid "%d unchecked signatures due to missing keys"
 msgstr "%d signature non contrôlées à cause de clefs manquantes\n"

-#: ../database_check.cc:922
-#, c-format
-msgid "%d bad signatures\n"
+#: database_check.cc:918
+#, fuzzy, c-format
+msgid "%d bad signatures"
 msgstr "%d mauvaises signatures\n"

-#: ../database_check.cc:948
-#, c-format
-msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs\n"
+#: database_check.cc:944
+#, fuzzy, c-format
+msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs"
 msgstr ""
 "contrôle fini: %d fichiers; %d listes; %d révisions; %d clefs; %d certifs\n"

-#: ../database_check.cc:954
-#, c-format
-msgid "total problems detected: %d (%d serious)\n"
+#: database_check.cc:950
+#, fuzzy, c-format
+msgid "total problems detected: %d (%d serious)"
 msgstr "problèmes total détectés: %d (%d sérieux)\n"

-#: ../database_check.cc:956
+#: database_check.cc:952
 #, c-format
 msgid "serious problems detected"
 msgstr "problèmes sérieux détectés"

-#: ../database_check.cc:958
-#, c-format
-msgid "minor problems detected\n"
+#: database_check.cc:954
+#, fuzzy, c-format
+msgid "minor problems detected"
 msgstr "problèmes mineurs détectés\n"

-#: ../database_check.cc:960
-#, c-format
-msgid "database is good\n"
+#: database_check.cc:956
+#, fuzzy, c-format
+msgid "database is good"
 msgstr "la base de données est bonne\n"

-#: ../database.cc:141
+#: database.cc:156
 #, c-format
 msgid ""
 "layout of database %s doesn't match this version of monotone\n"
@@ -2018,8 +2063,13 @@
 "(cette opération est irréversible; vous voudrez probablement prendre une "
 "copie d'abord)"

-#: ../database.cc:165
+#: database.cc:170
 #, c-format
+msgid "this database already contains rosters"
+msgstr ""
+
+#: database.cc:190
+#, c-format
 msgid ""
 "database %s contains revisions but no rosters\n"
 "if you are a project leader or doing local testing:\n"
@@ -2037,7 +2087,7 @@
 "  récupérez de nouveau dans une base de données fraiche.\n"
 "désolé pour l'inconvenience."

-#: ../database.cc:184
+#: database.cc:209
 #, c-format
 msgid ""
 "database %s contains manifests but no revisions\n"
@@ -2049,19 +2099,19 @@
 "niveau\n"
 "veuillez lire lest détails dans README.changesets"

-#: ../database.cc:220
+#: database.cc:245
 #, c-format
 msgid "unable to probe database version in file %s"
 msgstr "le sondage de la version de la base de données dans « %s » a échouée"

-#: ../database.cc:227
+#: database.cc:252
 #, c-format
 msgid "database %s is not an sqlite version 3 file, try dump and reload"
 msgstr ""
 "la base de données %s n'est pas un fichier sqlite version 3, essayer dump "
 "puis reload"

-#: ../database.cc:254
+#: database.cc:281 schema_migration.cc:200
 msgid ""
 "make sure database and containing directory are writeable\n"
 "and you have not run out of disk space"
@@ -2069,22 +2119,21 @@
 "assurez-vous que la base de données et le dossier la contenant sont\n"
 "accessibles en écriture et que vous disposez encore d'espace disque"

-#. kind of string surgery to avoid ~duplicate strings
-#: ../database.cc:260
+#: database.cc:287 schema_migration.cc:205
 #, c-format
 msgid ""
-"sqlite error: %d: %s\n"
+"sqlite error: %s\n"
 "%s"
 msgstr ""
-"erreur sqlite : %d : %s\n"
+"erreur sqlite : %s\n"
 "%s"

-#: ../database.cc:306
+#: database.cc:332
 #, c-format
 msgid "could not initialize database: %s: already exists"
 msgstr "impossible d'initialiser la base de données : %s : elle existe déjà"

-#: ../database.cc:311
+#: database.cc:337
 #, c-format
 msgid ""
 "existing (possibly stale) journal file '%s' has same stem as new database '%"
@@ -2092,13 +2141,13 @@
 "cancelling database creation"
 msgstr ""

-#: ../database.cc:454
+#: database.cc:487
 #, c-format
 msgid "cannot create %s; it already exists"
 msgstr "impossible de créer %s car ceci existe déjà"

-#: ../database.cc:514
-#, c-format
+#: database.cc:564
+#, fuzzy, c-format
 msgid ""
 "schema version    : %s\n"
 "counts:\n"
@@ -2109,6 +2158,7 @@
 "  revisions       : %u\n"
 "  ancestry edges  : %u\n"
 "  certs           : %u\n"
+"  logical files   : %u\n"
 "bytes:\n"
 "  full rosters    : %u\n"
 "  roster deltas   : %u\n"
@@ -2118,6 +2168,9 @@
 "  cached ancestry : %u\n"
 "  certs           : %u\n"
 "  total           : %u\n"
+"database:\n"
+"  page size       : %u\n"
+"  cache size      : %u\n"
 msgstr ""
 "version du schéma    : %s\n"
 "comptes:\n"
@@ -2138,73 +2191,73 @@
 "  certifs            : %u\n"
 "  total              : %u\n"

-#: ../database.cc:569
+#: database.cc:626
 #, c-format
 msgid "database schema version: %s"
 msgstr "version du schéma de la base de données : %s"

-#: ../database.cc:646
+#: database.cc:703
 #, c-format
 msgid "multiple statements in query: %s\n"
 msgstr "plusieurs instructions dans la requête: %s\n"

-#: ../database.cc:652
-#, c-format
-msgid "wanted %d columns got %d in query: %s\n"
+#: database.cc:709
+#, fuzzy, c-format
+msgid "wanted %d columns got %d in query: %s"
 msgstr "voulais %d colonnes, reçu %d dans la requête: %s\n"

-#: ../database.cc:711
-#, c-format
-msgid "null result in query: %s\n"
+#: database.cc:768
+#, fuzzy, c-format
+msgid "null result in query: %s"
 msgstr "la requête donnait aucun résultat: %s\n"

-#: ../database.cc:729
-#, c-format
-msgid "wanted %d rows got %s in query: %s\n"
+#: database.cc:786
+#, fuzzy, c-format
+msgid "wanted %d rows got %d in query: %s"
 msgstr "voulais %d rangs, reçu %s dans la requête: %s\n"

-#: ../database.cc:1728
+#: database.cc:1926
 #, c-format
 msgid "another key with name '%s' already exists"
 msgstr "une autre clef nommée « %s » existe déjà"

-#: ../database.cc:2784
+#: database.cc:2958
 #, c-format
 msgid "no database specified"
 msgstr "aucune base de données n'a été spécifiée"

-#: ../database.cc:2792
+#: database.cc:2966
 #, c-format
 msgid "database %s does not exist"
 msgstr "la base de données %s n'existe pas"

-#: ../database.cc:2793
+#: database.cc:2967
 #, c-format
 msgid "%s is a directory, not a database"
 msgstr "%s est un dossier, pas une base de données"

-#: ../database.cc:2818
+#: database.cc:2992
 #, c-format
 msgid "could not open database '%s': %s"
 msgstr "impossible d'ouvrir la base de données « %s » : %s"

-#: ../diff_patch.cc:588
+#: diff_patch.cc:606
 #, c-format
 msgid "file '%s' does not exist in workspace"
 msgstr "le fichier « %s » n'existe pas dans l'espace de travail"

-#: ../diff_patch.cc:589
+#: diff_patch.cc:607
 #, c-format
 msgid "'%s' in workspace is a directory, not a file"
 msgstr "« %s » est un dossier, pas un fichier"

-#: ../diff_patch.cc:593
+#: diff_patch.cc:611
 #, c-format
 msgid "file %s in workspace has id %s, wanted %s"
 msgstr ""
 "le fichier « %s » dans l'espace de travail a l'identité %s, je voulais %s"

-#: ../diff_patch.cc:714
+#: diff_patch.cc:732
 #, c-format
 msgid ""
 "help required for 3-way merge\n"
@@ -2219,13 +2272,8 @@
 "[  droite] %s\n"
 "[fusionné] %s\n"

-#: ../file_io.cc:116
+#: file_io.cc:175 file_io.cc:182
 #, c-format
-msgid "expected file '%s', but it is a directory."
-msgstr "le fichier « %s » ne peut être lu; c'est un dossier"
-
-#: ../file_io.cc:186 ../file_io.cc:193
-#, c-format
 msgid ""
 "could not create directory '%s'\n"
 "it is a file"
@@ -2233,7 +2281,7 @@
 "impossible de créer le dossier « %s »\n"
 "car c'est un fichier"

-#: ../file_io.cc:188
+#: file_io.cc:177
 #, c-format
 msgid ""
 "could not create directory '%s'\n"
@@ -2242,17 +2290,17 @@
 "impossible de créer le dossier « %s »\n"
 "%s"

-#: ../file_io.cc:192
+#: file_io.cc:181
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "impossible de créer le dossier « %s »"

-#: ../file_io.cc:205
+#: file_io.cc:194
 #, c-format
 msgid "failed to create directory '%s' for '%s'"
 msgstr "impossible de créer le dossier « %s » pour « %s »"

-#: ../file_io.cc:219
+#: file_io.cc:208
 #, c-format
 msgid ""
 "could not remove '%s'\n"
@@ -2261,458 +2309,461 @@
 "impossible de supprimer « %s »\n"
 "%s"

-#: ../file_io.cc:229
+#: file_io.cc:218
 #, c-format
 msgid "file to delete '%s' does not exist"
 msgstr "le fichier à supprimer « %s » n'existe pas"

-#: ../file_io.cc:230
+#: file_io.cc:219
 #, c-format
 msgid "file to delete, '%s', is not a file but a directory"
 msgstr "le fichier à supprimer « %s » n'est pas un fichier, c'est un dossier"

-#: ../file_io.cc:238
+#: file_io.cc:227
 #, c-format
 msgid "directory to delete '%s' does not exist"
 msgstr "le dossier à supprimer « %s » n'existe pas"

-#: ../file_io.cc:239
+#: file_io.cc:228
 #, c-format
 msgid "directory to delete, '%s', is not a directory but a file"
 msgstr "le dossier à supprimer « %s » n'est pas un dossier, c'est un fichier"

-#: ../file_io.cc:246
+#: file_io.cc:235
 #, c-format
 msgid "object to delete, '%s', does not exist"
 msgstr "l'objet à supprimer « %s » n'existe pas"

-#: ../file_io.cc:254
+#: file_io.cc:243
 #, c-format
 msgid "directory to delete, '%s', does not exist"
 msgstr "le dossier à supprimer « %s » n'existe pas"

-#: ../file_io.cc:255
+#: file_io.cc:244
 #, c-format
 msgid "directory to delete, '%s', is a file"
 msgstr "le dossier à supprimer « %s » est un fichier"

-#: ../file_io.cc:264
+#: file_io.cc:253
 #, c-format
 msgid "rename source file '%s' does not exist"
 msgstr "le chemin à renommer « %s » n'existe pas"

-#: ../file_io.cc:265
+#: file_io.cc:254
 #, c-format
 msgid "rename source file '%s' is a directory -- bug in monotone?"
 msgstr ""
 "le fichier à renommer « %s » est un dossier -- cerait-ce un bogue dans "
 "monotone?"

-#: ../file_io.cc:268 ../file_io.cc:281
+#: file_io.cc:257 file_io.cc:270
 #, c-format
 msgid "rename target '%s' already exists"
 msgstr "le nouveau nom « %s » existe déjà"

-#: ../file_io.cc:277
+#: file_io.cc:266
 #, c-format
 msgid "rename source dir '%s' does not exist"
 msgstr "le dossier à renommer « %s » n'existe pas"

-#: ../file_io.cc:278
+#: file_io.cc:267
 #, c-format
 msgid "rename source dir '%s' is a file -- bug in monotone?"
 msgstr ""
 "le dossier à renommer « %s » est un fichier -- cerait-ce un bogue dans "
 "monotone?"

-#: ../file_io.cc:292
+#: file_io.cc:281
 #, c-format
 msgid "rename source path '%s' does not exist"
 msgstr "le chemin à renommer « %s » n'existe pas"

-#: ../file_io.cc:307
+#: file_io.cc:296
 #, c-format
 msgid "file %s does not exist"
 msgstr "le fichier %s n'existe pas"

-#: ../file_io.cc:308
+#: file_io.cc:297
 #, c-format
 msgid "file %s cannot be read as data; it is a directory"
 msgstr "le fichier %s ne peut être lu; c'est un dossier"

-#: ../file_io.cc:312
+#: file_io.cc:301
 #, c-format
 msgid "cannot open file %s for reading"
 msgstr "impossible d'ouvrir le fichier %s pour le lire"

-#: ../file_io.cc:381
+#: file_io.cc:340
 #, c-format
 msgid "Cannot read standard input multiple times"
 msgstr "Impossible de lire l'entrée standard plusieurs fois"

-#: ../file_io.cc:412
+#: file_io.cc:371
 #, c-format
 msgid "file '%s' cannot be overwritten as data; it is a directory"
 msgstr "le fichier %s ne peut être re-écrit avec des données; c'est un dossier"

-#: ../file_io.cc:420
+#: file_io.cc:379
 #, c-format
 msgid "cannot open file %s for writing"
 msgstr "impossible d'ouvrir le fichier %s pour l'écrire"

-#: ../file_io.cc:530
-#, c-format
-msgid "caught runtime error %s constructing file path for %s\n"
+#: file_io.cc:461
+#, fuzzy, c-format
+msgid "caught runtime error %s constructing file path for %s"
 msgstr ""
 "attrape une erreur %s en cours d'exécution au milieu de la construction du "
 "cheming de fichier pour %s\n"

-#: ../file_io.cc:569
+#: file_io.cc:500
 #, c-format
 msgid "no such file or directory: '%s'"
 msgstr "aucun fichier ou dossier de ce type : « %s »"

-#: ../keys.cc:77
+#: keys.cc:99
 #, c-format
 msgid "got empty passphrase from get_passphrase() hook"
 msgstr "la phrase de passe obtenue depuis get_passphrase() est vide"

-#: ../keys.cc:93
+#: keys.cc:115
 #, c-format
 msgid "empty passphrase not allowed"
 msgstr "la phrase de passe ne doit pas être vide"

-#: ../keys.cc:100
+#: keys.cc:122
 #, c-format
 msgid "confirm passphrase for key ID [%s]: "
 msgstr "confirmez la phrase de passe pour la clef d'ID [%s] :"

-#: ../keys.cc:105
-#, c-format
-msgid "empty passphrases not allowed, try again\n"
+#: keys.cc:127
+#, fuzzy, c-format
+msgid "empty passphrases not allowed, try again"
 msgstr "la phrase de passe ne doit pas être vide, essayez de nouveau\n"

-#: ../keys.cc:106 ../keys.cc:113
-#, c-format
-msgid "too many failed passphrases\n"
+#: keys.cc:128 keys.cc:135
+#, fuzzy, c-format
+msgid "too many failed passphrases"
 msgstr "trop de phrases de passe incorrectes\n"

-#: ../keys.cc:112
-#, c-format
-msgid "passphrases do not match, try again\n"
+#: keys.cc:134
+#, fuzzy, c-format
+msgid "passphrases do not match, try again"
 msgstr "les phrases de passe ne correspondent pas, essayez à nouveau\n"

-#: ../keys.cc:119
+#: keys.cc:141
 #, c-format
 msgid "no passphrase given"
 msgstr "aucune phrase de passe fournie"

-#: ../keys.cc:542
+#: keys.cc:564
 #, c-format
 msgid "passphrase for '%s' is incorrect"
 msgstr "la phrase de passe pour « %s » est incorrecte"

-#: ../lua.cc:539 ../lua.cc:568 ../lua.cc:583
+#: lua.cc:555 lua.cc:584 lua.cc:599
 #, c-format
 msgid "%s called with an invalid parameter"
 msgstr "%s a été appelé avec un paramètre invalide"

-#: ../lua.cc:586
-#, c-format
-msgid "Directory '%s' does not exists"
+#: lua.cc:602
+#, fuzzy, c-format
+msgid "Directory '%s' does not exist"
 msgstr "le dossier « %s » n'existe pas"

-#: ../lua.cc:587 ../rcs_import.cc:1217 ../work.cc:420
+#: lua.cc:603 rcs_import.cc:1235 work.cc:488
 #, c-format
 msgid "'%s' is not a directory"
 msgstr "« %s » n'est pas un dossier"

-#: ../lua.cc:606 ../lua.cc:908
+#: lua.cc:622
 #, c-format
 msgid "lua error while loading rcfile '%s'"
 msgstr "erreur lua lors du chargement de « %s »"

-#: ../lua.cc:705
+#: lua.cc:706
 #, c-format
 msgid "bad input to parse_basic_io"
 msgstr "mauvaise entrée à parse_basic_io"

-#: ../lua.cc:920
-#, c-format
-msgid "lua error while loading '%s'"
-msgstr "erreur lua lors du chargement de « %s »"
-
-#: ../lua.cc:925
-#, c-format
-msgid "rcfile '%s' does not exist"
-msgstr "le fichier rc « %s » n'existe pas"
-
-#: ../main.cc:325
+#: main.cc:326
 msgid "interrupted"
 msgstr "interrompu"

-#: ../main.cc:329
+#: main.cc:330
 msgid "terminated by signal"
 msgstr "terminé par un signal"

-#: ../merkle_tree.cc:276
+#: merkle_tree.cc:290
 #, c-format
 msgid "node level is %d, exceeds maximum %d"
 msgstr "niveau de nœud est %d, ce qui dépasse la limite %d"

-#: ../merkle_tree.cc:311
+#: merkle_tree.cc:325
 #, c-format
 msgid "mismatched node hash value %s, expected %s"
 msgstr "la somme de contrôle %s ne correspond pas à la valeur attendue %s"

-#: ../monotone.cc:51
+#: monotone.cc:65
 msgid "select branch cert for operation"
 msgstr "choisi certif de branch pour l'opération"

-#: ../monotone.cc:52
+#: monotone.cc:66
 msgid "select revision id for operation"
 msgstr "choisi révision pour l'opération"

-#: ../monotone.cc:53
+#: monotone.cc:67
 msgid "set commit changelog message"
 msgstr "établissez le message du journal"

-#: ../monotone.cc:54
+#: monotone.cc:68
 #, fuzzy
 msgid "set filename containing commit changelog message"
 msgstr ""
 "'etablissez le nom du fichier qui contient l'entrée du journal pour confier"

-#: ../monotone.cc:55
+#: monotone.cc:69
 msgid "override date/time for commit"
 msgstr "supplante la date/l'heure pour confier"

-#: ../monotone.cc:56
+#: monotone.cc:70
 msgid "override author for commit"
 msgstr "supplante l'auteur pour confier"

-#: ../monotone.cc:57
+#: monotone.cc:71
 msgid "limit the number of levels of directories to descend"
 msgstr "limite le niveau de dossier à descendre"

-#: ../monotone.cc:58
+#: monotone.cc:72
 msgid "limit log output to the last number of entries"
 msgstr "limiter l'affichage du journal au dernier nombre d'entrées spécifié"

-#: ../monotone.cc:59
+#: monotone.cc:73
 msgid "limit log output to the next number of entries"
 msgstr "limiter l'affichage du journal au prochain nombre d'entrées spécifié"

-#: ../monotone.cc:60
+#: monotone.cc:74
 msgid "record process id of server"
 msgstr "enregistrer l'identifiant du processus serveur"

-#: ../monotone.cc:61
+#: monotone.cc:75
 msgid "print a brief version of the normal output"
 msgstr "affiche la version courte de l'affichage normale"

-#: ../monotone.cc:62
+#: monotone.cc:76
 msgid "print diffs along with logs"
 msgstr "affiche la différnce en affichant le journal"

-#: ../monotone.cc:63
+#: monotone.cc:77
 msgid "exclude merges when printing logs"
 msgstr "exclus les fusions en affichant le journal"

-#: ../monotone.cc:64
+#: monotone.cc:78
 msgid "use the current arguments as the future default"
 msgstr "emploie les arguments actuels comme défauts futurs"

-#: ../monotone.cc:65
+#: monotone.cc:79
 msgid "leave out anything described by its argument"
 msgstr "exclus tout ce qui est décrit par l'argument"

-#: ../monotone.cc:66
+#: monotone.cc:80
 msgid "use unified diff format"
 msgstr "utiliser le format diff unifié"

-#: ../monotone.cc:67
+#: monotone.cc:81
 msgid "use context diff format"
 msgstr "utiliser le format diff contextuel"

-#: ../monotone.cc:68
+#: monotone.cc:82
 msgid "use external diff hook for generating diffs"
 msgstr ""
 "emploie la procédure automatique de « diff » externe pour créer les "
 "différences"

-#: ../monotone.cc:69
+#: monotone.cc:83
 msgid "argument to pass external diff hook"
 msgstr "argument a passer la procédure automatique de « diff » externe"

-#: ../monotone.cc:70
-msgid "use least common ancestor as ancestor for merge"
-msgstr "emploi le plus petit ancêtre commun comme ancêtre pour la fusion"
-
-#: ../monotone.cc:71
+#: monotone.cc:84
 msgid "perform the associated file operation"
 msgstr "accomplis les opérations sur les fichiers associés"

-#: ../monotone.cc:72
+#: monotone.cc:85
 msgid "address:port to listen on (default :4691)"
 msgstr "écouter sur adresse:port (défaut :4691)"

-#: ../monotone.cc:73
+#: monotone.cc:86
 msgid "perform the operations for files missing from workspace"
 msgstr ""
 "accomplis les opérations sur les fichiers qui manquent dans l'espace de "
 "travail"

-#: ../monotone.cc:74
+#: monotone.cc:87
 msgid "perform the operations for unknown files from workspace"
 msgstr ""
 "accomplis les opérations sur les fichiers inconnus dans l'espace de travail"

-#: ../monotone.cc:75
+#: monotone.cc:88
 msgid "push the specified key even if it hasn't signed anything"
 msgstr "envoie la clef donnée même si rien n'est signé avec elle"

-#: ../monotone.cc:76
+#: monotone.cc:89
+msgid "serve netsync on stdio"
+msgstr ""
+
+#: monotone.cc:90
+msgid "disable transport authentication"
+msgstr ""
+
+#: monotone.cc:91
 msgid "when rosterifying, drop attrs entries with the given key"
 msgstr ""
 "tout en créent des listes, élimine les attributs signé par la clef donnée"

-#: ../monotone.cc:77
+#: monotone.cc:92
 msgid "exclude files when printing logs"
 msgstr "n'affiche pas les fichiers en affichant le journal"

-#: ../monotone.cc:78
+#: monotone.cc:93
 msgid "also operate on the contents of any listed directories"
 msgstr ""

-#: ../monotone.cc:87
+#: monotone.cc:102
 msgid "print debug log to stderr while running"
 msgstr "affiche le journal à déboguer sur la sortie d'erreur standard"

-#: ../monotone.cc:88
+#: monotone.cc:103
 msgid "file to dump debugging log to, on failure"
 msgstr "ficher dans lequel verser le journal à déboguer, en cas d'erreur"

-#: ../monotone.cc:89
+#: monotone.cc:104
 msgid "file to write the log to"
 msgstr "fichier où écrire le journal"

-#: ../monotone.cc:90
-msgid "suppress log and progress messages"
+#: monotone.cc:105
+#, fuzzy
+msgid "suppress verbose, informational and progress messages"
 msgstr "n'affiche pas le journal ou les messages de progrès"

-#: ../monotone.cc:91
+#: monotone.cc:106
+#, fuzzy
+msgid "suppress warning, verbose, informational and progress messages"
+msgstr "n'affiche pas le journal ou les messages de progrès"
+
+#: monotone.cc:107
 msgid "display help message"
 msgstr "afficher le message d'aide"

-#: ../monotone.cc:92
+#: monotone.cc:108
 msgid "print version number, then exit"
 msgstr "afficher le numéro de version, puis quitte"

-#: ../monotone.cc:93
+#: monotone.cc:109
 msgid "print detailed version number, then exit"
 msgstr "afficher le numéro de version détaillée, puis quitte"

-#: ../monotone.cc:94
+#: monotone.cc:110
 msgid "insert command line arguments taken from the given file"
 msgstr "fourre les arguments pris du fichier donné dans la linge de commande"

-#: ../monotone.cc:95
+#: monotone.cc:111
 msgid "set ticker style (count|dot|none)"
 msgstr "établis le style d'affichage de progrès (count|dot|none)"

-#: ../monotone.cc:96
+#: monotone.cc:112
 msgid "do not load standard lua hooks"
 msgstr "ne pas charger les hooks standards lua"

-#: ../monotone.cc:97
-msgid "do not load ~/.monotone/monotonerc or MT/monotonerc lua files"
+#: monotone.cc:113
+#, fuzzy
+msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files"
 msgstr ""
 "ne pas charger les fichiers lua ~/.monotone/monotonerc ou MT/monotonerc"

-#: ../monotone.cc:98
+#: monotone.cc:114
 msgid "load extra rc file"
 msgstr "charger un fichier rc supplémentaire"

-#: ../monotone.cc:99
+#: monotone.cc:115
 msgid "set key for signatures"
 msgstr "paramétrer la clef pour les signatures"

-#: ../monotone.cc:100
+#: monotone.cc:116
 msgid "set name of database"
 msgstr "paramétrer le nom de la base de données"

-#: ../monotone.cc:101
+#: monotone.cc:117
 msgid "limit search for workspace to specified root"
 msgstr "limite la recherche d'un espace de travail à la racine donnée"

 # **** Richard stopped here ****
-#: ../monotone.cc:102
+#: monotone.cc:118
 msgid "verbose completion output"
 msgstr "affiche plus d'information à la fin de l'exécution"

-#: ../monotone.cc:103
+#: monotone.cc:119
 msgid "set location of key store"
 msgstr "paramétrer l'emplacement de l'entrepôt des clefs"

-#: ../monotone.cc:104
+#: monotone.cc:120
 msgid "set location of configuration directory"
 msgstr "paramétrer l'emplacement du dossier de configuration"

-#: ../monotone.cc:208
+#: monotone.cc:224
 #, c-format
 msgid "problem parsing arguments from file %s: %s"
 msgstr "erreur lors de l'analyse d'arguments venant du fichier %s : %s"

-#: ../monotone.cc:217
+#: monotone.cc:233
 #, c-format
 msgid "weird error when stuffing arguments read from %s: %s\n"
 msgstr "erreur bizarre en employent des arguments lu de %s: %s\n"

-#: ../monotone.cc:299
+#: monotone.cc:330
 msgid "[OPTION...] command [ARGS...]\n"
 msgstr "[OPTION...] commande [ARGUMENTS...]\n"

-#: ../monotone.cc:551
+#: monotone.cc:593
 #, c-format
 msgid "syntax error near the \"%s\" option: %s"
 msgstr "erreur de syntaxe près de l'option « %s » : %s"

-#: ../monotone.cc:593
-#, c-format
-msgid "monotone %s doesn't use the option %s"
+#: monotone.cc:629
+#, fuzzy, c-format
+msgid "%s %s doesn't use the option %s"
 msgstr "monotone %s n'utilise pas l'option %s"

-#: ../monotone.cc:628
+#: monotone.cc:663
 #, c-format
 msgid "Options specific to '%s %s':"
 msgstr "Options spécifiques à « %s %s » :"

-#: ../mt_version.cc:23
+#: mt_version.cc:36
 #, c-format
 msgid "%s (base revision: %s)"
 msgstr "%s (révision de base : %s)"

-#: ../mt_version.cc:34
+#: mt_version.cc:56
 #, c-format
 msgid ""
-"Running on: %s\n"
-"Changes since base revision: %s\n"
+"Running on          : %s\n"
+"C++ compiler        : %s\n"
+"C++ standard library: %s\n"
+"Boost version       : %s\n"
+"Changes since base revision:\n"
+"%s"
 msgstr ""
-"En cours d'exécution sur : %s\n"
-"Changements depuis la révision de base : %s\n"

-#: ../netcmd.cc:40
+#: netcmd.cc:43
 #, c-format
 msgid "unknown item type 0x%x for '%s'"
 msgstr "type d'élément inconnu 0x%x pour « %s »"

-#: ../netcmd.cc:112
+#: netcmd.cc:115
 #, c-format
 msgid "unknown netcmd code 0x%x"
 msgstr "code de commande netcmd inconnu 0x%x"

-#: ../netcmd.cc:117
+#: netcmd.cc:120
 #, c-format
 msgid ""
 "protocol version mismatch: wanted '%d' got '%d'\n"
@@ -2721,20 +2772,20 @@
 "discordance de versions de protocol: voulais « %d », reçu « %d »\n"
 "%s"

-#: ../netcmd.cc:122
+#: netcmd.cc:125
 msgid "the remote side has a newer, incompatible version of monotone"
 msgstr "l'autre côté emploi une nouvelle version incompatible de monotone"

-#: ../netcmd.cc:123
+#: netcmd.cc:126
 msgid "the remote side has an older, incompatible version of monotone"
 msgstr "l'autre côté emploi une ancienne version incompatible de monotone"

-#: ../netcmd.cc:133
+#: netcmd.cc:136
 #, c-format
 msgid "oversized payload of '%d' bytes"
 msgstr "charge utile surdimensionnée de '%d' octets"

-#: ../netcmd.cc:162
+#: netcmd.cc:176
 #, c-format
 msgid ""
 "bad HMAC checksum (got %s, wanted %s)\n"
@@ -2743,91 +2794,85 @@
 "mauvaise somme de contrôle HMAC (reçu %s, attendu %s)\n"
 "ceci suggère que les données ont été corrompues pendant le transit\n"

-#: ../netcmd.cc:257 ../netcmd.cc:303
+#: netcmd.cc:272 netcmd.cc:318
 #, c-format
 msgid "unknown role specifier %d"
 msgstr "rôle donné %d est inconnu"

-#: ../netio.hh:38 ../netio.hh:56
+#: netio.hh:41 netio.hh:59
 #, c-format
 msgid "need %d bytes to decode %s at %d, only have %d"
 msgstr ""
 "%d octets sont nécessaire pour décoder %s à %d, seulement %d sont disponibles"

-#: ../netio.hh:84 ../netio.hh:119
+#: netio.hh:87 netio.hh:122
 #, c-format
 msgid "uleb128 decode for '%s' into %d-byte datum overflowed"
 msgstr "décodage uleb128 de « %s » en donnée de %d octets a débordé"

-#: ../netio.hh:139
+#: netio.hh:142
 #, c-format
 msgid "ran out of bytes reading uleb128 value for '%s' at pos %d"
 msgstr ""
 "pas assez d'octets en lisant la valeur uleb128 pour « %s », à la position %d"

-#: ../netio.hh:275
+#: netio.hh:278
 #, c-format
 msgid "decoding variable length string of %d bytes for '%s', maximum is %d"
 msgstr "décodage d'une linge de %d octets pour « %s » quand le maximum est %d"

-#: ../netio.hh:330
+#: netio.hh:333
 #, c-format
 msgid "expected %s to end at %d, have %d bytes"
 msgstr "je m'attendai à ce que %s finisse à %d, et j'ai %d octets"

-#: ../netsync.cc:245
+#: netsync.cc:258
 #, c-format
 msgid "check of '%s' failed"
 msgstr "la vérification de « %s » a échouée"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:691
+#: netsync.cc:724
 msgid "bytes in"
 msgstr "octets entrants"
-#msgstr "octets ⇩"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:693
+# msgstr "octets ⇩"
+#: netsync.cc:726
 msgid "bytes out"
 msgstr "octets sortants"
-#msgstr "octets ⇧"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:697
+# msgstr "octets ⇧"
+#: netsync.cc:730
 msgid "certs in"
 msgstr "certs entrants"
-#msgstr "certs ⇩"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:699 ../netsync.cc:712
+# msgstr "certs ⇩"
+#: netsync.cc:732 netsync.cc:745
 msgid "revs in"
 msgstr "révs entrantes"
-#msgstr "révs ⇩"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:704
+# msgstr "révs ⇩"
+#: netsync.cc:737
 msgid "certs out"
 msgstr "certs entrants"
-#msgstr "certs ⇧"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:706 ../netsync.cc:714
+# msgstr "certs ⇧"
+#: netsync.cc:739 netsync.cc:747
 msgid "revs out"
 msgstr "révs sortantes"
-#msgstr "révs ⇧"

-#: ../netsync.cc:820
+# msgstr "révs ⇧"
+#: netsync.cc:853
 #, c-format
 msgid "underflow on count of %s items to receive"
 msgstr "trop peux d'objets %s à recevoir"

-#: ../netsync.cc:1166
+#: netsync.cc:1201
 #, c-format
 msgid "received network error: %s"
 msgstr "erreur de réception réseau : %s"

-#: ../netsync.cc:1198
-#, c-format
+#: netsync.cc:1236
+#, fuzzy, c-format
 msgid ""
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
 "@ WARNING: SERVER IDENTIFICATION HAS CHANGED              @\n"
@@ -2836,7 +2881,7 @@
 "it is also possible that the server key has just been changed\n"
 "remote host sent key %s\n"
 "I expected %s\n"
-"'%s unset %s %s' overrides this check\n"
+"'%s unset %s %s' overrides this check"
 msgstr ""
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
 "@ ATTENTION : L'IDENTIFICATION DU SERVEUR A CHANGÉE       @\n"
@@ -2849,12 +2894,12 @@
 "j'attendais %s\n"
 "« %s unset %s %s » pour passer outre cette verification\n"

-#: ../netsync.cc:1208
+#: netsync.cc:1246
 #, c-format
 msgid "server key changed"
 msgstr "la clef du serveur a changée"

-#: ../netsync.cc:1213
+#: netsync.cc:1251
 #, c-format
 msgid ""
 "first time connecting to server %s\n"
@@ -2865,325 +2910,310 @@
 "Je considère qu'il s'agit vraiment de lui, mais vous devriez peut-être\n"
 "re-vérifier l'empreinte de leur clef : %s\n"

-#: ../netsync.cc:1220
-#, c-format
-msgid "saving public key for %s to database\n"
+#: netsync.cc:1258
+#, fuzzy, c-format
+msgid "saving public key for %s to database"
 msgstr "sauvegarde la clef publique « %s » dans la base de données\n"

-#: ../netsync.cc:1308
-#, c-format
-msgid "rejected attempt at anonymous connection for write\n"
+#: netsync.cc:1351
+#, fuzzy, c-format
+msgid "rejected attempt at anonymous connection for write"
 msgstr "essai de connexion anonyme pour écrire rejeté\n"

-#: ../netsync.cc:1315
-#, c-format
-msgid "rejected attempt at anonymous connection while running as sink\n"
+#: netsync.cc:1358
+#, fuzzy, c-format
+msgid "rejected attempt at anonymous connection while running as sink"
 msgstr "essai de connexion anonyme en étant un puit rejeté\n"

-#: ../netsync.cc:1330 ../netsync.cc:1427
+#: netsync.cc:1374 netsync.cc:1503
 #, c-format
 msgid "not serving branch '%s'"
 msgstr "la branche « %s » n'est pas servie"

-#: ../netsync.cc:1335
+#: netsync.cc:1380
 #, c-format
 msgid "anonymous access to branch '%s' denied by server"
 msgstr "accès anonyme à la branche « %s » refusé par le serveur"

-#: ../netsync.cc:1342
-#, c-format
-msgid "allowed anonymous read permission for '%s' excluding '%s'\n"
+#: netsync.cc:1389
+#, fuzzy, c-format
+msgid "allowed anonymous read permission for '%s' excluding '%s'"
 msgstr ""
 "permission de lecture anonyme accordée pour « %s » en excluant « %s »\n"

-#: ../netsync.cc:1374
-#, c-format
-msgid "detected replay attack in auth netcmd\n"
+#: netsync.cc:1395
+#, fuzzy, c-format
+msgid "allowed anonymous read/write permission for '%s' excluding '%s'"
+msgstr ""
+"permission de lecture anonyme accordée pour « %s » en excluant « %s »\n"
+
+#: netsync.cc:1450
+#, fuzzy, c-format
+msgid "detected replay attack in auth netcmd"
 msgstr "détecté une attaque de repasse dans la phase auth de netcmd\n"

-#: ../netsync.cc:1396
-#, c-format
-msgid "remote public key hash '%s' is unknown\n"
+#: netsync.cc:1472
+#, fuzzy, c-format
+msgid "remote public key hash '%s' is unknown"
 msgstr "la somme de contrôle « %s » d'une clef publique reçu est inconnue\n"

-#: ../netsync.cc:1413
-#, c-format
+#: netsync.cc:1489
+#, fuzzy, c-format
 msgid ""
 "denied '%s' read permission for '%s' excluding '%s' while running as pure "
-"sink\n"
+"sink"
 msgstr ""
 "permission de lecture refusée à « %s » pour « %s » en excluant « %s » et en "
 "étant un puit pure\n"

-#: ../netsync.cc:1433
-#, c-format
+#: netsync.cc:1509
+#, fuzzy, c-format
 msgid ""
-"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n"
+"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
 msgstr ""
 "permission de lecture refusée à « %s » pour « %s » en excluant « %s » à "
 "cause de la branche « %s »\n"

-#: ../netsync.cc:1436
+#: netsync.cc:1512
 #, c-format
 msgid "access to branch '%s' denied by server"
 msgstr "accès à la branche « %s » refusé par le serveur"

-#. If we're source_and_sink_role, continue even with no branches readable
-#. eg. serve --db=empty.db
-#: ../netsync.cc:1446
-#, c-format
-msgid "allowed '%s' read permission for '%s' excluding '%s'\n"
+#: netsync.cc:1522
+#, fuzzy, c-format
+msgid "allowed '%s' read permission for '%s' excluding '%s'"
 msgstr ""
 "permission de lecture accordée à « %s » pour « %s » en excluant « %s »\n"

-#: ../netsync.cc:1455
-#, c-format
+#: netsync.cc:1531
+#, fuzzy, c-format
 msgid ""
 "denied '%s' write permission for '%s' excluding '%s' while running as pure "
-"source\n"
+"source"
 msgstr ""
 "permission d'écrire refusée à « %s » pour « %s » en excluant « %s » en étant "
 "un source pure\n"

-#: ../netsync.cc:1463
-#, c-format
-msgid "denied '%s' write permission for '%s' excluding '%s'\n"
+#: netsync.cc:1539
+#, fuzzy, c-format
+msgid "denied '%s' write permission for '%s' excluding '%s'"
 msgstr "permission d'écrire refusée à « %s » pour « %s » en excluant « %s »\n"

-#: ../netsync.cc:1469
-#, c-format
-msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
+#: netsync.cc:1545
+#, fuzzy, c-format
+msgid "allowed '%s' write permission for '%s' excluding '%s'"
 msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n"

-#: ../netsync.cc:1509
-#, c-format
-msgid "bad client signature\n"
+#: netsync.cc:1569
+#, fuzzy, c-format
+msgid "bad client signature"
 msgstr "signature du client invalide\n"

-#: ../netsync.cc:1525
-#, c-format
-msgid "Unexpected 'refine' command on non-refined item type\n"
+#: netsync.cc:1585
+#, fuzzy, c-format
+msgid "Unexpected 'refine' command on non-refined item type"
 msgstr "Commande « refine » inattenue pour type d'objet non raffiné\n"

-#: ../netsync.cc:1622
+#: netsync.cc:1682
 #, c-format
 msgid "unknown bye phase %d received"
 msgstr "phase d'adieu %d inconnue reçue"

-#: ../netsync.cc:1637
-#, c-format
-msgid "Unexpected 'done' command on non-refined item type\n"
+#: netsync.cc:1697
+#, fuzzy, c-format
+msgid "Unexpected 'done' command on non-refined item type"
 msgstr "Commande « done » inattenue pour type d'objet non raffiné\n"

-#: ../netsync.cc:1717
-#, c-format
-msgid "epoch with hash '%s' does not exist in our database"
+#: netsync.cc:1769
+#, fuzzy, c-format
+msgid "%s with hash '%s' does not exist in our database"
 msgstr ""
 "l'époque avec la somme de contrôle « %s » n'existe pas dans notre base de "
 "données"

-#: ../netsync.cc:1746
+#: netsync.cc:1870
 #, c-format
-msgid "revision '%s' does not exist in our database"
-msgstr "la révision « %s » n'existe pas dans notre base de données"
-
-#: ../netsync.cc:1760
-#, c-format
-msgid "file '%s' does not exist in our database"
-msgstr "le fichier « %s » n'existe pas dans notre base de données"
-
-#: ../netsync.cc:1774
-#, c-format
-msgid "cert '%s' does not exist in our database"
-msgstr "le certif « %s » n'existe pas dans notre base de données"
-
-#. It is safe to call 'error' here, because if we get here,
-#. then the current netcmd packet cannot possibly have
-#. written anything to the database.
-#: ../netsync.cc:1826
-#, c-format
 msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
 msgstr ""
 "Discordance d'époque sur la branche %s. Le serveur a « %s », le client a « %"
 "s »."

-#: ../netsync.cc:1847
+#: netsync.cc:1888
 #, c-format
 msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
 msgstr ""
 "le contrôle de la somme de contrôle échoué pour la clef publique « %s » (%"
 "s); voulais « %s », reçu « %s »"

-#: ../netsync.cc:1864
+#: netsync.cc:1902
 #, c-format
 msgid "hash check failed for revision cert '%s'"
 msgstr ""
 "contrôle de la somme de contrôle échoué pour le certif de révision « %s »"

-#: ../netsync.cc:1939
+#: netsync.cc:1964
 #, c-format
 msgid "Received warning from usher: %s"
 msgstr "Alerte reçu de usher : %s"

-#: ../netsync.cc:2026 ../netsync.cc:2057
+#: netsync.cc:2051 netsync.cc:2082
 msgid "source and sink"
 msgstr "source et puit"

-#: ../netsync.cc:2027 ../netsync.cc:2058
+#: netsync.cc:2052 netsync.cc:2083
 msgid "source"
 msgstr "source"

-#: ../netsync.cc:2027 ../netsync.cc:2058
+#: netsync.cc:2052 netsync.cc:2083
 msgid "sink"
 msgstr "puit"

-#: ../netsync.cc:2212
+#: netsync.cc:2239
 #, c-format
 msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
 msgstr ""

-#: ../netsync.cc:2224 ../netsync.cc:2281
-#, c-format
-msgid "protocol error while processing peer %s: '%s'\n"
+#: netsync.cc:2251 netsync.cc:2350
+#, fuzzy, c-format
+msgid "protocol error while processing peer %s: '%s'"
 msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n"

-#: ../netsync.cc:2230
-#, c-format
-msgid "error: %s\n"
+#: netsync.cc:2257
+#, fuzzy, c-format
+msgid "error: %s"
 msgstr "erreur : %s\n"

-#. FIXME: split into labels and convert to ace here.
-#: ../netsync.cc:2260
-#, c-format
-msgid "connecting to %s\n"
+#: netsync.cc:2321
+#, fuzzy, c-format
+msgid "connecting to %s"
 msgstr "connexion à %s\n"

-#: ../netsync.cc:2296
+#: netsync.cc:2365
 #, c-format
 msgid "timed out waiting for I/O with peer %s, disconnecting\n"
 msgstr "temps mort en attendant E/S du pair %s, déconnexion\n"

-#: ../netsync.cc:2311
+#: netsync.cc:2388
 #, c-format
-msgid "got OOB data from peer %s, disconnecting\n"
-msgstr "reçu des données hors-bande du pair %s, déconnexion\n"
-
-#. We failed during processing. This should only happen in
-#. client voice when we have a decode exception, or received an
-#. error from our server (which is translated to a decode
-#. exception). We call these cases E() errors.
-#: ../netsync.cc:2326
-#, c-format
 msgid "processing failure while talking to peer %s, disconnecting\n"
 msgstr ""

-#: ../netsync.cc:2343
-#, c-format
-msgid "successful exchange with %s\n"
+#: netsync.cc:2405
+#, fuzzy, c-format
+msgid "successful exchange with %s"
 msgstr "échange réussi avec %s\n"

-#: ../netsync.cc:2349
+#: netsync.cc:2411
 #, c-format
-msgid "peer %s disconnected after we informed them of error\n"
+msgid "peer %s disconnected after we informed them of error"
 msgstr ""

-#: ../netsync.cc:2354
+#: netsync.cc:2416
 #, c-format
 msgid "I/O failure while talking to peer %s, disconnecting\n"
 msgstr ""

-#: ../netsync.cc:2383
-#, c-format
-msgid "protocol error while processing peer %s: '%s', marking as bad\n"
-msgstr ""
+#: netsync.cc:2482
+#, fuzzy, c-format
+msgid "protocol error while processing peer %s: '%s', marking as bad"
+msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n"

-#: ../netsync.cc:2415
-#, c-format
-msgid "accepted new client connection from %s : %s\n"
+#: netsync.cc:2514
+#, fuzzy, c-format
+msgid "accepted new client connection from %s : %s"
 msgstr "nouvelle connexion d'un client acceptée de %s : %s\n"

-#: ../netsync.cc:2449
-#, c-format
-msgid "protocol error while processing peer %s: '%s', disconnecting\n"
-msgstr ""
+#: netsync.cc:2551
+#, fuzzy, c-format
+msgid "protocol error while processing peer %s: '%s', disconnecting"
+msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n"

-#: ../netsync.cc:2460
+#: netsync.cc:2562
 #, c-format
-msgid "peer %s read failed in working state (error)\n"
+msgid "peer %s read failed in working state (error)"
 msgstr ""

-#: ../netsync.cc:2465
+#: netsync.cc:2567
 #, c-format
 msgid ""
 "peer %s read failed in shutdown state (possibly client misreported error)\n"
 msgstr ""

-#: ../netsync.cc:2471
+#: netsync.cc:2573
 #, c-format
-msgid "peer %s read failed in confirmed state (success)\n"
+msgid "peer %s read failed in confirmed state (success)"
 msgstr ""

-#: ../netsync.cc:2492
+#: netsync.cc:2594
 #, c-format
-msgid "peer %s write failed in working state (error)\n"
+msgid "peer %s write failed in working state (error)"
 msgstr ""

-#: ../netsync.cc:2497
+#: netsync.cc:2599
 #, c-format
 msgid ""
 "peer %s write failed in shutdown state (possibly client misreported error)\n"
 msgstr ""

-#: ../netsync.cc:2503
+#: netsync.cc:2605
 #, c-format
-msgid "peer %s write failed in confirmed state (success)\n"
+msgid "peer %s write failed in confirmed state (success)"
 msgstr ""

-#: ../netsync.cc:2530
-#, c-format
-msgid "peer %s processing finished, disconnecting\n"
+#: netsync.cc:2632
+#, fuzzy, c-format
+msgid "peer %s processing finished, disconnecting"
 msgstr "traitement du pair %s terminé, déconnexion\n"

-#: ../netsync.cc:2552
-#, c-format
-msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
+#: netsync.cc:2654
+#, fuzzy, c-format
+msgid "fd %d (peer %s) has been idle too long, disconnecting"
 msgstr "le fd %d (pair %s) est inactif depuis trop longtemps, déconnexion\n"

-#: ../netsync.cc:2620
-#, c-format
-msgid "beginning service on %s : %s\n"
+#: netsync.cc:2722
+#, fuzzy, c-format
+msgid "beginning service on %s : %s"
 msgstr "début du service sur %s : %s\n"

-#: ../netsync.cc:2621
+#: netsync.cc:2723
 msgid "<all interfaces>"
 msgstr "<toutes les interfaces>"

-#: ../netsync.cc:2635
+#: netsync.cc:2737
 #, c-format
 msgid "session limit %d reached, some connections will be refused\n"
 msgstr ""

-#: ../netsync.cc:2690
-#, c-format
-msgid "got OOB from peer %s, disconnecting\n"
+#: netsync.cc:2802
+#, fuzzy, c-format
+msgid "got OOB from peer %s, disconnecting"
 msgstr "reçu des données hors-bande du pair %s, déconnexion\n"

-#: ../netsync.cc:2759
-#, c-format
-msgid "finding items to synchronize:\n"
+#: netsync.cc:2862
+#, fuzzy, c-format
+msgid "beginning service on %s"
+msgstr "début du service sur %s : %s\n"
+
+#: netsync.cc:2925
+#, fuzzy, c-format
+msgid "got some OOB data on fd %d (peer %s), disconnecting"
+msgstr "reçu des données hors-bande du pair %s, déconnexion\n"
+
+#: netsync.cc:2974
+#, fuzzy, c-format
+msgid "finding items to synchronize:"
 msgstr "recherche d'éléments à synchroniser :\n"

-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:2767
+#: netsync.cc:2982
 msgid "certificates"
 msgstr "certificats"

-#: ../netsync.cc:2876
+#: netsync.cc:3095
 #, c-format
 msgid "Cannot find key '%s'"
 msgstr "Impossible de trouver la clef « %s »"

-#: ../netsync.cc:2916
+#: netsync.cc:3135
 #, c-format
 msgid ""
 "include branch pattern contains a quote character:\n"
@@ -3192,7 +3222,7 @@
 "le motif des branches à inclure contient un caractère de citation :\n"
 "%s\n"

-#: ../netsync.cc:2922
+#: netsync.cc:3141
 #, c-format
 msgid ""
 "exclude branch pattern contains a quote character:\n"
@@ -3201,110 +3231,103 @@
 "le motif des branches à exclure contient un caractère de citation :\n"
 "%s\n"

-#: ../netsync.cc:2945 ../netsync.cc:2949
+#: netsync.cc:3173 netsync.cc:3177
 #, c-format
 msgid "network error: %s"
 msgstr "erreur réseau : %s"

-#: ../packet.cc:94
+#: packet.cc:107
 #, c-format
 msgid "file preimage '%s' missing in db"
 msgstr ""

-#: ../packet.cc:95
+#: packet.cc:108
 #, c-format
 msgid "dropping delta '%s' -> '%s'"
 msgstr "supprime le delta « %s » -> « %s »"

-#: ../packet.cc:109
-#, c-format
-msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n"
-msgstr ""
-"fichier reconstruit du delta « %s » -> « %s » a une identité incorrected « %"
-"s »\n"
-
-#: ../packet.cc:138
-#, c-format
-msgid "missing prerequisite revision '%s'\n"
+#: packet.cc:139
+#, fuzzy, c-format
+msgid "missing prerequisite revision '%s'"
 msgstr "la révision préalable « %s » manque\n"

-#: ../packet.cc:139 ../packet.cc:150 ../packet.cc:166 ../packet.cc:174
-#, c-format
-msgid "dropping revision '%s'\n"
+#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175
+#, fuzzy, c-format
+msgid "dropping revision '%s'"
 msgstr "supprime la révision « %s »\n"

-#: ../packet.cc:149
-#, c-format
-msgid "missing prerequisite file '%s'\n"
+#: packet.cc:150
+#, fuzzy, c-format
+msgid "missing prerequisite file '%s'"
 msgstr "le fichier préalable « %s » manque\n"

-#: ../packet.cc:164
-#, c-format
-msgid "missing prerequisite file pre-delta '%s'\n"
-msgstr ""
+#: packet.cc:165
+#, fuzzy, c-format
+msgid "missing prerequisite file pre-delta '%s'"
+msgstr "le fichier préalable « %s » manque\n"

-#: ../packet.cc:172
-#, c-format
-msgid "missing prerequisite file post-delta '%s'\n"
-msgstr ""
+#: packet.cc:173
+#, fuzzy, c-format
+msgid "missing prerequisite file post-delta '%s'"
+msgstr "le fichier préalable « %s » manque\n"

-#: ../packet.cc:200
-#, c-format
-msgid "cert revision '%s' does not exist in db\n"
+#: packet.cc:201
+#, fuzzy, c-format
+msgid "cert revision '%s' does not exist in db"
 msgstr "la révision de certif « %s » n'existe pas dans la base de données\n"

-#: ../packet.cc:202
-#, c-format
-msgid "dropping cert\n"
+#: packet.cc:203
+#, fuzzy, c-format
+msgid "dropping cert"
 msgstr "élimine le certif\n"

-#: ../packet.cc:225
-#, c-format
-msgid "key '%s' is not equal to key '%s' in database\n"
+#: packet.cc:226
+#, fuzzy, c-format
+msgid "key '%s' is not equal to key '%s' in database"
 msgstr ""
 "la clef « %s » n'est pas égale à la clef « %s » dans la base de données\n"

-#: ../packet.cc:349
+#: packet.cc:350
 #, c-format
 msgid "malformed packet"
 msgstr "paquet malformé"

-#: ../packet.cc:449
+#: packet.cc:450
 #, c-format
 msgid "unknown packet type: '%s'"
 msgstr "type de paquet inconnu : « %s »"

-#: ../rcs_file.cc:343
+#: rcs_file.cc:354
 #, c-format
 msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n"
 msgstr ""

-#: ../rcs_file.cc:362
+#: rcs_file.cc:373
 #, c-format
 msgid "parse failure %d:%d: expecting word '%s'\n"
 msgstr ""

-#: ../rcs_file.cc:377
+#: rcs_file.cc:388
 #, c-format
 msgid "parse failure %d:%d: expecting word\n"
 msgstr ""

-#: ../rcs_import.cc:703
-#, c-format
-msgid "parsing RCS file %s\n"
+#: rcs_import.cc:721
+#, fuzzy, c-format
+msgid "parsing RCS file %s"
 msgstr "analyse du fichier RCS %s\n"

-#: ../rcs_import.cc:706
-#, c-format
-msgid "parsed RCS file %s OK\n"
+#: rcs_import.cc:724
+#, fuzzy, c-format
+msgid "parsed RCS file %s OK"
 msgstr "analyse du fichier RCS %s OK\n"

-#: ../rcs_import.cc:895
-#, c-format
-msgid "error reading RCS file %s: %s\n"
+#: rcs_import.cc:913
+#, fuzzy, c-format
+msgid "error reading RCS file %s: %s"
 msgstr "erreur lors de la lecture du fichier RCS %s : %s\n"

-#: ../rcs_import.cc:1192
+#: rcs_import.cc:1210
 #, c-format
 msgid ""
 "%s appears to be a CVS repository root directory\n"
@@ -3314,101 +3337,83 @@
 "essaie d'importer un module à la place, en employent « cvs_import %s/<nomo "
 "module>"

-#: ../rcs_import.cc:1204
+#: rcs_import.cc:1222
 #, c-format
 msgid "need base --branch argument for importing"
 msgstr "il faut un argument --branch come base pour importer"

-#: ../rcs_import.cc:1216
+#: rcs_import.cc:1234
 #, c-format
 msgid "path %s does not exist"
 msgstr "le chemin %s n'existe pas"

-#: ../rcs_import.cc:1251
+#: rcs_import.cc:1269
 msgid "tags"
 msgstr "étiquettes"

-#. This kluge exists because in the 0.24-era monotone databases, several
-#. bad merges still existed in which one side of the merge is an ancestor
-#. of the other side of the merge. In other words, graphs which look like
-#. this:
-#.
-#. a ----------------------> e
-#. \                       /
-#. \---> b -> c -> d ----/
-#.
-#. Such merges confuse the roster-building algorithm, because they should
-#. never have occurred in the first place: a was not a head at the time
-#. of the merge, e should simply have been considered an extension of d.
-#.
-#. So... we drop the a->e edges entirely.
-#.
-#. Note: this kluge drops edges which are a struct superset of those
-#. dropped by a previous kluge ("3-ancestor") so we have removed that
-#. code.
-#: ../revision.cc:700
-#, c-format
-msgid "scanning for bogus merge edges\n"
+#: revision.cc:730
+#, fuzzy, c-format
+msgid "scanning for bogus merge edges"
 msgstr "cherche des fusions bogguées\n"

-#: ../revision.cc:742
+#: revision.cc:772
 #, c-format
-msgid "optimizing out redundant edge %d -> %d\n"
+msgid "optimizing out redundant edge %d -> %d"
 msgstr ""

-#: ../revision.cc:751
-#, c-format
-msgid "failed to eliminate edge %d -> %d\n"
-msgstr ""
+#: revision.cc:781
+#, fuzzy, c-format
+msgid "failed to eliminate edge %d -> %d"
+msgstr "impossible de créer le dossier « %s » pour « %s »"

-#: ../revision.cc:762
-#, c-format
-msgid "rebuilding %d nodes\n"
+#: revision.cc:792
+#, fuzzy, c-format
+msgid "rebuilding %d nodes"
 msgstr "reconstruis %d nœuds\n"

-#: ../revision.cc:967
+#: revision.cc:997
 #, c-format
 msgid "Path %s added to child roster multiple times\n"
 msgstr ""

-#: ../revision.cc:980
+#: revision.cc:1010
 #, c-format
 msgid "Directory for path %s cannot be added, as there is a file in the way\n"
 msgstr ""

-#: ../revision.cc:991
-#, c-format
-msgid "Path %s cannot be added, as there is a directory in the way\n"
+#: revision.cc:1021
+#, fuzzy, c-format
+msgid "Path %s cannot be added, as there is a directory in the way"
 msgstr "Le chemin %s ne peut être ajouté, un dossier fait obstacle\n"

-#: ../revision.cc:994
+#: revision.cc:1024
 #, c-format
 msgid "Path %s added twice with differing content\n"
 msgstr ""

-#: ../revision.cc:1264
+#: revision.cc:1311
 #, c-format
 msgid ""
-"unknown attribute %s on path %s\n"
-"please contact %s so we can work out the right way to migrate this"
+"unknown attribute '%s' on path '%s'\n"
+"please contact %s so we can work out the right way to migrate this\n"
+"(if you just want it to go away, see the switch --drop-attr, but\n"
+"seriously, if you'd like to keep it, we're happy to figure out how)"
 msgstr ""
-"attribut %s inconnu pour le chemin %s\n"
-"veuillez contacter %s pour négocier la meilleure façon pour migrer"

-#: ../revision.cc:1373
-#, c-format
-msgid "converting existing revision graph to new roster-style revisions\n"
+#: revision.cc:1423
+#, fuzzy, c-format
+msgid "converting existing revision graph to new roster-style revisions"
 msgstr ""
 "convertis graphe de révisions présent à des nouvelles révision en style "
 "liste\n"

-#: ../revision.cc:1427
-#, c-format
-msgid "rebuilding revision graph from manifest certs\n"
+#: revision.cc:1478
+#, fuzzy, c-format
+msgid "rebuilding revision graph from manifest certs"
 msgstr ""
 "reconstruit le graphe des révisions à partir des certifs de manifeste\n"

-#: ../revision.cc:1530
+#: revision.cc:1581
 #, c-format
 msgid ""
 "encountered a revision with unknown format, version '%s'\n"
@@ -3419,173 +3424,153 @@
 "je ne comprend que le format version « 1 »\n"
 "il faut une version monotone plus nouvelle pour complèter cette opération"

-#: ../sanity.cc:116
+#: sanity.cc:135
 #, c-format
 msgid "fatal: formatter failed on %s:%d: %s"
 msgstr "fatal : le formatteur a échoué à %s:%d : %s"

-#: ../sanity.cc:190
+#: sanity.cc:209
 msgid "misuse: "
 msgstr "mauvais usage : "

-#: ../sanity.cc:202
+#: sanity.cc:221
 msgid "error: "
 msgstr "erreur :"

-#: ../sanity.cc:210
+#: sanity.cc:229
 #, c-format
 msgid "%s:%d: invariant '%s' violated"
 msgstr "%s:%d : violation de l'invariant « %s »"

-#: ../sanity.cc:223
+#: sanity.cc:242
 #, c-format
 msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"
 msgstr ""
 "%s:%d : l'index « %s » = %d dépasse la capacité du vector « %s » dont la "
 "taille est %d\n"

-#: ../sanity.cc:244
+#: sanity.cc:263
 #, c-format
 msgid "Current work set: %i items\n"
 msgstr "Ensemble de travail actuel: %i objets\n"

-#: ../schema_migration.cc:181
+#: schema_migration.cc:241
 #, c-format
-msgid "failure extracting schema from sqlite_master"
-msgstr "extraction de schéma de sqlite_master échoué"
-
-#: ../schema_migration.cc:217
-#, c-format
 msgid "calculating necessary migration steps"
 msgstr "calcule les étapes à passer pour migrer"

-#: ../schema_migration.cc:227
+#: schema_migration.cc:251
 #, c-format
 msgid "error at transaction BEGIN statement"
 msgstr ""

-#: ../schema_migration.cc:228
+#: schema_migration.cc:252
 #, c-format
 msgid "migrating data"
 msgstr "migration des données"

-#: ../schema_migration.cc:254
+#: schema_migration.cc:278
 #, c-format
 msgid "migration step failed: %s"
 msgstr "l'étape de migration a échoué : %s"

-#: ../schema_migration.cc:268
+#: schema_migration.cc:292
 #, c-format
 msgid "mismatched result of migration, got %s, wanted %s"
 msgstr "discordance de résultats de la migration, reçu %s, voulais %s"

-#: ../schema_migration.cc:271
+#: schema_migration.cc:295
 #, c-format
 msgid "committing changes to database"
 msgstr "confie les changements à la base de données"

-#: ../schema_migration.cc:273
+#: schema_migration.cc:297
 #, c-format
 msgid "failure on COMMIT"
 msgstr "COMMIT échoué"

-#: ../schema_migration.cc:275
+#: schema_migration.cc:299
 #, c-format
 msgid "optimizing database"
 msgstr "optimisation de la base de données"

-#: ../schema_migration.cc:277
+#: schema_migration.cc:301
 #, c-format
 msgid "error vacuuming after migration"
 msgstr ""

-#: ../schema_migration.cc:280
+#: schema_migration.cc:304
 #, c-format
 msgid "error running analyze after migration"
 msgstr "erreur en analysant après la migration"

-#: ../schema_migration.cc:287
+#: schema_migration.cc:311
 #, c-format
 msgid "database schema %s is unknown; cannot perform migration"
 msgstr ""
 "le schéma de la base de données %s est inconnu; impossible d'effectuer la "
 "migration"

-#. We really want 'db migrate' on an up-to-date schema to be a no-op
-#. (no vacuum or anything, even), so that automated scripts can fire
-#. one off optimistically and not have to worry about getting their
-#. administrators to do it by hand.
-#: ../schema_migration.cc:292
-#, c-format
-msgid "no migration performed; database schema already up-to-date at %s\n"
+#: schema_migration.cc:316
+#, fuzzy, c-format
+msgid "no migration performed; database schema already up-to-date at %s"
 msgstr ""
 "aucune migration n'a été effectuée; le schéma de la base de données est déjà "
 "à jour en %s\n"

-#: ../schema_migration.cc:842
+#: schema_migration.cc:866
 #, c-format
 msgid "public and private keys for %s don't match"
 msgstr "la clef publique ou privée « %s » ne correspondent pas l'une a l'autre"

-#: ../schema_migration.cc:845
+#: schema_migration.cc:869
 #, c-format
 msgid "moving key '%s' from database to %s"
 msgstr "déplace la clef « %s » de la base de données à %s"

-#: ../std_hooks.lua:28
+#: std_hooks.lua:31
+msgid "Press enter"
+msgstr ""
+
+#: std_hooks.lua:33
 msgid "Press enter when the subprocess has completed"
 msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé"

-#: ../transforms.cc:510
+#: ui.cc:126
 #, c-format
-msgid "failed to convert string from %s to %s: '%s'"
-msgstr "impossible de convertir la chaîne de %s en %s : « %s »"
-
-#: ../transforms.cc:741 ../transforms.cc:755
-#, c-format
-msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
-msgstr "conversion de %d octets d'UTF-8 en IDNA ACE: %s"
-
-#. xgettext: gibibytes (2^30 bytes)
-#: ../ui.cc:108
-#, c-format
 msgid "%.1f G"
 msgstr "%.1f Gi"

-#. xgettext: mebibytes (2^20 bytes)
-#: ../ui.cc:114
+#: ui.cc:132
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f Mi"

-#. xgettext: kibibytes (2^10 bytes)
-#: ../ui.cc:120
+#: ui.cc:138
 #, c-format
 msgid "%.1f k"
 msgstr "%.1f Ki"

-#. We know that we're going to eventually have 'total' displayed
-#. twice on screen, plus a slash. So we should pad out this field
-#. to that eventual size to avoid spurious re-issuing of the
-#. tick titles as we expand to the goal.
-#. xgettext: bytes
-#: ../ui.cc:137 ../ui.cc:139
+#: ui.cc:151
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"

-#. xgettext: bytes
-#: ../ui.cc:146
+#: ui.cc:156
 #, c-format
 msgid "%d"
 msgstr "%d"

-#: ../ui.cc:369
-#, c-format
+#: ui.cc:423
+msgid "warning: "
+msgstr ""
+
+#: ui.cc:432
+#, fuzzy, c-format
 msgid ""
 "fatal: %s\n"
 "this is almost certainly a bug in monotone.\n"
-"please send this error message, the output of 'monotone --full-version',\n"
+"please send this error message, the output of '%s --full-version',\n"
 "and a description of what you were doing to %s.\n"
 msgstr ""
 "néfaste: %s\n"
@@ -3593,216 +3578,344 @@
 "veuillez envoyer un ce message, ce que « monotone --full-version » affiche\n"
 "et une description de ce que vous vouliez faire à %s.\n"

-#: ../ui.cc:422
-msgid "monotone: "
-msgstr "monotone: "
+#: ui.cc:493
+#, fuzzy, c-format
+msgid "failed to open log file '%s'"
+msgstr "La lecture du fichier d'options « %s » a échouée"

-#: ../update.cc:65
-#, c-format
-msgid "failed to decode boolean testresult cert value '%s'\n"
+#: update.cc:72
+#, fuzzy, c-format
+msgid "failed to decode boolean testresult cert value '%s'"
 msgstr ""
 "ne pouvais pas décoder la valeur booléenne « %s » du certif testresult\n"

-#: ../update.cc:159
+#: update.cc:166
 #, c-format
 msgid "cannot determine branch for update"
 msgstr "impossible de déterminer la branche pour la mise à jour"

-#: ../vocab.cc:68
+#: vocab.cc:65
 #, c-format
 msgid "hex encoded ID '%s' size != %d"
 msgstr ""

-#: ../vocab.cc:72
+#: vocab.cc:69
 #, c-format
 msgid "bad character '%c' in id name '%s'"
 msgstr "caractère invalide « %c » dans le nom de l'id « %s »"

-#: ../vocab.cc:85
+#: vocab.cc:82
 #, c-format
 msgid "bad character '%c' in ace string '%s'"
 msgstr "caractère invalude « %c » dans la chaîne ace « %s »"

-#: ../vocab.cc:99
+#: vocab.cc:96
+#, fuzzy, c-format
+msgid "bad character '%c' in symbol '%s'"
+msgstr "caractère invalide « %c » dans le nom de la clef « %s »"
+
+#: vocab.cc:110
 #, c-format
 msgid "bad character '%c' in cert name '%s'"
 msgstr "caractère invalide « %c » dans le nom du certif « %s »"

-#: ../vocab.cc:112
+#: vocab.cc:123
 #, c-format
 msgid "bad character '%c' in key name '%s'"
 msgstr "caractère invalide « %c » dans le nom de la clef « %s »"

-#: ../vocab.cc:130
+#: vocab.cc:141
 #, c-format
 msgid "Invalid key length of %d bytes"
 msgstr "Longueur de clef invalide de %d octets"

-#: ../vocab.cc:148
+#: vocab.cc:159
 #, c-format
 msgid "Invalid hmac length of %d bytes"
 msgstr "Longueur hmac invalide de %d octets"

-#: ../work.cc:118
+#: work.cc:186
 #, c-format
 msgid "skipping ignorable file %s"
 msgstr "omission du fichier %s qui peut être ignoré"

-#: ../work.cc:127
+#: work.cc:195
 #, c-format
 msgid "skipping %s, already accounted for in workspace"
 msgstr "omission de %s qui existe déjà dans l'espace de travail"

-#: ../work.cc:131
+#: work.cc:199
 #, c-format
 msgid "adding %s to workspace manifest"
 msgstr "ajouter %s au manifeste de l'espace de travail"

-#: ../work.cc:221
+#: work.cc:289
 #, c-format
 msgid "skipping %s, not currently tracked"
 msgstr ""

-#: ../work.cc:231
+#: work.cc:299
 #, c-format
 msgid "cannot remove %s/, it is not empty"
 msgstr "impossible de supprimer %s/, il n'est pas vide"

-#: ../work.cc:242
+#: work.cc:310
 #, c-format
 msgid "dropping %s from workspace manifest"
 msgstr "supprimer %s du manifeste de l'espace de travail"

-#: ../work.cc:305
+#: work.cc:373
 #, c-format
 msgid "destination dir %s/ does not exist in current revision"
 msgstr "le dossier de destination %s/ n'existe pas dans la révision actuelle"

-#: ../work.cc:308
+#: work.cc:376
 #, c-format
 msgid "destination %s is an existing file in current revision"
 msgstr "la destination %s est un fichier qui existe dans la révision actuelle"

-#: ../work.cc:318
+#: work.cc:386
 #, c-format
 msgid "empty path %s is not allowed"
 msgstr "le chemin vide %s n'est pas permit"

-#: ../work.cc:332
+#: work.cc:400
 #, c-format
 msgid "%s does not exist in current revision"
 msgstr "%s n'existe pas dans la révision actuelle"

-#: ../work.cc:335
+#: work.cc:403
 #, c-format
 msgid "destination %s already exists in current revision"
 msgstr "la destination %s existe déjà dans la révision actuelle"

-#: ../work.cc:344
+#: work.cc:412
 #, c-format
 msgid "renaming %s to %s in workspace manifest"
 msgstr "renomme %s à %s dans le manifeste de l'espace de travail"

-#: ../work.cc:369
+#: work.cc:437
 #, c-format
 msgid "%s doesn't exist in workspace, skipping"
 msgstr "omission de %s qui n'existe pas dans la copie de travail"

-#: ../work.cc:373
+#: work.cc:441
 #, c-format
 msgid "destination %s already exists in workspace, skipping"
 msgstr "omission de %s qui existe déjà dans la copie de travail"

-#: ../work.cc:400
+#: work.cc:468
 #, c-format
 msgid "proposed new root directory '%s' is not versioned or does not exist"
 msgstr ""

-#: ../work.cc:402
+#: work.cc:470
 #, c-format
 msgid "proposed new root directory '%s' is not a directory"
 msgstr "la nouvelle racine proposé « %s » n'est pas un dossier"

-#: ../work.cc:407
+#: work.cc:475
 #, c-format
 msgid "proposed new root directory '%s' contains illegal path %s"
 msgstr "la nouvelle racine proposé « %s » contient le chemin illégal %s"

-#: ../work.cc:417
+#: work.cc:485
 #, c-format
 msgid "directory '%s' is not versioned or does not exist"
 msgstr "le dossier « %s » n'est pas versioné ou n'existe pas"

-#: ../work.cc:423
+#: work.cc:491
 #, c-format
 msgid "'%s' is in the way"
 msgstr "« %s » fait obstacle"

-#: ../work.cc:520
+#: work.cc:586
 #, c-format
 msgid "workspace is corrupt: %s does not exist"
 msgstr "l'espace de travail est corrompu : %s n'existe pas"

-#: ../work.cc:521
+#: work.cc:587
 #, c-format
 msgid "workspace is corrupt: %s is a directory"
 msgstr "l'espace de travail est corrompue : %s est un dossier"

-#: ../work.cc:531
+#: work.cc:597
 #, c-format
 msgid "Problem with workspace: %s is unreadable"
 msgstr "Problème avec l'espace de travail: %s n'est pas lisible"

-#: ../work.cc:557
-#, c-format
-msgid "base revision %s does not exist in database\n"
+#: work.cc:623
+#, fuzzy, c-format
+msgid "base revision %s does not exist in database"
 msgstr "la révision de base %s n'existe pas dans la base de données\n"

-#: ../work.cc:894
+#: work.cc:932
 #, c-format
 msgid "dropping %s"
 msgstr "supprime %s"

-#: ../work.cc:905 ../work.cc:916
+#: work.cc:943 work.cc:954
 #, c-format
 msgid "path %s already exists"
 msgstr "le chemin %s existe déjà"

-#: ../work.cc:938 ../work.cc:965
+#: work.cc:976 work.cc:1003
 #, c-format
 msgid "adding %s"
 msgstr "ajout de %s"

-#: ../work.cc:954
+#: work.cc:992
 #, c-format
 msgid "path '%s' already exists, cannot create"
 msgstr "le chemin « %s » existe déjà, ne peux pas le créer"

-#: ../work.cc:961
+#: work.cc:999
 #, c-format
 msgid "renaming %s to %s"
 msgstr "renommage de %s en %s"

-#: ../work.cc:996
+#: work.cc:1034
 #, c-format
 msgid "file '%s' does not exist"
 msgstr "le fichier « %s » n'existe pas"

-#: ../work.cc:997
+#: work.cc:1035
 #, c-format
 msgid "file '%s' is a directory"
 msgstr "le fichier « %s » est un dossier"

-#: ../work.cc:1002
+#: work.cc:1040
 #, c-format
 msgid "content of file '%s' has changed, not overwriting"
 msgstr "le contenu du fichier « %s » a changé, il ne sera pas écrasé"

-#: ../work.cc:1003
-#, c-format
-msgid "updating %s to %s"
+#: work.cc:1041
+#, fuzzy, c-format
+msgid "updating %s"
 msgstr "mise à jour de %s en %s"

+#~ msgid "unknown path '%s'\n"
+#~ msgstr "chemin inconnu « %s »\n"
+
+#~ msgid "negative or zero last not allowed\n"
+#~ msgstr "« last » négative ou zéro interdite\n"
+
+#~ msgid "negative or zero next not allowed\n"
+#~ msgstr "« next » négative ou zéro interdite\n"
+
+#~ msgid "branch '%s' is empty\n"
+#~ msgstr "la branche « %s » est vide\n"
+
+#~ msgid "Unknown file '%s' for log command"
+#~ msgstr "Fichier « %s » inconnu donnée à la commande log"
+
+#, fuzzy
+#~ msgid ""
+#~ "interface_version\n"
+#~ "heads [BRANCH]\n"
+#~ "ancestors REV1 [REV2 [REV3 [...]]]\n"
+#~ "attributes [FILE]\n"
+#~ "parents REV\n"
+#~ "descendents REV1 [REV2 [REV3 [...]]]\n"
+#~ "children REV\n"
+#~ "graph\n"
+#~ "erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n"
+#~ "toposort [REV1 [REV2 [REV3 [...]]]]\n"
+#~ "ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n"
+#~ "leaves\n"
+#~ "inventory\n"
+#~ "stdio\n"
+#~ "certs REV\n"
+#~ "select SELECTOR\n"
+#~ "get_file FILEID\n"
+#~ "get_manifest_of [REVID]\n"
+#~ "get_revision [REVID]\n"
+#~ "packet_for_rdata REVID\n"
+#~ "packets_for_certs REVID\n"
+#~ "packet_for_fdata FILEID\n"
+#~ "packet_for_fdelta OLD_FILE NEW_FILE\n"
+#~ "keys\n"
+#~ msgstr ""
+#~ "interface_version\n"
+#~ "heads [BRANCHE]\n"
+#~ "ancestors RÉV1 [RÉV2 [RÉV3 [...]]]\n"
+#~ "attributes [FICHIER]\n"
+#~ "parents RÉV\n"
+#~ "descendents RÉV1 [RÉV2 [RÉV3 [...]]]\n"
+#~ "children RÉV\n"
+#~ "graph\n"
+#~ "erase_ancestors [RÉV1 [RÉV2 [RÉV3 [...]]]]\n"
+#~ "toposort [RÉV1 [RÉV2 [RÉV3 [...]]]]\n"
+#~ "ancestry_difference NOUVELLE_RÉV [ANCIENNE_RÉV1 [ANCIENNE_RÉV2 [...]]]\n"
+#~ "leaves\n"
+#~ "inventory\n"
+#~ "stdio\n"
+#~ "certs RÉV\n"
+#~ "select SELECTEUR\n"
+#~ "get_file ID_FICHIER\n"
+#~ "get_manifest_of [ID_RÉV]\n"
+#~ "get_revision [ID_RÉV]\n"
+#~ "keys\n"
+
+#~ msgid ""
+#~ "sqlite error: %d: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "erreur sqlite : %d : %s\n"
+#~ "%s"
+
+#~ msgid "expected file '%s', but it is a directory."
+#~ msgstr "le fichier « %s » ne peut être lu; c'est un dossier"
+
+#~ msgid "lua error while loading '%s'"
+#~ msgstr "erreur lua lors du chargement de « %s »"
+
+#~ msgid "rcfile '%s' does not exist"
+#~ msgstr "le fichier rc « %s » n'existe pas"
+
+#~ msgid "use least common ancestor as ancestor for merge"
+#~ msgstr "emploi le plus petit ancêtre commun comme ancêtre pour la fusion"
+
+#~ msgid ""
+#~ "Running on: %s\n"
+#~ "Changes since base revision: %s\n"
+#~ msgstr ""
+#~ "En cours d'exécution sur : %s\n"
+#~ "Changements depuis la révision de base : %s\n"
+
+#~ msgid "revision '%s' does not exist in our database"
+#~ msgstr "la révision « %s » n'existe pas dans notre base de données"
+
+#~ msgid "file '%s' does not exist in our database"
+#~ msgstr "le fichier « %s » n'existe pas dans notre base de données"
+
+#~ msgid "cert '%s' does not exist in our database"
+#~ msgstr "le certif « %s » n'existe pas dans notre base de données"
+
+#~ msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n"
+#~ msgstr ""
+#~ "fichier reconstruit du delta « %s » -> « %s » a une identité incorrected "
+#~ "« %s »\n"
+
+#~ msgid ""
+#~ "unknown attribute %s on path %s\n"
+#~ "please contact %s so we can work out the right way to migrate this"
+#~ msgstr ""
+#~ "attribut %s inconnu pour le chemin %s\n"
+#~ "veuillez contacter %s pour négocier la meilleure façon pour migrer"
+
+#~ msgid "failure extracting schema from sqlite_master"
+#~ msgstr "extraction de schéma de sqlite_master échoué"
+
+#~ msgid "failed to convert string from %s to %s: '%s'"
+#~ msgstr "impossible de convertir la chaîne de %s en %s : « %s »"
+
+#~ msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
+#~ msgstr "conversion de %d octets d'UTF-8 en IDNA ACE: %s"
+
+#~ msgid "monotone: "
+#~ msgstr "monotone: "
+
 #~ msgid "OLDID NEWID"
 #~ msgstr "ANCIENID NOUVELID"

@@ -3923,9 +4036,6 @@
 #~ "trying 3-way merge\n"
 #~ msgstr "aucun ancêtre commun n'a été trouvé"

-#~ msgid "no such file '%s' in revision '%s'\n"
-#~ msgstr "aucun fichier « %s » dans la révision « %s »\n"
-
 #, fuzzy
 #~ msgid "checking %d files\n"
 #~ msgstr "la vérification de « %s » a échouée"
@@ -4259,12 +4369,5 @@
 #~ msgid "Running on: %s"
 #~ msgstr "Fonctionne sur : %s"

-#~ msgid ""
-#~ "sqlite error: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "erreur sqlite : %s\n"
-#~ "%s"
-
 #~ msgid "network error: %s\n"
 #~ msgstr "erreur réseau : %s\n"
============================================================
--- po/it.po	c43792e1289e6d6c8c2bbad030afab28d7700978
+++ po/it.po	008d67cc9a07706ebfd8fe0e0672d21ae55f29cf
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: monotone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 13:57+0200\n"
+"POT-Creation-Date: 2006-07-05 22:56-0700\n"
 "PO-Revision-Date: 2006-06-24 12:35+0100\n"
 "Last-Translator: Lapo Luchini <address@hidden>\n"
 "Language-Team: Lapo Luchini <address@hidden>\n"
@@ -101,8 +101,7 @@
 msgid "calculated cert hash '%s' does not match '%s'"
 msgstr "l'hash calcolato sul certificato è ‘%s’, non corrisponde a ‘%s’"

-#: cert.cc:379
-#: keys.cc:554
+#: cert.cc:379 keys.cc:554
 #, c-format
 msgid "no key pair '%s' found in key store '%s'"
 msgstr "la coppia di chiavi ‘%s’ non è nel portachiavi ‘%s’"
@@ -128,17 +127,23 @@
 #: cert.cc:478
 #, c-format
 msgid "no branch found for empty revision, please provide a branch name"
-msgstr "nessun ramo trovato per revisione vuota, per favore fornisci un nome di ramo"
+msgstr ""
+"nessun ramo trovato per revisione vuota, per favore fornisci un nome di ramo"

 #: cert.cc:487
 #, c-format
 msgid "no branch certs found for revision %s, please provide a branch name"
-msgstr "nessun certificato di ramo trovato per la revisione %s, per favore inserisci un nome di ramo"
+msgstr ""
+"nessun certificato di ramo trovato per la revisione %s, per favore inserisci "
+"un nome di ramo"

 #: cert.cc:491
 #, c-format
-msgid "multiple branch certs found for revision %s, please provide a branch name"
-msgstr "trovati certificati con rami multipli per la revisione %s, per favore inserisci il nome di un ramo"
+msgid ""
+"multiple branch certs found for revision %s, please provide a branch name"
+msgstr ""
+"trovati certificati con rami multipli per la revisione %s, per favore "
+"inserisci il nome di un ramo"

 #: cmd_automate.cc:205
 #, c-format
@@ -150,22 +155,16 @@
 msgid "Bad input to automate stdio"
 msgstr "Input non valido per ‘automate stdio’"

-#: cmd_automate.cc:296
+#: cmd_automate.cc:301
 msgid "automation"
 msgstr "automazione"

-#: cmd_automate.cc:297
+#: cmd_automate.cc:302
 msgid "automation interface"
 msgstr "interfaccia di automazione"

-#: cmd_db.cc:35
-#: cmd_diff_log.cc:404
-#: cmd_diff_log.cc:435
-#: cmd_diff_log.cc:437
-#: cmd_files.cc:102
-#: cmd_files.cc:164
-#: cmd_merging.cc:123
-#: cmd_ws_commit.cc:446
+#: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:435 cmd_diff_log.cc:437
+#: cmd_files.cc:102 cmd_files.cc:164 cmd_merging.cc:123 cmd_ws_commit.cc:446
 #: commands.cc:370
 #, c-format
 msgid "no such revision '%s'"
@@ -221,8 +220,7 @@
 msgid "The epoch must be %s characters"
 msgstr "L'epoca deve essere di %s caratteri"

-#: cmd_db.cc:119
-#: cmd_db.cc:135
+#: cmd_db.cc:119 cmd_db.cc:135
 msgid "vars"
 msgstr "variabili"

@@ -232,7 +230,8 @@

 #: cmd_db.cc:120
 msgid "set the database variable NAME to VALUE, in domain DOMAIN"
-msgstr "imposta la variabile NOME del database come VALORE, nel dominio DOMINIO"
+msgstr ""
+"imposta la variabile NOME del database come VALORE, nel dominio DOMINIO"

 #: cmd_db.cc:135
 msgid "DOMAIN NAME"
@@ -247,14 +246,8 @@
 msgid "no var with name %s in domain %s"
 msgstr "nessuna variabile ha nome ‘%s’ nel dominio ‘%s’"

-#: cmd_db.cc:152
-#: cmd_diff_log.cc:348
-#: cmd_diff_log.cc:558
-#: cmd_files.cc:78
-#: cmd_files.cc:145
-#: cmd_list.cc:437
-#: cmd_merging.cc:569
-#: cmd_ws_commit.cc:322
+#: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:558 cmd_files.cc:78
+#: cmd_files.cc:145 cmd_list.cc:437 cmd_merging.cc:569 cmd_ws_commit.cc:322
 #: commands.cc:246
 msgid "informative"
 msgstr "informativo"
@@ -272,12 +265,8 @@
 msgid "non-hex digits in partial id"
 msgstr "cifre non decimali nell'ID parziale"

-#: cmd_diff_log.cc:348
-#: cmd_ws_commit.cc:53
-#: cmd_ws_commit.cc:224
-#: cmd_ws_commit.cc:251
-#: cmd_ws_commit.cc:322
-#: cmd_ws_commit.cc:613
+#: cmd_diff_log.cc:348 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224
+#: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:613
 msgid "[PATH]..."
 msgstr "[PERCORSO…]"

@@ -313,18 +302,19 @@
 msgstr "[FILE…]"

 #: cmd_diff_log.cc:559
-msgid "print history in reverse order (filtering by 'FILE'). If one or more revisions are given, use them as a starting point."
-msgstr "stampa lo storico in ordine contrario (filtrando per ‘FILE’). Se sono specificate una o più revisioni, usa quelle come punto di partenza."
+msgid ""
+"print history in reverse order (filtering by 'FILE'). If one or more "
+"revisions are given, use them as a starting point."
+msgstr ""
+"stampa lo storico in ordine contrario (filtrando per ‘FILE’). Se sono "
+"specificate una o più revisioni, usa quelle come punto di partenza."

 #: cmd_diff_log.cc:621
 #, c-format
 msgid "only one of --last/--next allowed"
 msgstr "solo un comando permesso tra ‘--last’ e ‘--next’"

-#: cmd_files.cc:28
-#: cmd_files.cc:41
-#: cmd_files.cc:121
-#: cmd_merging.cc:634
+#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:771
 #: cmd_othervcs.cc:15
 msgid "debug"
 msgstr "debug"
@@ -400,8 +390,7 @@
 msgid "write file from database to stdout"
 msgstr "copia un file dal database a stdout"

-#: cmd_files.cc:176
-#: cmd_files.cc:178
+#: cmd_files.cc:176 cmd_files.cc:178
 #, c-format
 msgid "no file '%s' found in revision '%s'"
 msgstr "nessun file ‘%s’ trovato nella revisione %s"
@@ -426,17 +415,12 @@
 msgid "expanded partial id '%s' to '%s'"
 msgstr "id parziale ‘%s’ espanso in ‘%s’"

-#: cmd_key_cert.cc:26
-#: cmd_key_cert.cc:52
-#: cmd_key_cert.cc:92
-#: cmd_key_cert.cc:113
-#: cmd_key_cert.cc:149
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
+#: cmd_key_cert.cc:113 cmd_key_cert.cc:149
 msgid "key and cert"
 msgstr "chiavi e cert"

-#: cmd_key_cert.cc:26
-#: cmd_key_cert.cc:52
-#: cmd_key_cert.cc:92
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
 msgid "KEYID"
 msgstr "IDCHIAVE"

@@ -476,12 +460,18 @@
 #: cmd_key_cert.cc:84
 #, c-format
 msgid "public or private key '%s' does not exist in keystore or database"
-msgstr "o la chiave pubblica o quella privata ‘%s’ non esiste nel portachiavi o nel database"
+msgstr ""
+"o la chiave pubblica o quella privata ‘%s’ non esiste nel portachiavi o nel "
+"database"

 #: cmd_key_cert.cc:87
 #, c-format
-msgid "public or private key '%s' does not exist in keystore, and no database was specified"
-msgstr "o la chiave pubblica o quella privata ‘%s’ non esiste nel portachiavi, e nessun database è stato specificato"
+msgid ""
+"public or private key '%s' does not exist in keystore, and no database was "
+"specified"
+msgstr ""
+"o la chiave pubblica o quella privata ‘%s’ non esiste nel portachiavi, e "
+"nessun database è stato specificato"

 #: cmd_key_cert.cc:93
 msgid "change passphrase of a private RSA key"
@@ -540,11 +530,8 @@
 msgid "UNtrusted"
 msgstr "NON fidato"

-#: cmd_key_cert.cc:196
-#: cmd_key_cert.cc:209
-#: cmd_key_cert.cc:222
-#: cmd_key_cert.cc:238
-#: cmd_ws_commit.cc:171
+#: cmd_key_cert.cc:196 cmd_key_cert.cc:209 cmd_key_cert.cc:222
+#: cmd_key_cert.cc:238 cmd_ws_commit.cc:171
 msgid "review"
 msgstr "verifica"

@@ -565,8 +552,7 @@
 msgid "note the results of running a test on a revision"
 msgstr "annota i risultati dell'esecuzione di un test su una revisione"

-#: cmd_key_cert.cc:222
-#: cmd_ws_commit.cc:171
+#: cmd_key_cert.cc:222 cmd_ws_commit.cc:171
 msgid "REVISION"
 msgstr "REVISIONE"

@@ -597,8 +583,7 @@
 msgid "empty comment"
 msgstr "commento vuoto"

-#: cmd_list.cc:64
-#: cmd_list.cc:655
+#: cmd_list.cc:64 cmd_list.cc:655
 #, c-format
 msgid "no public key '%s' found in database"
 msgstr "la chiave pubblica ‘%s’ non è nel database"
@@ -693,14 +678,9 @@
 msgid "No such revision %s"
 msgstr "La revisione %s non esiste"

-#: cmd_merging.cc:53
-#: cmd_ws_commit.cc:53
-#: cmd_ws_commit.cc:224
-#: cmd_ws_commit.cc:251
-#: cmd_ws_commit.cc:278
-#: cmd_ws_commit.cc:303
-#: cmd_ws_commit.cc:515
-#: cmd_ws_commit.cc:613
+#: cmd_merging.cc:53 cmd_merging.cc:610 cmd_ws_commit.cc:53
+#: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278
+#: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613
 msgid "workspace"
 msgstr "spazio di lavoro"

@@ -714,14 +694,17 @@
 msgstr ""
 "aggiorna spazio di lavoro.\n"
 "Questo comando modifica il tuo spazio di lavoro affinché sia basato su di\n"
-"una differente versione, preservando nel contempo i cambiamenti non sottomessi.\n"
-"Se è specificata una revisione, aggiorna lo spazio di lavoro a quella revisione.\n"
+"una differente versione, preservando nel contempo i cambiamenti non "
+"sottomessi.\n"
+"Se è specificata una revisione, aggiorna lo spazio di lavoro a quella "
+"revisione.\n"
 "Altrimenti aggiorna lo spazio di lavoro alla testa del ramo."

 #: cmd_merging.cc:97
 #, c-format
 msgid "this workspace is a new project; cannot update"
-msgstr "questo spazio di lavoro è un nuovo progetto, non posso fare un ‘update’"
+msgstr ""
+"questo spazio di lavoro è un nuovo progetto, non posso fare un ‘update’"

 #: cmd_merging.cc:101
 #, c-format
@@ -802,13 +785,8 @@
 msgid "updated to base revision %s"
 msgstr "aggiorno alla revisione base %s"

-#: cmd_merging.cc:299
-#: cmd_merging.cc:352
-#: cmd_merging.cc:363
-#: cmd_merging.cc:523
-#: cmd_merging.cc:610
-#: cmd_ws_commit.cc:385
-#: cmd_ws_commit.cc:851
+#: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523
+#: cmd_merging.cc:747 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851
 #: cmd_ws_commit.cc:872
 msgid "tree"
 msgstr "albero"
@@ -817,16 +795,12 @@
 msgid "merge unmerged heads of branch"
 msgstr "fa il ‘merge’ delle teste di un ramo"

-#: cmd_merging.cc:308
-#: cmd_merging.cc:618
+#: cmd_merging.cc:308 cmd_merging.cc:755
 #, c-format
 msgid "please specify a branch, with --branch=BRANCH"
 msgstr "specifica un ramo, con --branch=BRANCH"

-#: cmd_merging.cc:312
-#: cmd_merging.cc:402
-#: cmd_merging.cc:405
-#: cmd_merging.cc:623
+#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:760
 #: cmd_ws_commit.cc:430
 #, c-format
 msgid "branch '%s' is empty"
@@ -847,18 +821,13 @@
 msgid "merging with revision %d / %d"
 msgstr "‘merge’ con la revisione %d / %d"

-#: cmd_merging.cc:328
-#: cmd_merging.cc:329
-#: cmd_merging.cc:412
-#: cmd_merging.cc:547
+#: cmd_merging.cc:328 cmd_merging.cc:329 cmd_merging.cc:412 cmd_merging.cc:547
 #: cmd_merging.cc:548
 #, c-format
 msgid "[source] %s"
 msgstr "[sorgente] %s"

-#: cmd_merging.cc:346
-#: cmd_merging.cc:519
-#: cmd_merging.cc:566
+#: cmd_merging.cc:346 cmd_merging.cc:519 cmd_merging.cc:566
 #, c-format
 msgid "[merged] %s"
 msgstr "[unione] %s"
@@ -884,8 +853,7 @@
 msgid "merge one branch into a subdirectory in another branch"
 msgstr "‘merge’ di un ramo in una sottodirectory di un altro ramo"

-#: cmd_merging.cc:403
-#: cmd_merging.cc:406
+#: cmd_merging.cc:403 cmd_merging.cc:406
 #, c-format
 msgid "branch '%s' is not merged"
 msgstr "il ramo ‘%s’ è separato"
@@ -926,15 +894,16 @@

 #: cmd_merging.cc:525
 msgid "merge two explicitly given revisions, placing result in given branch"
-msgstr "unisce due revisioni specificate, mettendo il risultato in un ramo specificato"
+msgstr ""
+"unisce due revisioni specificate, mettendo il risultato in un ramo "
+"specificato"

 #: cmd_merging.cc:540
 #, c-format
 msgid "%s and %s are the same revision, aborting"
 msgstr "%s e %s sono la stessa revisione, annullo"

-#: cmd_merging.cc:542
-#: cmd_merging.cc:544
+#: cmd_merging.cc:542 cmd_merging.cc:544
 #, c-format
 msgid "%s is already an ancestor of %s"
 msgstr "%s è già antenato di %s"
@@ -944,11 +913,13 @@
 msgstr "REV REV"

 #: cmd_merging.cc:570
-msgid "Show what conflicts would need to be resolved to merge the given revisions."
-msgstr "Mostra quali conflitti andrebbero risolto per fare il ‘merge’ di due revisioni specificate."
+msgid ""
+"Show what conflicts would need to be resolved to merge the given revisions."
+msgstr ""
+"Mostra quali conflitti andrebbero risolto per fare il ‘merge’ di due "
+"revisioni specificate."

-#: cmd_merging.cc:580
-#: cmd_merging.cc:582
+#: cmd_merging.cc:580 cmd_merging.cc:582
 #, c-format
 msgid "%s is an ancestor of %s; no merge is needed."
 msgstr "‘%s’ è un antenato di ‘%s’: il merge non è necessario."
@@ -983,25 +954,55 @@
 msgid "There are %s directory_loop_conflicts."
 msgstr "Ci sono %s conflitti di tipo directory_loop_conflicts."

-#: cmd_merging.cc:610
+#: cmd_merging.cc:611
+msgid ""
+"cherrypick changes from other parts of history into workspace.\n"
+"This command takes arbitrary changes made at any point in history,\n"
+"and applies them to your current workspace, as if you had made the\n"
+"edits by hand.\n"
+"If one revision is given, applies the changes made in that revision\n"
+"compared to its parent.\n"
+"If two revisions are given, applies the changes made to get from the\n"
+"first revision to the second."
+msgstr ""
+
+#: cmd_merging.cc:632
+#, c-format
+msgid ""
+"revision %s is a merge\n"
+"to apply the changes relative to one of its parents, use:\n"
+"  %s cherrypatch -r PARENT -r %s"
+msgstr ""
+
+#: cmd_merging.cc:649
+#, fuzzy, c-format
+msgid "no changes to apply"
+msgstr "nessuna modifica da salvare"
+
+#: cmd_merging.cc:740
+#, fuzzy, c-format
+msgid "applied changes to workspace"
+msgstr "aggiunge file allo spazio di lavoro"
+
+#: cmd_merging.cc:747
 msgid "show unmerged head revisions of branch"
 msgstr "mostra le revisioni delle teste separate di un ramo"

-#: cmd_merging.cc:625
+#: cmd_merging.cc:762
 #, c-format
 msgid "branch '%s' is currently merged:"
 msgstr "il ramo ‘%s’ è attualmente unito:"

-#: cmd_merging.cc:627
+#: cmd_merging.cc:764
 #, c-format
 msgid "branch '%s' is currently unmerged:"
 msgstr "il ramo ‘%s’ è attualmente separato:"

-#: cmd_merging.cc:634
+#: cmd_merging.cc:771
 msgid "REVID"
 msgstr "ID_REV"

-#: cmd_merging.cc:635
+#: cmd_merging.cc:772
 msgid "dump the roster associated with the given REVID"
 msgstr "stampa il roster associato al REVID dato"

@@ -1020,8 +1021,7 @@
 msgid "no server given and no default server set"
 msgstr "nessun server specificato e nessun server di default impostato"

-#: cmd_netsync.cc:59
-#: cmd_netsync.cc:79
+#: cmd_netsync.cc:59 cmd_netsync.cc:79
 #, c-format
 msgid "no branch pattern given"
 msgstr "nessun pattern di ramo specificato"
@@ -1039,37 +1039,38 @@
 #: cmd_netsync.cc:81
 #, c-format
 msgid "no branch pattern given and no default pattern set"
-msgstr "nessun pattern di ramo specificato e nessun pattern di default impostato"
+msgstr ""
+"nessun pattern di ramo specificato e nessun pattern di default impostato"

-#: cmd_netsync.cc:97
-#: cmd_netsync.cc:112
-#: cmd_netsync.cc:126
-#: cmd_netsync.cc:173
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 cmd_netsync.cc:173
 msgid "network"
 msgstr "rete"

-#: cmd_netsync.cc:97
-#: cmd_netsync.cc:112
-#: cmd_netsync.cc:126
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126
 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
 msgstr "[INDIRIZZO[:NUMERO_PORTA] [PATTERN]]"

 #: cmd_netsync.cc:98
 msgid "push branches matching PATTERN to netsync server at ADDRESS"
-msgstr "invia i rami che corrispondono a PATTERN al server netsync presso INDIRIZZO"
+msgstr ""
+"invia i rami che corrispondono a PATTERN al server netsync presso INDIRIZZO"

 #: cmd_netsync.cc:113
 msgid "pull branches matching PATTERN from netsync server at ADDRESS"
-msgstr "riceve i rami che corrispondono a PATTERN dal server netsync presso INDIRIZZO"
+msgstr ""
+"riceve i rami che corrispondono a PATTERN dal server netsync presso INDIRIZZO"

 #: cmd_netsync.cc:120
 #, c-format
 msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
-msgstr "eseguo ‘pull’ anonimo; utilizza ‘-k NOMECHIAVE’ se necessiti di autenticazione"
+msgstr ""
+"eseguo ‘pull’ anonimo; utilizza ‘-k NOMECHIAVE’ se necessiti di "
+"autenticazione"

 #: cmd_netsync.cc:127
 msgid "sync branches matching PATTERN with netsync server at ADDRESS"
-msgstr "sync dei rami che corrispondono a PATTERN con server netsync presso INDIRIZZO"
+msgstr ""
+"sync dei rami che corrispondono a PATTERN con server netsync presso INDIRIZZO"

 #: cmd_netsync.cc:149
 #, c-format
@@ -1091,12 +1092,16 @@

 #: cmd_netsync.cc:189
 #, c-format
-msgid "need permission to store persistent passphrase (see hook persist_phrase_ok())"
-msgstr "è necessario un permesso per ricordare la passphrase (vedi hook ‘persist_phrase_ok()’)"
+msgid ""
+"need permission to store persistent passphrase (see hook persist_phrase_ok())"
+msgstr ""
+"è necessario un permesso per ricordare la passphrase (vedi hook "
+"‘persist_phrase_ok()’)"

 #: cmd_netsync.cc:195
 #, c-format
-msgid "The --no-transport-auth option is only permitted in combination with --stdio"
+msgid ""
+"The --no-transport-auth option is only permitted in combination with --stdio"
 msgstr ""

 #: cmd_othervcs.cc:15
@@ -1106,7 +1111,8 @@
 #: cmd_othervcs.cc:16
 msgid ""
 "parse versions in RCS files\n"
-"this command doesn't reconstruct or import revisions.you probably want cvs_import"
+"this command doesn't reconstruct or import revisions.you probably want "
+"cvs_import"
 msgstr ""

 #: cmd_othervcs.cc:32
@@ -1121,14 +1127,11 @@
 msgid "import all versions in CVS repository"
 msgstr "importa tutte le versioni di un repository CVS"

-#: cmd_packet.cc:21
-#: cmd_packet.cc:50
-#: cmd_packet.cc:69
+#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69
 msgid "packet i/o"
 msgstr "i/o pacchetti"

-#: cmd_packet.cc:21
-#: cmd_packet.cc:50
+#: cmd_packet.cc:21 cmd_packet.cc:50
 msgid "ID"
 msgstr "ID"

@@ -1275,10 +1278,10 @@
 "estrae una revisione dal database in una directory.\n"
 "Se viene specificata una revisione, sarà quella ad essere estratta.\n"
 "Altrimenti sarà la testa del ramo (specificato o implicito).\n"
-"Se nessuna directory è specificata, il nome del ramo sarà usato come directory"
+"Se nessuna directory è specificata, il nome del ramo sarà usato come "
+"directory"

-#: cmd_ws_commit.cc:406
-#: cmd_ws_commit.cc:425
+#: cmd_ws_commit.cc:406 cmd_ws_commit.cc:425
 #, c-format
 msgid "need --branch argument for branch-based checkout"
 msgstr "c'è bisogno di un parametro --branch per estrarre un ramo specifico"
@@ -1286,7 +1289,8 @@
 #: cmd_ws_commit.cc:419
 #, c-format
 msgid "checkout directory '%s' already exists"
-msgstr "la directory ‘%s’ esiste già, non può essere utilizzata per il ‘checkout’"
+msgstr ""
+"la directory ‘%s’ esiste già, non può essere utilizzata per il ‘checkout’"

 #: cmd_ws_commit.cc:433
 #, c-format
@@ -1368,7 +1372,8 @@
 "perhaps move or delete _MTN/log,\n"
 "or remove --message/--message-file from the command line?"
 msgstr ""
-"‘_MTN/log’ non è vuoto e un messaggio di log è stato specificato sulla riga di comando\n"
+"‘_MTN/log’ non è vuoto e un messaggio di log è stato specificato sulla riga "
+"di comando\n"
 "forse vuoi muovere o cancellare ‘_MTN/log’ oppure\n"
 "togliere ‘--message’/‘--message-file’ dalla riga di comando?"

@@ -1387,8 +1392,7 @@
 msgid "revision %s already in database"
 msgstr "la revisione %s è già nel database"

-#: cmd_ws_commit.cc:754
-#: cmd_ws_commit.cc:784
+#: cmd_ws_commit.cc:754 cmd_ws_commit.cc:784
 #, c-format
 msgid "file '%s' modified during commit, aborting"
 msgstr "file ‘%s’ modificato durante il commit, abbandono"
@@ -1418,7 +1422,9 @@

 #: cmd_ws_commit.cc:852
 msgid "setup a new workspace directory, default to current"
-msgstr "imposta una nuova directory come spazio di lavoro, il default è quella attuale"
+msgstr ""
+"imposta una nuova directory come spazio di lavoro, il default è quella "
+"attuale"

 #: cmd_ws_commit.cc:858
 #, c-format
@@ -1429,10 +1435,10 @@
 msgid "refresh the inodeprint cache"
 msgstr "aggiorna la cache degli inodeprint"

-#: commands.cc:124
+#: commands.cc:124 commands.cc:225
 #, c-format
-msgid "unknown command '%s'\n"
-msgstr "comando ‘%s’ sconosciuto\n"
+msgid "unknown command '%s'"
+msgstr "comando ‘%s’ sconosciuto"

 #: commands.cc:135
 #, c-format
@@ -1443,11 +1449,6 @@
 msgid "commands:"
 msgstr "comandi:"

-#: commands.cc:225
-#, c-format
-msgid "unknown command '%s'"
-msgstr "comando ‘%s’ sconosciuto"
-
 #: commands.cc:246
 msgid "command [ARGS...]"
 msgstr "comando [ARGOMENTI…]"
@@ -1511,9 +1512,7 @@
 msgid "markings"
 msgstr "contrassegni"

-#: database_check.cc:338
-#: netsync.cc:2980
-#: rcs_import.cc:1244
+#: database_check.cc:338 netsync.cc:2980 rcs_import.cc:1244
 msgid "revisions"
 msgstr "revisioni"

@@ -1521,8 +1520,7 @@
 msgid "ancestry"
 msgstr "ascendenza"

-#: database_check.cc:470
-#: netsync.cc:2984
+#: database_check.cc:470 netsync.cc:2984
 msgid "keys"
 msgstr "chiavi"

@@ -1559,7 +1557,8 @@
 #: database_check.cc:581
 #, c-format
 msgid "roster %s is not parseable (perhaps with unnormalized paths?)"
-msgstr "roster ‘%s’ non comprensibile (forse a causa di percorsi non normalizzati)"
+msgstr ""
+"roster ‘%s’ non comprensibile (forse a causa di percorsi non normalizzati)"

 #: database_check.cc:588
 #, c-format
@@ -1568,8 +1567,13 @@

 #: database_check.cc:613
 #, c-format
-msgid "revision %s missing (%d revision references; %d cert references; %d parent references; %d child references; %d roster references)"
-msgstr "revisione %s mancante (%d riferimenti alla revisione; %d riferimenti al certificato; %d riferimenti al genitore; %d riferimenti al figlio; %d riferimenti al roster)"
+msgid ""
+"revision %s missing (%d revision references; %d cert references; %d parent "
+"references; %d child references; %d roster references)"
+msgstr ""
+"revisione %s mancante (%d riferimenti alla revisione; %d riferimenti al "
+"certificato; %d riferimenti al genitore; %d riferimenti al figlio; %d "
+"riferimenti al roster)"

 #: database_check.cc:621
 #, c-format
@@ -1605,13 +1609,16 @@
 #: database_check.cc:659
 #, c-format
 msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)"
-msgstr "la revisione %s non corrisponde ai genitori (%d stirpi di genitori; %d riferimenti alla revisione)"
+msgstr ""
+"la revisione %s non corrisponde ai genitori (%d stirpi di genitori; %d "
+"riferimenti alla revisione)"

 # TODO: stirpi?
 #: database_check.cc:668
 #, c-format
 msgid "revision %s mismatched children (%d ancestry children; %d parents)"
-msgstr "la revisione %s non corrisponde ai figli (%d stirpi di figli; %d genitori)"
+msgstr ""
+"la revisione %s non corrisponde ai figli (%d stirpi di figli; %d genitori)"

 #: database_check.cc:680
 #, c-format
@@ -1622,7 +1629,8 @@
 #: database_check.cc:687
 #, c-format
 msgid "revision %s is not parseable (perhaps with unnormalized paths?)"
-msgstr "revisione %s non comprensibile (forse a causa di percorsi non normalizzati)"
+msgstr ""
+"revisione %s non comprensibile (forse a causa di percorsi non normalizzati)"

 #: database_check.cc:694
 #, c-format
@@ -1757,7 +1765,9 @@
 #: database_check.cc:944
 #, c-format
 msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs"
-msgstr "controllo completo: %d file; %d roster; %d revisioni; %d chiavi; %d certificati"
+msgstr ""
+"controllo completo: %d file; %d roster; %d revisioni; %d chiavi; %d "
+"certificati"

 #: database_check.cc:950
 #, c-format
@@ -1826,17 +1836,16 @@
 #: database.cc:252
 #, c-format
 msgid "database %s is not an sqlite version 3 file, try dump and reload"
-msgstr "il database ‘%s’ non è un file SQLite versione 3, prova ‘dump’ e ‘reload’"
+msgstr ""
+"il database ‘%s’ non è un file SQLite versione 3, prova ‘dump’ e ‘reload’"

-#: database.cc:281
-#: schema_migration.cc:200
+#: database.cc:281 schema_migration.cc:200
 msgid ""
 "make sure database and containing directory are writeable\n"
 "and you have not run out of disk space"
 msgstr ""

-#: database.cc:287
-#: schema_migration.cc:205
+#: database.cc:287 schema_migration.cc:205
 #, c-format
 msgid ""
 "sqlite error: %s\n"
@@ -1853,7 +1862,8 @@
 #: database.cc:337
 #, c-format
 msgid ""
-"existing (possibly stale) journal file '%s' has same stem as new database '%s'\n"
+"existing (possibly stale) journal file '%s' has same stem as new database '%"
+"s'\n"
 "cancelling database creation"
 msgstr ""

@@ -1961,22 +1971,22 @@
 msgid "could not open database '%s': %s"
 msgstr "non riesco ad aprire il database ‘%s’: %s"

-#: diff_patch.cc:605
+#: diff_patch.cc:606
 #, c-format
 msgid "file '%s' does not exist in workspace"
 msgstr "il file ‘%s’ non esiste nello spazio di lavoro"

-#: diff_patch.cc:606
+#: diff_patch.cc:607
 #, c-format
 msgid "'%s' in workspace is a directory, not a file"
 msgstr "nello spazio di lavoro ‘%s’ è una directory, non un file"

-#: diff_patch.cc:610
+#: diff_patch.cc:611
 #, c-format
 msgid "file %s in workspace has id %s, wanted %s"
 msgstr "il file ‘%s’ hd id ‘%s’ nello spazio di lavoro, era atteso ‘%s’"

-#: diff_patch.cc:731
+#: diff_patch.cc:732
 #, c-format
 msgid ""
 "help required for 3-way merge\n"
@@ -1991,8 +2001,7 @@
 "[  destra] %s\n"
 "[  unione] %s\n"

-#: file_io.cc:175
-#: file_io.cc:182
+#: file_io.cc:175 file_io.cc:182
 #, c-format
 msgid ""
 "could not create directory '%s'\n"
@@ -2072,10 +2081,10 @@
 #: file_io.cc:254
 #, c-format
 msgid "rename source file '%s' is a directory -- bug in monotone?"
-msgstr "il file sorgente da rinominare ‘%s’ è una directory -- bug in monotone?"
+msgstr ""
+"il file sorgente da rinominare ‘%s’ è una directory -- bug in monotone?"

-#: file_io.cc:257
-#: file_io.cc:270
+#: file_io.cc:257 file_io.cc:270
 #, c-format
 msgid "rename target '%s' already exists"
 msgstr "esiste già un'altra chiave con nome ‘%s’"
@@ -2155,8 +2164,7 @@
 msgid "empty passphrases not allowed, try again"
 msgstr "le passphrase non può essere vuota, riprova"

-#: keys.cc:128
-#: keys.cc:135
+#: keys.cc:128 keys.cc:135
 #, c-format
 msgid "too many failed passphrases"
 msgstr "troppe passphrase errate"
@@ -2176,9 +2184,7 @@
 msgid "passphrase for '%s' is incorrect"
 msgstr "passphrase incorretta per ‘%s’"

-#: lua.cc:555
-#: lua.cc:584
-#: lua.cc:599
+#: lua.cc:555 lua.cc:584 lua.cc:599
 #, c-format
 msgid "%s called with an invalid parameter"
 msgstr "‘%s’ chiamato con un parametro non valido"
@@ -2188,9 +2194,7 @@
 msgid "Directory '%s' does not exist"
 msgstr "La directory ‘%s’ non esiste"

-#: lua.cc:603
-#: rcs_import.cc:1235
-#: work.cc:488
+#: lua.cc:603 rcs_import.cc:1235 work.cc:488
 #, c-format
 msgid "'%s' is not a directory"
 msgstr "‘%s’ non è una directory"
@@ -2329,7 +2333,9 @@

 #: monotone.cc:91
 msgid "when rosterifying, drop attrs entries with the given key"
-msgstr "durante la conversione al formato con roster, elimina gli attributi con una chiave specificata"
+msgstr ""
+"durante la conversione al formato con roster, elimina gli attributi con una "
+"chiave specificata"

 #: monotone.cc:92
 msgid "exclude files when printing logs"
@@ -2436,12 +2442,12 @@
 msgid "syntax error near the \"%s\" option: %s"
 msgstr "errore di sintassi vicino all'opzione ‘%s’: %s"

-#: monotone.cc:635
-#, c-format
-msgid "monotone %s doesn't use the option %s"
+#: monotone.cc:629
+#, fuzzy, c-format
+msgid "%s %s doesn't use the option %s"
 msgstr "monotone ‘%s’ non utilizza l'opzione ‘%s’"

-#: monotone.cc:670
+#: monotone.cc:663
 #, c-format
 msgid "Options specific to '%s %s':"
 msgstr "Opzioni specifiche per ‘%s %s’:"
@@ -2489,11 +2495,15 @@

 #: netcmd.cc:125
 msgid "the remote side has a newer, incompatible version of monotone"
-msgstr "all'altro capo c'è una versione più nuova di monotone, non compatibile con questa"
+msgstr ""
+"all'altro capo c'è una versione più nuova di monotone, non compatibile con "
+"questa"

 #: netcmd.cc:126
 msgid "the remote side has an older, incompatible version of monotone"
-msgstr "all'altro capo c'è una versione più vecchia di monotone, non compatibile con questa"
+msgstr ""
+"all'altro capo c'è una versione più vecchia di monotone, non compatibile con "
+"questa"

 #: netcmd.cc:136
 #, c-format
@@ -2507,20 +2517,17 @@
 "this suggests data was corrupted in transit\n"
 msgstr ""

-#: netcmd.cc:272
-#: netcmd.cc:318
+#: netcmd.cc:272 netcmd.cc:318
 #, c-format
 msgid "unknown role specifier %d"
 msgstr "specificatore di ruolo %d sconosciuto"

-#: netio.hh:41
-#: netio.hh:59
+#: netio.hh:41 netio.hh:59
 #, c-format
 msgid "need %d bytes to decode %s at %d, only have %d"
 msgstr ""

-#: netio.hh:87
-#: netio.hh:122
+#: netio.hh:87 netio.hh:122
 #, fuzzy, c-format
 msgid "uleb128 decode for '%s' into %d-byte datum overflowed"
 msgstr "decodifica uleb128 per ‘%s’ in dati %d-byte ***overflow***"
@@ -2533,7 +2540,9 @@
 #: netio.hh:278
 #, c-format
 msgid "decoding variable length string of %d bytes for '%s', maximum is %d"
-msgstr "decodifica in corso della stringa a lungheza variabile di %d byte per ‘%s’, il massimo è %d"
+msgstr ""
+"decodifica in corso della stringa a lungheza variabile di %d byte per ‘%s’, "
+"il massimo è %d"

 #: netio.hh:333
 #, c-format
@@ -2557,8 +2566,7 @@
 msgid "certs in"
 msgstr "cert. ↓"

-#: netsync.cc:732
-#: netsync.cc:745
+#: netsync.cc:732 netsync.cc:745
 msgid "revs in"
 msgstr "rev. ↓"

@@ -2566,8 +2574,7 @@
 msgid "certs out"
 msgstr "cert. ↑"

-#: netsync.cc:739
-#: netsync.cc:747
+#: netsync.cc:739 netsync.cc:747
 msgid "revs out"
 msgstr "rev. ↑"

@@ -2630,8 +2637,7 @@
 msgid "rejected attempt at anonymous connection while running as sink"
 msgstr "rifiutato un tentativo di connessione anonima funzionando come pozzo"

-#: netsync.cc:1374
-#: netsync.cc:1503
+#: netsync.cc:1374 netsync.cc:1503
 #, c-format
 msgid "not serving branch '%s'"
 msgstr "il ramo ‘%s’ non è servito"
@@ -2649,7 +2655,8 @@
 #: netsync.cc:1395
 #, c-format
 msgid "allowed anonymous read/write permission for '%s' excluding '%s'"
-msgstr "concessi permessi di lettura/scrittura anonime a ‘%s’ con esclusione di ‘%s’"
+msgstr ""
+"concessi permessi di lettura/scrittura anonime a ‘%s’ con esclusione di ‘%s’"

 #: netsync.cc:1450
 #, c-format
@@ -2663,13 +2670,20 @@

 #: netsync.cc:1489
 #, c-format
-msgid "denied '%s' read permission for '%s' excluding '%s' while running as pure sink"
-msgstr "negato a ‘%s’ il permesso di lettura a ‘%s’ con esclusione di ‘%s’ nel ruolo di pozzo"
+msgid ""
+"denied '%s' read permission for '%s' excluding '%s' while running as pure "
+"sink"
+msgstr ""
+"negato a ‘%s’ il permesso di lettura a ‘%s’ con esclusione di ‘%s’ nel ruolo "
+"di pozzo"

 #: netsync.cc:1509
 #, c-format
-msgid "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
-msgstr "negato a ‘%s’ il permesso di lettura a ‘%s’ con esclusione di ‘%s’ a causa del ramo ‘%s’"
+msgid ""
+"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
+msgstr ""
+"negato a ‘%s’ il permesso di lettura a ‘%s’ con esclusione di ‘%s’ a causa "
+"del ramo ‘%s’"

 #: netsync.cc:1512
 #, c-format
@@ -2683,8 +2697,12 @@

 #: netsync.cc:1531
 #, c-format
-msgid "denied '%s' write permission for '%s' excluding '%s' while running as pure source"
-msgstr "negato a ‘%s’ il permesso di scrittura a ‘%s’ con esclusione di ‘%s’ nel ruolo di sorgente"
+msgid ""
+"denied '%s' write permission for '%s' excluding '%s' while running as pure "
+"source"
+msgstr ""
+"negato a ‘%s’ il permesso di scrittura a ‘%s’ con esclusione di ‘%s’ nel "
+"ruolo di sorgente"

 #: netsync.cc:1539
 #, c-format
@@ -2724,7 +2742,9 @@
 #: netsync.cc:1870
 #, c-format
 msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
-msgstr "Epoca non corrispondente sul ramo ‘%s’: il server usa ‘%s’, il client usa ‘%s’."
+msgstr ""
+"Epoca non corrispondente sul ramo ‘%s’: il server usa ‘%s’, il client usa ‘%"
+"s’."

 #: netsync.cc:1888
 #, c-format
@@ -2741,18 +2761,15 @@
 msgid "Received warning from usher: %s"
 msgstr "Ricevuto avvertimento dall'usciere: %s"

-#: netsync.cc:2051
-#: netsync.cc:2082
+#: netsync.cc:2051 netsync.cc:2082
 msgid "source and sink"
 msgstr "sorgente e pozzo"

-#: netsync.cc:2052
-#: netsync.cc:2083
+#: netsync.cc:2052 netsync.cc:2083
 msgid "source"
 msgstr "sorgente"

-#: netsync.cc:2052
-#: netsync.cc:2083
+#: netsync.cc:2052 netsync.cc:2083
 msgid "sink"
 msgstr "pozzo"

@@ -2761,8 +2778,7 @@
 msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
 msgstr ""

-#: netsync.cc:2251
-#: netsync.cc:2350
+#: netsync.cc:2251 netsync.cc:2350
 #, c-format
 msgid "protocol error while processing peer %s: '%s'"
 msgstr ""
@@ -2824,7 +2840,8 @@

 #: netsync.cc:2567
 #, c-format
-msgid "peer %s read failed in shutdown state (possibly client misreported error)\n"
+msgid ""
+"peer %s read failed in shutdown state (possibly client misreported error)\n"
 msgstr ""

 #: netsync.cc:2573
@@ -2839,7 +2856,8 @@

 #: netsync.cc:2599
 #, c-format
-msgid "peer %s write failed in shutdown state (possibly client misreported error)\n"
+msgid ""
+"peer %s write failed in shutdown state (possibly client misreported error)\n"
 msgstr ""

 #: netsync.cc:2605
@@ -2916,8 +2934,7 @@
 "%s\n"
 msgstr ""

-#: netsync.cc:3173
-#: netsync.cc:3177
+#: netsync.cc:3173 netsync.cc:3177
 #, c-format
 msgid "network error: %s"
 msgstr "errore di rete: %s"
@@ -2937,10 +2954,7 @@
 msgid "missing prerequisite revision '%s'"
 msgstr "manca un requisito: la revisione %s"

-#: packet.cc:140
-#: packet.cc:151
-#: packet.cc:167
-#: packet.cc:175
+#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175
 #, c-format
 msgid "dropping revision '%s'"
 msgstr "elimino la revisione %s"
@@ -2990,7 +3004,8 @@
 #: rcs_file.cc:354
 #, c-format
 msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n"
-msgstr "errore sintattico %d:%d: mi aspettavo %s, ho ricevuto %s con valore ‘%s’\n"
+msgstr ""
+"errore sintattico %d:%d: mi aspettavo %s, ho ricevuto %s con valore ‘%s’\n"

 #: rcs_file.cc:373
 #, c-format
@@ -3068,12 +3083,16 @@
 #: revision.cc:1010
 #, c-format
 msgid "Directory for path %s cannot be added, as there is a file in the way\n"
-msgstr "La cartella per il percorso ‘%s’ non può essere aggiunta, dato che c'è già un file con lo stesso nome\n"
+msgstr ""
+"La cartella per il percorso ‘%s’ non può essere aggiunta, dato che c'è già "
+"un file con lo stesso nome\n"

 #: revision.cc:1021
 #, c-format
 msgid "Path %s cannot be added, as there is a directory in the way"
-msgstr "Il percorso ‘%s’ non può essere aggiunto, dato che c'è già una directory con lo stesso nome"
+msgstr ""
+"Il percorso ‘%s’ non può essere aggiunto, dato che c'è già una directory con "
+"lo stesso nome"

 #: revision.cc:1024
 #, c-format
@@ -3092,7 +3111,8 @@
 #: revision.cc:1423
 #, c-format
 msgid "converting existing revision graph to new roster-style revisions"
-msgstr "converto il grafo esistente delle revisioni al nuovo formato con roster"
+msgstr ""
+"converto il grafo esistente delle revisioni al nuovo formato con roster"

 #: revision.cc:1478
 #, c-format
@@ -3158,7 +3178,9 @@
 #: schema_migration.cc:292
 #, c-format
 msgid "mismatched result of migration, got %s, wanted %s"
-msgstr "risultati della migrazione diversi da quanto previsto: ho ottenuto ‘%s’ e mi aspettavo ‘%s’"
+msgstr ""
+"risultati della migrazione diversi da quanto previsto: ho ottenuto ‘%s’ e mi "
+"aspettavo ‘%s’"

 #: schema_migration.cc:295
 #, c-format
@@ -3193,7 +3215,9 @@
 #: schema_migration.cc:316
 #, c-format
 msgid "no migration performed; database schema already up-to-date at %s"
-msgstr "nessuna migrazione effettuata: lo schema del database era già aggiornato a ‘%s’"
+msgstr ""
+"nessuna migrazione effettuata: lo schema del database era già aggiornato a ‘%"
+"s’"

 #: schema_migration.cc:866
 #, c-format
@@ -3427,14 +3451,12 @@
 msgid "dropping %s"
 msgstr "sto cancellando ‘%s’"

-#: work.cc:943
-#: work.cc:954
+#: work.cc:943 work.cc:954
 #, c-format
 msgid "path %s already exists"
 msgstr "il percorso ‘%s’ esiste già"

-#: work.cc:976
-#: work.cc:1003
+#: work.cc:976 work.cc:1003
 #, c-format
 msgid "adding %s"
 msgstr "aggiungo ‘%s’"
@@ -3469,3 +3491,5 @@
 msgid "updating %s"
 msgstr "aggiornamento di ‘%s’ in corso"

+#~ msgid "unknown command '%s'\n"
+#~ msgstr "comando ‘%s’ sconosciuto\n"
============================================================
--- po/ja.po	be680168510cd01818f1886624d49d8bff014123
+++ po/ja.po	5b2a2f79c1265b794a1ba553c279e1f687a2c443
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: monotone HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-06 22:39+0900\n"
+"POT-Creation-Date: 2006-07-05 22:56-0700\n"
 "PO-Revision-Date: 2006-04-06 22:47+0900\n"
 "Last-Translator: Satoru SATOH <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -16,102 +16,97 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-#: app_state.cc:119
+#: app_state.cc:139
 #, c-format
 msgid "workspace required but not found%s%s"
 msgstr "ワークスペースが必要ですがみつかりませんでした%s%s"

-#: app_state.cc:127
+#: app_state.cc:147
 #, c-format
 msgid "invalid directory ''"
 msgstr "無効なディレクトリ ''"

-#: app_state.cc:135
-#, c-format
-msgid "monotone bookkeeping directory '%s' already exists in '%s'\n"
+#: app_state.cc:155
+#, fuzzy, c-format
+msgid "monotone bookkeeping directory '%s' already exists in '%s'"
 msgstr "monotone 記録簿用ディレクトリ '%s' は既に '%s' 内に存在しています\n"

-#: app_state.cc:174 app_state.cc:189
+#: app_state.cc:236
 #, c-format
-msgid "unknown path '%s'\n"
-msgstr "不明なパス '%s'\n"
-
-#: app_state.cc:350
-#, c-format
 msgid "search root '%s' does not exist"
 msgstr "検索ルート '%s' は存在しません"

-#: app_state.cc:351
+#: app_state.cc:237
 #, c-format
 msgid "search root '%s' is not a directory\n"
 msgstr "検索ルート '%s' はディレクトリではありません\n"

-#: app_state.cc:386
+#: app_state.cc:271
 #, c-format
 msgid "failed to parse date string '%s': %s"
 msgstr "データ文字列 '%s' の解析に失敗: %s"

-#: app_state.cc:400
+#: app_state.cc:286
 #, c-format
 msgid "negative depth not allowed\n"
 msgstr "深さの値を負にすることはできません\n"

-#: app_state.cc:408
+#: app_state.cc:294
 #, c-format
-msgid "negative or zero last not allowed\n"
-msgstr "最終値を負または零にすることはできません\n"
+msgid "illegal argument to --last: cannot be zero or negative\n"
+msgstr ""

-#: app_state.cc:416
+#: app_state.cc:302
 #, c-format
-msgid "negative or zero next not allowed\n"
-msgstr "次の値を負または零にすることはできません\n"
+msgid "illegal argument to --next: cannot be zero or negative\n"
+msgstr ""

-#: app_state.cc:552
+#: app_state.cc:438
 #, c-format
 msgid "Failed to read options file %s"
 msgstr "オプションファイル '%s' の解析に失敗"

-#: app_state.cc:569
+#: app_state.cc:455
 #, c-format
 msgid "Failed to write options file %s"
 msgstr "オプションファイル '%s' の書き込みに失敗"

-#: basic_io.cc:27
+#: basic_io.cc:33
 #, c-format
 msgid "error in %s:%d:%d:E: %s"
 msgstr "エラー %s:%d:%d:E: %s"

-#: cert.cc:58
-#, c-format
-msgid "ignoring bad signature by '%s' on '%s'\n"
+#: cert.cc:83
+#, fuzzy, c-format
+msgid "ignoring bad signature by '%s' on '%s'"
 msgstr "'%s' による '%s' への不正な署名を無視します\n"

-#: cert.cc:66
-#, c-format
-msgid "ignoring unknown signature by '%s' on '%s'\n"
+#: cert.cc:91
+#, fuzzy, c-format
+msgid "ignoring unknown signature by '%s' on '%s'"
 msgstr "'%s' による '%s' への不明な署名を無視します\n"

-#: cert.cc:129
-#, c-format
-msgid "trust function disliked %d signers of %s cert on manifest %s\n"
+#: cert.cc:157
+#, fuzzy, c-format
+msgid "trust function disliked %d signers of %s cert on manifest %s"
 msgstr "trust function disliked %d signers of %s cert on manifest %s\n"

-#: cert.cc:182
-#, c-format
-msgid "trust function disliked %d signers of %s cert on revision %s\n"
+#: cert.cc:214
+#, fuzzy, c-format
+msgid "trust function disliked %d signers of %s cert on revision %s"
 msgstr "trust function disliked %d signers of %s cert on revision %s\n"

-#: cert.cc:271
+#: cert.cc:303
 #, c-format
 msgid "calculated cert hash '%s' does not match '%s'"
 msgstr "計算した証明ハッシュ '%s' は '%s' と一致しません"

-#: cert.cc:347 keys.cc:532
+#: cert.cc:379 keys.cc:554
 #, c-format
 msgid "no key pair '%s' found in key store '%s'"
 msgstr "鍵対 '%s' は鍵の保存場所 '%s' にはありません"

-#: cert.cc:424
+#: cert.cc:457
 #, c-format
 msgid ""
 "you have no private key to make signatures with\n"
@@ -120,7 +115,7 @@
 "署名するための秘密鍵がありません。\n"
 "おそらく 'genkey <あなたのメールアドレス>' とする必要があります。"

-#: cert.cc:427
+#: cert.cc:460
 #, c-format
 msgid ""
 "you have multiple private keys\n"
@@ -129,227 +124,341 @@
 "複数の秘密鍵があります。\n"
 "'-k<keyname>' をコマンドに追加して署名に使うものを選択して下さい。"

-#: cert.cc:444
+#: cert.cc:478
 #, c-format
 msgid "no branch found for empty revision, please provide a branch name"
 msgstr "リビジョンが空のブランチはありません. ブランチ名を指定して下さい"

-#: cert.cc:453
+#: cert.cc:487
 #, c-format
 msgid "no branch certs found for revision %s, please provide a branch name"
 msgstr ""
 "リビジョン %s のブランチ証明がみつかりません. ブランチ名を指定して下さい"

-#: cert.cc:457
+#: cert.cc:491
 #, c-format
 msgid ""
 "multiple branch certs found for revision %s, please provide a branch name"
 msgstr "リビジョン %s のブランチ証明は複数あります. ブランチ名を指定して下さい"

-#: commands.cc:164
+#: cmd_automate.cc:205
 #, c-format
-msgid "command '%s' has multiple ambiguous expansions:\n"
-msgstr "'%s' だけでは曖昧で、展開できるコマンド候補は複数あります:\n"
+msgid "read from client failed with error code: %d"
+msgstr ""

-#: commands.cc:207
-msgid "commands:"
-msgstr "コマンド:"
+#: cmd_automate.cc:248
+#, fuzzy, c-format
+msgid "Bad input to automate stdio"
+msgstr "parse_basic_io に対し不正な入力"

-#: commands.cc:264
+#: cmd_automate.cc:301
+msgid "automation"
+msgstr "自動化"
+
+#: cmd_automate.cc:302
+msgid "automation interface"
+msgstr "自動化インターフェース"
+
+#: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:435 cmd_diff_log.cc:437
+#: cmd_files.cc:102 cmd_files.cc:164 cmd_merging.cc:123 cmd_ws_commit.cc:446
+#: commands.cc:370
 #, c-format
-msgid "unknown command '%s'\n"
-msgstr "不明なコマンド '%s'\n"
+msgid "no such revision '%s'"
+msgstr "リビジョン '%s' は存在しません"

-#: commands.cc:326
+#: cmd_db.cc:41
 #, c-format
-msgid "pid file '%s' already exists"
-msgstr "PID ファイル '%s' は既に存在しています"
+msgid "revision %s already has children. We cannot kill it."
+msgstr "リビジョン %s は既に子を持っていて削除できません"

-#: commands.cc:350 commands.cc:1359 commands.cc:1429 commands.cc:1865
-#: commands.cc:2711 commands.cc:3364 commands.cc:3599 commands.cc:3638
-#: commands.cc:3983
+#: cmd_db.cc:46
+msgid "database"
+msgstr "データベース"
+
+#: cmd_db.cc:47
+msgid ""
+"init\n"
+"info\n"
+"version\n"
+"dump\n"
+"load\n"
+"migrate\n"
+"execute\n"
+"kill_rev_locally ID\n"
+"kill_branch_certs_locally BRANCH\n"
+"kill_tag_locally TAG\n"
+"check\n"
+"changesetify\n"
+"rosterify\n"
+"set_epoch BRANCH EPOCH\n"
+msgstr ""
+"init\n"
+"info\n"
+"version\n"
+"dump\n"
+"load\n"
+"migrate\n"
+"execute\n"
+"kill_rev_locally ID\n"
+"kill_branch_certs_locally BRANCH\n"
+"kill_tag_locally TAG\n"
+"check\n"
+"changesetify\n"
+"rosterify\n"
+"set_epoch BRANCH EPOCH\n"
+
+#: cmd_db.cc:61
+msgid "manipulate database state"
+msgstr "データベースの状態を操作"
+
+#: cmd_db.cc:108
+#, c-format
+msgid "The epoch must be %s characters"
+msgstr "epoch は %s 文字でなければいけません"
+
+#: cmd_db.cc:119 cmd_db.cc:135
+msgid "vars"
+msgstr "変数"
+
+#: cmd_db.cc:119
+msgid "DOMAIN NAME VALUE"
+msgstr "DOMAIN NAME VALUE"
+
+#: cmd_db.cc:120
+msgid "set the database variable NAME to VALUE, in domain DOMAIN"
+msgstr "ドメイン DOMAIN のデータベース変数 NAME を VALUE に設定"
+
+#: cmd_db.cc:135
+msgid "DOMAIN NAME"
+msgstr "DOMAIN NAME"
+
+#: cmd_db.cc:136
+msgid "remove the database variable NAME in domain DOMAIN"
+msgstr "ドメイン DOMAIN のデータベース変数 NAME を消去"
+
+#: cmd_db.cc:148
+#, c-format
+msgid "no var with name %s in domain %s"
+msgstr "%s という変数はドメイン %s 内にはありません"
+
+#: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:558 cmd_files.cc:78
+#: cmd_files.cc:145 cmd_list.cc:437 cmd_merging.cc:569 cmd_ws_commit.cc:322
+#: commands.cc:246
 msgid "informative"
 msgstr "情報"

-#: commands.cc:350
-msgid "command [ARGS...]"
-msgstr "command [ARGS...]"
+#: cmd_db.cc:152
+msgid "(revision|file|key) PARTIAL-ID"
+msgstr "(revision|file|key) PARTIAL-ID"

-#: commands.cc:350
-msgid "display command help"
-msgstr "コマンドヘルプを表示"
+#: cmd_db.cc:153
+msgid "complete partial id"
+msgstr "部分 ID を補完"

-#: commands.cc:429
+#: cmd_db.cc:162
+#, c-format
+msgid "non-hex digits in partial id"
+msgstr "部分 ID に十六進数が含まれていません"
+
+#: cmd_diff_log.cc:348 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224
+#: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:613
+msgid "[PATH]..."
+msgstr "[PATH]..."
+
+#: cmd_diff_log.cc:349
+#, fuzzy
 msgid ""
-"Enter a description of this change.\n"
-"Lines beginning with `MTN:' are removed automatically.\n"
+"show current diffs on stdout.\n"
+"If one revision is given, the diff between the workspace and\n"
+"that revision is shown.  If two revisions are given, the diff\n"
+"between them is given. If no format is specified, unified\n"
+"is used by default."
 msgstr ""
-"この変更の説明を入力して下さい\n"
-"'MTN:' で始まる行は自動的に削除されます\n"
+"現在の差分を標準出力に表示\n"
+"リビジョンが一つ指定されていれば、ワークスペースとそのリビジョンの\n"
+"差分を、二つ指定されていればそれらリビジョン間の差分を表示します。\n"
+"形式が指定されていなければ、デフォルトでは unified 形式を使用します。"

-#: commands.cc:436
+#: cmd_diff_log.cc:365
 #, c-format
-msgid "edit of log message failed"
-msgstr "ログメッセージの編集に失敗しました"
+msgid ""
+"--diff-args requires --external\n"
+"try adding --external or removing --diff-args?"
+msgstr ""
+"--diff-args は --external を必要とします。\n"
+"--external を追加するか、--diff-args を省いてみてはどうですか?"

-#: commands.cc:445
-msgid "note: "
-msgstr "ノート: "
+#: cmd_diff_log.cc:494
+msgid "no changes"
+msgstr "変更なし"

-#: commands.cc:446
-#, c-format
+#: cmd_diff_log.cc:558
+msgid "[FILE] ..."
+msgstr "[FILE] ..."
+
+#: cmd_diff_log.cc:559
+#, fuzzy
 msgid ""
-"branch '%s' has multiple heads\n"
-"perhaps consider '%s merge'"
+"print history in reverse order (filtering by 'FILE'). If one or more "
+"revisions are given, use them as a starting point."
 msgstr ""
-"ブランチ '%s' には複数の最新版 (HEAD) があります\n"
-"’%s merge' を実行した方がよいでしょう"
+"降順で履歴を表示 ('FILE' でフィルタ)。一つ以上のリビジョンが指定されて\n"
+"いればそれを開始点として利用。"

-#: commands.cc:507 commands.cc:783 commands.cc:1447 commands.cc:1531
-#: commands.cc:2761 commands.cc:2789 commands.cc:2792 commands.cc:2929
-#: commands.cc:3621
+#: cmd_diff_log.cc:621
 #, c-format
-msgid "no such revision '%s'"
-msgstr "リビジョン '%s' は存在しません"
+msgid "only one of --last/--next allowed"
+msgstr "--last/--next のどちらかのみが許されています"

-#: commands.cc:514
-#, c-format
-msgid "expanding selection '%s'\n"
-msgstr "セレクション '%s' を展開\n"
+#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:771
+#: cmd_othervcs.cc:15
+msgid "debug"
+msgstr "デバッグ"

-#: commands.cc:522
-#, c-format
-msgid "no match for selection '%s'"
-msgstr "セレクション '%s' に一致するものがありません"
+#: cmd_files.cc:28
+msgid "load file contents into db"
+msgstr "ファイルの内容をデータベースに読み込み"

-#: commands.cc:528
-#, c-format
-msgid "expanded to '%s'\n"
-msgstr "'%s' に展開\n"
+#: cmd_files.cc:41
+msgid "<parent> <left> <right>"
+msgstr "<親> <左> <右>"

-#: commands.cc:545
-#, c-format
-msgid "selection '%s' has multiple ambiguous expansions: \n"
-msgstr "'%s' だけでは曖昧で、展開できるセレクションの候補は複数あります: \n"
+#: cmd_files.cc:42
+msgid "merge 3 files and output result"
+msgstr "三つのファイルを統合し結果を出力"

-#: commands.cc:563
+#: cmd_files.cc:56
 #, c-format
-msgid "non-hex digits in id"
-msgstr "ID に十六進数が含まれていません"
+msgid "ancestor file id does not exist"
+msgstr "祖先のファイル ID は存在しません"

-#: commands.cc:572
+#: cmd_files.cc:59
 #, c-format
-msgid "partial id '%s' does not have an expansion"
-msgstr "部分 ID '%s' を一つの ID に展開することはできません"
+msgid "left file id does not exist"
+msgstr "左ファイル ID は存在しません"

-#: commands.cc:575
+#: cmd_files.cc:62
 #, c-format
-msgid "partial id '%s' has multiple ambiguous expansions:\n"
-msgstr "'%s' だけでは曖昧で、展開できる ID の候補は複数あります:\n"
+msgid "right file id does not exist"
+msgstr "右ファイル ID は存在しません"

-#: commands.cc:582
+#: cmd_files.cc:73
 #, c-format
-msgid "expanded partial id '%s' to '%s'\n"
-msgstr "部分 ID '%s' を '%s' に展開\n"
+msgid "merge failed"
+msgstr "統合失敗"

-#: commands.cc:609 netsync.cc:1749
-#, c-format
-msgid "no public key '%s' found in database"
-msgstr "データベース内に公開鍵 '%s' はありません"
+#: cmd_files.cc:78
+msgid "PATH"
+msgstr "PATH"

-#: commands.cc:619
+#: cmd_files.cc:79
+msgid "print annotated copy of the file from REVISION"
+msgstr "REVISION の注釈付きのファイルのコピーを表示"
+
+#: cmd_files.cc:100
 #, c-format
-msgid ""
-"Key   : %s\n"
-"Sig   : %s\n"
-"Name  : %s\n"
-"Value : %s\n"
-msgstr ""
-"鍵    : %s\n"
-"署名  : %s\n"
-"名前  : %s\n"
-"値    : %s\n"
+msgid "no revision for file '%s' in database"
+msgstr "ファイル '%s' に対するリビジョンはデータベース内にみつかりませんでした"

-#: commands.cc:653
-msgid "ok"
-msgstr "OK"
+#: cmd_files.cc:111
+#, fuzzy, c-format
+msgid "no such file '%s' in revision '%s'"
+msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n"

-#: commands.cc:656
-msgid "bad"
-msgstr "NG"
+#: cmd_files.cc:114
+#, fuzzy, c-format
+msgid "'%s' in revision '%s' is not a file"
+msgstr "ワークスペース内の '%s' はファイルではなくディレクトリです"

-#: commands.cc:659
-msgid "unknown"
-msgstr "不明"
+#: cmd_files.cc:121
+msgid "[PATH]"
+msgstr "[PATH]"

-#: commands.cc:746
-#, c-format
-msgid "(*) - only in %s/"
-msgstr "(*) - %s/ 内にのみ存在"
+#: cmd_files.cc:122
+msgid "calculate identity of PATH or stdin"
+msgstr "PATH または標準入力を識別"

-#: commands.cc:769
+#: cmd_files.cc:146
+msgid "FILENAME"
+msgstr "FILENAME"
+
+#: cmd_files.cc:147
+msgid "write file from database to stdout"
+msgstr "データベースのファイルを標準出力に書き出し"
+
+#: cmd_files.cc:176 cmd_files.cc:178
+#, fuzzy, c-format
+msgid "no file '%s' found in revision '%s'"
+msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n"
+
+#: cmd.hh:87
 #, c-format
-msgid "no keys found\n"
-msgstr "鍵がみつかりませんでした\n"
+msgid "non-hex digits in id"
+msgstr "ID に十六進数が含まれていません"

-#: commands.cc:771
+#: cmd.hh:96
 #, c-format
-msgid "no keys found matching '%s'\n"
-msgstr "'%s' に一致する鍵はみつかりませんでした\n"
+msgid "partial id '%s' does not have an expansion"
+msgstr "部分 ID '%s' を一つの ID に展開することはできません"

-#: commands.cc:789
+#: cmd.hh:100
 #, c-format
-msgid "revision %s already has children. We cannot kill it."
-msgstr "リビジョン %s は既に子を持っていて削除できません"
+msgid "partial id '%s' has multiple ambiguous expansions:\n"
+msgstr "'%s' だけでは曖昧で、展開できる ID の候補は複数あります:\n"

-#: commands.cc:929 commands.cc:953 commands.cc:990 commands.cc:1011
-#: commands.cc:1047
+#: cmd.hh:108
+#, fuzzy, c-format
+msgid "expanded partial id '%s' to '%s'"
+msgstr "部分 ID '%s' を '%s' に展開\n"
+
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
+#: cmd_key_cert.cc:113 cmd_key_cert.cc:149
 msgid "key and cert"
 msgstr "鍵と証明"

-#: commands.cc:929 commands.cc:953 commands.cc:990
+#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92
 msgid "KEYID"
 msgstr "KEYID"

-#: commands.cc:929
+#: cmd_key_cert.cc:27
 msgid "generate an RSA key-pair"
 msgstr "鍵対を生成"

-#: commands.cc:944
+#: cmd_key_cert.cc:42
 #, c-format
 msgid "key '%s' already exists"
 msgstr "鍵 '%s' は既に存在しています"

-#: commands.cc:947
+#: cmd_key_cert.cc:45
 #, c-format
 msgid "generating key-pair '%s'"
 msgstr "鍵対 '%s' を生成しています"

-#: commands.cc:949
+#: cmd_key_cert.cc:47
 #, c-format
 msgid "storing key-pair '%s' in %s/"
 msgstr "鍵対 '%s' を %s/ に保存しています"

-#: commands.cc:953
+#: cmd_key_cert.cc:53
 msgid "drop a public and private key"
 msgstr "公開鍵と秘密鍵を破棄"

-#: commands.cc:967
-#, c-format
-msgid "dropping public key '%s' from database\n"
+#: cmd_key_cert.cc:67
+#, fuzzy, c-format
+msgid "dropping public key '%s' from database"
 msgstr "公開鍵 '%s' をデータベースから破棄しています\n"

-#: commands.cc:977
-#, c-format
-msgid "dropping key pair '%s' from keystore\n"
+#: cmd_key_cert.cc:77
+#, fuzzy, c-format
+msgid "dropping key pair '%s' from keystore"
 msgstr "鍵対 '%s' を鍵の保存場所から破棄しています\n"

-#: commands.cc:984
+#: cmd_key_cert.cc:84
 #, c-format
 msgid "public or private key '%s' does not exist in keystore or database"
 msgstr "公開または秘密鍵 '%s' は鍵の保存場所にもデータベース内にも存在しません"

-#: commands.cc:986
+#: cmd_key_cert.cc:87
 #, c-format
 msgid ""
 "public or private key '%s' does not exist in keystore, and no database was "
@@ -358,39 +467,39 @@
 "公開または秘密鍵 '%s' は鍵の保存場所には存在せず、データベースも指定されてい"
 "ません。"

-#: commands.cc:991
+#: cmd_key_cert.cc:93
 msgid "change passphrase of a private RSA key"
 msgstr "秘密 RSA 鍵のパスフレーズを変更"

-#: commands.cc:1001
+#: cmd_key_cert.cc:103
 #, c-format
 msgid "key '%s' does not exist in the keystore"
 msgstr "鍵 '%s' は鍵の保存場所にありません"

-#: commands.cc:1008
-#, c-format
-msgid "passphrase changed\n"
+#: cmd_key_cert.cc:110
+#, fuzzy, c-format
+msgid "passphrase changed"
 msgstr "パスフレーズを変更しました\n"

-#: commands.cc:1011
+#: cmd_key_cert.cc:113
 msgid "REVISION CERTNAME [CERTVAL]"
 msgstr "REVISION CERTNAME [CERTVAL]"

-#: commands.cc:1012
+#: cmd_key_cert.cc:114
 msgid "create a cert for a revision"
 msgstr "リビジョンの証明を作成"

-#: commands.cc:1047
+#: cmd_key_cert.cc:150
 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
 msgstr "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"

-#: commands.cc:1048
+#: cmd_key_cert.cc:151
 msgid ""
 "test whether a hypothetical cert would be trusted\n"
 "by current settings"
 msgstr "現在の設定で仮想証明が信頼可能かテスト"

-#: commands.cc:1081
+#: cmd_key_cert.cc:184
 #, c-format
 msgid ""
 "if a cert on: %s\n"
@@ -405,285 +514,122 @@
 "署名者 : %s\n"
 "よっておそらく %s でしょう\n"

-#: commands.cc:1090
+#: cmd_key_cert.cc:193
 msgid "trusted"
 msgstr "trusted"

-#: commands.cc:1090
+#: cmd_key_cert.cc:193
 msgid "UNtrusted"
 msgstr "UNtrusted"

-#: commands.cc:1093 commands.cc:1106 commands.cc:1119 commands.cc:1136
-#: commands.cc:1187
+#: cmd_key_cert.cc:196 cmd_key_cert.cc:209 cmd_key_cert.cc:222
+#: cmd_key_cert.cc:238 cmd_ws_commit.cc:171
 msgid "review"
 msgstr "レビュー"

-#: commands.cc:1093
+#: cmd_key_cert.cc:196
 msgid "REVISION TAGNAME"
 msgstr "REVISION TAGNAME"

-#: commands.cc:1094
+#: cmd_key_cert.cc:197
 msgid "put a symbolic tag cert on a revision"
 msgstr "記号的なタグ証明をリビジョンに付加"

-#: commands.cc:1106
+#: cmd_key_cert.cc:209
 msgid "ID (pass|fail|true|false|yes|no|1|0)"
 msgstr "ID (pass|fail|true|false|yes|no|1|0)"

-#: commands.cc:1107
+#: cmd_key_cert.cc:210
 msgid "note the results of running a test on a revision"
 msgstr "リビジョンのテストの実行結果を記録"

-#: commands.cc:1119 commands.cc:1136
+#: cmd_key_cert.cc:222 cmd_ws_commit.cc:171
 msgid "REVISION"
 msgstr "REVISION"

-#: commands.cc:1120
+#: cmd_key_cert.cc:223
 msgid "approve of a particular revision"
 msgstr "特定のリビジョンを承認"

-#: commands.cc:1131
+#: cmd_key_cert.cc:234
 #, c-format
 msgid "need --branch argument for approval"
 msgstr "承認には --branch 引数が必要です"

-#: commands.cc:1137
-msgid "disapprove of a particular revision"
-msgstr "特定のリビジョンを非承認"
-
-#: commands.cc:1150
-#, c-format
-msgid "revision '%s' has %d changesets, cannot invert\n"
-msgstr "リビジョン '%s' には %d 個の変更セットがあり、反転できません\n"
-
-#: commands.cc:1154
-#, c-format
-msgid "need --branch argument for disapproval"
-msgstr "非承認とするには --branch 引数が必要です"
-
-#: commands.cc:1187
+#: cmd_key_cert.cc:238
 msgid "REVISION [COMMENT]"
 msgstr "REVISION [COMMENT]"

-#: commands.cc:1188
+#: cmd_key_cert.cc:239
 msgid "comment on a particular revision"
 msgstr "特定のリビジョンにコメント"

-#: commands.cc:1198
+#: cmd_key_cert.cc:249
 #, c-format
 msgid "edit comment failed"
 msgstr "コメント編集に失敗"

-#: commands.cc:1201
+#: cmd_key_cert.cc:252
 #, c-format
 msgid "empty comment"
 msgstr "空のコメント"

-#: commands.cc:1214 commands.cc:1243 commands.cc:1268 commands.cc:1293
-#: commands.cc:2212 commands.cc:2330 commands.cc:2864 commands.cc:3412
-msgid "workspace"
-msgstr "ワークスペース"
-
-#: commands.cc:1214 commands.cc:1243 commands.cc:1359 commands.cc:2330
-#: commands.cc:2711 commands.cc:3412
-msgid "[PATH]..."
-msgstr "[PATH]..."
-
-#: commands.cc:1215
-msgid "add files to workspace"
-msgstr "ファイルをワークスペースに追加"
-
-#: commands.cc:1244
-msgid "drop files from workspace"
-msgstr "ファイルをワークスペースから削除"
-
-#: commands.cc:1269
-msgid ""
-"SRC DEST\n"
-"SRC1 [SRC2 [...]] DEST_DIR"
-msgstr ""
-"SRC DEST\n"
-"SRC1 [SRC2 [...]] DEST_DIR"
-
-#: commands.cc:1271
-msgid "rename entries in the workspace"
-msgstr "ワークスペース内のエントリの名称を変更"
-
-#: commands.cc:1293
-msgid "NEW_ROOT PUT_OLD"
-msgstr "NEW_ROOT PUT_OLD"
-
-#: commands.cc:1294
-msgid ""
-"rename the root directory\n"
-"after this command, the directory that currently has the name NEW_ROOT\n"
-"will be the root directory, and the directory that is currently the root\n"
-"directory will have name PUT_OLD.\n"
-"Using --execute is strongly recommended."
-msgstr ""
-"ルートディレクトリの変更\n"
-"このコマンドの後に、NEW_ROOT という名前でルートディレクトリになる予定の\n"
-"ディレクトリと、PUT_OLD という名前の現在のルートディレクトリを指定します。\n"
-"--execute の使用を強く推奨します。"
-
-#: commands.cc:1313 commands.cc:1326 commands.cc:1406 commands.cc:3519
-#: commands.cc:3964
-msgid "debug"
-msgstr "デバッグ"
-
-#: commands.cc:1313
-msgid "load file contents into db"
-msgstr "ファイルの内容をデータベースに読み込み"
-
-#: commands.cc:1326
-msgid "<parent> <left> <right>"
-msgstr "<親> <左> <右>"
-
-#: commands.cc:1327
-msgid "merge 3 files and output result"
-msgstr "三つのファイルを統合し結果を出力"
-
-#: commands.cc:1337
+#: cmd_list.cc:64 cmd_list.cc:655
 #, c-format
-msgid "ancestor file id does not exist"
-msgstr "祖先のファイル ID は存在しません"
+msgid "no public key '%s' found in database"
+msgstr "データベース内に公開鍵 '%s' はありません"

-#: commands.cc:1340
+#: cmd_list.cc:74
 #, c-format
-msgid "left file id does not exist"
-msgstr "左ファイル ID は存在しません"
-
-#: commands.cc:1343
-#, c-format
-msgid "right file id does not exist"
-msgstr "右ファイル ID は存在しません"
-
-#: commands.cc:1354
-#, c-format
-msgid "merge failed"
-msgstr "統合失敗"
-
-#: commands.cc:1359
-msgid "show status of workspace"
-msgstr "ワークスペースの状態を表示"
-
-#: commands.cc:1406
-msgid "[PATH]"
-msgstr "[PATH]"
-
-#: commands.cc:1407
-msgid "calculate identity of PATH or stdin"
-msgstr "PATH または標準入力を識別"
-
-#: commands.cc:1430
-msgid "FILENAME"
-msgstr "FILENAME"
-
-#: commands.cc:1431
-msgid "write file from database to stdout"
-msgstr "データベースのファイルを標準出力に書き出し"
-
-#: commands.cc:1459 commands.cc:1461 commands.cc:3630
-#, c-format
-msgid "no file '%s' found in revision '%s'\n"
-msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n"
-
-#: commands.cc:1473 commands.cc:1602 commands.cc:3097 commands.cc:3150
-#: commands.cc:3161 commands.cc:3311 commands.cc:3319 commands.cc:3873
-msgid "tree"
-msgstr "ツリー"
-
-#: commands.cc:1473
-msgid "[DIRECTORY]\n"
-msgstr "[DIRECTORY]\n"
-
-#: commands.cc:1474
 msgid ""
-"check out a revision from database into directory.\n"
-"If a revision is given, that's the one that will be checked out.\n"
-"Otherwise, it will be the head of the branch (given or implicit).\n"
-"If no directory is given, the branch name will be used as directory"
+"Key   : %s\n"
+"Sig   : %s\n"
+"Name  : %s\n"
+"Value : %s\n"
 msgstr ""
-"データベースからあるリビジョンを取り出してディレクトリに\n"
-"書き出します。リビジョンが指定されていればそれを取り出し、\n"
-"未指定なら、明示的または暗黙的に指定されたブランチの最新版を\n"
-"取り出します。ディレクトリが未指定ならディレクトリ名として\n"
-"ブランチ名を使います"
+"鍵    : %s\n"
+"署名  : %s\n"
+"名前  : %s\n"
+"値    : %s\n"

-#: commands.cc:1493 commands.cc:1512
-#, c-format
-msgid "need --branch argument for branch-based checkout"
-msgstr "ブランチを基準にしたチェックアウトには --branch 引数が必要です"
+#: cmd_list.cc:108
+msgid "ok"
+msgstr "OK"

-#: commands.cc:1506
-#, c-format
-msgid "checkout directory '%s' already exists"
-msgstr "取り出すディレクトリ '%s' は既に存在しています"
+#: cmd_list.cc:111
+msgid "bad"
+msgstr "NG"

-#: commands.cc:1515
-#, c-format
-msgid "branch '%s' is empty"
-msgstr "ブランチ '%s' は空です"
+#: cmd_list.cc:114
+msgid "unknown"
+msgstr "不明"

-#: commands.cc:1518
+#: cmd_list.cc:202
 #, c-format
-msgid "branch %s has multiple heads:"
-msgstr "ブランチ %s には複数の最新版 (HEAD) が存在しています:"
+msgid "(*) - only in %s/"
+msgstr "(*) - %s/ 内にのみ存在"

-#: commands.cc:1521
-#, c-format
-msgid "choose one with '%s checkout -r<id>'"
-msgstr "'%s update -r<id>' で一つを選択して下さい"
+#: cmd_list.cc:226
+#, fuzzy, c-format
+msgid "no keys found"
+msgstr "鍵がみつかりませんでした\n"

-#: commands.cc:1522
-#, c-format
-msgid "branch %s has multiple heads"
-msgstr "ブランチ %s には複数の最新版 (HEAD) が存在しています"
+#: cmd_list.cc:228
+#, fuzzy, c-format
+msgid "no keys found matching '%s'"
+msgstr "'%s' に一致する鍵はみつかりませんでした\n"

-#: commands.cc:1549
-#, c-format
-msgid "revision %s is not a member of branch %s\n"
-msgstr "リビジョン %s はブランチ %s には属していません\n"
-
-#: commands.cc:1583
-#, c-format
-msgid "no file %s found in database for %s"
-msgstr "ファイル %s (対象 %s)はデータベース内にはみつかりません"
-
-#: commands.cc:1602
-msgid "show unmerged head revisions of branch"
-msgstr "ブランチの統合されていない最新リビジョンを表示"
-
-#: commands.cc:1610 commands.cc:3106
-#, c-format
-msgid "please specify a branch, with --branch=BRANCH"
-msgstr "--branch=BRANCH というようにブランチを指定して下さい"
-
-#: commands.cc:1615 commands.cc:3110 commands.cc:3199 commands.cc:3202
-#, c-format
-msgid "branch '%s' is empty\n"
-msgstr "ブランチ '%s' は空です\n"
-
-#: commands.cc:1617
-#, c-format
-msgid "branch '%s' is currently merged:\n"
-msgstr "ブランチ '%s' は現在統合済みです:\n"
-
-#: commands.cc:1619
-#, c-format
-msgid "branch '%s' is currently unmerged:\n"
-msgstr "ブランチ '%s' は現在未統合です:\n"
-
-#: commands.cc:1658
-#, c-format
-msgid "no epoch for branch %s\n"
+#: cmd_list.cc:275
+#, fuzzy, c-format
+msgid "no epoch for branch %s"
 msgstr "ブランチ %s は epoch を持ちません\n"

-#: commands.cc:1866
+#: cmd_list.cc:438
+#, fuzzy
 msgid ""
 "certs ID\n"
 "keys [PATTERN]\n"
-"branches\n"
+"branches [PATTERN]\n"
 "epochs [BRANCH [...]]\n"
 "tags\n"
 "vars [DOMAIN]\n"
@@ -705,314 +651,34 @@
 "missing\n"
 "changed"

-#: commands.cc:1877
+#: cmd_list.cc:449
+#, fuzzy
 msgid ""
-"show database objects, or the current workspace manifest, or known,\n"
-"unknown, intentionally ignored, missing, or changed state files"
+"show database objects, or the current workspace manifest, \n"
+"or known, unknown, intentionally ignored, missing, or \n"
+"changed-state files"
 msgstr ""
 "データベースオブジェクト、現在のワークスペースのマニフェスト、\n"
 "既知または不明な、意図的に無視、または失なわれた状態のファイルを表示"

-#: commands.cc:1915 commands.cc:1943 commands.cc:1961
-msgid "packet i/o"
-msgstr "パケット I/O"
+#: cmd_list.cc:631
+#, fuzzy
+msgid "REV"
+msgstr "REVID"

-#: commands.cc:1915 commands.cc:1943
-msgid "ID"
-msgstr "ID"
+#: cmd_list.cc:641
+#, fuzzy, c-format
+msgid "No such revision %s"
+msgstr "リビジョン '%s' は存在しません"

-#: commands.cc:1915
-msgid "write public key packet to stdout"
-msgstr "公開鍵パケットを標準出力に出力"
+#: cmd_merging.cc:53 cmd_merging.cc:610 cmd_ws_commit.cc:53
+#: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278
+#: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613
+msgid "workspace"
+msgstr "ワークスペース"

-#: commands.cc:1937
-#, c-format
-msgid "public key '%s' does not exist"
-msgstr "公開鍵 '%s' は存在しません"
-
-#: commands.cc:1943
-msgid "write private key packet to stdout"
-msgstr "秘密鍵パケットを標準出力に出力"
-
-#: commands.cc:1951
-#, c-format
-msgid "public and private key '%s' do not exist in keystore"
-msgstr "公開または秘密鍵 '%s' は鍵の保存場所に存在しません"
-
-#: commands.cc:1962
-msgid "read packets from files or stdin"
-msgstr "ファイルまたは標準入力からパケットを読み込み"
-
-#: commands.cc:1970
-#, c-format
-msgid "no packets found on stdin"
-msgstr "標準入力にパケットをみつけることができませんでした"
-
-#: commands.cc:1981
-#, c-format
-msgid "no packets found in given file"
-msgid_plural "no packets found in given files"
-msgstr[0] "ファイル内にパケットは含まれていません"
-msgstr[1] "ファイル内にパケットは含まれていません"
-
-#: commands.cc:1985
-#, c-format
-msgid "read %d packet"
-msgid_plural "read %d packets"
-msgstr[0] "%d パケット読み込み"
-msgstr[1] "%d パケット読み込み"
-
-#: commands.cc:2014
-#, c-format
-msgid "setting default server to %s\n"
-msgstr "デフォルトのサーバーを %s に設定\n"
-
-#: commands.cc:2020
-#, c-format
-msgid "no hostname given"
-msgstr "ホスト名を指定して下さい"
-
-#: commands.cc:2022
-#, c-format
-msgid "no server given and no default server set"
-msgstr "サーバが未指定であり、デフォルトのサーバーも設定されていません"
-
-#: commands.cc:2040
-#, c-format
-msgid "setting default branch include pattern to '%s'\n"
-msgstr "ブランチ名に含めるデフォルトパターンを '%s' に設定\n"
-
-#: commands.cc:2046
-#, c-format
-msgid "setting default branch exclude pattern to '%s'\n"
-msgstr "ブランチ名に含めないデフォルトパターンを '%s' に設定\n"
-
-#: commands.cc:2052
-#, c-format
-msgid "no branch pattern given"
-msgstr "ブランチ名を指定して下さい"
-
-#: commands.cc:2054
-#, c-format
-msgid "no branch pattern given and no default pattern set"
-msgstr "ブランチパターンが未指定、かつデフォルトパターンも設定されていません"
-
-#: commands.cc:2070 commands.cc:2085 commands.cc:2099 commands.cc:2114
-msgid "network"
-msgstr "ネットワーク"
-
-#: commands.cc:2070 commands.cc:2085 commands.cc:2099
-msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
-msgstr "[ADDRESS[:PORTNUMBER] [PATTERN]]"
-
-#: commands.cc:2071
-msgid "push branches matching PATTERN to netsync server at ADDRESS"
-msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) にプッシュ"
-
-#: commands.cc:2086
-msgid "pull branches matching PATTERN from netsync server at ADDRESS"
-msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) から取り込み"
-
-#: commands.cc:2093
-#, c-format
-msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
-msgstr "匿名で取り込んでいます; 認証が必要な場合は -kKEYNAME を使って下さい\n"
-
-#: commands.cc:2100
-msgid "sync branches matching PATTERN with netsync server at ADDRESS"
-msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) と同期"
-
-#: commands.cc:2114
-msgid "PATTERN ..."
-msgstr "PATTERN..."
-
-#: commands.cc:2115
-msgid "serve the branches specified by PATTERNs to connecting clients"
-msgstr "PATTERNs で指定したブランチを接続クライアントに提供"
-
-#: commands.cc:2128
-#, c-format
+#: cmd_merging.cc:54
 msgid ""
-"need permission to store persistent passphrase (see hook persist_phrase_ok())"
-msgstr ""
-"パスフレーズをずっと保存しておきたいのなら権限が必要です。 (フック "
-"persist_phrase_ok() を参照)"
-
-#: commands.cc:2140
-msgid "database"
-msgstr "データベース"
-
-#: commands.cc:2141
-msgid ""
-"init\n"
-"info\n"
-"version\n"
-"dump\n"
-"load\n"
-"migrate\n"
-"execute\n"
-"kill_rev_locally ID\n"
-"kill_branch_certs_locally BRANCH\n"
-"kill_tag_locally TAG\n"
-"check\n"
-"changesetify\n"
-"rosterify\n"
-"set_epoch BRANCH EPOCH\n"
-msgstr ""
-"init\n"
-"info\n"
-"version\n"
-"dump\n"
-"load\n"
-"migrate\n"
-"execute\n"
-"kill_rev_locally ID\n"
-"kill_branch_certs_locally BRANCH\n"
-"kill_tag_locally TAG\n"
-"check\n"
-"changesetify\n"
-"rosterify\n"
-"set_epoch BRANCH EPOCH\n"
-
-#: commands.cc:2155
-msgid "manipulate database state"
-msgstr "データベースの状態を操作"
-
-#: commands.cc:2202
-#, c-format
-msgid "The epoch must be %s characters"
-msgstr "epoch は %s 文字でなければいけません"
-
-#: commands.cc:2212
-msgid ""
-"set PATH ATTR VALUE\n"
-"get PATH [ATTR]\n"
-"drop PATH [ATTR]"
-msgstr ""
-"set PATH ATTR VALUE\n"
-"get PATH [ATTR]\n"
-"drop PATH [ATTR]"
-
-#: commands.cc:2213
-msgid "set, get or drop file attributes"
-msgstr "ファイル属性を設定/取得/削除"
-
-#: commands.cc:2229
-#, c-format
-msgid "Unknown path '%s'"
-msgstr "不明なパス '%s'"
-
-#: commands.cc:2258
-#, c-format
-msgid "Path '%s' does not have attribute '%s'\n"
-msgstr "パス '%s' には属性 '%s' がありません\n"
-
-#: commands.cc:2284
-#, c-format
-msgid "No attributes for '%s'"
-msgstr "'%s' について属性はありません"
-
-#: commands.cc:2293
-#, c-format
-msgid "No attribute '%s' on path '%s'"
-msgstr "パス '%s' について '%s' という属性はありません"
-
-#: commands.cc:2312
-#, c-format
-msgid "--message and --message-file are mutually exclusive"
-msgstr "--message と --message-file を同時に指定することはできません"
-
-#: commands.cc:2331
-msgid "commit workspace to database"
-msgstr "ワークスペースをデータベースにコミット"
-
-#: commands.cc:2349
-#, c-format
-msgid "no changes to commit\n"
-msgstr "コミットする変更がありません\n"
-
-#: commands.cc:2363
-#, c-format
-msgid "beginning commit on branch '%s'\n"
-msgstr "ブランチ '%s' についてコミット開始\n"
-
-#: commands.cc:2372
-#, c-format
-msgid ""
-"_MTN/log is non-empty and log message was specified on command line\n"
-"perhaps move or delete _MTN/log,\n"
-"or remove --message/--message-file from the command line?"
-msgstr ""
-"_MTN/log は空ではなく、コマンド行でログメッセージを指定しています。\n"
-"_MTN/log を移動/削除するか、コマンド行から --message/--message-file を\n"
-"消して下さい。"
-
-#: commands.cc:2384
-#, c-format
-msgid "empty log message; commit canceled"
-msgstr "空のログメッセージ; コミットは取り消されました"
-
-#: commands.cc:2403
-#, c-format
-msgid "log message rejected: %s\n"
-msgstr "ログメッセージを拒否: %s\n"
-
-#: commands.cc:2411
-#, c-format
-msgid "revision %s already in database\n"
-msgstr "リビジョン %s は既にデータベース内に存在しています\n"
-
-#: commands.cc:2449 commands.cc:2466 commands.cc:2485
-#, c-format
-msgid "file '%s' modified during commit, aborting"
-msgstr "ファイル '%s' は commit 前に変更されました. 中止します"
-
-#: commands.cc:2511
-#, c-format
-msgid "committed revision %s\n"
-msgstr "リビジョン %s をコミット\n"
-
-#: commands.cc:2517
-#, c-format
-msgid ""
-"note: this revision creates divergence\n"
-"note: you may (or may not) wish to run '%s merge'"
-msgstr ""
-"注意: このリビジョンによって分岐が生じます\n"
-"注意: 分岐を望まないなら '%s merge' を実行して下さい"
-
-#: commands.cc:2712
-msgid ""
-"show current diffs on stdout.\n"
-"If one revision is given, the diff between the workspace and\n"
-"that revision is shown.  If two revisions are given, the diff between\n"
-"them is given.  If no format is specified, unified is used by default."
-msgstr ""
-"現在の差分を標準出力に表示\n"
-"リビジョンが一つ指定されていれば、ワークスペースとそのリビジョンの\n"
-"差分を、二つ指定されていればそれらリビジョン間の差分を表示します。\n"
-"形式が指定されていなければ、デフォルトでは unified 形式を使用します。"
-
-#: commands.cc:2728
-#, c-format
-msgid ""
-"--diff-args requires --external\n"
-"try adding --external or removing --diff-args?"
-msgstr ""
-"--diff-args は --external を必要とします。\n"
-"--external を追加するか、--diff-args を省いてみてはどうですか?"
-
-#: commands.cc:2770
-#, c-format
-msgid "current revision has no ancestor"
-msgstr "現在のリビジョンには祖先がありません"
-
-#: commands.cc:2833
-msgid "no changes"
-msgstr "変更なし"
-
-#: commands.cc:2865
-msgid ""
 "update workspace.\n"
 "This command modifies your workspace to be based off of a\n"
 "different revision, preserving uncommitted changes as it does so.\n"
@@ -1024,17 +690,17 @@
 "コミットされていない変更はそのままにされます。リビジョンを指定して\n"
 "いればそのリビジョンに、未指定なら最新版 (HEAD) に更新します。"

-#: commands.cc:2903
+#: cmd_merging.cc:97
 #, c-format
 msgid "this workspace is a new project; cannot update"
 msgstr "このワークスペースは新規のプロジェクトです; 更新できません。"

-#: commands.cc:2907
-#, c-format
-msgid "updating along branch '%s'..."
+#: cmd_merging.cc:101
+#, fuzzy, c-format
+msgid "updating along branch '%s'"
 msgstr "ブランチ '%s' に沿って更新しています..."

-#: commands.cc:2911
+#: cmd_merging.cc:105
 #, c-format
 msgid ""
 "your request matches no descendents of the current revision\n"
@@ -1045,36 +711,40 @@
 "もしかしたら --revision=<他のブランチのリビジョン> としたいのでは\n"
 "ありませんか?"

-#: commands.cc:2916
+#: cmd_merging.cc:110
 #, c-format
 msgid "multiple update candidates:"
 msgstr "複数の更新候補:"

-#: commands.cc:2920
+#: cmd_merging.cc:114
 #, c-format
 msgid "choose one with '%s update -r<id>'"
 msgstr "'%s update -r<id>' として一つ選択"

-#: commands.cc:2921
+#: cmd_merging.cc:115
 #, c-format
 msgid "multiple update candidates remain after selection"
 msgstr "選択後も複数の候補が残っています"

-#: commands.cc:2936
-#, c-format
-msgid "already up to date at %s\n"
+#: cmd_merging.cc:130
+#, fuzzy, c-format
+msgid "already up to date at %s"
 msgstr "%s は既に最新です\n"

-#: commands.cc:2944
-#, c-format
-msgid "selected update target %s\n"
+#: cmd_merging.cc:138
+#, fuzzy, c-format
+msgid "selected update target %s"
 msgstr "選択された更新ターゲット %s\n"

-#: commands.cc:2974
-#, c-format
+#: cmd_merging.cc:162
+#, fuzzy, c-format
+msgid "target revision is not in current branch"
+msgstr "現在のリビジョンには祖先がありません"
+
+#: cmd_merging.cc:170
+#, fuzzy, c-format
 msgid ""
-"revision %s is a member of multiple branches:\n"
-"%s\n"
+"target revision is in multiple branches:%s\n"
 "\n"
 "try again with explicit --branch"
 msgstr ""
@@ -1083,174 +753,342 @@
 "\n"
 "明示的に --branch を指定して再試行して下さい。"

-#: commands.cc:2980
+#: cmd_merging.cc:178
+#, fuzzy, c-format
+msgid "switching to branch %s"
+msgstr "ブランチ '%s' についてコミット開始\n"
+
+#: cmd_merging.cc:183
 #, c-format
 msgid ""
-"revision %s is a member of\n"
-"%s, updating workspace branch"
+"target revision not in any branch\n"
+"next commit will use branch %s"
 msgstr ""
-"リビジョン %s は %s に属しています\n"
-"ワークスペースブランチを更新しています"

-#: commands.cc:2986
+#: cmd_merging.cc:288
 #, c-format
-msgid ""
-"revision %s is a member of no branches,\n"
-"using branch %s for workspace"
+msgid "switched branch; next commit will use branch %s"
 msgstr ""
-"リビジョン %s はブランチには属していませんので、\n"
-"ワークスペースに %s を使います"

-#: commands.cc:3087
-#, c-format
-msgid "updated to base revision %s\n"
+#: cmd_merging.cc:289
+#, fuzzy, c-format
+msgid "updated to base revision %s"
 msgstr "基準リビジョン %s に更新\n"

-#: commands.cc:3097
+#: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523
+#: cmd_merging.cc:747 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851
+#: cmd_ws_commit.cc:872
+msgid "tree"
+msgstr "ツリー"
+
+#: cmd_merging.cc:299
 msgid "merge unmerged heads of branch"
 msgstr "統合されていないブランチの複数の最新版を統合"

-#: commands.cc:3113
+#: cmd_merging.cc:308 cmd_merging.cc:755
 #, c-format
-msgid "branch '%s' is already merged\n"
+msgid "please specify a branch, with --branch=BRANCH"
+msgstr "--branch=BRANCH というようにブランチを指定して下さい"
+
+#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:760
+#: cmd_ws_commit.cc:430
+#, c-format
+msgid "branch '%s' is empty"
+msgstr "ブランチ '%s' は空です"
+
+#: cmd_merging.cc:315
+#, fuzzy, c-format
+msgid "branch '%s' is already merged"
 msgstr "ブランチ '%s' は既に統合済みです\n"

-#: commands.cc:3121
-#, c-format
-msgid "starting with revision 1 / %d\n"
+#: cmd_merging.cc:323
+#, fuzzy, c-format
+msgid "starting with revision 1 / %d"
 msgstr "リビジョン 1 / %d について作業開始\n"

-#: commands.cc:3125
-#, c-format
-msgid "merging with revision %d / %d\n"
+#: cmd_merging.cc:327
+#, fuzzy, c-format
+msgid "merging with revision %d / %d"
 msgstr "リビジョン %d / %d について統合中\n"

-#: commands.cc:3126 commands.cc:3127 commands.cc:3209 commands.cc:3342
-#: commands.cc:3343
-#, c-format
-msgid "[source] %s\n"
+#: cmd_merging.cc:328 cmd_merging.cc:329 cmd_merging.cc:412 cmd_merging.cc:547
+#: cmd_merging.cc:548
+#, fuzzy, c-format
+msgid "[source] %s"
 msgstr "[元] %s\n"

-#: commands.cc:3144 commands.cc:3307 commands.cc:3361
-#, c-format
-msgid "[merged] %s\n"
+#: cmd_merging.cc:346 cmd_merging.cc:519 cmd_merging.cc:566
+#, fuzzy, c-format
+msgid "[merged] %s"
 msgstr "[統合済み] %s\n"

-#: commands.cc:3147
-#, c-format
-msgid "note: your workspaces have not been updated\n"
+#: cmd_merging.cc:349
+#, fuzzy, c-format
+msgid "note: your workspaces have not been updated"
 msgstr "注意: ワークスペースは更新されていません\n"

-#: commands.cc:3150
+#: cmd_merging.cc:352
 msgid "SOURCE-BRANCH DEST-BRANCH"
 msgstr "SOURCE-BRANCH DEST-BRANCH"

-#: commands.cc:3151
+#: cmd_merging.cc:353
 msgid "merge from one branch to another asymmetrically"
 msgstr "一方のブランチを他方に非同期に統合"

-#: commands.cc:3161
+#: cmd_merging.cc:363
 msgid "SOURCE-BRANCH DEST-BRANCH DIR"
 msgstr "SOURCE-BRANCH DEST-BRANCH DIR"

-#: commands.cc:3162
+#: cmd_merging.cc:364
 msgid "merge one branch into a subdirectory in another branch"
 msgstr "ブランチを他のブランチのサブディレクトリに統合"

-#: commands.cc:3200 commands.cc:3203
-#, c-format
-msgid "branch '%s' is not merged\n"
+#: cmd_merging.cc:403 cmd_merging.cc:406
+#, fuzzy, c-format
+msgid "branch '%s' is not merged"
 msgstr "ブランチ '%s' は統合されていません\n"

-#: commands.cc:3208
-#, c-format
-msgid "propagating %s -> %s\n"
+#: cmd_merging.cc:411
+#, fuzzy, c-format
+msgid "propagating %s -> %s"
 msgstr "伝播中 %s -> %s\n"

-#: commands.cc:3210
-#, c-format
-msgid "[target] %s\n"
+#: cmd_merging.cc:413
+#, fuzzy, c-format
+msgid "[target] %s"
 msgstr "[先] %s\n"

-#: commands.cc:3215
-#, c-format
-msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
+#: cmd_merging.cc:418
+#, fuzzy, c-format
+msgid "branch '%s' is up-to-date with respect to branch '%s'"
 msgstr "ブランチ '%s' はブランチ '%s' に対して最新です\n"

-#: commands.cc:3217
-#, c-format
-msgid "no action taken\n"
+#: cmd_merging.cc:420
+#, fuzzy, c-format
+msgid "no action taken"
 msgstr "何もしません\n"

-#: commands.cc:3221
-#, c-format
-msgid "no merge necessary; putting %s in branch '%s'\n"
+#: cmd_merging.cc:424
+#, fuzzy, c-format
+msgid "no merge necessary; putting %s in branch '%s'"
 msgstr "統合は必要ありません. %s をブランチ '%s' 内に取り込み中\n"

-#: commands.cc:3257
+#: cmd_merging.cc:462
 #, c-format
 msgid "Path %s not found in destination tree."
 msgstr "パス %s は先のツリー内にみつかりません"

-#: commands.cc:3311
-msgid "refresh the inodeprint cache"
-msgstr "i-node 表示キャッシュを更新"
-
-#: commands.cc:3320
+#: cmd_merging.cc:524
 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"
 msgstr "LEFT-REVISION RIGHT-REVISION DEST-BRANCH"

-#: commands.cc:3321
+#: cmd_merging.cc:525
 msgid "merge two explicitly given revisions, placing result in given branch"
 msgstr "明示的に指定した二つのリビジョンを統合。結果は指定ブランチへ。"

-#: commands.cc:3335
+#: cmd_merging.cc:540
 #, c-format
 msgid "%s and %s are the same revision, aborting"
 msgstr "%s と %s は同じリビジョンです. 中止します"

-#: commands.cc:3337 commands.cc:3339
+#: cmd_merging.cc:542 cmd_merging.cc:544
 #, c-format
 msgid "%s is already an ancestor of %s"
 msgstr "%s は既に %s の祖先となっています"

-#: commands.cc:3364
-msgid "(revision|file|key) PARTIAL-ID"
-msgstr "(revision|file|key) PARTIAL-ID"
+#: cmd_merging.cc:569
+msgid "REV REV"
+msgstr "REV REV"

-#: commands.cc:3365
-msgid "complete partial id"
-msgstr "部分 ID を補完"
+#: cmd_merging.cc:570
+msgid ""
+"Show what conflicts would need to be resolved to merge the given revisions."
+msgstr "指定のリビジョンを統合するのに解決が必要な衝突を表示"

-#: commands.cc:3374
+#: cmd_merging.cc:580 cmd_merging.cc:582
+#, fuzzy, c-format
+msgid "%s is an ancestor of %s; no merge is needed."
+msgstr "%s は %s の祖先; 統合は必要ありません"
+
+#: cmd_merging.cc:596
 #, c-format
-msgid "non-hex digits in partial id"
-msgstr "部分 ID に十六進数が含まれていません"
+msgid "There are %s node_name_conflicts."
+msgstr "%s node_name_conflicts があります"

-#: commands.cc:3413
-msgid "revert file(s), dir(s) or entire workspace (\".\")"
-msgstr "ファイル、ディレクトリまたは完全なワークスペース (\".\") の変更を破棄"
+#: cmd_merging.cc:598
+#, c-format
+msgid "There are %s file_content_conflicts."
+msgstr "%s file_content_conflicts があります"

-#: commands.cc:3490
+#: cmd_merging.cc:600
 #, c-format
-msgid "reverting %s"
-msgstr "%s を戻しています"
+msgid "There are %s node_attr_conflicts."
+msgstr "%s node_attr_conflicts があります"

-#: commands.cc:3494
+#: cmd_merging.cc:602
 #, c-format
-msgid "no file version %s found in database for %s"
-msgstr "バージョン %s のファイルはデータベース内にみつかりません (対象: %s)"
+msgid "There are %s orphaned_node_conflicts."
+msgstr "%s orphaned_node_conflicts があります"

-#: commands.cc:3507
+#: cmd_merging.cc:604
 #, c-format
-msgid "recreating %s/"
-msgstr "%s/ を戻しています"
+msgid "There are %s rename_target_conflicts."
+msgstr "%s rename_target_conflicts があります"

-#: commands.cc:3519
+#: cmd_merging.cc:606
+#, c-format
+msgid "There are %s directory_loop_conflicts."
+msgstr "%s directory_loop_conflicts があります"
+
+#: cmd_merging.cc:611
+msgid ""
+"cherrypick changes from other parts of history into workspace.\n"
+"This command takes arbitrary changes made at any point in history,\n"
+"and applies them to your current workspace, as if you had made the\n"
+"edits by hand.\n"
+"If one revision is given, applies the changes made in that revision\n"
+"compared to its parent.\n"
+"If two revisions are given, applies the changes made to get from the\n"
+"first revision to the second."
+msgstr ""
+
+#: cmd_merging.cc:632
+#, c-format
+msgid ""
+"revision %s is a merge\n"
+"to apply the changes relative to one of its parents, use:\n"
+"  %s cherrypatch -r PARENT -r %s"
+msgstr ""
+
+#: cmd_merging.cc:649
+#, fuzzy, c-format
+msgid "no changes to apply"
+msgstr "コミットする変更がありません\n"
+
+#: cmd_merging.cc:740
+#, fuzzy, c-format
+msgid "applied changes to workspace"
+msgstr "ファイルをワークスペースに追加"
+
+#: cmd_merging.cc:747
+msgid "show unmerged head revisions of branch"
+msgstr "ブランチの統合されていない最新リビジョンを表示"
+
+#: cmd_merging.cc:762
+#, fuzzy, c-format
+msgid "branch '%s' is currently merged:"
+msgstr "ブランチ '%s' は現在統合済みです:\n"
+
+#: cmd_merging.cc:764
+#, fuzzy, c-format
+msgid "branch '%s' is currently unmerged:"
+msgstr "ブランチ '%s' は現在未統合です:\n"
+
+#: cmd_merging.cc:771
+msgid "REVID"
+msgstr "REVID"
+
+#: cmd_merging.cc:772
+msgid "dump the roster associated with the given REVID"
+msgstr "指定の REVID について関連づけられた名簿をダンプ"
+
+#: cmd_netsync.cc:40
+#, fuzzy, c-format
+msgid "setting default server to %s"
+msgstr "デフォルトのサーバーを %s に設定\n"
+
+#: cmd_netsync.cc:46
+#, c-format
+msgid "no hostname given"
+msgstr "ホスト名を指定して下さい"
+
+#: cmd_netsync.cc:48
+#, c-format
+msgid "no server given and no default server set"
+msgstr "サーバが未指定であり、デフォルトのサーバーも設定されていません"
+
+#: cmd_netsync.cc:59 cmd_netsync.cc:79
+#, c-format
+msgid "no branch pattern given"
+msgstr "ブランチ名を指定して下さい"
+
+#: cmd_netsync.cc:67
+#, fuzzy, c-format
+msgid "setting default branch include pattern to '%s'"
+msgstr "ブランチ名に含めるデフォルトパターンを '%s' に設定\n"
+
+#: cmd_netsync.cc:73
+#, fuzzy, c-format
+msgid "setting default branch exclude pattern to '%s'"
+msgstr "ブランチ名に含めないデフォルトパターンを '%s' に設定\n"
+
+#: cmd_netsync.cc:81
+#, c-format
+msgid "no branch pattern given and no default pattern set"
+msgstr "ブランチパターンが未指定、かつデフォルトパターンも設定されていません"
+
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 cmd_netsync.cc:173
+msgid "network"
+msgstr "ネットワーク"
+
+#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126
+msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
+msgstr "[ADDRESS[:PORTNUMBER] [PATTERN]]"
+
+#: cmd_netsync.cc:98
+msgid "push branches matching PATTERN to netsync server at ADDRESS"
+msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) にプッシュ"
+
+#: cmd_netsync.cc:113
+msgid "pull branches matching PATTERN from netsync server at ADDRESS"
+msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) から取り込み"
+
+#: cmd_netsync.cc:120
+#, fuzzy, c-format
+msgid "doing anonymous pull; use -kKEYNAME if you need authentication"
+msgstr "匿名で取り込んでいます; 認証が必要な場合は -kKEYNAME を使って下さい\n"
+
+#: cmd_netsync.cc:127
+msgid "sync branches matching PATTERN with netsync server at ADDRESS"
+msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) と同期"
+
+#: cmd_netsync.cc:149
+#, c-format
+msgid "pid file '%s' already exists"
+msgstr "PID ファイル '%s' は既に存在しています"
+
+#: cmd_netsync.cc:151
+#, fuzzy, c-format
+msgid "failed to create pid file '%s'"
+msgstr "オプションファイル '%s' の解析に失敗"
+
+#: cmd_netsync.cc:173
+msgid "PATTERN ..."
+msgstr "PATTERN..."
+
+#: cmd_netsync.cc:174
+msgid "serve the branches specified by PATTERNs to connecting clients"
+msgstr "PATTERNs で指定したブランチを接続クライアントに提供"
+
+#: cmd_netsync.cc:189
+#, c-format
+msgid ""
+"need permission to store persistent passphrase (see hook persist_phrase_ok())"
+msgstr ""
+"パスフレーズをずっと保存しておきたいのなら権限が必要です。 (フック "
+"persist_phrase_ok() を参照)"
+
+#: cmd_netsync.cc:195
+#, c-format
+msgid ""
+"The --no-transport-auth option is only permitted in combination with --stdio"
+msgstr ""
+
+#: cmd_othervcs.cc:15
 msgid "RCSFILE..."
 msgstr "RCSFILE..."

-#: commands.cc:3520
+#: cmd_othervcs.cc:16
 msgid ""
 "parse versions in RCS files\n"
 "this command doesn't reconstruct or import revisions.you probably want "
@@ -1260,484 +1098,666 @@
 "このコマンドは (CVS の) リビジョンを再構築または取り込みはしません。おそらく"
 "あなたの期待しているのは cvs_import でしょう。"

-#: commands.cc:3536
+#: cmd_othervcs.cc:32
 msgid "rcs"
 msgstr "RCS 関連"

-#: commands.cc:3536
+#: cmd_othervcs.cc:32
 msgid "CVSROOT"
 msgstr "CVSROOT"

-#: commands.cc:3536
+#: cmd_othervcs.cc:33
 msgid "import all versions in CVS repository"
 msgstr "CVS リポジトリ内のすべてのバージョンを取り込む"

-#: commands.cc:3599
-msgid "PATH"
-msgstr "PATH"
+#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69
+msgid "packet i/o"
+msgstr "パケット I/O"

-#: commands.cc:3600
-msgid "print annotated copy of the file from REVISION"
-msgstr "REVISION の注釈付きのファイルのコピーを表示"
+#: cmd_packet.cc:21 cmd_packet.cc:50
+msgid "ID"
+msgstr "ID"

-#: commands.cc:3620
+#: cmd_packet.cc:22
+msgid "write public key packet to stdout"
+msgstr "公開鍵パケットを標準出力に出力"
+
+#: cmd_packet.cc:44
 #, c-format
-msgid "no revision for file '%s' in database"
-msgstr "ファイル '%s' に対するリビジョンはデータベース内にみつかりませんでした"
+msgid "public key '%s' does not exist"
+msgstr "公開鍵 '%s' は存在しません"

-#: commands.cc:3638
-msgid "[FILE] ..."
-msgstr "[FILE] ..."
+#: cmd_packet.cc:51
+msgid "write private key packet to stdout"
+msgstr "秘密鍵パケットを標準出力に出力"

-#: commands.cc:3639
+#: cmd_packet.cc:59
+#, c-format
+msgid "public and private key '%s' do not exist in keystore"
+msgstr "公開または秘密鍵 '%s' は鍵の保存場所に存在しません"
+
+#: cmd_packet.cc:70
+msgid "read packets from files or stdin"
+msgstr "ファイルまたは標準入力からパケットを読み込み"
+
+#: cmd_packet.cc:78
+#, c-format
+msgid "no packets found on stdin"
+msgstr "標準入力にパケットをみつけることができませんでした"
+
+#: cmd_packet.cc:90
+#, c-format
+msgid "no packets found in given file"
+msgid_plural "no packets found in given files"
+msgstr[0] "ファイル内にパケットは含まれていません"
+msgstr[1] "ファイル内にパケットは含まれていません"
+
+#: cmd_packet.cc:94
+#, c-format
+msgid "read %d packet"
+msgid_plural "read %d packets"
+msgstr[0] "%d パケット読み込み"
+msgstr[1] "%d パケット読み込み"
+
+#: cmd_ws_commit.cc:42
 msgid ""
-"print history in reverse order (filtering by 'FILE'). If one or more\n"
-"revisions are given, use them as a starting point."
+"Enter a description of this change.\n"
+"Lines beginning with `MTN:' are removed automatically.\n"
 msgstr ""
-"降順で履歴を表示 ('FILE' でフィルタ)。一つ以上のリビジョンが指定されて\n"
-"いればそれを開始点として利用。"
+"この変更の説明を入力して下さい\n"
+"'MTN:' で始まる行は自動的に削除されます\n"

-#: commands.cc:3687
+#: cmd_ws_commit.cc:50
 #, c-format
-msgid "Unknown file '%s' for log command"
-msgstr "ログコマンドに対して不明なファイル '%s'"
+msgid "edit of log message failed"
+msgstr "ログメッセージの編集に失敗しました"

-#: commands.cc:3705
+#: cmd_ws_commit.cc:54
+msgid "revert file(s), dir(s) or entire workspace (\".\")"
+msgstr "ファイル、ディレクトリまたは完全なワークスペース (\".\") の変更を破棄"
+
+#: cmd_ws_commit.cc:137
 #, c-format
-msgid "only one of --last/--next allowed"
-msgstr "--last/--next のどちらかのみが許されています"
+msgid "reverting %s"
+msgstr "%s を戻しています"

-#: commands.cc:3873
-msgid "[DIRECTORY]"
-msgstr "[DIRECTORY]"
+#: cmd_ws_commit.cc:141
+#, c-format
+msgid "no file version %s found in database for %s"
+msgstr "バージョン %s のファイルはデータベース内にみつかりません (対象: %s)"

-#: commands.cc:3873
-msgid "setup a new workspace directory, default to current"
-msgstr "新しいワークスペースディレクトリを作成 (デフォルト: 現在の場所)"
+#: cmd_ws_commit.cc:154
+#, c-format
+msgid "recreating %s/"
+msgstr "%s/ を戻しています"

-#: commands.cc:3879
+#: cmd_ws_commit.cc:172
+msgid "disapprove of a particular revision"
+msgstr "特定のリビジョンを非承認"
+
+#: cmd_ws_commit.cc:185
 #, c-format
-msgid "need --branch argument for setup"
-msgstr "作成には --branch 引数が必要です"
+msgid "revision '%s' has %d changesets, cannot invert\n"
+msgstr "リビジョン '%s' には %d 個の変更セットがあり、反転できません\n"

-#: commands.cc:3893
-msgid "automation"
-msgstr "自動化"
+#: cmd_ws_commit.cc:189
+#, c-format
+msgid "need --branch argument for disapproval"
+msgstr "非承認とするには --branch 引数が必要です"

-#: commands.cc:3894
+#: cmd_ws_commit.cc:225
+msgid "add files to workspace"
+msgstr "ファイルをワークスペースに追加"
+
+#: cmd_ws_commit.cc:252
+msgid "drop files from workspace"
+msgstr "ファイルをワークスペースから削除"
+
+#: cmd_ws_commit.cc:279
 msgid ""
-"interface_version\n"
-"heads [BRANCH]\n"
-"ancestors REV1 [REV2 [REV3 [...]]]\n"
-"attributes [FILE]\n"
-"parents REV\n"
-"descendents REV1 [REV2 [REV3 [...]]]\n"
-"children REV\n"
-"graph\n"
-"erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n"
-"toposort [REV1 [REV2 [REV3 [...]]]]\n"
-"ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n"
-"leaves\n"
-"inventory\n"
-"stdio\n"
-"certs REV\n"
-"select SELECTOR\n"
-"get_file FILEID\n"
-"get_manifest_of [REVID]\n"
-"get_revision [REVID]\n"
-"packet_for_rdata REVID\n"
-"packets_for_certs REVID\n"
-"packet_for_fdata FILEID\n"
-"packet_for_fdelta OLD_FILE NEW_FILE\n"
-"keys\n"
+"SRC DEST\n"
+"SRC1 [SRC2 [...]] DEST_DIR"
 msgstr ""
-"interface_version\n"
-"heads [BRANCH]\n"
-"ancestors REV1 [REV2 [REV3 [...]]]\n"
-"attributes [FILE]\n"
-"parents REV\n"
-"descendents REV1 [REV2 [REV3 [...]]]\n"
-"children REV\n"
-"graph\n"
-"erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n"
-"toposort [REV1 [REV2 [REV3 [...]]]]\n"
-"ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n"
-"leaves\n"
-"inventory\n"
-"stdio\n"
-"certs REV\n"
-"select SELECTOR\n"
-"get_file FILEID\n"
-"get_manifest_of [REVID]\n"
-"get_revision [REVID]\n"
-"packet_for_rdata REVID\n"
-"packets_for_certs REVID\n"
-"packet_for_fdata FILEID\n"
-"packet_for_fdelta OLD_FILE NEW_FILE\n"
-"keys\n"
+"SRC DEST\n"
+"SRC1 [SRC2 [...]] DEST_DIR"

-#: commands.cc:3918
-msgid "automation interface"
-msgstr "自動化インターフェース"
+#: cmd_ws_commit.cc:281
+msgid "rename entries in the workspace"
+msgstr "ワークスペース内のエントリの名称を変更"

-#: commands.cc:3932 commands.cc:3948
-msgid "vars"
-msgstr "変数"
+#: cmd_ws_commit.cc:303
+msgid "NEW_ROOT PUT_OLD"
+msgstr "NEW_ROOT PUT_OLD"

-#: commands.cc:3932
-msgid "DOMAIN NAME VALUE"
-msgstr "DOMAIN NAME VALUE"
+#: cmd_ws_commit.cc:304
+msgid ""
+"rename the root directory\n"
+"after this command, the directory that currently has the name NEW_ROOT\n"
+"will be the root directory, and the directory that is currently the root\n"
+"directory will have name PUT_OLD.\n"
+"Using --execute is strongly recommended."
+msgstr ""
+"ルートディレクトリの変更\n"
+"このコマンドの後に、NEW_ROOT という名前でルートディレクトリになる予定の\n"
+"ディレクトリと、PUT_OLD という名前の現在のルートディレクトリを指定します。\n"
+"--execute の使用を強く推奨します。"

-#: commands.cc:3933
-msgid "set the database variable NAME to VALUE, in domain DOMAIN"
-msgstr "ドメイン DOMAIN のデータベース変数 NAME を VALUE に設定"
+#: cmd_ws_commit.cc:323
+msgid "show status of workspace"
+msgstr "ワークスペースの状態を表示"

-#: commands.cc:3948
-msgid "DOMAIN NAME"
-msgstr "DOMAIN NAME"
+#: cmd_ws_commit.cc:385
+msgid "[DIRECTORY]\n"
+msgstr "[DIRECTORY]\n"

-#: commands.cc:3949
-msgid "remove the database variable NAME in domain DOMAIN"
-msgstr "ドメイン DOMAIN のデータベース変数 NAME を消去"
+#: cmd_ws_commit.cc:386
+msgid ""
+"check out a revision from database into directory.\n"
+"If a revision is given, that's the one that will be checked out.\n"
+"Otherwise, it will be the head of the branch (given or implicit).\n"
+"If no directory is given, the branch name will be used as directory"
+msgstr ""
+"データベースからあるリビジョンを取り出してディレクトリに\n"
+"書き出します。リビジョンが指定されていればそれを取り出し、\n"
+"未指定なら、明示的または暗黙的に指定されたブランチの最新版を\n"
+"取り出します。ディレクトリが未指定ならディレクトリ名として\n"
+"ブランチ名を使います"

-#: commands.cc:3960
+#: cmd_ws_commit.cc:406 cmd_ws_commit.cc:425
 #, c-format
-msgid "no var with name %s in domain %s"
-msgstr "%s という変数はドメイン %s 内にはありません"
+msgid "need --branch argument for branch-based checkout"
+msgstr "ブランチを基準にしたチェックアウトには --branch 引数が必要です"

-#: commands.cc:3964
-msgid "REVID"
-msgstr "REVID"
+#: cmd_ws_commit.cc:419
+#, c-format
+msgid "checkout directory '%s' already exists"
+msgstr "取り出すディレクトリ '%s' は既に存在しています"

-#: commands.cc:3965
-msgid "dump the roster associated with the given REVID"
-msgstr "指定の REVID について関連づけられた名簿をダンプ"
+#: cmd_ws_commit.cc:433
+#, c-format
+msgid "branch %s has multiple heads:"
+msgstr "ブランチ %s には複数の最新版 (HEAD) が存在しています:"

-#: commands.cc:3983
-msgid "REV REV"
-msgstr "REV REV"
+#: cmd_ws_commit.cc:436
+#, c-format
+msgid "choose one with '%s checkout -r<id>'"
+msgstr "'%s update -r<id>' で一つを選択して下さい"

-#: commands.cc:3983
+#: cmd_ws_commit.cc:437
+#, c-format
+msgid "branch %s has multiple heads"
+msgstr "ブランチ %s には複数の最新版 (HEAD) が存在しています"
+
+#: cmd_ws_commit.cc:464
+#, fuzzy, c-format
+msgid "revision %s is not a member of branch %s"
+msgstr "リビジョン %s はブランチ %s には属していません\n"
+
+#: cmd_ws_commit.cc:497
+#, c-format
+msgid "no file %s found in database for %s"
+msgstr "ファイル %s (対象 %s)はデータベース内にはみつかりません"
+
+#: cmd_ws_commit.cc:515
 msgid ""
-"Show what conflicts would need to be resolved to merge the given revisions."
-msgstr "指定のリビジョンを統合するのに解決が必要な衝突を表示"
+"set PATH ATTR VALUE\n"
+"get PATH [ATTR]\n"
+"drop PATH [ATTR]"
+msgstr ""
+"set PATH ATTR VALUE\n"
+"get PATH [ATTR]\n"
+"drop PATH [ATTR]"

-#: commands.cc:3992 commands.cc:3994
+#: cmd_ws_commit.cc:516
+msgid "set, get or drop file attributes"
+msgstr "ファイル属性を設定/取得/削除"
+
+#: cmd_ws_commit.cc:533
 #, c-format
-msgid "%s in an ancestor of %s; no merge is needed."
-msgstr "%s は %s の祖先; 統合は必要ありません"
+msgid "Unknown path '%s'"
+msgstr "不明なパス '%s'"

-#: commands.cc:4008
+#: cmd_ws_commit.cc:562
 #, c-format
-msgid "There are %s node_name_conflicts."
-msgstr "%s node_name_conflicts があります"
+msgid "Path '%s' does not have attribute '%s'\n"
+msgstr "パス '%s' には属性 '%s' がありません\n"

-#: commands.cc:4009
+#: cmd_ws_commit.cc:590
 #, c-format
-msgid "There are %s file_content_conflicts."
-msgstr "%s file_content_conflicts があります"
+msgid "No attributes for '%s'"
+msgstr "'%s' について属性はありません"

-#: commands.cc:4010
+#: cmd_ws_commit.cc:601
 #, c-format
-msgid "There are %s node_attr_conflicts."
-msgstr "%s node_attr_conflicts があります"
+msgid "No attribute '%s' on path '%s'"
+msgstr "パス '%s' について '%s' という属性はありません"

-#: commands.cc:4011
+#: cmd_ws_commit.cc:614
+msgid "commit workspace to database"
+msgstr "ワークスペースをデータベースにコミット"
+
+#: cmd_ws_commit.cc:648
+#, fuzzy, c-format
+msgid "no changes to commit"
+msgstr "コミットする変更がありません\n"
+
+#: cmd_ws_commit.cc:662
+#, fuzzy, c-format
+msgid "beginning commit on branch '%s'"
+msgstr "ブランチ '%s' についてコミット開始\n"
+
+#: cmd_ws_commit.cc:671
 #, c-format
-msgid "There are %s orphaned_node_conflicts."
-msgstr "%s orphaned_node_conflicts があります"
+msgid ""
+"_MTN/log is non-empty and log message was specified on command line\n"
+"perhaps move or delete _MTN/log,\n"
+"or remove --message/--message-file from the command line?"
+msgstr ""
+"_MTN/log は空ではなく、コマンド行でログメッセージを指定しています。\n"
+"_MTN/log を移動/削除するか、コマンド行から --message/--message-file を\n"
+"消して下さい。"

-#: commands.cc:4012
+#: cmd_ws_commit.cc:686
 #, c-format
-msgid "There are %s rename_target_conflicts."
-msgstr "%s rename_target_conflicts があります"
+msgid "empty log message; commit canceled"
+msgstr "空のログメッセージ; コミットは取り消されました"

-#: commands.cc:4013
+#: cmd_ws_commit.cc:707
+#, fuzzy, c-format
+msgid "log message rejected: %s"
+msgstr "ログメッセージを拒否: %s\n"
+
+#: cmd_ws_commit.cc:715
+#, fuzzy, c-format
+msgid "revision %s already in database"
+msgstr "リビジョン %s は既にデータベース内に存在しています\n"
+
+#: cmd_ws_commit.cc:754 cmd_ws_commit.cc:784
 #, c-format
-msgid "There are %s directory_loop_conflicts."
-msgstr "%s directory_loop_conflicts があります"
+msgid "file '%s' modified during commit, aborting"
+msgstr "ファイル '%s' は commit 前に変更されました. 中止します"

-#: database_check.cc:125
+#: cmd_ws_commit.cc:766
+#, fuzzy, c-format
+msgid "Your database is missing version %s of file '%s'"
+msgstr "ファイル %s 内のデータベースバージョンを検出できませんでした"
+
+#: cmd_ws_commit.cc:812
+#, fuzzy, c-format
+msgid "committed revision %s"
+msgstr "リビジョン %s をコミット\n"
+
+#: cmd_ws_commit.cc:818
+#, c-format
+msgid ""
+"note: this revision creates divergence\n"
+"note: you may (or may not) wish to run '%s merge'"
+msgstr ""
+"注意: このリビジョンによって分岐が生じます\n"
+"注意: 分岐を望まないなら '%s merge' を実行して下さい"
+
+#: cmd_ws_commit.cc:851
+msgid "[DIRECTORY]"
+msgstr "[DIRECTORY]"
+
+#: cmd_ws_commit.cc:852
+msgid "setup a new workspace directory, default to current"
+msgstr "新しいワークスペースディレクトリを作成 (デフォルト: 現在の場所)"
+
+#: cmd_ws_commit.cc:858
+#, c-format
+msgid "need --branch argument for setup"
+msgstr "作成には --branch 引数が必要です"
+
+#: cmd_ws_commit.cc:873
+msgid "refresh the inodeprint cache"
+msgstr "i-node 表示キャッシュを更新"
+
+#: commands.cc:124 commands.cc:225
+#, fuzzy, c-format
+msgid "unknown command '%s'"
+msgstr "不明なコマンド '%s'\n"
+
+#: commands.cc:135
+#, c-format
+msgid "command '%s' has multiple ambiguous expansions:\n"
+msgstr "'%s' だけでは曖昧で、展開できるコマンド候補は複数あります:\n"
+
+#: commands.cc:168
+msgid "commands:"
+msgstr "コマンド:"
+
+#: commands.cc:246
+msgid "command [ARGS...]"
+msgstr "command [ARGS...]"
+
+#: commands.cc:246
+msgid "display command help"
+msgstr "コマンドヘルプを表示"
+
+#: commands.cc:377
+#, fuzzy, c-format
+msgid "expanding selection '%s'"
+msgstr "セレクション '%s' を展開\n"
+
+#: commands.cc:385
+#, c-format
+msgid "no match for selection '%s'"
+msgstr "セレクション '%s' に一致するものがありません"
+
+#: commands.cc:391
+#, fuzzy, c-format
+msgid "expanded to '%s'"
+msgstr "'%s' に展開\n"
+
+#: commands.cc:408
+#, c-format
+msgid "selection '%s' has multiple ambiguous expansions: \n"
+msgstr "'%s' だけでは曖昧で、展開できるセレクションの候補は複数あります: \n"
+
+#: commands.cc:425
+msgid "note: "
+msgstr "ノート: "
+
+#: commands.cc:426
+#, c-format
+msgid ""
+"branch '%s' has multiple heads\n"
+"perhaps consider '%s merge'"
+msgstr ""
+"ブランチ '%s' には複数の最新版 (HEAD) があります\n"
+"’%s merge' を実行した方がよいでしょう"
+
+#: commands.cc:444
+#, c-format
+msgid "--message and --message-file are mutually exclusive"
+msgstr "--message と --message-file を同時に指定することはできません"
+
+#: database_check.cc:133
+#, c-format
+msgid "file structure is corrupted; cannot check further"
+msgstr ""
+
+#: database_check.cc:144
 msgid "files"
 msgstr "ファイル"

-#: database_check.cc:154
+#: database_check.cc:173
 msgid "rosters"
 msgstr "名簿"

-#: database_check.cc:221
+#: database_check.cc:240
 msgid "markings"
 msgstr "印"

-#: database_check.cc:319 netsync.cc:2782 rcs_import.cc:1226
+#: database_check.cc:338 netsync.cc:2980 rcs_import.cc:1244
 msgid "revisions"
 msgstr "リビジョン"

-#: database_check.cc:418
+#: database_check.cc:437
 msgid "ancestry"
 msgstr "祖先"

-#: database_check.cc:451 netsync.cc:2786
+#: database_check.cc:470 netsync.cc:2984
 msgid "keys"
 msgstr "鍵"

-#: database_check.cc:477
+#: database_check.cc:496
 msgid "certs"
 msgstr "証明"

-#: database_check.cc:514
-#, c-format
-msgid "file %s missing (%d manifest references)\n"
+#: database_check.cc:533
+#, fuzzy, c-format
+msgid "file %s missing (%d manifest references)"
 msgstr "ファイル %s がありません (マニフェスト参照: %d)\n"

-#: database_check.cc:521
-#, c-format
-msgid "file %s unreferenced\n"
+#: database_check.cc:540
+#, fuzzy, c-format
+msgid "file %s unreferenced"
 msgstr "ファイル %s は参照されていません\n"

-#: database_check.cc:542
-#, c-format
-msgid "roster %s unreferenced\n"
+#: database_check.cc:561
+#, fuzzy, c-format
+msgid "roster %s unreferenced"
 msgstr "名簿 %s は参照されていません\n"

-#: database_check.cc:548
-#, c-format
-msgid "roster %s incomplete (%d missing files)\n"
+#: database_check.cc:567
+#, fuzzy, c-format
+msgid "roster %s incomplete (%d missing files)"
 msgstr "名簿 %s は不完全です (みつからないファイル: %d)\n"

-#: database_check.cc:555
-#, c-format
-msgid "roster %s incomplete (%d missing revisions)\n"
+#: database_check.cc:574
+#, fuzzy, c-format
+msgid "roster %s incomplete (%d missing revisions)"
 msgstr "名簿 %s は不完全です (みつからないリビジョン: %d)\n"

-#: database_check.cc:562
-#, c-format
-msgid "roster %s is not parseable (perhaps with unnormalized paths?)\n"
+#: database_check.cc:581
+#, fuzzy, c-format
+msgid "roster %s is not parseable (perhaps with unnormalized paths?)"
 msgstr "名簿 %s を解析できません (パスが正規化されていないのでは?)\n"

-#: database_check.cc:569
-#, c-format
-msgid "roster %s is not in normalized form\n"
+#: database_check.cc:588
+#, fuzzy, c-format
+msgid "roster %s is not in normalized form"
 msgstr "名簿 %s は正規化された形式になっていません\n"

-#: database_check.cc:594
-#, c-format
+#: database_check.cc:613
+#, fuzzy, c-format
 msgid ""
 "revision %s missing (%d revision references; %d cert references; %d parent "
-"references; %d child references; %d roster references)\n"
+"references; %d child references; %d roster references)"
 msgstr ""
 "リビジョン %s がありません (リビジョン参照: %d, 証明参照: %d, 親参照: %d, 子"
 "参照: %d, 名簿参照: %d)\n"

-#: database_check.cc:602
-#, c-format
-msgid "revision %s incomplete (%d missing manifests)\n"
+#: database_check.cc:621
+#, fuzzy, c-format
+msgid "revision %s incomplete (%d missing manifests)"
 msgstr "リビジョン %s は不完全です (みつからないマニフェスト: %d)\n"

-#: database_check.cc:609
-#, c-format
-msgid "revision %s incomplete (%d missing revisions)\n"
+#: database_check.cc:628
+#, fuzzy, c-format
+msgid "revision %s incomplete (%d missing revisions)"
 msgstr "リビジョン %s は不完全です (みつからないリビジョン: %d)\n"

-#: database_check.cc:616
-#, c-format
-msgid "revision %s incomplete (missing roster link)\n"
+#: database_check.cc:635
+#, fuzzy, c-format
+msgid "revision %s incomplete (missing roster link)"
 msgstr "リビジョン %s は不完全です (名簿のリンクがありません)\n"

-#: database_check.cc:622
-#, c-format
-msgid "revision %s incomplete (missing roster)\n"
+#: database_check.cc:641
+#, fuzzy, c-format
+msgid "revision %s incomplete (missing roster)"
 msgstr "リビジョン %s は不完全です (名簿がありません)\n"

-#: database_check.cc:628
-#, c-format
-msgid "revision %s mismatched roster and manifest\n"
+#: database_check.cc:647
+#, fuzzy, c-format
+msgid "revision %s mismatched roster and manifest"
 msgstr "リビジョン %s の名簿とマニフェストが一致していません\n"

-#: database_check.cc:634
-#, c-format
-msgid "revision %s incomplete (incomplete roster)\n"
+#: database_check.cc:653
+#, fuzzy, c-format
+msgid "revision %s incomplete (incomplete roster)"
 msgstr "リビジョン %s は不完全です (名簿が不完全)\n"

-#: database_check.cc:640
-#, c-format
-msgid ""
-"revision %s mismatched parents (%d ancestry parents; %d revision refs)\n"
+#: database_check.cc:659
+#, fuzzy, c-format
+msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)"
 msgstr "リビジョン %s は親と不一致です (親: %d; リビジョン参照: %d)\n"

-#: database_check.cc:649
-#, c-format
-msgid "revision %s mismatched children (%d ancestry children; %d parents)\n"
+#: database_check.cc:668
+#, fuzzy, c-format
+msgid "revision %s mismatched children (%d ancestry children; %d parents)"
 msgstr "リビジョン %s は子と不一致です (子: %d; 親: %d)\n"

-#: database_check.cc:661
-#, c-format
-msgid "revision %s has bad history (%s)\n"
+#: database_check.cc:680
+#, fuzzy, c-format
+msgid "revision %s has bad history (%s)"
 msgstr "リビジョン %s は不正な履歴 (%s) を持っています\n"

-#: database_check.cc:668
-#, c-format
-msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n"
+#: database_check.cc:687
+#, fuzzy, c-format
+msgid "revision %s is not parseable (perhaps with unnormalized paths?)"
 msgstr "リビジョン %s を解析できません (パスが正規化されていないのでは?)\n"

-#: database_check.cc:675
-#, c-format
-msgid "revision %s is not in normalized form\n"
+#: database_check.cc:694
+#, fuzzy, c-format
+msgid "revision %s is not in normalized form"
 msgstr "リビジョン %s は正規化された形式ではありません\n"

-#: database_check.cc:699
-#, c-format
-msgid "key %s missing (signed %d certs)\n"
+#: database_check.cc:718
+#, fuzzy, c-format
+msgid "key %s missing (signed %d certs)"
 msgstr "鍵 %s がありません (%d 個の証明を署名)\n"

-#: database_check.cc:732
-#, c-format
-msgid "revision %s unchecked signature in %s cert from missing key %s\n"
+#: database_check.cc:751
+#, fuzzy, c-format
+msgid "revision %s unchecked signature in %s cert from missing key %s"
 msgstr ""
 "リビジョン %s の %s 証明(失われた鍵 %s) の署名は検証されたものではありませ"
 "ん\n"

-#: database_check.cc:740
-#, c-format
-msgid "revision %s bad signature in %s cert from key %s\n"
+#: database_check.cc:759
+#, fuzzy, c-format
+msgid "revision %s bad signature in %s cert from key %s"
 msgstr "リビジョン %s の %s 証明 (鍵 %s) の不正な署名を無視します\n"

-#: database_check.cc:755
-#, c-format
-msgid "revision %s missing %s cert\n"
+#: database_check.cc:774
+#, fuzzy, c-format
+msgid "revision %s missing %s cert"
 msgstr "リビジョン %s は %s 証明を欠いています\n"

-#: database_check.cc:764
-#, c-format
-msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)\n"
+#: database_check.cc:783
+#, fuzzy, c-format
+msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)"
 msgstr "リビジョン %s は証明に合致しません (%d 作者 %d 日時 %d 変更ログ)\n"

-#: database_check.cc:844
-#, c-format
-msgid "%d missing files\n"
+#: database_check.cc:870
+#, fuzzy, c-format
+msgid "%d missing files"
 msgstr "みつからないファイル: %d\n"

-#: database_check.cc:846
-#, c-format
-msgid "%d unreferenced files\n"
+#: database_check.cc:872
+#, fuzzy, c-format
+msgid "%d unreferenced files"
 msgstr "参照されていないファイル: %d\n"

-#: database_check.cc:849
-#, c-format
-msgid "%d unreferenced rosters\n"
+#: database_check.cc:875
+#, fuzzy, c-format
+msgid "%d unreferenced rosters"
 msgstr "参照されていない名簿: %d\n"

-#: database_check.cc:851
-#, c-format
-msgid "%d incomplete rosters\n"
+#: database_check.cc:877
+#, fuzzy, c-format
+msgid "%d incomplete rosters"
 msgstr "不完全な名簿: %d\n"

-#: database_check.cc:853
-#, c-format
-msgid "%d rosters not parseable (perhaps with invalid paths)\n"
+#: database_check.cc:879
+#, fuzzy, c-format
+msgid "%d rosters not parseable (perhaps with invalid paths)"
 msgstr "解析できない名簿 (パスが不適切なのでは?): %d\n"

-#: database_check.cc:856
-#, c-format
-msgid "%d rosters not in normalized form\n"
+#: database_check.cc:882
+#, fuzzy, c-format
+msgid "%d rosters not in normalized form"
 msgstr "正規化された形式になっていない名簿: %d\n"

-#: database_check.cc:859
-#, c-format
-msgid "%d missing revisions\n"
+#: database_check.cc:885
+#, fuzzy, c-format
+msgid "%d missing revisions"
 msgstr "みつからないリビジョン: %d\n"

-#: database_check.cc:861
-#, c-format
-msgid "%d incomplete revisions\n"
+#: database_check.cc:887
+#, fuzzy, c-format
+msgid "%d incomplete revisions"
 msgstr "不完全なリビジョン: %d\n"

-#: database_check.cc:863
-#, c-format
-msgid "%d mismatched parents\n"
+#: database_check.cc:889
+#, fuzzy, c-format
+msgid "%d mismatched parents"
 msgstr "一致しない親: %d\n"

-#: database_check.cc:865
-#, c-format
-msgid "%d mismatched children\n"
+#: database_check.cc:891
+#, fuzzy, c-format
+msgid "%d mismatched children"
 msgstr "一致しない子: %d\n"

-#: database_check.cc:867
-#, c-format
-msgid "%d revisions with bad history\n"
+#: database_check.cc:893
+#, fuzzy, c-format
+msgid "%d revisions with bad history"
 msgstr "不正な履歴を持つリビジョン: %d\n"

-#: database_check.cc:869
-#, c-format
-msgid "%d revisions not parseable (perhaps with invalid paths)\n"
+#: database_check.cc:895
+#, fuzzy, c-format
+msgid "%d revisions not parseable (perhaps with invalid paths)"
 msgstr "解析できないリビジョン (パスが不適切なのでは?): %d\n"

-#: database_check.cc:872
-#, c-format
-msgid "%d revisions not in normalized form\n"
+#: database_check.cc:898
+#, fuzzy, c-format
+msgid "%d revisions not in normalized form"
 msgstr "正規化された形式になっていないリビジョン: %d\n"

-#: database_check.cc:876
-#, c-format
-msgid "%d unreferenced roster links\n"
+#: database_check.cc:902
+#, fuzzy, c-format
+msgid "%d unreferenced roster links"
 msgstr "参照されていない名簿リンク: %d\n"

-#: database_check.cc:879
-#, c-format
-msgid "%d missing rosters\n"
+#: database_check.cc:905
+#, fuzzy, c-format
+msgid "%d missing rosters"
 msgstr "みつからない名簿: %d\n"

-#: database_check.cc:883
-#, c-format
-msgid "%d missing keys\n"
+#: database_check.cc:909
+#, fuzzy, c-format
+msgid "%d missing keys"
 msgstr "みつからない鍵: %d\n"

-#: database_check.cc:886
-#, c-format
-msgid "%d missing certs\n"
+#: database_check.cc:912
+#, fuzzy, c-format
+msgid "%d missing certs"
 msgstr "みつからない証明: %d\n"

-#: database_check.cc:888
-#, c-format
-msgid "%d mismatched certs\n"
+#: database_check.cc:914
+#, fuzzy, c-format
+msgid "%d mismatched certs"
 msgstr "一致しない証明: %d\n"

-#: database_check.cc:890
-#, c-format
-msgid "%d unchecked signatures due to missing keys\n"
+#: database_check.cc:916
+#, fuzzy, c-format
+msgid "%d unchecked signatures due to missing keys"
 msgstr "鍵がみつからないために検証されていない署名: %d\n"

-#: database_check.cc:892
-#, c-format
-msgid "%d bad signatures\n"
+#: database_check.cc:918
+#, fuzzy, c-format
+msgid "%d bad signatures"
 msgstr "不正な署名: %d\n"

-#: database_check.cc:918
-#, c-format
-msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs\n"
+#: database_check.cc:944
+#, fuzzy, c-format
+msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs"
 msgstr "検証完了: ファイル: %d, 名簿: %d, リビジョン: %d, 鍵: %d, 証明: %d\n"

-#: database_check.cc:924
-#, c-format
-msgid "total problems detected: %d (%d serious)\n"
+#: database_check.cc:950
+#, fuzzy, c-format
+msgid "total problems detected: %d (%d serious)"
 msgstr "検出した障害総計: %d (深刻: %d)\n"

-#: database_check.cc:926
+#: database_check.cc:952
 #, c-format
 msgid "serious problems detected"
 msgstr "深刻な問題を検出しました"

-#: database_check.cc:928
-#, c-format
-msgid "minor problems detected\n"
+#: database_check.cc:954
+#, fuzzy, c-format
+msgid "minor problems detected"
 msgstr "軽微な問題を検出しました\n"

-#: database_check.cc:930
-#, c-format
-msgid "database is good\n"
+#: database_check.cc:956
+#, fuzzy, c-format
+msgid "database is good"
 msgstr "データベースは正常です\n"

-#: database.cc:141
+#: database.cc:156
 #, c-format
 msgid ""
 "layout of database %s doesn't match this version of monotone\n"
@@ -1750,12 +1770,12 @@
 "'%s db migrate' として更新してみて下さい\n"
 "(これは不可逆ですので、まずバックアップをとった方がいいでしょう)"

-#: database.cc:155
+#: database.cc:170
 #, c-format
 msgid "this database already contains rosters"
 msgstr "このデータベースには既に名簿が含まれています"

-#: database.cc:175
+#: database.cc:190
 #, c-format
 msgid ""
 "database %s contains revisions but no rosters\n"
@@ -1773,7 +1793,7 @@
 "統合し、新しいデータベースに取り込むのを待って下さい。\n"
 "不便ですみません。"

-#: database.cc:194
+#: database.cc:209
 #, c-format
 msgid ""
 "database %s contains manifests but no revisions\n"
@@ -1784,19 +1804,19 @@
 "このデータベースは古すぎるのでアップグレードする必要があります\n"
 "詳細については README.changesets を参照して下さい"

-#: database.cc:230
+#: database.cc:245
 #, c-format
 msgid "unable to probe database version in file %s"
 msgstr "ファイル %s 内のデータベースバージョンを検出できませんでした"

-#: database.cc:237
+#: database.cc:252
 #, c-format
 msgid "database %s is not an sqlite version 3 file, try dump and reload"
 msgstr ""
 "データベース %s は SQLite ver. 3 のファイルではありません。ダンプした後再度読"
 "み込んでみて下さい"

-#: database.cc:266 schema_migration.cc:187
+#: database.cc:281 schema_migration.cc:200
 msgid ""
 "make sure database and containing directory are writeable\n"
 "and you have not run out of disk space"
@@ -1804,7 +1824,7 @@
 "データベースとそれを含むディレクトリが書き込み可能であるか、\n"
 "そしてディスク容量が不足していないか確認して下さい"

-#: database.cc:272 schema_migration.cc:192
+#: database.cc:287 schema_migration.cc:205
 #, c-format
 msgid ""
 "sqlite error: %s\n"
@@ -1813,12 +1833,12 @@
 "sqlite エラー: %s\n"
 "%s"

-#: database.cc:318
+#: database.cc:332
 #, c-format
 msgid "could not initialize database: %s: already exists"
 msgstr "データベースを初期化できませんでした: %s: 既に存在しています"

-#: database.cc:323
+#: database.cc:337
 #, c-format
 msgid ""
 "existing (possibly stale) journal file '%s' has same stem as new database '%"
@@ -1829,13 +1849,13 @@
 "じ幹を持っています\n"
 "データベース作成を中止します"

-#: database.cc:473
+#: database.cc:487
 #, c-format
 msgid "cannot create %s; it already exists"
 msgstr "%s を作成できません; 既に存在しています"

-#: database.cc:537
-#, c-format
+#: database.cc:564
+#, fuzzy, c-format
 msgid ""
 "schema version    : %s\n"
 "counts:\n"
@@ -1846,6 +1866,7 @@
 "  revisions       : %u\n"
 "  ancestry edges  : %u\n"
 "  certs           : %u\n"
+"  logical files   : %u\n"
 "bytes:\n"
 "  full rosters    : %u\n"
 "  roster deltas   : %u\n"
@@ -1881,73 +1902,73 @@
 "  ページサイズ      : %u\n"
 "  キャッシュサイズ  : %u\n"

-#: database.cc:597
+#: database.cc:626
 #, c-format
 msgid "database schema version: %s"
 msgstr "基準スキーマバージョン: %s"

-#: database.cc:674
+#: database.cc:703
 #, c-format
 msgid "multiple statements in query: %s\n"
 msgstr "クエリ中に複数のステートメント: %s\n"

-#: database.cc:680
-#, c-format
-msgid "wanted %d columns got %d in query: %s\n"
+#: database.cc:709
+#, fuzzy, c-format
+msgid "wanted %d columns got %d in query: %s"
 msgstr "クエリで %d 列要求しましたが得たのは %d 列です: %s\n"

-#: database.cc:739
-#, c-format
-msgid "null result in query: %s\n"
+#: database.cc:768
+#, fuzzy, c-format
+msgid "null result in query: %s"
 msgstr "クエリ中に結果 null が含まれています: %s\n"

-#: database.cc:757
-#, c-format
-msgid "wanted %d rows got %s in query: %s\n"
+#: database.cc:786
+#, fuzzy, c-format
+msgid "wanted %d rows got %d in query: %s"
 msgstr "クエリで %d 行要求しましたが得たのは %s です: %s\n"

-#: database.cc:1777
+#: database.cc:1926
 #, c-format
 msgid "another key with name '%s' already exists"
 msgstr "'%s' という名前の他の鍵が既に存在しています"

-#: database.cc:2833
+#: database.cc:2958
 #, c-format
 msgid "no database specified"
 msgstr "データベース未指定"

-#: database.cc:2841
+#: database.cc:2966
 #, c-format
 msgid "database %s does not exist"
 msgstr "データベース %s は存在しません"

-#: database.cc:2842
+#: database.cc:2967
 #, c-format
 msgid "%s is a directory, not a database"
 msgstr "%s はデータベースではなくディレクトリです"

-#: database.cc:2867
+#: database.cc:2992
 #, c-format
 msgid "could not open database '%s': %s"
 msgstr "データベース '%s': %s を開けませんでした"

-#: diff_patch.cc:590
+#: diff_patch.cc:606
 #, c-format
 msgid "file '%s' does not exist in workspace"
 msgstr "ファイル '%s' はワークスペース内に存在しません"

-#: diff_patch.cc:591
+#: diff_patch.cc:607
 #, c-format
 msgid "'%s' in workspace is a directory, not a file"
 msgstr "ワークスペース内の '%s' はファイルではなくディレクトリです"

-#: diff_patch.cc:595
+#: diff_patch.cc:611
 #, c-format
 msgid "file %s in workspace has id %s, wanted %s"
 msgstr ""
 "ワークスペース内のファイル %s の ID は %s ですが、期待されるのは %s です"

-#: diff_patch.cc:716
+#: diff_patch.cc:732
 #, c-format
 msgid ""
 "help required for 3-way merge\n"
@@ -1962,13 +1983,8 @@
 "[    右] %s\n"
 "[統合済] %s\n"

-#: file_io.cc:116
+#: file_io.cc:175 file_io.cc:182
 #, c-format
-msgid "expected file '%s', but it is a directory."
-msgstr "'%s' は期待していたファイルではなく、ディレクトリです"
-
-#: file_io.cc:186 file_io.cc:193
-#, c-format
 msgid ""
 "could not create directory '%s'\n"
 "it is a file"
@@ -1976,7 +1992,7 @@
 "ディレクトリ '%s' を作成できませんでした\n"
 "ファイルです"

-#: file_io.cc:188
+#: file_io.cc:177
 #, c-format
 msgid ""
 "could not create directory '%s'\n"
@@ -1985,17 +2001,17 @@
 "ディレクトリ '%s' を作成できませんでした\n"
 "%s"

-#: file_io.cc:192
+#: file_io.cc:181
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "ディレクトリ '%s' を作成できませんでした"

-#: file_io.cc:205
+#: file_io.cc:194
 #, c-format
 msgid "failed to create directory '%s' for '%s'"
 msgstr "ディレクトリ '%s' ('%s' のための)の作成に失敗しました"

-#: file_io.cc:219
+#: file_io.cc:208
 #, c-format
 msgid ""
 "could not remove '%s'\n"
@@ -2004,424 +2020,424 @@
 "'%s' を削除できませんでした\n"
 "%s"

-#: file_io.cc:229
+#: file_io.cc:218
 #, c-format
 msgid "file to delete '%s' does not exist"
 msgstr "削除するファイル '%s' は存在しません"

-#: file_io.cc:230
+#: file_io.cc:219
 #, c-format
 msgid "file to delete, '%s', is not a file but a directory"
 msgstr "削除するファイル '%s' はファイルでなく、ディレクトリです"

-#: file_io.cc:238
+#: file_io.cc:227
 #, c-format
 msgid "directory to delete '%s' does not exist"
 msgstr "削除するディレクトリ '%s' は存在しません"

-#: file_io.cc:239
+#: file_io.cc:228
 #, c-format
 msgid "directory to delete, '%s', is not a directory but a file"
 msgstr "削除するディレクトリ '%s' はディレクトリではなくファイルです"

-#: file_io.cc:246
+#: file_io.cc:235
 #, c-format
 msgid "object to delete, '%s', does not exist"
 msgstr "削除するオブジェクト '%s' は存在しません"

-#: file_io.cc:254
+#: file_io.cc:243
 #, c-format
 msgid "directory to delete, '%s', does not exist"
 msgstr "削除するディレクトリ '%s' は存在しません"

-#: file_io.cc:255
+#: file_io.cc:244
 #, c-format
 msgid "directory to delete, '%s', is a file"
 msgstr "削除するディレクトリ '%s' はファイルです"

-#: file_io.cc:264
+#: file_io.cc:253
 #, c-format
 msgid "rename source file '%s' does not exist"
 msgstr "名称変更する元のファイル '%s' は存在しません"

-#: file_io.cc:265
+#: file_io.cc:254
 #, c-format
 msgid "rename source file '%s' is a directory -- bug in monotone?"
 msgstr "名称変更元のファイル '%s' はディレクトリです -- monotone のバグ?"

-#: file_io.cc:268 file_io.cc:281
+#: file_io.cc:257 file_io.cc:270
 #, c-format
 msgid "rename target '%s' already exists"
 msgstr "名称変更ターゲット '%s' は既に存在しています"

-#: file_io.cc:277
+#: file_io.cc:266
 #, c-format
 msgid "rename source dir '%s' does not exist"
 msgstr "名称変更元のディレクトリ '%s' は存在しません"

-#: file_io.cc:278
+#: file_io.cc:267
 #, c-format
 msgid "rename source dir '%s' is a file -- bug in monotone?"
 msgstr "名称変更元のディレクトリ '%s' はファイルです -- monotone のバグ?"

-#: file_io.cc:292
+#: file_io.cc:281
 #, c-format
 msgid "rename source path '%s' does not exist"
 msgstr "名称変更元のパス '%s' は存在しません"

-#: file_io.cc:307
+#: file_io.cc:296
 #, c-format
 msgid "file %s does not exist"
 msgstr "ファイル %s は存在しません"

-#: file_io.cc:308
+#: file_io.cc:297
 #, c-format
 msgid "file %s cannot be read as data; it is a directory"
 msgstr "'%s' は期待していたファイルではなく、ディレクトリです"

-#: file_io.cc:312
+#: file_io.cc:301
 #, c-format
 msgid "cannot open file %s for reading"
 msgstr "ファイル %s を読み込みのために開くことができません"

-#: file_io.cc:381
+#: file_io.cc:340
 #, c-format
 msgid "Cannot read standard input multiple times"
 msgstr "標準入力を何度も読み込むことはできません"

-#: file_io.cc:412
+#: file_io.cc:371
 #, c-format
 msgid "file '%s' cannot be overwritten as data; it is a directory"
 msgstr "'%s' にデータを上書きできません。ディレクトリです"

-#: file_io.cc:420
+#: file_io.cc:379
 #, c-format
 msgid "cannot open file %s for writing"
 msgstr "ファイル %s を書き込みのために開くことができません"

-#: file_io.cc:530
-#, c-format
-msgid "caught runtime error %s constructing file path for %s\n"
+#: file_io.cc:461
+#, fuzzy, c-format
+msgid "caught runtime error %s constructing file path for %s"
 msgstr "%s についてファイルパス作成中に実行時エラー %s 発生\n"

-#: file_io.cc:569
+#: file_io.cc:500
 #, c-format
 msgid "no such file or directory: '%s'"
 msgstr "そのようなファイルまたはディレクトリはありません: '%s'"

-#: keys.cc:77
+#: keys.cc:99
 #, c-format
 msgid "got empty passphrase from get_passphrase() hook"
 msgstr "get_passphrase() フックは空のパスフレーズを返しました"

-#: keys.cc:93
+#: keys.cc:115
 #, c-format
 msgid "empty passphrase not allowed"
 msgstr "パスフレーズは空にできません"

-#: keys.cc:100
+#: keys.cc:122
 #, c-format
 msgid "confirm passphrase for key ID [%s]: "
 msgstr "鍵 ID [%s] のパスフレーズを確認: "

-#: keys.cc:105
-#, c-format
-msgid "empty passphrases not allowed, try again\n"
+#: keys.cc:127
+#, fuzzy, c-format
+msgid "empty passphrases not allowed, try again"
 msgstr "パスフレーズは空にできません. 再度試して下さい\n"

-#: keys.cc:106 keys.cc:113
-#, c-format
-msgid "too many failed passphrases\n"
+#: keys.cc:128 keys.cc:135
+#, fuzzy, c-format
+msgid "too many failed passphrases"
 msgstr "パスフレーズの入力ミスが多すぎます\n"

-#: keys.cc:112
-#, c-format
-msgid "passphrases do not match, try again\n"
+#: keys.cc:134
+#, fuzzy, c-format
+msgid "passphrases do not match, try again"
 msgstr "パスフレーズが一致しません。再度試して下さい\n"

-#: keys.cc:119
+#: keys.cc:141
 #, c-format
 msgid "no passphrase given"
 msgstr "パスフレーズを指定して下さい"

-#: keys.cc:542
+#: keys.cc:564
 #, c-format
 msgid "passphrase for '%s' is incorrect"
 msgstr "'%s' に対するパスフレーズが間違っています"

-#: lua.cc:539 lua.cc:568 lua.cc:583
+#: lua.cc:555 lua.cc:584 lua.cc:599
 #, c-format
 msgid "%s called with an invalid parameter"
 msgstr "%s 呼出し時の引数が不適切です"

-#: lua.cc:586
-#, c-format
-msgid "Directory '%s' does not exists"
+#: lua.cc:602
+#, fuzzy, c-format
+msgid "Directory '%s' does not exist"
 msgstr "ディレクトリ '%s' は存在しません"

-#: lua.cc:587 rcs_import.cc:1217 work.cc:420
+#: lua.cc:603 rcs_import.cc:1235 work.cc:488
 #, c-format
 msgid "'%s' is not a directory"
 msgstr "'%s' はディレクトリではありません"

-#: lua.cc:606 lua.cc:908
+#: lua.cc:622
 #, c-format
 msgid "lua error while loading rcfile '%s'"
 msgstr "初期化ファイル '%s' を読み込み中に lua のエラー"

-#: lua.cc:705
+#: lua.cc:706
 #, c-format
 msgid "bad input to parse_basic_io"
 msgstr "parse_basic_io に対し不正な入力"

-#: lua.cc:920
-#, c-format
-msgid "lua error while loading '%s'"
-msgstr "lua '%s' を読み込み中にエラー"
-
-#: lua.cc:925
-#, c-format
-msgid "rcfile '%s' does not exist"
-msgstr "初期化ファイル '%s' は存在しません"
-
-#: main.cc:325
+#: main.cc:326
 msgid "interrupted"
 msgstr "割込み"

-#: main.cc:329
+#: main.cc:330
 msgid "terminated by signal"
 msgstr "シグナルで終了"

-#: merkle_tree.cc:276
+#: merkle_tree.cc:290
 #, c-format
 msgid "node level is %d, exceeds maximum %d"
 msgstr "ノードレベル %d は最大制限 %d を越えています"

-#: merkle_tree.cc:311
+#: merkle_tree.cc:325
 #, c-format
 msgid "mismatched node hash value %s, expected %s"
 msgstr "一致しないノードハッシュ値 %s、期待されるのは %s です"

-#: monotone.cc:53
+#: monotone.cc:65
 msgid "select branch cert for operation"
 msgstr "操作のためのブランチ証明を選択"

-#: monotone.cc:54
+#: monotone.cc:66
 msgid "select revision id for operation"
 msgstr "操作のためのリビジョン ID を選択"

-#: monotone.cc:55
+#: monotone.cc:67
 msgid "set commit changelog message"
 msgstr "コミット変更記録メッセージを設定"

-#: monotone.cc:56
+#: monotone.cc:68
 msgid "set filename containing commit changelog message"
 msgstr "コミット変更記録メッセージを含むファイルを設定"

-#: monotone.cc:57
+#: monotone.cc:69
 msgid "override date/time for commit"
 msgstr "コミット時の日時を上書き指定"

-#: monotone.cc:58
+#: monotone.cc:70
 msgid "override author for commit"
 msgstr "コミット時の作成者を上書き指定"

-#: monotone.cc:59
+#: monotone.cc:71
 msgid "limit the number of levels of directories to descend"
 msgstr "降下するディレクトリの深さを制限"

-#: monotone.cc:60
+#: monotone.cc:72
 msgid "limit log output to the last number of entries"
 msgstr "ログ出力のエントリ数(最近)を制限"

-#: monotone.cc:61
+#: monotone.cc:73
 msgid "limit log output to the next number of entries"
 msgstr "ログ出力のエントリ数(次)を制限"

-#: monotone.cc:62
+#: monotone.cc:74
 msgid "record process id of server"
 msgstr "サーバーのプロセス ID を記録"

-#: monotone.cc:63
+#: monotone.cc:75
 msgid "print a brief version of the normal output"
 msgstr "通常出力の簡単なバージョンを表示"

-#: monotone.cc:64
+#: monotone.cc:76
 msgid "print diffs along with logs"
 msgstr "ログと共に差分を表示"

-#: monotone.cc:65
+#: monotone.cc:77
 msgid "exclude merges when printing logs"
 msgstr "ログを表示する際に統合については省略"

-#: monotone.cc:66
+#: monotone.cc:78
 msgid "use the current arguments as the future default"
 msgstr "現在の引数を将来のデフォルトとして使用"

-#: monotone.cc:67
+#: monotone.cc:79
 msgid "leave out anything described by its argument"
 msgstr "引数によって説明されるすべてを省く"

-#: monotone.cc:68
+#: monotone.cc:80
 msgid "use unified diff format"
 msgstr "unified diff 形式を使用"

-#: monotone.cc:69
+#: monotone.cc:81
 msgid "use context diff format"
 msgstr "context diff 形式を使用"

-#: monotone.cc:70
+#: monotone.cc:82
 msgid "use external diff hook for generating diffs"
 msgstr "差分の生成に外部 diff フックを使用"

-#: monotone.cc:71
+#: monotone.cc:83
 msgid "argument to pass external diff hook"
 msgstr "外部 diff フックに渡す引数"

-#: monotone.cc:72
-msgid "use least common ancestor as ancestor for merge"
-msgstr "最も近い共通の祖先を統合の祖先として使用"
-
-#: monotone.cc:73
+#: monotone.cc:84
 msgid "perform the associated file operation"
 msgstr "関連付けられたファイル操作を実行"

-#: monotone.cc:74
+#: monotone.cc:85
 msgid "address:port to listen on (default :4691)"
 msgstr "待機する アドレス:ポート (デフォルト: 4691)"

-#: monotone.cc:75
+#: monotone.cc:86
 msgid "perform the operations for files missing from workspace"
 msgstr "ワークスペース内ではみつからないファイルについて操作を実行"

-#: monotone.cc:76
+#: monotone.cc:87
 msgid "perform the operations for unknown files from workspace"
 msgstr "ワークスペース内では不明なファイルについて操作を実行"

-#: monotone.cc:77
+#: monotone.cc:88
 msgid "push the specified key even if it hasn't signed anything"
 msgstr "指定の鍵について署名の有無にかかわらず取り込み"

-#: monotone.cc:78
+#: monotone.cc:89
+msgid "serve netsync on stdio"
+msgstr ""
+
+#: monotone.cc:90
+msgid "disable transport authentication"
+msgstr ""
+
+#: monotone.cc:91
 msgid "when rosterifying, drop attrs entries with the given key"
 msgstr "名簿作成中に指定の鍵のエントリの属性を破棄"

-#: monotone.cc:79
+#: monotone.cc:92
 msgid "exclude files when printing logs"
 msgstr "ログを表示する際にファイルについては省略"

-#: monotone.cc:80
+#: monotone.cc:93
 msgid "also operate on the contents of any listed directories"
 msgstr "一覧のディレクトリの内容についても処理"

-#: monotone.cc:89
+#: monotone.cc:102
 msgid "print debug log to stderr while running"
 msgstr "実行時、標準エラー出力にデバッグログを表示"

-#: monotone.cc:90
+#: monotone.cc:103
 msgid "file to dump debugging log to, on failure"
 msgstr "失敗時にデバッグログを出力するファイル"

-#: monotone.cc:91
+#: monotone.cc:104
 msgid "file to write the log to"
 msgstr "ログを書き込むファイル"

-#: monotone.cc:92
-msgid "suppress log and progress messages"
+#: monotone.cc:105
+#, fuzzy
+msgid "suppress verbose, informational and progress messages"
 msgstr "ログおよび進捗を示すメッセージを表示しない"

-#: monotone.cc:93
+#: monotone.cc:106
+#, fuzzy
+msgid "suppress warning, verbose, informational and progress messages"
+msgstr "ログおよび進捗を示すメッセージを表示しない"
+
+#: monotone.cc:107
 msgid "display help message"
 msgstr "ヘルプメッセージを表示"

-#: monotone.cc:94
+#: monotone.cc:108
 msgid "print version number, then exit"
 msgstr "バージョン番号を表示し、終了"

-#: monotone.cc:95
+#: monotone.cc:109
 msgid "print detailed version number, then exit"
 msgstr "詳細なバージョン番号を表示し、終了"

-#: monotone.cc:96
+#: monotone.cc:110
 msgid "insert command line arguments taken from the given file"
 msgstr "指定のファイルの内容をコマンド行引数に挿入"

-#: monotone.cc:97
+#: monotone.cc:111
 msgid "set ticker style (count|dot|none)"
 msgstr "ティッカーのスタイルを設定 (count|dot|none)"

-#: monotone.cc:98
+#: monotone.cc:112
 msgid "do not load standard lua hooks"
 msgstr "標準 lua フックを読み込まない"

-#: monotone.cc:99
+#: monotone.cc:113
 msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files"
 msgstr ""
 "~/.monotone/monotonerc または _MTN/monotonerc lua ファイルを読み込まない"

-#: monotone.cc:100
+#: monotone.cc:114
 msgid "load extra rc file"
 msgstr "別の初期化ファイルを読み込む"

-#: monotone.cc:101
+#: monotone.cc:115
 msgid "set key for signatures"
 msgstr "署名の鍵を設定"

-#: monotone.cc:102
+#: monotone.cc:116
 msgid "set name of database"
 msgstr "データベース名を設定"

-#: monotone.cc:103
+#: monotone.cc:117
 msgid "limit search for workspace to specified root"
 msgstr "ワークスペースの検索を指定のルート下に制限"

-#: monotone.cc:104
+#: monotone.cc:118
 msgid "verbose completion output"
 msgstr "冗長な完了メッセージ"

-#: monotone.cc:105
+#: monotone.cc:119
 msgid "set location of key store"
 msgstr "鍵の保存場所を設定"

-#: monotone.cc:106
+#: monotone.cc:120
 msgid "set location of configuration directory"
 msgstr "設定用のディレクトリの場所を設定"

-#: monotone.cc:210
+#: monotone.cc:224
 #, c-format
 msgid "problem parsing arguments from file %s: %s"
 msgstr "ファイル %s からの引数を解析中に問題発生: %s"

-#: monotone.cc:219
+#: monotone.cc:233
 #, c-format
 msgid "weird error when stuffing arguments read from %s: %s\n"
 msgstr "%s から引数を読み取り中に予期せぬエラー発生: %s\n"

-#: monotone.cc:311
+#: monotone.cc:330
 msgid "[OPTION...] command [ARGS...]\n"
 msgstr "[OPTION...] command [ARGS...]\n"

-#: monotone.cc:563
+#: monotone.cc:593
 #, c-format
 msgid "syntax error near the \"%s\" option: %s"
 msgstr "\"%s\" オプションの近くに構文エラー: %s"

-#: monotone.cc:605
-#, c-format
-msgid "monotone %s doesn't use the option %s"
+#: monotone.cc:629
+#, fuzzy, c-format
+msgid "%s %s doesn't use the option %s"
 msgstr "monotone %s にはオプション %s は使えません"

-#: monotone.cc:640
+#: monotone.cc:663
 #, c-format
 msgid "Options specific to '%s %s':"
 msgstr "'%s %s' に特化したオプション:"

-#: mt_version.cc:27
+#: mt_version.cc:36
 #, c-format
 msgid "%s (base revision: %s)"
 msgstr "%s (基準リビジョン %s)"

-#: mt_version.cc:47
+#: mt_version.cc:56
 #, c-format
 msgid ""
 "Running on          : %s\n"
@@ -2430,24 +2446,25 @@
 "Boost version       : %s\n"
 "Changes since base revision:\n"
 "%s"
-msgstr "実行環境            : %s\n"
+msgstr ""
+"実行環境            : %s\n"
 "C++ コンパイラ      : %s\n"
 "C++ 標準ライブラリ  : %s\n"
 "Boost バージョン    : %s\n"
 "基底リビジョンからの変更:\n"
 "%s"

-#: netcmd.cc:40
+#: netcmd.cc:43
 #, c-format
 msgid "unknown item type 0x%x for '%s'"
 msgstr "不明なアイテムタイプ 0x%x (対象 '%s')"

-#: netcmd.cc:112
+#: netcmd.cc:115
 #, c-format
 msgid "unknown netcmd code 0x%x"
 msgstr "不明な netcmd コード 0x%x"

-#: netcmd.cc:117
+#: netcmd.cc:120
 #, c-format
 msgid ""
 "protocol version mismatch: wanted '%d' got '%d'\n"
@@ -2457,22 +2474,22 @@
 "す\n"
 "%s"

-#: netcmd.cc:122
+#: netcmd.cc:125
 msgid "the remote side has a newer, incompatible version of monotone"
 msgstr ""
 "monotone のバージョンに互換性がありません (リモート側がより新しいものです)"

-#: netcmd.cc:123
+#: netcmd.cc:126
 msgid "the remote side has an older, incompatible version of monotone"
 msgstr ""
 "monotone のバージョンに互換性がありません (リモート側がより古いものです)"

-#: netcmd.cc:133
+#: netcmd.cc:136
 #, c-format
 msgid "oversized payload of '%d' bytes"
 msgstr "'%d' バイトの長さ超過のペイロード"

-#: netcmd.cc:162
+#: netcmd.cc:176
 #, c-format
 msgid ""
 "bad HMAC checksum (got %s, wanted %s)\n"
@@ -2481,77 +2498,77 @@
 "不正な HMAC チェックサム (計算値 %s / 期待値 %s)\n"
 "これは転送中にデータが壊れたことを示唆しています\n"

-#: netcmd.cc:257 netcmd.cc:303
+#: netcmd.cc:272 netcmd.cc:318
 #, c-format
 msgid "unknown role specifier %d"
 msgstr "不明な役割指定子 %d"

-#: netio.hh:38 netio.hh:56
+#: netio.hh:41 netio.hh:59
 #, c-format
 msgid "need %d bytes to decode %s at %d, only have %d"
 msgstr "%d バイト必要 (%s のデコード、位置 %d) ですが %d しかありません"

-#: netio.hh:84 netio.hh:119
+#: netio.hh:87 netio.hh:122
 #, c-format
 msgid "uleb128 decode for '%s' into %d-byte datum overflowed"
 msgstr "'%s' について uleb128 デコード; %d バイトオーバーフロー"

-#: netio.hh:139
+#: netio.hh:142
 #, c-format
 msgid "ran out of bytes reading uleb128 value for '%s' at pos %d"
 msgstr "'%s' について uleb128 値を読み込み中にポジション %d でデータ欠損"

-#: netio.hh:275
+#: netio.hh:278
 #, c-format
 msgid "decoding variable length string of %d bytes for '%s', maximum is %d"
 msgstr "%d バイトの可変長文字列 （対象 '%s'、最大長 %d) をデコード中"

-#: netio.hh:330
+#: netio.hh:333
 #, c-format
 msgid "expected %s to end at %d, have %d bytes"
 msgstr "%s について終端 %d、容量 %d バイトであることを期待"

-#: netsync.cc:245
+#: netsync.cc:258
 #, c-format
 msgid "check of '%s' failed"
 msgstr "'%s' の検証に失敗"

-#: netsync.cc:708
+#: netsync.cc:724
 msgid "bytes in"
 msgstr "バイト (入)"

-#: netsync.cc:710
+#: netsync.cc:726
 msgid "bytes out"
 msgstr "バイト (出)"

-#: netsync.cc:714
+#: netsync.cc:730
 msgid "certs in"
 msgstr "証明 (入)"

-#: netsync.cc:716 netsync.cc:729
+#: netsync.cc:732 netsync.cc:745
 msgid "revs in"
 msgstr "リビジョン (入)"

-#: netsync.cc:721
+#: netsync.cc:737
 msgid "certs out"
 msgstr "証明 (出)"

-#: netsync.cc:723 netsync.cc:731
+#: netsync.cc:739 netsync.cc:747
 msgid "revs out"
 msgstr "リビジョン (出)"

-#: netsync.cc:837
+#: netsync.cc:853
 #, c-format
 msgid "underflow on count of %s items to receive"
 msgstr "受け取る %s アイテムについて個数がアンダーフロー"

-#: netsync.cc:1183
+#: netsync.cc:1201
 #, c-format
 msgid "received network error: %s"
 msgstr "ネットワークエラーを受信: %s"

-#: netsync.cc:1215
-#, c-format
+#: netsync.cc:1236
+#, fuzzy, c-format
 msgid ""
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
 "@ WARNING: SERVER IDENTIFICATION HAS CHANGED              @\n"
@@ -2560,7 +2577,7 @@
 "it is also possible that the server key has just been changed\n"
 "remote host sent key %s\n"
 "I expected %s\n"
-"'%s unset %s %s' overrides this check\n"
+"'%s unset %s %s' overrides this check"
 msgstr ""
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
 "@ 警告: サーバーの識別 ID が変更されています              @\n"
@@ -2571,12 +2588,12 @@
 "期待値 %s\n"
 "'%s unset %s %s' とすると検証結果を無視するようになります\n"

-#: netsync.cc:1225
+#: netsync.cc:1246
 #, c-format
 msgid "server key changed"
 msgstr "サーバー鍵が変更されました"

-#: netsync.cc:1230
+#: netsync.cc:1251
 #, c-format
 msgid ""
 "first time connecting to server %s\n"
@@ -2587,236 +2604,221 @@
 "偽物でないとは思いますが、鍵の指紋を二重にチェックしてみるといいでしょう: %"
 "s\n"

-#: netsync.cc:1237
-#, c-format
-msgid "saving public key for %s to database\n"
+#: netsync.cc:1258
+#, fuzzy, c-format
+msgid "saving public key for %s to database"
 msgstr "%s の公開鍵をデータベースに保存中\n"

-#: netsync.cc:1325
-#, c-format
-msgid "rejected attempt at anonymous connection for write\n"
+#: netsync.cc:1351
+#, fuzzy, c-format
+msgid "rejected attempt at anonymous connection for write"
 msgstr "匿名での接続からの書き込みを拒否\n"

-#: netsync.cc:1332
-#, c-format
-msgid "rejected attempt at anonymous connection while running as sink\n"
+#: netsync.cc:1358
+#, fuzzy, c-format
+msgid "rejected attempt at anonymous connection while running as sink"
 msgstr "シンクとして実行中の匿名での接続からの書き込みを拒否\n"

-#: netsync.cc:1347 netsync.cc:1444
+#: netsync.cc:1374 netsync.cc:1503
 #, c-format
 msgid "not serving branch '%s'"
 msgstr "ブランチ '%s' は提供していません"

-#: netsync.cc:1352
+#: netsync.cc:1380
 #, c-format
 msgid "anonymous access to branch '%s' denied by server"
 msgstr "ブランチ '%s' への匿名アクセスはサーバーによって拒否されました"

-#: netsync.cc:1359
-#, c-format
-msgid "allowed anonymous read permission for '%s' excluding '%s'\n"
+#: netsync.cc:1389
+#, fuzzy, c-format
+msgid "allowed anonymous read permission for '%s' excluding '%s'"
 msgstr "匿名での '%s' ('%s' を除く)の読み込みを許可しました\n"

-#: netsync.cc:1391
-#, c-format
-msgid "detected replay attack in auth netcmd\n"
+#: netsync.cc:1395
+#, fuzzy, c-format
+msgid "allowed anonymous read/write permission for '%s' excluding '%s'"
+msgstr "匿名での '%s' ('%s' を除く)の読み込みを許可しました\n"
+
+#: netsync.cc:1450
+#, fuzzy, c-format
+msgid "detected replay attack in auth netcmd"
 msgstr "auth netcmd 中に繰り返し攻撃を検出\n"

-#: netsync.cc:1413
-#, c-format
-msgid "remote public key hash '%s' is unknown\n"
+#: netsync.cc:1472
+#, fuzzy, c-format
+msgid "remote public key hash '%s' is unknown"
 msgstr "リモートの公開鍵ハッシュ '%s' は不明なものです\n"

-#: netsync.cc:1430
-#, c-format
+#: netsync.cc:1489
+#, fuzzy, c-format
 msgid ""
 "denied '%s' read permission for '%s' excluding '%s' while running as pure "
-"sink\n"
+"sink"
 msgstr ""
 "純粋シンクとして実行中の '%s' の '%s' ('%s' を除く) の読み込みを拒否しまし"
 "た\n"

-#: netsync.cc:1450
-#, c-format
+#: netsync.cc:1509
+#, fuzzy, c-format
 msgid ""
-"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n"
+"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'"
 msgstr ""
 "'%s' の '%s' ('%s' を除く)の読み込みをブランチ '%s' のために拒否しました\n"

-#: netsync.cc:1453
+#: netsync.cc:1512
 #, c-format
 msgid "access to branch '%s' denied by server"
 msgstr "ブランチ '%s' へのアクセスはサーバーによって拒否されました"

-#: netsync.cc:1463
-#, c-format
-msgid "allowed '%s' read permission for '%s' excluding '%s'\n"
+#: netsync.cc:1522
+#, fuzzy, c-format
+msgid "allowed '%s' read permission for '%s' excluding '%s'"
 msgstr "'%s' の匿名での '%s' ('%s' を除く)の読み込みを許可しました\n"

-#: netsync.cc:1472
-#, c-format
+#: netsync.cc:1531
+#, fuzzy, c-format
 msgid ""
 "denied '%s' write permission for '%s' excluding '%s' while running as pure "
-"source\n"
+"source"
 msgstr ""
 "純粋ソースとして実行中の '%s' の '%s' ('%s' を除く) への書き込みを拒否しまし"
 "た\n"

-#: netsync.cc:1480
-#, c-format
-msgid "denied '%s' write permission for '%s' excluding '%s'\n"
+#: netsync.cc:1539
+#, fuzzy, c-format
+msgid "denied '%s' write permission for '%s' excluding '%s'"
 msgstr "'%s' の '%s' ('%s' を除く)への書き込みを拒否しました\n"

-#: netsync.cc:1486
-#, c-format
-msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
+#: netsync.cc:1545
+#, fuzzy, c-format
+msgid "allowed '%s' write permission for '%s' excluding '%s'"
 msgstr "'%s' の '%s' ('%s' を除く)への書き込みを許可しました\n"

-#: netsync.cc:1526
-#, c-format
-msgid "bad client signature\n"
+#: netsync.cc:1569
+#, fuzzy, c-format
+msgid "bad client signature"
 msgstr "不正なクライアント署名\n"

-#: netsync.cc:1542
-#, c-format
-msgid "Unexpected 'refine' command on non-refined item type\n"
+#: netsync.cc:1585
+#, fuzzy, c-format
+msgid "Unexpected 'refine' command on non-refined item type"
 msgstr "refine されていないアイテム型について予期しない 'refine' コマンド\n"

-#: netsync.cc:1639
+#: netsync.cc:1682
 #, c-format
 msgid "unknown bye phase %d received"
 msgstr "不明な bye フェーズ %d を受信"

-#: netsync.cc:1654
-#, c-format
-msgid "Unexpected 'done' command on non-refined item type\n"
+#: netsync.cc:1697
+#, fuzzy, c-format
+msgid "Unexpected 'done' command on non-refined item type"
 msgstr "refine されていないアイテム型について予期しない 'done' コマンド\n"

-#: netsync.cc:1734
-#, c-format
-msgid "epoch with hash '%s' does not exist in our database"
+#: netsync.cc:1769
+#, fuzzy, c-format
+msgid "%s with hash '%s' does not exist in our database"
 msgstr "こちらのデータベースにはハッシュ '%s' の epoch は含まれていません"

-#: netsync.cc:1763
+#: netsync.cc:1870
 #, c-format
-msgid "revision '%s' does not exist in our database"
-msgstr "こちらのデータベースにはリビジョン '%s' は含まれていません"
-
-#: netsync.cc:1777
-#, c-format
-msgid "file '%s' does not exist in our database"
-msgstr "こちらのデータベースにはファイル '%s' は含まれていません"
-
-#: netsync.cc:1791
-#, c-format
-msgid "cert '%s' does not exist in our database"
-msgstr "こちらのデータベースには証明 '%s' は含まれていません"
-
-#: netsync.cc:1843
-#, c-format
 msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
 msgstr ""
 "ブランチ %s について epoch が一致しません。サーバー側 '%s', クライアント側 '%"
 "s'"

-#: netsync.cc:1864
+#: netsync.cc:1888
 #, c-format
 msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
 msgstr "公開鍵 '%s' (%s) についてハッシュ検証に失敗。期待値 '%s'、計算値 '%s'"

-#: netsync.cc:1881
+#: netsync.cc:1902
 #, c-format
 msgid "hash check failed for revision cert '%s'"
 msgstr "リビジョン証明 '%s' についてハッシュ検証に失敗"

-#: netsync.cc:1956
+#: netsync.cc:1964
 #, c-format
 msgid "Received warning from usher: %s"
 msgstr "門番から警告を受信: %s"

-#: netsync.cc:2043 netsync.cc:2074
+#: netsync.cc:2051 netsync.cc:2082
 msgid "source and sink"
 msgstr "ソースとシンク"

-#: netsync.cc:2044 netsync.cc:2075
+#: netsync.cc:2052 netsync.cc:2083
 msgid "source"
 msgstr "ソース"

-#: netsync.cc:2044 netsync.cc:2075
+#: netsync.cc:2052 netsync.cc:2083
 msgid "sink"
 msgstr "シンク"

-#: netsync.cc:2229
+#: netsync.cc:2239
 #, c-format
 msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
 msgstr "netcmd dispatch の後でピーア %s の入力バッファがあふれました\n"

-#: netsync.cc:2241 netsync.cc:2298
-#, c-format
-msgid "protocol error while processing peer %s: '%s'\n"
+#: netsync.cc:2251 netsync.cc:2350
+#, fuzzy, c-format
+msgid "protocol error while processing peer %s: '%s'"
 msgstr "ピーア %s: '%s' を処理中にプロトコルエラー発生\n"

-#: netsync.cc:2247
-#, c-format
-msgid "error: %s\n"
+#: netsync.cc:2257
+#, fuzzy, c-format
+msgid "error: %s"
 msgstr "エラー: %s\n"

-#: netsync.cc:2277
-#, c-format
-msgid "connecting to %s\n"
+#: netsync.cc:2321
+#, fuzzy, c-format
+msgid "connecting to %s"
 msgstr "%s に接続中\n"

-#: netsync.cc:2313
+#: netsync.cc:2365
 #, c-format
 msgid "timed out waiting for I/O with peer %s, disconnecting\n"
 msgstr "ピーア %s の I/O を待っている間にタイムアウト, 切断中\n"

-#: netsync.cc:2328
+#: netsync.cc:2388
 #, c-format
-msgid "got OOB data from peer %s, disconnecting\n"
-msgstr "ピーア %s から OOB データを受信し、切断中\n"
-
-#: netsync.cc:2343
-#, c-format
 msgid "processing failure while talking to peer %s, disconnecting\n"
 msgstr "ピーア %s と通信中に処理が失敗し、切断中\n"

-#: netsync.cc:2360
-#, c-format
-msgid "successful exchange with %s\n"
+#: netsync.cc:2405
+#, fuzzy, c-format
+msgid "successful exchange with %s"
 msgstr "%s との交換に成功\n"

-#: netsync.cc:2366
-#, c-format
-msgid "peer %s disconnected after we informed them of error\n"
+#: netsync.cc:2411
+#, fuzzy, c-format
+msgid "peer %s disconnected after we informed them of error"
 msgstr "ピーア %s にエラーを報告後に切断されました\n"

-#: netsync.cc:2371
+#: netsync.cc:2416
 #, c-format
 msgid "I/O failure while talking to peer %s, disconnecting\n"
 msgstr "ピーア %s と通信中に I/O の失敗、切断中\n"

-#: netsync.cc:2400
-#, c-format
-msgid "protocol error while processing peer %s: '%s', marking as bad\n"
+#: netsync.cc:2482
+#, fuzzy, c-format
+msgid "protocol error while processing peer %s: '%s', marking as bad"
 msgstr "ピーア %s: '%s' を処理中にプロトコルエラー発生、誤りとして印付け\n"

-#: netsync.cc:2432
-#, c-format
-msgid "accepted new client connection from %s : %s\n"
+#: netsync.cc:2514
+#, fuzzy, c-format
+msgid "accepted new client connection from %s : %s"
 msgstr "%s : %s からの新しいクライアント接続を受理\n"

-#: netsync.cc:2466
-#, c-format
-msgid "protocol error while processing peer %s: '%s', disconnecting\n"
+#: netsync.cc:2551
+#, fuzzy, c-format
+msgid "protocol error while processing peer %s: '%s', disconnecting"
 msgstr "ピーア %s: '%s' からを処理中にプロトコルエラー発生、切断中\n"

-#: netsync.cc:2477
-#, c-format
-msgid "peer %s read failed in working state (error)\n"
+#: netsync.cc:2562
+#, fuzzy, c-format
+msgid "peer %s read failed in working state (error)"
 msgstr "ピーア %s についてワーキングステートで読み込みに失敗 (エラー)\n"

-#: netsync.cc:2482
+#: netsync.cc:2567
 #, c-format
 msgid ""
 "peer %s read failed in shutdown state (possibly client misreported error)\n"
@@ -2824,17 +2826,17 @@
 "ピーア %s についてシャットダウンステートで読み込みに失敗 (おそらくクライアン"
 "トの誤ったエラー報告です)\n"

-#: netsync.cc:2488
-#, c-format
-msgid "peer %s read failed in confirmed state (success)\n"
+#: netsync.cc:2573
+#, fuzzy, c-format
+msgid "peer %s read failed in confirmed state (success)"
 msgstr "ピーア %s について確認ステートで読み込みに失敗 (成功)\n"

-#: netsync.cc:2509
-#, c-format
-msgid "peer %s write failed in working state (error)\n"
+#: netsync.cc:2594
+#, fuzzy, c-format
+msgid "peer %s write failed in working state (error)"
 msgstr "ピーア %s についてワーキングステートで書き込みに失敗 (エラー)\n"

-#: netsync.cc:2514
+#: netsync.cc:2599
 #, c-format
 msgid ""
 "peer %s write failed in shutdown state (possibly client misreported error)\n"
@@ -2842,55 +2844,65 @@
 "ピーア %s についてシャットダウンステートで書き込みに失敗 (おそらくクライアン"
 "トの誤ったエラー報告です)\n"

-#: netsync.cc:2520
-#, c-format
-msgid "peer %s write failed in confirmed state (success)\n"
+#: netsync.cc:2605
+#, fuzzy, c-format
+msgid "peer %s write failed in confirmed state (success)"
 msgstr "ピーア %s について確認ステートで書き込みに失敗 (成功)\n"

-#: netsync.cc:2547
-#, c-format
-msgid "peer %s processing finished, disconnecting\n"
+#: netsync.cc:2632
+#, fuzzy, c-format
+msgid "peer %s processing finished, disconnecting"
 msgstr "ピーア %s 処理終了、切断中\n"

-#: netsync.cc:2569
-#, c-format
-msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
+#: netsync.cc:2654
+#, fuzzy, c-format
+msgid "fd %d (peer %s) has been idle too long, disconnecting"
 msgstr "fd %d (ピーア %s) はアイドル時間が長すぎます。切断中\n"

-#: netsync.cc:2637
-#, c-format
-msgid "beginning service on %s : %s\n"
+#: netsync.cc:2722
+#, fuzzy, c-format
+msgid "beginning service on %s : %s"
 msgstr "%s : %s でサービスを開始\n"

-#: netsync.cc:2638
+#: netsync.cc:2723
 msgid "<all interfaces>"
 msgstr "<すべてのインターフェース>"

-#: netsync.cc:2652
+#: netsync.cc:2737
 #, c-format
 msgid "session limit %d reached, some connections will be refused\n"
 msgstr "セッション制限 %d に達しました。いくつかの接続は拒否されます\n"

-#: netsync.cc:2707
-#, c-format
-msgid "got OOB from peer %s, disconnecting\n"
+#: netsync.cc:2802
+#, fuzzy, c-format
+msgid "got OOB from peer %s, disconnecting"
 msgstr "ピーア %s から OOB データを受信、切断中\n"

-#: netsync.cc:2776
-#, c-format
-msgid "finding items to synchronize:\n"
+#: netsync.cc:2862
+#, fuzzy, c-format
+msgid "beginning service on %s"
+msgstr "%s : %s でサービスを開始\n"
+
+#: netsync.cc:2925
+#, fuzzy, c-format
+msgid "got some OOB data on fd %d (peer %s), disconnecting"
+msgstr "ピーア %s から OOB データを受信し、切断中\n"
+
+#: netsync.cc:2974
+#, fuzzy, c-format
+msgid "finding items to synchronize:"
 msgstr "同期アイテムを検索中:\n"

-#: netsync.cc:2784
+#: netsync.cc:2982
 msgid "certificates"
 msgstr "証明書"

-#: netsync.cc:2893
+#: netsync.cc:3095
 #, c-format
 msgid "Cannot find key '%s'"
 msgstr "鍵 '%s' をみつけることができません"

-#: netsync.cc:2933
+#: netsync.cc:3135
 #, c-format
 msgid ""
 "include branch pattern contains a quote character:\n"
@@ -2899,7 +2911,7 @@
 "引用符を含むブランチパターンを含める:\n"
 "%s\n"

-#: netsync.cc:2939
+#: netsync.cc:3141
 #, c-format
 msgid ""
 "exclude branch pattern contains a quote character:\n"
@@ -2908,108 +2920,102 @@
 "引用符を含むブランチパターンを含めない:\n"
 "%s\n"

-#: netsync.cc:2962 netsync.cc:2966
+#: netsync.cc:3173 netsync.cc:3177
 #, c-format
 msgid "network error: %s"
 msgstr "ネットワークエラー: %s"

-#: packet.cc:94
+#: packet.cc:107
 #, c-format
 msgid "file preimage '%s' missing in db"
 msgstr "ファイルのプレイメージ '%s' がデータベース内にみつかりません"

-#: packet.cc:95
+#: packet.cc:108
 #, c-format
 msgid "dropping delta '%s' -> '%s'"
 msgstr "差分 '%s' -> '%s' を破棄しています"

-#: packet.cc:109
-#, c-format
-msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n"
-msgstr ""
-"差分 '%s' -> '%s' から再構築されたファイルの ID '%s' は不正なものです\n"
-
-#: packet.cc:138
-#, c-format
-msgid "missing prerequisite revision '%s'\n"
+#: packet.cc:139
+#, fuzzy, c-format
+msgid "missing prerequisite revision '%s'"
 msgstr "必須条件となるリビジョン '%s' がみつかりません\n"

-#: packet.cc:139 packet.cc:150 packet.cc:166 packet.cc:174
-#, c-format
-msgid "dropping revision '%s'\n"
+#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175
+#, fuzzy, c-format
+msgid "dropping revision '%s'"
 msgstr "リビジョン '%s' を破棄しています\n"

-#: packet.cc:149
-#, c-format
-msgid "missing prerequisite file '%s'\n"
+#: packet.cc:150
+#, fuzzy, c-format
+msgid "missing prerequisite file '%s'"
 msgstr "必須となるファイル '%s' がみつかりません\n"

-#: packet.cc:164
-#, c-format
-msgid "missing prerequisite file pre-delta '%s'\n"
+#: packet.cc:165
+#, fuzzy, c-format
+msgid "missing prerequisite file pre-delta '%s'"
 msgstr "必須となるファイルのプレ差分 '%s' がみつかりません\n"

-#: packet.cc:172
-#, c-format
-msgid "missing prerequisite file post-delta '%s'\n"
+#: packet.cc:173
+#, fuzzy, c-format
+msgid "missing prerequisite file post-delta '%s'"
 msgstr "必須となるファイルのポスト差分 '%s' がみつかりません\n"

-#: packet.cc:200
-#, c-format
-msgid "cert revision '%s' does not exist in db\n"
+#: packet.cc:201
+#, fuzzy, c-format
+msgid "cert revision '%s' does not exist in db"
 msgstr "データベースに証明リビジョン '%s' は含まれていません\n"

-#: packet.cc:202
-#, c-format
-msgid "dropping cert\n"
+#: packet.cc:203
+#, fuzzy, c-format
+msgid "dropping cert"
 msgstr "証明を破棄しています\n"

-#: packet.cc:225
-#, c-format
-msgid "key '%s' is not equal to key '%s' in database\n"
+#: packet.cc:226
+#, fuzzy, c-format
+msgid "key '%s' is not equal to key '%s' in database"
 msgstr "鍵 '%s' はデータベース内の鍵 '%s' と一致しません\n"

-#: packet.cc:349
+#: packet.cc:350
 #, c-format
 msgid "malformed packet"
 msgstr "壊れたパケット"

-#: packet.cc:449
+#: packet.cc:450
 #, c-format
 msgid "unknown packet type: '%s'"
 msgstr "不明なパケット型: '%s'"

-#: rcs_file.cc:343
+#: rcs_file.cc:354
 #, c-format
 msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n"
 msgstr "解析失敗 %d:%d: 期待値 %s、取得 %s (値 '%s')\n"

-#: rcs_file.cc:362
+#: rcs_file.cc:373
 #, c-format
 msgid "parse failure %d:%d: expecting word '%s'\n"
 msgstr "解析失敗 %d:%d: 期待される語句 '%s'\n"

-#: rcs_file.cc:377
+#: rcs_file.cc:388
 #, c-format
 msgid "parse failure %d:%d: expecting word\n"
 msgstr "解析失敗 %d:%d: 期待される語句\n"

-#: rcs_import.cc:703
-#, c-format
-msgid "parsing RCS file %s\n"
+#: rcs_import.cc:721
+#, fuzzy, c-format
+msgid "parsing RCS file %s"
 msgstr "RCS ファイル %s を解析中\n"

-#: rcs_import.cc:706
-#, c-format
-msgid "parsed RCS file %s OK\n"
+#: rcs_import.cc:724
+#, fuzzy, c-format
+msgid "parsed RCS file %s OK"
 msgstr "解析した RCS ファイル %s: OK\n"

-#: rcs_import.cc:895
-#, c-format
-msgid "error reading RCS file %s: %s\n"
+#: rcs_import.cc:913
+#, fuzzy, c-format
+msgid "error reading RCS file %s: %s"
 msgstr "RCS ファイル %s を読み込み中にエラー: %s\n"

-#: rcs_import.cc:1192
+#: rcs_import.cc:1210
 #, c-format
 msgid ""
 "%s appears to be a CVS repository root directory\n"
@@ -3018,62 +3024,62 @@
 "%s は CVS リポジトリのルートディレクトリのようです。\n"
 "代りに 'cvs_import %s/<モジュール名>' で取り込んでみて下さい"

-#: rcs_import.cc:1204
+#: rcs_import.cc:1222
 #, c-format
 msgid "need base --branch argument for importing"
 msgstr "取り込みには基準 --branch 引数が必要です"

-#: rcs_import.cc:1216
+#: rcs_import.cc:1234
 #, c-format
 msgid "path %s does not exist"
 msgstr "パス %s は存在しません"

-#: rcs_import.cc:1251
+#: rcs_import.cc:1269
 msgid "tags"
 msgstr "タグ"

-#: revision.cc:700
-#, c-format
-msgid "scanning for bogus merge edges\n"
+#: revision.cc:730
+#, fuzzy, c-format
+msgid "scanning for bogus merge edges"
 msgstr "偽りの統合先端を走査中\n"

-#: revision.cc:742
-#, c-format
-msgid "optimizing out redundant edge %d -> %d\n"
+#: revision.cc:772
+#, fuzzy, c-format
+msgid "optimizing out redundant edge %d -> %d"
 msgstr "冗長な先端 %d -> %d を最適化中\n"

-#: revision.cc:751
-#, c-format
-msgid "failed to eliminate edge %d -> %d\n"
+#: revision.cc:781
+#, fuzzy, c-format
+msgid "failed to eliminate edge %d -> %d"
 msgstr "先端 %d -> %d の除去に失敗\n"

-#: revision.cc:762
-#, c-format
-msgid "rebuilding %d nodes\n"
+#: revision.cc:792
+#, fuzzy, c-format
+msgid "rebuilding %d nodes"
 msgstr "再構築中: %d ノード\n"

-#: revision.cc:967
+#: revision.cc:997
 #, c-format
 msgid "Path %s added to child roster multiple times\n"
 msgstr "パス %s が子の名簿に複数回追加されました\n"

-#: revision.cc:980
+#: revision.cc:1010
 #, c-format
 msgid "Directory for path %s cannot be added, as there is a file in the way\n"
 msgstr ""
 "邪魔になっているファイルがあるので、パス %s のディレクトリを追加できません\n"

-#: revision.cc:991
-#, c-format
-msgid "Path %s cannot be added, as there is a directory in the way\n"
+#: revision.cc:1021
+#, fuzzy, c-format
+msgid "Path %s cannot be added, as there is a directory in the way"
 msgstr "邪魔になっているディレクトリがあるので パス %s を追加できません\n"

-#: revision.cc:994
+#: revision.cc:1024
 #, c-format
 msgid "Path %s added twice with differing content\n"
 msgstr "異なる内容でパス %s を二回追加しています\n"

-#: revision.cc:1281
+#: revision.cc:1311
 #, c-format
 msgid ""
 "unknown attribute '%s' on path '%s'\n"
@@ -3086,18 +3092,18 @@
 "(もし単に先に進みたいのなら --drop-attr スウィッチについて参照して下さい。\n"
 "しかし本当のところそのままにしておいてもらう方が解決には役立ちます。)"

-#: revision.cc:1393
-#, c-format
-msgid "converting existing revision graph to new roster-style revisions\n"
+#: revision.cc:1423
+#, fuzzy, c-format
+msgid "converting existing revision graph to new roster-style revisions"
 msgstr ""
 "既存のリビジョンのグラフを新しい名簿スタイルのリビジョンに変換しています\n"

-#: revision.cc:1448
-#, c-format
-msgid "rebuilding revision graph from manifest certs\n"
+#: revision.cc:1478
+#, fuzzy, c-format
+msgid "rebuilding revision graph from manifest certs"
 msgstr "マニフェスト証明からリビジョングラフを再度構成中\n"

-#: revision.cc:1551
+#: revision.cc:1581
 #, c-format
 msgid ""
 "encountered a revision with unknown format, version '%s'\n"
@@ -3108,359 +3114,479 @@
 "理解できるのはバージョン '1' 形式だけです。\n"
 "この操作を完了するにはより新しいバージョンの monotone が必要です"

-#: sanity.cc:117
+#: sanity.cc:135
 #, c-format
 msgid "fatal: formatter failed on %s:%d: %s"
 msgstr "致命的: フォーマッタ失敗 %s:%d: %s"

-#: sanity.cc:191
+#: sanity.cc:209
 msgid "misuse: "
 msgstr "誤り: "

-#: sanity.cc:203
+#: sanity.cc:221
 msgid "error: "
 msgstr "エラー: "

-#: sanity.cc:211
+#: sanity.cc:229
 #, c-format
 msgid "%s:%d: invariant '%s' violated"
 msgstr "%s:%d: invariant '%s' violated"

-#: sanity.cc:224
+#: sanity.cc:242
 #, c-format
 msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"
 msgstr "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n"

-#: sanity.cc:245
+#: sanity.cc:263
 #, c-format
 msgid "Current work set: %i items\n"
 msgstr "現在の作業セット: %i アイテム\n"

-#: schema_migration.cc:228
+#: schema_migration.cc:241
 #, c-format
 msgid "calculating necessary migration steps"
 msgstr "必要な統合ステップを見積っています"

-#: schema_migration.cc:238
+#: schema_migration.cc:251
 #, c-format
 msgid "error at transaction BEGIN statement"
 msgstr "トランザクション BEGIN 文でエラー"

-#: schema_migration.cc:239
+#: schema_migration.cc:252
 #, c-format
 msgid "migrating data"
 msgstr "データを統合しています"

-#: schema_migration.cc:265
+#: schema_migration.cc:278
 #, c-format
 msgid "migration step failed: %s"
 msgstr "統合ステップ失敗: %s"

-#: schema_migration.cc:279
+#: schema_migration.cc:292
 #, c-format
 msgid "mismatched result of migration, got %s, wanted %s"
 msgstr "統合の結果の不一致: 結果 %s, 期待 %s"

-#: schema_migration.cc:282
+#: schema_migration.cc:295
 #, c-format
 msgid "committing changes to database"
 msgstr "変更をデータベースにコミットしています"

-#: schema_migration.cc:284
+#: schema_migration.cc:297
 #, c-format
 msgid "failure on COMMIT"
 msgstr "COMMIT 失敗"

-#: schema_migration.cc:286
+#: schema_migration.cc:299
 #, c-format
 msgid "optimizing database"
 msgstr "データベースを最適化しています"

-#: schema_migration.cc:288
+#: schema_migration.cc:301
 #, c-format
 msgid "error vacuuming after migration"
 msgstr "統合後のバキューム処理中にエラー"

-#: schema_migration.cc:291
+#: schema_migration.cc:304
 #, c-format
 msgid "error running analyze after migration"
 msgstr "統合後に解析実行中にエラー"

-#: schema_migration.cc:298
+#: schema_migration.cc:311
 #, c-format
 msgid "database schema %s is unknown; cannot perform migration"
 msgstr "不明なデータベーススキーマ %s; 統合できません"

-#: schema_migration.cc:303
-#, c-format
-msgid "no migration performed; database schema already up-to-date at %s\n"
+#: schema_migration.cc:316
+#, fuzzy, c-format
+msgid "no migration performed; database schema already up-to-date at %s"
 msgstr "統合しません; データベーススキーマは既に最新になっています: %s\n"

-#: schema_migration.cc:853
+#: schema_migration.cc:866
 #, c-format
 msgid "public and private keys for %s don't match"
 msgstr "%s の公開鍵と秘密鍵が一致しません"

-#: schema_migration.cc:856
+#: schema_migration.cc:869
 #, c-format
 msgid "moving key '%s' from database to %s"
 msgstr "鍵 '%s' をデータベースから %s に移動しています"

-#: std_hooks.lua:28
+#: std_hooks.lua:31
+msgid "Press enter"
+msgstr ""
+
+#: std_hooks.lua:33
 msgid "Press enter when the subprocess has completed"
 msgstr "サブプロセスが完了したら [Enter] を押して下さい"

-#: transforms.cc:510
+#: ui.cc:126
 #, c-format
-msgid "failed to convert string from %s to %s: '%s'"
-msgstr "文字列の変換 (%s から %s: '%s' へ) に失敗しました"
-
-#: transforms.cc:741 transforms.cc:755
-#, c-format
-msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
-msgstr "UTF-8 から IDNA ACE へ変換中にエラー(%d バイト): %s"
-
-#: ui.cc:108
-#, c-format
 msgid "%.1f G"
 msgstr "%.1f G"

-#: ui.cc:114
+#: ui.cc:132
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"

-#: ui.cc:120
+#: ui.cc:138
 #, c-format
 msgid "%.1f k"
 msgstr "%.1f k"

-#: ui.cc:137 ui.cc:139
+#: ui.cc:151
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"

-#: ui.cc:146
+#: ui.cc:156
 #, c-format
 msgid "%d"
 msgstr "%d"

-#: ui.cc:369
+#: ui.cc:423
+msgid "warning: "
+msgstr ""
+
+#: ui.cc:432
 #, c-format
 msgid ""
 "fatal: %s\n"
 "this is almost certainly a bug in monotone.\n"
 "please send this error message, the output of '%s --full-version',\n"
 "and a description of what you were doing to %s.\n"
-msgstr "深刻: %s\n"
+msgstr ""
+"深刻: %s\n"
 "これはほぼ確実に monotone のバグでしょう。\n"
 "このエラーメッセージと '%s --full-version' の結果と %s について\n"
 "何をしたか説明を添えて報告して下さい\n"

-#: update.cc:65
-#, c-format
-msgid "failed to decode boolean testresult cert value '%s'\n"
+#: ui.cc:493
+#, fuzzy, c-format
+msgid "failed to open log file '%s'"
+msgstr "オプションファイル '%s' の解析に失敗"
+
+#: update.cc:72
+#, fuzzy, c-format
+msgid "failed to decode boolean testresult cert value '%s'"
 msgstr "テスト結果真偽値の証明値 '%s' のデコードに失敗しました\n"

-#: update.cc:159
+#: update.cc:166
 #, c-format
 msgid "cannot determine branch for update"
 msgstr "更新するブランチを決定できません"

-#: vocab.cc:68
+#: vocab.cc:65
 #, c-format
 msgid "hex encoded ID '%s' size != %d"
 msgstr "十六進エンコード ID '%s' サイズ != %d"

-#: vocab.cc:72
+#: vocab.cc:69
 #, c-format
 msgid "bad character '%c' in id name '%s'"
 msgstr "不正な文字 '%c' (ID 名 '%s' 内)"

-#: vocab.cc:85
+#: vocab.cc:82
 #, c-format
 msgid "bad character '%c' in ace string '%s'"
 msgstr "不正な文字 '%c' (ace 文字列 '%s' 内)"

-#: vocab.cc:99
+#: vocab.cc:96
+#, fuzzy, c-format
+msgid "bad character '%c' in symbol '%s'"
+msgstr "不正な文字 '%c' (キー名 '%s' 内)"
+
+#: vocab.cc:110
 #, c-format
 msgid "bad character '%c' in cert name '%s'"
 msgstr "不正な文字 '%c' (証明 '%s' 内)"

-#: vocab.cc:112
+#: vocab.cc:123
 #, c-format
 msgid "bad character '%c' in key name '%s'"
 msgstr "不正な文字 '%c' (キー名 '%s' 内)"

-#: vocab.cc:130
+#: vocab.cc:141
 #, c-format
 msgid "Invalid key length of %d bytes"
 msgstr "不正な鍵長 %d バイト"

-#: vocab.cc:148
+#: vocab.cc:159
 #, c-format
 msgid "Invalid hmac length of %d bytes"
 msgstr "不正な HMAC 長 %d バイト"

-#: work.cc:118
+#: work.cc:186
 #, c-format
 msgid "skipping ignorable file %s"
 msgstr "無視できるファイル %s をスキップしています"

-#: work.cc:127
+#: work.cc:195
 #, c-format
 msgid "skipping %s, already accounted for in workspace"
 msgstr "既にワークスペースで数に入れられている %s をスキップしています"

-#: work.cc:131
+#: work.cc:199
 #, c-format
 msgid "adding %s to workspace manifest"
 msgstr "ワークスペースのマニフェストに %s を追加しています"

-#: work.cc:221
+#: work.cc:289
 #, c-format
 msgid "skipping %s, not currently tracked"
 msgstr "追跡されていない %s をスキップしています"

-#: work.cc:231
+#: work.cc:299
 #, c-format
 msgid "cannot remove %s/, it is not empty"
 msgstr "空ではないので %s/ を削除できません"

-#: work.cc:242
+#: work.cc:310
 #, c-format
 msgid "dropping %s from workspace manifest"
 msgstr "ワークスペースのマニフェストから %s を破棄しています"

-#: work.cc:305
+#: work.cc:373
 #, c-format
 msgid "destination dir %s/ does not exist in current revision"
 msgstr "現在のリビジョンにディレクトリ %s/ はありません"

-#: work.cc:308
+#: work.cc:376
 #, c-format
 msgid "destination %s is an existing file in current revision"
 msgstr "現在のリビジョンに %s はありません"

-#: work.cc:318
+#: work.cc:386
 #, c-format
 msgid "empty path %s is not allowed"
 msgstr "パス %s は空にできません"

-#: work.cc:332
+#: work.cc:400
 #, c-format
 msgid "%s does not exist in current revision"
 msgstr "現在のリビジョンに %s はありません"

-#: work.cc:335
+#: work.cc:403
 #, c-format
 msgid "destination %s already exists in current revision"
 msgstr "%s は既に現在のリビジョンにあります"

-#: work.cc:344
+#: work.cc:412
 #, c-format
 msgid "renaming %s to %s in workspace manifest"
 msgstr "ワークスペースのマニフェスト内の %s を %s に変更しています"

-#: work.cc:369
+#: work.cc:437
 #, c-format
 msgid "%s doesn't exist in workspace, skipping"
 msgstr "ワークスペース内に %s はありませんので、スキップします"

-#: work.cc:373
+#: work.cc:441
 #, c-format
 msgid "destination %s already exists in workspace, skipping"
 msgstr "リビジョン '%s' は既にデータベースにありますので、スキップします"

-#: work.cc:400
+#: work.cc:468
 #, c-format
 msgid "proposed new root directory '%s' is not versioned or does not exist"
 msgstr ""
 "提案された新しいルートディレクトリ '%s' はバージョン付けされていないか、存在"
 "しません"

-#: work.cc:402
+#: work.cc:470
 #, c-format
 msgid "proposed new root directory '%s' is not a directory"
 msgstr "提案された新しいルートディレクトリ '%s' はディレクトリではありません"

-#: work.cc:407
+#: work.cc:475
 #, c-format
 msgid "proposed new root directory '%s' contains illegal path %s"
 msgstr ""
 "提案された新しいルートディレクトリ '%s' には不正なパス %s が含まれています"

-#: work.cc:417
+#: work.cc:485
 #, c-format
 msgid "directory '%s' is not versioned or does not exist"
 msgstr "ディレクトリ '%s' はバージョン付けされていないか、存在しません"

-#: work.cc:423
+#: work.cc:491
 #, c-format
 msgid "'%s' is in the way"
 msgstr "'%s' が邪魔になっています"

-#: work.cc:520
+#: work.cc:586
 #, c-format
 msgid "workspace is corrupt: %s does not exist"
 msgstr "ワークスペースは壊れています: %s は存在しません"

-#: work.cc:521
+#: work.cc:587
 #, c-format
 msgid "workspace is corrupt: %s is a directory"
 msgstr "ワークスペースは壊れています: %s は存在しません"

-#: work.cc:531
+#: work.cc:597
 #, c-format
 msgid "Problem with workspace: %s is unreadable"
 msgstr "ワークスペースに問題があります: %s を読み込めません"

-#: work.cc:557
-#, c-format
-msgid "base revision %s does not exist in database\n"
+#: work.cc:623
+#, fuzzy, c-format
+msgid "base revision %s does not exist in database"
 msgstr "データベースに基準リビジョン %s は含まれていません\n"

-#: work.cc:894
+#: work.cc:932
 #, c-format
 msgid "dropping %s"
 msgstr "%s を破棄しています"

-#: work.cc:905 work.cc:916
+#: work.cc:943 work.cc:954
 #, c-format
 msgid "path %s already exists"
 msgstr "パス %s は既にあります"

-#: work.cc:938 work.cc:965
+#: work.cc:976 work.cc:1003
 #, c-format
 msgid "adding %s"
 msgstr "%s を追加しています"

-#: work.cc:954
+#: work.cc:992
 #, c-format
 msgid "path '%s' already exists, cannot create"
 msgstr "パス '%s' は既にありますので作成できません"

-#: work.cc:961
+#: work.cc:999
 #, c-format
 msgid "renaming %s to %s"
 msgstr "%s から %s に名称変更しています"

-#: work.cc:996
+#: work.cc:1034
 #, c-format
 msgid "file '%s' does not exist"
 msgstr "ファイル '%s' は存在しません"

-#: work.cc:997
+#: work.cc:1035
 #, c-format
 msgid "file '%s' is a directory"
 msgstr "ファイル '%s' はディレクトリです"

-#: work.cc:1002
+#: work.cc:1040
 #, c-format
 msgid "content of file '%s' has changed, not overwriting"
 msgstr "ファイル '%s' の内容は変更されているので上書きしません"

-#: work.cc:1003
+#: work.cc:1041
 #, c-format
 msgid "updating %s"
 msgstr "%s を更新しています"
+
+#~ msgid "unknown path '%s'\n"
+#~ msgstr "不明なパス '%s'\n"
+
+#~ msgid "negative or zero last not allowed\n"
+#~ msgstr "最終値を負または零にすることはできません\n"
+
+#~ msgid "negative or zero next not allowed\n"
+#~ msgstr "次の値を負または零にすることはできません\n"
+
+#~ msgid "branch '%s' is empty\n"
+#~ msgstr "ブランチ '%s' は空です\n"
+
+#~ msgid ""
+#~ "revision %s is a member of\n"
+#~ "%s, updating workspace branch"
+#~ msgstr ""
+#~ "リビジョン %s は %s に属しています\n"
+#~ "ワークスペースブランチを更新しています"
+
+#~ msgid ""
+#~ "revision %s is a member of no branches,\n"
+#~ "using branch %s for workspace"
+#~ msgstr ""
+#~ "リビジョン %s はブランチには属していませんので、\n"
+#~ "ワークスペースに %s を使います"
+
+#~ msgid "Unknown file '%s' for log command"
+#~ msgstr "ログコマンドに対して不明なファイル '%s'"
+
+#~ msgid ""
+#~ "interface_version\n"
+#~ "heads [BRANCH]\n"
+#~ "ancestors REV1 [REV2 [REV3 [...]]]\n"
+#~ "attributes [FILE]\n"
+#~ "parents REV\n"
+#~ "descendents REV1 [REV2 [REV3 [...]]]\n"
+#~ "children REV\n"
+#~ "graph\n"
+#~ "erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n"
+#~ "toposort [REV1 [REV2 [REV3 [...]]]]\n"
+#~ "ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n"
+#~ "leaves\n"
+#~ "inventory\n"
+#~ "stdio\n"
+#~ "certs REV\n"
+#~ "select SELECTOR\n"
+#~ "get_file FILEID\n"
+#~ "get_manifest_of [REVID]\n"
+#~ "get_revision [REVID]\n"
+#~ "packet_for_rdata REVID\n"
+#~ "packets_for_certs REVID\n"
+#~ "packet_for_fdata FILEID\n"
+#~ "packet_for_fdelta OLD_FILE NEW_FILE\n"
+#~ "keys\n"
+#~ msgstr ""
+#~ "interface_version\n"
+#~ "heads [BRANCH]\n"
+#~ "ancestors REV1 [REV2 [REV3 [...]]]\n"
+#~ "attributes [FILE]\n"
+#~ "parents REV\n"
+#~ "descendents REV1 [REV2 [REV3 [...]]]\n"
+#~ "children REV\n"
+#~ "graph\n"
+#~ "erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n"
+#~ "toposort [REV1 [REV2 [REV3 [...]]]]\n"
+#~ "ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n"
+#~ "leaves\n"
+#~ "inventory\n"
+#~ "stdio\n"
+#~ "certs REV\n"
+#~ "select SELECTOR\n"
+#~ "get_file FILEID\n"
+#~ "get_manifest_of [REVID]\n"
+#~ "get_revision [REVID]\n"
+#~ "packet_for_rdata REVID\n"
+#~ "packets_for_certs REVID\n"
+#~ "packet_for_fdata FILEID\n"
+#~ "packet_for_fdelta OLD_FILE NEW_FILE\n"
+#~ "keys\n"
+
+#~ msgid "expected file '%s', but it is a directory."
+#~ msgstr "'%s' は期待していたファイルではなく、ディレクトリです"
+
+#~ msgid "lua error while loading '%s'"
+#~ msgstr "lua '%s' を読み込み中にエラー"
+
+#~ msgid "rcfile '%s' does not exist"
+#~ msgstr "初期化ファイル '%s' は存在しません"
+
+#~ msgid "use least common ancestor as ancestor for merge"
+#~ msgstr "最も近い共通の祖先を統合の祖先として使用"
+
+#~ msgid "revision '%s' does not exist in our database"
+#~ msgstr "こちらのデータベースにはリビジョン '%s' は含まれていません"
+
+#~ msgid "file '%s' does not exist in our database"
+#~ msgstr "こちらのデータベースにはファイル '%s' は含まれていません"
+
+#~ msgid "cert '%s' does not exist in our database"
+#~ msgstr "こちらのデータベースには証明 '%s' は含まれていません"
+
+#~ msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n"
+#~ msgstr ""
+#~ "差分 '%s' -> '%s' から再構築されたファイルの ID '%s' は不正なものです\n"
+
+#~ msgid "failed to convert string from %s to %s: '%s'"
+#~ msgstr "文字列の変換 (%s から %s: '%s' へ) に失敗しました"
+
+#~ msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
+#~ msgstr "UTF-8 から IDNA ACE へ変換中にエラー(%d バイト): %s"
============================================================
--- po/pt_BR.po	5b8fc28ad0037d7ee07bf8aad1a6f085d0e0f34f
+++ po/pt_BR.po	d6f06940859e9f18b33ea20e6525bfe9e0630113
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Monotone 0.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-20 09:37-0300\n"
+"POT-Creation-Date: 2006-07-05 22:56-0700\n"
 "PO-Revision-Date: 2006-06-20 17:56-0300\n"
 "Last-Translator: Alex Sandro Queiroz e Silva <address@hidden>\n"
 "Language-Team: Alex Sandro Queiroz e Silva <address@hidden>\n"
@@ -27,8 +27,8 @@
 msgstr "diretório inválido ''"

 #: app_state.cc:155
-#, c-format
-msgid "monotone bookkeeping directory '%s' already exists in '%s'\n"
+#, fuzzy, c-format
+msgid "monotone bookkeeping directory '%s' already exists in '%s'"
 msgstr "diretório '%s' de manutenção do monotone já existe em '%s'\n"

 #: app_state.cc:236
@@ -161,11 +161,11 @@
 msgid "Bad input to automate stdio"
 msgstr ""

-#: cmd_automate.cc:296
+#: cmd_automate.cc:301
 msgid "automation"
 msgstr "automação"

-#: cmd_automate.cc:297
+#: cmd_automate.cc:302
 msgid "automation interface"
 msgstr "interface de automação"

@@ -320,7 +320,7 @@
 msgid "only one of --last/--next allowed"
 msgstr "apenas ou --last ou --next é permitido"

-#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:634
+#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:771
 #: cmd_othervcs.cc:15
 msgid "debug"
 msgstr "depuração"
@@ -682,9 +682,9 @@
 msgid "No such revision %s"
 msgstr "versão '%s' não existe"

-#: cmd_merging.cc:53 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224
-#: cmd_ws_commit.cc:251 cmd_ws_commit.cc:278 cmd_ws_commit.cc:303
-#: cmd_ws_commit.cc:515 cmd_ws_commit.cc:613
+#: cmd_merging.cc:53 cmd_merging.cc:610 cmd_ws_commit.cc:53
+#: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278
+#: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613
 msgid "workspace"
 msgstr "área de trabalho"

@@ -784,7 +784,7 @@
 msgstr "atualizado para versão-base %s"

 #: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523
-#: cmd_merging.cc:610 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851
+#: cmd_merging.cc:747 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851
 #: cmd_ws_commit.cc:872
 msgid "tree"
 msgstr "árvore"
@@ -793,12 +793,12 @@
 msgid "merge unmerged heads of branch"
 msgstr "combina diferentes frentes do ramo"

-#: cmd_merging.cc:308 cmd_merging.cc:618
+#: cmd_merging.cc:308 cmd_merging.cc:755
 #, c-format
 msgid "please specify a branch, with --branch=BRANCH"
 msgstr "por favor especifique um ramo com --branch=RAMO"

-#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:623
+#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:760
 #: cmd_ws_commit.cc:430
 #, c-format
 msgid "branch '%s' is empty"
@@ -951,25 +951,55 @@
 msgid "There are %s directory_loop_conflicts."
 msgstr "Há %s conflitos de laços de diretório."

-#: cmd_merging.cc:610
+#: cmd_merging.cc:611
+msgid ""
+"cherrypick changes from other parts of history into workspace.\n"
+"This command takes arbitrary changes made at any point in history,\n"
+"and applies them to your current workspace, as if you had made the\n"
+"edits by hand.\n"
+"If one revision is given, applies the changes made in that revision\n"
+"compared to its parent.\n"
+"If two revisions are given, applies the changes made to get from the\n"
+"first revision to the second."
+msgstr ""
+
+#: cmd_merging.cc:632
+#, c-format
+msgid ""
+"revision %s is a merge\n"
+"to apply the changes relative to one of its parents, use:\n"
+"  %s cherrypatch -r PARENT -r %s"
+msgstr ""
+
+#: cmd_merging.cc:649
+#, fuzzy, c-format
+msgid "no changes to apply"
+msgstr "nenhuma mudança para gravar"
+
+#: cmd_merging.cc:740
+#, fuzzy, c-format
+msgid "applied changes to workspace"
+msgstr "adiciona arquivos à área de trabalho"
+
+#: cmd_merging.cc:747
 msgid "show unmerged head revisions of branch"
 msgstr "mostra frentes não combinadas do ramo"

-#: cmd_merging.cc:625
+#: cmd_merging.cc:762
 #, c-format
 msgid "branch '%s' is currently merged:"
 msgstr "ramo '%s' está atualmente combinado:"

-#: cmd_merging.cc:627
+#: cmd_merging.cc:764
 #, c-format
 msgid "branch '%s' is currently unmerged:"
 msgstr "ramo '%s' não está combinado atualmente:"

-#: cmd_merging.cc:634
+#: cmd_merging.cc:771
 msgid "REVID"
 msgstr "VERSÂO"

-#: cmd_merging.cc:635
+#: cmd_merging.cc:772
 msgid "dump the roster associated with the given REVID"
 msgstr "exibe conteúdo do roster associado com VERSÃO"

@@ -1400,10 +1430,10 @@
 msgid "refresh the inodeprint cache"
 msgstr "atualiza o cache de inodeprint"

-#: commands.cc:124
+#: commands.cc:124 commands.cc:225
 #, c-format
-msgid "unknown command '%s'\n"
-msgstr "comando desconhecido '%s'\n"
+msgid "unknown command '%s'"
+msgstr "comando desconhecido '%s'"

 #: commands.cc:135
 #, c-format
@@ -1414,11 +1444,6 @@
 msgid "commands:"
 msgstr "comandos:"

-#: commands.cc:225
-#, c-format
-msgid "unknown command '%s'"
-msgstr "comando desconhecido '%s'"
-
 #: commands.cc:246
 msgid "command [ARGS...]"
 msgstr "comando [ARGS...]"
@@ -1911,22 +1936,22 @@
 msgid "could not open database '%s': %s"
 msgstr "erro abrindo banco de dados '%s': %s"

-#: diff_patch.cc:605
+#: diff_patch.cc:606
 #, c-format
 msgid "file '%s' does not exist in workspace"
 msgstr "arquivo '%s' não existe na área de trabalho"

-#: diff_patch.cc:606
+#: diff_patch.cc:607
 #, c-format
 msgid "'%s' in workspace is a directory, not a file"
 msgstr "'%s' na área de trabalho é um diretório, não um arquivo"

-#: diff_patch.cc:610
+#: diff_patch.cc:611
 #, c-format
 msgid "file %s in workspace has id %s, wanted %s"
 msgstr "arquivo %s na área de trabalho tem id %s, pedido %s"

-#: diff_patch.cc:731
+#: diff_patch.cc:732
 #, c-format
 msgid ""
 "help required for 3-way merge\n"
@@ -2375,12 +2400,12 @@
 msgid "syntax error near the \"%s\" option: %s"
 msgstr ""

-#: monotone.cc:635
+#: monotone.cc:629
 #, c-format
-msgid "monotone %s doesn't use the option %s"
+msgid "%s %s doesn't use the option %s"
 msgstr ""

-#: monotone.cc:670
+#: monotone.cc:663
 #, c-format
 msgid "Options specific to '%s %s':"
 msgstr ""
@@ -2874,7 +2899,6 @@
 msgid "missing prerequisite file post-delta '%s'"
 msgstr "arquivo pós-delta pré-requisito '%s' não existe"

-
 #: packet.cc:201
 #, c-format
 msgid "cert revision '%s' does not exist in db"
@@ -2982,9 +3006,9 @@
 msgstr ""

 #: revision.cc:1021
-#, c-format
-msgid "Path %s cannot be added, as there is a directory in the way\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Path %s cannot be added, as there is a directory in the way"
+msgstr "arquivo %s não pode ser lido como dados, é um diretório"

 #: revision.cc:1024
 #, c-format
@@ -3335,8 +3359,8 @@
 msgstr "Problema com área de trabalho: %s é ilegível"

 #: work.cc:623
-#, c-format
-msgid "base revision %s does not exist in database\n"
+#, fuzzy, c-format
+msgid "base revision %s does not exist in database"
 msgstr "versão-base %s não existe no banco de dados\n"

 #: work.cc:932
@@ -3384,6 +3408,9 @@
 msgid "updating %s"
 msgstr "atualizando %s"

+#~ msgid "unknown command '%s'\n"
+#~ msgstr "comando desconhecido '%s'\n"
+
 #~ msgid "unknown path '%s'\n"
 #~ msgstr "caminho desconhecido '%s'\n"

============================================================
--- po/sv.po	3c30314f0fcb405fdffd637d1416edeccd7ef25f
+++ po/sv.po	f26b570bb75cfbca0f3a63c484500b8ae2c7f2ea
@@ -145,7 +145,7 @@
 msgstr ""
 "Project-Id-Version: monotone 0.26pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-24 17:55+0200\n"
+"POT-Creation-Date: 2006-07-05 22:56-0700\n"
 "PO-Revision-Date: 2006-06-24 17:57+0200\n"
 "Last-Translator: Joel Rosdahl <address@hidden>\n"
 "Language-Team: Richard Levitte <address@hidden>\n"
@@ -289,11 +289,11 @@
 msgid "Bad input to automate stdio"
 msgstr "felaktigt indata till automate stdio"

-#: cmd_automate.cc:296
+#: cmd_automate.cc:301
 msgid "automation"
 msgstr "automatisering"

-#: cmd_automate.cc:297
+#: cmd_automate.cc:302
 msgid "automation interface"
 msgstr "automatiseringsgränssnitt"

@@ -447,7 +447,7 @@
 msgid "only one of --last/--next allowed"
 msgstr "enbart en av --last eller --next tillåten"

-#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:634
+#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:771
 #: cmd_othervcs.cc:15
 msgid "debug"
 msgstr "felsökning"
@@ -808,9 +808,9 @@
 msgid "No such revision %s"
 msgstr "det finns ingen revision med identiteten %s"

-#: cmd_merging.cc:53 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224
-#: cmd_ws_commit.cc:251 cmd_ws_commit.cc:278 cmd_ws_commit.cc:303
-#: cmd_ws_commit.cc:515 cmd_ws_commit.cc:613
+#: cmd_merging.cc:53 cmd_merging.cc:610 cmd_ws_commit.cc:53
+#: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278
+#: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613
 msgid "workspace"
 msgstr "arbetskopia"

@@ -915,7 +915,7 @@
 msgstr "uppdaterad till revisionen %s"

 #: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523
-#: cmd_merging.cc:610 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851
+#: cmd_merging.cc:747 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851
 #: cmd_ws_commit.cc:872
 msgid "tree"
 msgstr "träd"
@@ -924,12 +924,12 @@
 msgid "merge unmerged heads of branch"
 msgstr "slå ihop ej ihopslagna löv i grenen"

-#: cmd_merging.cc:308 cmd_merging.cc:618
+#: cmd_merging.cc:308 cmd_merging.cc:755
 #, c-format
 msgid "please specify a branch, with --branch=BRANCH"
 msgstr "var god ange en gren med --branch=GREN"

-#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:623
+#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:760
 #: cmd_ws_commit.cc:430
 #, c-format
 msgid "branch '%s' is empty"
@@ -1081,25 +1081,55 @@
 msgid "There are %s directory_loop_conflicts."
 msgstr "Det finns %s directory_loop-konflikter."

-#: cmd_merging.cc:610
+#: cmd_merging.cc:611
+msgid ""
+"cherrypick changes from other parts of history into workspace.\n"
+"This command takes arbitrary changes made at any point in history,\n"
+"and applies them to your current workspace, as if you had made the\n"
+"edits by hand.\n"
+"If one revision is given, applies the changes made in that revision\n"
+"compared to its parent.\n"
+"If two revisions are given, applies the changes made to get from the\n"
+"first revision to the second."
+msgstr ""
+
+#: cmd_merging.cc:632
+#, c-format
+msgid ""
+"revision %s is a merge\n"
+"to apply the changes relative to one of its parents, use:\n"
+"  %s cherrypatch -r PARENT -r %s"
+msgstr ""
+
+#: cmd_merging.cc:649
+#, fuzzy, c-format
+msgid "no changes to apply"
+msgstr "inga ändringar att arkivera"
+
+#: cmd_merging.cc:740
+#, fuzzy, c-format
+msgid "applied changes to workspace"
+msgstr "lägg till filer i arbetskopian"
+
+#: cmd_merging.cc:747
 msgid "show unmerged head revisions of branch"
 msgstr "visa ej ihopslagna lövrevisioner i grenen"

-#: cmd_merging.cc:625
+#: cmd_merging.cc:762
 #, c-format
 msgid "branch '%s' is currently merged:"
 msgstr "grenen '%s' har för tillfället ett löv:"

-#: cmd_merging.cc:627
+#: cmd_merging.cc:764
 #, c-format
 msgid "branch '%s' is currently unmerged:"
 msgstr "grenen '%s' har för tillfället mer än ett löv:"

-#: cmd_merging.cc:634
+#: cmd_merging.cc:771
 msgid "REVID"
 msgstr "REVID"

-#: cmd_merging.cc:635
+#: cmd_merging.cc:772
 msgid "dump the roster associated with the given REVID"
 msgstr "skriv ut den lista som hör ihop med angivet REVID"

@@ -1524,10 +1554,10 @@
 msgid "refresh the inodeprint cache"
 msgstr "uppdatera inodeprint-cachen"

-#: commands.cc:124
+#: commands.cc:124 commands.cc:225
 #, c-format
-msgid "unknown command '%s'\n"
-msgstr "okänt kommando '%s'\n"
+msgid "unknown command '%s'"
+msgstr "okänt kommando '%s'"

 #: commands.cc:135
 #, c-format
@@ -1538,11 +1568,6 @@
 msgid "commands:"
 msgstr "kommandon:"

-#: commands.cc:225
-#, c-format
-msgid "unknown command '%s'"
-msgstr "okänt kommando '%s'"
-
 #: commands.cc:246
 msgid "command [ARGS...]"
 msgstr "kommandon [ARGUMENT...]"
@@ -2079,22 +2104,22 @@
 msgid "could not open database '%s': %s"
 msgstr "kunde inte öppna databasen '%s': %s"

-#: diff_patch.cc:605
+#: diff_patch.cc:606
 #, c-format
 msgid "file '%s' does not exist in workspace"
 msgstr "filen '%s' existerar inte i arbetskopian"

-#: diff_patch.cc:606
+#: diff_patch.cc:607
 #, c-format
 msgid "'%s' in workspace is a directory, not a file"
 msgstr "'%s' i arbetskopian är en katalog, inte en fil"

-#: diff_patch.cc:610
+#: diff_patch.cc:611
 #, c-format
 msgid "file %s in workspace has id %s, wanted %s"
 msgstr "filen %s i arbetskopian har identiteten %s, %s eftersöktes"

-#: diff_patch.cc:731
+#: diff_patch.cc:732
 #, c-format
 msgid ""
 "help required for 3-way merge\n"
@@ -2548,12 +2573,12 @@
 msgid "syntax error near the \"%s\" option: %s"
 msgstr "syntaxfel nära flaggan \"%s\": %s"

-#: monotone.cc:635
+#: monotone.cc:629
 #, c-format
 msgid "%s %s doesn't use the option %s"
 msgstr "%s %s använder inte flaggan %s"

-#: monotone.cc:670
+#: monotone.cc:663
 #, c-format
 msgid "Options specific to '%s %s':"
 msgstr "Specifika flaggor för '%s %s':"
@@ -3617,6 +3642,9 @@
 msgid "updating %s"
 msgstr "uppdaterar %s"

+#~ msgid "unknown command '%s'\n"
+#~ msgstr "okänt kommando '%s'\n"
+
 #~ msgid ""
 #~ "interface_version\n"
 #~ "heads [BRANCH]\n"