# # patch "ChangeLog" # from [4ffb3e98f5bba9ddd2e68e63059e4fde39c1765c] # to [4961b5d0d86bbeabb4c4aca4f9eecd3ff36f631a] # # patch "netsync.cc" # from [750ebec30f4cb560e17fcb14adbc601fdd73224f] # to [f5ebf69261757e767cf0da088341cb8decba07bb] # # patch "po/fr.po" # from [9d62b550595ead5ad9df1c6e57ef85b13d178252] # to [b1f90e30baa9e493a1eaca00d8b20251ef60b251] # ======================================================================== --- ChangeLog 4ffb3e98f5bba9ddd2e68e63059e4fde39c1765c +++ ChangeLog 4961b5d0d86bbeabb4c4aca4f9eecd3ff36f631a @@ -1,3 +1,8 @@ +2005-11-14 Benoît Dejean + + * po/fr.po: Updated French translation. + * netsync.cc: Removed many i18n strings. + 2005-11-14 Nathaniel Smith * monotone.texi (Historical records): Clarify wording, based on ======================================================================== --- netsync.cc 750ebec30f4cb560e17fcb14adbc601fdd73224f +++ netsync.cc f5ebf69261757e767cf0da088341cb8decba07bb @@ -2029,7 +2029,7 @@ case empty_state: { // we agree, this slot is empty - L(F("(#0) they have an empty slot %d (in a %s node '%s', level %d, we do not have)\n") + L(boost::format("(#0) they have an empty slot %d (in a %s node '%s', level %d, we do not have)\n") % slot % typestr % hpref % lev); continue; } @@ -2041,16 +2041,16 @@ hexenc hslotval; their_node.get_raw_slot(slot, slotval); their_node.get_hex_slot(slot, hslotval); - L(F("(#0) they have a live leaf at slot %d (in a %s node '%s', level %d, we do not have)\n") + L(boost::format("(#0) they have a live leaf at slot %d (in a %s node '%s', level %d, we do not have)\n") % slot % typestr % hpref % lev); - L(F("(#0) requesting their %s leaf %s\n") % typestr % hslotval); + L(boost::format("(#0) requesting their %s leaf %s\n") % typestr % hslotval); queue_send_data_cmd(their_node.type, slotval); } break; case dead_leaf_state: { // we cannot ask for what they have, it is dead - L(F("(#0) they have a dead leaf at slot %d (in a %s node '%s', level %d, we do not have)\n") + L(boost::format("(#0) they have a dead leaf at slot %d (in a %s node '%s', level %d, we do not have)\n") % slot % typestr % hpref % lev); continue; } @@ -2058,7 +2058,7 @@ case subtree_state: { // they have a subtree; might as well ask for that - L(F("(#0) they have a subtree at slot %d (in a %s node '%s', level %d, we do not have)\n") + L(boost::format("(#0) they have a subtree at slot %d (in a %s node '%s', level %d, we do not have)\n") % slot % typestr % hpref % lev); merkle_node our_fake_subtree; their_node.extended_prefix(slot, our_fake_subtree.pref); @@ -2088,14 +2088,14 @@ case empty_state: // 1: theirs == empty, ours == empty - L(F("(#1) they have an empty slot %d in %s node '%s', level %d, and so do we\n") + L(boost::format("(#1) they have an empty slot %d in %s node '%s', level %d, and so do we\n") % slot % typestr % hpref % lev); continue; break; case live_leaf_state: // 2: theirs == empty, ours == live - L(F("(#2) they have an empty slot %d in %s node '%s', level %d, we have a live leaf\n") + L(boost::format("(#2) they have an empty slot %d in %s node '%s', level %d, we have a live leaf\n") % slot % typestr % hpref % lev); { I(their_node.type == our_node->type); @@ -2109,14 +2109,14 @@ case dead_leaf_state: // 3: theirs == empty, ours == dead - L(F("(#3) they have an empty slot %d in %s node '%s', level %d, we have a dead leaf\n") + L(boost::format("(#3) they have an empty slot %d in %s node '%s', level %d, we have a dead leaf\n") % slot % typestr % hpref % lev); continue; break; case subtree_state: // 4: theirs == empty, ours == subtree - L(F("(#4) they have an empty slot %d in %s node '%s', level %d, we have a subtree\n") + L(boost::format("(#4) they have an empty slot %d in %s node '%s', level %d, we have a subtree\n") % slot % typestr % hpref % lev); { prefix subprefix; @@ -2143,7 +2143,7 @@ case empty_state: // 5: theirs == live, ours == empty - L(F("(#5) they have a live leaf at slot %d in %s node '%s', level %d, we have nothing\n") + L(boost::format("(#5) they have a live leaf at slot %d in %s node '%s', level %d, we have nothing\n") % slot % typestr % hpref % lev); { id slotval; @@ -2154,7 +2154,7 @@ case live_leaf_state: // 6: theirs == live, ours == live - L(F("(#6) they have a live leaf at slot %d in %s node '%s', and so do we\n") + L(boost::format("(#6) they have a live leaf at slot %d in %s node '%s', and so do we\n") % slot % typestr % hpref); { id our_slotval, their_slotval; @@ -2164,7 +2164,7 @@ { hexenc hslotval; their_node.get_hex_slot(slot, hslotval); - L(F("(#6) we both have live %s leaf '%s'\n") % typestr % hslotval); + L(boost::format("(#6) we both have live %s leaf '%s'\n") % typestr % hslotval); continue; } else @@ -2180,7 +2180,7 @@ case dead_leaf_state: // 7: theirs == live, ours == dead - L(F("(#7) they have a live leaf at slot %d in %s node %s, level %d, we have a dead one\n") + L(boost::format("(#7) they have a live leaf at slot %d in %s node %s, level %d, we have a dead one\n") % slot % typestr % hpref % lev); { id our_slotval, their_slotval; @@ -2190,7 +2190,7 @@ { hexenc hslotval; their_node.get_hex_slot(slot, hslotval); - L(F("(#7) it's the same %s leaf '%s', but ours is dead\n") + L(boost::format("(#7) it's the same %s leaf '%s', but ours is dead\n") % typestr % hslotval); continue; } @@ -2203,7 +2203,7 @@ case subtree_state: // 8: theirs == live, ours == subtree - L(F("(#8) they have a live leaf in slot %d of %s node '%s', level %d, we have a subtree\n") + L(boost::format("(#8) they have a live leaf in slot %d of %s node '%s', level %d, we have a subtree\n") % slot % typestr % hpref % lev); { @@ -2212,16 +2212,16 @@ their_node.get_raw_slot(slot, their_slotval); encode_hexenc(their_slotval, their_hval); if (data_exists(their_node.type, their_slotval, app)) - L(F("(#8) we have a copy of their live leaf '%s' in slot %d of %s node '%s', level %d\n") + L(boost::format("(#8) we have a copy of their live leaf '%s' in slot %d of %s node '%s', level %d\n") % their_hval % slot % typestr % hpref % lev); else { - L(F("(#8) requesting a copy of their live leaf '%s' in slot %d of %s node '%s', level %d\n") + L(boost::format("(#8) requesting a copy of their live leaf '%s' in slot %d of %s node '%s', level %d\n") % their_hval % slot % typestr % hpref % lev); queue_send_data_cmd(their_node.type, their_slotval); } - L(F("(#8) sending our subtree for refinement, in slot %d of %s node '%s', level %d\n") + L(boost::format("(#8) sending our subtree for refinement, in slot %d of %s node '%s', level %d\n") % slot % typestr % hpref % lev); prefix subprefix; our_node->extended_raw_prefix(slot, subprefix); @@ -2244,14 +2244,14 @@ { case empty_state: // 9: theirs == dead, ours == empty - L(F("(#9) they have a dead leaf at slot %d in %s node '%s', level %d, we have nothing\n") + L(boost::format("(#9) they have a dead leaf at slot %d in %s node '%s', level %d, we have nothing\n") % slot % typestr % hpref % lev); continue; break; case live_leaf_state: // 10: theirs == dead, ours == live - L(F("(#10) they have a dead leaf at slot %d in %s node '%s', level %d, we have a live one\n") + L(boost::format("(#10) they have a dead leaf at slot %d in %s node '%s', level %d, we have a live one\n") % slot % typestr % hpref % lev); { id our_slotval, their_slotval; @@ -2261,7 +2261,7 @@ our_node->get_hex_slot(slot, hslotval); if (their_slotval == our_slotval) { - L(F("(#10) we both have %s leaf %s, theirs is dead\n") + L(boost::format("(#10) we both have %s leaf %s, theirs is dead\n") % typestr % hslotval); continue; } @@ -2277,14 +2277,14 @@ case dead_leaf_state: // 11: theirs == dead, ours == dead - L(F("(#11) they have a dead leaf at slot %d in %s node '%s', level %d, so do we\n") + L(boost::format("(#11) they have a dead leaf at slot %d in %s node '%s', level %d, so do we\n") % slot % typestr % hpref % lev); continue; break; case subtree_state: // theirs == dead, ours == subtree - L(F("(#12) they have a dead leaf in slot %d of %s node '%s', we have a subtree\n") + L(boost::format("(#12) they have a dead leaf in slot %d of %s node '%s', we have a subtree\n") % slot % typestr % hpref % lev); { prefix subprefix; @@ -2307,7 +2307,7 @@ { case empty_state: // 13: theirs == subtree, ours == empty - L(F("(#13) they have a subtree at slot %d in %s node '%s', level %d, we have nothing\n") + L(boost::format("(#13) they have a subtree at slot %d in %s node '%s', level %d, we have nothing\n") % slot % typestr % hpref % lev); { merkle_node our_fake_subtree; @@ -2320,7 +2320,7 @@ case live_leaf_state: // 14: theirs == subtree, ours == live - L(F("(#14) they have a subtree at slot %d in %s node '%s', level %d, we have a live leaf\n") + L(boost::format("(#14) they have a subtree at slot %d in %s node '%s', level %d, we have a live leaf\n") % slot % typestr % hpref % lev); { size_t subslot; @@ -2332,7 +2332,7 @@ pick_slot_and_prefix_for_value(our_slotval, our_node->level + 1, subslot, our_fake_subtree.pref); - L(F("(#14) pushed our leaf '%s' into fake subtree slot %d, level %d\n") + L(boost::format("(#14) pushed our leaf '%s' into fake subtree slot %d, level %d\n") % hslotval % subslot % (lev + 1)); our_fake_subtree.type = their_node.type; our_fake_subtree.level = our_node->level + 1; @@ -2344,7 +2344,7 @@ case dead_leaf_state: // 15: theirs == subtree, ours == dead - L(F("(#15) they have a subtree at slot %d in %s node '%s', level %d, we have a dead leaf\n") + L(boost::format("(#15) they have a subtree at slot %d in %s node '%s', level %d, we have a dead leaf\n") % slot % typestr % hpref % lev); { size_t subslot; @@ -2363,7 +2363,7 @@ case subtree_state: // 16: theirs == subtree, ours == subtree - L(F("(#16) they have a subtree at slot %d in %s node '%s', level %d, and so do we\n") + L(boost::format("(#16) they have a subtree at slot %d in %s node '%s', level %d, and so do we\n") % slot % typestr % hpref % lev); { id our_slotval, their_slotval; @@ -2373,12 +2373,12 @@ our_node->get_hex_slot(slot, hslotval); if (their_slotval == our_slotval) { - L(F("(#16) we both have %s subtree '%s'\n") % typestr % hslotval); + L(boost::format("(#16) we both have %s subtree '%s'\n") % typestr % hslotval); continue; } else { - L(F("(#16) %s subtrees at slot %d differ, refining ours\n") % typestr % slot); + L(boost::format("(#16) %s subtrees at slot %d differ, refining ours\n") % typestr % slot); prefix subprefix; our_node->extended_raw_prefix(slot, subprefix); merkle_ptr our_subtree; ======================================================================== --- po/fr.po 9d62b550595ead5ad9df1c6e57ef85b13d178252 +++ po/fr.po b1f90e30baa9e493a1eaca00d8b20251ef60b251 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: monotone 0.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-30 03:00-0700\n" -"PO-Revision-Date: 2005-09-06 03:22+0200\n" +"POT-Creation-Date: 2005-11-20 23:36+0100\n" +"PO-Revision-Date: 2005-11-21 00:05+0100\n" "Last-Translator: Benoît Dejean \n" "Language-Team: Benoît Dejean \n" "MIME-Version: 1.0\n" @@ -15,471 +15,495 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: app_state.cc:51 +#: ../app_state.cc:71 #, c-format msgid "initializing from directory %s\n" msgstr "" -#: app_state.cc:62 +#: ../app_state.cc:82 #, c-format msgid "branch name is '%s'\n" msgstr "le nom de la branche est « %s »\n" -#: app_state.cc:69 +#: ../app_state.cc:89 #, c-format msgid "setting dump path to %s\n" msgstr "" -#: app_state.cc:83 +#: ../app_state.cc:103 #, c-format msgid "working copy directory required but not found%s%s" msgstr "" -#: app_state.cc:91 +#: ../app_state.cc:111 #, c-format msgid "invalid directory ''" msgstr "" -#: app_state.cc:93 +#: ../app_state.cc:113 #, c-format msgid "creating working copy in %s\n" msgstr "création d'une copie de travail dans %s\n" -#: app_state.cc:99 +#: ../app_state.cc:119 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'\n" msgstr "" -#: app_state.cc:102 +#: ../app_state.cc:122 #, c-format msgid "creating bookkeeping directory '%s' for working copy in '%s'\n" msgstr "" -#: app_state.cc:133 +#: ../app_state.cc:153 #, c-format msgid "'%s' ignored by restricted path set\n" msgstr "" -#: app_state.cc:138 app_state.cc:156 +#: ../app_state.cc:158 ../app_state.cc:176 #, c-format msgid "unknown path '%s'\n" msgstr "chemin inconnu « %s »\n" -#: app_state.cc:140 +#: ../app_state.cc:160 #, c-format msgid "'%s' added to restricted path set\n" msgstr "" -#: app_state.cc:151 +#: ../app_state.cc:171 #, c-format msgid "'%s' ignored by excluded path set\n" msgstr "" -#: app_state.cc:158 +#: ../app_state.cc:178 #, c-format msgid "'%s' added to excluded path set\n" msgstr "" -#: app_state.cc:185 +#: ../app_state.cc:205 #, c-format msgid "checking excluded path set for '%s'\n" msgstr "" -#: app_state.cc:192 app_state.cc:225 +#: ../app_state.cc:212 ../app_state.cc:245 #, c-format msgid "path '%s' found in excluded path set; '%s' excluded\n" msgstr "" -#: app_state.cc:211 +#: ../app_state.cc:231 #, c-format msgid "checking restricted path set for '%s'\n" msgstr "" -#: app_state.cc:219 +#: ../app_state.cc:239 #, c-format msgid "path '%s' found in restricted path set; '%s' included\n" msgstr "" -#: app_state.cc:287 +#: ../app_state.cc:327 #, fuzzy, c-format msgid "search root '%s' does not exist" msgstr "le fichier rc « %s » n'existe pas" -#: app_state.cc:288 -#, c-format +#: ../app_state.cc:328 +#, fuzzy, c-format msgid "search root '%s' is not a directory\n" -msgstr "" +msgstr "la racin" -#: app_state.cc:290 +#: ../app_state.cc:330 #, c-format msgid "set search root to %s\n" msgstr "" -#: app_state.cc:321 +#: ../app_state.cc:361 #, c-format msgid "negative depth not allowed\n" msgstr "profondeur négative interdite\n" -#: app_state.cc:329 +#: ../app_state.cc:369 #, c-format msgid "negative or zero last not allowed\n" msgstr "" -#: app_state.cc:438 +#: ../app_state.cc:492 #, c-format msgid "Failed to read options file %s" -msgstr "" +msgstr "La lecture du fichier d'options « %s » a échouée" -#: app_state.cc:455 +#: ../app_state.cc:509 #, c-format msgid "Failed to write options file %s" -msgstr "" +msgstr "L'écriture du fichier d'options « %s » a échouée" -#: basic_io.cc:26 basic_io.cc:27 +#: ../basic_io.cc:26 ../basic_io.cc:27 #, c-format msgid "error in %s:%d:%d:E: %s" -msgstr "" +msgstr "erreur dans %s:%d:%d:E : %s" -#: cert.cc:49 +#: ../cert.cc:51 #, c-format msgid "cert ok\n" msgstr "certificat OK\n" -#: cert.cc:56 +#: ../cert.cc:58 #, c-format msgid "ignoring bad signature by '%s' on '%s'\n" msgstr "" -#: cert.cc:64 +#: ../cert.cc:66 #, c-format msgid "ignoring unknown signature by '%s' on '%s'\n" msgstr "" -#: cert.cc:121 +#: ../cert.cc:123 #, c-format msgid "trust function liked %d signers of %s cert on manifest %s\n" msgstr "" -#: cert.cc:127 +#: ../cert.cc:129 #, c-format msgid "trust function disliked %d signers of %s cert on manifest %s\n" msgstr "" -#: cert.cc:174 +#: ../cert.cc:176 #, c-format msgid "trust function liked %d signers of %s cert on revision %s\n" msgstr "" -#: cert.cc:180 +#: ../cert.cc:182 #, c-format msgid "trust function disliked %d signers of %s cert on revision %s\n" msgstr "" -#: cert.cc:269 +#: ../cert.cc:271 #, c-format msgid "calculated cert hash '%s' does not match '%s'" msgstr "" -#: cert.cc:303 +#: ../cert.cc:305 #, c-format msgid "cert: signable text %s\n" msgstr "" -#: cert.cc:364 keys.cc:508 +#: ../cert.cc:365 #, c-format -msgid "no private key '%s' found in database or get_priv_key hook" +msgid "no private key '%s' found in key store or get_priv_key hook" msgstr "" -#: cert.cc:373 +#. We really don't want the database key and the rcfile key +#. to differ. +#. keys_match(id, kskeys.priv, id, luakeys.priv) +#. && +#: ../cert.cc:375 #, c-format -msgid "mismatch between private key '%s' in database and get_priv_key hook" +msgid "mismatch between key '%s' in key store and get_key_pair hook" msgstr "" -#: cert.cc:477 +#: ../cert.cc:461 #, c-format -msgid "no branch found for empty revision, please provide a branch name" +msgid "" +"you have no private key to make signatures with\n" +"perhaps you need to 'genkey '" msgstr "" +"vous n'avez pas de clef privé pour établir des signatures,\n" +"vous avez sans doute besoin de faire « genkey  »" -#: cert.cc:486 +#: ../cert.cc:464 #, c-format -msgid "no branch certs found for revision %s, please provide a branch name" +msgid "" +"you have multiple private keys\n" +"pick one to use for signatures by adding '-k' to your command" msgstr "" +"vous avez plusieurs clefs privés\n" +"choisissez-en une à utiliser pour vos signatures en ajoutant « -" +"k » à votre commande" -#: cert.cc:490 +#: ../cert.cc:481 #, c-format -msgid "" -"multiple branch certs found for revision %s, please provide a branch name" +msgid "no branch found for empty revision, please provide a branch name" msgstr "" -#: cert.cc:507 rcs_import.cc:1231 revision.cc:1594 revision.cc:1626 +#: ../cert.cc:490 #, c-format -msgid "no unique private key for cert construction" +msgid "no branch certs found for revision %s, please provide a branch name" msgstr "" -#: cert.cc:622 +#: ../cert.cc:494 #, c-format -msgid "no default author name for branch '%s'" +msgid "" +"multiple branch certs found for revision %s, please provide a branch name" msgstr "" -#: change_set.cc:289 +#: ../change_set.cc:289 #, c-format msgid "tid %d: parent %d, type %s, name %s\n" msgstr "" -#: change_set.cc:315 +#: ../change_set.cc:315 #, c-format msgid "%d -> %d\n" msgstr "" -#: change_set.cc:1540 +#: ../change_set.cc:1540 #, c-format msgid "concatenating change sets\n" msgstr "" -#: change_set.cc:1563 +#: ../change_set.cc:1563 #, c-format msgid "concatenating %d and %d deltas\n" msgstr "" -#: change_set.cc:1573 +#: ../change_set.cc:1573 #, c-format msgid "processing delta on %s\n" msgstr "" -#: change_set.cc:1577 +#: ../change_set.cc:1577 #, c-format msgid "delta on %s in first changeset renamed to %s\n" msgstr "" -#: change_set.cc:1582 +#. the delta should be removed if the file is going to be deleted +#: ../change_set.cc:1582 #, c-format msgid "discarding delta [%s]->[%s] for deleted file '%s'\n" msgstr "" -#: change_set.cc:1600 +#: ../change_set.cc:1600 #, c-format msgid "fusing deltas on %s : %s -> %s and %s -> %s\n" msgstr "" -#: change_set.cc:1614 +#: ../change_set.cc:1614 #, c-format msgid "delta on %s in second changeset copied forward\n" msgstr "" -#: change_set.cc:1628 +#: ../change_set.cc:1628 #, c-format msgid "finished concatenation\n" msgstr "" -#: change_set.cc:1734 change_set.cc:1741 +#: ../change_set.cc:1734 ../change_set.cc:1741 #, c-format msgid "delete of %s dominates rename to %s\n" msgstr "" -#: change_set.cc:1751 +#: ../change_set.cc:1751 #, c-format msgid "unable to resolve file conflict '%s' -> '%s' vs. '%s'" msgstr "" -#: change_set.cc:1755 +#: ../change_set.cc:1755 #, c-format msgid "unable to resolve dir conflict '%s' -> '%s' vs. '%s'" msgstr "" -#: change_set.cc:1760 +#: ../change_set.cc:1760 #, c-format msgid "illegal conflict resolution '%s', wanted '%s' or '%s'\n" msgstr "" -#: change_set.cc:1816 +#: ../change_set.cc:1816 #, c-format msgid "tid %d (%s) clobbered tid %d (%s)\n" msgstr "" -#: change_set.cc:1852 +#: ../change_set.cc:1852 #, c-format msgid "skipping common change on %s (tid %d)\n" msgstr "" -#: change_set.cc:1857 +#: ../change_set.cc:1857 #, c-format msgid "skipping neutral change of %s -> %s (tid %d)\n" msgstr "" -#: change_set.cc:1864 +#: ../change_set.cc:1864 #, c-format msgid "propagating change on %s -> %s (tid %d)\n" msgstr "" -#: change_set.cc:1880 +#: ../change_set.cc:1880 #, c-format msgid "conflict detected, resolved in A's favour\n" msgstr "conflit détecté, résolu en faveur de A\n" -#: change_set.cc:1886 +#: ../change_set.cc:1886 #, c-format msgid "conflict detected, resolved in B's favour\n" msgstr "conflit détecté, résolu en faveur de B\n" -#: change_set.cc:2053 +#: ../change_set.cc:2053 #, c-format msgid "reusing merge resolution '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2062 +#: ../change_set.cc:2062 #, c-format msgid "merge of '%s' : '%s' vs. '%s' (no common ancestor) failed" msgstr "" -#: change_set.cc:2069 +#: ../change_set.cc:2069 #, c-format msgid "merge of '%s' : '%s' -> '%s' vs '%s' failed" msgstr "" -#: change_set.cc:2073 +#: ../change_set.cc:2073 #, c-format msgid "merge of '%s' : '%s' -> '%s' vs '%s' resolved to '%s'\n" msgstr "" -#: change_set.cc:2131 +#: ../change_set.cc:2131 #, c-format msgid "skipping delta '%s'->'%s' on deleted file '%s'\n" msgstr "" -#: change_set.cc:2139 +#. if no deltas in b, copy ours over using the merged name +#: ../change_set.cc:2139 #, c-format msgid "merge is copying delta '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2163 +#. ... use the delta from 'a' +#. 'a' change_set included a delta []->[...], ie file added. We want to +#. follow this fork so it gets added to the b_merged changeset +#: ../change_set.cc:2163 #, c-format msgid "propagating new file addition delta on '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2175 +#. ... ignore the delta +#. 'b' change_set included a delta []->[...], ie file added. We don't need +#. to add it to the b_merged changeset, since any delta in 'a' will be +#. ignored (as 'b' includes deletions). +#: ../change_set.cc:2175 #, c-format msgid "skipping new file addition delta on '%s' : '' -> '%s'\n" msgstr "" -#: change_set.cc:2183 +#. ... absorb identical deltas +#: ../change_set.cc:2183 #, c-format msgid "skipping common delta '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2189 +#: ../change_set.cc:2189 #, c-format msgid "skipping neutral delta on '%s' : %s -> %s\n" msgstr "" -#: change_set.cc:2197 +#: ../change_set.cc:2197 #, c-format msgid "propagating unperturbed delta on '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2207 +#. ... or resolve conflict +#: ../change_set.cc:2207 #, c-format msgid "merging delta '%s' : '%s' -> '%s' vs. '%s'\n" msgstr "" -#: change_set.cc:2220 +#: ../change_set.cc:2220 #, c-format msgid "resolved merge to '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2249 +#: ../change_set.cc:2249 #, c-format msgid "merging change sets\n" msgstr "" -#: change_set.cc:2311 +#: ../change_set.cc:2311 #, c-format msgid "finished merge\n" msgstr "" -#: change_set.cc:2330 +#: ../change_set.cc:2330 #, c-format msgid "inverting change set\n" msgstr "" -#: change_set.cc:2360 +#: ../change_set.cc:2360 #, c-format msgid "converted 'delete %s' to 'add as %s' in inverse\n" msgstr "" -#: change_set.cc:2369 +#: ../change_set.cc:2369 #, c-format msgid "converted add %s to delete in inverse\n" msgstr "" -#: change_set.cc:2379 +#: ../change_set.cc:2379 #, c-format msgid "converting delta %s -> %s on %s\n" msgstr "" -#: change_set.cc:2381 +#: ../change_set.cc:2381 #, c-format msgid "inverse is delta %s -> %s on %s\n" msgstr "" -#: change_set.cc:2447 change_set.cc:2495 +#: ../change_set.cc:2447 ../change_set.cc:2495 #, c-format msgid "moving file %s -> %s\n" msgstr "déplacement du fichier %s -> %s\n" -#: change_set.cc:2454 change_set.cc:2503 +#: ../change_set.cc:2454 ../change_set.cc:2503 #, c-format msgid "moving dir %s -> %s\n" msgstr "déplacement du dossier %s -> %s\n" -#: commands.cc:136 +#: ../commands.cc:136 #, c-format msgid "expanding command '%s'\n" msgstr "" -#: commands.cc:153 +#: ../commands.cc:153 #, c-format msgid "expanded command to '%s'\n" msgstr "" -#: commands.cc:158 +#: ../commands.cc:158 #, c-format msgid "command '%s' has multiple ambiguous expansions:\n" msgstr "" -#: commands.cc:201 +#: ../commands.cc:201 msgid "commands:" msgstr "commandes :" -#: commands.cc:245 +#: ../commands.cc:246 #, c-format msgid "executing command '%s'\n" msgstr "exécution de la commande « %s »\n" -#: commands.cc:251 +#: ../commands.cc:252 #, c-format msgid "unknown command '%s'\n" msgstr "commande inconnue « %s »\n" -#: commands.cc:298 +#: ../commands.cc:299 #, c-format msgid "pid file '%s' already exists" msgstr "le fichier pid « %s » existe déjà" -#: commands.cc:322 commands.cc:1218 commands.cc:1298 commands.cc:1641 -#: commands.cc:2571 commands.cc:3259 commands.cc:3456 commands.cc:3493 +#: ../commands.cc:323 ../commands.cc:1275 ../commands.cc:1355 +#: ../commands.cc:1720 ../commands.cc:2670 ../commands.cc:3358 +#: ../commands.cc:3575 ../commands.cc:3612 msgid "informative" msgstr "information" -#: commands.cc:322 +#: ../commands.cc:323 msgid "command [ARGS...]" -msgstr "" +msgstr "commande [ARGUMENTS...]" -#: commands.cc:322 -#, fuzzy +#: ../commands.cc:323 msgid "display command help" -msgstr "afficher le message d'aide" +msgstr "afficher l'aide de la commande" -#: commands.cc:381 +#: ../commands.cc:382 msgid "" "Enter a description of this change.\n" "Lines beginning with `MT:' are removed automatically.\n" @@ -487,16 +511,16 @@ "Saisissez une description pour cette modification.\n" "Les lignes débutant par « MT: » sont supprimées automatiquement.\n" -#: commands.cc:388 +#: ../commands.cc:389 #, c-format msgid "edit of log message failed" msgstr "l'édition du message du journal a échouée" -#: commands.cc:397 +#: ../commands.cc:398 msgid "note: " -msgstr "" +msgstr "note : " -#: commands.cc:398 +#: ../commands.cc:399 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -505,59 +529,60 @@ "la branche « %s » a plusieurs heads\n" "vous devriez peut-être lancer « monotone merge »" -#: commands.cc:458 commands.cc:679 commands.cc:1317 commands.cc:1384 -#: commands.cc:1752 commands.cc:2618 commands.cc:2633 commands.cc:2636 -#: commands.cc:2834 commands.cc:3475 +#: ../commands.cc:459 ../commands.cc:715 ../commands.cc:1374 +#: ../commands.cc:1446 ../commands.cc:1831 ../commands.cc:2717 +#: ../commands.cc:2732 ../commands.cc:2735 ../commands.cc:2933 +#: ../commands.cc:3594 #, c-format msgid "no such revision '%s'" msgstr "aucune révision « %s »" -#: commands.cc:465 +#: ../commands.cc:466 #, c-format msgid "expanding selection '%s'\n" -msgstr "" +msgstr "expansion de la sélection « %s »\n" -#: commands.cc:473 +#: ../commands.cc:474 #, c-format msgid "no match for selection '%s'" -msgstr "" +msgstr "aucune correspondance pour la sélection « %s »" -#: commands.cc:476 +#: ../commands.cc:477 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" -msgstr "" +msgstr "la sélection « %s » a plusieurs expansions ambigües : \n" -#: commands.cc:483 +#: ../commands.cc:484 #, c-format msgid "expanded to '%s'\n" msgstr "" -#: commands.cc:494 +#: ../commands.cc:495 #, c-format msgid "non-hex digits in id" -msgstr "" +msgstr "chiffre non-héxadécimal dans l'id" -#: commands.cc:503 +#: ../commands.cc:504 #, fuzzy, c-format msgid "partial id '%s' does not have an expansion" msgstr "le fichier rc « %s » n'existe pas" -#: commands.cc:506 +#: ../commands.cc:507 #, fuzzy, c-format msgid "partial id '%s' has multiple ambiguous expansions:\n" msgstr "le fichier rc « %s » n'existe pas" -#: commands.cc:513 +#: ../commands.cc:514 #, c-format msgid "expanded partial id '%s' to '%s'\n" msgstr "" -#: commands.cc:540 keys.cc:510 netsync.cc:2197 +#: ../commands.cc:541 ../netsync.cc:1942 #, c-format msgid "no public key '%s' found in database" msgstr "aucune clef publique « %s » dans la base de données" -#: commands.cc:550 +#: ../commands.cc:551 #, c-format msgid "" "Key : %s\n" @@ -570,130 +595,126 @@ "Nom : %s\n" "Valeur : %s\n" -#: commands.cc:584 +#: ../commands.cc:585 msgid "ok" msgstr "0K" -#: commands.cc:587 +#: ../commands.cc:588 msgid "bad" msgstr "mauvais" -#: commands.cc:590 +#: ../commands.cc:591 msgid "unknown" msgstr "inconnu" -#: commands.cc:665 +#: ../commands.cc:678 #, c-format +msgid "(*) - only in %s/" +msgstr "(*) - uniquement dans %s/" + +#: ../commands.cc:701 +#, c-format msgid "no keys found\n" msgstr "aucune clef trouvée\n" -#: commands.cc:667 +#: ../commands.cc:703 #, c-format msgid "no keys found matching '%s'\n" msgstr "aucune clef correspondant à « %s »\n" -#: commands.cc:685 +#: ../commands.cc:721 #, 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." -#: commands.cc:815 commands.cc:837 commands.cc:869 commands.cc:893 -#: commands.cc:933 +#: ../commands.cc:851 ../commands.cc:875 ../commands.cc:912 ../commands.cc:933 +#: ../commands.cc:969 msgid "key and cert" msgstr "clef et certificat" -#: commands.cc:815 commands.cc:837 commands.cc:869 +#: ../commands.cc:851 ../commands.cc:875 ../commands.cc:912 msgid "KEYID" msgstr "IDCLEF" -#: commands.cc:815 +#: ../commands.cc:851 msgid "generate an RSA key-pair" msgstr "générer une paire de clefs RSA" -#: commands.cc:825 +#: ../commands.cc:866 #, c-format -msgid "key '%s' already exists in database" -msgstr "la clef « %s » est déjà dans la base de données" +msgid "key '%s' already exists" +msgstr "la clef « %s » existe déjà" -#: commands.cc:829 +#: ../commands.cc:869 #, c-format -msgid "generating key-pair '%s'\n" -msgstr "" +msgid "generating key-pair '%s'" +msgstr "génératio de la paire de clef « %s »" -#: commands.cc:831 -#, c-format -msgid "storing key-pair '%s' in database\n" -msgstr "" +#: ../commands.cc:871 +#, fuzzy, c-format +msgid "storing key-pair '%s' in %s/" +msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs\n" -#: commands.cc:837 +#: ../commands.cc:875 msgid "drop a public and private key" msgstr "supprimer une clef publique et privée" -#: commands.cc:848 +#: ../commands.cc:889 #, c-format msgid "dropping public key '%s' from database\n" -msgstr "" +msgstr "suppression de la clef publique « %s » de la base de données\n" -#: commands.cc:855 -#, c-format -msgid "" -"dropping private key '%s' from database\n" -"\n" -msgstr "" -"suppression de la clef privée « %s » de la base de données\n" -"\n" +#: ../commands.cc:899 +#, fuzzy, c-format +msgid "dropping key pair '%s' from keystore\n" +msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs\n" -#: commands.cc:856 -#, c-format -msgid "" -"the private key data may not have been erased from the\n" -"database. it is recommended that you use 'db dump' and\n" -"'db load' to be sure." -msgstr "" +#: ../commands.cc:906 +#, fuzzy, 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:864 -#, c-format -msgid "public or private key '%s' does not exist in database" +#: ../commands.cc:908 +#, fuzzy, c-format +msgid "" +"public or private key '%s' does not exist in keystore, and no database was " +"specified" msgstr "la clef publique ou privée « %s » n'existe pas dans la base de données" -#: commands.cc:870 +#: ../commands.cc:913 msgid "change passphrase of a private RSA key" msgstr "changer la phrase de passe pour une clef RSA privée" -#: commands.cc:881 -#, c-format -msgid "key '%s' does not exist in database" +#: ../commands.cc:923 +#, fuzzy, c-format +msgid "key '%s' does not exist in the keystore" msgstr "la clef « %s » n'existe pas dans la base de données" -#: commands.cc:888 +#: ../commands.cc:930 #, c-format msgid "passphrase changed\n" msgstr "la phrase de passe à changée\n" -#: commands.cc:893 +#: ../commands.cc:933 +#, fuzzy msgid "REVISION CERTNAME [CERTVAL]" -msgstr "" +msgstr "RÉVISION CERTIFICAT " -#: commands.cc:894 +#: ../commands.cc:934 msgid "create a cert for a revision" msgstr "créer un certificat pour une révision" -#: commands.cc:914 -#, c-format -msgid "no unique private key found, and no key specified" -msgstr "" - -#: commands.cc:933 +#: ../commands.cc:969 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "" -#: commands.cc:934 +#: ../commands.cc:970 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" msgstr "" -#: commands.cc:967 +#: ../commands.cc:1003 #, c-format msgid "" "if a cert on: %s\n" @@ -703,187 +724,195 @@ "it would be: %s\n" msgstr "" -#: commands.cc:976 +#: ../commands.cc:1012 msgid "trusted" -msgstr "" +msgstr "fiable" -#: commands.cc:976 +#: ../commands.cc:1012 msgid "UNtrusted" -msgstr "" +msgstr "NON-fiable" -#: commands.cc:979 commands.cc:992 commands.cc:1004 commands.cc:1021 -#: commands.cc:1067 +#: ../commands.cc:1015 ../commands.cc:1028 ../commands.cc:1040 +#: ../commands.cc:1057 ../commands.cc:1103 msgid "review" msgstr "" -#: commands.cc:979 +#: ../commands.cc:1015 msgid "REVISION TAGNAME" msgstr "" -#: commands.cc:980 +#: ../commands.cc:1016 #, fuzzy msgid "put a symbolic tag cert on a revision version" msgstr "mettre une certificat-étiquette symbolique" -#: commands.cc:992 +#: ../commands.cc:1028 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "" -#: commands.cc:993 +#: ../commands.cc:1029 msgid "note the results of running a test on a revision" msgstr "" -#: commands.cc:1004 commands.cc:1021 +#: ../commands.cc:1040 ../commands.cc:1057 msgid "REVISION" -msgstr "" +msgstr "RÉVISION" -#: commands.cc:1005 +#: ../commands.cc:1041 msgid "approve of a particular revision" msgstr "approuver une révision particulière" -#: commands.cc:1016 +#: ../commands.cc:1052 #, c-format msgid "need --branch argument for approval" msgstr "" -#: commands.cc:1022 +#: ../commands.cc:1058 msgid "disapprove of a particular revision" -msgstr "" +msgstr "désapprouver une révision en particulier" -#: commands.cc:1035 +#: ../commands.cc:1071 #, fuzzy, c-format msgid "revision '%s' has %d changesets, cannot invert\n" msgstr "la révision %s n'existe pas" -#: commands.cc:1039 +#: ../commands.cc:1075 #, c-format msgid "need --branch argument for disapproval" msgstr "" -#: commands.cc:1067 +#: ../commands.cc:1103 msgid "REVISION [COMMENT]" -msgstr "" +msgstr "RÉVISION [COMMENTAIRE]" -#: commands.cc:1068 +#: ../commands.cc:1104 msgid "comment on a particular revision" -msgstr "" +msgstr "commenter une révision en particulier" -#: commands.cc:1078 +#: ../commands.cc:1114 #, c-format msgid "edit comment failed" msgstr "l'édition du commentaire a échouée" -#: commands.cc:1081 +#: ../commands.cc:1117 #, c-format msgid "empty comment" msgstr "commentaire vide" -#: commands.cc:1091 commands.cc:1116 commands.cc:1143 commands.cc:1275 -#: commands.cc:2102 commands.cc:2225 commands.cc:2783 commands.cc:3316 +#. static void dump_change_set(string const & name, +#. change_set & cs) +#. { +#. data dat; +#. write_change_set(cs, dat); +#. cout << "change set '" << name << "'\n" << dat << endl; +#. } +#: ../commands.cc:1129 ../commands.cc:1166 ../commands.cc:1200 +#: ../commands.cc:1332 ../commands.cc:2198 ../commands.cc:2321 +#: ../commands.cc:2882 ../commands.cc:3415 msgid "working copy" msgstr "copie de travail" -#: commands.cc:1091 commands.cc:1116 -msgid "PATH..." -msgstr "CHEMIN..." +#: ../commands.cc:1129 ../commands.cc:1166 ../commands.cc:1275 +#: ../commands.cc:2321 ../commands.cc:2670 ../commands.cc:3415 +msgid "[PATH]..." +msgstr "[CHEMIN]..." -#: commands.cc:1092 +#: ../commands.cc:1130 msgid "add files to working copy" msgstr "ajouter des fichiers à la copie de travail" -#: commands.cc:1117 +#: ../commands.cc:1167 msgid "drop files from working copy" msgstr "supprimer des fichiers de la copie de travail" -#: commands.cc:1143 +#: ../commands.cc:1200 msgid "SRC DST" msgstr "SRC DST" -#: commands.cc:1144 +#: ../commands.cc:1201 msgid "rename entries in the working copy" msgstr "renommer des entrées dans la copie de travail" -#: commands.cc:1172 commands.cc:1185 commands.cc:2704 commands.cc:2721 -#: commands.cc:3376 +#. fload and fmerge are simple commands for debugging the line +#. merger. +#: ../commands.cc:1229 ../commands.cc:1242 ../commands.cc:2803 +#: ../commands.cc:2820 ../commands.cc:3495 msgid "debug" msgstr "" -#: commands.cc:1172 +#: ../commands.cc:1229 msgid "load file contents into db" msgstr "charger le contenu du fichier dans la base de données" -#: commands.cc:1185 +#: ../commands.cc:1242 msgid " " msgstr " " -#: commands.cc:1186 +#: ../commands.cc:1243 msgid "merge 3 files and output result" msgstr "" -#: commands.cc:1196 +#: ../commands.cc:1253 #, c-format msgid "ancestor file id does not exist" msgstr "" -#: commands.cc:1199 +#: ../commands.cc:1256 #, c-format msgid "left file id does not exist" -msgstr "" +msgstr "l'id du fichier gauche n'existe pas" -#: commands.cc:1202 +#: ../commands.cc:1259 #, c-format msgid "right file id does not exist" -msgstr "" +msgstr "l'id du fichier droit n'existe pas" -#: commands.cc:1213 +#: ../commands.cc:1270 #, c-format msgid "merge failed" -msgstr "" +msgstr "la fusion a échouée" -#: commands.cc:1218 commands.cc:2225 commands.cc:2571 commands.cc:3316 -msgid "[PATH]..." -msgstr "" - -#: commands.cc:1218 +#: ../commands.cc:1275 msgid "show status of working copy" msgstr "afficher l'état de la copie de travail" -#: commands.cc:1275 +#: ../commands.cc:1332 msgid "[PATH]" -msgstr "" +msgstr "[CHEMIN]" -#: commands.cc:1276 +#: ../commands.cc:1333 msgid "calculate identity of PATH or stdin" msgstr "" -#: commands.cc:1299 +#: ../commands.cc:1356 msgid "FILENAME" msgstr "" -#: commands.cc:1300 +#: ../commands.cc:1357 msgid "write file from database to stdout" msgstr "" -#: commands.cc:1328 +#: ../commands.cc:1385 #, c-format msgid "no file '%s' found in revision '%s'\n" -msgstr "" +msgstr "aucun fichier « %s » dans la révision « %s »\n" -#: commands.cc:1332 +#: ../commands.cc:1389 #, fuzzy, c-format msgid "dumping file '%s'\n" msgstr "importation du fichier « %s »\n" -#: commands.cc:1340 commands.cc:1447 commands.cc:3059 commands.cc:3108 -#: commands.cc:3193 commands.cc:3200 commands.cc:3661 +#: ../commands.cc:1397 ../commands.cc:1505 ../commands.cc:3158 +#: ../commands.cc:3207 ../commands.cc:3292 ../commands.cc:3299 +#: ../commands.cc:3780 msgid "tree" msgstr "arborescence" -#: commands.cc:1340 +#: ../commands.cc:1397 msgid "[DIRECTORY]\n" -msgstr "" +msgstr "[DOSSIER]\n" -#: commands.cc:1341 +#: ../commands.cc:1398 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" @@ -891,86 +920,84 @@ "If no directory is given, the branch name will be used as directory" msgstr "" -#: commands.cc:1358 commands.cc:1372 +#. no checkout dir specified, use branch name for dir +#. use branch head revision +#: ../commands.cc:1415 ../commands.cc:1434 #, c-format msgid "need --branch argument for branch-based checkout" msgstr "" -#: commands.cc:1375 +#: ../commands.cc:1428 +#, fuzzy, c-format +msgid "checkout directory '%s' already exists" +msgstr "le fichier pid « %s » existe déjà" + +#: ../commands.cc:1437 ../commands.cc:1518 ../commands.cc:3171 +#: ../commands.cc:3241 ../commands.cc:3244 #, c-format -msgid "branch %s is empty" -msgstr "la branche %s est vide" +msgid "branch '%s' is empty\n" +msgstr "la branche « %s » est vide\n" -#: commands.cc:1376 +#: ../commands.cc:1438 #, c-format msgid "branch %s has multiple heads" msgstr "" -#: commands.cc:1397 +#: ../commands.cc:1459 #, c-format msgid "found %d %s branch certs on revision %s\n" msgstr "" -#: commands.cc:1402 +#: ../commands.cc:1464 #, 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" -#: commands.cc:1408 -#, fuzzy, c-format -msgid "checkout directory '%s' already exists" -msgstr "le fichier pid « %s » existe déjà" - -#: commands.cc:1422 +#: ../commands.cc:1480 #, c-format msgid "no manifest %s found in database" msgstr "" -#: commands.cc:1424 +#: ../commands.cc:1482 #, c-format msgid "checking out revision %s to directory %s\n" msgstr "" -#: commands.cc:1430 +#: ../commands.cc:1488 #, c-format msgid "no file %s found in database for %s" msgstr "" -#: commands.cc:1434 commands.cc:3363 +#: ../commands.cc:1492 ../commands.cc:3482 #, c-format msgid "writing file %s to %s\n" msgstr "" -#: commands.cc:1447 +#: ../commands.cc:1505 msgid "show unmerged head revisions of branch" msgstr "" -#: commands.cc:1455 commands.cc:3068 +#: ../commands.cc:1513 ../commands.cc:3167 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "veuillez préciser une branche avec --branch=BRANCHE" -#: commands.cc:1460 commands.cc:3072 commands.cc:3142 commands.cc:3145 +#: ../commands.cc:1520 #, c-format -msgid "branch '%s' is empty\n" -msgstr "la branche « %s » est vide\n" - -#: commands.cc:1462 -#, c-format msgid "branch '%s' is currently merged:\n" msgstr "la branche « %s » est actuellement fusionnée :\n" -#: commands.cc:1464 +#: ../commands.cc:1522 #, c-format msgid "branch '%s' is currently unmerged:\n" msgstr "la branche « %s » n'est actuellement pas fusionnée :\n" -#: commands.cc:1503 +#: ../commands.cc:1561 #, c-format msgid "no epoch for branch %s\n" msgstr "" -#: commands.cc:1642 +#: ../commands.cc:1721 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -984,211 +1011,206 @@ "missing" msgstr "" -#: commands.cc:1652 +#: ../commands.cc:1731 msgid "" "show database objects, or the current working copy manifest,\n" "or unknown, intentionally ignored, or missing state files" msgstr "" -#: commands.cc:1689 commands.cc:1715 commands.cc:1739 commands.cc:1757 -#: commands.cc:1776 commands.cc:1795 commands.cc:1813 commands.cc:1829 -#: commands.cc:1849 +#: ../commands.cc:1768 ../commands.cc:1794 ../commands.cc:1818 +#: ../commands.cc:1836 ../commands.cc:1855 ../commands.cc:1874 +#: ../commands.cc:1892 ../commands.cc:1920 ../commands.cc:1938 msgid "packet i/o" msgstr "" -#: commands.cc:1689 commands.cc:1715 +#: ../commands.cc:1768 ../commands.cc:1794 msgid "OLDID NEWID" msgstr "" -#: commands.cc:1690 +#: ../commands.cc:1769 msgid "write manifest delta packet to stdout" msgstr "" -#: commands.cc:1704 commands.cc:1706 commands.cc:1770 +#: ../commands.cc:1783 ../commands.cc:1785 ../commands.cc:1849 #, c-format msgid "no such manifest '%s'" msgstr "aucun manifeste « %s »" -#: commands.cc:1716 +#: ../commands.cc:1795 msgid "write file delta packet to stdout" msgstr "" -#: commands.cc:1730 commands.cc:1732 commands.cc:1789 commands.cc:2123 +#: ../commands.cc:1809 ../commands.cc:1811 ../commands.cc:1868 +#: ../commands.cc:2219 #, c-format msgid "no such file '%s'" msgstr "aucun fichier « %s »" -#: commands.cc:1739 commands.cc:1757 commands.cc:1776 commands.cc:1795 -#: commands.cc:1813 commands.cc:1829 +#: ../commands.cc:1818 ../commands.cc:1836 ../commands.cc:1855 +#: ../commands.cc:1874 ../commands.cc:1892 ../commands.cc:1920 msgid "ID" -msgstr "" +msgstr "ID" -#: commands.cc:1739 +#: ../commands.cc:1818 msgid "write revision data packet to stdout" msgstr "" -#: commands.cc:1757 +#: ../commands.cc:1836 msgid "write manifest data packet to stdout" msgstr "" -#: commands.cc:1776 +#: ../commands.cc:1855 msgid "write file data packet to stdout" msgstr "" -#: commands.cc:1795 +#: ../commands.cc:1874 msgid "write cert packets to stdout" msgstr "" -#: commands.cc:1813 +#: ../commands.cc:1892 msgid "write public key packet to stdout" msgstr "" -#: commands.cc:1821 -#, c-format -msgid "public key '%s' does not exist in database" -msgstr "" +#: ../commands.cc:1914 +#, fuzzy, c-format +msgid "public key '%s' does not exist" +msgstr "le fichier rc « %s » n'existe pas" -#: commands.cc:1829 +#: ../commands.cc:1920 msgid "write private key packet to stdout" msgstr "" -#: commands.cc:1837 -#, c-format -msgid "public and private key '%s' do not exist in database" -msgstr "" +#: ../commands.cc:1928 +#, fuzzy, 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 la base de données" -#: commands.cc:1850 +#: ../commands.cc:1939 msgid "read packets from files or stdin" msgstr "lecture des paquets depuis des fichiers ou l'entrée standard" -#: commands.cc:1858 +#: ../commands.cc:1947 #, c-format msgid "no packets found on stdin" msgstr "aucun paquet trouvé sur l'entrée standard" -#: commands.cc:1869 +#: ../commands.cc:1958 #, 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:1873 +#: ../commands.cc:1962 #, c-format msgid "read %d packet" msgid_plural "read %d packets" msgstr[0] "lu %d paquet" msgstr[1] "lu %d paquets" -#: commands.cc:1877 commands.cc:1966 commands.cc:1981 commands.cc:1995 -#: commands.cc:2010 +#: ../commands.cc:1966 ../commands.cc:2060 ../commands.cc:2075 +#: ../commands.cc:2089 ../commands.cc:2104 msgid "network" msgstr "réseau" -#: commands.cc:1878 +#: ../commands.cc:1967 msgid "rebuild the indices used to sync over the network" msgstr "" "reconstruction des index utilisés pour la synchronisation par le réseau" -#: commands.cc:1912 +#: ../commands.cc:2004 #, c-format msgid "setting default server to %s\n" msgstr "" -#: commands.cc:1918 +#: ../commands.cc:2010 #, c-format msgid "no hostname given" -msgstr "" +msgstr "aucun nom d'hôte fourni" -#: commands.cc:1920 +#: ../commands.cc:2012 #, c-format msgid "no server given and no default server set" msgstr "" -#: commands.cc:1924 +#: ../commands.cc:2016 #, c-format msgid "using default server address: %s\n" msgstr "utilisation de l'adresse par défaut du serveur : %s\n" -#: commands.cc:1936 +#: ../commands.cc:2030 #, c-format msgid "setting default branch include pattern to '%s'\n" msgstr "" -#: commands.cc:1942 +#: ../commands.cc:2036 #, c-format msgid "setting default branch exclude pattern to '%s'\n" msgstr "" -#: commands.cc:1948 +#: ../commands.cc:2042 #, c-format msgid "no branch pattern given" msgstr "" -#: commands.cc:1950 +#: ../commands.cc:2044 #, c-format msgid "no branch pattern given and no default pattern set" msgstr "" -#: commands.cc:1954 +#: ../commands.cc:2048 #, c-format msgid "using default branch include pattern: '%s'\n" msgstr "" -#: commands.cc:1962 +#: ../commands.cc:2056 #, c-format msgid "excluding: %s\n" msgstr "" -#: commands.cc:1966 commands.cc:1981 commands.cc:1995 +#: ../commands.cc:2060 ../commands.cc:2075 ../commands.cc:2089 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADRESSE[:PORT] [MOTIF]]" -#: commands.cc:1967 +#: ../commands.cc:2061 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "" "envoie les branches correspondant au MOTIF au serveur netsync à l'ADRESSE" -#: commands.cc:1974 commands.cc:2003 commands.cc:2020 -#, c-format -msgid "could not guess default signing key" -msgstr "" - -#: commands.cc:1982 +#: ../commands.cc:2076 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "" -#: commands.cc:1989 +#: ../commands.cc:2083 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n" msgstr "" "récupération anonyme; utilisez -kNOMCLEF si vous avez besoin d'une " "authentification\n" -#: commands.cc:1996 +#: ../commands.cc:2090 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "" -#: commands.cc:2010 -msgid "ADDRESS[:PORTNUMBER] PATTERN ..." -msgstr "ADRESSE[:PORT] MOTIF ..." +#: ../commands.cc:2104 +msgid "PATTERN ..." +msgstr "CHEMIN ..." -#: commands.cc:2011 -msgid "" -"listen on ADDRESS and serve the specified branches to connecting clients" +#: ../commands.cc:2105 +msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "" -#: commands.cc:2024 +#: ../commands.cc:2118 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" msgstr "" -#: commands.cc:2034 +#: ../commands.cc:2130 msgid "database" msgstr "base de données" -#: commands.cc:2035 +#: ../commands.cc:2131 msgid "" "init\n" "info\n" @@ -1206,46 +1228,46 @@ "set_epoch BRANCH EPOCH\n" msgstr "" -#: commands.cc:2049 +#: ../commands.cc:2145 msgid "manipulate database state" msgstr "manipule l'état de la base de données" -#: commands.cc:2102 +#: ../commands.cc:2198 msgid "" "set FILE ATTR VALUE\n" "get FILE [ATTR]\n" "drop FILE" msgstr "" -#: commands.cc:2103 +#: ../commands.cc:2199 msgid "set, get or drop file attributes" msgstr "" -#: commands.cc:2191 work.cc:113 +#: ../commands.cc:2287 ../work.cc:113 #, c-format msgid "registering %s file in working copy\n" msgstr "" -#: commands.cc:2220 +#: ../commands.cc:2316 #, c-format msgid "failed to parse date string '%s': %s" msgstr "" -#: commands.cc:2226 +#: ../commands.cc:2322 msgid "commit working copy to database" msgstr "" -#: commands.cc:2244 +#: ../commands.cc:2340 #, c-format msgid "no changes to commit\n" msgstr "aucun changement à valider\n" -#: commands.cc:2255 +#: ../commands.cc:2354 #, c-format msgid "beginning commit on branch '%s'\n" msgstr "" -#: commands.cc:2256 +#: ../commands.cc:2355 #, c-format msgid "" "new manifest '%s'\n" @@ -1254,12 +1276,12 @@ "nouveau manifeste « %s »\n" "nouvelle révision « %s »\n" -#: commands.cc:2263 +#: ../commands.cc:2362 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message et --message-file sont mutuellement exclusifs" -#: commands.cc:2266 +#: ../commands.cc:2365 #, fuzzy, c-format msgid "" "MT/log is non-empty and --message supplied\n" @@ -1267,7 +1289,7 @@ "or remove --message from the command line?" msgstr "MT/log n'est pas vide et --message-file a été passé\n" -#: commands.cc:2271 +#: ../commands.cc:2370 #, c-format msgid "" "MT/log is non-empty and --message-file supplied\n" @@ -1275,69 +1297,70 @@ "or remove --message-file from the command line?" msgstr "" -#: commands.cc:2289 +#: ../commands.cc:2388 #, fuzzy, c-format msgid "empty log message; commit canceled" msgstr "message du journal vide" -#: commands.cc:2301 +#: ../commands.cc:2400 #, c-format msgid "revision %s already in database\n" msgstr "la révision %s est déjà dans la base de données\n" -#: commands.cc:2306 +#. new revision +#: ../commands.cc:2405 #, c-format msgid "inserting new revision %s\n" msgstr "insertion de la nouvelle révision %s\n" -#: commands.cc:2315 +#: ../commands.cc:2414 #, c-format msgid "skipping manifest %s, already in database\n" msgstr "" -#: commands.cc:2319 +#: ../commands.cc:2418 #, c-format msgid "inserting manifest delta %s -> %s\n" msgstr "" -#: commands.cc:2330 +#: ../commands.cc:2429 #, c-format msgid "inserting full manifest %s\n" msgstr "" -#: commands.cc:2343 +#: ../commands.cc:2442 #, c-format msgid "skipping file delta %s, already in database\n" msgstr "" -#: commands.cc:2349 +#: ../commands.cc:2448 #, c-format msgid "inserting delta %s -> %s\n" msgstr "" -#: commands.cc:2359 commands.cc:2376 +#: ../commands.cc:2458 ../commands.cc:2475 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "le fichier « %s » a été modifié pendant le commit, interruption" -#: commands.cc:2369 +#: ../commands.cc:2468 #, c-format msgid "inserting full version %s\n" msgstr "" -#: commands.cc:2403 +#: ../commands.cc:2502 #, c-format msgid "committed revision %s\n" msgstr "" -#: commands.cc:2409 +#: ../commands.cc:2508 #, c-format msgid "" "note: this revision creates divergence\n" "note: you may (or may not) wish to run 'monotone merge'" msgstr "" -#: commands.cc:2572 +#: ../commands.cc:2671 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the working directory and\n" @@ -1345,7 +1368,7 @@ "them is given. If no format is specified, unified is used by default." msgstr "" -#: commands.cc:2588 +#: ../commands.cc:2687 #, c-format msgid "" "--diff-args requires --external\n" @@ -1354,62 +1377,62 @@ "--diff-args requiet --external\n" "essayez d'ajouter --external ou de retirer --diff-args ?" -#: commands.cc:2622 +#: ../commands.cc:2721 #, c-format msgid "current revision has no ancestor" msgstr "la révision actuelle n'existe pas" -#: commands.cc:2661 +#: ../commands.cc:2760 #, c-format msgid "no common ancestor for %s and %s" msgstr "pas d'ancêtre commun pour %s et %s" -#: commands.cc:2667 +#: ../commands.cc:2766 #, c-format msgid "concatenating un-committed changeset to composite\n" msgstr "" -#: commands.cc:2704 commands.cc:2721 +#: ../commands.cc:2803 ../commands.cc:2820 msgid "LEFT RIGHT" msgstr "GAUCHE DROITE" -#: commands.cc:2704 +#: ../commands.cc:2803 #, fuzzy msgid "print least common ancestor" msgstr "l'ancêtre commun est %s\n" -#: commands.cc:2717 +#: ../commands.cc:2816 msgid "no common ancestor found" msgstr "aucun ancêtre commun n'a été trouvé" -#: commands.cc:2721 +#: ../commands.cc:2820 msgid "print least common ancestor / dominator" msgstr "" -#: commands.cc:2735 +#: ../commands.cc:2834 #, fuzzy msgid "no common ancestor/dominator found" msgstr "l'ancêtre commun est %s\n" -#: commands.cc:2760 +#: ../commands.cc:2859 #, c-format msgid "updating %s to %s\n" msgstr "mise à jour de %s en %s\n" -#: commands.cc:2784 +#: ../commands.cc:2883 msgid "" "update working copy.\n" "If a revision is given, base the update on that revision. If not,\n" "base the update on the head of the branch (given or implicit)." msgstr "" -#: commands.cc:2809 +#: ../commands.cc:2908 #, c-format msgid "this working directory is a new project; cannot update" msgstr "" "ce dossier de travail est un nouveau projet, impossible de mettre à jour" -#: commands.cc:2816 +#: ../commands.cc:2915 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1417,284 +1440,297 @@ "maybe you want --revision=" msgstr "" -#: commands.cc:2821 +#: ../commands.cc:2920 #, c-format msgid "multiple update candidates:\n" msgstr "plusieurs candidats pour la mise à jour :\n" -#: commands.cc:2825 +#: ../commands.cc:2924 #, c-format msgid "choose one with 'monotone update -r'\n" msgstr "choisissez en un avec « monotone update -r »\n" -#: commands.cc:2826 +#: ../commands.cc:2925 #, c-format msgid "multiple candidates remain after selection" msgstr "" -#: commands.cc:2841 +#: ../commands.cc:2940 #, c-format msgid "already up to date at %s\n" msgstr "déjà à jour en %s\n" -#: commands.cc:2845 +#: ../commands.cc:2948 #, c-format msgid "selected update target %s\n" msgstr "sélection de la cible %s pour la mise à jour\n" -#: commands.cc:2857 +#: ../commands.cc:2960 #, c-format msgid "" "revision %s is not a member of branch %s\n" "try again with explicit --branch\n" msgstr "" -#: commands.cc:2872 +#. working copy has no changes +#: ../commands.cc:2975 #, c-format msgid "updating along chosen edge %s -> %s\n" msgstr "" -#: commands.cc:2883 +#: ../commands.cc:2986 #, c-format msgid "merging working copy with chosen edge %s -> %s\n" msgstr "" -#: commands.cc:2932 +#: ../commands.cc:3035 #, c-format msgid "updated to base revision %s\n" msgstr "mise à jour vers la révision de base %s\n" -#: commands.cc:2998 +#: ../commands.cc:3101 #, fuzzy, c-format msgid "" "common ancestor %s found\n" "trying 3-way merge\n" msgstr "aucun ancêtre commun n'a été trouvé" -#: commands.cc:3009 +#: ../commands.cc:3112 #, c-format msgid "no common ancestor found, synthesizing edges\n" msgstr "" -#: commands.cc:3059 +#: ../commands.cc:3158 #, fuzzy msgid "merge unmerged heads of branch" msgstr "fusionne les" -#: commands.cc:3073 +#: ../commands.cc:3172 #, c-format msgid "branch '%s' is merged\n" msgstr "la branche « %s » est fusionnée\n" -#: commands.cc:3079 +#: ../commands.cc:3178 #, c-format msgid "starting with revision 1 / %d\n" msgstr "" -#: commands.cc:3083 +#: ../commands.cc:3182 #, c-format msgid "merging with revision %d / %d\n" msgstr "" -#: commands.cc:3084 commands.cc:3085 commands.cc:3152 commands.cc:3236 -#: commands.cc:3237 +#. Somewhat redundant, but consistent with output of plain "merge" command. +#: ../commands.cc:3183 ../commands.cc:3184 ../commands.cc:3251 +#: ../commands.cc:3335 ../commands.cc:3336 #, c-format msgid "[source] %s\n" -msgstr "" +msgstr "[source] %s\n" -#: commands.cc:3102 commands.cc:3189 commands.cc:3256 +#: ../commands.cc:3201 ../commands.cc:3288 ../commands.cc:3355 #, c-format msgid "[merged] %s\n" -msgstr "" +msgstr "[fusionné] %s\n" -#: commands.cc:3105 +#: ../commands.cc:3204 #, c-format msgid "note: your working copies have not been updated\n" msgstr "" -#: commands.cc:3108 +#: ../commands.cc:3207 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "" -#: commands.cc:3109 +#: ../commands.cc:3208 msgid "merge from one branch to another asymmetrically" msgstr "" -#: commands.cc:3143 commands.cc:3146 +#: ../commands.cc:3242 ../commands.cc:3245 #, c-format msgid "branch '%s' is not merged\n" msgstr "la branche « %s » n'est pas fusionnée\n" -#: commands.cc:3151 +#: ../commands.cc:3250 #, c-format msgid "propagating %s -> %s\n" msgstr "" -#: commands.cc:3153 +#: ../commands.cc:3252 #, c-format msgid "[target] %s\n" -msgstr "" +msgstr "[cible] %s\n" -#: commands.cc:3158 +#: ../commands.cc:3257 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "" -#: commands.cc:3160 +#: ../commands.cc:3259 #, c-format msgid "no action taken\n" msgstr "" -#: commands.cc:3164 +#: ../commands.cc:3263 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "" -#: commands.cc:3193 +#: ../commands.cc:3292 msgid "refresh the inodeprint cache" msgstr "" -#: commands.cc:3201 +#: ../commands.cc:3300 msgid "" "LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" msgstr "" -#: commands.cc:3203 +#: ../commands.cc:3302 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" -#: commands.cc:3218 commands.cc:3220 +#: ../commands.cc:3317 ../commands.cc:3319 #, c-format msgid "%s is not an ancestor of %s" msgstr "%s n'est pas un ancêtre de %s" -#: commands.cc:3229 +#: ../commands.cc:3328 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "" -#: commands.cc:3231 commands.cc:3233 +#: ../commands.cc:3330 ../commands.cc:3332 #, c-format msgid "%s is already an ancestor of %s" -msgstr "" +msgstr "%s est déjà un ancêtre de %s" -#: commands.cc:3259 +#: ../commands.cc:3358 msgid "(revision|manifest|file|key) PARTIAL-ID" msgstr "" -#: commands.cc:3260 +#: ../commands.cc:3359 msgid "complete partial id" msgstr "" -#: commands.cc:3269 +#: ../commands.cc:3368 #, c-format msgid "non-hex digits in partial id" msgstr "" -#: commands.cc:3317 +#: ../commands.cc:3416 msgid "revert file(s), dir(s) or entire working copy" msgstr "" -#: commands.cc:3355 +#: ../commands.cc:3441 #, c-format +msgid "revert adding find_missing entries to %d original args elements\n" +msgstr "" + +#: ../commands.cc:3450 +#, c-format +msgid "" +"after adding everything from find_missing, revert args_copy has %d elements\n" +msgstr "" + +#: ../commands.cc:3474 +#, c-format msgid "reverting %s from %s to %s\n" msgstr "" -#: commands.cc:3359 +#: ../commands.cc:3478 #, c-format msgid "no file version %s found in database for %s" msgstr "" -#: commands.cc:3376 +#: ../commands.cc:3495 msgid "RCSFILE..." msgstr "" -#: commands.cc:3377 +#: ../commands.cc:3496 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " "cvs_import" msgstr "" -#: commands.cc:3393 +#: ../commands.cc:3512 msgid "rcs" msgstr "" -#: commands.cc:3393 +#: ../commands.cc:3512 msgid "CVSROOT" msgstr "" -#: commands.cc:3393 +#: ../commands.cc:3512 msgid "import all versions in CVS repository" msgstr "" -#: commands.cc:3456 +#: ../commands.cc:3575 msgid "PATH" -msgstr "" +msgstr "CHEMIN" -#: commands.cc:3457 +#: ../commands.cc:3576 msgid "print annotated copy of the file from REVISION" msgstr "" -#: commands.cc:3474 +#: ../commands.cc:3593 #, c-format msgid "no revision for file '%s' in database" msgstr "" -#: commands.cc:3477 +#: ../commands.cc:3596 #, c-format msgid "annotate file file_path '%s'\n" msgstr "" -#: commands.cc:3486 +#: ../commands.cc:3605 #, c-format msgid "no such file '%s' in revision '%s'\n" msgstr "aucun fichier « %s » dans la révision « %s »\n" -#: commands.cc:3488 +#: ../commands.cc:3607 #, c-format msgid "annotate for file_id %s\n" msgstr "" -#: commands.cc:3493 +#: ../commands.cc:3612 msgid "[FILE]" -msgstr "" +msgstr "[FICHIER]" -#: commands.cc:3494 +#: ../commands.cc:3613 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." msgstr "" -#: commands.cc:3554 +#: ../commands.cc:3673 #, c-format msgid "revision %s does not exist in db, skipping\n" msgstr "" -#: commands.cc:3587 +#: ../commands.cc:3706 #, c-format msgid "revision '%s' in '%s' maps to '%s' in %s\n" msgstr "" -#: commands.cc:3661 +#: ../commands.cc:3780 msgid "DIRECTORY" -msgstr "" +msgstr "DOSSIER" -#: commands.cc:3661 +#: ../commands.cc:3780 msgid "setup a new working copy directory" msgstr "" -#: commands.cc:3667 +#: ../commands.cc:3786 #, c-format msgid "need --branch argument for setup" msgstr "" -#: commands.cc:3676 +#: ../commands.cc:3795 msgid "automation" msgstr "automatisation" -#: commands.cc:3677 +#: ../commands.cc:3796 msgid "" "interface_version\n" "heads [BRANCH]\n" @@ -1715,401 +1751,410 @@ "get_file ID\n" "get_manifest [ID]\n" "get_revision [ID]\n" +"keys\n" msgstr "" -#: commands.cc:3696 +#: ../commands.cc:3816 msgid "automation interface" -msgstr "" +msgstr "interface d'automatisation" -#: commands.cc:3710 commands.cc:3726 +#: ../commands.cc:3830 ../commands.cc:3846 msgid "vars" msgstr "variables" -#: commands.cc:3710 +#: ../commands.cc:3830 msgid "DOMAIN NAME VALUE" msgstr "" -#: commands.cc:3711 +#: ../commands.cc:3831 msgid "set the database variable NAME to VALUE, in domain DOMAIN" msgstr "" -#: commands.cc:3726 +#: ../commands.cc:3846 msgid "DOMAIN NAME" msgstr "" -#: commands.cc:3727 +#: ../commands.cc:3847 msgid "remove the database variable NAME in domain DOMAIN" msgstr "" -#: commands.cc:3738 +#: ../commands.cc:3858 #, c-format msgid "no var with name %s in domain %s" msgstr "" -#: database_check.cc:109 +#: ../database_check.cc:109 #, fuzzy, c-format msgid "checking %d files\n" msgstr "la vérification de « %s » a échouée" -#: database_check.cc:111 +#: ../database_check.cc:111 msgid "files" -msgstr "" +msgstr "fichiers" -#: database_check.cc:116 +#: ../database_check.cc:116 #, fuzzy, c-format msgid "checking file %s\n" msgstr "importation du fichier « %s »\n" -#: database_check.cc:134 +#: ../database_check.cc:134 #, c-format msgid "checking %d manifests\n" msgstr "" -#: database_check.cc:136 rcs_import.cc:1259 -#, fuzzy +#: ../database_check.cc:136 ../rcs_import.cc:1258 msgid "manifests" -msgstr "aucun manifeste « %s »" +msgstr "manifestes" -#: database_check.cc:141 -#, fuzzy, c-format +#: ../database_check.cc:141 +#, c-format msgid "checking manifest %s\n" -msgstr "aucun manifeste « %s »" +msgstr "vérification du manifeste « %s »\n" -#: database_check.cc:153 -#, fuzzy, c-format +#: ../database_check.cc:153 +#, c-format msgid "error parsing manifest %s: %s" -msgstr "erreur lors de la lecture du fichier RCS %s : %s\n" +msgstr "erreur lors de l'analyse du manifeste %s : %s" -#: database_check.cc:190 -#, fuzzy, c-format +#: ../database_check.cc:190 +#, c-format msgid "checking %d revisions\n" -msgstr "erreur réseau : %s" +msgstr "verification de %d révisions\n" -#: database_check.cc:192 database_check.cc:380 netsync.cc:3718 -#: rcs_import.cc:1258 +#. xgettext: please use short message and try to avoid multibytes chars +#: ../database_check.cc:192 ../database_check.cc:380 ../netsync.cc:3485 +#: ../rcs_import.cc:1257 msgid "revisions" msgstr "révisions" -#: database_check.cc:197 -#, fuzzy, c-format +#: ../database_check.cc:197 +#, c-format msgid "checking revision %s\n" -msgstr "nouvelle révisions %s\n" +msgstr "vérification de la révisions %s\n" -#: database_check.cc:209 +#: ../database_check.cc:209 #, fuzzy, c-format msgid "error parsing revision %s: %s" msgstr "erreur lors de la lecture du fichier RCS %s : %s\n" -#: database_check.cc:277 +#: ../database_check.cc:277 #, c-format msgid "checked %d revisions after starting with %d\n" msgstr "" -#: database_check.cc:289 +#: ../database_check.cc:289 #, c-format msgid "checking %d ancestry edges\n" msgstr "" -#: database_check.cc:291 +#: ../database_check.cc:291 msgid "ancestry" -msgstr "" +msgstr "ancêtre" -#: database_check.cc:322 +#: ../database_check.cc:322 #, c-format msgid "checking %d public keys\n" -msgstr "" +msgstr "vérification de %d clefs publiques\n" -#: database_check.cc:324 netsync.cc:3722 +#. xgettext: please use short message and try to avoid multibytes chars +#: ../database_check.cc:324 ../netsync.cc:3489 msgid "keys" msgstr "clefs" -#: database_check.cc:348 +#: ../database_check.cc:348 #, fuzzy, c-format msgid "checking %d revision certs\n" msgstr "insertion de la nouvelle révision %s\n" -#: database_check.cc:350 netsync.cc:3720 +#. xgettext: please use short message and try to avoid multibytes chars +#: ../database_check.cc:350 ../netsync.cc:3487 msgid "certs" msgstr "certs" -#: database_check.cc:378 +#: ../database_check.cc:378 #, c-format msgid "checking local history of %d revisions\n" msgstr "" -#: database_check.cc:413 +#: ../database_check.cc:413 #, c-format msgid "file %s missing (%d manifest references)\n" msgstr "" -#: database_check.cc:420 +#: ../database_check.cc:420 #, c-format msgid "file %s unreferenced\n" -msgstr "" +msgstr "fichier %s non-référencé\n" -#: database_check.cc:442 +#: ../database_check.cc:442 #, c-format msgid "manifest %s missing (%d revision references)\n" msgstr "" -#: database_check.cc:449 +#: ../database_check.cc:449 #, c-format msgid "manifest %s unreferenced\n" msgstr "" -#: database_check.cc:455 +#: ../database_check.cc:455 #, c-format msgid "manifest %s incomplete (%d missing files)\n" msgstr "" -#: database_check.cc:462 +#: ../database_check.cc:462 #, c-format msgid "manifest %s is not parseable (perhaps with unnormalized paths?)\n" msgstr "" -#: database_check.cc:469 +#: ../database_check.cc:469 #, c-format msgid "manifest %s is not in normalized form\n" msgstr "" -#: database_check.cc:493 +#: ../database_check.cc:493 #, c-format msgid "revision %s missing (%d revision references; %d cert references)\n" msgstr "" -#: database_check.cc:500 +#: ../database_check.cc:500 #, c-format msgid "revision %s incomplete (%d missing manifests)\n" msgstr "" -#: database_check.cc:507 +#: ../database_check.cc:507 #, c-format msgid "revision %s incomplete (%d missing revisions)\n" msgstr "" -#: database_check.cc:514 +#: ../database_check.cc:514 #, c-format msgid "revision %s incomplete (%d incomplete manifests)\n" msgstr "" -#: database_check.cc:521 +#: ../database_check.cc:521 #, c-format msgid "" "revision %s mismatched parents (%d ancestry parents; %d revision refs)\n" msgstr "" -#: database_check.cc:530 +#: ../database_check.cc:530 #, c-format msgid "revision %s mismatched children (%d ancestry children; %d parents)\n" msgstr "" -#: database_check.cc:542 +#: ../database_check.cc:542 #, fuzzy, c-format msgid "revision %s has bad history (%s)\n" msgstr "la révision %s est déjà dans la base de données\n" -#: database_check.cc:549 +#: ../database_check.cc:549 #, c-format msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n" msgstr "" -#: database_check.cc:556 +#: ../database_check.cc:556 #, fuzzy, c-format msgid "revision %s is not in normalized form\n" msgstr "la révision %s n'est pas membre de la branche %s\n" -#: database_check.cc:573 +#: ../database_check.cc:573 #, fuzzy, c-format msgid "key %s signed %d certs\n" msgstr "clef et certificat" -#: database_check.cc:580 +#: ../database_check.cc:580 #, c-format msgid "key %s missing (signed %d certs)\n" msgstr "" -#: database_check.cc:613 +#: ../database_check.cc:613 #, c-format msgid "revision %s unchecked signature in %s cert from missing key %s\n" msgstr "" -#: database_check.cc:621 +#: ../database_check.cc:621 #, c-format msgid "revision %s bad signature in %s cert from key %s\n" msgstr "" -#: database_check.cc:636 -#, fuzzy, c-format +#: ../database_check.cc:636 +#, c-format msgid "revision %s missing %s cert\n" -msgstr "la révision %s est déjà dans la base de données\n" +msgstr "" -#: database_check.cc:645 +#: ../database_check.cc:645 #, c-format msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)\n" msgstr "" -#: database_check.cc:717 +#: ../database_check.cc:717 #, fuzzy, c-format msgid "%d missing files\n" msgstr "importation du fichier « %s »\n" -#: database_check.cc:719 +#: ../database_check.cc:719 #, c-format msgid "%d unreferenced files\n" -msgstr "" +msgstr "%d fichiers non-référencés\n" -#: database_check.cc:722 +#: ../database_check.cc:722 #, fuzzy, c-format msgid "%d missing manifests\n" msgstr "noeud %d = révision %s = manifeste %s\n" -#: database_check.cc:724 +#: ../database_check.cc:724 #, c-format msgid "%d unreferenced manifests\n" -msgstr "" +msgstr "%d manifestes non-référencés\n" -#: database_check.cc:726 +#: ../database_check.cc:726 #, c-format msgid "%d incomplete manifests\n" -msgstr "" +msgstr "%d manifestes incomplets\n" -#: database_check.cc:728 +#: ../database_check.cc:728 #, c-format msgid "%d manifests not parseable (perhaps with invalid paths)\n" msgstr "" -#: database_check.cc:731 +#: ../database_check.cc:731 #, c-format msgid "%d manifests not in normalized form\n" msgstr "" -#: database_check.cc:734 +#: ../database_check.cc:734 #, fuzzy, c-format msgid "%d missing revisions\n" msgstr "insertion de la nouvelle révision %s\n" -#: database_check.cc:736 +#: ../database_check.cc:736 #, fuzzy, c-format msgid "%d incomplete revisions\n" msgstr "nouvelle révisions %s\n" -#: database_check.cc:738 +#: ../database_check.cc:738 #, c-format msgid "%d mismatched parents\n" msgstr "" -#: database_check.cc:740 +#: ../database_check.cc:740 #, c-format msgid "%d mismatched children\n" msgstr "" -#: database_check.cc:742 +#: ../database_check.cc:742 #, c-format msgid "%d revisions with bad history\n" msgstr "" -#: database_check.cc:744 +#: ../database_check.cc:744 #, c-format msgid "%d revisions not parseable (perhaps with invalid paths)\n" msgstr "" -#: database_check.cc:747 +#: ../database_check.cc:747 #, c-format msgid "%d revisions not in normalized form\n" msgstr "" -#: database_check.cc:750 +#: ../database_check.cc:750 #, c-format msgid "%d missing keys\n" -msgstr "" +msgstr "%d clefs manquantes\n" -#: database_check.cc:753 +#: ../database_check.cc:753 #, c-format msgid "%d missing certs\n" -msgstr "" +msgstr "%d certificats manquants\n" -#: database_check.cc:755 -#, c-format +#: ../database_check.cc:755 +#, fuzzy, c-format msgid "%d mismatched certs\n" -msgstr "" +msgstr "%d" -#: database_check.cc:757 +#: ../database_check.cc:757 #, c-format msgid "%d unchecked signatures due to missing keys\n" msgstr "" -#: database_check.cc:759 +#: ../database_check.cc:759 #, c-format msgid "%d bad signatures\n" -msgstr "" +msgstr "%d mauvaises signatures\n" -#: database_check.cc:784 +#: ../database_check.cc:784 #, c-format msgid "" "check complete: %d files; %d manifests; %d revisions; %d keys; %d certs\n" msgstr "" -#: database_check.cc:790 +#: ../database_check.cc:790 #, c-format msgid "total problems detected: %d (%d serious)\n" msgstr "" -#: database_check.cc:792 +#: ../database_check.cc:792 #, c-format msgid "serious problems detected" -msgstr "" +msgstr "problèmes sérieux détectés" -#: database_check.cc:794 +#: ../database_check.cc:794 #, c-format msgid "minor problems detected\n" -msgstr "" +msgstr "problèmes mineurs détectés\n" -#: database_check.cc:796 -#, fuzzy, c-format +#: ../database_check.cc:796 +#, c-format msgid "database is good\n" -msgstr "base de données" +msgstr "la base de données est bonne\n" -#: database.cc:80 +#: ../database.cc:86 #, c-format msgid "" -"database schemas do not match: wanted %s, got %s. try migrating database" +"layout of database %s doesn't match this version of monotone\n" +"wanted schema %s, got %s\n" +"try 'monotone db migrate' to upgrade\n" +"(this is irreversible; you may want to make a backup copy first)" msgstr "" -#: database.cc:135 database.cc:197 +#: ../database.cc:143 ../database.cc:205 #, c-format msgid "database %s does not exist" msgstr "la base de données %s n'existe pas" -#: database.cc:136 database.cc:198 +#: ../database.cc:144 ../database.cc:206 #, c-format msgid "%s is a directory, not a database" msgstr "%s est un dossier, pas une base de données" -#: database.cc:143 +#: ../database.cc:151 #, c-format msgid "unable to probe database version in file %s" msgstr "" -#: database.cc:150 +#: ../database.cc:158 #, c-format msgid "database %s is not an sqlite version 3 file, try dump and reload" -msgstr "" +msgstr "la base de données %s n'est pas un fichier sqlite version 3, essayer dump puis reload" -#: database.cc:172 database.cc:183 +#. first log the code so we can find _out_ what the confusing code +#. was... note that code does not uniquely identify the errmsg, unlike +#. errno's. +#: ../database.cc:180 ../database.cc:191 #, c-format msgid "sqlite error: %d: %s" msgstr "erreur sqlite : %d : %s" -#: database.cc:177 +#: ../database.cc:185 msgid "make sure database and containing directory are writeable" msgstr "" -#: database.cc:224 +#: ../database.cc:232 #, c-format msgid "could not initialize database: %s: already exists" -msgstr "" +msgstr "impossible d'initialiser la base de données : %s : elle existe déjà" -#: database.cc:229 +#: ../database.cc:237 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -2117,12 +2162,12 @@ "cancelling database creation" msgstr "" -#: database.cc:348 +#: ../database.cc:358 #, c-format msgid "cannot create %s; it already exists" msgstr "impossible de créer %s car ceci existe déjà" -#: database.cc:412 +#: ../database.cc:422 #, c-format msgid "" "schema version : %s\n" @@ -2163,227 +2208,298 @@ " certificats : %u\n" " total : %u\n" -#: database.cc:465 +#: ../database.cc:475 #, c-format msgid "database schema version: %s" msgstr "version du schéma de la base de données : %s" -#: database.cc:483 +#: ../database.cc:493 #, fuzzy msgid "mcerts" -msgstr "certs" +msgstr "mcerts" -#: database.cc:484 +#: ../database.cc:494 #, fuzzy msgid "pubkeys" msgstr "clefs" -#: database.cc:485 +#: ../database.cc:495 #, fuzzy msgid "privkeys" msgstr "clefs" -#: database.cc:545 +#: ../database.cc:539 #, c-format msgid "statement cache statistics\n" msgstr "statistiques relatives au cache des expressions\n" -#: database.cc:546 +#: ../database.cc:540 #, c-format msgid "prepared %d statements\n" msgstr "%d expressions préparées\n" -#: database.cc:551 +#: ../database.cc:544 #, c-format msgid "%d executions of %s\n" msgstr "%d exécutions de %s\n" -#: database.cc:608 +#: ../database.cc:597 #, c-format msgid "prepared statement %s\n" msgstr "" -#: database.cc:612 +#: ../database.cc:601 #, c-format msgid "multiple statements in query: %s\n" msgstr "" -#: database.cc:618 +#: ../database.cc:607 #, c-format msgid "wanted %d columns got %d in query: %s\n" msgstr "" -#: database.cc:624 +#: ../database.cc:613 #, c-format msgid "binding %d parameters for %s\n" msgstr "" -#: database.cc:638 +#: ../database.cc:627 #, c-format msgid "binding %d with value '%s'\n" msgstr "" -#: database.cc:654 +#: ../database.cc:643 #, c-format msgid "null result in query: %s\n" msgstr "" -#: database.cc:672 +#: ../database.cc:661 #, c-format msgid "wanted %d rows got %s in query: %s\n" msgstr "" -#: database.cc:682 +#: ../database.cc:671 #, c-format msgid "cannot change filename to %s while db is open" msgstr "" -#: database.cc:882 +#: ../database.cc:873 #, c-format msgid "version cache expiring %s\n" msgstr "" -#: database.cc:904 +#. ++cache_hits; +#: ../database.cc:895 #, c-format msgid "version cache hit on %s\n" msgstr "" -#: database.cc:949 +#. tricky path +#. we start from the file we want to reconstruct and work *forwards* +#. through the database, until we get to a full data object. we then +#. trace back through the list of edges we followed to get to the data +#. object, applying reverse deltas. +#. +#. the effect of this algorithm is breadth-first search, backwards +#. through the storage graph, to discover a forwards shortest path, and +#. then following that shortest path with delta application. +#. +#. we used to do this with the boost graph library, but it invovled +#. loading too much of the storage graph into memory at any moment. this +#. imperative version only loads the descendents of the reconstruction +#. node, so it much cheaper in terms of memory. +#. +#. we also maintain a cycle-detecting set, just to be safe +#: ../database.cc:940 #, c-format msgid "reconstructing %s in %s\n" msgstr "" -#: database.cc:1003 +#: ../database.cc:994 #, c-format msgid "inserting edge: %s <- %s\n" msgstr "" -#: database.cc:1007 +#: ../database.cc:998 #, c-format msgid "skipping merge edge %s <- %s\n" msgstr "" -#: database.cc:1053 +#: ../database.cc:1044 #, c-format msgid "following delta %s -> %s\n" msgstr "" -#: database.cc:1417 +#. perform the actual SQL transactions to kill rev rid here +#: ../database.cc:1466 #, c-format msgid "Killing revision %s locally\n" msgstr "" -#: database.cc:1429 +#: ../database.cc:1478 #, c-format msgid "Deleting all references to branch %s\n" msgstr "" -#: database.cc:1442 +#: ../database.cc:1491 #, c-format msgid "Deleting all references to tag %s\n" msgstr "" -#: database.cc:1592 database.cc:1604 +#: ../database.cc:1592 #, c-format msgid "another key with name '%s' already exists" msgstr "" -#: database.cc:2453 +#: ../database.cc:2220 +#, fuzzy, c-format +msgid "after get_branch_heads for %s, heads has %d entries\n" +msgstr "la branche %s a %d entrées\n" + +#: ../database.cc:2243 #, c-format +msgid "processing selector type %d with i->second '%s'\n" +msgstr "" + +#: ../database.cc:2250 +#, c-format +msgid "limiting to current branch '%s'\n" +msgstr "" + +#: ../database.cc:2480 +#, c-format msgid "no database specified" msgstr "aucune base de données n'a été spécifiée" -#: database.cc:2464 +#: ../database.cc:2506 #, c-format msgid "could not open database '%s': %s" msgstr "impossible d'ouvrir la base de données « %s » : %s" -#: diff_patch.cc:209 +#: ../database.cc:2548 #, c-format +msgid "attempting to rollback and close %d databases" +msgstr "" + +#: ../database.cc:2557 +#, c-format +msgid "exec_err = %d, close_err = %d" +msgstr "" + +#. Coming into loop we have: +#. i +#. z --pres--> z 0 +#. o --pres--> o 1 +#. a --chng--> a 2 The important thing here is that 'a' in +#. t the LHS matches with ... +#. u +#. v +#. a ... the a on the RHS here. Hence we can +#. q --pres--> q 3 'shift' the entire 'changed' block +#. e --chng--> d 4 upwards, leaving a 'preserved' line +#. g --pres--> g 5 'a'->'a' +#. +#. Want to end up with: +#. i +#. z --pres--> z 0 +#. o --chng--> o 1 +#. a +#. t +#. u +#. v +#. a --pres--> a 2 +#. q --pres--> q 3 +#. e --chng--> d 4 +#. g --pres--> g 5 +#. +#. Now all the 'changed' extents are normalised to the +#. earliest possible position. +#: ../diff_patch.cc:209 +#, c-format msgid "exchanging preserved extent [%d+%d] with changed extent [%d+%d]\n" msgstr "" -#: diff_patch.cc:300 +#: ../diff_patch.cc:300 #, c-format msgid "conflicting edits: %s %d[%d] '%s' vs. %s %d[%d] '%s'\n" msgstr "" -#: diff_patch.cc:328 +#: ../diff_patch.cc:328 #, c-format msgid "conflicting edits: [%s %d %d] vs. [%s %d %d]\n" msgstr "" -#: diff_patch.cc:376 +#: ../diff_patch.cc:376 #, c-format msgid "calculating left edit script on %d -> %d lines\n" msgstr "" -#: diff_patch.cc:384 +#: ../diff_patch.cc:384 #, c-format msgid "calculating right edit script on %d -> %d lines\n" msgstr "" -#: diff_patch.cc:392 +#: ../diff_patch.cc:392 #, c-format msgid "calculating left extents on %d edits\n" msgstr "" -#: diff_patch.cc:397 +#: ../diff_patch.cc:397 #, c-format msgid "calculating right extents on %d edits\n" msgstr "" -#: diff_patch.cc:402 +#: ../diff_patch.cc:402 #, c-format msgid "normalizing %d right extents\n" msgstr "" -#: diff_patch.cc:405 +#: ../diff_patch.cc:405 #, c-format msgid "normalizing %d left extents\n" msgstr "" -#: diff_patch.cc:411 +#: ../diff_patch.cc:411 #, c-format msgid "conflicting prefixes\n" -msgstr "" +msgstr "préfixes en conflit\n" -#: diff_patch.cc:417 +#: ../diff_patch.cc:417 #, c-format msgid "conflicting suffixes\n" -msgstr "" +msgstr "suffixes en conflit\n" -#: diff_patch.cc:421 +#: ../diff_patch.cc:421 #, c-format msgid "merging %d left, %d right extents\n" msgstr "" -#: diff_patch.cc:452 +#: ../diff_patch.cc:452 #, c-format msgid "conflict detected. no merge.\n" -msgstr "" +msgstr "conflit détecté, pas de fusion.\n" -#: diff_patch.cc:472 +#: ../diff_patch.cc:472 #, c-format msgid "recording successful merge of %s <-> %s into %s\n" msgstr "" -#: diff_patch.cc:528 +#: ../diff_patch.cc:530 #, c-format msgid "trying to merge %s <-> %s (ancestor: %s)\n" msgstr "" -#: diff_patch.cc:533 diff_patch.cc:638 +#: ../diff_patch.cc:535 ../diff_patch.cc:640 #, c-format msgid "files are identical\n" msgstr "les fichiers sont identiques\n" -#: diff_patch.cc:575 +#: ../diff_patch.cc:577 #, c-format msgid "internal 3-way merged ok\n" msgstr "" -#: diff_patch.cc:589 +#: ../diff_patch.cc:591 #, c-format msgid "" "help required for 3-way merge\n" @@ -2398,17 +2514,17 @@ "[ droite] %s\n" "[fusionné] %s\n" -#: diff_patch.cc:606 +#: ../diff_patch.cc:608 #, c-format msgid "lua merge3 hook merged ok\n" msgstr "" -#: diff_patch.cc:633 +#: ../diff_patch.cc:635 #, c-format msgid "trying to merge %s <-> %s\n" msgstr "" -#: diff_patch.cc:649 +#: ../diff_patch.cc:651 #, c-format msgid "" "help required for 2-way merge\n" @@ -2421,37 +2537,37 @@ "[ droite] %s\n" "[fusionné] %s\n" -#: diff_patch.cc:663 +#: ../diff_patch.cc:665 #, c-format msgid "lua merge2 hook merged ok\n" msgstr "" -#: diff_patch.cc:694 +#: ../diff_patch.cc:696 #, c-format msgid "temporarily recording merge of %s <-> %s into %s\n" msgstr "" -#: diff_patch.cc:711 +#: ../diff_patch.cc:713 #, c-format msgid "file '%s' does not exist in working copy" msgstr "le fichier « %s » n'existe pas dans la copie de travail" -#: diff_patch.cc:712 +#: ../diff_patch.cc:714 #, c-format msgid "'%s' in working copy is a directory, not a file" msgstr "" -#: diff_patch.cc:716 +#: ../diff_patch.cc:718 #, c-format msgid "file %s in working copy has id %s, wanted %s" msgstr "" -#: file_io.cc:116 +#: ../file_io.cc:116 #, c-format msgid "expected file '%s', but it is a directory." msgstr "" -#: file_io.cc:186 file_io.cc:193 +#: ../file_io.cc:186 ../file_io.cc:193 #, c-format msgid "" "could not create directory '%s'\n" @@ -2460,166 +2576,161 @@ "impossible de créer le dossier « %s »\n" "car c'est un fichier" -#: file_io.cc:188 +#: ../file_io.cc:188 #, c-format msgid "" "could not create directory '%s'\n" "%s" msgstr "" -"impossible de créer le dossier « %s »\n" +"impossible de créer le dossier « %s »\n" "%s" -#: file_io.cc:192 +#: ../file_io.cc:192 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le dossier « %s »" -#: file_io.cc:205 +#: ../file_io.cc:205 #, fuzzy, c-format msgid "failed to create directory '%s' for '%s'" msgstr "impossible de créer le dossier : %s : %s\n" -#: file_io.cc:213 +#: ../file_io.cc:213 #, c-format msgid "file to delete '%s' does not exist" msgstr "le fichier à supprimer « %s » n'existe pas" -#: file_io.cc:214 +#: ../file_io.cc:214 #, fuzzy, c-format msgid "file to delete, '%s', is not a file but a directory" msgstr "le fichier à supprimer « %s » n'existe pas" -#: file_io.cc:222 +#: ../file_io.cc:222 #, fuzzy, c-format msgid "directory to delete, '%s', does not exist" msgstr "le dossier à supprimer « %s » n'existe pas" -#: file_io.cc:223 +#: ../file_io.cc:223 #, fuzzy, c-format msgid "directory to delete, '%s', is a file" msgstr "le dossier à supprimer « %s » n'existe pas" -#: file_io.cc:232 +#: ../file_io.cc:232 #, c-format msgid "rename source file '%s' does not exist" msgstr "" -#: file_io.cc:233 +#: ../file_io.cc:233 #, c-format msgid "rename source file '%s' is a directory -- bug in monotone?" msgstr "" -#: file_io.cc:236 file_io.cc:249 +#: ../file_io.cc:236 ../file_io.cc:249 #, fuzzy, c-format msgid "rename target '%s' already exists" msgstr "le fichier pid « %s » existe déjà" -#: file_io.cc:245 +#: ../file_io.cc:245 #, c-format msgid "rename source dir '%s' does not exist" msgstr "" -#: file_io.cc:246 +#: ../file_io.cc:246 #, c-format msgid "rename source dir '%s' is a file -- bug in monotone?" msgstr "" -#: file_io.cc:260 +#: ../file_io.cc:260 #, fuzzy, c-format msgid "rename source path '%s' does not exist" msgstr "le chemin %s n'existe pas" -#: file_io.cc:275 +#: ../file_io.cc:275 #, c-format msgid "file %s does not exist" msgstr "le fichier %s n'existe pas" -#: file_io.cc:276 +#: ../file_io.cc:276 #, c-format msgid "file %s cannot be read as data; it is a directory" -msgstr "" +msgstr "le fichier %s ne peut être lu; c'est un dossier" -#: file_io.cc:280 +#: ../file_io.cc:280 #, c-format msgid "cannot open file %s for reading" -msgstr "" +msgstr "impossible d'ouvrir le fichier %s pour le lire" -#: file_io.cc:324 +#: ../file_io.cc:347 #, c-format msgid "Cannot read standard input multiple times" msgstr "Impossible de lire l'entrée standard plusieurs fois" -#: file_io.cc:354 +#: ../file_io.cc:378 #, c-format msgid "file '%s' cannot be overwritten as data; it is a directory" msgstr "" -#: file_io.cc:368 +#: ../file_io.cc:386 #, c-format msgid "cannot open file %s for writing" -msgstr "" +msgstr "impossible d'ouvrir le fichier %s pour l'écrire" -#: file_io.cc:375 +#: ../file_io.cc:477 #, c-format -msgid "removing %s failed" -msgstr "la suppression de %s a échouée" - -#: file_io.cc:437 -#, c-format msgid "ignoring book keeping entry %s\n" msgstr "" -#: file_io.cc:457 +#: ../file_io.cc:497 #, c-format msgid "caught runtime error %s constructing file path for %s\n" msgstr "" -#: file_io.cc:481 +#: ../file_io.cc:521 #, c-format msgid "no such file or directory: '%s'" msgstr "Aucun fichier ou répertoire de ce type : « %s »" -#: keys.cc:42 +#: ../keys.cc:42 #, c-format msgid "running arc4 process on %d bytes of data\n" msgstr "" -#: keys.cc:80 +#: ../keys.cc:76 #, c-format msgid "got empty passphrase from get_passphrase() hook" msgstr "la phrase de passe obtenue depuis get_passphrase() est vide" -#: keys.cc:96 +#: ../keys.cc:92 #, c-format msgid "empty passphrase not allowed" msgstr "la phrase de passe ne doit pas être vide" -#: keys.cc:103 +#: ../keys.cc:99 #, c-format msgid "confirm passphrase for key ID [%s]: " -msgstr "" +msgstr "confirmez la phrase de passe pour la clef d'ID [%s] :" -#: keys.cc:108 +#: ../keys.cc:104 #, c-format msgid "empty passphrases not allowed, try again\n" msgstr "" -#: keys.cc:109 keys.cc:116 +#: ../keys.cc:105 ../keys.cc:112 #, c-format msgid "too many failed passphrases\n" msgstr "" -#: keys.cc:115 +#: ../keys.cc:111 #, c-format msgid "passphrases do not match, try again\n" -msgstr "" +msgstr "les phrases de passe ne correspondent pas, essayez à nouveau\n" -#: keys.cc:122 +#: ../keys.cc:118 #, c-format msgid "no passphrase given" -msgstr "" +msgstr "aucune phrase de passe fournie" -#: keys.cc:184 +#: ../keys.cc:177 #, c-format msgid "" "generated %d-byte public key\n" @@ -2628,371 +2739,423 @@ "clef publique de %d octets générée\n" "clef privée (chiffrée) de %d octets générée\n" -#: keys.cc:207 keys.cc:263 +#: ../keys.cc:194 #, c-format -msgid "building signer from %d-byte decrypted private key\n" +msgid "base64-decoding %d-byte private key\n" msgstr "" -#: keys.cc:256 +#: ../keys.cc:199 +#, fuzzy, c-format +msgid "have %d-byte encrypted private key\n" +msgstr "" +"clef publique de %d octets générée\n" +"clef privée (chiffrée) de %d octets générée\n" + +#: ../keys.cc:244 #, c-format -msgid "base64-decoding %d-byte private key\n" +msgid "base64-decoding %d-byte old private key\n" msgstr "" -#: keys.cc:300 +#: ../keys.cc:255 #, c-format +msgid "building signer from %d-byte decrypted private key\n" +msgstr "" + +#: ../keys.cc:355 +#, c-format msgid "produced %d-byte signature\n" msgstr "" -#: keys.cc:328 +#: ../keys.cc:383 #, c-format msgid "building verifier for %d-byte pub key\n" msgstr "" -#: keys.cc:350 +#. check the text+sig against the key +#: ../keys.cc:405 #, c-format msgid "checking %d-byte (%d decoded) signature\n" msgstr "" -#: keys.cc:521 +#: ../keys.cc:531 #, c-format -msgid "passphrase for '%s' is incorrect" +msgid "no key pair '%s' found in key store or get_priv_key hook" msgstr "" -#: lua.cc:109 +#: ../keys.cc:542 #, c-format -msgid "lua failure: %s; stack = %s\n" -msgstr "" +msgid "passphrase for '%s' is incorrect" +msgstr "la phrase de passe pour « %s » est incorrecte" -#: lua.cc:115 +#: ../lua.cc:119 #, c-format -msgid "Lua::ok(): failed = %i" +msgid "lua failure: %s; stack = %s\n" msgstr "" -#: lua.cc:124 +#: ../lua.cc:126 +#, fuzzy, c-format +msgid "Lua::ok(): failed" +msgstr "Lua::ok() : échec = %i" + +#: ../lua.cc:135 #, c-format msgid "lua stack: %s" -msgstr "" +msgstr "pile lua : %s" -#: lua.cc:204 +#: ../lua.cc:215 #, c-format msgid "lua: extracted string = %s" -msgstr "" +msgstr "lua : chaîne extraite = %s" -#: lua.cc:217 +#: ../lua.cc:228 #, c-format msgid "lua: extracted int = %i" -msgstr "" +msgstr "lua : int extrait = %i" -#: lua.cc:230 +#: ../lua.cc:241 #, c-format msgid "lua: extracted double = %i" -msgstr "" +msgstr "lua : double extrait = %i" -#: lua.cc:244 +#: ../lua.cc:255 #, c-format msgid "lua: extracted bool = %i" -msgstr "" +msgstr "lua : bool extrait = %i" -#: lua.cc:364 +#: ../lua.cc:375 #, c-format msgid "loading lua hook %s" msgstr "" -#: lua.cc:527 lua.cc:556 lua.cc:571 +#: ../lua.cc:538 ../lua.cc:567 ../lua.cc:582 #, c-format msgid "%s called with an invalid parameter" -msgstr "" +msgstr "%s a été appelé avec un paramètre invalide" -#: lua.cc:574 +#: ../lua.cc:585 #, c-format msgid "Directory '%s' does not exists" msgstr "le dossier « %s » n'existe pas" -#: lua.cc:575 rcs_import.cc:1249 +#: ../lua.cc:586 ../rcs_import.cc:1248 #, c-format msgid "'%s' is not a directory" msgstr "« %s » n'est pas un dossier" -#: lua.cc:594 lua.cc:752 +#: ../lua.cc:605 ../lua.cc:900 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "" -#: lua.cc:749 lua.cc:762 +#: ../lua.cc:897 ../lua.cc:910 #, c-format msgid "opening rcfile '%s' ...\n" msgstr "ouverture du fichier rc « %s » ...\n" -#: lua.cc:753 lua.cc:765 +#: ../lua.cc:901 ../lua.cc:913 #, c-format msgid "'%s' is ok\n" -msgstr "" +msgstr "« %s » est 0K\n" -#: lua.cc:764 +#: ../lua.cc:912 #, c-format msgid "lua error while loading '%s'" -msgstr "" +msgstr "erreur lua lors du chargement de « %s »" -#: lua.cc:769 +#: ../lua.cc:917 #, c-format msgid "rcfile '%s' does not exist" msgstr "le fichier rc « %s » n'existe pas" -#: lua.cc:770 +#: ../lua.cc:918 #, c-format msgid "skipping nonexistent rcfile '%s'\n" msgstr "" -#: lua.cc:1211 +#: ../lua.cc:1363 #, c-format msgid "calling attr_init_function for %s" msgstr "" -#: lua.cc:1215 +#: ../lua.cc:1367 #, c-format msgid " calling an attr_init_function for %s" msgstr "" -#: lua.cc:1228 +#: ../lua.cc:1380 #, c-format msgid " added attr %s = %s" msgstr "" -#: lua.cc:1232 +#: ../lua.cc:1384 #, c-format msgid " no attr added" msgstr "" -#: manifest.cc:55 +#: ../main.cc:325 +msgid "interrupted" +msgstr "interrompu" + +#: ../main.cc:329 +msgid "terminated by signal" +msgstr "terminé par un signal" + +#: ../manifest.cc:55 #, c-format msgid "scanning file %s\n" -msgstr "" +msgstr "analyse du fichier %s\n" -#: manifest.cc:188 +#: ../manifest.cc:188 #, c-format msgid "missing %s" msgstr "" -#: manifest.cc:201 -#, c-format +#: ../manifest.cc:201 +#, fuzzy, c-format msgid "" "%d missing files\n" "to restore consistency, on each missing file run either\n" "'monotone drop FILE' to remove it permanently, or\n" "'monotone revert FILE' to restore it\n" +"or to handle all at once, simple 'monotone drop --missing'\n" +"or 'monotone revert --missing'" msgstr "" "%d fichiers manquants\n" "pour restaurer un état consistent, pour chaque fichier manquant\n" "lancer soit « monotone drop FICHIER » pour le supprimer définitivement,\n" "soit « monotone revert FICHIER » pour le restaurer\n" -#: merkle_tree.cc:281 +#: ../merkle_tree.cc:281 #, c-format msgid "node level is %d, exceeds maximum %d" msgstr "" -#: merkle_tree.cc:317 +#: ../merkle_tree.cc:317 #, c-format msgid "mismatched node hash value %s, expected %s" msgstr "" -#: monotone.cc:51 +#: ../monotone.cc:52 msgid "select branch cert for operation" msgstr "" -#: monotone.cc:52 +#: ../monotone.cc:53 msgid "select revision id for operation" msgstr "" -#: monotone.cc:53 +#: ../monotone.cc:54 #, fuzzy msgid "set commit changelog message" msgstr "message du journal vide" -#: monotone.cc:54 +#: ../monotone.cc:55 msgid "set filename containing commit changelog message" msgstr "" -#: monotone.cc:55 +#: ../monotone.cc:56 msgid "override date/time for commit" msgstr "" -#: monotone.cc:56 +#: ../monotone.cc:57 msgid "override author for commit" msgstr "" -#: monotone.cc:57 +#: ../monotone.cc:58 msgid "limit the number of levels of directories to descend" msgstr "" -#: monotone.cc:58 +#: ../monotone.cc:59 msgid "limit the log output to the given number of entries" -msgstr "" +msgstr "limiter l'affichage du journal au nombre d'entrées spécifié" -#: monotone.cc:59 +#: ../monotone.cc:60 msgid "record process id of server" msgstr "" -#: monotone.cc:60 +#: ../monotone.cc:61 msgid "print a brief version of the normal output" msgstr "" -#: monotone.cc:61 +#: ../monotone.cc:62 msgid "print diffs along with logs" msgstr "" -#: monotone.cc:62 +#: ../monotone.cc:63 msgid "skip merges when printing logs" msgstr "" -#: monotone.cc:63 +#: ../monotone.cc:64 msgid "use the current arguments as the future default" msgstr "" -#: monotone.cc:64 +#: ../monotone.cc:65 msgid "leave out anything described by its argument" msgstr "" -#: monotone.cc:65 +#: ../monotone.cc:66 msgid "use unified diff format" msgstr "utiliser le format diff unifié" -#: monotone.cc:66 +#: ../monotone.cc:67 msgid "use context diff format" msgstr "utiliser le format diff contextuel" -#: monotone.cc:67 +#: ../monotone.cc:68 msgid "use external diff hook for generating diffs" msgstr "" -#: monotone.cc:68 +#: ../monotone.cc:69 msgid "argument to pass external diff hook" msgstr "" -#: monotone.cc:69 +#: ../monotone.cc:70 msgid "use least common ancestor as ancestor for merge" msgstr "" -#: monotone.cc:70 +#: ../monotone.cc:71 msgid "perform the associated file operation" msgstr "" -#: monotone.cc:79 +#: ../monotone.cc:72 +msgid "address:port to listen on (default :5253)" +msgstr "écouteur sur adresse:port (défaut :5233)" + +#: ../monotone.cc:73 +msgid "perform the operations for files missing from working directory" +msgstr "" + +#: ../monotone.cc:74 +msgid "perform the operations for unknown files from working directory" +msgstr "" + +#: ../monotone.cc:75 +msgid "push the specified key even if it hasn't signed anything" +msgstr "" + +#: ../monotone.cc:84 msgid "print debug log to stderr while running" msgstr "" -#: monotone.cc:80 +#: ../monotone.cc:85 msgid "file to dump debugging log to, on failure" msgstr "" -#: monotone.cc:81 +#: ../monotone.cc:86 msgid "suppress log and progress messages" msgstr "" -#: monotone.cc:82 +#: ../monotone.cc:87 msgid "display help message" msgstr "afficher le message d'aide" -#: monotone.cc:83 +#: ../monotone.cc:88 msgid "print version number, then exit" msgstr "afficher le numéro de version, puis quitte" -#: monotone.cc:84 +#: ../monotone.cc:89 msgid "print detailed version number, then exit" msgstr "afficher le numéro de version détaillée, puis quitte" -#: monotone.cc:85 +#: ../monotone.cc:90 msgid "insert command line arguments taken from the given file" msgstr "" -#: monotone.cc:86 +#: ../monotone.cc:91 msgid "set ticker style (count|dot|none)" msgstr "" -#: monotone.cc:87 +#: ../monotone.cc:92 msgid "do not load standard lua hooks" msgstr "ne pas charger les hooks standards lua" -#: monotone.cc:88 +#: ../monotone.cc:93 msgid "do not load ~/.monotone/monotonerc or MT/monotonerc lua files" msgstr "" "ne pas charger les fichiers lua ~/.monotone/monotonerc ou MT/monotonerc" -#: monotone.cc:89 +#: ../monotone.cc:94 msgid "load extra rc file" msgstr "charger un fichier rc supplémentaire" -#: monotone.cc:90 +#: ../monotone.cc:95 msgid "set key for signatures" msgstr "" -#: monotone.cc:91 +#: ../monotone.cc:96 msgid "set name of database" msgstr "" -#: monotone.cc:92 +#: ../monotone.cc:97 msgid "limit search for working copy to specified root" msgstr "" -#: monotone.cc:93 +#: ../monotone.cc:98 msgid "verbose completion output" msgstr "" -#: monotone.cc:199 +#: ../monotone.cc:99 +msgid "set location of key store" +msgstr "" + +#: ../monotone.cc:100 +msgid "set location of configuration directory" +msgstr "" + +#: ../monotone.cc:204 #, c-format msgid "problem parsing arguments from file %s: %s" msgstr "" -#: monotone.cc:208 +#: ../monotone.cc:213 #, c-format msgid "weird error when stuffing arguments read from %s: %s\n" msgstr "" -#: monotone.cc:258 +#: ../monotone.cc:262 #, c-format msgid "command line: %s\n" msgstr "ligne de commande : %s\n" -#: monotone.cc:261 +#: ../monotone.cc:265 #, c-format msgid "set locale: LC_ALL=%s\n" msgstr "paramétrage de la locale : LC_ALL=%s\n" -#: monotone.cc:289 +#: ../monotone.cc:293 msgid "[OPTION...] command [ARGS...]\n" -msgstr "" +msgstr "[OPTION...] commande [ARGUMENTS...]\n" -#: monotone.cc:457 +#: ../monotone.cc:498 #, c-format msgid "syntax error near the \"%s\" option: %s" -msgstr "" +msgstr "erreur de syntaxe près de l'option « %s » : %s" -#: monotone.cc:496 +#: ../monotone.cc:537 #, c-format msgid "monotone %s doesn't use the option %s" msgstr "monotone %s n'utilise pas l'option %s" -#: monotone.cc:518 +#: ../monotone.cc:559 #, c-format msgid "Removed 'hidden' from option # %d\n" msgstr "" -#: monotone.cc:524 monotone.cc:535 +#: ../monotone.cc:565 ../monotone.cc:576 #, c-format msgid "Added 'hidden' to option # %d\n" msgstr "" -#: monotone.cc:531 +#: ../monotone.cc:572 #, c-format msgid "Options specific to 'monotone %s':" msgstr "Options spécifiques à « monotone %s » :" -#: mt_version.cc:23 +#: ../mt_version.cc:23 #, c-format msgid "%s (base revision: %s)" msgstr "%s (révision de base : %s)" -#: mt_version.cc:34 +#: ../mt_version.cc:34 #, c-format msgid "" "Running on: %s\n" @@ -3001,27 +3164,27 @@ "En cours d'exécution sur : %s\n" "Changements depuis la révision de base : %s\n" -#: netcmd.cc:42 +#: ../netcmd.cc:42 #, c-format msgid "unknown item type 0x%x for '%s'" msgstr "type d'élément inconnu 0x%x pour « %s »" -#: netcmd.cc:94 +#: ../netcmd.cc:94 #, c-format msgid "protocol version mismatch: wanted '%d' got '%d'" msgstr "" -#: netcmd.cc:119 +#: ../netcmd.cc:119 #, c-format msgid "unknown netcmd code 0x%x" msgstr "code de commande netcmd inconnu 0x%x" -#: netcmd.cc:130 +#: ../netcmd.cc:130 #, c-format msgid "oversized payload of '%d' bytes" msgstr "charge utile surdimensionnée de '%d' octets" -#: netcmd.cc:159 +#: ../netcmd.cc:159 #, c-format msgid "" "bad HMAC checksum (got %s, wanted %s)\n" @@ -3030,356 +3193,282 @@ "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:235 netcmd.cc:281 +#: ../netcmd.cc:235 ../netcmd.cc:281 #, c-format msgid "unknown role specifier %d" msgstr "" -#: netio.hh:38 netio.hh:56 +#: ../netio.hh:38 ../netio.hh:56 #, 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:84 ../netio.hh:119 #, c-format msgid "uleb128 decode for '%s' into %d-byte datum overflowed" msgstr "" -#: netio.hh:139 +#: ../netio.hh:139 #, c-format msgid "ran out of bytes reading uleb128 value for '%s' at pos %d" msgstr "" -#: netio.hh:275 +#: ../netio.hh:275 #, c-format msgid "decoding variable length string of %d bytes for '%s', maximum is %d" msgstr "" -#: netio.hh:330 +#: ../netio.hh:330 #, c-format msgid "expected %s to end at %d, have %d bytes" msgstr "" -#: netsync.cc:244 +#: ../netsync.cc:243 #, c-format msgid "check of '%s' failed" msgstr "la vérification de « %s » a échouée" -#: netsync.cc:664 +#. xgettext: please use short message and try to avoid multibytes chars +#: ../netsync.cc:696 msgid "bytes in" msgstr "octets ⇩" -#: netsync.cc:666 +#. xgettext: please use short message and try to avoid multibytes chars +#: ../netsync.cc:698 msgid "bytes out" msgstr "octets ⇧" -#: netsync.cc:670 netsync.cc:687 +#. xgettext: please use short message and try to avoid multibytes chars +#: ../netsync.cc:702 ../netsync.cc:719 msgid "revs written" msgstr "révs écrites" -#: netsync.cc:672 +#. xgettext: please use short message and try to avoid multibytes chars +#: ../netsync.cc:704 msgid "certs in" msgstr "certs ⇩" -#: netsync.cc:674 netsync.cc:689 +#. xgettext: please use short message and try to avoid multibytes chars +#: ../netsync.cc:706 ../netsync.cc:721 msgid "revs in" msgstr "révs ⇩" -#: netsync.cc:679 +#. xgettext: please use short message and try to avoid multibytes chars +#: ../netsync.cc:711 msgid "certs out" msgstr "certs ⇧" -#: netsync.cc:681 netsync.cc:691 +#. xgettext: please use short message and try to avoid multibytes chars +#: ../netsync.cc:713 ../netsync.cc:723 msgid "revs out" msgstr "révs ⇧" -#: netsync.cc:749 +#. But otherwise, we're ready to go! +#: ../netsync.cc:781 #, c-format msgid "all epochs processed, opening database valve\n" msgstr "" -#: netsync.cc:837 +#: ../netsync.cc:878 #, c-format msgid "dropping outgoing netcmd (because we're in error unwind mode)\n" msgstr "" -#: netsync.cc:861 +#: ../netsync.cc:902 #, c-format msgid "error: %s\n" msgstr "erreur : %s\n" -#: netsync.cc:869 +#: ../netsync.cc:910 #, c-format msgid "analyzing %d entries in manifest\n" msgstr "" -#: netsync.cc:913 +#: ../netsync.cc:949 #, c-format -msgid "revision %s is attached via database\n" +msgid "analyzing %d ancestry edges\n" msgstr "" -#: netsync.cc:918 +#: ../netsync.cc:971 #, c-format -msgid "checking attachment of %s in ancestry\n" +msgid "intermediate set_difference heads size %d" msgstr "" -#: netsync.cc:925 +#: ../netsync.cc:1007 #, c-format -msgid "checking attachment of %s in parent %s\n" +msgid "Dropping branch certs for unwanted branch %s" msgstr "" -#: netsync.cc:929 +#: ../netsync.cc:1024 #, c-format -msgid "revision %s is attached via parent %s\n" +msgid "after step 2, heads size %d" msgstr "" -#: netsync.cc:936 +#: ../netsync.cc:1048 #, c-format -msgid "decided that revision '%s' is attached\n" +msgid "after step 3, heads size %d" msgstr "" -#: netsync.cc:938 +#: ../netsync.cc:1068 #, c-format -msgid "decided that revision '%s' is not attached\n" +msgid "analyze_ancestry_graph" msgstr "" -#: netsync.cc:1006 +#: ../netsync.cc:1071 #, c-format -msgid "not requesting (in reverse) initial manifest %s as we already have it\n" +msgid "not all done in analyze_ancestry_graph" msgstr "" -#: netsync.cc:1009 +#: ../netsync.cc:1077 #, c-format -msgid "requesting (in reverse) initial manifest data %s\n" +msgid "already analyzed_ancestry in analyze_ancestry_graph" msgstr "" -#: netsync.cc:1019 +#: ../netsync.cc:1081 #, c-format -msgid "" -"not requesting (in reverse) manifest delta to %s as we already have it\n" +msgid "analyze_ancestry_graph fetching" msgstr "" -#: netsync.cc:1022 +#: ../netsync.cc:1116 #, c-format -msgid "requesting (in reverse) manifest delta %s -> %s\n" -msgstr "" - -#: netsync.cc:1049 -#, c-format -msgid "not requesting (in reverse) initial file %s as we already have it\n" -msgstr "" - -#: netsync.cc:1052 -#, c-format -msgid "requesting (in reverse) initial file data %s\n" -msgstr "" - -#: netsync.cc:1062 -#, c-format -msgid "not requesting (in reverse) file delta to %s as we already have it\n" -msgstr "" - -#: netsync.cc:1065 -#, c-format -msgid "requesting (in reverse) file delta %s -> %s on %s\n" -msgstr "" - -#: netsync.cc:1097 -#, c-format -msgid "visiting revision '%s' for forward deltas\n" -msgstr "" - -#: netsync.cc:1125 -#, c-format -msgid "not requesting forward manifest delta to '%s' as we already have it\n" -msgstr "" - -#: netsync.cc:1131 -#, c-format -msgid "requesting full manifest data %s\n" -msgstr "" - -#: netsync.cc:1136 -#, c-format -msgid "requesting forward manifest delta %s -> %s\n" -msgstr "" - -#: netsync.cc:1150 -#, c-format -msgid "" -"not requesting forward delta %s -> %s on file %s as we already have it\n" -msgstr "" - -#: netsync.cc:1156 -#, c-format -msgid "requesting full file data %s\n" -msgstr "" - -#: netsync.cc:1162 -#, c-format -msgid "requesting forward delta %s -> %s on file %s\n" -msgstr "" - -#: netsync.cc:1192 -#, c-format -msgid "analyzing %d ancestry edges\n" -msgstr "" - -#: netsync.cc:1248 -#, c-format -msgid "Dropping branch certs for unwanted branch %s" -msgstr "" - -#: netsync.cc:1303 -#, c-format -msgid "isolated %d heads\n" -msgstr "" - -#: netsync.cc:1330 -#, c-format -msgid "requesting attached ancestry of revision '%s'\n" -msgstr "" - -#: netsync.cc:1335 -#, c-format -msgid "requesting detached ancestry of revision '%s'\n" -msgstr "" - -#: netsync.cc:1369 -#, c-format msgid "read %d bytes from fd %d (peer %s)\n" msgstr "%d octets lu sur le descripteur de fichier %d (pair %s)\n" -#: netsync.cc:1372 +#: ../netsync.cc:1119 #, c-format msgid "in error unwind mode, so throwing them into the bit bucket\n" msgstr "" -#: netsync.cc:1404 +#: ../netsync.cc:1151 #, c-format msgid "wrote %d bytes to fd %d (peer %s)\n" msgstr "%d octets écris sur le descripteur de fichier %d (pair %s)\n" -#: netsync.cc:1412 +#. we've flushed our error message, so it's time to get out. +#: ../netsync.cc:1159 #, c-format msgid "finished flushing output queue in error unwind mode, disconnecting\n" msgstr "" -#: netsync.cc:1426 +#: ../netsync.cc:1173 #, c-format msgid "queueing 'bye' command\n" msgstr "" -#: netsync.cc:1436 +#: ../netsync.cc:1183 #, c-format msgid "queueing 'error' command\n" msgstr "" -#: netsync.cc:1449 +#: ../netsync.cc:1196 #, c-format msgid "queueing 'done' command for %s level %s\n" msgstr "" -#: netsync.cc:1525 +#: ../netsync.cc:1265 #, c-format msgid "queueing request for refinement of %s node '%s', level %d\n" msgstr "" -#: netsync.cc:1543 +#: ../netsync.cc:1283 #, c-format msgid "not queueing request for %s '%s' as we are in pure source role\n" msgstr "" -#: netsync.cc:1550 +#: ../netsync.cc:1290 #, c-format msgid "not queueing request for %s '%s' as we already requested it\n" msgstr "" -#: netsync.cc:1555 +#: ../netsync.cc:1295 #, c-format msgid "queueing request for data of %s item '%s'\n" msgstr "" -#: netsync.cc:1579 +#: ../netsync.cc:1319 #, c-format msgid "" "not queueing request for %s delta '%s' -> '%s' as we are in pure source " "role\n" msgstr "" -#: netsync.cc:1586 +#: ../netsync.cc:1326 #, c-format msgid "" "not queueing request for %s delta '%s' -> '%s' as we already requested the " "target\n" msgstr "" -#: netsync.cc:1591 +#: ../netsync.cc:1331 #, c-format msgid "queueing request for contents of %s delta '%s' -> '%s'\n" msgstr "" -#: netsync.cc:1611 +#: ../netsync.cc:1351 #, c-format msgid "not queueing %s data for '%s' as we are in pure sink role\n" msgstr "" -#: netsync.cc:1616 +#: ../netsync.cc:1356 #, c-format msgid "queueing %d bytes of data for %s item '%s'\n" msgstr "" -#: netsync.cc:1650 +#: ../netsync.cc:1390 #, c-format msgid "not queueing %s delta '%s' -> '%s' as we are in pure sink role\n" msgstr "" -#: netsync.cc:1655 +#: ../netsync.cc:1395 #, c-format msgid "queueing %s delta '%s' -> '%s'\n" msgstr "" -#: netsync.cc:1673 +#: ../netsync.cc:1413 #, c-format msgid "" "not queueing note of nonexistence of %s item '%s' as we are in pure sink " "role\n" msgstr "" -#: netsync.cc:1678 +#: ../netsync.cc:1418 #, c-format msgid "queueing note of nonexistance of %s item '%s'\n" msgstr "" -#: netsync.cc:1690 +#: ../netsync.cc:1430 #, c-format msgid "received 'bye' netcmd\n" msgstr "" -#: netsync.cc:1698 +#: ../netsync.cc:1438 #, fuzzy, c-format msgid "received network error: %s" msgstr "erreur réseau : %s" -#: netsync.cc:1715 +#. we received *no* refinements on this level -- or we ran out of +#. levels -- so refinement for this type is finished. +#: ../netsync.cc:1455 #, c-format msgid "received 'done' for empty %s level %d, marking as complete\n" msgstr "" -#: netsync.cc:1737 +#. we *did* receive some refinements on this level, reset to zero and +#. queue an echo of the 'done' marker. +#: ../netsync.cc:1477 #, c-format msgid "" "received 'done' for %s level %d, which had refinements; sending echo of done " "for level %d\n" msgstr "" -#: netsync.cc:1770 +#: ../netsync.cc:1510 #, c-format msgid "server key has name %s, hash %s\n" -msgstr "" +msgstr "le nom du serveur est %s, et son hachi %s :)\n" -#: netsync.cc:1778 +#: ../netsync.cc:1518 #, c-format msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -3391,1532 +3480,1651 @@ "I expected %s\n" "'monotone unset %s %s' overrides this check\n" msgstr "" +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" +"@ ATTENTION : L'IDENTIFICATION DU SERVEUR A CHANGÉE @\n" +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" +"IL EST POSSIBLE QUE QUELQU'UN SOIT ENTRAIN DE FAIRE\n" +"QUELQUE CHOSE DE MÉCHANT\n" +"il est également possible que la clef du serveur ait juste\n" +"changée\n" +"l'hôte distant a envoyée la clef %s\n" +"j'attendais %s\n" +"« monotone unset %s %s » pour passer outre cette verification\n" -#: netsync.cc:1788 +#: ../netsync.cc:1528 #, c-format msgid "server key changed" -msgstr "" +msgstr "la clef du serveur a changée" -#: netsync.cc:1793 +#: ../netsync.cc:1533 #, c-format msgid "" "first time connecting to server %s\n" "I'll assume it's really them, but you might want to double-check\n" "their key's fingerprint: %s\n" msgstr "" +"Première connexion au serveur %s\n" +"Je considère qu'il s'agit vraiment de lui, mais vous devriez peut-être re-" +"vérifier l'empreinte de leur clef : %s\n" -#: netsync.cc:1800 +#: ../netsync.cc:1540 #, c-format msgid "saving public key for %s to database\n" msgstr "" -#: netsync.cc:1807 +#: ../netsync.cc:1547 #, c-format msgid "received 'hello' netcmd from server '%s' with nonce '%s'\n" msgstr "" -#: netsync.cc:1888 +#: ../netsync.cc:1628 #, c-format msgid "rejected attempt at anonymous connection for write\n" msgstr "" -#: netsync.cc:1895 +#: ../netsync.cc:1635 #, c-format msgid "rejected attempt at anonymous connection while running as sink\n" msgstr "" -#: netsync.cc:1912 +#: ../netsync.cc:1652 #, c-format msgid "anonymous access to branch '%s' denied by server" -msgstr "" +msgstr "accès anonyme à la branche « %s » refusé par le serveur" -#: netsync.cc:1917 +#: ../netsync.cc:1657 #, c-format msgid "allowed anonymous read permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:1949 +#: ../netsync.cc:1689 #, c-format msgid "detected replay attack in auth netcmd\n" msgstr "" -#: netsync.cc:1970 +#: ../netsync.cc:1714 #, c-format msgid "remote public key hash '%s' is unknown\n" msgstr "" -#: netsync.cc:1986 +#: ../netsync.cc:1731 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " "sink\n" msgstr "" -#: netsync.cc:2002 +#: ../netsync.cc:1747 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n" msgstr "" -#: netsync.cc:2004 +#: ../netsync.cc:1749 #, c-format msgid "access to branch '%s' denied by server" msgstr "accès à la branche « %s » refusé par le serveur" -#: netsync.cc:2012 +#. if we're source_and_sink_role, continue even with no branches readable +#. ex: serve --db=empty.db +#: ../netsync.cc:1757 #, c-format msgid "allowed '%s' read permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:2021 +#: ../netsync.cc:1766 #, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " "source\n" msgstr "" -#: netsync.cc:2029 +#: ../netsync.cc:1774 #, c-format msgid "denied '%s' write permission for '%s' excluding '%s'\n" -msgstr "" +msgstr "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n" -#: netsync.cc:2035 +#: ../netsync.cc:1780 #, c-format msgid "allowed '%s' write permission for '%s' excluding '%s'\n" -msgstr "" +msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n" -#: netsync.cc:2050 +#. get our private key and sign back +#: ../netsync.cc:1795 #, c-format msgid "client signature OK, accepting authentication\n" -msgstr "" +msgstr "signature du client 0K, authentification acceptée\n" -#: netsync.cc:2072 +#: ../netsync.cc:1817 #, c-format msgid "bad client signature\n" -msgstr "" +msgstr "signature du client invalide\n" -#: netsync.cc:2087 +#. nb. this->role is our role, the server is in the opposite role +#: ../netsync.cc:1832 #, c-format msgid "" "received 'confirm' netcmd from server '%s' for pattern '%s' exclude '%s' in %" "s mode\n" msgstr "" -#: netsync.cc:2089 netsync.cc:3070 netsync.cc:3101 +#: ../netsync.cc:1834 ../netsync.cc:2831 ../netsync.cc:2862 msgid "source and sink" -msgstr "" +msgstr "source et puit" -#: netsync.cc:2090 netsync.cc:3071 netsync.cc:3102 +#: ../netsync.cc:1835 ../netsync.cc:2832 ../netsync.cc:2863 msgid "sink" -msgstr "" +msgstr "puit" -#: netsync.cc:2090 netsync.cc:3071 netsync.cc:3102 +#: ../netsync.cc:1835 ../netsync.cc:2832 ../netsync.cc:2863 msgid "source" -msgstr "" +msgstr "source" -#: netsync.cc:2103 +#: ../netsync.cc:1848 #, c-format msgid "server signature OK, accepting authentication\n" -msgstr "" +msgstr "signature du serveur 0K, authentification acceptée\n" -#: netsync.cc:2108 +#: ../netsync.cc:1853 #, c-format msgid "bad server signature\n" -msgstr "" +msgstr "signature du serveur invalide\n" -#: netsync.cc:2113 +#: ../netsync.cc:1858 #, c-format msgid "unknown server key\n" -msgstr "" +msgstr "clef du serveur inconnue\n" -#: netsync.cc:2182 +#: ../netsync.cc:1927 #, c-format msgid "epoch with hash '%s' does not exist in our database" msgstr "" -#: netsync.cc:2192 +#: ../netsync.cc:1937 #, c-format msgid "public key '%s' is also called '%s'\n" msgstr "" -#: netsync.cc:2211 +#: ../netsync.cc:1956 #, c-format msgid "revision '%s' does not exist in our database" msgstr "" -#: netsync.cc:2225 +#: ../netsync.cc:1970 #, c-format msgid "manifest '%s' does not exist in our database" msgstr "" -#: netsync.cc:2239 +#: ../netsync.cc:1984 #, c-format msgid "file '%s' does not exist in our database" msgstr "" -#: netsync.cc:2253 +#: ../netsync.cc:1998 #, c-format msgid "cert '%s' does not exist in our database" msgstr "" -#: netsync.cc:2272 +#: ../netsync.cc:2017 #, c-format msgid "received 'refine' netcmd on %s node '%s', level %d\n" msgstr "" -#: netsync.cc:2277 +#: ../netsync.cc:2022 #, c-format msgid "no corresponding %s merkle node for prefix '%s', level %d\n" msgstr "" -#: netsync.cc:2287 +#. we agree, this slot is empty +#: ../netsync.cc:2032 #, c-format msgid "" "(#0) they have an empty slot %d (in a %s node '%s', level %d, we do not " "have)\n" msgstr "" -#: netsync.cc:2299 +#: ../netsync.cc:2044 #, c-format msgid "" "(#0) they have a live leaf at slot %d (in a %s node '%s', level %d, we do " "not have)\n" msgstr "" -#: netsync.cc:2301 +#: ../netsync.cc:2046 #, c-format msgid "(#0) requesting their %s leaf %s\n" msgstr "" -#: netsync.cc:2308 +#. we cannot ask for what they have, it is dead +#: ../netsync.cc:2053 #, c-format msgid "" "(#0) they have a dead leaf at slot %d (in a %s node '%s', level %d, we do " "not have)\n" msgstr "" -#: netsync.cc:2316 +#. they have a subtree; might as well ask for that +#: ../netsync.cc:2061 #, c-format msgid "" "(#0) they have a subtree at slot %d (in a %s node '%s', level %d, we do not " "have)\n" msgstr "" -#: netsync.cc:2332 +#. we have a corresponding merkle node. there are 16 branches +#. to the following switch condition. it is awful. sorry. +#: ../netsync.cc:2077 #, c-format msgid "found corresponding %s merkle node for prefix '%s', level %d\n" msgstr "" -#: netsync.cc:2346 +#. 1: theirs == empty, ours == empty +#: ../netsync.cc:2091 #, c-format msgid "" "(#1) they have an empty slot %d in %s node '%s', level %d, and so do we\n" msgstr "" -#: netsync.cc:2353 +#. 2: theirs == empty, ours == live +#: ../netsync.cc:2098 #, c-format msgid "" "(#2) they have an empty slot %d in %s node '%s', level %d, we have a live " "leaf\n" msgstr "" -#: netsync.cc:2367 +#. 3: theirs == empty, ours == dead +#: ../netsync.cc:2112 #, c-format msgid "" "(#3) they have an empty slot %d in %s node '%s', level %d, we have a dead " "leaf\n" msgstr "" -#: netsync.cc:2374 +#. 4: theirs == empty, ours == subtree +#: ../netsync.cc:2119 #, c-format msgid "" "(#4) they have an empty slot %d in %s node '%s', level %d, we have a " "subtree\n" msgstr "" -#: netsync.cc:2401 +#. 5: theirs == live, ours == empty +#: ../netsync.cc:2146 #, c-format msgid "" "(#5) they have a live leaf at slot %d in %s node '%s', level %d, we have " "nothing\n" msgstr "" -#: netsync.cc:2412 +#. 6: theirs == live, ours == live +#: ../netsync.cc:2157 #, c-format msgid "(#6) they have a live leaf at slot %d in %s node '%s', and so do we\n" msgstr "" -#: netsync.cc:2422 +#: ../netsync.cc:2167 #, c-format msgid "(#6) we both have live %s leaf '%s'\n" msgstr "" -#: netsync.cc:2438 +#. 7: theirs == live, ours == dead +#: ../netsync.cc:2183 #, c-format msgid "" "(#7) they have a live leaf at slot %d in %s node %s, level %d, we have a " "dead one\n" msgstr "" -#: netsync.cc:2448 +#: ../netsync.cc:2193 #, c-format msgid "(#7) it's the same %s leaf '%s', but ours is dead\n" msgstr "" -#: netsync.cc:2461 +#. 8: theirs == live, ours == subtree +#: ../netsync.cc:2206 #, c-format msgid "" "(#8) they have a live leaf in slot %d of %s node '%s', level %d, we have a " "subtree\n" msgstr "" -#: netsync.cc:2470 +#: ../netsync.cc:2215 #, c-format msgid "" "(#8) we have a copy of their live leaf '%s' in slot %d of %s node '%s', " "level %d\n" msgstr "" -#: netsync.cc:2474 +#: ../netsync.cc:2219 #, c-format msgid "" "(#8) requesting a copy of their live leaf '%s' in slot %d of %s node '%s', " "level %d\n" msgstr "" -#: netsync.cc:2479 +#: ../netsync.cc:2224 #, c-format msgid "" "(#8) sending our subtree for refinement, in slot %d of %s node '%s', level %" "d\n" msgstr "" -#: netsync.cc:2502 +#. 9: theirs == dead, ours == empty +#: ../netsync.cc:2247 #, c-format msgid "" "(#9) they have a dead leaf at slot %d in %s node '%s', level %d, we have " "nothing\n" msgstr "" -#: netsync.cc:2509 +#. 10: theirs == dead, ours == live +#: ../netsync.cc:2254 #, c-format msgid "" "(#10) they have a dead leaf at slot %d in %s node '%s', level %d, we have a " "live one\n" msgstr "" -#: netsync.cc:2519 +#: ../netsync.cc:2264 #, c-format msgid "(#10) we both have %s leaf %s, theirs is dead\n" msgstr "" -#: netsync.cc:2535 +#. 11: theirs == dead, ours == dead +#: ../netsync.cc:2280 #, c-format msgid "" "(#11) they have a dead leaf at slot %d in %s node '%s', level %d, so do we\n" msgstr "" -#: netsync.cc:2542 +#. theirs == dead, ours == subtree +#: ../netsync.cc:2287 #, c-format msgid "" "(#12) they have a dead leaf in slot %d of %s node '%s', we have a subtree\n" msgstr "" -#: netsync.cc:2565 +#. 13: theirs == subtree, ours == empty +#: ../netsync.cc:2310 #, c-format msgid "" "(#13) they have a subtree at slot %d in %s node '%s', level %d, we have " "nothing\n" msgstr "" -#: netsync.cc:2578 +#. 14: theirs == subtree, ours == live +#: ../netsync.cc:2323 #, c-format msgid "" "(#14) they have a subtree at slot %d in %s node '%s', level %d, we have a " "live leaf\n" msgstr "" -#: netsync.cc:2590 +#: ../netsync.cc:2335 #, c-format msgid "(#14) pushed our leaf '%s' into fake subtree slot %d, level %d\n" msgstr "" -#: netsync.cc:2602 +#. 15: theirs == subtree, ours == dead +#: ../netsync.cc:2347 #, c-format msgid "" "(#15) they have a subtree at slot %d in %s node '%s', level %d, we have a " "dead leaf\n" msgstr "" -#: netsync.cc:2621 +#. 16: theirs == subtree, ours == subtree +#: ../netsync.cc:2366 #, c-format msgid "" "(#16) they have a subtree at slot %d in %s node '%s', level %d, and so do " "we\n" msgstr "" -#: netsync.cc:2631 +#: ../netsync.cc:2376 #, c-format msgid "(#16) we both have %s subtree '%s'\n" msgstr "" -#: netsync.cc:2636 +#: ../netsync.cc:2381 #, c-format msgid "(#16) %s subtrees at slot %d differ, refining ours\n" msgstr "" -#: netsync.cc:2663 +#: ../netsync.cc:2408 #, c-format msgid "received 'send_data' netcmd requesting %s '%s'\n" msgstr "" -#: netsync.cc:2691 +#: ../netsync.cc:2436 #, c-format msgid "received 'send_delta' netcmd requesting %s edge '%s' -> '%s'\n" msgstr "" -#: netsync.cc:2745 +#: ../netsync.cc:2490 #, c-format msgid "delta requested for item type %s\n" msgstr "" -#: netsync.cc:2768 +#: ../netsync.cc:2513 #, c-format msgid "epoch '%s' already exists in our database\n" msgstr "" -#: netsync.cc:2775 +#: ../netsync.cc:2520 #, c-format msgid "received epoch %s for branch %s\n" msgstr "" -#: netsync.cc:2782 +#: ../netsync.cc:2527 #, c-format msgid "branch %s has no epoch; setting epoch to %s\n" msgstr "" -#: netsync.cc:2788 +#: ../netsync.cc:2533 #, c-format msgid "branch %s already has an epoch; checking\n" msgstr "" -#: netsync.cc:2799 +#. 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:2544 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." msgstr "" -#: netsync.cc:2810 +#: ../netsync.cc:2555 #, c-format msgid "public key '%s' already exists in our database\n" -msgstr "" +msgstr "la clef publique « %s » existe déjà dans notre base de données\n" -#: netsync.cc:2819 +#: ../netsync.cc:2564 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" msgstr "" -#: netsync.cc:2828 +#: ../netsync.cc:2573 #, c-format msgid "cert '%s' already exists in our database\n" -msgstr "" +msgstr "le certificat « %s » existe déjà dans notre base de données\n" -#: netsync.cc:2836 +#: ../netsync.cc:2581 #, c-format msgid "hash check failed for revision cert '%s'" msgstr "" -#: netsync.cc:2852 +#: ../netsync.cc:2597 #, c-format msgid "revision '%s' already exists in our database\n" msgstr "la révision « %s » existe déjà dans notre base de données\n" -#: netsync.cc:2855 +#: ../netsync.cc:2600 #, fuzzy, c-format msgid "received revision '%s'\n" msgstr "erreur réseau : %s" -#: netsync.cc:2874 +#: ../netsync.cc:2619 #, c-format msgid "manifest version '%s' already exists in our database\n" msgstr "" +"la version du manifeste « %s » existe déjà dans notre base de données\n" -#: netsync.cc:2889 +#: ../netsync.cc:2634 #, c-format msgid "file version '%s' already exists in our database\n" -msgstr "" +msgstr "la version « %s » du fichier existe déjà dans notre base de données\n" -#: netsync.cc:2959 +#: ../netsync.cc:2720 #, c-format msgid "ignoring delta received for item type %s\n" msgstr "" -#: netsync.cc:2973 +#: ../netsync.cc:2734 #, c-format msgid "received 'nonexistant' netcmd for %s '%s'\n" msgstr "" -#: netsync.cc:2985 +#: ../netsync.cc:2746 #, fuzzy, c-format msgid "Received warning from usher: %s" msgstr "erreur réseau : %s" -#: netsync.cc:2987 +#: ../netsync.cc:2748 #, fuzzy, c-format msgid "Received greeting from usher: %s" msgstr "erreur réseau : %s" -#: netsync.cc:2992 +#: ../netsync.cc:2753 #, c-format msgid "Sent reply." -msgstr "" +msgstr "Réponse envoyée." -#: netsync.cc:3067 +#: ../netsync.cc:2828 #, c-format msgid "" "received 'anonymous' netcmd from client for pattern '%s' excluding '%s' in %" "s mode\n" msgstr "" -#: netsync.cc:3098 +#: ../netsync.cc:2859 #, c-format msgid "" "received 'auth(hmac)' netcmd from client '%s' for pattern '%s' exclude '%s' " "in %s mode with nonce1 '%s'\n" msgstr "" -#: netsync.cc:3274 +#: ../netsync.cc:3031 #, c-format msgid "processing %d byte input buffer from peer %s\n" msgstr "" -#: netsync.cc:3277 +#: ../netsync.cc:3034 #, c-format msgid "input buffer for peer %s is overfull after netcmd dispatch\n" msgstr "" -#: netsync.cc:3284 netsync.cc:3318 netsync.cc:3345 +#: ../netsync.cc:3038 #, c-format +msgid "failed to process '%s' packet" +msgstr "échec du traitement du paquet « %s »" + +#: ../netsync.cc:3043 ../netsync.cc:3077 ../netsync.cc:3104 +#, c-format msgid "protocol error while processing peer %s: '%s'\n" msgstr "" -#: netsync.cc:3304 +#. FIXME: split into labels and convert to ace here. +#: ../netsync.cc:3063 #, c-format msgid "connecting to %s\n" msgstr "connexion à %s\n" -#: netsync.cc:3331 +#: ../netsync.cc:3090 #, c-format msgid "timed out waiting for I/O with peer %s, disconnecting\n" msgstr "" -#: netsync.cc:3353 -#, c-format +#: ../netsync.cc:3112 +#, fuzzy, c-format msgid "read from fd %d (peer %s) closed OK after goodbye\n" -msgstr "lecture depuis le fd %d (pair %s) fermée OK après aurevoir\n" +msgstr "la lecture du fd %d (pair %s) fermée OK après aurevoir\n" -#: netsync.cc:3355 +#: ../netsync.cc:3114 #, c-format msgid "read from fd %d (peer %s) failed, disconnecting\n" -msgstr "" +msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n" -#: netsync.cc:3365 +#: ../netsync.cc:3124 #, c-format msgid "write on fd %d (peer %s) closed OK after goodbye\n" -msgstr "" +msgstr "la écriture du fd %d (pair %s) a échouée, déconnexion\n" -#: netsync.cc:3367 +#: ../netsync.cc:3126 #, c-format msgid "write on fd %d (peer %s) failed, disconnecting\n" msgstr "" -#: netsync.cc:3374 +#: ../netsync.cc:3133 #, c-format msgid "got OOB data on fd %d (peer %s), disconnecting\n" msgstr "" -#: netsync.cc:3383 +#: ../netsync.cc:3142 #, c-format msgid "terminated exchange with %s\n" msgstr "échange avorté avec %s\n" -#: netsync.cc:3391 +#: ../netsync.cc:3150 #, c-format msgid "successful exchange with %s\n" msgstr "échange réussi avec %s\n" -#: netsync.cc:3412 +#: ../netsync.cc:3171 #, c-format msgid "fd %d is armed\n" msgstr "" -#: netsync.cc:3419 +#: ../netsync.cc:3178 #, c-format msgid "protocol error while processing peer %s: '%s', marking as bad\n" msgstr "" -#: netsync.cc:3441 +#: ../netsync.cc:3200 #, c-format msgid "accepting new connection on %s : %s\n" -msgstr "" +msgstr "nouvelle connexion sur %s : %s\n" -#: netsync.cc:3447 +#: ../netsync.cc:3206 #, c-format msgid "accept() returned a dead client\n" msgstr "accept() à renvoyée un client mort\n" -#: netsync.cc:3451 -#, c-format -msgid "accepted new client connection from %s\n" -msgstr "" +#: ../netsync.cc:3210 +#, fuzzy, c-format +msgid "accepted new client connection from %s : %s\n" +msgstr "connexion d'un nouveau client de %s\n" -#: netsync.cc:3478 +#: ../netsync.cc:3238 #, c-format msgid "protocol error while processing peer %s: '%s', disconnecting\n" msgstr "" -#: netsync.cc:3486 +#: ../netsync.cc:3246 #, c-format msgid "fd %d (peer %s) read failed, disconnecting\n" msgstr "la lecture sur le fd %d (pair %s) a échouée, déconnexion\n" -#: netsync.cc:3502 +#: ../netsync.cc:3262 #, c-format msgid "fd %d (peer %s) write failed, disconnecting\n" msgstr "l'écriture sur le fd %d (pair %s) a échouée, déconnexion\n" -#: netsync.cc:3526 +#: ../netsync.cc:3286 #, c-format msgid "fd %d (peer %s) processing finished, disconnecting\n" msgstr "traitement du fd %d (pair %s) terminé, déconnexion\n" -#: netsync.cc:3548 +#: ../netsync.cc:3308 #, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting\n" msgstr "le fd %d (pair %s) est inactif depuis trop longtemps, déconnexion\n" -#: netsync.cc:3554 +#: ../netsync.cc:3314 #, c-format msgid "fd %d (peer %s) exchanged goodbyes and flushed output, disconnecting\n" msgstr "" -#: netsync.cc:3585 -#, c-format +#: ../netsync.cc:3354 +#, fuzzy, c-format msgid "beginning service on %s : %s\n" -msgstr "" +msgstr "début du service sur %s : %d\n" -#: netsync.cc:3599 +#: ../netsync.cc:3366 #, c-format msgid "session limit %d reached, some connections will be refused\n" msgstr "" -#: netsync.cc:3605 +#: ../netsync.cc:3372 #, c-format msgid "i/o probe with %d armed\n" msgstr "" -#: netsync.cc:3615 +#: ../netsync.cc:3382 #, c-format msgid "timed out waiting for I/O (listening on %s : %s)\n" msgstr "" -#: netsync.cc:3631 +#: ../netsync.cc:3398 #, c-format msgid "got woken up for action on unknown fd %d\n" msgstr "" -#: netsync.cc:3646 +#: ../netsync.cc:3413 #, c-format msgid "got some OOB data on fd %d (peer %s), disconnecting\n" msgstr "" -#: netsync.cc:3708 +#: ../netsync.cc:3475 #, c-format msgid "finding items to synchronize:\n" msgstr "recherche d'éléments à synchroniser :\n" -#: netsync.cc:3711 +#: ../netsync.cc:3478 #, c-format msgid "including branch %s" msgstr "inclusion de la branche %s" -#: netsync.cc:3763 +#: ../netsync.cc:3537 #, c-format msgid "setting epoch on %s to zero\n" msgstr "" -#: netsync.cc:3853 netsync.cc:3858 +#: ../netsync.cc:3586 #, c-format +msgid "Cannot find key '%s'" +msgstr "Impossible de trouver la clef « %s »" + +#: ../netsync.cc:3640 ../netsync.cc:3644 +#, c-format msgid "network error: %s" msgstr "erreur réseau : %s" -#: packet.cc:325 +#: ../netsync.cc:3698 #, c-format +msgid "ancestry_fetcher: got %d heads" +msgstr "" + +#: ../netsync.cc:3808 +#, c-format +msgid "traversing head %s" +msgstr "" + +#: ../packet.cc:329 +#, c-format msgid "writing delayed revision data packet for %s\n" msgstr "" -#: packet.cc:332 +#: ../packet.cc:336 #, c-format msgid "discarding revision data packet %s with unmet dependencies\n" msgstr "" -#: packet.cc:338 +#: ../packet.cc:342 #, c-format msgid "writing delayed manifest data packet for %s\n" msgstr "" -#: packet.cc:345 +#: ../packet.cc:349 #, c-format msgid "discarding manifest data packet %s with unmet dependencies\n" msgstr "" -#: packet.cc:351 +#: ../packet.cc:355 #, c-format msgid "writing delayed file data packet for %s\n" msgstr "" -#: packet.cc:364 +#: ../packet.cc:368 #, c-format -msgid "writing delayed manifest %s packet for %s -> %s\n" +msgid "writing delayed manifest %s packet for %s -> %s%s\n" msgstr "" -#: packet.cc:377 +#: ../packet.cc:382 #, c-format msgid "discarding manifest delta packet %s -> %s with unmet dependencies\n" msgstr "" -#: packet.cc:384 +#: ../packet.cc:389 #, c-format -msgid "writing delayed file %s packet for %s -> %s\n" +msgid "writing delayed file %s packet for %s -> %s%s\n" msgstr "" -#: packet.cc:397 +#: ../packet.cc:403 #, c-format msgid "discarding file delta packet %s -> %s with unmet dependencies\n" msgstr "" -#: packet.cc:404 +#: ../packet.cc:410 #, c-format msgid "writing delayed revision cert on %s\n" msgstr "" -#: packet.cc:411 +#: ../packet.cc:417 #, c-format msgid "discarding revision cert packet %s with unmet dependencies\n" msgstr "" -#: packet.cc:418 +#: ../packet.cc:424 #, c-format msgid "writing delayed public key %s\n" msgstr "" -#: packet.cc:431 +#: ../packet.cc:437 #, c-format msgid "writing delayed private key %s\n" msgstr "" -#: packet.cc:601 +#: ../packet.cc:607 #, c-format msgid "noting acceptence of revision %s\n" msgstr "" -#: packet.cc:614 +#: ../packet.cc:620 #, c-format msgid "noting acceptence of manifest %s\n" msgstr "" -#: packet.cc:627 +#: ../packet.cc:633 #, c-format msgid "noting acceptence of file %s\n" msgstr "" -#: packet.cc:649 +#: ../packet.cc:655 #, c-format msgid "skipping existing file version %s\n" msgstr "" -#: packet.cc:677 +#: ../packet.cc:695 #, c-format msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n" msgstr "" -#: packet.cc:683 +#: ../packet.cc:701 #, c-format msgid "delaying file delta %s -> %s for preimage\n" msgstr "" -#: packet.cc:693 +#: ../packet.cc:711 #, c-format msgid "skipping delta to existing file version %s\n" msgstr "" -#: packet.cc:721 +#: ../packet.cc:739 #, c-format msgid "reconstructed file from reverse delta '%s' -> '%s' has wrong id '%s'\n" msgstr "" -#: packet.cc:727 +#: ../packet.cc:745 #, c-format msgid "delaying reverse file delta %s -> %s for preimage\n" msgstr "" -#: packet.cc:737 +#: ../packet.cc:755 #, c-format msgid "skipping reverse delta to existing file version %s\n" msgstr "" -#: packet.cc:754 +#: ../packet.cc:772 #, c-format msgid "skipping existing manifest version %s\n" msgstr "" -#: packet.cc:782 +#: ../packet.cc:813 #, c-format msgid "reconstructed manifest from delta '%s' -> '%s' has wrong id '%s'\n" msgstr "" -#: packet.cc:788 +#: ../packet.cc:819 #, c-format msgid "delaying manifest delta %s -> %s for preimage\n" msgstr "" -#: packet.cc:798 +#: ../packet.cc:829 #, c-format msgid "skipping delta to existing manifest version %s\n" msgstr "" -#: packet.cc:826 +#: ../packet.cc:857 #, c-format msgid "" "reconstructed manifest from reverse delta '%s' -> '%s' has wrong id '%s'\n" msgstr "" -#: packet.cc:832 +#: ../packet.cc:863 #, c-format msgid "delaying manifest reverse delta %s -> %s for preimage\n" msgstr "" -#: packet.cc:842 +#: ../packet.cc:873 #, c-format msgid "skipping reverse delta to existing manifest version %s\n" msgstr "" -#: packet.cc:864 +#: ../packet.cc:895 #, c-format msgid "delaying revision %s for new manifest %s\n" msgstr "" -#: packet.cc:878 +#: ../packet.cc:909 #, c-format msgid "delaying revision %s for old manifest %s\n" msgstr "" -#: packet.cc:888 +#: ../packet.cc:919 #, c-format msgid "delaying revision %s for old revision %s\n" msgstr "" -#: packet.cc:901 +#: ../packet.cc:932 #, c-format msgid "delaying revision %s for old file %s\n" msgstr "" -#: packet.cc:911 +#: ../packet.cc:942 #, c-format msgid "delaying revision %s for new file %s\n" msgstr "" -#: packet.cc:929 +#: ../packet.cc:960 #, c-format msgid "skipping existing revision %s\n" msgstr "" -#: packet.cc:947 +#: ../packet.cc:978 #, c-format msgid "delaying revision cert on %s\n" msgstr "" -#: packet.cc:960 +#: ../packet.cc:991 #, c-format msgid "skipping existing revision cert %s\n" msgstr "" -#: packet.cc:974 +#: ../packet.cc:1005 #, c-format msgid "skipping prohibited public key %s\n" msgstr "" -#: packet.cc:987 +#: ../packet.cc:1018 #, c-format msgid "key '%s' is not equal to key '%s' in database\n" msgstr "" "la clef « %s » n'est pas égale à la clef « %s » dans la base de données\n" -#: packet.cc:988 +#: ../packet.cc:1019 #, c-format msgid "skipping existing public key %s\n" msgstr "" -#: packet.cc:1001 -#, c-format -msgid "skipping prohibited private key %s\n" -msgstr "" +#: ../packet.cc:1032 +#, fuzzy, c-format +msgid "skipping prohibited key pair %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#: packet.cc:1010 -#, c-format -msgid "skipping existing private key %s\n" -msgstr "" +#: ../packet.cc:1041 +#, fuzzy, c-format +msgid "skipping existing key pair %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#: packet.cc:1046 +#: ../packet.cc:1077 #, c-format msgid "packet valve opened\n" msgstr "" -#: packet.cc:1058 +#: ../packet.cc:1089 #, c-format msgid "wrote %i queued packets\n" -msgstr "" +msgstr "écriture de %i paquets en attente\n" -#: packet.cc:1307 +#: ../packet.cc:1360 #, c-format -msgid "read data packet\n" +msgid "malformed packet" +msgstr "paquet malformé" + +#: ../packet.cc:1376 +#, fuzzy, c-format +msgid "read data packet" msgstr "lecture d'un paquet de donnée\n" -#: packet.cc:1329 -#, c-format -msgid "read delta packet\n" +#: ../packet.cc:1396 +#, fuzzy, c-format +msgid "read delta packet" msgstr "lecture d'un paquet delta\n" -#: packet.cc:1360 -#, c-format -msgid "read cert packet\n" -msgstr "" +#: ../packet.cc:1427 +#, fuzzy, c-format +msgid "read cert packet" +msgstr "lecture d'un paquet certificat\n" -#: packet.cc:1386 -#, c-format -msgid "read key data packet\n" -msgstr "" +#: ../packet.cc:1447 +#, fuzzy, c-format +msgid "read pubkey data packet" +msgstr "lecture d'un paquet de données\n" -#: rcs_file.cc:343 +#: ../packet.cc:1456 +#, fuzzy, c-format +msgid "read keypair data packet" +msgstr "lecture d'un paquet de données\n" + +#: ../packet.cc:1466 +#, fuzzy, c-format +msgid "unknown packet type: '%s'" +msgstr "chemin inconnu « %s »\n" + +#: ../rcs_file.cc:343 #, c-format msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n" msgstr "" -#: rcs_file.cc:362 +#: ../rcs_file.cc:362 #, c-format msgid "parse failure %d:%d: expecting word '%s'\n" msgstr "" -#: rcs_file.cc:377 +#: ../rcs_file.cc:377 #, c-format msgid "parse failure %d:%d: expecting word\n" msgstr "" -#: rcs_import.cc:247 +#: ../rcs_import.cc:247 #, c-format msgid "Calculating time of %s\n" msgstr "" -#: rcs_import.cc:281 +#: ../rcs_import.cc:281 #, c-format msgid "version %s -> tag %s\n" msgstr "" -#: rcs_import.cc:448 +#: ../rcs_import.cc:448 #, c-format msgid "skipping identity file edge\n" msgstr "" -#: rcs_import.cc:456 rcs_import.cc:482 +#. we already have a way to get to this old version, +#. no need to insert another reconstruction path +#: ../rcs_import.cc:456 ../rcs_import.cc:482 #, c-format msgid "existing path to %s found, skipping\n" msgstr "" -#: rcs_import.cc:474 +#: ../rcs_import.cc:474 #, c-format msgid "skipping identity manifest edge\n" msgstr "" -#: rcs_import.cc:592 +#: ../rcs_import.cc:592 #, c-format msgid "version %s has %d lines\n" -msgstr "" +msgstr "la version %s a %d lignes\n" -#: rcs_import.cc:605 +#: ../rcs_import.cc:605 #, c-format msgid "following RCS edge %s -> %s\n" msgstr "" -#: rcs_import.cc:608 +#: ../rcs_import.cc:608 #, c-format msgid "constructed RCS version %s, inserting into database\n" msgstr "" -#: rcs_import.cc:651 +#: ../rcs_import.cc:651 #, c-format msgid "following RCS branch %s = '%s'\n" msgstr "" -#: rcs_import.cc:661 +#: ../rcs_import.cc:661 #, c-format msgid "finished RCS branch %s = '%s'\n" msgstr "" -#: rcs_import.cc:682 rcs_import.cc:730 +#: ../rcs_import.cc:682 ../rcs_import.cc:730 #, c-format msgid "parsing RCS file %s\n" msgstr "analyse du fichier RCS %s\n" -#: rcs_import.cc:684 rcs_import.cc:733 +#: ../rcs_import.cc:684 ../rcs_import.cc:733 #, c-format msgid "parsed RCS file %s OK\n" msgstr "analyse du fichier RCS %s OK\n" -#: rcs_import.cc:773 +#: ../rcs_import.cc:773 #, c-format msgid "importing file '%s'\n" msgstr "importation du fichier « %s »\n" -#: rcs_import.cc:845 +#: ../rcs_import.cc:845 #, c-format msgid "first version in branch %s would be %s\n" msgstr "" -#: rcs_import.cc:852 +#: ../rcs_import.cc:852 #, c-format msgid "file branchpoint for %s at %s\n" msgstr "" -#: rcs_import.cc:922 +#: ../rcs_import.cc:922 #, c-format msgid "error reading RCS file %s: %s\n" msgstr "erreur lors de la lecture du fichier RCS %s : %s\n" -#: rcs_import.cc:926 +#: ../rcs_import.cc:926 #, c-format msgid "skipping non-RCS file %s\n" msgstr "" -#: rcs_import.cc:1105 +#: ../rcs_import.cc:1105 #, c-format msgid "examining next commit [t:%d] [p:%s] [a:%s] [c:%s]\n" msgstr "" -#: rcs_import.cc:1118 +#: ../rcs_import.cc:1118 #, c-format msgid "expiring cluster\n" msgstr "" -#: rcs_import.cc:1134 +#: ../rcs_import.cc:1134 #, c-format msgid "examining cluster %d to see if it touched %d\n" msgstr "" -#: rcs_import.cc:1142 +#: ../rcs_import.cc:1142 #, c-format msgid "found cluster touching %d: [t:%d] [a:%d] [c:%d]\n" msgstr "" -#: rcs_import.cc:1150 +#: ../rcs_import.cc:1150 #, c-format msgid "last modification time is %d\n" msgstr "la date de dernière modification est %d\n" -#: rcs_import.cc:1166 +#: ../rcs_import.cc:1166 #, c-format msgid "picked existing cluster [t:%d] [a:%d] [c:%d]\n" msgstr "" -#: rcs_import.cc:1180 +#: ../rcs_import.cc:1180 #, c-format msgid "building new cluster [t:%d] [a:%d] [c:%d]\n" msgstr "" -#: rcs_import.cc:1205 +#. now we are done this lineage; flush all remaining clusters +#: ../rcs_import.cc:1205 #, c-format msgid "finished branch commits, writing all pending clusters\n" msgstr "" -#: rcs_import.cc:1211 +#: ../rcs_import.cc:1211 #, c-format msgid "finished writing pending clusters\n" msgstr "" -#: rcs_import.cc:1223 +#: ../rcs_import.cc:1223 #, c-format msgid "" "%s appears to be a CVS repository root directory\n" "try importing a module instead, with 'cvs_import %s/" msgstr "" -#: rcs_import.cc:1236 +#: ../rcs_import.cc:1235 #, c-format msgid "need base --branch argument for importing" msgstr "" -#: rcs_import.cc:1248 +#: ../rcs_import.cc:1247 #, c-format msgid "path %s does not exist" msgstr "le chemin %s n'existe pas" -#: rcs_import.cc:1267 +#: ../rcs_import.cc:1266 #, c-format msgid "branch %s has %d entries\n" -msgstr "" +msgstr "la branche %s a %d entrées\n" -#: rcs_import.cc:1277 +#: ../rcs_import.cc:1276 #, c-format msgid "trunk has %d entries\n" msgstr "" -#: rcs_import.cc:1284 +#: ../rcs_import.cc:1283 msgid "tags" msgstr "" -#: rcs_import.cc:1330 +#: ../rcs_import.cc:1329 #, c-format msgid "initial cluster on branch %s has %d live entries\n" msgstr "" -#: rcs_import.cc:1337 +#: ../rcs_import.cc:1336 #, c-format msgid "initial cluster contains %s at %s\n" msgstr "" -#: rcs_import.cc:1383 +#: ../rcs_import.cc:1382 #, c-format msgid "storing manifest '%s' (base %s)\n" msgstr "" -#: rcs_import.cc:1388 +#: ../rcs_import.cc:1387 #, c-format msgid "storing head %s\n" msgstr "" -#: rcs_import.cc:1403 +#: ../rcs_import.cc:1402 #, c-format msgid "skipping delta to null manifest\n" msgstr "" -#: rcs_import.cc:1415 +#: ../rcs_import.cc:1414 #, c-format msgid "skipping cyclical manifest delta %s -> %s\n" msgstr "" -#: rcs_import.cc:1421 +#: ../rcs_import.cc:1420 #, c-format msgid "writing full manifest %s\n" msgstr "" -#: rcs_import.cc:1431 +#: ../rcs_import.cc:1430 #, c-format msgid "storing manifest delta %s -> %s\n" msgstr "" -#: rcs_import.cc:1493 +#: ../rcs_import.cc:1492 #, c-format msgid "adding entry state '%s' on '%s'\n" msgstr "" -#: rcs_import.cc:1500 +#: ../rcs_import.cc:1499 #, c-format msgid "applying state delta on '%s' : '%s' -> '%s'\n" msgstr "" -#: rcs_import.cc:1511 +#: ../rcs_import.cc:1510 #, c-format msgid "deleting entry state '%s' on '%s'\n" msgstr "" -#: rcs_import.cc:1530 +#: ../rcs_import.cc:1529 #, c-format msgid "BEGIN consume_cluster()\n" msgstr "" -#: rcs_import.cc:1550 +#: ../rcs_import.cc:1549 #, c-format msgid "END consume_cluster('%s') (parent '%s')\n" msgstr "" -#: revision.cc:126 +#: ../revision.cc:126 #, c-format msgid "verifying new revisions (this may take a while)\n" msgstr "vérification des nouvelles révisions (ceci peut prendre du temps)\n" -#: revision.cc:128 +#: ../revision.cc:128 #, c-format msgid "Verifying revision %s has sane history (to depth %i)\n" msgstr "" -#: revision.cc:166 +#: ../revision.cc:166 #, c-format msgid "Examining %s -> %s\n" msgstr "" -#: revision.cc:243 +#: ../revision.cc:243 #, c-format msgid "%s and %s have no common ancestor, so done\n" msgstr "" -#: revision.cc:249 +#: ../revision.cc:249 #, c-format msgid "already checked common ancestor, so done\n" msgstr "" -#: revision.cc:252 +#: ../revision.cc:252 #, c-format msgid "%s is a merge; verifying paths to common ancestor %s are sane\n" msgstr "" -#: revision.cc:310 +#: ../revision.cc:310 #, c-format msgid "loading parents for node %d\n" msgstr "" -#: revision.cc:332 +#: ../revision.cc:332 #, c-format msgid "parent %s -> node %d\n" msgstr "parent %s -> noeud %d\n" -#: revision.cc:482 +#: ../revision.cc:482 #, c-format msgid "found %d intersecting nodes\n" msgstr "" -#: revision.cc:535 +#: ../revision.cc:535 #, c-format msgid "searching for common ancestor, left=%s right=%s\n" msgstr "" -#: revision.cc:540 +#: ../revision.cc:540 #, c-format msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n" msgstr "" -#: revision.cc:545 +#: ../revision.cc:545 #, c-format msgid "found node %d, ancestor of left %s and dominating right %s\n" msgstr "" -#: revision.cc:552 +#: ../revision.cc:552 #, c-format msgid "found node %d, ancestor of right %s and dominating left %s\n" msgstr "" -#: revision.cc:589 +#: ../revision.cc:589 #, c-format msgid "searching for least common ancestor, left=%s right=%s\n" msgstr "" -#: revision.cc:593 +#: ../revision.cc:593 #, c-format msgid "least common ancestor scan [par=%d,anc=%d]\n" msgstr "" -#: revision.cc:598 +#: ../revision.cc:598 #, c-format msgid "found node %d, ancestor of left %s and right %s\n" msgstr "" -#: revision.cc:652 +#: ../revision.cc:652 #, c-format msgid "checking whether %s is an ancestor of %s\n" -msgstr "" +msgstr "vérification si %s est un ancêtre de %s\n" -#: revision.cc:764 +#. now stick them in our ordering (if wanted) and remove them from the +#. graph, calculating the new roots as we go +#: ../revision.cc:764 #, c-format msgid "new root: %s\n" msgstr "nouvelle racine : %s\n" -#: revision.cc:779 +#: ../revision.cc:779 #, c-format msgid "new leaf: %s\n" msgstr "nouvelle feuille : %s\n" -#: revision.cc:921 +#: ../revision.cc:921 #, c-format msgid "exploring changesets from parents of %s, seeking towards %s\n" msgstr "" -#: revision.cc:934 +#: ../revision.cc:934 #, c-format msgid "considering parent %s of %s\n" msgstr "" -#: revision.cc:960 +#: ../revision.cc:960 #, c-format msgid "revision %s is relevant, composing with edge to %s\n" msgstr "" -#: revision.cc:967 +#: ../revision.cc:967 #, c-format msgid "parent %s of %s is not relevant\n" msgstr "" -#: revision.cc:1003 +#: ../revision.cc:1003 #, c-format msgid "adding parents of %s to subgraph\n" msgstr "" -#: revision.cc:1013 +#: ../revision.cc:1013 #, c-format msgid "found parent %s of %s\n" msgstr "" -#: revision.cc:1017 +#: ../revision.cc:1017 #, c-format msgid "adding parent %s to next frontier\n" msgstr "" -#: revision.cc:1032 +#: ../revision.cc:1032 #, c-format msgid "calculating composite changeset between %s and %s\n" msgstr "" -#: revision.cc:1050 +#: ../revision.cc:1050 #, c-format msgid "calculating changeset from %s to %s\n" msgstr "" -#: revision.cc:1054 +#: ../revision.cc:1054 #, c-format msgid "no common ancestor for %s and %s\n" -msgstr "" +msgstr "pas d'ancêtre commun pour « %s » et « %s »\n" -#: revision.cc:1055 +#: ../revision.cc:1055 #, c-format msgid "common ancestor is %s\n" msgstr "l'ancêtre commun est %s\n" -#: revision.cc:1086 +#: ../revision.cc:1086 #, c-format msgid "analyzing manifest changes from '%s' -> '%s'\n" msgstr "" -#: revision.cc:1099 +#: ../revision.cc:1099 #, c-format msgid "splitting ancestry for file %s\n" msgstr "" -#: revision.cc:1166 +#: ../revision.cc:1166 #, c-format msgid "noting ancestry from child %d -> parent %d\n" msgstr "" -#: revision.cc:1199 +#: ../revision.cc:1199 #, c-format msgid "setting epoch for %s to %s\n" msgstr "" -#: revision.cc:1255 +#. This method is, as the name suggests, a kluge. It exists because in the +#. 0.17 timeframe, monotone's ancestry graph has several nodes with 3 +#. parents. This isn't, in principle, necessarily a bad thing; having 3 +#. parents is reasonably well defined, I don't know of much code that is +#. dependent on revisions having only 2 parents, etc. But it is a very +#. weird thing, that we would never under any circumstances create today, +#. and it only exists as a side-effect of the pre-changeset days. In the +#. future we may decide to allow 3+-parent revisions; we may decide to +#. disallow it. Right now, I'd rather keep options open. +#. We remove only edges that are "redundant" (i.e., already weird...). +#. These are also something that we currently refuse to produce -- when a +#. node has more than one parent, and one parent is an ancestor of another. +#. These edges, again, only exist because of weirdnesses in the +#. pre-changeset days, and are not particularly meaningful. Again, we may +#. decide in the future to use them for some things, but... +#. FIXME: remove this method eventually, since it is (mildly) destructive on +#. history, and isn't really doing anything that necessarily needs to happen +#. anyway. +#: ../revision.cc:1255 #, c-format msgid "scanning for nodes with 3+ parents\n" msgstr "" -#: revision.cc:1296 +#: ../revision.cc:1296 #, c-format msgid "optimizing out redundant edge %i -> %i\n" msgstr "" -#: revision.cc:1323 +#: ../revision.cc:1323 #, c-format msgid "rebuilding %d nodes\n" msgstr "" -#: revision.cc:1360 +#: ../revision.cc:1360 #, c-format msgid "node %d = manifest %s\n" msgstr "" -#: revision.cc:1371 +#: ../revision.cc:1371 #, c-format msgid "loaded '%s' manifest cert for node %s\n" msgstr "" -#: revision.cc:1399 +#: ../revision.cc:1399 #, c-format msgid "node %d = revision %s = manifest %s\n" msgstr "noeud %d = révision %s = manifeste %s\n" -#: revision.cc:1411 +#: ../revision.cc:1411 #, c-format msgid "loaded '%s' revision cert for node %s\n" msgstr "" -#: revision.cc:1435 +#: ../revision.cc:1435 #, c-format msgid "processing node %d\n" msgstr "" -#: revision.cc:1439 +#: ../revision.cc:1439 #, c-format msgid "node %d already processed, skipping\n" msgstr "" -#: revision.cc:1453 +#: ../revision.cc:1453 #, c-format msgid "node %d is a root node\n" -msgstr "" +msgstr "le noeud %d est un noeud racine\n" -#: revision.cc:1469 revision.cc:1552 +#: ../revision.cc:1469 ../revision.cc:1552 #, c-format msgid "parent node %d = revision %s\n" msgstr "" -#: revision.cc:1531 +#: ../revision.cc:1531 #, c-format msgid "processing edge from child %d -> parent %d\n" msgstr "" -#: revision.cc:1569 +#: ../revision.cc:1569 #, c-format msgid "mapped node %d to revision %s\n" msgstr "" -#: revision.cc:1575 +#: ../revision.cc:1575 #, c-format msgid "skipping already existing revision %s\n" msgstr "" -#: revision.cc:1587 +#: ../revision.cc:1587 #, c-format msgid "rebuilding revision graph from existing graph\n" msgstr "" -#: revision.cc:1620 +#: ../revision.cc:1619 #, c-format msgid "rebuilding revision graph from manifest certs\n" msgstr "" -#: sanity.cc:37 +#: ../sanity.cc:38 #, c-format msgid "started up on %s\n" msgstr "" -#: sanity.cc:53 +#: ../sanity.cc:54 #, c-format msgid "wrote debugging log to %s" msgstr "" -#: sanity.cc:56 +#: ../sanity.cc:57 #, c-format msgid "failed to write debugging log to %s" msgstr "impossible d'écrire le journal de debogage sur %s" -#: sanity.cc:107 +#: ../sanity.cc:108 #, c-format msgid "fatal: formatter failed on %s:%d: %s" -msgstr "" +msgstr "fatal : le formatteur a échoué à %s:%d : %s" -#: sanity.cc:181 +#: ../sanity.cc:182 msgid "misuse: " -msgstr "" +msgstr "mauvais usage : " -#: sanity.cc:192 +#: ../sanity.cc:194 msgid "error: " msgstr "erreur :" -#: sanity.cc:230 +#: ../sanity.cc:232 #, c-format msgid "ignoring request to give last gasp; already in process of dumping\n" msgstr "" -#: sanity.cc:234 +#: ../sanity.cc:236 #, c-format msgid "saving current work set: %i items" msgstr "" -#: sanity.cc:236 +#: ../sanity.cc:238 #, c-format msgid "Current work set: %i items\n" msgstr "" -#: sanity.cc:250 sanity.cc:256 +#: ../sanity.cc:252 ../sanity.cc:258 #, c-format msgid "ignoring error trigged by saving work set to debug log" msgstr "" -#: sanity.cc:260 +#: ../sanity.cc:262 #, c-format msgid "finished saving work set" msgstr "" -#: schema_migration.cc:263 +#: ../schema_migration.cc:275 #, 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" -#: schema_migration.cc:268 +#. 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:280 #, c-format msgid "no migration performed; database schema already up-to-date at %s\n" msgstr "" "aucune migration n'a été effectuée; le schéma de la base de données est déjà " "à jour en %s\n" -#: std_hooks.lua:28 +#: ../schema_migration.cc:830 +#, fuzzy, c-format +msgid "public and private keys for %s don't match" +msgstr "la clef publique ou privée « %s » n'existe pas dans la base de données" + +#: ../schema_migration.cc:833 +#, fuzzy, c-format +msgid "moving key '%s' from database to %s" +msgstr "aucune clef publique « %s » dans la base de données" + +#: ../std_hooks.lua:28 msgid "Press enter when the subprocess has completed" -msgstr "" +msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé" -#: std_hooks.lua:192 +#: ../std_hooks.lua:221 #, c-format msgid "Error running editor '%s' to enter log message\n" msgstr "" +"Erreur pendant l'exécution de « %s » pour saisir le message du journal\n" -#: std_hooks.lua:529 +#: ../std_hooks.lua:557 msgid "executing external 2-way merge command\n" msgstr "" -#: std_hooks.lua:637 +#: ../std_hooks.lua:665 msgid "executing external 3-way merge command\n" msgstr "" -#: transforms.cc:520 +#: ../transforms.cc:520 #, c-format msgid "converting %d bytes from %s to %s\n" msgstr "conversion de %d octets de %s en %s\n" -#: transforms.cc:526 +#: ../transforms.cc:526 #, 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:651 +#: ../transforms.cc:666 #, c-format msgid "converting %d bytes from IDNA ACE to UTF-8\n" msgstr "" -#: transforms.cc:654 transforms.cc:668 +#: ../transforms.cc:669 ../transforms.cc:683 #, c-format msgid "error converting %d UTF-8 bytes to IDNA ACE: %s" msgstr "" -#: transforms.cc:665 +#: ../transforms.cc:680 #, c-format msgid "converting %d bytes from UTF-8 to IDNA ACE\n" msgstr "conversion de %d octets d'UTF-8 en IDNA ACE\n" -#: transforms.cc:813 -#, c-format +#: ../transforms.cc:828 +#, fuzzy, c-format msgid "doing linesep conversion to %s\n" -msgstr "" +msgstr "conversion des " -#: ui.cc:119 +#. xgettext: mebibytes (2^20 bytes) +#: ../ui.cc:119 #, c-format msgid "%.1f M" msgstr "%.1f Mi" -#: ui.cc:124 +#. xgettext: kibibytes (2^10 bytes) +#: ../ui.cc:124 #, c-format msgid "%.1f k" msgstr "%.1f ki" -#: ui.cc:133 +#. xgettext: bytes +#: ../ui.cc:133 #, c-format msgid "%d" msgstr "%d" -#: ui.cc:325 +#: ../ui.cc:326 #, c-format msgid "" "fatal: %s\n" @@ -4925,111 +5133,111 @@ "and a description of what you were doing to %s.\n" msgstr "" -#: ui.cc:368 +#: ../ui.cc:369 msgid "monotone: " -msgstr "" +msgstr "monotone: " -#: update.cc:66 +#: ../update.cc:66 #, c-format msgid "failed to decode boolean testresult cert value '%s'\n" msgstr "" -#: update.cc:78 +#: ../update.cc:78 #, c-format msgid "Considering update target %s\n" msgstr "" -#: update.cc:88 +#: ../update.cc:88 #, c-format msgid "%s not in branch %s\n" msgstr "%s n'est pas dans la branche %s\n" -#: update.cc:97 +#: ../update.cc:97 #, c-format msgid "%s is acceptable update candidate\n" msgstr "" -#: update.cc:102 +#: ../update.cc:102 #, c-format msgid "%s has unacceptable test results\n" msgstr "" -#: update.cc:160 +#: ../update.cc:160 #, c-format msgid "cannot determine branch for update" msgstr "impossible de déterminer la branche pour la mise à jour" -#: vocab.cc:53 +#: ../vocab.cc:53 #, c-format msgid "hex encoded ID '%s' size != %d" msgstr "" -#: vocab.cc:56 +#: ../vocab.cc:56 #, c-format msgid "bad character '%c' in id name '%s'" -msgstr "" +msgstr "caractère invalide « %c » dans le nom de l'id « %s »" -#: vocab.cc:69 +#: ../vocab.cc:69 #, c-format msgid "bad character '%c' in ace string '%s'" -msgstr "" +msgstr "caractère invalude « %c » dans la chaîne ace « %s »" -#: vocab.cc:83 +#: ../vocab.cc:83 #, c-format msgid "bad character '%c' in cert name '%s'" -msgstr "" +msgstr "caractère invalide « %c » dans le nom du certificat « %s »" -#: vocab.cc:96 +#: ../vocab.cc:96 #, c-format msgid "bad character '%c' in key name '%s'" -msgstr "" +msgstr "caractère invalide « %c » dans le nom de la clef « %s »" -#: vocab.cc:114 +#: ../vocab.cc:114 #, c-format msgid "Invalid key length of %d bytes" msgstr "Longueur de clef invalide de %d octets" -#: vocab.cc:132 +#: ../vocab.cc:132 #, c-format msgid "Invalid hmac length of %d bytes" msgstr "Longueur hmac invalide de %d octets" -#: work.cc:64 +#: ../work.cc:64 #, c-format msgid "skipping ignorable file %s\n" -msgstr "" +msgstr "omission du fichier %s qui peut ignoré\n" -#: work.cc:70 +#: ../work.cc:70 #, c-format msgid "skipping %s, already accounted for in working copy\n" -msgstr "" +msgstr "omission de %s qui existe déjà dans la copie de travail\n" -#: work.cc:74 +#: ../work.cc:74 #, c-format msgid "adding %s to working copy add set\n" msgstr "" -#: work.cc:136 +#: ../work.cc:136 #, c-format msgid "adding attribute '%s' on file %s to %s\n" msgstr "" -#: work.cc:203 -#, c-format +#: ../work.cc:203 +#, fuzzy, c-format msgid "invalid path ''" -msgstr "" +msgstr "chem" -#: work.cc:207 +#: ../work.cc:207 #, c-format msgid "skipping %s, not currently tracked\n" msgstr "" -#: work.cc:211 +#: ../work.cc:211 #, c-format msgid "adding %s to working copy delete set\n" msgstr "" -#: work.cc:215 +#: ../work.cc:215 #, c-format msgid "" "sorry -- 'drop ' is currently broken.\n" @@ -5038,146 +5246,167 @@ "désolé mais « drop  » est actuellement cassé.\n" "essayez « find %s -type f | monotone drop address@hidden" -#: work.cc:227 +#: ../work.cc:227 #, c-format msgid "dropped attributes for file %s from %s\n" msgstr "" -#: work.cc:253 +#: ../work.cc:253 #, c-format msgid "invalid source path ''" msgstr "" -#: work.cc:254 +#: ../work.cc:254 #, c-format msgid "invalid destination path ''" msgstr "" -#: work.cc:265 +#: ../work.cc:265 #, c-format msgid "%s does not exist in current revision\n" -msgstr "" +msgstr "%s n'existe pas dans la révision actuelle\n" -#: work.cc:268 +#: ../work.cc:268 #, c-format msgid "%s already exists in current revision\n" -msgstr "" +msgstr "%s existe déjà dans la révision actuelle\n" -#: work.cc:270 +#: ../work.cc:270 #, c-format msgid "adding %s -> %s to working copy rename set\n" msgstr "" -#: work.cc:293 +#: ../work.cc:293 #, c-format msgid "%s has existing attributes in %s; clean them up first" msgstr "" -#: work.cc:302 +#: ../work.cc:302 #, c-format msgid "moving attributes for %s to %s\n" msgstr "" -#: work.cc:321 +#: ../work.cc:321 #, c-format msgid "work path is %s\n" msgstr "" -#: work.cc:330 +#: ../work.cc:330 #, c-format msgid "checking for un-committed work file %s\n" msgstr "" -#: work.cc:334 +#: ../work.cc:334 #, c-format msgid "read rearrangement from %s\n" msgstr "" -#: work.cc:338 +#: ../work.cc:338 #, c-format msgid "no un-committed work file %s\n" msgstr "" -#: work.cc:375 +#: ../work.cc:375 #, c-format msgid "revision path is %s\n" msgstr "" -#: work.cc:385 +#: ../work.cc:385 #, c-format msgid "working copy is corrupt: %s does not exist" msgstr "la copie de travail est corrompue : %s n'existe pas" -#: work.cc:386 +#: ../work.cc:386 #, c-format msgid "working copy is corrupt: %s is a directory" -msgstr "" +msgstr "la copie de travail est corrompue : %s est un dossier" -#: work.cc:389 +#: ../work.cc:389 #, c-format msgid "loading revision id from %s\n" msgstr "" -#: work.cc:396 +#: ../work.cc:396 #, c-format msgid "Problem with working directory: %s is unreadable" msgstr "" -#: work.cc:405 +#: ../work.cc:405 #, c-format msgid "writing revision id to %s\n" msgstr "" -#: work.cc:424 +#: ../work.cc:424 #, c-format msgid "base revision %s does not exist in database\n" -msgstr "" +msgstr "la révision de base %s n'existe pas dans la base de données\n" -#: work.cc:427 +#: ../work.cc:427 #, c-format msgid "old manifest is %s\n" -msgstr "" +msgstr "l'ancien manifeste est %s\n" -#: work.cc:430 +#: ../work.cc:430 #, c-format msgid "base manifest %s does not exist in database\n" msgstr "" -#: work.cc:435 +#: ../work.cc:435 #, c-format msgid "old manifest has %d entries\n" -msgstr "" +msgstr "l'ancien manifeste a %d entrées\n" -#: work.cc:456 +#: ../work.cc:456 #, c-format msgid "user log path is %s\n" msgstr "" -#: work.cc:505 +#: ../work.cc:505 #, c-format msgid "options path is %s\n" msgstr "" -#: work.cc:552 +#: ../work.cc:552 #, c-format msgid "local dump path is %s\n" msgstr "" -#: work.cc:604 +#: ../work.cc:604 #, c-format msgid "attribute map path is %s\n" msgstr "" -#: xdelta.cc:345 +#: ../xdelta.cc:345 #, c-format msgid "computing binary delta instructions\n" msgstr "" -#: xdelta.cc:347 +#: ../xdelta.cc:347 #, c-format msgid "computed binary delta instructions\n" msgstr "" +#~ msgid "branch %s is empty" +#~ msgstr "la branche %s est vide" + +#~ msgid "ADDRESS[:PORTNUMBER] PATTERN ..." +#~ msgstr "ADRESSE[:PORT] MOTIF ..." + +#~ msgid "key '%s' already exists in database" +#~ msgstr "la clef « %s » est déjà dans la base de données" + +#~ msgid "removing %s failed" +#~ msgstr "la suppression de %s a échouée" + +#~ msgid "database %s is a directory" +#~ msgstr "la base de données %s est un dossier" + +#~ msgid "guess_binary called with an invalid parameter" +#~ msgstr "guess_binary a été appelé avec un paramètre invalide" + +#~ msgid "IncludeDir called with an invalid parameter" +#~ msgstr "IncludeDir a été appelé avec un paramètre invalide" + #~ msgid "path %s is not a directory" #~ msgstr "le chemin %s n'est pas un dossier"