# # # patch "ChangeLog" # from [484a145eaac0500d4fc2a0938b9ca924ef565ef3] # to [9d0b20c4aaf90037d3e3987a5ecde32d50aed8d5] # # patch "po/fr.po" # from [b1f90e30baa9e493a1eaca00d8b20251ef60b251] # to [19aadf74f9e170d53777ab4fdf52b7796968291f] # ============================================================ --- ChangeLog 484a145eaac0500d4fc2a0938b9ca924ef565ef3 +++ ChangeLog 9d0b20c4aaf90037d3e3987a5ecde32d50aed8d5 @@ -1,3 +1,7 @@ +2005-11-28 Benoît Dejean + + * po/fr.po: Updated French i18n. + 2005-11-28 Nathaniel Smith * txt2c.cc (main): Work correctly even on empty files. ============================================================ --- po/fr.po b1f90e30baa9e493a1eaca00d8b20251ef60b251 +++ po/fr.po 19aadf74f9e170d53777ab4fdf52b7796968291f @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: monotone 0.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-20 23:36+0100\n" -"PO-Revision-Date: 2005-11-21 00:05+0100\n" +"POT-Creation-Date: 2005-11-28 19:39+0100\n" +"PO-Revision-Date: 2005-11-28 21:12+0100\n" "Last-Translator: Benoît Dejean \n" "Language-Team: Benoît Dejean \n" "MIME-Version: 1.0\n" @@ -15,480 +15,10 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../app_state.cc:71 -#, c-format -msgid "initializing from directory %s\n" -msgstr "" - -#: ../app_state.cc:82 -#, c-format -msgid "branch name is '%s'\n" -msgstr "le nom de la branche est « %s »\n" - -#: ../app_state.cc:89 -#, c-format -msgid "setting dump path to %s\n" -msgstr "" - -#: ../app_state.cc:103 -#, c-format -msgid "working copy directory required but not found%s%s" -msgstr "" - -#: ../app_state.cc:111 -#, c-format -msgid "invalid directory ''" -msgstr "" - -#: ../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:119 -#, c-format -msgid "monotone bookkeeping directory '%s' already exists in '%s'\n" -msgstr "" - -#: ../app_state.cc:122 -#, c-format -msgid "creating bookkeeping directory '%s' for working copy in '%s'\n" -msgstr "" - -#: ../app_state.cc:153 -#, c-format -msgid "'%s' ignored by restricted path set\n" -msgstr "" - -#: ../app_state.cc:158 ../app_state.cc:176 -#, c-format -msgid "unknown path '%s'\n" -msgstr "chemin inconnu « %s »\n" - -#: ../app_state.cc:160 -#, c-format -msgid "'%s' added to restricted path set\n" -msgstr "" - -#: ../app_state.cc:171 -#, c-format -msgid "'%s' ignored by excluded path set\n" -msgstr "" - -#: ../app_state.cc:178 -#, c-format -msgid "'%s' added to excluded path set\n" -msgstr "" - -#: ../app_state.cc:205 -#, c-format -msgid "checking excluded path set for '%s'\n" -msgstr "" - -#: ../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:231 -#, c-format -msgid "checking restricted path set for '%s'\n" -msgstr "" - -#: ../app_state.cc:239 -#, c-format -msgid "path '%s' found in restricted path set; '%s' included\n" -msgstr "" - -#: ../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:328 -#, fuzzy, c-format -msgid "search root '%s' is not a directory\n" -msgstr "la racin" - -#: ../app_state.cc:330 -#, c-format -msgid "set search root to %s\n" -msgstr "" - -#: ../app_state.cc:361 -#, c-format -msgid "negative depth not allowed\n" -msgstr "profondeur négative interdite\n" - -#: ../app_state.cc:369 -#, c-format -msgid "negative or zero last not allowed\n" -msgstr "" - -#: ../app_state.cc:492 -#, c-format -msgid "Failed to read options file %s" -msgstr "La lecture du fichier d'options « %s » a échouée" - -#: ../app_state.cc:509 -#, c-format -msgid "Failed to write options file %s" -msgstr "L'écriture du fichier d'options « %s » a échouée" - -#: ../basic_io.cc:26 ../basic_io.cc:27 -#, c-format -msgid "error in %s:%d:%d:E: %s" -msgstr "erreur dans %s:%d:%d:E : %s" - -#: ../cert.cc:51 -#, c-format -msgid "cert ok\n" -msgstr "certificat OK\n" - -#: ../cert.cc:58 -#, c-format -msgid "ignoring bad signature by '%s' on '%s'\n" -msgstr "" - -#: ../cert.cc:66 -#, c-format -msgid "ignoring unknown signature by '%s' on '%s'\n" -msgstr "" - -#: ../cert.cc:123 -#, c-format -msgid "trust function liked %d signers of %s cert on manifest %s\n" -msgstr "" - -#: ../cert.cc:129 -#, c-format -msgid "trust function disliked %d signers of %s cert on manifest %s\n" -msgstr "" - -#: ../cert.cc:176 -#, c-format -msgid "trust function liked %d signers of %s cert on revision %s\n" -msgstr "" - -#: ../cert.cc:182 -#, c-format -msgid "trust function disliked %d signers of %s cert on revision %s\n" -msgstr "" - -#: ../cert.cc:271 -#, c-format -msgid "calculated cert hash '%s' does not match '%s'" -msgstr "" - -#: ../cert.cc:305 -#, c-format -msgid "cert: signable text %s\n" -msgstr "" - -#: ../cert.cc:365 -#, c-format -msgid "no private key '%s' found in key store or get_priv_key hook" -msgstr "" - -#. 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 key '%s' in key store and get_key_pair hook" -msgstr "" - -#: ../cert.cc:461 -#, c-format -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:464 -#, c-format -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:481 -#, c-format -msgid "no branch found for empty revision, please provide a branch name" -msgstr "" - -#: ../cert.cc:490 -#, c-format -msgid "no branch certs found for revision %s, please provide a branch name" -msgstr "" - -#: ../cert.cc:494 -#, c-format -msgid "" -"multiple branch certs found for revision %s, please provide a branch name" -msgstr "" - -#: ../change_set.cc:289 -#, c-format -msgid "tid %d: parent %d, type %s, name %s\n" -msgstr "" - -#: ../change_set.cc:315 -#, c-format -msgid "%d -> %d\n" -msgstr "" - -#: ../change_set.cc:1540 -#, c-format -msgid "concatenating change sets\n" -msgstr "" - -#: ../change_set.cc:1563 -#, c-format -msgid "concatenating %d and %d deltas\n" -msgstr "" - -#: ../change_set.cc:1573 -#, c-format -msgid "processing delta on %s\n" -msgstr "" - -#: ../change_set.cc:1577 -#, c-format -msgid "delta on %s in first changeset renamed to %s\n" -msgstr "" - -#. 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 -#, c-format -msgid "fusing deltas on %s : %s -> %s and %s -> %s\n" -msgstr "" - -#: ../change_set.cc:1614 -#, c-format -msgid "delta on %s in second changeset copied forward\n" -msgstr "" - -#: ../change_set.cc:1628 -#, c-format -msgid "finished concatenation\n" -msgstr "" - -#: ../change_set.cc:1734 ../change_set.cc:1741 -#, c-format -msgid "delete of %s dominates rename to %s\n" -msgstr "" - -#: ../change_set.cc:1751 -#, c-format -msgid "unable to resolve file conflict '%s' -> '%s' vs. '%s'" -msgstr "" - -#: ../change_set.cc:1755 -#, c-format -msgid "unable to resolve dir conflict '%s' -> '%s' vs. '%s'" -msgstr "" - -#: ../change_set.cc:1760 -#, c-format -msgid "illegal conflict resolution '%s', wanted '%s' or '%s'\n" -msgstr "" - -#: ../change_set.cc:1816 -#, c-format -msgid "tid %d (%s) clobbered tid %d (%s)\n" -msgstr "" - -#: ../change_set.cc:1852 -#, c-format -msgid "skipping common change on %s (tid %d)\n" -msgstr "" - -#: ../change_set.cc:1857 -#, c-format -msgid "skipping neutral change of %s -> %s (tid %d)\n" -msgstr "" - -#: ../change_set.cc:1864 -#, c-format -msgid "propagating change on %s -> %s (tid %d)\n" -msgstr "" - -#: ../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 -#, 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 -#, c-format -msgid "reusing merge resolution '%s' : '%s' -> '%s'\n" -msgstr "" - -#: ../change_set.cc:2062 -#, c-format -msgid "merge of '%s' : '%s' vs. '%s' (no common ancestor) failed" -msgstr "" - -#: ../change_set.cc:2069 -#, c-format -msgid "merge of '%s' : '%s' -> '%s' vs '%s' failed" -msgstr "" - -#: ../change_set.cc:2073 -#, c-format -msgid "merge of '%s' : '%s' -> '%s' vs '%s' resolved to '%s'\n" -msgstr "" - -#: ../change_set.cc:2131 -#, c-format -msgid "skipping delta '%s'->'%s' on deleted file '%s'\n" -msgstr "" - -#. 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 "" - -#. ... 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 "" - -#. ... 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 "" - -#. ... absorb identical deltas -#: ../change_set.cc:2183 -#, c-format -msgid "skipping common delta '%s' : '%s' -> '%s'\n" -msgstr "" - -#: ../change_set.cc:2189 -#, c-format -msgid "skipping neutral delta on '%s' : %s -> %s\n" -msgstr "" - -#: ../change_set.cc:2197 -#, c-format -msgid "propagating unperturbed delta on '%s' : '%s' -> '%s'\n" -msgstr "" - -#. ... or resolve conflict -#: ../change_set.cc:2207 -#, c-format -msgid "merging delta '%s' : '%s' -> '%s' vs. '%s'\n" -msgstr "" - -#: ../change_set.cc:2220 -#, c-format -msgid "resolved merge to '%s' : '%s' -> '%s'\n" -msgstr "" - -#: ../change_set.cc:2249 -#, c-format -msgid "merging change sets\n" -msgstr "" - -#: ../change_set.cc:2311 -#, c-format -msgid "finished merge\n" -msgstr "" - -#: ../change_set.cc:2330 -#, c-format -msgid "inverting change set\n" -msgstr "" - -#: ../change_set.cc:2360 -#, c-format -msgid "converted 'delete %s' to 'add as %s' in inverse\n" -msgstr "" - -#: ../change_set.cc:2369 -#, c-format -msgid "converted add %s to delete in inverse\n" -msgstr "" - -#: ../change_set.cc:2379 -#, c-format -msgid "converting delta %s -> %s on %s\n" -msgstr "" - -#: ../change_set.cc:2381 -#, c-format -msgid "inverse is delta %s -> %s on %s\n" -msgstr "" - -#: ../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 -#, c-format -msgid "moving dir %s -> %s\n" -msgstr "déplacement du dossier %s -> %s\n" - -#: ../commands.cc:136 -#, c-format -msgid "expanding command '%s'\n" -msgstr "" - -#: ../commands.cc:153 -#, c-format -msgid "expanded command to '%s'\n" -msgstr "" - -#: ../commands.cc:158 -#, c-format -msgid "command '%s' has multiple ambiguous expansions:\n" -msgstr "" - #: ../commands.cc:201 msgid "commands:" msgstr "commandes :" -#: ../commands.cc:246 -#, c-format -msgid "executing command '%s'\n" -msgstr "exécution de la commande « %s »\n" - -#: ../commands.cc:252 -#, c-format -msgid "unknown command '%s'\n" -msgstr "commande inconnue « %s »\n" - -#: ../commands.cc:299 -#, c-format -msgid "pid file '%s' already exists" -msgstr "le fichier pid « %s » existe déjà" - #: ../commands.cc:323 ../commands.cc:1275 ../commands.cc:1355 #: ../commands.cc:1720 ../commands.cc:2670 ../commands.cc:3358 #: ../commands.cc:3575 ../commands.cc:3612 @@ -511,11 +41,6 @@ "Saisissez une description pour cette modification.\n" "Les lignes débutant par « MT: » sont supprimées automatiquement.\n" -#: ../commands.cc:389 -#, c-format -msgid "edit of log message failed" -msgstr "l'édition du message du journal a échouée" - #: ../commands.cc:398 msgid "note: " msgstr "note : " @@ -529,59 +54,6 @@ "la branche « %s » a plusieurs heads\n" "vous devriez peut-être lancer « monotone merge »" -#: ../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:466 -#, c-format -msgid "expanding selection '%s'\n" -msgstr "expansion de la sélection « %s »\n" - -#: ../commands.cc:474 -#, c-format -msgid "no match for selection '%s'" -msgstr "aucune correspondance pour la sélection « %s »" - -#: ../commands.cc:477 -#, c-format -msgid "selection '%s' has multiple ambiguous expansions: \n" -msgstr "la sélection « %s » a plusieurs expansions ambigües : \n" - -#: ../commands.cc:484 -#, c-format -msgid "expanded to '%s'\n" -msgstr "" - -#: ../commands.cc:495 -#, c-format -msgid "non-hex digits in id" -msgstr "chiffre non-héxadécimal dans l'id" - -#: ../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:507 -#, fuzzy, c-format -msgid "partial id '%s' has multiple ambiguous expansions:\n" -msgstr "le fichier rc « %s » n'existe pas" - -#: ../commands.cc:514 -#, c-format -msgid "expanded partial id '%s' to '%s'\n" -msgstr "" - -#: ../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:551 #, c-format msgid "" @@ -607,26 +79,6 @@ msgid "unknown" msgstr "inconnu" -#: ../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:703 -#, c-format -msgid "no keys found matching '%s'\n" -msgstr "aucune clef correspondant à « %s »\n" - -#: ../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:851 ../commands.cc:875 ../commands.cc:912 ../commands.cc:933 #: ../commands.cc:969 msgid "key and cert" @@ -640,61 +92,14 @@ msgid "generate an RSA key-pair" msgstr "générer une paire de clefs RSA" -#: ../commands.cc:866 -#, c-format -msgid "key '%s' already exists" -msgstr "la clef « %s » existe déjà" - -#: ../commands.cc:869 -#, c-format -msgid "generating key-pair '%s'" -msgstr "génératio de la paire de clef « %s »" - -#: ../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:875 msgid "drop a public and private key" msgstr "supprimer une clef publique et privée" -#: ../commands.cc:889 -#, c-format -msgid "dropping public key '%s' from database\n" -msgstr "suppression de la clef publique « %s » de la base de données\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: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: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:913 msgid "change passphrase of a private RSA key" msgstr "changer la phrase de passe pour une clef RSA privée" -#: ../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:930 -#, c-format -msgid "passphrase changed\n" -msgstr "la phrase de passe à changée\n" - #: ../commands.cc:933 #, fuzzy msgid "REVISION CERTNAME [CERTVAL]" @@ -706,7 +111,7 @@ #: ../commands.cc:969 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" -msgstr "" +msgstr "RÉVISION NOM VALEUR SIGNATAIRE1 [SIGNATAIRE2 [...]]" #: ../commands.cc:970 msgid "" @@ -714,16 +119,6 @@ "by current settings" msgstr "" -#: ../commands.cc:1003 -#, c-format -msgid "" -"if a cert on: %s\n" -"with key: %s\n" -"and value: %s\n" -"was signed by: %s\n" -"it would be: %s\n" -msgstr "" - #: ../commands.cc:1012 msgid "trusted" msgstr "fiable" @@ -762,25 +157,10 @@ msgid "approve of a particular revision" msgstr "approuver une révision particulière" -#: ../commands.cc:1052 -#, c-format -msgid "need --branch argument for approval" -msgstr "" - #: ../commands.cc:1058 msgid "disapprove of a particular revision" msgstr "désapprouver une révision en particulier" -#: ../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:1075 -#, c-format -msgid "need --branch argument for disapproval" -msgstr "" - #: ../commands.cc:1103 msgid "REVISION [COMMENT]" msgstr "RÉVISION [COMMENTAIRE]" @@ -789,16 +169,6 @@ msgid "comment on a particular revision" msgstr "commenter une révision en particulier" -#: ../commands.cc:1114 -#, c-format -msgid "edit comment failed" -msgstr "l'édition du commentaire a échouée" - -#: ../commands.cc:1117 -#, c-format -msgid "empty comment" -msgstr "commentaire vide" - #. static void dump_change_set(string const & name, #. change_set & cs) #. { @@ -838,7 +208,7 @@ #: ../commands.cc:1229 ../commands.cc:1242 ../commands.cc:2803 #: ../commands.cc:2820 ../commands.cc:3495 msgid "debug" -msgstr "" +msgstr "debug" #: ../commands.cc:1229 msgid "load file contents into db" @@ -852,26 +222,6 @@ msgid "merge 3 files and output result" msgstr "" -#: ../commands.cc:1253 -#, c-format -msgid "ancestor file id does not exist" -msgstr "" - -#: ../commands.cc:1256 -#, c-format -msgid "left file id does not exist" -msgstr "l'id du fichier gauche n'existe pas" - -#: ../commands.cc:1259 -#, c-format -msgid "right file id does not exist" -msgstr "l'id du fichier droit n'existe pas" - -#: ../commands.cc:1270 -#, c-format -msgid "merge failed" -msgstr "la fusion a échouée" - #: ../commands.cc:1275 msgid "show status of working copy" msgstr "afficher l'état de la copie de travail" @@ -882,26 +232,16 @@ #: ../commands.cc:1333 msgid "calculate identity of PATH or stdin" -msgstr "" +msgstr "calculer l'identité du CHEMIN ou de l'entrée standard" #: ../commands.cc:1356 msgid "FILENAME" -msgstr "" +msgstr "FICHIER" #: ../commands.cc:1357 msgid "write file from database to stdout" -msgstr "" +msgstr "écrire un fichier de la base de donnée sur la sortie standard" -#: ../commands.cc:1385 -#, c-format -msgid "no file '%s' found in revision '%s'\n" -msgstr "aucun fichier « %s » dans la révision « %s »\n" - -#: ../commands.cc:1389 -#, fuzzy, c-format -msgid "dumping file '%s'\n" -msgstr "importation du fichier « %s »\n" - #: ../commands.cc:1397 ../commands.cc:1505 ../commands.cc:3158 #: ../commands.cc:3207 ../commands.cc:3292 ../commands.cc:3299 #: ../commands.cc:3780 @@ -919,84 +259,16 @@ "Otherwise, it will be the head of the branch (given or implicit).\n" "If no directory is given, the branch name will be used as directory" msgstr "" +"récupère une révision depuis une base de données dans un dossier. Si une\n" +"révision est spécifiée, c'est celle-ci qui sera récupérée. Sinon, il s'agira\n" +"que la versionde de tête (spécifiée ou implicite).\n" +"Si aucun nom de dossier n'est fourni, le nom de la branche sera utilisé\n" +"comme nom de dossier" -#. 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: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\n" -msgstr "la branche « %s » est vide\n" - -#: ../commands.cc:1438 -#, c-format -msgid "branch %s has multiple heads" -msgstr "" - -#: ../commands.cc:1459 -#, c-format -msgid "found %d %s branch certs on revision %s\n" -msgstr "" - -#: ../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:1480 -#, c-format -msgid "no manifest %s found in database" -msgstr "" - -#: ../commands.cc:1482 -#, c-format -msgid "checking out revision %s to directory %s\n" -msgstr "" - -#: ../commands.cc:1488 -#, c-format -msgid "no file %s found in database for %s" -msgstr "" - -#: ../commands.cc:1492 ../commands.cc:3482 -#, c-format -msgid "writing file %s to %s\n" -msgstr "" - #: ../commands.cc:1505 msgid "show unmerged head revisions of branch" msgstr "" -#: ../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:1520 -#, c-format -msgid "branch '%s' is currently merged:\n" -msgstr "la branche « %s » est actuellement fusionnée :\n" - -#: ../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:1561 -#, c-format -msgid "no epoch for branch %s\n" -msgstr "" - #: ../commands.cc:1721 msgid "" "certs ID\n" @@ -1031,21 +303,10 @@ msgid "write manifest delta packet to stdout" msgstr "" -#: ../commands.cc:1783 ../commands.cc:1785 ../commands.cc:1849 -#, c-format -msgid "no such manifest '%s'" -msgstr "aucun manifeste « %s »" - #: ../commands.cc:1795 msgid "write file delta packet to stdout" msgstr "" -#: ../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:1818 ../commands.cc:1836 ../commands.cc:1855 #: ../commands.cc:1874 ../commands.cc:1892 ../commands.cc:1920 msgid "ID" @@ -1071,43 +332,14 @@ msgid "write public key packet to stdout" msgstr "" -#: ../commands.cc:1914 -#, fuzzy, c-format -msgid "public key '%s' does not exist" -msgstr "le fichier rc « %s » n'existe pas" - #: ../commands.cc:1920 msgid "write private key packet to stdout" 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:1939 msgid "read packets from files or stdin" msgstr "lecture des paquets depuis des fichiers ou l'entrée standard" -#: ../commands.cc:1947 -#, c-format -msgid "no packets found on stdin" -msgstr "aucun paquet trouvé sur l'entrée standard" - -#: ../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:1962 -#, c-format -msgid "read %d packet" -msgid_plural "read %d packets" -msgstr[0] "lu %d paquet" -msgstr[1] "lu %d paquets" - #: ../commands.cc:1966 ../commands.cc:2060 ../commands.cc:2075 #: ../commands.cc:2089 ../commands.cc:2104 msgid "network" @@ -1118,56 +350,6 @@ msgstr "" "reconstruction des index utilisés pour la synchronisation par le réseau" -#: ../commands.cc:2004 -#, c-format -msgid "setting default server to %s\n" -msgstr "" - -#: ../commands.cc:2010 -#, c-format -msgid "no hostname given" -msgstr "aucun nom d'hôte fourni" - -#: ../commands.cc:2012 -#, c-format -msgid "no server given and no default server set" -msgstr "" - -#: ../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:2030 -#, c-format -msgid "setting default branch include pattern to '%s'\n" -msgstr "" - -#: ../commands.cc:2036 -#, c-format -msgid "setting default branch exclude pattern to '%s'\n" -msgstr "" - -#: ../commands.cc:2042 -#, c-format -msgid "no branch pattern given" -msgstr "" - -#: ../commands.cc:2044 -#, c-format -msgid "no branch pattern given and no default pattern set" -msgstr "" - -#: ../commands.cc:2048 -#, c-format -msgid "using default branch include pattern: '%s'\n" -msgstr "" - -#: ../commands.cc:2056 -#, c-format -msgid "excluding: %s\n" -msgstr "" - #: ../commands.cc:2060 ../commands.cc:2075 ../commands.cc:2089 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADRESSE[:PORT] [MOTIF]]" @@ -1181,13 +363,6 @@ msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "" -#: ../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:2090 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "" @@ -1198,14 +373,8 @@ #: ../commands.cc:2105 msgid "serve the branches specified by PATTERNs to connecting clients" -msgstr "" +msgstr "servir les branches spécifiées par les MOTIFs aux clients qui se connectent" -#: ../commands.cc:2118 -#, c-format -msgid "" -"need permission to store persistent passphrase (see hook persist_phrase_ok())" -msgstr "" - #: ../commands.cc:2130 msgid "database" msgstr "base de données" @@ -1243,123 +412,10 @@ msgid "set, get or drop file attributes" msgstr "" -#: ../commands.cc:2287 ../work.cc:113 -#, c-format -msgid "registering %s file in working copy\n" -msgstr "" - -#: ../commands.cc:2316 -#, c-format -msgid "failed to parse date string '%s': %s" -msgstr "" - #: ../commands.cc:2322 msgid "commit working copy to database" msgstr "" -#: ../commands.cc:2340 -#, c-format -msgid "no changes to commit\n" -msgstr "aucun changement à valider\n" - -#: ../commands.cc:2354 -#, c-format -msgid "beginning commit on branch '%s'\n" -msgstr "" - -#: ../commands.cc:2355 -#, c-format -msgid "" -"new manifest '%s'\n" -"new revision '%s'\n" -msgstr "" -"nouveau manifeste « %s »\n" -"nouvelle révision « %s »\n" - -#: ../commands.cc:2362 -#, c-format -msgid "--message and --message-file are mutually exclusive" -msgstr "--message et --message-file sont mutuellement exclusifs" - -#: ../commands.cc:2365 -#, fuzzy, c-format -msgid "" -"MT/log is non-empty and --message supplied\n" -"perhaps move or delete MT/log,\n" -"or remove --message from the command line?" -msgstr "MT/log n'est pas vide et --message-file a été passé\n" - -#: ../commands.cc:2370 -#, c-format -msgid "" -"MT/log is non-empty and --message-file supplied\n" -"perhaps move or delete MT/log,\n" -"or remove --message-file from the command line?" -msgstr "" - -#: ../commands.cc:2388 -#, fuzzy, c-format -msgid "empty log message; commit canceled" -msgstr "message du journal vide" - -#: ../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" - -#. new revision -#: ../commands.cc:2405 -#, c-format -msgid "inserting new revision %s\n" -msgstr "insertion de la nouvelle révision %s\n" - -#: ../commands.cc:2414 -#, c-format -msgid "skipping manifest %s, already in database\n" -msgstr "" - -#: ../commands.cc:2418 -#, c-format -msgid "inserting manifest delta %s -> %s\n" -msgstr "" - -#: ../commands.cc:2429 -#, c-format -msgid "inserting full manifest %s\n" -msgstr "" - -#: ../commands.cc:2442 -#, c-format -msgid "skipping file delta %s, already in database\n" -msgstr "" - -#: ../commands.cc:2448 -#, c-format -msgid "inserting delta %s -> %s\n" -msgstr "" - -#: ../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:2468 -#, c-format -msgid "inserting full version %s\n" -msgstr "" - -#: ../commands.cc:2502 -#, c-format -msgid "committed revision %s\n" -msgstr "" - -#: ../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:2671 msgid "" "show current diffs on stdout.\n" @@ -1368,30 +424,6 @@ "them is given. If no format is specified, unified is used by default." msgstr "" -#: ../commands.cc:2687 -#, c-format -msgid "" -"--diff-args requires --external\n" -"try adding --external or removing --diff-args?" -msgstr "" -"--diff-args requiet --external\n" -"essayez d'ajouter --external ou de retirer --diff-args ?" - -#: ../commands.cc:2721 -#, c-format -msgid "current revision has no ancestor" -msgstr "la révision actuelle n'existe pas" - -#: ../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:2766 -#, c-format -msgid "concatenating un-committed changeset to composite\n" -msgstr "" - #: ../commands.cc:2803 ../commands.cc:2820 msgid "LEFT RIGHT" msgstr "GAUCHE DROITE" @@ -1414,11 +446,6 @@ msgid "no common ancestor/dominator found" msgstr "l'ancêtre commun est %s\n" -#: ../commands.cc:2859 -#, c-format -msgid "updating %s to %s\n" -msgstr "mise à jour de %s en %s\n" - #: ../commands.cc:2883 msgid "" "update working copy.\n" @@ -1426,117 +453,11 @@ "base the update on the head of the branch (given or implicit)." msgstr "" -#: ../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:2915 -#, c-format -msgid "" -"your request matches no descendents of the current revision\n" -"in fact, it doesn't even match the current revision\n" -"maybe you want --revision=" -msgstr "" - -#: ../commands.cc:2920 -#, c-format -msgid "multiple update candidates:\n" -msgstr "plusieurs candidats pour la mise à jour :\n" - -#: ../commands.cc:2924 -#, c-format -msgid "choose one with 'monotone update -r'\n" -msgstr "choisissez en un avec « monotone update -r »\n" - -#: ../commands.cc:2925 -#, c-format -msgid "multiple candidates remain after selection" -msgstr "" - -#: ../commands.cc:2940 -#, c-format -msgid "already up to date at %s\n" -msgstr "déjà à jour en %s\n" - -#: ../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:2960 -#, c-format -msgid "" -"revision %s is not a member of branch %s\n" -"try again with explicit --branch\n" -msgstr "" - -#. working copy has no changes -#: ../commands.cc:2975 -#, c-format -msgid "updating along chosen edge %s -> %s\n" -msgstr "" - -#: ../commands.cc:2986 -#, c-format -msgid "merging working copy with chosen edge %s -> %s\n" -msgstr "" - -#: ../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: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:3112 -#, c-format -msgid "no common ancestor found, synthesizing edges\n" -msgstr "" - #: ../commands.cc:3158 #, fuzzy msgid "merge unmerged heads of branch" msgstr "fusionne les" -#: ../commands.cc:3172 -#, c-format -msgid "branch '%s' is merged\n" -msgstr "la branche « %s » est fusionnée\n" - -#: ../commands.cc:3178 -#, c-format -msgid "starting with revision 1 / %d\n" -msgstr "" - -#: ../commands.cc:3182 -#, c-format -msgid "merging with revision %d / %d\n" -msgstr "" - -#. 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 "[source] %s\n" - -#: ../commands.cc:3201 ../commands.cc:3288 ../commands.cc:3355 -#, c-format -msgid "[merged] %s\n" -msgstr "[fusionné] %s\n" - -#: ../commands.cc:3204 -#, c-format -msgid "note: your working copies have not been updated\n" -msgstr "" - #: ../commands.cc:3207 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "" @@ -1545,65 +466,22 @@ msgid "merge from one branch to another asymmetrically" msgstr "" -#: ../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:3250 -#, c-format -msgid "propagating %s -> %s\n" -msgstr "" - -#: ../commands.cc:3252 -#, c-format -msgid "[target] %s\n" -msgstr "[cible] %s\n" - -#: ../commands.cc:3257 -#, c-format -msgid "branch '%s' is up-to-date with respect to branch '%s'\n" -msgstr "" - -#: ../commands.cc:3259 -#, c-format -msgid "no action taken\n" -msgstr "" - -#: ../commands.cc:3263 -#, c-format -msgid "no merge necessary; putting %s in branch '%s'\n" -msgstr "" - #: ../commands.cc:3292 msgid "refresh the inodeprint cache" -msgstr "" +msgstr "rafraîchir le cache d'inodeprint" #: ../commands.cc:3300 msgid "" "LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" msgstr "" +"RÉVISION-GAUCHE RÉVISION-DROITE BRANCHE-DESTINATION\n" +"RÉVISION GAUCHE RÉVISION DROITE ANCÊTRE-COMMUN BRANCHE-DESTINATION" #: ../commands.cc:3302 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" -#: ../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:3328 -#, c-format -msgid "%s and %s are the same revision, aborting" -msgstr "" - -#: ../commands.cc:3330 ../commands.cc:3332 -#, c-format -msgid "%s is already an ancestor of %s" -msgstr "%s est déjà un ancêtre de %s" - #: ../commands.cc:3358 msgid "(revision|manifest|file|key) PARTIAL-ID" msgstr "" @@ -1612,36 +490,10 @@ msgid "complete partial id" msgstr "" -#: ../commands.cc:3368 -#, c-format -msgid "non-hex digits in partial id" -msgstr "" - #: ../commands.cc:3416 msgid "revert file(s), dir(s) or entire working copy" msgstr "" -#: ../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:3478 -#, c-format -msgid "no file version %s found in database for %s" -msgstr "" - #: ../commands.cc:3495 msgid "RCSFILE..." msgstr "" @@ -1673,26 +525,6 @@ msgid "print annotated copy of the file from REVISION" msgstr "" -#: ../commands.cc:3593 -#, c-format -msgid "no revision for file '%s' in database" -msgstr "" - -#: ../commands.cc:3596 -#, c-format -msgid "annotate file file_path '%s'\n" -msgstr "" - -#: ../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:3607 -#, c-format -msgid "annotate for file_id %s\n" -msgstr "" - #: ../commands.cc:3612 msgid "[FILE]" msgstr "[FICHIER]" @@ -1703,29 +535,14 @@ "revisions are given, use them as a starting point." msgstr "" -#: ../commands.cc:3673 -#, c-format -msgid "revision %s does not exist in db, skipping\n" -msgstr "" - -#: ../commands.cc:3706 -#, c-format -msgid "revision '%s' in '%s' maps to '%s' in %s\n" -msgstr "" - #: ../commands.cc:3780 msgid "DIRECTORY" msgstr "DOSSIER" #: ../commands.cc:3780 msgid "setup a new working copy directory" -msgstr "" +msgstr "préparer un dossier pour une nouvelle copie de travail" -#: ../commands.cc:3786 -#, c-format -msgid "need --branch argument for setup" -msgstr "" - #: ../commands.cc:3795 msgid "automation" msgstr "automatisation" @@ -1764,7 +581,7 @@ #: ../commands.cc:3830 msgid "DOMAIN NAME VALUE" -msgstr "" +msgstr "DOMAINE NOM VALEUR" #: ../commands.cc:3831 msgid "set the database variable NAME to VALUE, in domain DOMAIN" @@ -1772,1126 +589,59 @@ #: ../commands.cc:3846 msgid "DOMAIN NAME" -msgstr "" +msgstr "DOMAINE NOM VALEUR" #: ../commands.cc:3847 msgid "remove the database variable NAME in domain DOMAIN" msgstr "" -#: ../commands.cc:3858 -#, c-format -msgid "no var with name %s in domain %s" -msgstr "" - -#: ../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 msgid "files" msgstr "fichiers" -#: ../database_check.cc:116 -#, fuzzy, c-format -msgid "checking file %s\n" -msgstr "importation du fichier « %s »\n" - -#: ../database_check.cc:134 -#, c-format -msgid "checking %d manifests\n" -msgstr "" - #: ../database_check.cc:136 ../rcs_import.cc:1258 msgid "manifests" msgstr "manifestes" -#: ../database_check.cc:141 -#, c-format -msgid "checking manifest %s\n" -msgstr "vérification du manifeste « %s »\n" - -#: ../database_check.cc:153 -#, c-format -msgid "error parsing manifest %s: %s" -msgstr "erreur lors de l'analyse du manifeste %s : %s" - -#: ../database_check.cc:190 -#, c-format -msgid "checking %d revisions\n" -msgstr "verification de %d révisions\n" - #. xgettext: please use short message and try to avoid multibytes chars -#: ../database_check.cc:192 ../database_check.cc:380 ../netsync.cc:3485 +#: ../database_check.cc:192 ../database_check.cc:380 ../netsync.cc:3497 #: ../rcs_import.cc:1257 msgid "revisions" msgstr "révisions" -#: ../database_check.cc:197 -#, c-format -msgid "checking revision %s\n" -msgstr "vérification de la révisions %s\n" - -#: ../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 -#, c-format -msgid "checked %d revisions after starting with %d\n" -msgstr "" - -#: ../database_check.cc:289 -#, c-format -msgid "checking %d ancestry edges\n" -msgstr "" - #: ../database_check.cc:291 msgid "ancestry" msgstr "ancêtre" -#: ../database_check.cc:322 -#, c-format -msgid "checking %d public keys\n" -msgstr "vérification de %d clefs publiques\n" - #. xgettext: please use short message and try to avoid multibytes chars -#: ../database_check.cc:324 ../netsync.cc:3489 +#: ../database_check.cc:324 ../netsync.cc:3501 msgid "keys" msgstr "clefs" -#: ../database_check.cc:348 -#, fuzzy, c-format -msgid "checking %d revision certs\n" -msgstr "insertion de la nouvelle révision %s\n" - #. xgettext: please use short message and try to avoid multibytes chars -#: ../database_check.cc:350 ../netsync.cc:3487 +#: ../database_check.cc:350 ../netsync.cc:3499 msgid "certs" msgstr "certs" -#: ../database_check.cc:378 -#, c-format -msgid "checking local history of %d revisions\n" -msgstr "" - -#: ../database_check.cc:413 -#, c-format -msgid "file %s missing (%d manifest references)\n" -msgstr "" - -#: ../database_check.cc:420 -#, c-format -msgid "file %s unreferenced\n" -msgstr "fichier %s non-référencé\n" - -#: ../database_check.cc:442 -#, c-format -msgid "manifest %s missing (%d revision references)\n" -msgstr "" - -#: ../database_check.cc:449 -#, c-format -msgid "manifest %s unreferenced\n" -msgstr "" - -#: ../database_check.cc:455 -#, c-format -msgid "manifest %s incomplete (%d missing files)\n" -msgstr "" - -#: ../database_check.cc:462 -#, c-format -msgid "manifest %s is not parseable (perhaps with unnormalized paths?)\n" -msgstr "" - -#: ../database_check.cc:469 -#, c-format -msgid "manifest %s is not in normalized form\n" -msgstr "" - -#: ../database_check.cc:493 -#, c-format -msgid "revision %s missing (%d revision references; %d cert references)\n" -msgstr "" - -#: ../database_check.cc:500 -#, c-format -msgid "revision %s incomplete (%d missing manifests)\n" -msgstr "" - -#: ../database_check.cc:507 -#, c-format -msgid "revision %s incomplete (%d missing revisions)\n" -msgstr "" - -#: ../database_check.cc:514 -#, c-format -msgid "revision %s incomplete (%d incomplete manifests)\n" -msgstr "" - -#: ../database_check.cc:521 -#, c-format -msgid "" -"revision %s mismatched parents (%d ancestry parents; %d revision refs)\n" -msgstr "" - -#: ../database_check.cc:530 -#, c-format -msgid "revision %s mismatched children (%d ancestry children; %d parents)\n" -msgstr "" - -#: ../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 -#, c-format -msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n" -msgstr "" - -#: ../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 -#, fuzzy, c-format -msgid "key %s signed %d certs\n" -msgstr "clef et certificat" - -#: ../database_check.cc:580 -#, c-format -msgid "key %s missing (signed %d certs)\n" -msgstr "" - -#: ../database_check.cc:613 -#, c-format -msgid "revision %s unchecked signature in %s cert from missing key %s\n" -msgstr "" - -#: ../database_check.cc:621 -#, c-format -msgid "revision %s bad signature in %s cert from key %s\n" -msgstr "" - -#: ../database_check.cc:636 -#, c-format -msgid "revision %s missing %s cert\n" -msgstr "" - -#: ../database_check.cc:645 -#, c-format -msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)\n" -msgstr "" - -#: ../database_check.cc:717 -#, fuzzy, c-format -msgid "%d missing files\n" -msgstr "importation du fichier « %s »\n" - -#: ../database_check.cc:719 -#, c-format -msgid "%d unreferenced files\n" -msgstr "%d fichiers non-référencés\n" - -#: ../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 -#, c-format -msgid "%d unreferenced manifests\n" -msgstr "%d manifestes non-référencés\n" - -#: ../database_check.cc:726 -#, c-format -msgid "%d incomplete manifests\n" -msgstr "%d manifestes incomplets\n" - -#: ../database_check.cc:728 -#, c-format -msgid "%d manifests not parseable (perhaps with invalid paths)\n" -msgstr "" - -#: ../database_check.cc:731 -#, c-format -msgid "%d manifests not in normalized form\n" -msgstr "" - -#: ../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 -#, fuzzy, c-format -msgid "%d incomplete revisions\n" -msgstr "nouvelle révisions %s\n" - -#: ../database_check.cc:738 -#, c-format -msgid "%d mismatched parents\n" -msgstr "" - -#: ../database_check.cc:740 -#, c-format -msgid "%d mismatched children\n" -msgstr "" - -#: ../database_check.cc:742 -#, c-format -msgid "%d revisions with bad history\n" -msgstr "" - -#: ../database_check.cc:744 -#, c-format -msgid "%d revisions not parseable (perhaps with invalid paths)\n" -msgstr "" - -#: ../database_check.cc:747 -#, c-format -msgid "%d revisions not in normalized form\n" -msgstr "" - -#: ../database_check.cc:750 -#, c-format -msgid "%d missing keys\n" -msgstr "%d clefs manquantes\n" - -#: ../database_check.cc:753 -#, c-format -msgid "%d missing certs\n" -msgstr "%d certificats manquants\n" - -#: ../database_check.cc:755 -#, fuzzy, c-format -msgid "%d mismatched certs\n" -msgstr "%d" - -#: ../database_check.cc:757 -#, c-format -msgid "%d unchecked signatures due to missing keys\n" -msgstr "" - -#: ../database_check.cc:759 -#, c-format -msgid "%d bad signatures\n" -msgstr "%d mauvaises signatures\n" - -#: ../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 -#, c-format -msgid "total problems detected: %d (%d serious)\n" -msgstr "" - -#: ../database_check.cc:792 -#, c-format -msgid "serious problems detected" -msgstr "problèmes sérieux détectés" - -#: ../database_check.cc:794 -#, c-format -msgid "minor problems detected\n" -msgstr "problèmes mineurs détectés\n" - -#: ../database_check.cc:796 -#, c-format -msgid "database is good\n" -msgstr "la base de données est bonne\n" - -#: ../database.cc:86 -#, c-format -msgid "" -"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:143 ../database.cc:205 -#, c-format -msgid "database %s does not exist" -msgstr "la base de données %s n'existe pas" - -#: ../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:151 -#, c-format -msgid "unable to probe database version in file %s" -msgstr "" - -#: ../database.cc:158 -#, c-format -msgid "database %s is not an sqlite version 3 file, try dump and reload" -msgstr "la base de données %s n'est pas un fichier sqlite version 3, essayer dump puis reload" - -#. 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:185 msgid "make sure database and containing directory are writeable" msgstr "" -#: ../database.cc:232 -#, c-format -msgid "could not initialize database: %s: already exists" -msgstr "impossible d'initialiser la base de données : %s : elle existe déjà" - -#: ../database.cc:237 -#, c-format -msgid "" -"existing (possibly stale) journal file '%s' has same stem as new database '%" -"s'\n" -"cancelling database creation" -msgstr "" - -#: ../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:422 -#, c-format -msgid "" -"schema version : %s\n" -"counts:\n" -" full manifests : %u\n" -" manifest deltas : %u\n" -" full files : %u\n" -" file deltas : %u\n" -" revisions : %u\n" -" ancestry edges : %u\n" -" certs : %u\n" -"bytes:\n" -" full manifests : %u\n" -" manifest deltas : %u\n" -" full files : %u\n" -" file deltas : %u\n" -" revisions : %u\n" -" cached ancestry : %u\n" -" certs : %u\n" -" total : %u\n" -msgstr "" -"version du schéma : %s\n" -"comptes:\n" -" manifestes complets : %u\n" -" deltas de manifestes : %u\n" -" fichiers complets : %u\n" -" deltas de fichiers : %u\n" -" révisions : %u\n" -" ancestry edges : %u\n" -" certificats : %u\n" -"octets:\n" -" manifestes complets : %u\n" -" deltas de manifestes : %u\n" -" fichiers complets : %u\n" -" deltas de fichiers : %u\n" -" révisions : %u\n" -" cached ancestry : %u\n" -" certificats : %u\n" -" total : %u\n" - -#: ../database.cc:475 -#, c-format -msgid "database schema version: %s" -msgstr "version du schéma de la base de données : %s" - -#: ../database.cc:493 +#: ../database.cc:494 #, fuzzy msgid "mcerts" msgstr "mcerts" -#: ../database.cc:494 +#: ../database.cc:495 #, fuzzy msgid "pubkeys" msgstr "clefs" -#: ../database.cc:495 +#: ../database.cc:496 #, fuzzy msgid "privkeys" msgstr "clefs" -#: ../database.cc:539 -#, c-format -msgid "statement cache statistics\n" -msgstr "statistiques relatives au cache des expressions\n" - -#: ../database.cc:540 -#, c-format -msgid "prepared %d statements\n" -msgstr "%d expressions préparées\n" - -#: ../database.cc:544 -#, c-format -msgid "%d executions of %s\n" -msgstr "%d exécutions de %s\n" - -#: ../database.cc:597 -#, c-format -msgid "prepared statement %s\n" -msgstr "" - -#: ../database.cc:601 -#, c-format -msgid "multiple statements in query: %s\n" -msgstr "" - -#: ../database.cc:607 -#, c-format -msgid "wanted %d columns got %d in query: %s\n" -msgstr "" - -#: ../database.cc:613 -#, c-format -msgid "binding %d parameters for %s\n" -msgstr "" - -#: ../database.cc:627 -#, c-format -msgid "binding %d with value '%s'\n" -msgstr "" - -#: ../database.cc:643 -#, c-format -msgid "null result in query: %s\n" -msgstr "" - -#: ../database.cc:661 -#, c-format -msgid "wanted %d rows got %s in query: %s\n" -msgstr "" - -#: ../database.cc:671 -#, c-format -msgid "cannot change filename to %s while db is open" -msgstr "" - -#: ../database.cc:873 -#, c-format -msgid "version cache expiring %s\n" -msgstr "" - -#. ++cache_hits; -#: ../database.cc:895 -#, c-format -msgid "version cache hit on %s\n" -msgstr "" - -#. 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:994 -#, c-format -msgid "inserting edge: %s <- %s\n" -msgstr "" - -#: ../database.cc:998 -#, c-format -msgid "skipping merge edge %s <- %s\n" -msgstr "" - -#: ../database.cc:1044 -#, c-format -msgid "following delta %s -> %s\n" -msgstr "" - -#. perform the actual SQL transactions to kill rev rid here -#: ../database.cc:1466 -#, c-format -msgid "Killing revision %s locally\n" -msgstr "" - -#: ../database.cc:1478 -#, c-format -msgid "Deleting all references to branch %s\n" -msgstr "" - -#: ../database.cc:1491 -#, c-format -msgid "Deleting all references to tag %s\n" -msgstr "" - -#: ../database.cc:1592 -#, c-format -msgid "another key with name '%s' already exists" -msgstr "" - -#: ../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:2506 -#, c-format -msgid "could not open database '%s': %s" -msgstr "impossible d'ouvrir la base de données « %s » : %s" - -#: ../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 -#, c-format -msgid "conflicting edits: %s %d[%d] '%s' vs. %s %d[%d] '%s'\n" -msgstr "" - -#: ../diff_patch.cc:328 -#, c-format -msgid "conflicting edits: [%s %d %d] vs. [%s %d %d]\n" -msgstr "" - -#: ../diff_patch.cc:376 -#, c-format -msgid "calculating left edit script on %d -> %d lines\n" -msgstr "" - -#: ../diff_patch.cc:384 -#, c-format -msgid "calculating right edit script on %d -> %d lines\n" -msgstr "" - -#: ../diff_patch.cc:392 -#, c-format -msgid "calculating left extents on %d edits\n" -msgstr "" - -#: ../diff_patch.cc:397 -#, c-format -msgid "calculating right extents on %d edits\n" -msgstr "" - -#: ../diff_patch.cc:402 -#, c-format -msgid "normalizing %d right extents\n" -msgstr "" - -#: ../diff_patch.cc:405 -#, c-format -msgid "normalizing %d left extents\n" -msgstr "" - -#: ../diff_patch.cc:411 -#, c-format -msgid "conflicting prefixes\n" -msgstr "préfixes en conflit\n" - -#: ../diff_patch.cc:417 -#, c-format -msgid "conflicting suffixes\n" -msgstr "suffixes en conflit\n" - -#: ../diff_patch.cc:421 -#, c-format -msgid "merging %d left, %d right extents\n" -msgstr "" - -#: ../diff_patch.cc:452 -#, c-format -msgid "conflict detected. no merge.\n" -msgstr "conflit détecté, pas de fusion.\n" - -#: ../diff_patch.cc:472 -#, c-format -msgid "recording successful merge of %s <-> %s into %s\n" -msgstr "" - -#: ../diff_patch.cc:530 -#, c-format -msgid "trying to merge %s <-> %s (ancestor: %s)\n" -msgstr "" - -#: ../diff_patch.cc:535 ../diff_patch.cc:640 -#, c-format -msgid "files are identical\n" -msgstr "les fichiers sont identiques\n" - -#: ../diff_patch.cc:577 -#, c-format -msgid "internal 3-way merged ok\n" -msgstr "" - -#: ../diff_patch.cc:591 -#, c-format -msgid "" -"help required for 3-way merge\n" -"[ancestor] %s\n" -"[ left] %s\n" -"[ right] %s\n" -"[ merged] %s\n" -msgstr "" -"aide requise pour la fusion de 3 fichiers\n" -"[ ancêtre] %s\n" -"[ gauche] %s\n" -"[ droite] %s\n" -"[fusionné] %s\n" - -#: ../diff_patch.cc:608 -#, c-format -msgid "lua merge3 hook merged ok\n" -msgstr "" - -#: ../diff_patch.cc:635 -#, c-format -msgid "trying to merge %s <-> %s\n" -msgstr "" - -#: ../diff_patch.cc:651 -#, c-format -msgid "" -"help required for 2-way merge\n" -"[ left] %s\n" -"[ right] %s\n" -"[ merged] %s\n" -msgstr "" -"aide requise pour la fusion de 2 fichiers\n" -"[ gauche] %s\n" -"[ droite] %s\n" -"[fusionné] %s\n" - -#: ../diff_patch.cc:665 -#, c-format -msgid "lua merge2 hook merged ok\n" -msgstr "" - -#: ../diff_patch.cc:696 -#, c-format -msgid "temporarily recording merge of %s <-> %s into %s\n" -msgstr "" - -#: ../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:714 -#, c-format -msgid "'%s' in working copy is a directory, not a file" -msgstr "" - -#: ../diff_patch.cc:718 -#, c-format -msgid "file %s in working copy has id %s, wanted %s" -msgstr "" - -#: ../file_io.cc:116 -#, c-format -msgid "expected file '%s', but it is a directory." -msgstr "" - -#: ../file_io.cc:186 ../file_io.cc:193 -#, c-format -msgid "" -"could not create directory '%s'\n" -"it is a file" -msgstr "" -"impossible de créer le dossier « %s »\n" -"car c'est un fichier" - -#: ../file_io.cc:188 -#, c-format -msgid "" -"could not create directory '%s'\n" -"%s" -msgstr "" -"impossible de créer le dossier « %s »\n" -"%s" - -#: ../file_io.cc:192 -#, c-format -msgid "could not create directory '%s'" -msgstr "impossible de créer le dossier « %s »" - -#: ../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 -#, c-format -msgid "file to delete '%s' does not exist" -msgstr "le fichier à supprimer « %s » n'existe pas" - -#: ../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 -#, fuzzy, c-format -msgid "directory to delete, '%s', does not exist" -msgstr "le dossier à supprimer « %s » n'existe pas" - -#: ../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 -#, c-format -msgid "rename source file '%s' does not exist" -msgstr "" - -#: ../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 -#, fuzzy, c-format -msgid "rename target '%s' already exists" -msgstr "le fichier pid « %s » existe déjà" - -#: ../file_io.cc:245 -#, c-format -msgid "rename source dir '%s' does not exist" -msgstr "" - -#: ../file_io.cc:246 -#, c-format -msgid "rename source dir '%s' is a file -- bug in monotone?" -msgstr "" - -#: ../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 -#, c-format -msgid "file %s does not exist" -msgstr "le fichier %s n'existe pas" - -#: ../file_io.cc:276 -#, c-format -msgid "file %s cannot be read as data; it is a directory" -msgstr "le fichier %s ne peut être lu; c'est un dossier" - -#: ../file_io.cc:280 -#, c-format -msgid "cannot open file %s for reading" -msgstr "impossible d'ouvrir le fichier %s pour le lire" - -#: ../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:378 -#, c-format -msgid "file '%s' cannot be overwritten as data; it is a directory" -msgstr "" - -#: ../file_io.cc:386 -#, c-format -msgid "cannot open file %s for writing" -msgstr "impossible d'ouvrir le fichier %s pour l'écrire" - -#: ../file_io.cc:477 -#, c-format -msgid "ignoring book keeping entry %s\n" -msgstr "" - -#: ../file_io.cc:497 -#, c-format -msgid "caught runtime error %s constructing file path for %s\n" -msgstr "" - -#: ../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 -#, c-format -msgid "running arc4 process on %d bytes of data\n" -msgstr "" - -#: ../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:92 -#, c-format -msgid "empty passphrase not allowed" -msgstr "la phrase de passe ne doit pas être vide" - -#: ../keys.cc:99 -#, c-format -msgid "confirm passphrase for key ID [%s]: " -msgstr "confirmez la phrase de passe pour la clef d'ID [%s] :" - -#: ../keys.cc:104 -#, c-format -msgid "empty passphrases not allowed, try again\n" -msgstr "" - -#: ../keys.cc:105 ../keys.cc:112 -#, c-format -msgid "too many failed passphrases\n" -msgstr "" - -#: ../keys.cc:111 -#, c-format -msgid "passphrases do not match, try again\n" -msgstr "les phrases de passe ne correspondent pas, essayez à nouveau\n" - -#: ../keys.cc:118 -#, c-format -msgid "no passphrase given" -msgstr "aucune phrase de passe fournie" - -#: ../keys.cc:177 -#, c-format -msgid "" -"generated %d-byte public key\n" -"generated %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:194 -#, c-format -msgid "base64-decoding %d-byte private key\n" -msgstr "" - -#: ../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 old private key\n" -msgstr "" - -#: ../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:383 -#, c-format -msgid "building verifier for %d-byte pub key\n" -msgstr "" - -#. check the text+sig against the key -#: ../keys.cc:405 -#, c-format -msgid "checking %d-byte (%d decoded) signature\n" -msgstr "" - -#: ../keys.cc:531 -#, c-format -msgid "no key pair '%s' found in key store or get_priv_key hook" -msgstr "" - -#: ../keys.cc:542 -#, c-format -msgid "passphrase for '%s' is incorrect" -msgstr "la phrase de passe pour « %s » est incorrecte" - -#: ../lua.cc:119 -#, c-format -msgid "lua failure: %s; stack = %s\n" -msgstr "" - -#: ../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 "pile lua : %s" - -#: ../lua.cc:215 -#, c-format -msgid "lua: extracted string = %s" -msgstr "lua : chaîne extraite = %s" - -#: ../lua.cc:228 -#, c-format -msgid "lua: extracted int = %i" -msgstr "lua : int extrait = %i" - -#: ../lua.cc:241 -#, c-format -msgid "lua: extracted double = %i" -msgstr "lua : double extrait = %i" - -#: ../lua.cc:255 -#, c-format -msgid "lua: extracted bool = %i" -msgstr "lua : bool extrait = %i" - -#: ../lua.cc:375 -#, c-format -msgid "loading lua hook %s" -msgstr "" - -#: ../lua.cc:538 ../lua.cc:567 ../lua.cc:582 -#, c-format -msgid "%s called with an invalid parameter" -msgstr "%s a été appelé avec un paramètre invalide" - -#: ../lua.cc:585 -#, c-format -msgid "Directory '%s' does not exists" -msgstr "le dossier « %s » n'existe pas" - -#: ../lua.cc:586 ../rcs_import.cc:1248 -#, c-format -msgid "'%s' is not a directory" -msgstr "« %s » n'est pas un dossier" - -#: ../lua.cc:605 ../lua.cc:900 -#, c-format -msgid "lua error while loading rcfile '%s'" -msgstr "" - -#: ../lua.cc:897 ../lua.cc:910 -#, c-format -msgid "opening rcfile '%s' ...\n" -msgstr "ouverture du fichier rc « %s » ...\n" - -#: ../lua.cc:901 ../lua.cc:913 -#, c-format -msgid "'%s' is ok\n" -msgstr "« %s » est 0K\n" - -#: ../lua.cc:912 -#, c-format -msgid "lua error while loading '%s'" -msgstr "erreur lua lors du chargement de « %s »" - -#: ../lua.cc:917 -#, c-format -msgid "rcfile '%s' does not exist" -msgstr "le fichier rc « %s » n'existe pas" - -#: ../lua.cc:918 -#, c-format -msgid "skipping nonexistent rcfile '%s'\n" -msgstr "" - -#: ../lua.cc:1363 -#, c-format -msgid "calling attr_init_function for %s" -msgstr "" - -#: ../lua.cc:1367 -#, c-format -msgid " calling an attr_init_function for %s" -msgstr "" - -#: ../lua.cc:1380 -#, c-format -msgid " added attr %s = %s" -msgstr "" - -#: ../lua.cc:1384 -#, c-format -msgid " no attr added" -msgstr "" - #: ../main.cc:325 msgid "interrupted" msgstr "interrompu" @@ -2900,335 +650,176 @@ msgid "terminated by signal" msgstr "terminé par un signal" -#: ../manifest.cc:55 -#, c-format -msgid "scanning file %s\n" -msgstr "analyse du fichier %s\n" - -#: ../manifest.cc:188 -#, c-format -msgid "missing %s" +#: ../monotone.cc:51 +msgid "select branch cert for operation" msgstr "" -#: ../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 -#, c-format -msgid "node level is %d, exceeds maximum %d" -msgstr "" - -#: ../merkle_tree.cc:317 -#, c-format -msgid "mismatched node hash value %s, expected %s" -msgstr "" - #: ../monotone.cc:52 -msgid "select branch cert for operation" +msgid "select revision id for operation" msgstr "" #: ../monotone.cc:53 -msgid "select revision id for operation" -msgstr "" - -#: ../monotone.cc:54 #, fuzzy msgid "set commit changelog message" msgstr "message du journal vide" -#: ../monotone.cc:55 +#: ../monotone.cc:54 msgid "set filename containing commit changelog message" msgstr "" -#: ../monotone.cc:56 +#: ../monotone.cc:55 msgid "override date/time for commit" msgstr "" -#: ../monotone.cc:57 +#: ../monotone.cc:56 msgid "override author for commit" msgstr "" -#: ../monotone.cc:58 +#: ../monotone.cc:57 msgid "limit the number of levels of directories to descend" msgstr "" -#: ../monotone.cc:59 +#: ../monotone.cc:58 msgid "limit the log output to the given number of entries" msgstr "limiter l'affichage du journal au nombre d'entrées spécifié" -#: ../monotone.cc:60 +#: ../monotone.cc:59 msgid "record process id of server" -msgstr "" +msgstr "enregistrer l'identifiant du processus serveur" -#: ../monotone.cc:61 +#: ../monotone.cc:60 msgid "print a brief version of the normal output" msgstr "" -#: ../monotone.cc:62 +#: ../monotone.cc:61 msgid "print diffs along with logs" msgstr "" -#: ../monotone.cc:63 +#: ../monotone.cc:62 msgid "skip merges when printing logs" msgstr "" -#: ../monotone.cc:64 +#: ../monotone.cc:63 msgid "use the current arguments as the future default" msgstr "" -#: ../monotone.cc:65 +#: ../monotone.cc:64 msgid "leave out anything described by its argument" msgstr "" -#: ../monotone.cc:66 +#: ../monotone.cc:65 msgid "use unified diff format" msgstr "utiliser le format diff unifié" -#: ../monotone.cc:67 +#: ../monotone.cc:66 msgid "use context diff format" msgstr "utiliser le format diff contextuel" -#: ../monotone.cc:68 +#: ../monotone.cc:67 msgid "use external diff hook for generating diffs" msgstr "" -#: ../monotone.cc:69 +#: ../monotone.cc:68 msgid "argument to pass external diff hook" msgstr "" -#: ../monotone.cc:70 +#: ../monotone.cc:69 msgid "use least common ancestor as ancestor for merge" msgstr "" -#: ../monotone.cc:71 +#: ../monotone.cc:70 msgid "perform the associated file operation" msgstr "" -#: ../monotone.cc:72 +#: ../monotone.cc:71 msgid "address:port to listen on (default :5253)" msgstr "écouteur sur adresse:port (défaut :5233)" -#: ../monotone.cc:73 +#: ../monotone.cc:72 msgid "perform the operations for files missing from working directory" msgstr "" -#: ../monotone.cc:74 +#: ../monotone.cc:73 msgid "perform the operations for unknown files from working directory" msgstr "" -#: ../monotone.cc:75 +#: ../monotone.cc:74 msgid "push the specified key even if it hasn't signed anything" msgstr "" -#: ../monotone.cc:84 +#: ../monotone.cc:83 msgid "print debug log to stderr while running" msgstr "" -#: ../monotone.cc:85 +#: ../monotone.cc:84 msgid "file to dump debugging log to, on failure" msgstr "" -#: ../monotone.cc:86 +#: ../monotone.cc:85 msgid "suppress log and progress messages" msgstr "" -#: ../monotone.cc:87 +#: ../monotone.cc:86 msgid "display help message" msgstr "afficher le message d'aide" -#: ../monotone.cc:88 +#: ../monotone.cc:87 msgid "print version number, then exit" msgstr "afficher le numéro de version, puis quitte" -#: ../monotone.cc:89 +#: ../monotone.cc:88 msgid "print detailed version number, then exit" msgstr "afficher le numéro de version détaillée, puis quitte" -#: ../monotone.cc:90 +#: ../monotone.cc:89 msgid "insert command line arguments taken from the given file" msgstr "" -#: ../monotone.cc:91 +#: ../monotone.cc:90 msgid "set ticker style (count|dot|none)" msgstr "" -#: ../monotone.cc:92 +#: ../monotone.cc:91 msgid "do not load standard lua hooks" msgstr "ne pas charger les hooks standards lua" -#: ../monotone.cc:93 +#: ../monotone.cc:92 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:94 +#: ../monotone.cc:93 msgid "load extra rc file" msgstr "charger un fichier rc supplémentaire" -#: ../monotone.cc:95 +#: ../monotone.cc:94 msgid "set key for signatures" -msgstr "" +msgstr "paramétrer la clef pour les signatures" -#: ../monotone.cc:96 +#: ../monotone.cc:95 msgid "set name of database" -msgstr "" +msgstr "paramétrer le nom de la base de données" -#: ../monotone.cc:97 +#: ../monotone.cc:96 msgid "limit search for working copy to specified root" msgstr "" -#: ../monotone.cc:98 +#: ../monotone.cc:97 msgid "verbose completion output" msgstr "" -#: ../monotone.cc:99 +#: ../monotone.cc:98 msgid "set location of key store" -msgstr "" +msgstr "paramétrer l'emplacement de l'entrepôt de données" -#: ../monotone.cc:100 +#: ../monotone.cc:99 msgid "set location of configuration directory" -msgstr "" +msgstr "paramétrer l'emplacement du dossier de configuration" -#: ../monotone.cc:204 -#, c-format -msgid "problem parsing arguments from file %s: %s" -msgstr "" - -#: ../monotone.cc:213 -#, c-format -msgid "weird error when stuffing arguments read from %s: %s\n" -msgstr "" - -#: ../monotone.cc:262 -#, c-format -msgid "command line: %s\n" -msgstr "ligne de commande : %s\n" - -#: ../monotone.cc:265 -#, c-format -msgid "set locale: LC_ALL=%s\n" -msgstr "paramétrage de la locale : LC_ALL=%s\n" - -#: ../monotone.cc:293 +#: ../monotone.cc:292 msgid "[OPTION...] command [ARGS...]\n" msgstr "[OPTION...] commande [ARGUMENTS...]\n" -#: ../monotone.cc:498 -#, c-format -msgid "syntax error near the \"%s\" option: %s" -msgstr "erreur de syntaxe près de l'option « %s » : %s" - -#: ../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:559 -#, c-format -msgid "Removed 'hidden' from option # %d\n" -msgstr "" - -#: ../monotone.cc:565 ../monotone.cc:576 -#, c-format -msgid "Added 'hidden' to option # %d\n" -msgstr "" - -#: ../monotone.cc:572 -#, c-format -msgid "Options specific to 'monotone %s':" -msgstr "Options spécifiques à « monotone %s » :" - -#: ../mt_version.cc:23 -#, c-format -msgid "%s (base revision: %s)" -msgstr "%s (révision de base : %s)" - -#: ../mt_version.cc:34 -#, c-format -msgid "" -"Running on: %s\n" -"Changes since base revision: %s\n" -msgstr "" -"En cours d'exécution sur : %s\n" -"Changements depuis la révision de base : %s\n" - -#: ../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 -#, c-format -msgid "protocol version mismatch: wanted '%d' got '%d'" -msgstr "" - -#: ../netcmd.cc:119 -#, c-format -msgid "unknown netcmd code 0x%x" -msgstr "code de commande netcmd inconnu 0x%x" - -#: ../netcmd.cc:130 -#, c-format -msgid "oversized payload of '%d' bytes" -msgstr "charge utile surdimensionnée de '%d' octets" - -#: ../netcmd.cc:159 -#, c-format -msgid "" -"bad HMAC checksum (got %s, wanted %s)\n" -"this suggests data was corrupted in transit\n" -msgstr "" -"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 -#, c-format -msgid "unknown role specifier %d" -msgstr "" - -#: ../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 -#, c-format -msgid "uleb128 decode for '%s' into %d-byte datum overflowed" -msgstr "" - -#: ../netio.hh:139 -#, c-format -msgid "ran out of bytes reading uleb128 value for '%s' at pos %d" -msgstr "" - -#: ../netio.hh:275 -#, c-format -msgid "decoding variable length string of %d bytes for '%s', maximum is %d" -msgstr "" - -#: ../netio.hh:330 -#, c-format -msgid "expected %s to end at %d, have %d bytes" -msgstr "" - -#: ../netsync.cc:243 -#, c-format -msgid "check of '%s' failed" -msgstr "la vérification de « %s » a échouée" - #. xgettext: please use short message and try to avoid multibytes chars #: ../netsync.cc:696 msgid "bytes in" @@ -3264,350 +855,6 @@ msgid "revs out" msgstr "révs ⇧" -#. But otherwise, we're ready to go! -#: ../netsync.cc:781 -#, c-format -msgid "all epochs processed, opening database valve\n" -msgstr "" - -#: ../netsync.cc:878 -#, c-format -msgid "dropping outgoing netcmd (because we're in error unwind mode)\n" -msgstr "" - -#: ../netsync.cc:902 -#, c-format -msgid "error: %s\n" -msgstr "erreur : %s\n" - -#: ../netsync.cc:910 -#, c-format -msgid "analyzing %d entries in manifest\n" -msgstr "" - -#: ../netsync.cc:949 -#, c-format -msgid "analyzing %d ancestry edges\n" -msgstr "" - -#: ../netsync.cc:971 -#, c-format -msgid "intermediate set_difference heads size %d" -msgstr "" - -#: ../netsync.cc:1007 -#, c-format -msgid "Dropping branch certs for unwanted branch %s" -msgstr "" - -#: ../netsync.cc:1024 -#, c-format -msgid "after step 2, heads size %d" -msgstr "" - -#: ../netsync.cc:1048 -#, c-format -msgid "after step 3, heads size %d" -msgstr "" - -#: ../netsync.cc:1068 -#, c-format -msgid "analyze_ancestry_graph" -msgstr "" - -#: ../netsync.cc:1071 -#, c-format -msgid "not all done in analyze_ancestry_graph" -msgstr "" - -#: ../netsync.cc:1077 -#, c-format -msgid "already analyzed_ancestry in analyze_ancestry_graph" -msgstr "" - -#: ../netsync.cc:1081 -#, c-format -msgid "analyze_ancestry_graph fetching" -msgstr "" - -#: ../netsync.cc:1116 -#, 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:1119 -#, c-format -msgid "in error unwind mode, so throwing them into the bit bucket\n" -msgstr "" - -#: ../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" - -#. 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:1173 -#, c-format -msgid "queueing 'bye' command\n" -msgstr "" - -#: ../netsync.cc:1183 -#, c-format -msgid "queueing 'error' command\n" -msgstr "" - -#: ../netsync.cc:1196 -#, c-format -msgid "queueing 'done' command for %s level %s\n" -msgstr "" - -#: ../netsync.cc:1265 -#, c-format -msgid "queueing request for refinement of %s node '%s', level %d\n" -msgstr "" - -#: ../netsync.cc:1283 -#, c-format -msgid "not queueing request for %s '%s' as we are in pure source role\n" -msgstr "" - -#: ../netsync.cc:1290 -#, c-format -msgid "not queueing request for %s '%s' as we already requested it\n" -msgstr "" - -#: ../netsync.cc:1295 -#, c-format -msgid "queueing request for data of %s item '%s'\n" -msgstr "" - -#: ../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:1326 -#, c-format -msgid "" -"not queueing request for %s delta '%s' -> '%s' as we already requested the " -"target\n" -msgstr "" - -#: ../netsync.cc:1331 -#, c-format -msgid "queueing request for contents of %s delta '%s' -> '%s'\n" -msgstr "" - -#: ../netsync.cc:1351 -#, c-format -msgid "not queueing %s data for '%s' as we are in pure sink role\n" -msgstr "" - -#: ../netsync.cc:1356 -#, c-format -msgid "queueing %d bytes of data for %s item '%s'\n" -msgstr "" - -#: ../netsync.cc:1390 -#, c-format -msgid "not queueing %s delta '%s' -> '%s' as we are in pure sink role\n" -msgstr "" - -#: ../netsync.cc:1395 -#, c-format -msgid "queueing %s delta '%s' -> '%s'\n" -msgstr "" - -#: ../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:1418 -#, c-format -msgid "queueing note of nonexistance of %s item '%s'\n" -msgstr "" - -#: ../netsync.cc:1430 -#, c-format -msgid "received 'bye' netcmd\n" -msgstr "" - -#: ../netsync.cc:1438 -#, fuzzy, c-format -msgid "received network error: %s" -msgstr "erreur réseau : %s" - -#. 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 "" - -#. 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:1510 -#, c-format -msgid "server key has name %s, hash %s\n" -msgstr "le nom du serveur est %s, et son hachi %s :)\n" - -#: ../netsync.cc:1518 -#, c-format -msgid "" -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" -"@ WARNING: SERVER IDENTIFICATION HAS CHANGED @\n" -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" -"IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY\n" -"it is also possible that the server key has just been changed\n" -"remote host sent key %s\n" -"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:1528 -#, c-format -msgid "server key changed" -msgstr "la clef du serveur a changée" - -#: ../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:1540 -#, c-format -msgid "saving public key for %s to database\n" -msgstr "" - -#: ../netsync.cc:1547 -#, c-format -msgid "received 'hello' netcmd from server '%s' with nonce '%s'\n" -msgstr "" - -#: ../netsync.cc:1628 -#, c-format -msgid "rejected attempt at anonymous connection for write\n" -msgstr "" - -#: ../netsync.cc:1635 -#, c-format -msgid "rejected attempt at anonymous connection while running as sink\n" -msgstr "" - -#: ../netsync.cc:1652 -#, c-format -msgid "anonymous access to branch '%s' denied by server" -msgstr "accès anonyme à la branche « %s » refusé par le serveur" - -#: ../netsync.cc:1657 -#, c-format -msgid "allowed anonymous read permission for '%s' excluding '%s'\n" -msgstr "" - -#: ../netsync.cc:1689 -#, c-format -msgid "detected replay attack in auth netcmd\n" -msgstr "" - -#: ../netsync.cc:1714 -#, c-format -msgid "remote public key hash '%s' is unknown\n" -msgstr "" - -#: ../netsync.cc:1731 -#, c-format -msgid "" -"denied '%s' read permission for '%s' excluding '%s' while running as pure " -"sink\n" -msgstr "" - -#: ../netsync.cc:1747 -#, c-format -msgid "" -"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n" -msgstr "" - -#: ../netsync.cc:1749 -#, c-format -msgid "access to branch '%s' denied by server" -msgstr "accès à la branche « %s » refusé par le serveur" - -#. if we're source_and_sink_role, continue even with no branches readable -#. ex: serve --db=empty.db -#: ../netsync.cc:1757 -#, c-format -msgid "allowed '%s' read permission for '%s' excluding '%s'\n" -msgstr "" - -#: ../netsync.cc:1766 -#, c-format -msgid "" -"denied '%s' write permission for '%s' excluding '%s' while running as pure " -"source\n" -msgstr "" - -#: ../netsync.cc:1774 -#, c-format -msgid "denied '%s' write permission for '%s' excluding '%s'\n" -msgstr "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n" - -#: ../netsync.cc:1780 -#, c-format -msgid "allowed '%s' write permission for '%s' excluding '%s'\n" -msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n" - -#. get our private key and sign back -#: ../netsync.cc:1795 -#, c-format -msgid "client signature OK, accepting authentication\n" -msgstr "signature du client 0K, authentification acceptée\n" - -#: ../netsync.cc:1817 -#, c-format -msgid "bad client signature\n" -msgstr "signature du client invalide\n" - -#. 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:1834 ../netsync.cc:2831 ../netsync.cc:2862 msgid "source and sink" msgstr "source et puit" @@ -3620,1772 +867,1157 @@ msgid "source" msgstr "source" -#: ../netsync.cc:1848 -#, c-format -msgid "server signature OK, accepting authentication\n" -msgstr "signature du serveur 0K, authentification acceptée\n" - -#: ../netsync.cc:1853 -#, c-format -msgid "bad server signature\n" -msgstr "signature du serveur invalide\n" - -#: ../netsync.cc:1858 -#, c-format -msgid "unknown server key\n" -msgstr "clef du serveur inconnue\n" - -#: ../netsync.cc:1927 -#, c-format -msgid "epoch with hash '%s' does not exist in our database" +#: ../rcs_import.cc:1283 +msgid "tags" msgstr "" -#: ../netsync.cc:1937 -#, c-format -msgid "public key '%s' is also called '%s'\n" -msgstr "" +#: ../sanity.cc:182 +msgid "misuse: " +msgstr "mauvais usage : " -#: ../netsync.cc:1956 -#, c-format -msgid "revision '%s' does not exist in our database" -msgstr "" +#: ../sanity.cc:194 +msgid "error: " +msgstr "erreur :" -#: ../netsync.cc:1970 -#, c-format -msgid "manifest '%s' does not exist in our database" -msgstr "" +#: ../std_hooks.lua:28 +msgid "Press enter when the subprocess has completed" +msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé" -#: ../netsync.cc:1984 +#: ../std_hooks.lua:221 #, c-format -msgid "file '%s' does not exist in our database" +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" -#: ../netsync.cc:1998 -#, c-format -msgid "cert '%s' does not exist in our database" +#: ../std_hooks.lua:563 +msgid "executing external 2-way merge command\n" msgstr "" -#: ../netsync.cc:2017 -#, c-format -msgid "received 'refine' netcmd on %s node '%s', level %d\n" +#: ../std_hooks.lua:671 +msgid "executing external 3-way merge command\n" msgstr "" -#: ../netsync.cc:2022 +#. xgettext: mebibytes (2^20 bytes) +#: ../ui.cc:119 #, c-format -msgid "no corresponding %s merkle node for prefix '%s', level %d\n" -msgstr "" +msgid "%.1f M" +msgstr "%.1f Mi" -#. we agree, this slot is empty -#: ../netsync.cc:2032 +#. xgettext: kibibytes (2^10 bytes) +#: ../ui.cc:124 #, c-format -msgid "" -"(#0) they have an empty slot %d (in a %s node '%s', level %d, we do not " -"have)\n" -msgstr "" +msgid "%.1f k" +msgstr "%.1f ki" -#: ../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 "" +#: ../ui.cc:369 +msgid "monotone: " +msgstr "monotone: " -#: ../netsync.cc:2046 -#, c-format -msgid "(#0) requesting their %s leaf %s\n" -msgstr "" +#~ msgid "branch name is '%s'\n" +#~ msgstr "le nom de la branche est « %s »\n" -#. 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 "" +#~ msgid "creating working copy in %s\n" +#~ msgstr "création d'une copie de travail dans %s\n" -#. 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 "" +#~ msgid "unknown path '%s'\n" +#~ msgstr "chemin inconnu « %s »\n" -#. 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 "" +#, fuzzy +#~ msgid "search root '%s' does not exist" +#~ msgstr "le fichier rc « %s » n'existe pas" -#. 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 "" +#, fuzzy +#~ msgid "search root '%s' is not a directory\n" +#~ msgstr "la racin" -#. 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 "" +#~ msgid "negative depth not allowed\n" +#~ msgstr "profondeur négative interdite\n" -#. 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 "" +#~ msgid "Failed to read options file %s" +#~ msgstr "La lecture du fichier d'options « %s » a échouée" -#. 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 "" +#~ msgid "Failed to write options file %s" +#~ msgstr "L'écriture du fichier d'options « %s » a échouée" -#. 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 "" +#~ msgid "error in %s:%d:%d:E: %s" +#~ msgstr "erreur dans %s:%d:%d:E : %s" -#. 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 "" +#~ msgid "cert ok\n" +#~ msgstr "certificat OK\n" -#: ../netsync.cc:2167 -#, c-format -msgid "(#6) we both have live %s leaf '%s'\n" -msgstr "" +#~ 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  »" -#. 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 "" +#~ 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" -#: ../netsync.cc:2193 -#, c-format -msgid "(#7) it's the same %s leaf '%s', but ours is dead\n" -msgstr "" +#~ msgid "conflict detected, resolved in A's favour\n" +#~ msgstr "conflit détecté, résolu en faveur de A\n" -#. 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 "" +#~ msgid "conflict detected, resolved in B's favour\n" +#~ msgstr "conflit détecté, résolu en faveur de B\n" -#: ../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 "" +#~ msgid "moving file %s -> %s\n" +#~ msgstr "déplacement du fichier %s -> %s\n" -#: ../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 "" +#~ msgid "moving dir %s -> %s\n" +#~ msgstr "déplacement du dossier %s -> %s\n" -#: ../netsync.cc:2224 -#, c-format -msgid "" -"(#8) sending our subtree for refinement, in slot %d of %s node '%s', level %" -"d\n" -msgstr "" +#~ msgid "executing command '%s'\n" +#~ msgstr "exécution de la commande « %s »\n" -#. 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 "" +#~ msgid "unknown command '%s'\n" +#~ msgstr "commande inconnue « %s »\n" -#. 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 "" +#~ msgid "pid file '%s' already exists" +#~ msgstr "le fichier pid « %s » existe déjà" -#: ../netsync.cc:2264 -#, c-format -msgid "(#10) we both have %s leaf %s, theirs is dead\n" -msgstr "" +#~ msgid "edit of log message failed" +#~ msgstr "l'édition du message du journal a échouée" -#. 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 "" +#~ msgid "no such revision '%s'" +#~ msgstr "aucune révision « %s »" -#. 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 "" +#~ msgid "expanding selection '%s'\n" +#~ msgstr "expansion de la sélection « %s »\n" -#. 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 "" +#~ msgid "no match for selection '%s'" +#~ msgstr "aucune correspondance pour la sélection « %s »" -#. 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 "" +#~ msgid "selection '%s' has multiple ambiguous expansions: \n" +#~ msgstr "la sélection « %s » a plusieurs expansions ambigües : \n" -#: ../netsync.cc:2335 -#, c-format -msgid "(#14) pushed our leaf '%s' into fake subtree slot %d, level %d\n" -msgstr "" +#~ msgid "non-hex digits in id" +#~ msgstr "chiffre non-héxadécimal dans l'id" -#. 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 "" +#, fuzzy +#~ msgid "partial id '%s' does not have an expansion" +#~ msgstr "le fichier rc « %s » n'existe pas" -#. 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 "" +#, fuzzy +#~ msgid "partial id '%s' has multiple ambiguous expansions:\n" +#~ msgstr "le fichier rc « %s » n'existe pas" -#: ../netsync.cc:2376 -#, c-format -msgid "(#16) we both have %s subtree '%s'\n" -msgstr "" +#~ msgid "no public key '%s' found in database" +#~ msgstr "aucune clef publique « %s » dans la base de données" -#: ../netsync.cc:2381 -#, c-format -msgid "(#16) %s subtrees at slot %d differ, refining ours\n" -msgstr "" +#~ msgid "(*) - only in %s/" +#~ msgstr "(*) - uniquement dans %s/" -#: ../netsync.cc:2408 -#, c-format -msgid "received 'send_data' netcmd requesting %s '%s'\n" -msgstr "" +#~ msgid "no keys found\n" +#~ msgstr "aucune clef trouvée\n" -#: ../netsync.cc:2436 -#, c-format -msgid "received 'send_delta' netcmd requesting %s edge '%s' -> '%s'\n" -msgstr "" +#~ msgid "no keys found matching '%s'\n" +#~ msgstr "aucune clef correspondant à « %s »\n" -#: ../netsync.cc:2490 -#, c-format -msgid "delta requested for item type %s\n" -msgstr "" +#~ msgid "revision %s already has children. We cannot kill it." +#~ msgstr "la révision %s a déjà des descendants. Impossible de la tuer." -#: ../netsync.cc:2513 -#, c-format -msgid "epoch '%s' already exists in our database\n" -msgstr "" +#~ msgid "key '%s' already exists" +#~ msgstr "la clef « %s » existe déjà" -#: ../netsync.cc:2520 -#, c-format -msgid "received epoch %s for branch %s\n" -msgstr "" +#~ msgid "generating key-pair '%s'" +#~ msgstr "génératio de la paire de clef « %s »" -#: ../netsync.cc:2527 -#, c-format -msgid "branch %s has no epoch; setting epoch to %s\n" -msgstr "" +#, fuzzy +#~ msgid "storing key-pair '%s' in %s/" +#~ msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs\n" -#: ../netsync.cc:2533 -#, c-format -msgid "branch %s already has an epoch; checking\n" -msgstr "" +#~ msgid "dropping public key '%s' from database\n" +#~ msgstr "suppression de la clef publique « %s » de la base de données\n" -#. 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 "" +#, fuzzy +#~ msgid "dropping key pair '%s' from keystore\n" +#~ msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs\n" -#: ../netsync.cc:2555 -#, c-format -msgid "public key '%s' already exists in our database\n" -msgstr "la clef publique « %s » existe déjà dans notre base de données\n" +#, fuzzy +#~ 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" -#: ../netsync.cc:2564 -#, c-format -msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" -msgstr "" +#, fuzzy +#~ 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" -#: ../netsync.cc:2573 -#, c-format -msgid "cert '%s' already exists in our database\n" -msgstr "le certificat « %s » existe déjà dans notre base de données\n" +#, fuzzy +#~ msgid "key '%s' does not exist in the keystore" +#~ msgstr "la clef « %s » n'existe pas dans la base de données" -#: ../netsync.cc:2581 -#, c-format -msgid "hash check failed for revision cert '%s'" -msgstr "" +#~ msgid "passphrase changed\n" +#~ msgstr "la phrase de passe à changée\n" -#: ../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" +#, fuzzy +#~ msgid "revision '%s' has %d changesets, cannot invert\n" +#~ msgstr "la révision %s n'existe pas" -#: ../netsync.cc:2600 -#, fuzzy, c-format -msgid "received revision '%s'\n" -msgstr "erreur réseau : %s" +#~ msgid "edit comment failed" +#~ msgstr "l'édition du commentaire a échouée" -#: ../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" +#~ msgid "empty comment" +#~ msgstr "commentaire vide" -#: ../netsync.cc:2634 -#, c-format -msgid "file version '%s' already exists in our database\n" -msgstr "la version « %s » du fichier existe déjà dans notre base de données\n" +#~ msgid "left file id does not exist" +#~ msgstr "l'id du fichier gauche n'existe pas" -#: ../netsync.cc:2720 -#, c-format -msgid "ignoring delta received for item type %s\n" -msgstr "" +#~ msgid "right file id does not exist" +#~ msgstr "l'id du fichier droit n'existe pas" -#: ../netsync.cc:2734 -#, c-format -msgid "received 'nonexistant' netcmd for %s '%s'\n" -msgstr "" +#~ msgid "merge failed" +#~ msgstr "la fusion a échouée" -#: ../netsync.cc:2746 -#, fuzzy, c-format -msgid "Received warning from usher: %s" -msgstr "erreur réseau : %s" +#~ msgid "no file '%s' found in revision '%s'\n" +#~ msgstr "aucun fichier « %s » dans la révision « %s »\n" -#: ../netsync.cc:2748 -#, fuzzy, c-format -msgid "Received greeting from usher: %s" -msgstr "erreur réseau : %s" +#, fuzzy +#~ msgid "dumping file '%s'\n" +#~ msgstr "importation du fichier « %s »\n" -#: ../netsync.cc:2753 -#, c-format -msgid "Sent reply." -msgstr "Réponse envoyée." +#, fuzzy +#~ msgid "checkout directory '%s' already exists" +#~ msgstr "le fichier pid « %s » existe déjà" -#: ../netsync.cc:2828 -#, c-format -msgid "" -"received 'anonymous' netcmd from client for pattern '%s' excluding '%s' in %" -"s mode\n" -msgstr "" +#~ msgid "branch '%s' is empty\n" +#~ msgstr "la branche « %s » est vide\n" -#: ../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 "" +#~ 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" -#: ../netsync.cc:3031 -#, c-format -msgid "processing %d byte input buffer from peer %s\n" -msgstr "" +#~ msgid "please specify a branch, with --branch=BRANCH" +#~ msgstr "veuillez préciser une branche avec --branch=BRANCHE" -#: ../netsync.cc:3034 -#, c-format -msgid "input buffer for peer %s is overfull after netcmd dispatch\n" -msgstr "" +#~ msgid "branch '%s' is currently merged:\n" +#~ msgstr "la branche « %s » est actuellement fusionnée :\n" -#: ../netsync.cc:3038 -#, c-format -msgid "failed to process '%s' packet" -msgstr "échec du traitement du paquet « %s »" +#~ msgid "branch '%s' is currently unmerged:\n" +#~ msgstr "la branche « %s » n'est actuellement pas fusionnée :\n" -#: ../netsync.cc:3043 ../netsync.cc:3077 ../netsync.cc:3104 -#, c-format -msgid "protocol error while processing peer %s: '%s'\n" -msgstr "" +#~ msgid "no such manifest '%s'" +#~ msgstr "aucun manifeste « %s »" -#. FIXME: split into labels and convert to ace here. -#: ../netsync.cc:3063 -#, c-format -msgid "connecting to %s\n" -msgstr "connexion à %s\n" +#~ msgid "no such file '%s'" +#~ msgstr "aucun fichier « %s »" -#: ../netsync.cc:3090 -#, c-format -msgid "timed out waiting for I/O with peer %s, disconnecting\n" -msgstr "" +#, fuzzy +#~ msgid "public key '%s' does not exist" +#~ msgstr "le fichier rc « %s » n'existe pas" -#: ../netsync.cc:3112 -#, fuzzy, c-format -msgid "read from fd %d (peer %s) closed OK after goodbye\n" -msgstr "la lecture du fd %d (pair %s) fermée OK après aurevoir\n" +#, fuzzy +#~ 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" -#: ../netsync.cc:3114 -#, c-format -msgid "read from fd %d (peer %s) failed, disconnecting\n" -msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n" +#~ msgid "no packets found on stdin" +#~ msgstr "aucun paquet trouvé sur l'entrée standard" -#: ../netsync.cc:3124 -#, c-format -msgid "write on fd %d (peer %s) closed OK after goodbye\n" -msgstr "la écriture du fd %d (pair %s) a échouée, déconnexion\n" +#~ msgid "no packets found in given file" +#~ msgid_plural "no packets found in given files" +#~ msgstr[0] "aucun paquet trouvé dans le fichier spécifié" +#~ msgstr[1] "aucun paquet trouvé dans les fichiers spécifiés" -#: ../netsync.cc:3126 -#, c-format -msgid "write on fd %d (peer %s) failed, disconnecting\n" -msgstr "" +#~ msgid "read %d packet" +#~ msgid_plural "read %d packets" +#~ msgstr[0] "lu %d paquet" +#~ msgstr[1] "lu %d paquets" -#: ../netsync.cc:3133 -#, c-format -msgid "got OOB data on fd %d (peer %s), disconnecting\n" -msgstr "" +#~ msgid "no hostname given" +#~ msgstr "aucun nom d'hôte fourni" -#: ../netsync.cc:3142 -#, c-format -msgid "terminated exchange with %s\n" -msgstr "échange avorté avec %s\n" +#~ msgid "using default server address: %s\n" +#~ msgstr "utilisation de l'adresse par défaut du serveur : %s\n" -#: ../netsync.cc:3150 -#, c-format -msgid "successful exchange with %s\n" -msgstr "échange réussi avec %s\n" +#~ 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" -#: ../netsync.cc:3171 -#, c-format -msgid "fd %d is armed\n" -msgstr "" +#~ msgid "no changes to commit\n" +#~ msgstr "aucun changement à valider\n" -#: ../netsync.cc:3178 -#, c-format -msgid "protocol error while processing peer %s: '%s', marking as bad\n" -msgstr "" +#~ msgid "" +#~ "new manifest '%s'\n" +#~ "new revision '%s'\n" +#~ msgstr "" +#~ "nouveau manifeste « %s »\n" +#~ "nouvelle révision « %s »\n" -#: ../netsync.cc:3200 -#, c-format -msgid "accepting new connection on %s : %s\n" -msgstr "nouvelle connexion sur %s : %s\n" +#~ msgid "--message and --message-file are mutually exclusive" +#~ msgstr "--message et --message-file sont mutuellement exclusifs" -#: ../netsync.cc:3206 -#, c-format -msgid "accept() returned a dead client\n" -msgstr "accept() à renvoyée un client mort\n" +#, fuzzy +#~ msgid "" +#~ "MT/log is non-empty and --message supplied\n" +#~ "perhaps move or delete MT/log,\n" +#~ "or remove --message from the command line?" +#~ msgstr "MT/log n'est pas vide et --message-file a été passé\n" -#: ../netsync.cc:3210 -#, fuzzy, c-format -msgid "accepted new client connection from %s : %s\n" -msgstr "connexion d'un nouveau client de %s\n" +#, fuzzy +#~ msgid "empty log message; commit canceled" +#~ msgstr "message du journal vide" -#: ../netsync.cc:3238 -#, c-format -msgid "protocol error while processing peer %s: '%s', disconnecting\n" -msgstr "" +#~ msgid "revision %s already in database\n" +#~ msgstr "la révision %s est déjà dans la base de données\n" -#: ../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" +#~ msgid "inserting new revision %s\n" +#~ msgstr "insertion de la nouvelle révision %s\n" -#: ../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" +#~ msgid "file '%s' modified during commit, aborting" +#~ msgstr "le fichier « %s » a été modifié pendant le commit, interruption" -#: ../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" +#~ msgid "" +#~ "--diff-args requires --external\n" +#~ "try adding --external or removing --diff-args?" +#~ msgstr "" +#~ "--diff-args requiet --external\n" +#~ "essayez d'ajouter --external ou de retirer --diff-args ?" -#: ../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" +#~ msgid "current revision has no ancestor" +#~ msgstr "la révision actuelle n'existe pas" -#: ../netsync.cc:3314 -#, c-format -msgid "fd %d (peer %s) exchanged goodbyes and flushed output, disconnecting\n" -msgstr "" +#~ msgid "no common ancestor for %s and %s" +#~ msgstr "pas d'ancêtre commun pour %s et %s" -#: ../netsync.cc:3354 -#, fuzzy, c-format -msgid "beginning service on %s : %s\n" -msgstr "début du service sur %s : %d\n" +#~ msgid "updating %s to %s\n" +#~ msgstr "mise à jour de %s en %s\n" -#: ../netsync.cc:3366 -#, c-format -msgid "session limit %d reached, some connections will be refused\n" -msgstr "" +#~ msgid "this working directory is a new project; cannot update" +#~ msgstr "" +#~ "ce dossier de travail est un nouveau projet, impossible de mettre à jour" -#: ../netsync.cc:3372 -#, c-format -msgid "i/o probe with %d armed\n" -msgstr "" +#~ msgid "multiple update candidates:\n" +#~ msgstr "plusieurs candidats pour la mise à jour :\n" -#: ../netsync.cc:3382 -#, c-format -msgid "timed out waiting for I/O (listening on %s : %s)\n" -msgstr "" +#~ msgid "choose one with 'monotone update -r'\n" +#~ msgstr "choisissez en un avec « monotone update -r »\n" -#: ../netsync.cc:3398 -#, c-format -msgid "got woken up for action on unknown fd %d\n" -msgstr "" +#~ msgid "already up to date at %s\n" +#~ msgstr "déjà à jour en %s\n" -#: ../netsync.cc:3413 -#, c-format -msgid "got some OOB data on fd %d (peer %s), disconnecting\n" -msgstr "" +#~ msgid "selected update target %s\n" +#~ msgstr "sélection de la cible %s pour la mise à jour\n" -#: ../netsync.cc:3475 -#, c-format -msgid "finding items to synchronize:\n" -msgstr "recherche d'éléments à synchroniser :\n" +#~ msgid "updated to base revision %s\n" +#~ msgstr "mise à jour vers la révision de base %s\n" -#: ../netsync.cc:3478 -#, c-format -msgid "including branch %s" -msgstr "inclusion de la branche %s" +#, fuzzy +#~ msgid "" +#~ "common ancestor %s found\n" +#~ "trying 3-way merge\n" +#~ msgstr "aucun ancêtre commun n'a été trouvé" -#: ../netsync.cc:3537 -#, c-format -msgid "setting epoch on %s to zero\n" -msgstr "" +#~ msgid "branch '%s' is merged\n" +#~ msgstr "la branche « %s » est fusionnée\n" -#: ../netsync.cc:3586 -#, c-format -msgid "Cannot find key '%s'" -msgstr "Impossible de trouver la clef « %s »" +#~ msgid "[source] %s\n" +#~ msgstr "[source] %s\n" -#: ../netsync.cc:3640 ../netsync.cc:3644 -#, c-format -msgid "network error: %s" -msgstr "erreur réseau : %s" +#~ msgid "[merged] %s\n" +#~ msgstr "[fusionné] %s\n" -#: ../netsync.cc:3698 -#, c-format -msgid "ancestry_fetcher: got %d heads" -msgstr "" +#~ msgid "branch '%s' is not merged\n" +#~ msgstr "la branche « %s » n'est pas fusionnée\n" -#: ../netsync.cc:3808 -#, c-format -msgid "traversing head %s" -msgstr "" +#~ msgid "[target] %s\n" +#~ msgstr "[cible] %s\n" -#: ../packet.cc:329 -#, c-format -msgid "writing delayed revision data packet for %s\n" -msgstr "" +#~ msgid "%s is not an ancestor of %s" +#~ msgstr "%s n'est pas un ancêtre de %s" -#: ../packet.cc:336 -#, c-format -msgid "discarding revision data packet %s with unmet dependencies\n" -msgstr "" +#~ msgid "%s is already an ancestor of %s" +#~ msgstr "%s est déjà un ancêtre de %s" -#: ../packet.cc:342 -#, c-format -msgid "writing delayed manifest data packet for %s\n" -msgstr "" +#~ msgid "no such file '%s' in revision '%s'\n" +#~ msgstr "aucun fichier « %s » dans la révision « %s »\n" -#: ../packet.cc:349 -#, c-format -msgid "discarding manifest data packet %s with unmet dependencies\n" -msgstr "" +#, fuzzy +#~ msgid "checking %d files\n" +#~ msgstr "la vérification de « %s » a échouée" -#: ../packet.cc:355 -#, c-format -msgid "writing delayed file data packet for %s\n" -msgstr "" +#, fuzzy +#~ msgid "checking file %s\n" +#~ msgstr "importation du fichier « %s »\n" -#: ../packet.cc:368 -#, c-format -msgid "writing delayed manifest %s packet for %s -> %s%s\n" -msgstr "" +#~ msgid "checking manifest %s\n" +#~ msgstr "vérification du manifeste « %s »\n" -#: ../packet.cc:382 -#, c-format -msgid "discarding manifest delta packet %s -> %s with unmet dependencies\n" -msgstr "" +#~ msgid "error parsing manifest %s: %s" +#~ msgstr "erreur lors de l'analyse du manifeste %s : %s" -#: ../packet.cc:389 -#, c-format -msgid "writing delayed file %s packet for %s -> %s%s\n" -msgstr "" +#~ msgid "checking %d revisions\n" +#~ msgstr "verification de %d révisions\n" -#: ../packet.cc:403 -#, c-format -msgid "discarding file delta packet %s -> %s with unmet dependencies\n" -msgstr "" +#~ msgid "checking revision %s\n" +#~ msgstr "vérification de la révisions %s\n" -#: ../packet.cc:410 -#, c-format -msgid "writing delayed revision cert on %s\n" -msgstr "" +#, fuzzy +#~ msgid "error parsing revision %s: %s" +#~ msgstr "erreur lors de la lecture du fichier RCS %s : %s\n" -#: ../packet.cc:417 -#, c-format -msgid "discarding revision cert packet %s with unmet dependencies\n" -msgstr "" +#~ msgid "checking %d public keys\n" +#~ msgstr "vérification de %d clefs publiques\n" -#: ../packet.cc:424 -#, c-format -msgid "writing delayed public key %s\n" -msgstr "" +#, fuzzy +#~ msgid "checking %d revision certs\n" +#~ msgstr "insertion de la nouvelle révision %s\n" -#: ../packet.cc:437 -#, c-format -msgid "writing delayed private key %s\n" -msgstr "" +#~ msgid "file %s unreferenced\n" +#~ msgstr "fichier %s non-référencé\n" -#: ../packet.cc:607 -#, c-format -msgid "noting acceptence of revision %s\n" -msgstr "" +#, fuzzy +#~ msgid "revision %s has bad history (%s)\n" +#~ msgstr "la révision %s est déjà dans la base de données\n" -#: ../packet.cc:620 -#, c-format -msgid "noting acceptence of manifest %s\n" -msgstr "" +#, fuzzy +#~ msgid "revision %s is not in normalized form\n" +#~ msgstr "la révision %s n'est pas membre de la branche %s\n" -#: ../packet.cc:633 -#, c-format -msgid "noting acceptence of file %s\n" -msgstr "" +#, fuzzy +#~ msgid "key %s signed %d certs\n" +#~ msgstr "clef et certificat" -#: ../packet.cc:655 -#, c-format -msgid "skipping existing file version %s\n" -msgstr "" +#, fuzzy +#~ msgid "%d missing files\n" +#~ msgstr "importation du fichier « %s »\n" -#: ../packet.cc:695 -#, c-format -msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n" -msgstr "" +#~ msgid "%d unreferenced files\n" +#~ msgstr "%d fichiers non-référencés\n" -#: ../packet.cc:701 -#, c-format -msgid "delaying file delta %s -> %s for preimage\n" -msgstr "" +#, fuzzy +#~ msgid "%d missing manifests\n" +#~ msgstr "noeud %d = révision %s = manifeste %s\n" -#: ../packet.cc:711 -#, c-format -msgid "skipping delta to existing file version %s\n" -msgstr "" +#~ msgid "%d unreferenced manifests\n" +#~ msgstr "%d manifestes non-référencés\n" -#: ../packet.cc:739 -#, c-format -msgid "reconstructed file from reverse delta '%s' -> '%s' has wrong id '%s'\n" -msgstr "" +#~ msgid "%d incomplete manifests\n" +#~ msgstr "%d manifestes incomplets\n" -#: ../packet.cc:745 -#, c-format -msgid "delaying reverse file delta %s -> %s for preimage\n" -msgstr "" +#, fuzzy +#~ msgid "%d missing revisions\n" +#~ msgstr "insertion de la nouvelle révision %s\n" -#: ../packet.cc:755 -#, c-format -msgid "skipping reverse delta to existing file version %s\n" -msgstr "" +#, fuzzy +#~ msgid "%d incomplete revisions\n" +#~ msgstr "nouvelle révisions %s\n" -#: ../packet.cc:772 -#, c-format -msgid "skipping existing manifest version %s\n" -msgstr "" +#~ msgid "%d missing keys\n" +#~ msgstr "%d clefs manquantes\n" -#: ../packet.cc:813 -#, c-format -msgid "reconstructed manifest from delta '%s' -> '%s' has wrong id '%s'\n" -msgstr "" +#~ msgid "%d missing certs\n" +#~ msgstr "%d certificats manquants\n" -#: ../packet.cc:819 -#, c-format -msgid "delaying manifest delta %s -> %s for preimage\n" -msgstr "" +#, fuzzy +#~ msgid "%d mismatched certs\n" +#~ msgstr "%d" -#: ../packet.cc:829 -#, c-format -msgid "skipping delta to existing manifest version %s\n" -msgstr "" +#~ msgid "%d bad signatures\n" +#~ msgstr "%d mauvaises signatures\n" -#: ../packet.cc:857 -#, c-format -msgid "" -"reconstructed manifest from reverse delta '%s' -> '%s' has wrong id '%s'\n" -msgstr "" +#~ msgid "serious problems detected" +#~ msgstr "problèmes sérieux détectés" -#: ../packet.cc:863 -#, c-format -msgid "delaying manifest reverse delta %s -> %s for preimage\n" -msgstr "" +#~ msgid "minor problems detected\n" +#~ msgstr "problèmes mineurs détectés\n" -#: ../packet.cc:873 -#, c-format -msgid "skipping reverse delta to existing manifest version %s\n" -msgstr "" +#~ msgid "database is good\n" +#~ msgstr "la base de données est bonne\n" -#: ../packet.cc:895 -#, c-format -msgid "delaying revision %s for new manifest %s\n" -msgstr "" +#~ msgid "database %s does not exist" +#~ msgstr "la base de données %s n'existe pas" -#: ../packet.cc:909 -#, c-format -msgid "delaying revision %s for old manifest %s\n" -msgstr "" +#~ msgid "%s is a directory, not a database" +#~ msgstr "%s est un dossier, pas une base de données" -#: ../packet.cc:919 -#, c-format -msgid "delaying revision %s for old revision %s\n" -msgstr "" +#~ msgid "database %s is not an sqlite version 3 file, try dump and reload" +#~ msgstr "" +#~ "la base de données %s n'est pas un fichier sqlite version 3, essayer dump " +#~ "puis reload" -#: ../packet.cc:932 -#, c-format -msgid "delaying revision %s for old file %s\n" -msgstr "" +#~ msgid "sqlite error: %d: %s" +#~ msgstr "erreur sqlite : %d : %s" -#: ../packet.cc:942 -#, c-format -msgid "delaying revision %s for new file %s\n" -msgstr "" +#~ msgid "could not initialize database: %s: already exists" +#~ msgstr "impossible d'initialiser la base de données : %s : elle existe déjà" -#: ../packet.cc:960 -#, c-format -msgid "skipping existing revision %s\n" -msgstr "" +#~ msgid "cannot create %s; it already exists" +#~ msgstr "impossible de créer %s car ceci existe déjà" -#: ../packet.cc:978 -#, c-format -msgid "delaying revision cert on %s\n" -msgstr "" +#~ msgid "" +#~ "schema version : %s\n" +#~ "counts:\n" +#~ " full manifests : %u\n" +#~ " manifest deltas : %u\n" +#~ " full files : %u\n" +#~ " file deltas : %u\n" +#~ " revisions : %u\n" +#~ " ancestry edges : %u\n" +#~ " certs : %u\n" +#~ "bytes:\n" +#~ " full manifests : %u\n" +#~ " manifest deltas : %u\n" +#~ " full files : %u\n" +#~ " file deltas : %u\n" +#~ " revisions : %u\n" +#~ " cached ancestry : %u\n" +#~ " certs : %u\n" +#~ " total : %u\n" +#~ msgstr "" +#~ "version du schéma : %s\n" +#~ "comptes:\n" +#~ " manifestes complets : %u\n" +#~ " deltas de manifestes : %u\n" +#~ " fichiers complets : %u\n" +#~ " deltas de fichiers : %u\n" +#~ " révisions : %u\n" +#~ " ancestry edges : %u\n" +#~ " certificats : %u\n" +#~ "octets:\n" +#~ " manifestes complets : %u\n" +#~ " deltas de manifestes : %u\n" +#~ " fichiers complets : %u\n" +#~ " deltas de fichiers : %u\n" +#~ " révisions : %u\n" +#~ " cached ancestry : %u\n" +#~ " certificats : %u\n" +#~ " total : %u\n" -#: ../packet.cc:991 -#, c-format -msgid "skipping existing revision cert %s\n" -msgstr "" +#~ msgid "database schema version: %s" +#~ msgstr "version du schéma de la base de données : %s" -#: ../packet.cc:1005 -#, c-format -msgid "skipping prohibited public key %s\n" -msgstr "" +#~ msgid "statement cache statistics\n" +#~ msgstr "statistiques relatives au cache des expressions\n" -#: ../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" +#~ msgid "prepared %d statements\n" +#~ msgstr "%d expressions préparées\n" -#: ../packet.cc:1019 -#, c-format -msgid "skipping existing public key %s\n" -msgstr "" +#~ msgid "%d executions of %s\n" +#~ msgstr "%d exécutions de %s\n" -#: ../packet.cc:1032 -#, fuzzy, c-format -msgid "skipping prohibited key pair %s\n" -msgstr "omission du fichier %s qui peut ignoré\n" +#, fuzzy +#~ msgid "after get_branch_heads for %s, heads has %d entries\n" +#~ msgstr "la branche %s a %d entrées\n" -#: ../packet.cc:1041 -#, fuzzy, c-format -msgid "skipping existing key pair %s\n" -msgstr "omission du fichier %s qui peut ignoré\n" +#~ msgid "no database specified" +#~ msgstr "aucune base de données n'a été spécifiée" -#: ../packet.cc:1077 -#, c-format -msgid "packet valve opened\n" -msgstr "" +#~ msgid "could not open database '%s': %s" +#~ msgstr "impossible d'ouvrir la base de données « %s » : %s" -#: ../packet.cc:1089 -#, c-format -msgid "wrote %i queued packets\n" -msgstr "écriture de %i paquets en attente\n" +#~ msgid "conflicting prefixes\n" +#~ msgstr "préfixes en conflit\n" -#: ../packet.cc:1360 -#, c-format -msgid "malformed packet" -msgstr "paquet malformé" +#~ msgid "conflicting suffixes\n" +#~ msgstr "suffixes en conflit\n" -#: ../packet.cc:1376 -#, fuzzy, c-format -msgid "read data packet" -msgstr "lecture d'un paquet de donnée\n" +#~ msgid "conflict detected. no merge.\n" +#~ msgstr "conflit détecté, pas de fusion.\n" -#: ../packet.cc:1396 -#, fuzzy, c-format -msgid "read delta packet" -msgstr "lecture d'un paquet delta\n" +#~ msgid "files are identical\n" +#~ msgstr "les fichiers sont identiques\n" -#: ../packet.cc:1427 -#, fuzzy, c-format -msgid "read cert packet" -msgstr "lecture d'un paquet certificat\n" +#~ msgid "" +#~ "help required for 3-way merge\n" +#~ "[ancestor] %s\n" +#~ "[ left] %s\n" +#~ "[ right] %s\n" +#~ "[ merged] %s\n" +#~ msgstr "" +#~ "aide requise pour la fusion de 3 fichiers\n" +#~ "[ ancêtre] %s\n" +#~ "[ gauche] %s\n" +#~ "[ droite] %s\n" +#~ "[fusionné] %s\n" -#: ../packet.cc:1447 -#, fuzzy, c-format -msgid "read pubkey data packet" -msgstr "lecture d'un paquet de données\n" +#~ msgid "" +#~ "help required for 2-way merge\n" +#~ "[ left] %s\n" +#~ "[ right] %s\n" +#~ "[ merged] %s\n" +#~ msgstr "" +#~ "aide requise pour la fusion de 2 fichiers\n" +#~ "[ gauche] %s\n" +#~ "[ droite] %s\n" +#~ "[fusionné] %s\n" -#: ../packet.cc:1456 -#, fuzzy, c-format -msgid "read keypair data packet" -msgstr "lecture d'un paquet de données\n" +#~ msgid "file '%s' does not exist in working copy" +#~ msgstr "le fichier « %s » n'existe pas dans la copie de travail" -#: ../packet.cc:1466 -#, fuzzy, c-format -msgid "unknown packet type: '%s'" -msgstr "chemin inconnu « %s »\n" +#~ msgid "" +#~ "could not create directory '%s'\n" +#~ "it is a file" +#~ msgstr "" +#~ "impossible de créer le dossier « %s »\n" +#~ "car c'est un fichier" -#: ../rcs_file.cc:343 -#, c-format -msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n" -msgstr "" +#~ msgid "" +#~ "could not create directory '%s'\n" +#~ "%s" +#~ msgstr "" +#~ "impossible de créer le dossier « %s »\n" +#~ "%s" -#: ../rcs_file.cc:362 -#, c-format -msgid "parse failure %d:%d: expecting word '%s'\n" -msgstr "" +#~ msgid "could not create directory '%s'" +#~ msgstr "impossible de créer le dossier « %s »" -#: ../rcs_file.cc:377 -#, c-format -msgid "parse failure %d:%d: expecting word\n" -msgstr "" +#, fuzzy +#~ msgid "failed to create directory '%s' for '%s'" +#~ msgstr "impossible de créer le dossier : %s : %s\n" -#: ../rcs_import.cc:247 -#, c-format -msgid "Calculating time of %s\n" -msgstr "" +#~ msgid "file to delete '%s' does not exist" +#~ msgstr "le fichier à supprimer « %s » n'existe pas" -#: ../rcs_import.cc:281 -#, c-format -msgid "version %s -> tag %s\n" -msgstr "" +#, fuzzy +#~ msgid "file to delete, '%s', is not a file but a directory" +#~ msgstr "le fichier à supprimer « %s » n'existe pas" -#: ../rcs_import.cc:448 -#, c-format -msgid "skipping identity file edge\n" -msgstr "" +#, fuzzy +#~ msgid "directory to delete, '%s', does not exist" +#~ msgstr "le dossier à supprimer « %s » n'existe pas" -#. 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 "" +#, fuzzy +#~ msgid "directory to delete, '%s', is a file" +#~ msgstr "le dossier à supprimer « %s » n'existe pas" -#: ../rcs_import.cc:474 -#, c-format -msgid "skipping identity manifest edge\n" -msgstr "" +#, fuzzy +#~ msgid "rename target '%s' already exists" +#~ msgstr "le fichier pid « %s » existe déjà" -#: ../rcs_import.cc:592 -#, c-format -msgid "version %s has %d lines\n" -msgstr "la version %s a %d lignes\n" +#, fuzzy +#~ msgid "rename source path '%s' does not exist" +#~ msgstr "le chemin %s n'existe pas" -#: ../rcs_import.cc:605 -#, c-format -msgid "following RCS edge %s -> %s\n" -msgstr "" +#~ msgid "file %s does not exist" +#~ msgstr "le fichier %s n'existe pas" -#: ../rcs_import.cc:608 -#, c-format -msgid "constructed RCS version %s, inserting into database\n" -msgstr "" +#~ msgid "file %s cannot be read as data; it is a directory" +#~ msgstr "le fichier %s ne peut être lu; c'est un dossier" -#: ../rcs_import.cc:651 -#, c-format -msgid "following RCS branch %s = '%s'\n" -msgstr "" +#~ msgid "cannot open file %s for reading" +#~ msgstr "impossible d'ouvrir le fichier %s pour le lire" -#: ../rcs_import.cc:661 -#, c-format -msgid "finished RCS branch %s = '%s'\n" -msgstr "" +#~ msgid "Cannot read standard input multiple times" +#~ msgstr "Impossible de lire l'entrée standard plusieurs fois" -#: ../rcs_import.cc:682 ../rcs_import.cc:730 -#, c-format -msgid "parsing RCS file %s\n" -msgstr "analyse du fichier RCS %s\n" +#~ msgid "cannot open file %s for writing" +#~ msgstr "impossible d'ouvrir le fichier %s pour l'écrire" -#: ../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" +#~ msgid "no such file or directory: '%s'" +#~ msgstr "Aucun fichier ou répertoire de ce type : « %s »" -#: ../rcs_import.cc:773 -#, c-format -msgid "importing file '%s'\n" -msgstr "importation du fichier « %s »\n" +#~ msgid "got empty passphrase from get_passphrase() hook" +#~ msgstr "la phrase de passe obtenue depuis get_passphrase() est vide" -#: ../rcs_import.cc:845 -#, c-format -msgid "first version in branch %s would be %s\n" -msgstr "" +#~ msgid "empty passphrase not allowed" +#~ msgstr "la phrase de passe ne doit pas être vide" -#: ../rcs_import.cc:852 -#, c-format -msgid "file branchpoint for %s at %s\n" -msgstr "" +#~ msgid "confirm passphrase for key ID [%s]: " +#~ msgstr "confirmez la phrase de passe pour la clef d'ID [%s] :" -#: ../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" +#~ msgid "passphrases do not match, try again\n" +#~ msgstr "les phrases de passe ne correspondent pas, essayez à nouveau\n" -#: ../rcs_import.cc:926 -#, c-format -msgid "skipping non-RCS file %s\n" -msgstr "" +#~ msgid "no passphrase given" +#~ msgstr "aucune phrase de passe fournie" -#: ../rcs_import.cc:1105 -#, c-format -msgid "examining next commit [t:%d] [p:%s] [a:%s] [c:%s]\n" -msgstr "" +#~ msgid "" +#~ "generated %d-byte public key\n" +#~ "generated %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" -#: ../rcs_import.cc:1118 -#, c-format -msgid "expiring cluster\n" -msgstr "" +#, fuzzy +#~ 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" -#: ../rcs_import.cc:1134 -#, c-format -msgid "examining cluster %d to see if it touched %d\n" -msgstr "" +#~ msgid "passphrase for '%s' is incorrect" +#~ msgstr "la phrase de passe pour « %s » est incorrecte" -#: ../rcs_import.cc:1142 -#, c-format -msgid "found cluster touching %d: [t:%d] [a:%d] [c:%d]\n" -msgstr "" +#, fuzzy +#~ msgid "Lua::ok(): failed" +#~ msgstr "Lua::ok() : échec = %i" -#: ../rcs_import.cc:1150 -#, c-format -msgid "last modification time is %d\n" -msgstr "la date de dernière modification est %d\n" +#~ msgid "lua stack: %s" +#~ msgstr "pile lua : %s" -#: ../rcs_import.cc:1166 -#, c-format -msgid "picked existing cluster [t:%d] [a:%d] [c:%d]\n" -msgstr "" +#~ msgid "lua: extracted string = %s" +#~ msgstr "lua : chaîne extraite = %s" -#: ../rcs_import.cc:1180 -#, c-format -msgid "building new cluster [t:%d] [a:%d] [c:%d]\n" -msgstr "" +#~ msgid "lua: extracted int = %i" +#~ msgstr "lua : int extrait = %i" -#. 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 "" +#~ msgid "lua: extracted double = %i" +#~ msgstr "lua : double extrait = %i" -#: ../rcs_import.cc:1211 -#, c-format -msgid "finished writing pending clusters\n" -msgstr "" +#~ msgid "lua: extracted bool = %i" +#~ msgstr "lua : bool extrait = %i" -#: ../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 "" +#~ msgid "%s called with an invalid parameter" +#~ msgstr "%s a été appelé avec un paramètre invalide" -#: ../rcs_import.cc:1235 -#, c-format -msgid "need base --branch argument for importing" -msgstr "" +#~ msgid "Directory '%s' does not exists" +#~ msgstr "le dossier « %s » n'existe pas" -#: ../rcs_import.cc:1247 -#, c-format -msgid "path %s does not exist" -msgstr "le chemin %s n'existe pas" +#~ msgid "'%s' is not a directory" +#~ msgstr "« %s » n'est pas un dossier" -#: ../rcs_import.cc:1266 -#, c-format -msgid "branch %s has %d entries\n" -msgstr "la branche %s a %d entrées\n" +#~ msgid "opening rcfile '%s' ...\n" +#~ msgstr "ouverture du fichier rc « %s » ...\n" -#: ../rcs_import.cc:1276 -#, c-format -msgid "trunk has %d entries\n" -msgstr "" +#~ msgid "'%s' is ok\n" +#~ msgstr "« %s » est 0K\n" -#: ../rcs_import.cc:1283 -msgid "tags" -msgstr "" +#~ msgid "lua error while loading '%s'" +#~ msgstr "erreur lua lors du chargement de « %s »" -#: ../rcs_import.cc:1329 -#, c-format -msgid "initial cluster on branch %s has %d live entries\n" -msgstr "" +#~ msgid "rcfile '%s' does not exist" +#~ msgstr "le fichier rc « %s » n'existe pas" -#: ../rcs_import.cc:1336 -#, c-format -msgid "initial cluster contains %s at %s\n" -msgstr "" +#~ msgid "scanning file %s\n" +#~ msgstr "analyse du fichier %s\n" -#: ../rcs_import.cc:1382 -#, c-format -msgid "storing manifest '%s' (base %s)\n" -msgstr "" +#, fuzzy +#~ 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" -#: ../rcs_import.cc:1387 -#, c-format -msgid "storing head %s\n" -msgstr "" +#~ msgid "command line: %s\n" +#~ msgstr "ligne de commande : %s\n" -#: ../rcs_import.cc:1402 -#, c-format -msgid "skipping delta to null manifest\n" -msgstr "" +#~ msgid "set locale: LC_ALL=%s\n" +#~ msgstr "paramétrage de la locale : LC_ALL=%s\n" -#: ../rcs_import.cc:1414 -#, c-format -msgid "skipping cyclical manifest delta %s -> %s\n" -msgstr "" +#~ msgid "syntax error near the \"%s\" option: %s" +#~ msgstr "erreur de syntaxe près de l'option « %s » : %s" -#: ../rcs_import.cc:1420 -#, c-format -msgid "writing full manifest %s\n" -msgstr "" +#~ msgid "monotone %s doesn't use the option %s" +#~ msgstr "monotone %s n'utilise pas l'option %s" -#: ../rcs_import.cc:1430 -#, c-format -msgid "storing manifest delta %s -> %s\n" -msgstr "" +#~ msgid "Options specific to 'monotone %s':" +#~ msgstr "Options spécifiques à « monotone %s » :" -#: ../rcs_import.cc:1492 -#, c-format -msgid "adding entry state '%s' on '%s'\n" -msgstr "" +#~ msgid "%s (base revision: %s)" +#~ msgstr "%s (révision de base : %s)" -#: ../rcs_import.cc:1499 -#, c-format -msgid "applying state delta on '%s' : '%s' -> '%s'\n" -msgstr "" +#~ msgid "" +#~ "Running on: %s\n" +#~ "Changes since base revision: %s\n" +#~ msgstr "" +#~ "En cours d'exécution sur : %s\n" +#~ "Changements depuis la révision de base : %s\n" -#: ../rcs_import.cc:1510 -#, c-format -msgid "deleting entry state '%s' on '%s'\n" -msgstr "" +#~ msgid "unknown item type 0x%x for '%s'" +#~ msgstr "type d'élément inconnu 0x%x pour « %s »" -#: ../rcs_import.cc:1529 -#, c-format -msgid "BEGIN consume_cluster()\n" -msgstr "" +#~ msgid "unknown netcmd code 0x%x" +#~ msgstr "code de commande netcmd inconnu 0x%x" -#: ../rcs_import.cc:1549 -#, c-format -msgid "END consume_cluster('%s') (parent '%s')\n" -msgstr "" +#~ msgid "oversized payload of '%d' bytes" +#~ msgstr "charge utile surdimensionnée de '%d' octets" -#: ../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" +#~ msgid "" +#~ "bad HMAC checksum (got %s, wanted %s)\n" +#~ "this suggests data was corrupted in transit\n" +#~ msgstr "" +#~ "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" -#: ../revision.cc:128 -#, c-format -msgid "Verifying revision %s has sane history (to depth %i)\n" -msgstr "" +#~ 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" -#: ../revision.cc:166 -#, c-format -msgid "Examining %s -> %s\n" -msgstr "" +#~ msgid "check of '%s' failed" +#~ msgstr "la vérification de « %s » a échouée" -#: ../revision.cc:243 -#, c-format -msgid "%s and %s have no common ancestor, so done\n" -msgstr "" +#~ msgid "error: %s\n" +#~ msgstr "erreur : %s\n" -#: ../revision.cc:249 -#, c-format -msgid "already checked common ancestor, so done\n" -msgstr "" +#~ msgid "read %d bytes from fd %d (peer %s)\n" +#~ msgstr "%d octets lu sur le descripteur de fichier %d (pair %s)\n" -#: ../revision.cc:252 -#, c-format -msgid "%s is a merge; verifying paths to common ancestor %s are sane\n" -msgstr "" +#~ msgid "wrote %d bytes to fd %d (peer %s)\n" +#~ msgstr "%d octets écris sur le descripteur de fichier %d (pair %s)\n" -#: ../revision.cc:310 -#, c-format -msgid "loading parents for node %d\n" -msgstr "" +#, fuzzy +#~ msgid "received network error: %s" +#~ msgstr "erreur réseau : %s" -#: ../revision.cc:332 -#, c-format -msgid "parent %s -> node %d\n" -msgstr "parent %s -> noeud %d\n" +#~ msgid "server key has name %s, hash %s\n" +#~ msgstr "le nom du serveur est %s, et son hachi %s :)\n" -#: ../revision.cc:482 -#, c-format -msgid "found %d intersecting nodes\n" -msgstr "" +#~ msgid "" +#~ "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" +#~ "@ WARNING: SERVER IDENTIFICATION HAS CHANGED @\n" +#~ "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" +#~ "IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY\n" +#~ "it is also possible that the server key has just been changed\n" +#~ "remote host sent key %s\n" +#~ "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" -#: ../revision.cc:535 -#, c-format -msgid "searching for common ancestor, left=%s right=%s\n" -msgstr "" +#~ msgid "server key changed" +#~ msgstr "la clef du serveur a changée" -#: ../revision.cc:540 -#, c-format -msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n" -msgstr "" +#~ 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\n" +#~ "re-vérifier l'empreinte de leur clef : %s\n" -#: ../revision.cc:545 -#, c-format -msgid "found node %d, ancestor of left %s and dominating right %s\n" -msgstr "" +#~ msgid "anonymous access to branch '%s' denied by server" +#~ msgstr "accès anonyme à la branche « %s » refusé par le serveur" -#: ../revision.cc:552 -#, c-format -msgid "found node %d, ancestor of right %s and dominating left %s\n" -msgstr "" +#~ msgid "access to branch '%s' denied by server" +#~ msgstr "accès à la branche « %s » refusé par le serveur" -#: ../revision.cc:589 -#, c-format -msgid "searching for least common ancestor, left=%s right=%s\n" -msgstr "" +#~ msgid "denied '%s' write permission for '%s' excluding '%s'\n" +#~ msgstr "" +#~ "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n" -#: ../revision.cc:593 -#, c-format -msgid "least common ancestor scan [par=%d,anc=%d]\n" -msgstr "" +#~ msgid "allowed '%s' write permission for '%s' excluding '%s'\n" +#~ msgstr "" +#~ "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n" -#: ../revision.cc:598 -#, c-format -msgid "found node %d, ancestor of left %s and right %s\n" -msgstr "" +#~ msgid "client signature OK, accepting authentication\n" +#~ msgstr "signature du client 0K, authentification acceptée\n" -#: ../revision.cc:652 -#, c-format -msgid "checking whether %s is an ancestor of %s\n" -msgstr "vérification si %s est un ancêtre de %s\n" +#~ msgid "bad client signature\n" +#~ msgstr "signature du client invalide\n" -#. 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" +#~ msgid "server signature OK, accepting authentication\n" +#~ msgstr "signature du serveur 0K, authentification acceptée\n" -#: ../revision.cc:779 -#, c-format -msgid "new leaf: %s\n" -msgstr "nouvelle feuille : %s\n" +#~ msgid "bad server signature\n" +#~ msgstr "signature du serveur invalide\n" -#: ../revision.cc:921 -#, c-format -msgid "exploring changesets from parents of %s, seeking towards %s\n" -msgstr "" +#~ msgid "unknown server key\n" +#~ msgstr "clef du serveur inconnue\n" -#: ../revision.cc:934 -#, c-format -msgid "considering parent %s of %s\n" -msgstr "" +#~ msgid "public key '%s' already exists in our database\n" +#~ msgstr "la clef publique « %s » existe déjà dans notre base de données\n" -#: ../revision.cc:960 -#, c-format -msgid "revision %s is relevant, composing with edge to %s\n" -msgstr "" +#~ msgid "cert '%s' already exists in our database\n" +#~ msgstr "le certificat « %s » existe déjà dans notre base de données\n" -#: ../revision.cc:967 -#, c-format -msgid "parent %s of %s is not relevant\n" -msgstr "" +#~ msgid "revision '%s' already exists in our database\n" +#~ msgstr "la révision « %s » existe déjà dans notre base de données\n" -#: ../revision.cc:1003 -#, c-format -msgid "adding parents of %s to subgraph\n" -msgstr "" +#, fuzzy +#~ msgid "received revision '%s'\n" +#~ msgstr "erreur réseau : %s" -#: ../revision.cc:1013 -#, c-format -msgid "found parent %s of %s\n" -msgstr "" +#~ 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" -#: ../revision.cc:1017 -#, c-format -msgid "adding parent %s to next frontier\n" -msgstr "" +#~ msgid "file version '%s' already exists in our database\n" +#~ msgstr "" +#~ "la version « %s » du fichier existe déjà dans notre base de données\n" -#: ../revision.cc:1032 -#, c-format -msgid "calculating composite changeset between %s and %s\n" -msgstr "" +#, fuzzy +#~ msgid "Received warning from usher: %s" +#~ msgstr "erreur réseau : %s" -#: ../revision.cc:1050 -#, c-format -msgid "calculating changeset from %s to %s\n" -msgstr "" +#, fuzzy +#~ msgid "Received greeting from usher: %s" +#~ msgstr "erreur réseau : %s" -#: ../revision.cc:1054 -#, c-format -msgid "no common ancestor for %s and %s\n" -msgstr "pas d'ancêtre commun pour « %s » et « %s »\n" +#~ msgid "Sent reply." +#~ msgstr "Réponse envoyée." -#: ../revision.cc:1055 -#, c-format -msgid "common ancestor is %s\n" -msgstr "l'ancêtre commun est %s\n" +#~ msgid "failed to process '%s' packet" +#~ msgstr "échec du traitement du paquet « %s »" -#: ../revision.cc:1086 -#, c-format -msgid "analyzing manifest changes from '%s' -> '%s'\n" -msgstr "" +#~ msgid "connecting to %s\n" +#~ msgstr "connexion à %s\n" -#: ../revision.cc:1099 -#, c-format -msgid "splitting ancestry for file %s\n" -msgstr "" +#, fuzzy +#~ msgid "read from fd %d (peer %s) closed OK after goodbye\n" +#~ msgstr "la lecture du fd %d (pair %s) fermée OK après aurevoir\n" -#: ../revision.cc:1166 -#, c-format -msgid "noting ancestry from child %d -> parent %d\n" -msgstr "" +#~ msgid "read from fd %d (peer %s) failed, disconnecting\n" +#~ msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n" -#: ../revision.cc:1199 -#, c-format -msgid "setting epoch for %s to %s\n" -msgstr "" +#~ msgid "write on fd %d (peer %s) closed OK after goodbye\n" +#~ msgstr "la écriture du fd %d (pair %s) a échouée, déconnexion\n" -#. 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 "" +#~ msgid "terminated exchange with %s\n" +#~ msgstr "échange avorté avec %s\n" -#: ../revision.cc:1296 -#, c-format -msgid "optimizing out redundant edge %i -> %i\n" -msgstr "" +#~ msgid "successful exchange with %s\n" +#~ msgstr "échange réussi avec %s\n" -#: ../revision.cc:1323 -#, c-format -msgid "rebuilding %d nodes\n" -msgstr "" +#~ msgid "accepting new connection on %s : %s\n" +#~ msgstr "nouvelle connexion sur %s : %s\n" -#: ../revision.cc:1360 -#, c-format -msgid "node %d = manifest %s\n" -msgstr "" +#~ msgid "accept() returned a dead client\n" +#~ msgstr "accept() à renvoyée un client mort\n" -#: ../revision.cc:1371 -#, c-format -msgid "loaded '%s' manifest cert for node %s\n" -msgstr "" +#, fuzzy +#~ msgid "accepted new client connection from %s : %s\n" +#~ msgstr "connexion d'un nouveau client de %s\n" -#: ../revision.cc:1399 -#, c-format -msgid "node %d = revision %s = manifest %s\n" -msgstr "noeud %d = révision %s = manifeste %s\n" +#~ msgid "fd %d (peer %s) read failed, disconnecting\n" +#~ msgstr "la lecture sur le fd %d (pair %s) a échouée, déconnexion\n" -#: ../revision.cc:1411 -#, c-format -msgid "loaded '%s' revision cert for node %s\n" -msgstr "" +#~ msgid "fd %d (peer %s) write failed, disconnecting\n" +#~ msgstr "l'écriture sur le fd %d (pair %s) a échouée, déconnexion\n" -#: ../revision.cc:1435 -#, c-format -msgid "processing node %d\n" -msgstr "" +#~ msgid "fd %d (peer %s) processing finished, disconnecting\n" +#~ msgstr "traitement du fd %d (pair %s) terminé, déconnexion\n" -#: ../revision.cc:1439 -#, c-format -msgid "node %d already processed, skipping\n" -msgstr "" +#~ 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" -#: ../revision.cc:1453 -#, c-format -msgid "node %d is a root node\n" -msgstr "le noeud %d est un noeud racine\n" +#, fuzzy +#~ msgid "beginning service on %s : %s\n" +#~ msgstr "début du service sur %s : %d\n" -#: ../revision.cc:1469 ../revision.cc:1552 -#, c-format -msgid "parent node %d = revision %s\n" -msgstr "" +#~ msgid "finding items to synchronize:\n" +#~ msgstr "recherche d'éléments à synchroniser :\n" -#: ../revision.cc:1531 -#, c-format -msgid "processing edge from child %d -> parent %d\n" -msgstr "" +#~ msgid "including branch %s" +#~ msgstr "inclusion de la branche %s" -#: ../revision.cc:1569 -#, c-format -msgid "mapped node %d to revision %s\n" -msgstr "" +#~ msgid "Cannot find key '%s'" +#~ msgstr "Impossible de trouver la clef « %s »" -#: ../revision.cc:1575 -#, c-format -msgid "skipping already existing revision %s\n" -msgstr "" +#~ msgid "network error: %s" +#~ msgstr "erreur réseau : %s" -#: ../revision.cc:1587 -#, c-format -msgid "rebuilding revision graph from existing graph\n" -msgstr "" +#~ 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" -#: ../revision.cc:1619 -#, c-format -msgid "rebuilding revision graph from manifest certs\n" -msgstr "" +#, fuzzy +#~ msgid "skipping prohibited key pair %s\n" +#~ msgstr "omission du fichier %s qui peut ignoré\n" -#: ../sanity.cc:38 -#, c-format -msgid "started up on %s\n" -msgstr "" +#, fuzzy +#~ msgid "skipping existing key pair %s\n" +#~ msgstr "omission du fichier %s qui peut ignoré\n" -#: ../sanity.cc:54 -#, c-format -msgid "wrote debugging log to %s" -msgstr "" +#~ msgid "wrote %i queued packets\n" +#~ msgstr "écriture de %i paquets en attente\n" -#: ../sanity.cc:57 -#, c-format -msgid "failed to write debugging log to %s" -msgstr "impossible d'écrire le journal de debogage sur %s" +#~ msgid "malformed packet" +#~ msgstr "paquet malformé" -#: ../sanity.cc:108 -#, c-format -msgid "fatal: formatter failed on %s:%d: %s" -msgstr "fatal : le formatteur a échoué à %s:%d : %s" +#, fuzzy +#~ msgid "read data packet" +#~ msgstr "lecture d'un paquet de donnée\n" -#: ../sanity.cc:182 -msgid "misuse: " -msgstr "mauvais usage : " +#, fuzzy +#~ msgid "read delta packet" +#~ msgstr "lecture d'un paquet delta\n" -#: ../sanity.cc:194 -msgid "error: " -msgstr "erreur :" +#, fuzzy +#~ msgid "read cert packet" +#~ msgstr "lecture d'un paquet certificat\n" -#: ../sanity.cc:232 -#, c-format -msgid "ignoring request to give last gasp; already in process of dumping\n" -msgstr "" +#, fuzzy +#~ msgid "read pubkey data packet" +#~ msgstr "lecture d'un paquet de données\n" -#: ../sanity.cc:236 -#, c-format -msgid "saving current work set: %i items" -msgstr "" +#, fuzzy +#~ msgid "read keypair data packet" +#~ msgstr "lecture d'un paquet de données\n" -#: ../sanity.cc:238 -#, c-format -msgid "Current work set: %i items\n" -msgstr "" +#, fuzzy +#~ msgid "unknown packet type: '%s'" +#~ msgstr "chemin inconnu « %s »\n" -#: ../sanity.cc:252 ../sanity.cc:258 -#, c-format -msgid "ignoring error trigged by saving work set to debug log" -msgstr "" +#~ msgid "version %s has %d lines\n" +#~ msgstr "la version %s a %d lignes\n" -#: ../sanity.cc:262 -#, c-format -msgid "finished saving work set" -msgstr "" +#~ msgid "parsing RCS file %s\n" +#~ msgstr "analyse du fichier RCS %s\n" -#: ../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" +#~ msgid "parsed RCS file %s OK\n" +#~ msgstr "analyse du fichier RCS %s OK\n" -#. 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" +#~ msgid "importing file '%s'\n" +#~ msgstr "importation du fichier « %s »\n" -#: ../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" +#~ msgid "error reading RCS file %s: %s\n" +#~ msgstr "erreur lors de la lecture du fichier RCS %s : %s\n" -#: ../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" +#~ msgid "last modification time is %d\n" +#~ msgstr "la date de dernière modification est %d\n" -#: ../std_hooks.lua:28 -msgid "Press enter when the subprocess has completed" -msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé" +#~ msgid "path %s does not exist" +#~ msgstr "le chemin %s n'existe pas" -#: ../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" +#~ msgid "branch %s has %d entries\n" +#~ msgstr "la branche %s a %d entrées\n" -#: ../std_hooks.lua:557 -msgid "executing external 2-way merge command\n" -msgstr "" +#~ msgid "verifying new revisions (this may take a while)\n" +#~ msgstr "vérification des nouvelles révisions (ceci peut prendre du temps)\n" -#: ../std_hooks.lua:665 -msgid "executing external 3-way merge command\n" -msgstr "" +#~ msgid "parent %s -> node %d\n" +#~ msgstr "parent %s -> noeud %d\n" -#: ../transforms.cc:520 -#, c-format -msgid "converting %d bytes from %s to %s\n" -msgstr "conversion de %d octets de %s en %s\n" +#~ msgid "checking whether %s is an ancestor of %s\n" +#~ msgstr "vérification si %s est un ancêtre de %s\n" -#: ../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 »" +#~ msgid "new root: %s\n" +#~ msgstr "nouvelle racine : %s\n" -#: ../transforms.cc:666 -#, c-format -msgid "converting %d bytes from IDNA ACE to UTF-8\n" -msgstr "" +#~ msgid "new leaf: %s\n" +#~ msgstr "nouvelle feuille : %s\n" -#: ../transforms.cc:669 ../transforms.cc:683 -#, c-format -msgid "error converting %d UTF-8 bytes to IDNA ACE: %s" -msgstr "" +#~ msgid "no common ancestor for %s and %s\n" +#~ msgstr "pas d'ancêtre commun pour « %s » et « %s »\n" -#: ../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" +#~ msgid "common ancestor is %s\n" +#~ msgstr "l'ancêtre commun est %s\n" -#: ../transforms.cc:828 -#, fuzzy, c-format -msgid "doing linesep conversion to %s\n" -msgstr "conversion des " +#~ msgid "node %d = revision %s = manifest %s\n" +#~ msgstr "noeud %d = révision %s = manifeste %s\n" -#. xgettext: mebibytes (2^20 bytes) -#: ../ui.cc:119 -#, c-format -msgid "%.1f M" -msgstr "%.1f Mi" +#~ msgid "node %d is a root node\n" +#~ msgstr "le noeud %d est un noeud racine\n" -#. xgettext: kibibytes (2^10 bytes) -#: ../ui.cc:124 -#, c-format -msgid "%.1f k" -msgstr "%.1f ki" +#~ msgid "failed to write debugging log to %s" +#~ msgstr "impossible d'écrire le journal de debogage sur %s" -#. xgettext: bytes -#: ../ui.cc:133 -#, c-format -msgid "%d" -msgstr "%d" +#~ msgid "fatal: formatter failed on %s:%d: %s" +#~ msgstr "fatal : le formatteur a échoué à %s:%d : %s" -#: ../ui.cc:326 -#, c-format -msgid "" -"fatal: %s\n" -"this is almost certainly a bug in monotone.\n" -"please send this error message, the output of 'monotone --full-version',\n" -"and a description of what you were doing to %s.\n" -msgstr "" +#~ 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" -#: ../ui.cc:369 -msgid "monotone: " -msgstr "monotone: " +#~ 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" -#: ../update.cc:66 -#, c-format -msgid "failed to decode boolean testresult cert value '%s'\n" -msgstr "" +#, fuzzy +#~ 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" -#: ../update.cc:78 -#, c-format -msgid "Considering update target %s\n" -msgstr "" +#, fuzzy +#~ msgid "moving key '%s' from database to %s" +#~ msgstr "aucune clef publique « %s » dans la base de données" -#: ../update.cc:88 -#, c-format -msgid "%s not in branch %s\n" -msgstr "%s n'est pas dans la branche %s\n" +#~ msgid "converting %d bytes from %s to %s\n" +#~ msgstr "conversion de %d octets de %s en %s\n" -#: ../update.cc:97 -#, c-format -msgid "%s is acceptable update candidate\n" -msgstr "" +#~ msgid "failed to convert string from %s to %s: '%s'" +#~ msgstr "impossible de convertir la chaîne de %s en %s : « %s »" -#: ../update.cc:102 -#, c-format -msgid "%s has unacceptable test results\n" -msgstr "" +#~ msgid "converting %d bytes from UTF-8 to IDNA ACE\n" +#~ msgstr "conversion de %d octets d'UTF-8 en IDNA ACE\n" -#: ../update.cc:160 -#, c-format -msgid "cannot determine branch for update" -msgstr "impossible de déterminer la branche pour la mise à jour" +#, fuzzy +#~ msgid "doing linesep conversion to %s\n" +#~ msgstr "conversion des " -#: ../vocab.cc:53 -#, c-format -msgid "hex encoded ID '%s' size != %d" -msgstr "" +#~ msgid "%d" +#~ msgstr "%d" -#: ../vocab.cc:56 -#, c-format -msgid "bad character '%c' in id name '%s'" -msgstr "caractère invalide « %c » dans le nom de l'id « %s »" +#~ msgid "%s not in branch %s\n" +#~ msgstr "%s n'est pas dans la branche %s\n" -#: ../vocab.cc:69 -#, c-format -msgid "bad character '%c' in ace string '%s'" -msgstr "caractère invalude « %c » dans la chaîne ace « %s »" +#~ msgid "cannot determine branch for update" +#~ msgstr "impossible de déterminer la branche pour la mise à jour" -#: ../vocab.cc:83 -#, c-format -msgid "bad character '%c' in cert name '%s'" -msgstr "caractère invalide « %c » dans le nom du certificat « %s »" +#~ msgid "bad character '%c' in id name '%s'" +#~ msgstr "caractère invalide « %c » dans le nom de l'id « %s »" -#: ../vocab.cc:96 -#, c-format -msgid "bad character '%c' in key name '%s'" -msgstr "caractère invalide « %c » dans le nom de la clef « %s »" +#~ msgid "bad character '%c' in ace string '%s'" +#~ msgstr "caractère invalude « %c » dans la chaîne ace « %s »" -#: ../vocab.cc:114 -#, c-format -msgid "Invalid key length of %d bytes" -msgstr "Longueur de clef invalide de %d octets" +#~ msgid "bad character '%c' in cert name '%s'" +#~ msgstr "caractère invalide « %c » dans le nom du certificat « %s »" -#: ../vocab.cc:132 -#, c-format -msgid "Invalid hmac length of %d bytes" -msgstr "Longueur hmac invalide de %d octets" +#~ msgid "bad character '%c' in key name '%s'" +#~ msgstr "caractère invalide « %c » dans le nom de la clef « %s »" -#: ../work.cc:64 -#, c-format -msgid "skipping ignorable file %s\n" -msgstr "omission du fichier %s qui peut ignoré\n" +#~ msgid "Invalid key length of %d bytes" +#~ msgstr "Longueur de clef invalide de %d octets" -#: ../work.cc:70 -#, c-format -msgid "skipping %s, already accounted for in working copy\n" -msgstr "omission de %s qui existe déjà dans la copie de travail\n" +#~ msgid "Invalid hmac length of %d bytes" +#~ msgstr "Longueur hmac invalide de %d octets" -#: ../work.cc:74 -#, c-format -msgid "adding %s to working copy add set\n" -msgstr "" +#~ msgid "skipping ignorable file %s\n" +#~ msgstr "omission du fichier %s qui peut ignoré\n" -#: ../work.cc:136 -#, c-format -msgid "adding attribute '%s' on file %s to %s\n" -msgstr "" +#~ msgid "skipping %s, already accounted for in working copy\n" +#~ msgstr "omission de %s qui existe déjà dans la copie de travail\n" -#: ../work.cc:203 -#, fuzzy, c-format -msgid "invalid path ''" -msgstr "chem" +#, fuzzy +#~ msgid "invalid path ''" +#~ msgstr "chem" -#: ../work.cc:207 -#, c-format -msgid "skipping %s, not currently tracked\n" -msgstr "" +#~ msgid "" +#~ "sorry -- 'drop ' is currently broken.\n" +#~ "try 'find %s -type f | monotone drop address@hidden'\n" +#~ msgstr "" +#~ "désolé mais « drop  » est actuellement cassé.\n" +#~ "essayez « find %s -type f | monotone drop address@hidden" -#: ../work.cc:211 -#, c-format -msgid "adding %s to working copy delete set\n" -msgstr "" +#~ msgid "%s does not exist in current revision\n" +#~ msgstr "%s n'existe pas dans la révision actuelle\n" -#: ../work.cc:215 -#, c-format -msgid "" -"sorry -- 'drop ' is currently broken.\n" -"try 'find %s -type f | monotone drop address@hidden'\n" -msgstr "" -"désolé mais « drop  » est actuellement cassé.\n" -"essayez « find %s -type f | monotone drop address@hidden" +#~ msgid "%s already exists in current revision\n" +#~ msgstr "%s existe déjà dans la révision actuelle\n" -#: ../work.cc:227 -#, c-format -msgid "dropped attributes for file %s from %s\n" -msgstr "" +#~ msgid "working copy is corrupt: %s does not exist" +#~ msgstr "la copie de travail est corrompue : %s n'existe pas" -#: ../work.cc:253 -#, c-format -msgid "invalid source path ''" -msgstr "" +#~ msgid "working copy is corrupt: %s is a directory" +#~ msgstr "la copie de travail est corrompue : %s est un dossier" -#: ../work.cc:254 -#, c-format -msgid "invalid destination path ''" -msgstr "" +#~ msgid "base revision %s does not exist in database\n" +#~ msgstr "la révision de base %s n'existe pas dans la base de données\n" -#: ../work.cc:265 -#, c-format -msgid "%s does not exist in current revision\n" -msgstr "%s n'existe pas dans la révision actuelle\n" +#~ msgid "old manifest is %s\n" +#~ msgstr "l'ancien manifeste est %s\n" -#: ../work.cc:268 -#, c-format -msgid "%s already exists in current revision\n" -msgstr "%s existe déjà dans la révision actuelle\n" +#~ msgid "old manifest has %d entries\n" +#~ msgstr "l'ancien manifeste a %d entrées\n" -#: ../work.cc:270 -#, c-format -msgid "adding %s -> %s to working copy rename set\n" -msgstr "" - -#: ../work.cc:293 -#, c-format -msgid "%s has existing attributes in %s; clean them up first" -msgstr "" - -#: ../work.cc:302 -#, c-format -msgid "moving attributes for %s to %s\n" -msgstr "" - -#: ../work.cc:321 -#, c-format -msgid "work path is %s\n" -msgstr "" - -#: ../work.cc:330 -#, c-format -msgid "checking for un-committed work file %s\n" -msgstr "" - -#: ../work.cc:334 -#, c-format -msgid "read rearrangement from %s\n" -msgstr "" - -#: ../work.cc:338 -#, c-format -msgid "no un-committed work file %s\n" -msgstr "" - -#: ../work.cc:375 -#, c-format -msgid "revision path is %s\n" -msgstr "" - -#: ../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 -#, c-format -msgid "working copy is corrupt: %s is a directory" -msgstr "la copie de travail est corrompue : %s est un dossier" - -#: ../work.cc:389 -#, c-format -msgid "loading revision id from %s\n" -msgstr "" - -#: ../work.cc:396 -#, c-format -msgid "Problem with working directory: %s is unreadable" -msgstr "" - -#: ../work.cc:405 -#, c-format -msgid "writing revision id to %s\n" -msgstr "" - -#: ../work.cc:424 -#, c-format -msgid "base revision %s does not exist in database\n" -msgstr "la révision de base %s n'existe pas dans la base de données\n" - -#: ../work.cc:427 -#, c-format -msgid "old manifest is %s\n" -msgstr "l'ancien manifeste est %s\n" - -#: ../work.cc:430 -#, c-format -msgid "base manifest %s does not exist in database\n" -msgstr "" - -#: ../work.cc:435 -#, c-format -msgid "old manifest has %d entries\n" -msgstr "l'ancien manifeste a %d entrées\n" - -#: ../work.cc:456 -#, c-format -msgid "user log path is %s\n" -msgstr "" - -#: ../work.cc:505 -#, c-format -msgid "options path is %s\n" -msgstr "" - -#: ../work.cc:552 -#, c-format -msgid "local dump path is %s\n" -msgstr "" - -#: ../work.cc:604 -#, c-format -msgid "attribute map path is %s\n" -msgstr "" - -#: ../xdelta.cc:345 -#, c-format -msgid "computing binary delta instructions\n" -msgstr "" - -#: ../xdelta.cc:347 -#, c-format -msgid "computed binary delta instructions\n" -msgstr "" - #~ msgid "branch %s is empty" #~ msgstr "la branche %s est vide"