# # old_revision [415678619be6b3caf516be63188419b5163c1a32] # # patch "ChangeLog" # from [012316a22aa364034903caa6fa70d1cc342c0ffd] # to [c1899c67969784794dbd5218c0c4a2a3945384cd] # # patch "commands.cc" # from [67c6e0b7843df6c466dbb3ef9def38498684478d] # to [54f6656a108041f2c45830fdbfcc4d21554323f7] # # patch "po/fr.po" # from [1cc9083443a50ae73f039d17ceb547eaad04b9f0] # to [bc02b451090cd5c8e1d7db51bfac6259efad3355] # # patch "po/ja.po" # from [0b4599ee497a230e6d90a6e4bc48b2f1d09b219a] # to [bf3f6bcb48e546d32df49afe123e85694f37d6f7] # # patch "po/pt_BR.po" # from [d364d01614746e1da2256825f652af89b6836197] # to [5c5094c58a3e7acffb1cf31073b12fbe6b6bcd22] # ============================================================ --- ChangeLog 012316a22aa364034903caa6fa70d1cc342c0ffd +++ ChangeLog c1899c67969784794dbd5218c0c4a2a3945384cd @@ -1,3 +1,7 @@ +2006-01-02 Jonathan Ho + + * commands.cc (CMD(clone)): added new clone command + 2005-12-29 Nathaniel Smith * NEWS: Write up for 0.25. ============================================================ --- commands.cc 67c6e0b7843df6c466dbb3ef9def38498684478d +++ commands.cc 54f6656a108041f2c45830fdbfcc4d21554323f7 @@ -2101,6 +2101,16 @@ include_pattern, exclude_pattern, app); } +CMD(clone, N_("network"), N_("[ADDRESS[:PORTNUMBER] [PATTERN]]"), + N_("clone branches matching PATTERN from netsync server at ADDRESS"), + OPT_SET_DEFAULT % OPT_EXCLUDE) +{ + app.db.initialize(); + + cmd_pull pull; + pull.exec(app, args); +} + CMD(serve, N_("network"), N_("PATTERN ..."), N_("serve the branches specified by PATTERNs to connecting clients"), OPT_BIND % OPT_PIDFILE % OPT_EXCLUDE) ============================================================ --- po/fr.po 1cc9083443a50ae73f039d17ceb547eaad04b9f0 +++ po/fr.po bc02b451090cd5c8e1d7db51bfac6259efad3355 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: monotone 0.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-06 15:24+0100\n" +"POT-Creation-Date: 2006-01-02 16:42-0800\n" "PO-Revision-Date: 2005-12-01 14:35+0100\n" "Last-Translator: Benoît Dejean \n" "Language-Team: Benoît Dejean \n" @@ -15,25 +15,479 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../commands.cc:201 +#: app_state.cc:66 +#, c-format +msgid "initializing from directory %s\n" +msgstr "" + +#: app_state.cc:87 +#, c-format +msgid "branch name is '%s'\n" +msgstr "le nom de la branche est « %s »\n" + +#: app_state.cc:94 +#, c-format +msgid "setting dump path to %s\n" +msgstr "" + +#: app_state.cc:108 +#, c-format +msgid "working copy directory required but not found%s%s" +msgstr "" + +#: app_state.cc:116 +#, fuzzy, c-format +msgid "invalid directory ''" +msgstr "chem" + +#: app_state.cc:118 +#, c-format +msgid "creating working copy in %s\n" +msgstr "création d'une copie de travail dans %s\n" + +#: app_state.cc:124 +#, fuzzy, c-format +msgid "monotone bookkeeping directory '%s' already exists in '%s'\n" +msgstr "le fichier pid « %s » existe déjà" + +#: app_state.cc:127 +#, fuzzy, c-format +msgid "creating bookkeeping directory '%s' for working copy in '%s'\n" +msgstr "création d'une copie de travail dans %s\n" + +#: app_state.cc:158 +#, c-format +msgid "'%s' ignored by restricted path set\n" +msgstr "" + +#: app_state.cc:163 app_state.cc:181 +#, c-format +msgid "unknown path '%s'\n" +msgstr "chemin inconnu « %s »\n" + +#: app_state.cc:165 +#, c-format +msgid "'%s' added to restricted path set\n" +msgstr "" + +#: app_state.cc:176 +#, c-format +msgid "'%s' ignored by excluded path set\n" +msgstr "" + +#: app_state.cc:183 +#, c-format +msgid "'%s' added to excluded path set\n" +msgstr "" + +#: app_state.cc:210 +#, c-format +msgid "checking excluded path set for '%s'\n" +msgstr "" + +#: app_state.cc:217 app_state.cc:250 +#, c-format +msgid "path '%s' found in excluded path set; '%s' excluded\n" +msgstr "" + +#: app_state.cc:236 +#, fuzzy, c-format +msgid "checking restricted path set for '%s'\n" +msgstr "vérification de la révisions %s\n" + +#: app_state.cc:244 +#, c-format +msgid "path '%s' found in restricted path set; '%s' included\n" +msgstr "" + +#: app_state.cc:332 +#, fuzzy, c-format +msgid "search root '%s' does not exist" +msgstr "le fichier rc « %s » n'existe pas" + +#: app_state.cc:333 +#, fuzzy, c-format +msgid "search root '%s' is not a directory\n" +msgstr "la racin" + +#: app_state.cc:335 +#, c-format +msgid "set search root to %s\n" +msgstr "" + +#: app_state.cc:366 +#, c-format +msgid "negative depth not allowed\n" +msgstr "profondeur négative interdite\n" + +#: app_state.cc:374 +#, fuzzy, c-format +msgid "negative or zero last not allowed\n" +msgstr "profondeur négative interdite\n" + +#: app_state.cc:497 +#, c-format +msgid "Failed to read options file %s" +msgstr "La lecture du fichier d'options « %s » a échouée" + +#: app_state.cc:514 +#, 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 +#, fuzzy, c-format +msgid "no private key '%s' found in key store or get_priv_key hook" +msgstr "la clef publique ou privée « %s » n'existe pas dans la base de données" + +#: 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 +#, fuzzy, c-format +msgid "processing delta on %s\n" +msgstr "connexion à %s\n" + +#: change_set.cc:1577 +#, c-format +msgid "delta on %s in first changeset renamed to %s\n" +msgstr "" + +#: 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 +#, fuzzy, c-format +msgid "skipping common change on %s (tid %d)\n" +msgstr "pas d'ancêtre commun pour « %s » et « %s »\n" + +#: 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 "" + +#: change_set.cc:2139 +#, c-format +msgid "merge is copying delta '%s' : '%s' -> '%s'\n" +msgstr "" + +#: change_set.cc:2163 +#, c-format +msgid "propagating new file addition delta on '%s' : '%s' -> '%s'\n" +msgstr "" + +#: change_set.cc:2175 +#, c-format +msgid "skipping new file addition delta on '%s' : '' -> '%s'\n" +msgstr "" + +#: 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 "" + +#: 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 +#, fuzzy, c-format +msgid "merging change sets\n" +msgstr "échange avorté avec %s\n" + +#: 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 +#, fuzzy, c-format +msgid "converting delta %s -> %s on %s\n" +msgstr "conversion de %d octets de %s en %s\n" + +#: 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 +#, fuzzy, c-format +msgid "expanding command '%s'\n" +msgstr "exécution de la commande « %s »\n" + +#: commands.cc:153 +#, fuzzy, c-format +msgid "expanded command to '%s'\n" +msgstr "exécution de la commande « %s »\n" + +#: commands.cc:158 +#, fuzzy, c-format +msgid "command '%s' has multiple ambiguous expansions:\n" +msgstr "la sélection « %s » a plusieurs expansions ambigües : \n" + +#: commands.cc:201 msgid "commands:" msgstr "commandes :" -#: ../commands.cc:323 ../commands.cc:1275 ../commands.cc:1355 -#: ../commands.cc:1720 ../commands.cc:2670 ../commands.cc:3358 -#: ../commands.cc:3575 ../commands.cc:3612 +#: 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:2684 commands.cc:3372 commands.cc:3592 commands.cc:3629 msgid "informative" msgstr "information" -#: ../commands.cc:323 +#: commands.cc:323 msgid "command [ARGS...]" msgstr "commande [ARGUMENTS...]" -#: ../commands.cc:323 +#: commands.cc:323 msgid "display command help" msgstr "afficher l'aide de la commande" -#: ../commands.cc:382 +#: commands.cc:382 msgid "" "Enter a description of this change.\n" "Lines beginning with `MT:' are removed automatically.\n" @@ -41,11 +495,16 @@ "Saisissez une description pour cette modification.\n" "Les lignes débutant par « MT: » sont supprimées automatiquement.\n" -#: ../commands.cc:398 +#: 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 : " -#: ../commands.cc:399 +#: commands.cc:399 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -54,8 +513,60 @@ "la branche « %s » a plusieurs heads\n" "vous devriez peut-être lancer « monotone merge »" -#: ../commands.cc:551 +#: commands.cc:459 commands.cc:715 commands.cc:1374 commands.cc:1446 +#: commands.cc:1831 commands.cc:2731 commands.cc:2746 commands.cc:2749 +#: commands.cc:2947 commands.cc:3611 #, 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 +#, fuzzy, c-format +msgid "expanded to '%s'\n" +msgstr "expansion de la sélection « %s »\n" + +#: 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 "" "Key : %s\n" "Sig : %s\n" @@ -67,192 +578,313 @@ "Nom : %s\n" "Valeur : %s\n" -#: ../commands.cc:585 +#: commands.cc:585 msgid "ok" msgstr "0K" -#: ../commands.cc:588 +#: commands.cc:588 msgid "bad" msgstr "mauvais" -#: ../commands.cc:591 +#: commands.cc:591 msgid "unknown" msgstr "inconnu" -#: ../commands.cc:851 ../commands.cc:875 ../commands.cc:912 ../commands.cc:933 -#: ../commands.cc:969 +#: 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" msgstr "clef et certificat" -#: ../commands.cc:851 ../commands.cc:875 ../commands.cc:912 +#: commands.cc:851 commands.cc:875 commands.cc:912 msgid "KEYID" msgstr "IDCLEF" -#: ../commands.cc:851 +#: commands.cc:851 msgid "generate an RSA key-pair" msgstr "générer une paire de clefs RSA" -#: ../commands.cc:875 +#: 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:913 +#: 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:933 +#: 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]" msgstr "RÉVISION CERTIFICAT " -#: ../commands.cc:934 +#: commands.cc:934 msgid "create a cert for a revision" msgstr "créer un certificat pour une révision" -#: ../commands.cc:969 +#: commands.cc:969 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "RÉVISION NOM VALEUR SIGNATAIRE1 [SIGNATAIRE2 [...]]" -#: ../commands.cc:970 +#: commands.cc:970 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" msgstr "" -#: ../commands.cc:1012 +#: 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" -#: ../commands.cc:1012 +#: commands.cc:1012 msgid "UNtrusted" msgstr "NON-fiable" -#: ../commands.cc:1015 ../commands.cc:1028 ../commands.cc:1040 -#: ../commands.cc:1057 ../commands.cc:1103 +#: commands.cc:1015 commands.cc:1028 commands.cc:1040 commands.cc:1057 +#: commands.cc:1103 msgid "review" msgstr "" -#: ../commands.cc:1015 +#: commands.cc:1015 msgid "REVISION TAGNAME" msgstr "" -#: ../commands.cc:1016 +#: commands.cc:1016 #, fuzzy msgid "put a symbolic tag cert on a revision version" msgstr "mettre une certificat-étiquette symbolique" -#: ../commands.cc:1028 +#: commands.cc:1028 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "" -#: ../commands.cc:1029 +#: commands.cc:1029 msgid "note the results of running a test on a revision" msgstr "" -#: ../commands.cc:1040 ../commands.cc:1057 +#: commands.cc:1040 commands.cc:1057 msgid "REVISION" msgstr "RÉVISION" -#: ../commands.cc:1041 +#: commands.cc:1041 msgid "approve of a particular revision" msgstr "approuver une révision particulière" -#: ../commands.cc:1058 +#: 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:1103 +#: 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]" -#: ../commands.cc:1104 +#: commands.cc:1104 msgid "comment on a particular revision" msgstr "commenter une révision en particulier" -#. static void dump_change_set(string const & name, -#. change_set & cs) -#. { -#. data dat; -#. write_change_set(cs, dat); -#. cout << "change set '" << name << "'\n" << dat << endl; -#. } -#: ../commands.cc:1129 ../commands.cc:1166 ../commands.cc:1200 -#: ../commands.cc:1332 ../commands.cc:2198 ../commands.cc:2321 -#: ../commands.cc:2882 ../commands.cc:3415 +#: 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" + +#: commands.cc:1129 commands.cc:1166 commands.cc:1200 commands.cc:1332 +#: commands.cc:2208 commands.cc:2331 commands.cc:2896 commands.cc:3429 msgid "working copy" msgstr "copie de travail" -#: ../commands.cc:1129 ../commands.cc:1166 ../commands.cc:1275 -#: ../commands.cc:2321 ../commands.cc:2670 ../commands.cc:3415 +#: commands.cc:1129 commands.cc:1166 commands.cc:1275 commands.cc:2331 +#: commands.cc:2684 commands.cc:3429 msgid "[PATH]..." msgstr "[CHEMIN]..." -#: ../commands.cc:1130 +#: commands.cc:1130 msgid "add files to working copy" msgstr "ajouter des fichiers à la copie de travail" -#: ../commands.cc:1167 +#: commands.cc:1167 msgid "drop files from working copy" msgstr "supprimer des fichiers de la copie de travail" -#: ../commands.cc:1200 +#: commands.cc:1200 msgid "SRC DST" msgstr "SRC DST" -#: ../commands.cc:1201 +#: commands.cc:1201 msgid "rename entries in the working copy" msgstr "renommer des entrées dans la copie de travail" -#. fload and fmerge are simple commands for debugging the line -#. merger. -#: ../commands.cc:1229 ../commands.cc:1242 ../commands.cc:2803 -#: ../commands.cc:2820 ../commands.cc:3495 +#: commands.cc:1229 commands.cc:1242 commands.cc:2817 commands.cc:2834 +#: commands.cc:3512 msgid "debug" msgstr "debug" -#: ../commands.cc:1229 +#: commands.cc:1229 msgid "load file contents into db" msgstr "charger le contenu du fichier dans la base de données" -#: ../commands.cc:1242 +#: commands.cc:1242 msgid " " msgstr " " -#: ../commands.cc:1243 +#: commands.cc:1243 msgid "merge 3 files and output result" msgstr "" -#: ../commands.cc:1275 +#: commands.cc:1253 +#, fuzzy, c-format +msgid "ancestor file id does not exist" +msgstr "l'id du fichier gauche n'existe pas" + +#: 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" -#: ../commands.cc:1332 +#: commands.cc:1332 msgid "[PATH]" msgstr "[CHEMIN]" -#: ../commands.cc:1333 +#: commands.cc:1333 msgid "calculate identity of PATH or stdin" msgstr "calculer l'identité du CHEMIN ou de l'entrée standard" -#: ../commands.cc:1356 +#: commands.cc:1356 msgid "FILENAME" msgstr "FICHIER" -#: ../commands.cc:1357 +#: commands.cc:1357 msgid "write file from database to stdout" msgstr "écrire un fichier de la base de donnée sur la sortie standard" -#: ../commands.cc:1397 ../commands.cc:1505 ../commands.cc:3158 -#: ../commands.cc:3207 ../commands.cc:3292 ../commands.cc:3299 -#: ../commands.cc:3780 +#: 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:3172 commands.cc:3221 +#: commands.cc:3306 commands.cc:3313 commands.cc:3797 msgid "tree" msgstr "arborescence" -#: ../commands.cc:1397 +#: commands.cc:1397 msgid "[DIRECTORY]\n" msgstr "[DOSSIER]\n" -#: ../commands.cc:1398 +#: commands.cc:1398 msgid "" "check out a revision from database into directory.\n" "If a revision is given, that's the one that will be checked out.\n" @@ -266,11 +898,82 @@ "Si aucun nom de dossier n'est fourni, le nom de la branche sera utilisé\n" "comme nom de dossier" -#: ../commands.cc:1505 +#: 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:3185 commands.cc:3255 +#: commands.cc:3258 +#, c-format +msgid "branch '%s' is empty\n" +msgstr "la branche « %s » est vide\n" + +#: commands.cc:1438 +#, fuzzy, c-format +msgid "branch %s has multiple heads" +msgstr "la branche %s a %d entrées\n" + +#: commands.cc:1459 +#, fuzzy, c-format +msgid "found %d %s branch certs on revision %s\n" +msgstr "mise à jour vers la révision de base %s\n" + +#: 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 +#, fuzzy, c-format +msgid "no manifest %s found in database" +msgstr "aucune clef publique « %s » dans la base de données" + +#: commands.cc:1482 +#, fuzzy, c-format +msgid "checking out revision %s to directory %s\n" +msgstr "vérification de la révisions %s\n" + +#: commands.cc:1488 +#, fuzzy, c-format +msgid "no file %s found in database for %s" +msgstr "aucune clef publique « %s » dans la base de données" + +#: commands.cc:1492 commands.cc:3499 +#, fuzzy, c-format +msgid "writing file %s to %s\n" +msgstr "déplacement du fichier %s -> %s\n" + +#: commands.cc:1505 msgid "show unmerged head revisions of branch" msgstr "" -#: ../commands.cc:1721 +#: commands.cc:1513 commands.cc:3181 +#, 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 +#, fuzzy, c-format +msgid "no epoch for branch %s\n" +msgstr "%s n'est pas dans la branche %s\n" + +#: commands.cc:1721 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -284,104 +987,212 @@ "missing" msgstr "" -#: ../commands.cc:1731 +#: commands.cc:1731 msgid "" "show database objects, or the current working copy manifest,\n" "or unknown, intentionally ignored, or missing state files" msgstr "" -#: ../commands.cc:1768 ../commands.cc:1794 ../commands.cc:1818 -#: ../commands.cc:1836 ../commands.cc:1855 ../commands.cc:1874 -#: ../commands.cc:1892 ../commands.cc:1920 ../commands.cc:1938 +#: commands.cc:1768 commands.cc:1794 commands.cc:1818 commands.cc:1836 +#: commands.cc:1855 commands.cc:1874 commands.cc:1892 commands.cc:1920 +#: commands.cc:1938 msgid "packet i/o" msgstr "" -#: ../commands.cc:1768 ../commands.cc:1794 +#: commands.cc:1768 commands.cc:1794 msgid "OLDID NEWID" msgstr "ANCIENID NOUVELID" -#: ../commands.cc:1769 +#: commands.cc:1769 msgid "write manifest delta packet to stdout" msgstr "" -#: ../commands.cc:1795 +#: 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:1818 ../commands.cc:1836 ../commands.cc:1855 -#: ../commands.cc:1874 ../commands.cc:1892 ../commands.cc:1920 +#: commands.cc:1809 commands.cc:1811 commands.cc:1868 commands.cc:2229 +#, 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" msgstr "ID" -#: ../commands.cc:1818 +#: commands.cc:1818 msgid "write revision data packet to stdout" msgstr "" -#: ../commands.cc:1836 +#: commands.cc:1836 msgid "write manifest data packet to stdout" msgstr "" -#: ../commands.cc:1855 +#: commands.cc:1855 msgid "write file data packet to stdout" msgstr "" -#: ../commands.cc:1874 +#: commands.cc:1874 msgid "write cert packets to stdout" msgstr "" -#: ../commands.cc:1892 +#: commands.cc:1892 msgid "write public key packet to stdout" msgstr "" -#: ../commands.cc:1920 +#: 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:1939 +#: 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:1966 ../commands.cc:2060 ../commands.cc:2075 -#: ../commands.cc:2089 ../commands.cc:2104 +#: 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 commands.cc:2114 msgid "network" msgstr "réseau" -#: ../commands.cc:1967 +#: commands.cc:1967 msgid "rebuild the indices used to sync over the network" msgstr "" "reconstruction des index utilisés pour la synchronisation par le réseau" -#: ../commands.cc:2060 ../commands.cc:2075 ../commands.cc:2089 +#: commands.cc:2004 +#, fuzzy, c-format +msgid "setting default server to %s\n" +msgstr "utilisation de l'adresse par défaut du serveur : %s\n" + +#: 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 +#, fuzzy, c-format +msgid "no branch pattern given" +msgstr "aucune phrase de passe fournie" + +#: commands.cc:2044 +#, c-format +msgid "no branch pattern given and no default pattern set" +msgstr "" + +#: commands.cc:2048 +#, fuzzy, c-format +msgid "using default branch include pattern: '%s'\n" +msgstr "utilisation de l'adresse par défaut du serveur : %s\n" + +#: commands.cc:2056 +#, fuzzy, c-format +msgid "excluding: %s\n" +msgstr "inclusion de la branche %s" + +#: commands.cc:2060 commands.cc:2075 commands.cc:2089 commands.cc:2104 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADRESSE[:PORT] [MOTIF]]" -#: ../commands.cc:2061 +#: commands.cc:2061 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "" "envoie les branches correspondant au MOTIF au serveur netsync à l'ADRESSE" -#: ../commands.cc:2076 +#: commands.cc:2076 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "" -#: ../commands.cc:2090 +#: 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 "" -#: ../commands.cc:2104 +#: commands.cc:2105 +#, fuzzy +msgid "clone branches matching PATTERN from netsync server at ADDRESS" +msgstr "" +"envoie les branches correspondant au MOTIF au serveur netsync à l'ADRESSE" + +#: commands.cc:2114 msgid "PATTERN ..." msgstr "CHEMIN ..." -#: ../commands.cc:2105 +#: commands.cc:2115 msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "" "servir les branches spécifiées par les MOTIFs aux clients qui se connectent" -#: ../commands.cc:2130 +#: commands.cc:2128 +#, c-format +msgid "" +"need permission to store persistent passphrase (see hook persist_phrase_ok())" +msgstr "" + +#: commands.cc:2140 msgid "database" msgstr "base de données" -#: ../commands.cc:2131 +#: commands.cc:2141 msgid "" "init\n" "info\n" @@ -399,80 +1210,355 @@ "set_epoch BRANCH EPOCH\n" msgstr "" -#: ../commands.cc:2145 +#: commands.cc:2155 msgid "manipulate database state" msgstr "manipule l'état de la base de données" -#: ../commands.cc:2198 +#: commands.cc:2208 msgid "" "set FILE ATTR VALUE\n" "get FILE [ATTR]\n" "drop FILE" msgstr "" -#: ../commands.cc:2199 +#: commands.cc:2209 msgid "set, get or drop file attributes" msgstr "" -#: ../commands.cc:2322 +#: commands.cc:2297 work.cc:113 +#, fuzzy, c-format +msgid "registering %s file in working copy\n" +msgstr "renommer des entrées dans la copie de travail" + +#: commands.cc:2326 +#, fuzzy, c-format +msgid "failed to parse date string '%s': %s" +msgstr "impossible de créer le dossier : %s : %s\n" + +#: commands.cc:2332 msgid "commit working copy to database" msgstr "" -#: ../commands.cc:2671 +#: commands.cc:2350 +#, c-format +msgid "no changes to commit\n" +msgstr "aucun changement à valider\n" + +#: commands.cc:2364 +#, fuzzy, c-format +msgid "beginning commit on branch '%s'\n" +msgstr "début du service sur %s : %d\n" + +#: commands.cc:2365 +#, c-format msgid "" +"new manifest '%s'\n" +"new revision '%s'\n" +msgstr "" +"nouveau manifeste « %s »\n" +"nouvelle révision « %s »\n" + +#: commands.cc:2372 +#, c-format +msgid "--message and --message-file are mutually exclusive" +msgstr "--message et --message-file sont mutuellement exclusifs" + +#: commands.cc:2375 +#, 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:2380 +#, fuzzy, 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 "MT/log n'est pas vide et --message-file a été passé\n" + +#: commands.cc:2398 +#, fuzzy, c-format +msgid "empty log message; commit canceled" +msgstr "message du journal vide" + +#: commands.cc:2410 +#, c-format +msgid "revision %s already in database\n" +msgstr "la révision %s est déjà dans la base de données\n" + +#: commands.cc:2415 +#, c-format +msgid "inserting new revision %s\n" +msgstr "insertion de la nouvelle révision %s\n" + +#: commands.cc:2424 +#, fuzzy, c-format +msgid "skipping manifest %s, already in database\n" +msgstr "la révision %s est déjà dans la base de données\n" + +#: commands.cc:2428 +#, fuzzy, c-format +msgid "inserting manifest delta %s -> %s\n" +msgstr "erreur lors de l'analyse du manifeste %s : %s" + +#: commands.cc:2439 +#, fuzzy, c-format +msgid "inserting full manifest %s\n" +msgstr "vérification du manifeste « %s »\n" + +#: commands.cc:2452 +#, fuzzy, c-format +msgid "skipping file delta %s, already in database\n" +msgstr "la révision %s est déjà dans la base de données\n" + +#: commands.cc:2458 +#, fuzzy, c-format +msgid "inserting delta %s -> %s\n" +msgstr "insertion de la nouvelle révision %s\n" + +#: commands.cc:2468 commands.cc:2485 +#, c-format +msgid "file '%s' modified during commit, aborting" +msgstr "le fichier « %s » a été modifié pendant le commit, interruption" + +#: commands.cc:2478 +#, fuzzy, c-format +msgid "inserting full version %s\n" +msgstr "insertion de la nouvelle révision %s\n" + +#: commands.cc:2512 +#, fuzzy, c-format +msgid "committed revision %s\n" +msgstr "erreur réseau : %s" + +#: commands.cc:2518 +#, c-format +msgid "" +"note: this revision creates divergence\n" +"note: you may (or may not) wish to run 'monotone merge'" +msgstr "" + +#: commands.cc:2685 +msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the working directory and\n" "that revision is shown. If two revisions are given, the diff between\n" "them is given. If no format is specified, unified is used by default." msgstr "" -#: ../commands.cc:2803 ../commands.cc:2820 +#: commands.cc:2701 +#, 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:2735 +#, c-format +msgid "current revision has no ancestor" +msgstr "la révision actuelle n'existe pas" + +#: commands.cc:2774 +#, c-format +msgid "no common ancestor for %s and %s" +msgstr "pas d'ancêtre commun pour %s et %s" + +#: commands.cc:2780 +#, c-format +msgid "concatenating un-committed changeset to composite\n" +msgstr "" + +#: commands.cc:2817 commands.cc:2834 msgid "LEFT RIGHT" msgstr "GAUCHE DROITE" -#: ../commands.cc:2803 +#: commands.cc:2817 #, fuzzy msgid "print least common ancestor" msgstr "l'ancêtre commun est %s\n" -#: ../commands.cc:2816 +#: commands.cc:2830 msgid "no common ancestor found" msgstr "aucun ancêtre commun n'a été trouvé" -#: ../commands.cc:2820 +#: commands.cc:2834 msgid "print least common ancestor / dominator" msgstr "" -#: ../commands.cc:2834 +#: commands.cc:2848 #, fuzzy msgid "no common ancestor/dominator found" msgstr "l'ancêtre commun est %s\n" -#: ../commands.cc:2883 +#: commands.cc:2873 +#, fuzzy, c-format +msgid "updating %s to %s" +msgstr "mise à jour de %s en %s\n" + +#: commands.cc:2897 msgid "" "update working copy.\n" "If a revision is given, base the update on that revision. If not,\n" "base the update on the head of the branch (given or implicit)." msgstr "" -#: ../commands.cc:3158 +#: commands.cc:2922 +#, 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:2929 +#, 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:2934 +#, c-format +msgid "multiple update candidates:\n" +msgstr "plusieurs candidats pour la mise à jour :\n" + +#: commands.cc:2938 +#, c-format +msgid "choose one with 'monotone update -r'\n" +msgstr "choisissez en un avec « monotone update -r »\n" + +#: commands.cc:2939 +#, c-format +msgid "multiple candidates remain after selection" +msgstr "" + +#: commands.cc:2954 +#, c-format +msgid "already up to date at %s\n" +msgstr "déjà à jour en %s\n" + +#: commands.cc:2962 +#, c-format +msgid "selected update target %s\n" +msgstr "sélection de la cible %s pour la mise à jour\n" + +#: commands.cc:2974 +#, fuzzy, c-format +msgid "" +"revision %s is not a member of branch %s\n" +"try again with explicit --branch\n" +msgstr "la révision %s n'est pas membre de la branche %s\n" + +#: commands.cc:2989 +#, c-format +msgid "updating along chosen edge %s -> %s\n" +msgstr "" + +#: commands.cc:3000 +#, fuzzy, c-format +msgid "merging working copy with chosen edge %s -> %s\n" +msgstr "création d'une copie de travail dans %s\n" + +#: commands.cc:3049 +#, c-format +msgid "updated to base revision %s\n" +msgstr "mise à jour vers la révision de base %s\n" + +#: commands.cc:3115 +#, 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:3126 +#, fuzzy, c-format +msgid "no common ancestor found, synthesizing edges\n" +msgstr "aucun ancêtre commun n'a été trouvé" + +#: commands.cc:3172 #, fuzzy msgid "merge unmerged heads of branch" msgstr "fusionne les" -#: ../commands.cc:3207 +#: commands.cc:3186 +#, c-format +msgid "branch '%s' is merged\n" +msgstr "la branche « %s » est fusionnée\n" + +#: commands.cc:3192 +#, fuzzy, c-format +msgid "starting with revision 1 / %d\n" +msgstr "insertion de la nouvelle révision %s\n" + +#: commands.cc:3196 +#, fuzzy, c-format +msgid "merging with revision %d / %d\n" +msgstr "insertion de la nouvelle révision %s\n" + +#: commands.cc:3197 commands.cc:3198 commands.cc:3265 commands.cc:3349 +#: commands.cc:3350 +#, c-format +msgid "[source] %s\n" +msgstr "[source] %s\n" + +#: commands.cc:3215 commands.cc:3302 commands.cc:3369 +#, c-format +msgid "[merged] %s\n" +msgstr "[fusionné] %s\n" + +#: commands.cc:3218 +#, c-format +msgid "note: your working copies have not been updated\n" +msgstr "" + +#: commands.cc:3221 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "" -#: ../commands.cc:3208 +#: commands.cc:3222 msgid "merge from one branch to another asymmetrically" msgstr "" -#: ../commands.cc:3292 +#: commands.cc:3256 commands.cc:3259 +#, c-format +msgid "branch '%s' is not merged\n" +msgstr "la branche « %s » n'est pas fusionnée\n" + +#: commands.cc:3264 +#, fuzzy, c-format +msgid "propagating %s -> %s\n" +msgstr "mise à jour de %s en %s\n" + +#: commands.cc:3266 +#, c-format +msgid "[target] %s\n" +msgstr "[cible] %s\n" + +#: commands.cc:3271 +#, c-format +msgid "branch '%s' is up-to-date with respect to branch '%s'\n" +msgstr "" + +#: commands.cc:3273 +#, c-format +msgid "no action taken\n" +msgstr "" + +#: commands.cc:3277 +#, c-format +msgid "no merge necessary; putting %s in branch '%s'\n" +msgstr "" + +#: commands.cc:3306 msgid "refresh the inodeprint cache" msgstr "rafraîchir le cache d'inodeprint" -#: ../commands.cc:3300 +#: commands.cc:3314 msgid "" "LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" @@ -480,76 +1566,152 @@ "RÉVISION-GAUCHE RÉVISION-DROITE BRANCHE-DESTINATION\n" "RÉVISION GAUCHE RÉVISION DROITE ANCÊTRE-COMMUN BRANCHE-DESTINATION" -#: ../commands.cc:3302 +#: commands.cc:3316 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" -#: ../commands.cc:3358 +#: commands.cc:3331 commands.cc:3333 +#, c-format +msgid "%s is not an ancestor of %s" +msgstr "%s n'est pas un ancêtre de %s" + +#: commands.cc:3342 +#, c-format +msgid "%s and %s are the same revision, aborting" +msgstr "" + +#: commands.cc:3344 commands.cc:3346 +#, c-format +msgid "%s is already an ancestor of %s" +msgstr "%s est déjà un ancêtre de %s" + +#: commands.cc:3372 msgid "(revision|manifest|file|key) PARTIAL-ID" msgstr "" -#: ../commands.cc:3359 +#: commands.cc:3373 msgid "complete partial id" msgstr "" -#: ../commands.cc:3416 -msgid "revert file(s), dir(s) or entire working copy" +#: commands.cc:3382 +#, fuzzy, c-format +msgid "non-hex digits in partial id" +msgstr "chiffre non-héxadécimal dans l'id" + +#: commands.cc:3430 +msgid "revert file(s), dir(s) or entire working copy (\".\")" msgstr "" -#: ../commands.cc:3495 +#: commands.cc:3458 +#, c-format +msgid "revert adding find_missing entries to %d original args elements\n" +msgstr "" + +#: commands.cc:3467 +#, c-format +msgid "" +"after adding everything from find_missing, revert args_copy has %d elements\n" +msgstr "" + +#: commands.cc:3491 +#, fuzzy, c-format +msgid "reverting %s to %s" +msgstr "mise à jour de %s en %s\n" + +#: commands.cc:3495 +#, fuzzy, c-format +msgid "no file version %s found in database for %s" +msgstr "aucune clef publique « %s » dans la base de données" + +#: commands.cc:3512 msgid "RCSFILE..." msgstr "FICHIER_RCS..." -#: ../commands.cc:3496 +#: commands.cc:3513 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " "cvs_import" msgstr "" -#: ../commands.cc:3512 +#: commands.cc:3529 msgid "rcs" msgstr "rcs" -#: ../commands.cc:3512 +#: commands.cc:3529 msgid "CVSROOT" msgstr "CVSROOT" -#: ../commands.cc:3512 +#: commands.cc:3529 msgid "import all versions in CVS repository" msgstr "importer toutes les versions d'un dépôt CVS" -#: ../commands.cc:3575 +#: commands.cc:3592 msgid "PATH" msgstr "CHEMIN" -#: ../commands.cc:3576 +#: commands.cc:3593 msgid "print annotated copy of the file from REVISION" msgstr "" -#: ../commands.cc:3612 +#: commands.cc:3610 +#, fuzzy, c-format +msgid "no revision for file '%s' in database" +msgstr "la révision %s est déjà dans la base de données\n" + +#: commands.cc:3613 +#, fuzzy, c-format +msgid "annotate file file_path '%s'\n" +msgstr "Impossible de trouver la clef « %s »" + +#: commands.cc:3622 +#, c-format +msgid "no such file '%s' in revision '%s'\n" +msgstr "aucun fichier « %s » dans la révision « %s »\n" + +#: commands.cc:3624 +#, c-format +msgid "annotate for file_id %s\n" +msgstr "" + +#: commands.cc:3629 msgid "[FILE]" msgstr "[FICHIER]" -#: ../commands.cc:3613 +#: commands.cc:3630 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." msgstr "" -#: ../commands.cc:3780 +#: commands.cc:3690 +#, fuzzy, c-format +msgid "revision %s does not exist in db, skipping\n" +msgstr "la révision de base %s n'existe pas dans la base de données\n" + +#: commands.cc:3723 +#, fuzzy, c-format +msgid "revision '%s' in '%s' maps to '%s' in %s\n" +msgstr "la révision %s n'est pas membre de la branche %s\n" + +#: commands.cc:3797 msgid "DIRECTORY" msgstr "DOSSIER" -#: ../commands.cc:3780 +#: commands.cc:3797 msgid "setup a new working copy directory" msgstr "préparer un dossier pour une nouvelle copie de travail" -#: ../commands.cc:3795 +#: commands.cc:3803 +#, c-format +msgid "need --branch argument for setup" +msgstr "" + +#: commands.cc:3812 msgid "automation" msgstr "automatisation" -#: ../commands.cc:3796 +#: commands.cc:3813 msgid "" "interface_version\n" "heads [BRANCH]\n" @@ -573,1454 +1735,3391 @@ "keys\n" msgstr "" -#: ../commands.cc:3816 +#: commands.cc:3833 msgid "automation interface" msgstr "interface d'automatisation" -#: ../commands.cc:3830 ../commands.cc:3846 +#: commands.cc:3847 commands.cc:3863 msgid "vars" msgstr "variables" -#: ../commands.cc:3830 +#: commands.cc:3847 msgid "DOMAIN NAME VALUE" msgstr "DOMAINE NOM VALEUR" -#: ../commands.cc:3831 +#: commands.cc:3848 msgid "set the database variable NAME to VALUE, in domain DOMAIN" msgstr "" -#: ../commands.cc:3846 +#: commands.cc:3863 msgid "DOMAIN NAME" msgstr "DOMAINE NOM VALEUR" -#: ../commands.cc:3847 +#: commands.cc:3864 msgid "remove the database variable NAME in domain DOMAIN" msgstr "" "supprimer la variable NOM de la base de données dans le domaine DOMAINE" -#: ../database_check.cc:111 +#: commands.cc:3875 +#, 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:136 ../rcs_import.cc:1258 +#: database_check.cc:116 +#, fuzzy, c-format +msgid "checking file %s\n" +msgstr "importation du fichier « %s »\n" + +#: database_check.cc:134 +#, fuzzy, c-format +msgid "checking %d manifests\n" +msgstr "vérification du manifeste « %s »\n" + +#: database_check.cc:136 rcs_import.cc:1258 msgid "manifests" msgstr "manifestes" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../database_check.cc:192 ../database_check.cc:380 ../netsync.cc:3497 -#: ../rcs_import.cc:1257 +#: 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" + +#: database_check.cc:192 database_check.cc:380 netsync.cc:3497 +#: rcs_import.cc:1257 msgid "revisions" msgstr "révisions" -#: ../database_check.cc:291 +#: 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 +#, fuzzy, c-format +msgid "checked %d revisions after starting with %d\n" +msgstr "insertion de la nouvelle révision %s\n" + +#: database_check.cc:289 +#, fuzzy, c-format +msgid "checking %d ancestry edges\n" +msgstr "vérification du manifeste « %s »\n" + +#: database_check.cc:291 msgid "ancestry" msgstr "ancêtre" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../database_check.cc:324 ../netsync.cc:3501 +#: database_check.cc:322 +#, c-format +msgid "checking %d public keys\n" +msgstr "vérification de %d clefs publiques\n" + +#: database_check.cc:324 netsync.cc:3501 msgid "keys" msgstr "clefs" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../database_check.cc:350 ../netsync.cc:3499 +#: database_check.cc:348 +#, fuzzy, c-format +msgid "checking %d revision certs\n" +msgstr "insertion de la nouvelle révision %s\n" + +#: database_check.cc:350 netsync.cc:3499 msgid "certs" msgstr "certs" -#: ../database.cc:185 +#: database_check.cc:378 +#, fuzzy, c-format +msgid "checking local history of %d revisions\n" +msgstr "verification de %d révisions\n" + +#: database_check.cc:413 +#, fuzzy, c-format +msgid "file %s missing (%d manifest references)\n" +msgstr "noeud %d = révision %s = manifeste %s\n" + +#: database_check.cc:420 +#, c-format +msgid "file %s unreferenced\n" +msgstr "fichier %s non-référencé\n" + +#: database_check.cc:442 +#, fuzzy, c-format +msgid "manifest %s missing (%d revision references)\n" +msgstr "insertion de la nouvelle révision %s\n" + +#: database_check.cc:449 +#, fuzzy, c-format +msgid "manifest %s unreferenced\n" +msgstr "fichier %s non-référencé\n" + +#: 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 +#, fuzzy, c-format +msgid "manifest %s is not in normalized form\n" +msgstr "la révision %s n'est pas membre de la branche %s\n" + +#: database_check.cc:493 +#, c-format +msgid "revision %s missing (%d revision references; %d cert references)\n" +msgstr "" + +#: database_check.cc:500 +#, fuzzy, c-format +msgid "revision %s incomplete (%d missing manifests)\n" +msgstr "%d manifestes incomplets\n" + +#: database_check.cc:507 +#, fuzzy, c-format +msgid "revision %s incomplete (%d missing revisions)\n" +msgstr "nouvelle révisions %s\n" + +#: database_check.cc:514 +#, fuzzy, c-format +msgid "revision %s incomplete (%d incomplete manifests)\n" +msgstr "%d manifestes incomplets\n" + +#: 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 +#, fuzzy, c-format +msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n" +msgstr "la révision %s n'est pas membre de la branche %s\n" + +#: 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 +#, fuzzy, c-format +msgid "key %s missing (signed %d certs)\n" +msgstr "clef et certificat" + +#: database_check.cc:613 +#, c-format +msgid "revision %s unchecked signature in %s cert from missing key %s\n" +msgstr "" + +#: database_check.cc:621 +#, fuzzy, c-format +msgid "revision %s bad signature in %s cert from key %s\n" +msgstr "la révision %s est déjà dans la base de données\n" + +#: database_check.cc:636 +#, fuzzy, c-format +msgid "revision %s missing %s cert\n" +msgstr "%d certificats manquants\n" + +#: 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 +#, fuzzy, c-format +msgid "%d manifests not in normalized form\n" +msgstr "la révision %s n'est pas membre de la branche %s\n" + +#: 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 +#, fuzzy, c-format +msgid "%d mismatched parents\n" +msgstr "%d" + +#: database_check.cc:740 +#, fuzzy, c-format +msgid "%d mismatched children\n" +msgstr "%d" + +#: database_check.cc:742 +#, fuzzy, c-format +msgid "%d revisions with bad history\n" +msgstr "la révision %s est déjà dans la base de données\n" + +#: database_check.cc:744 +#, c-format +msgid "%d revisions not parseable (perhaps with invalid paths)\n" +msgstr "" + +#: database_check.cc:747 +#, fuzzy, c-format +msgid "%d revisions not in normalized form\n" +msgstr "la révision %s n'est pas membre de la branche %s\n" + +#: 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 +#, fuzzy, c-format +msgid "total problems detected: %d (%d serious)\n" +msgstr "problèmes mineurs détectés\n" + +#: 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:147 +#, fuzzy, c-format +msgid "unable to probe database version in file %s" +msgstr "La lecture du fichier d'options « %s » a échouée" + +#: database.cc:154 +#, c-format +msgid "database %s is not an sqlite version 3 file, try dump and reload" +msgstr "" +"la base de données %s n'est pas un fichier sqlite version 3, essayer dump " +"puis reload" + +#: database.cc:176 database.cc:187 +#, c-format +msgid "sqlite error: %d: %s" +msgstr "erreur sqlite : %d : %s" + +#: database.cc:181 msgid "make sure database and containing directory are writeable" msgstr "" -#: ../database.cc:494 +#: database.cc:226 +#, 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:231 +#, c-format +msgid "" +"existing (possibly stale) journal file '%s' has same stem as new database '%" +"s'\n" +"cancelling database creation" +msgstr "" + +#: database.cc:353 +#, c-format +msgid "cannot create %s; it already exists" +msgstr "impossible de créer %s car ceci existe déjà" + +#: database.cc:417 +#, 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:471 +#, c-format +msgid "database schema version: %s" +msgstr "version du schéma de la base de données : %s" + +#: database.cc:490 #, fuzzy msgid "mcerts" msgstr "mcerts" -#: ../database.cc:495 +#: database.cc:491 #, fuzzy msgid "pubkeys" msgstr "clefs" -#: ../database.cc:496 +#: database.cc:492 #, fuzzy msgid "privkeys" msgstr "clefs" -#: ../main.cc:325 +#: database.cc:536 +#, c-format +msgid "statement cache statistics\n" +msgstr "statistiques relatives au cache des expressions\n" + +#: database.cc:537 +#, c-format +msgid "prepared %d statements\n" +msgstr "%d expressions préparées\n" + +#: database.cc:541 +#, c-format +msgid "%d executions of %s\n" +msgstr "%d exécutions de %s\n" + +#: database.cc:594 +#, fuzzy, c-format +msgid "prepared statement %s\n" +msgstr "%d expressions préparées\n" + +#: database.cc:598 +#, c-format +msgid "multiple statements in query: %s\n" +msgstr "" + +#: database.cc:604 +#, c-format +msgid "wanted %d columns got %d in query: %s\n" +msgstr "" + +#: database.cc:610 +#, c-format +msgid "binding %d parameters for %s\n" +msgstr "" + +#: database.cc:624 +#, fuzzy, c-format +msgid "binding %d with value '%s'\n" +msgstr "importation du fichier « %s »\n" + +#: database.cc:640 +#, c-format +msgid "null result in query: %s\n" +msgstr "" + +#: database.cc:658 +#, c-format +msgid "wanted %d rows got %s in query: %s\n" +msgstr "" + +#: database.cc:668 +#, c-format +msgid "cannot change filename to %s while db is open" +msgstr "" + +#: database.cc:686 +#, c-format +msgid "" +"Attempt to start exclusive transaction within non-exclusive transaction." +msgstr "" + +#: database.cc:880 +#, c-format +msgid "version cache expiring %s\n" +msgstr "" + +#: database.cc:902 +#, c-format +msgid "version cache hit on %s\n" +msgstr "" + +#: database.cc:971 +#, fuzzy, c-format +msgid "reconstructing %s in %s\n" +msgstr "connexion à %s\n" + +#: database.cc:1077 +#, fuzzy, c-format +msgid "following delta %s -> %s\n" +msgstr "déplacement du dossier %s -> %s\n" + +#: database.cc:1499 +#, fuzzy, c-format +msgid "Killing revision %s locally\n" +msgstr "vérification de la révisions %s\n" + +#: database.cc:1511 +#, c-format +msgid "Deleting all references to branch %s\n" +msgstr "" + +#: database.cc:1524 +#, c-format +msgid "Deleting all references to tag %s\n" +msgstr "" + +#: database.cc:1625 +#, fuzzy, c-format +msgid "another key with name '%s' already exists" +msgstr "la clef « %s » existe déjà" + +#: database.cc:2253 +#, 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:2276 +#, c-format +msgid "processing selector type %d with i->second '%s'\n" +msgstr "" + +#: database.cc:2283 +#, c-format +msgid "limiting to current branch '%s'\n" +msgstr "" + +#: database.cc:2513 +#, c-format +msgid "no database specified" +msgstr "aucune base de données n'a été spécifiée" + +#: database.cc:2521 +#, c-format +msgid "database %s does not exist" +msgstr "la base de données %s n'existe pas" + +#: database.cc:2522 +#, c-format +msgid "%s is a directory, not a database" +msgstr "%s est un dossier, pas une base de données" + +#: database.cc:2547 +#, c-format +msgid "could not open database '%s': %s" +msgstr "impossible d'ouvrir la base de données « %s » : %s" + +#: database.cc:2592 +#, c-format +msgid "attempting to rollback and close %d databases" +msgstr "" + +#: database.cc:2601 +#, c-format +msgid "exec_err = %d, close_err = %d" +msgstr "" + +#: 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 +#, fuzzy, c-format +msgid "trying to merge %s <-> %s (ancestor: %s)\n" +msgstr "vérification si %s est un ancêtre de %s\n" + +#: 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 +#, fuzzy, c-format +msgid "trying to merge %s <-> %s\n" +msgstr "déplacement du dossier %s -> %s\n" + +#: 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 +#, fuzzy, c-format +msgid "'%s' in working copy is a directory, not a file" +msgstr "%s est un dossier, pas une base de données" + +#: diff_patch.cc:718 +#, fuzzy, c-format +msgid "file %s in working copy has id %s, wanted %s" +msgstr "création d'une copie de travail dans %s\n" + +#: file_io.cc:116 +#, fuzzy, c-format +msgid "expected file '%s', but it is a directory." +msgstr "le fichier %s ne peut être lu; c'est un dossier" + +#: file_io.cc:186 file_io.cc:193 +#, c-format +msgid "" +"could not create directory '%s'\n" +"it is a file" +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 +#, fuzzy, c-format +msgid "rename source file '%s' does not exist" +msgstr "le chemin %s n'existe pas" + +#: 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 +#, fuzzy, c-format +msgid "rename source dir '%s' does not exist" +msgstr "le chemin %s n'existe pas" + +#: 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 +#, fuzzy, c-format +msgid "file '%s' cannot be overwritten as data; it is a directory" +msgstr "le fichier %s ne peut être lu; c'est un dossier" + +#: 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 +#, fuzzy, c-format +msgid "empty passphrases not allowed, try again\n" +msgstr "la phrase de passe ne doit pas être vide" + +#: 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 +#, fuzzy, c-format +msgid "base64-decoding %d-byte 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: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 +#, fuzzy, c-format +msgid "base64-decoding %d-byte old 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:255 +#, fuzzy, c-format +msgid "building signer from %d-byte decrypted 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:355 +#, fuzzy, c-format +msgid "produced %d-byte signature\n" +msgstr "signature du client invalide\n" + +#: keys.cc:383 +#, c-format +msgid "building verifier for %d-byte pub key\n" +msgstr "" + +#: 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 +#, fuzzy, c-format +msgid "loading lua hook %s" +msgstr "ne pas charger les hooks standards lua" + +#: 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 +#, fuzzy, c-format +msgid "lua error while loading rcfile '%s'" +msgstr "erreur lua lors du chargement de « %s »" + +#: 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 +#, fuzzy, c-format +msgid "skipping nonexistent rcfile '%s'\n" +msgstr "omission du fichier %s qui peut ignoré\n" + +#: 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" -#: ../main.cc:329 +#: main.cc:329 msgid "terminated by signal" msgstr "terminé par un signal" -#: ../monotone.cc:51 +#: manifest.cc:55 +#, c-format +msgid "scanning file %s\n" +msgstr "analyse du fichier %s\n" + +#: manifest.cc:188 +#, fuzzy, c-format +msgid "missing %s" +msgstr "%d clefs manquantes\n" + +#: 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:51 msgid "select branch cert for operation" msgstr "" -#: ../monotone.cc:52 +#: monotone.cc:52 msgid "select revision id for operation" msgstr "" -#: ../monotone.cc:53 +#: monotone.cc:53 #, fuzzy msgid "set commit changelog message" msgstr "message du journal vide" -#: ../monotone.cc:54 +#: monotone.cc:54 msgid "set filename containing commit changelog message" msgstr "" -#: ../monotone.cc:55 +#: monotone.cc:55 msgid "override date/time for commit" msgstr "" -#: ../monotone.cc:56 +#: monotone.cc:56 msgid "override author for commit" msgstr "" -#: ../monotone.cc:57 +#: monotone.cc:57 msgid "limit the number of levels of directories to descend" msgstr "" -#: ../monotone.cc:58 +#: 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:59 +#: monotone.cc:59 msgid "record process id of server" msgstr "enregistrer l'identifiant du processus serveur" -#: ../monotone.cc:60 +#: monotone.cc:60 msgid "print a brief version of the normal output" msgstr "" -#: ../monotone.cc:61 +#: monotone.cc:61 msgid "print diffs along with logs" msgstr "" -#: ../monotone.cc:62 +#: monotone.cc:62 msgid "skip merges when printing logs" msgstr "" -#: ../monotone.cc:63 +#: monotone.cc:63 msgid "use the current arguments as the future default" msgstr "" -#: ../monotone.cc:64 +#: monotone.cc:64 msgid "leave out anything described by its argument" msgstr "" -#: ../monotone.cc:65 +#: monotone.cc:65 msgid "use unified diff format" msgstr "utiliser le format diff unifié" -#: ../monotone.cc:66 +#: monotone.cc:66 msgid "use context diff format" msgstr "utiliser le format diff contextuel" -#: ../monotone.cc:67 +#: monotone.cc:67 msgid "use external diff hook for generating diffs" msgstr "" -#: ../monotone.cc:68 +#: monotone.cc:68 msgid "argument to pass external diff hook" msgstr "" -#: ../monotone.cc:69 +#: monotone.cc:69 msgid "use least common ancestor as ancestor for merge" msgstr "" -#: ../monotone.cc:70 +#: monotone.cc:70 msgid "perform the associated file operation" msgstr "" -#: ../monotone.cc:71 +#: monotone.cc:71 msgid "address:port to listen on (default :5253)" msgstr "écouteur sur adresse:port (défaut :5233)" -#: ../monotone.cc:72 +#: monotone.cc:72 msgid "perform the operations for files missing from working directory" msgstr "" -#: ../monotone.cc:73 +#: monotone.cc:73 msgid "perform the operations for unknown files from working directory" msgstr "" -#: ../monotone.cc:74 +#: monotone.cc:74 msgid "push the specified key even if it hasn't signed anything" msgstr "" -#: ../monotone.cc:83 +#: monotone.cc:83 msgid "print debug log to stderr while running" msgstr "" -#: ../monotone.cc:84 +#: monotone.cc:84 msgid "file to dump debugging log to, on failure" msgstr "" -#: ../monotone.cc:85 +#: monotone.cc:85 msgid "suppress log and progress messages" msgstr "" -#: ../monotone.cc:86 +#: monotone.cc:86 msgid "display help message" msgstr "afficher le message d'aide" -#: ../monotone.cc:87 +#: monotone.cc:87 msgid "print version number, then exit" msgstr "afficher le numéro de version, puis quitte" -#: ../monotone.cc:88 +#: monotone.cc:88 msgid "print detailed version number, then exit" msgstr "afficher le numéro de version détaillée, puis quitte" -#: ../monotone.cc:89 +#: monotone.cc:89 msgid "insert command line arguments taken from the given file" msgstr "" -#: ../monotone.cc:90 +#: monotone.cc:90 msgid "set ticker style (count|dot|none)" msgstr "" -#: ../monotone.cc:91 +#: monotone.cc:91 msgid "do not load standard lua hooks" msgstr "ne pas charger les hooks standards lua" -#: ../monotone.cc:92 +#: 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:93 +#: monotone.cc:93 msgid "load extra rc file" msgstr "charger un fichier rc supplémentaire" -#: ../monotone.cc:94 +#: monotone.cc:94 msgid "set key for signatures" msgstr "paramétrer la clef pour les signatures" -#: ../monotone.cc:95 +#: monotone.cc:95 msgid "set name of database" msgstr "paramétrer le nom de la base de données" -#: ../monotone.cc:96 +#: monotone.cc:96 msgid "limit search for working copy to specified root" msgstr "" -#: ../monotone.cc:97 +#: monotone.cc:97 msgid "verbose completion output" msgstr "" -#: ../monotone.cc:98 +#: monotone.cc:98 msgid "set location of key store" msgstr "paramétrer l'emplacement de l'entrepôt de données" -#: ../monotone.cc:99 +#: monotone.cc:99 msgid "set location of configuration directory" msgstr "paramétrer l'emplacement du dossier de configuration" -#: ../monotone.cc:292 +#: monotone.cc:203 +#, fuzzy, c-format +msgid "problem parsing arguments from file %s: %s" +msgstr "erreur lors de la lecture du fichier RCS %s : %s\n" + +#: monotone.cc:212 +#, c-format +msgid "weird error when stuffing arguments read from %s: %s\n" +msgstr "" + +#: monotone.cc:261 +#, c-format +msgid "command line: %s\n" +msgstr "ligne de commande : %s\n" + +#: monotone.cc:264 +#, c-format +msgid "set locale: LC_ALL=%s\n" +msgstr "paramétrage de la locale : LC_ALL=%s\n" + +#: monotone.cc:292 msgid "[OPTION...] command [ARGS...]\n" msgstr "[OPTION...] commande [ARGUMENTS...]\n" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:696 +#: monotone.cc:522 +#, c-format +msgid "syntax error near the \"%s\" option: %s" +msgstr "erreur de syntaxe près de l'option « %s » : %s" + +#: monotone.cc:561 +#, c-format +msgid "monotone %s doesn't use the option %s" +msgstr "monotone %s n'utilise pas l'option %s" + +#: monotone.cc:583 +#, c-format +msgid "Removed 'hidden' from option # %d\n" +msgstr "" + +#: monotone.cc:589 monotone.cc:600 +#, c-format +msgid "Added 'hidden' to option # %d\n" +msgstr "" + +#: monotone.cc:596 +#, 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 +#, fuzzy, c-format +msgid "unknown role specifier %d" +msgstr "aucune base de données n'a été spécifiée" + +#: 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 +#, fuzzy, c-format +msgid "expected %s to end at %d, have %d bytes" +msgstr "" +"%d octets sont nécessaire pour décoder %s à %d, seulement %d sont disponibles" + +#: netsync.cc:243 +#, c-format +msgid "check of '%s' failed" +msgstr "la vérification de « %s » a échouée" + +#: netsync.cc:696 msgid "bytes in" msgstr "octets ⇩" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:698 +#: netsync.cc:698 msgid "bytes out" msgstr "octets ⇧" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:702 ../netsync.cc:719 +#: netsync.cc:702 netsync.cc:719 msgid "revs written" msgstr "révs écrites" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:704 +#: netsync.cc:704 msgid "certs in" msgstr "certs ⇩" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:706 ../netsync.cc:721 +#: netsync.cc:706 netsync.cc:721 msgid "revs in" msgstr "révs ⇩" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:711 +#: netsync.cc:711 msgid "certs out" msgstr "certs ⇧" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:713 ../netsync.cc:723 +#: netsync.cc:713 netsync.cc:723 msgid "revs out" msgstr "révs ⇧" -#: ../netsync.cc:1834 ../netsync.cc:2831 ../netsync.cc:2862 +#: 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 +#, fuzzy, c-format +msgid "analyzing %d entries in manifest\n" +msgstr "noeud %d = révision %s = manifeste %s\n" + +#: 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" + +#: netsync.cc:1159 +#, c-format +msgid "finished flushing output queue in error unwind mode, disconnecting\n" +msgstr "" + +#: netsync.cc:1173 +#, fuzzy, c-format +msgid "queueing 'bye' command\n" +msgstr "exécution de la commande « %s »\n" + +#: 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 +#, fuzzy, c-format +msgid "queueing %d bytes of data for %s item '%s'\n" +msgstr "conversion de %d octets de %s en %s\n" + +#: 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" + +#: netsync.cc:1455 +#, c-format +msgid "received 'done' for empty %s level %d, marking as complete\n" +msgstr "" + +#: 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\n" +"re-vérifier l'empreinte de leur clef : %s\n" + +#: netsync.cc:1540 +#, fuzzy, c-format +msgid "saving public key for %s to database\n" +msgstr "suppression de la clef publique « %s » de la base de données\n" + +#: 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 +#, fuzzy, c-format +msgid "allowed anonymous read permission for '%s' excluding '%s'\n" +msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n" + +#: 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 +#, fuzzy, c-format +msgid "" +"denied '%s' read permission for '%s' excluding '%s' while running as pure " +"sink\n" +msgstr "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n" + +#: netsync.cc:1747 +#, fuzzy, c-format +msgid "" +"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n" +msgstr "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n" + +#: netsync.cc:1749 +#, c-format +msgid "access to branch '%s' denied by server" +msgstr "accès à la branche « %s » refusé par le serveur" + +#: netsync.cc:1757 +#, fuzzy, c-format +msgid "allowed '%s' read permission for '%s' excluding '%s'\n" +msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n" + +#: netsync.cc:1766 +#, fuzzy, c-format +msgid "" +"denied '%s' write permission for '%s' excluding '%s' while running as pure " +"source\n" +msgstr "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n" + +#: 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" + +#: 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" + +#: 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" -#: ../netsync.cc:1835 ../netsync.cc:2832 ../netsync.cc:2863 +#: netsync.cc:1835 netsync.cc:2832 netsync.cc:2863 msgid "sink" msgstr "puit" -#: ../netsync.cc:1835 ../netsync.cc:2832 ../netsync.cc:2863 +#: netsync.cc:1835 netsync.cc:2832 netsync.cc:2863 msgid "source" msgstr "source" -#: ../rcs_import.cc:1283 -msgid "tags" +#: 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 +#, fuzzy, c-format +msgid "epoch with hash '%s' does not exist in our database" +msgstr "la révision de base %s n'existe pas dans la base de données\n" + +#: netsync.cc:1937 +#, fuzzy, c-format +msgid "public key '%s' is also called '%s'\n" +msgstr "le fichier rc « %s » n'existe pas" + +#: netsync.cc:1956 +#, fuzzy, c-format +msgid "revision '%s' does not exist in our database" +msgstr "la révision de base %s n'existe pas dans la base de données\n" + +#: netsync.cc:1970 +#, fuzzy, c-format +msgid "manifest '%s' does not exist in our database" msgstr "" +"la version du manifeste « %s » existe déjà dans notre base de données\n" -#: ../sanity.cc:182 -msgid "misuse: " -msgstr "mauvais usage : " +#: netsync.cc:1984 +#, fuzzy, c-format +msgid "file '%s' does not exist in our database" +msgstr "le fichier « %s » n'existe pas dans la copie de travail" -#: ../sanity.cc:194 -msgid "error: " -msgstr "erreur :" +#: netsync.cc:1998 +#, fuzzy, c-format +msgid "cert '%s' does not exist in our database" +msgstr "le certificat « %s » existe déjà dans notre base de données\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é" +#: netsync.cc:2017 +#, c-format +msgid "received 'refine' netcmd on %s node '%s', level %d\n" +msgstr "" -#: ../std_hooks.lua:221 +#: netsync.cc:2022 #, c-format -msgid "Error running editor '%s' to enter log message\n" +msgid "no corresponding %s merkle node for prefix '%s', level %d\n" msgstr "" -"Erreur pendant l'exécution de « %s » pour saisir le message du journal\n" -#: ../std_hooks.lua:563 -msgid "executing external 2-way merge command\n" +#: netsync.cc:2077 +#, c-format +msgid "found corresponding %s merkle node for prefix '%s', level %d\n" msgstr "" -#: ../std_hooks.lua:671 -msgid "executing external 3-way merge command\n" +#: netsync.cc:2408 +#, c-format +msgid "received 'send_data' netcmd requesting %s '%s'\n" msgstr "" -#. xgettext: mebibytes (2^20 bytes) -#: ../ui.cc:119 +#: netsync.cc:2436 #, c-format -msgid "%.1f M" -msgstr "%.1f Mi" +msgid "received 'send_delta' netcmd requesting %s edge '%s' -> '%s'\n" +msgstr "" -#. xgettext: kibibytes (2^10 bytes) -#: ../ui.cc:124 +#: netsync.cc:2490 #, c-format -msgid "%.1f k" -msgstr "%.1f ki" +msgid "delta requested for item type %s\n" +msgstr "" -#: ../ui.cc:369 -msgid "monotone: " -msgstr "monotone: " +#: netsync.cc:2513 +#, fuzzy, c-format +msgid "epoch '%s' already exists in our database\n" +msgstr "le certificat « %s » existe déjà dans notre base de données\n" -#~ msgid "branch name is '%s'\n" -#~ msgstr "le nom de la branche est « %s »\n" +#: netsync.cc:2520 +#, fuzzy, c-format +msgid "received epoch %s for branch %s\n" +msgstr "erreur réseau : %s" -#~ msgid "creating working copy in %s\n" -#~ msgstr "création d'une copie de travail dans %s\n" +#: netsync.cc:2527 +#, fuzzy, c-format +msgid "branch %s has no epoch; setting epoch to %s\n" +msgstr "la branche %s a %d entrées\n" -#~ msgid "unknown path '%s'\n" -#~ msgstr "chemin inconnu « %s »\n" +#: netsync.cc:2533 +#, c-format +msgid "branch %s already has an epoch; checking\n" +msgstr "" -#, fuzzy -#~ msgid "search root '%s' does not exist" -#~ msgstr "le fichier rc « %s » n'existe pas" +#: netsync.cc:2544 +#, c-format +msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." +msgstr "" -#, fuzzy -#~ msgid "search root '%s' is not a directory\n" -#~ msgstr "la racin" +#: 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" -#~ msgid "negative depth not allowed\n" -#~ msgstr "profondeur négative interdite\n" +#: netsync.cc:2564 +#, c-format +msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" +msgstr "" -#~ msgid "Failed to read options file %s" -#~ msgstr "La lecture du fichier d'options « %s » a échouée" +#: 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" -#~ msgid "Failed to write options file %s" -#~ msgstr "L'écriture du fichier d'options « %s » a échouée" +#: netsync.cc:2581 +#, fuzzy, c-format +msgid "hash check failed for revision cert '%s'" +msgstr "insertion de la nouvelle révision %s\n" -#~ msgid "error in %s:%d:%d:E: %s" -#~ msgstr "erreur dans %s:%d:%d:E : %s" +#: 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" -#~ msgid "cert ok\n" -#~ msgstr "certificat OK\n" +#: netsync.cc:2600 +#, fuzzy, c-format +msgid "received revision '%s'\n" +msgstr "erreur réseau : %s" -#~ 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  »" +#: 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 "" -#~ "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: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 "conflict detected, resolved in A's favour\n" -#~ msgstr "conflit détecté, résolu en faveur de A\n" +#: netsync.cc:2720 +#, c-format +msgid "ignoring delta received for item type %s\n" +msgstr "" -#~ msgid "conflict detected, resolved in B's favour\n" -#~ msgstr "conflit détecté, résolu en faveur de B\n" +#: netsync.cc:2734 +#, c-format +msgid "received 'nonexistant' netcmd for %s '%s'\n" +msgstr "" -#~ msgid "moving file %s -> %s\n" -#~ msgstr "déplacement du fichier %s -> %s\n" +#: netsync.cc:2746 +#, fuzzy, c-format +msgid "Received warning from usher: %s" +msgstr "erreur réseau : %s" -#~ msgid "moving dir %s -> %s\n" -#~ msgstr "déplacement du dossier %s -> %s\n" +#: netsync.cc:2748 +#, fuzzy, c-format +msgid "Received greeting from usher: %s" +msgstr "erreur réseau : %s" -#~ msgid "executing command '%s'\n" -#~ msgstr "exécution de la commande « %s »\n" +#: netsync.cc:2753 +#, c-format +msgid "Sent reply." +msgstr "Réponse envoyée." -#~ msgid "unknown command '%s'\n" -#~ msgstr "commande inconnue « %s »\n" +#: netsync.cc:2828 +#, c-format +msgid "" +"received 'anonymous' netcmd from client for pattern '%s' excluding '%s' in %" +"s mode\n" +msgstr "" -#~ msgid "pid file '%s' already exists" -#~ msgstr "le fichier pid « %s » existe déjà" +#: 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 "edit of log message failed" -#~ msgstr "l'édition du message du journal a échouée" +#: netsync.cc:3031 +#, fuzzy, c-format +msgid "processing %d byte input buffer from peer %s\n" +msgstr "%d octets écris sur le descripteur de fichier %d (pair %s)\n" -#~ msgid "no such revision '%s'" -#~ msgstr "aucune révision « %s »" +#: netsync.cc:3034 +#, c-format +msgid "input buffer for peer %s is overfull after netcmd dispatch\n" +msgstr "" -#~ msgid "expanding selection '%s'\n" -#~ msgstr "expansion de la sélection « %s »\n" +#: netsync.cc:3038 +#, c-format +msgid "failed to process '%s' packet" +msgstr "échec du traitement du paquet « %s »" -#~ msgid "no match for selection '%s'" -#~ msgstr "aucune correspondance pour la sélection « %s »" +#: netsync.cc:3043 netsync.cc:3083 netsync.cc:3110 +#, fuzzy, c-format +msgid "protocol error while processing peer %s: '%s'\n" +msgstr "erreur lua lors du chargement de « %s »" -#~ msgid "selection '%s' has multiple ambiguous expansions: \n" -#~ msgstr "la sélection « %s » a plusieurs expansions ambigües : \n" +#: netsync.cc:3068 +#, c-format +msgid "connecting to %s\n" +msgstr "connexion à %s\n" -#~ msgid "non-hex digits in id" -#~ msgstr "chiffre non-héxadécimal dans l'id" +#: netsync.cc:3096 +#, fuzzy, c-format +msgid "timed out waiting for I/O with peer %s, disconnecting\n" +msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n" -#, fuzzy -#~ msgid "partial id '%s' does not have an expansion" -#~ msgstr "le fichier rc « %s » n'existe pas" +#: netsync.cc:3118 +#, 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 "partial id '%s' has multiple ambiguous expansions:\n" -#~ msgstr "le fichier rc « %s » n'existe pas" +#: netsync.cc:3120 +#, 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 public key '%s' found in database" -#~ msgstr "aucune clef publique « %s » dans la base de données" +#: netsync.cc:3130 +#, 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 "(*) - only in %s/" -#~ msgstr "(*) - uniquement dans %s/" +#: netsync.cc:3132 +#, fuzzy, c-format +msgid "write on fd %d (peer %s) failed, disconnecting\n" +msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n" -#~ msgid "no keys found\n" -#~ msgstr "aucune clef trouvée\n" +#: netsync.cc:3139 +#, fuzzy, c-format +msgid "got OOB data on fd %d (peer %s), disconnecting\n" +msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n" -#~ msgid "no keys found matching '%s'\n" -#~ msgstr "aucune clef correspondant à « %s »\n" +#: netsync.cc:3148 +#, c-format +msgid "terminated exchange with %s\n" +msgstr "échange avorté avec %s\n" -#~ 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:3156 +#, c-format +msgid "successful exchange with %s\n" +msgstr "échange réussi avec %s\n" -#~ msgid "key '%s' already exists" -#~ msgstr "la clef « %s » existe déjà" +#: netsync.cc:3177 +#, fuzzy, c-format +msgid "fd %d is armed\n" +msgstr "le noeud %d est un noeud racine\n" -#~ msgid "generating key-pair '%s'" -#~ msgstr "génératio de la paire de clef « %s »" +#: netsync.cc:3184 +#, c-format +msgid "protocol error while processing peer %s: '%s', marking as bad\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:3206 +#, c-format +msgid "accepting new connection on %s : %s\n" +msgstr "nouvelle connexion sur %s : %s\n" -#~ msgid "dropping public key '%s' from database\n" -#~ msgstr "suppression de la clef publique « %s » de la base de données\n" +#: netsync.cc:3212 +#, c-format +msgid "accept() returned a dead client\n" +msgstr "accept() à renvoyée un client mort\n" -#, 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:3216 +#, fuzzy, c-format +msgid "accepted new client connection from %s : %s\n" +msgstr "connexion d'un nouveau client de %s\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:3244 +#, c-format +msgid "protocol error while processing peer %s: '%s', disconnecting\n" +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:3252 +#, 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" -#, 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:3268 +#, 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 "passphrase changed\n" -#~ msgstr "la phrase de passe à changée\n" +#: netsync.cc:3292 +#, c-format +msgid "fd %d (peer %s) processing finished, disconnecting\n" +msgstr "traitement du fd %d (pair %s) terminé, déconnexion\n" -#, fuzzy -#~ msgid "revision '%s' has %d changesets, cannot invert\n" -#~ msgstr "la révision %s n'existe pas" +#: netsync.cc:3314 +#, 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 "edit comment failed" -#~ msgstr "l'édition du commentaire a échouée" +#: netsync.cc:3320 +#, fuzzy, c-format +msgid "fd %d (peer %s) exchanged goodbyes and flushed output, disconnecting\n" +msgstr "la lecture sur le fd %d (pair %s) a échouée, déconnexion\n" -#~ msgid "empty comment" -#~ msgstr "commentaire vide" +#: netsync.cc:3366 +#, fuzzy, c-format +msgid "beginning service on %s : %s\n" +msgstr "début du service sur %s : %d\n" -#~ msgid "left file id does not exist" -#~ msgstr "l'id du fichier gauche n'existe pas" +#: netsync.cc:3378 +#, c-format +msgid "session limit %d reached, some connections will be refused\n" +msgstr "" -#~ msgid "right file id does not exist" -#~ msgstr "l'id du fichier droit n'existe pas" +#: netsync.cc:3384 +#, c-format +msgid "i/o probe with %d armed\n" +msgstr "" -#~ msgid "merge failed" -#~ msgstr "la fusion a échouée" +#: netsync.cc:3394 +#, c-format +msgid "timed out waiting for I/O (listening on %s : %s)\n" +msgstr "" -#~ msgid "no file '%s' found in revision '%s'\n" -#~ msgstr "aucun fichier « %s » dans la révision « %s »\n" +#: netsync.cc:3410 +#, c-format +msgid "got woken up for action on unknown fd %d\n" +msgstr "" -#, fuzzy -#~ msgid "dumping file '%s'\n" -#~ msgstr "importation du fichier « %s »\n" +#: netsync.cc:3425 +#, fuzzy, c-format +msgid "got some OOB data on fd %d (peer %s), disconnecting\n" +msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n" -#, fuzzy -#~ msgid "checkout directory '%s' already exists" -#~ msgstr "le fichier pid « %s » existe déjà" +#: netsync.cc:3487 +#, c-format +msgid "finding items to synchronize:\n" +msgstr "recherche d'éléments à synchroniser :\n" -#~ msgid "branch '%s' is empty\n" -#~ msgstr "la branche « %s » est vide\n" +#: netsync.cc:3490 +#, c-format +msgid "including branch %s" +msgstr "inclusion de la branche %s" -#~ 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:3549 +#, c-format +msgid "setting epoch on %s to zero\n" +msgstr "" -#~ msgid "please specify a branch, with --branch=BRANCH" -#~ msgstr "veuillez préciser une branche avec --branch=BRANCHE" +#: netsync.cc:3598 +#, c-format +msgid "Cannot find key '%s'" +msgstr "Impossible de trouver la clef « %s »" -#~ msgid "branch '%s' is currently merged:\n" -#~ msgstr "la branche « %s » est actuellement fusionnée :\n" +#: netsync.cc:3652 netsync.cc:3656 +#, c-format +msgid "network error: %s" +msgstr "erreur réseau : %s" -#~ msgid "branch '%s' is currently unmerged:\n" -#~ msgstr "la branche « %s » n'est actuellement pas fusionnée :\n" +#: netsync.cc:3710 +#, c-format +msgid "ancestry_fetcher: got %d heads" +msgstr "" -#~ msgid "no such manifest '%s'" -#~ msgstr "aucun manifeste « %s »" +#: netsync.cc:3820 +#, c-format +msgid "traversing head %s" +msgstr "" -#~ msgid "no such file '%s'" -#~ msgstr "aucun fichier « %s »" +#: packet.cc:330 +#, c-format +msgid "writing delayed revision data packet for %s\n" +msgstr "" -#, fuzzy -#~ msgid "public key '%s' does not exist" -#~ msgstr "le fichier rc « %s » n'existe pas" +#: packet.cc:337 +#, c-format +msgid "discarding revision data packet %s with unmet dependencies\n" +msgstr "" -#, 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" +#: packet.cc:343 +#, c-format +msgid "writing delayed manifest data packet for %s\n" +msgstr "" -#~ msgid "no packets found on stdin" -#~ msgstr "aucun paquet trouvé sur l'entrée standard" +#: packet.cc:350 +#, c-format +msgid "discarding manifest data packet %s with unmet dependencies\n" +msgstr "" -#~ 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" +#: packet.cc:356 +#, c-format +msgid "writing delayed file data packet for %s\n" +msgstr "" -#~ msgid "read %d packet" -#~ msgid_plural "read %d packets" -#~ msgstr[0] "lu %d paquet" -#~ msgstr[1] "lu %d paquets" +#: packet.cc:369 +#, c-format +msgid "writing delayed manifest %s packet for %s -> %s%s\n" +msgstr "" -#~ msgid "no hostname given" -#~ msgstr "aucun nom d'hôte fourni" +#: packet.cc:383 +#, c-format +msgid "discarding manifest delta packet %s -> %s with unmet dependencies\n" +msgstr "" -#~ msgid "using default server address: %s\n" -#~ msgstr "utilisation de l'adresse par défaut du serveur : %s\n" +#: packet.cc:390 +#, c-format +msgid "writing delayed file %s packet for %s -> %s%s\n" +msgstr "" -#~ 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" +#: packet.cc:404 +#, c-format +msgid "discarding file delta packet %s -> %s with unmet dependencies\n" +msgstr "" -#~ msgid "no changes to commit\n" -#~ msgstr "aucun changement à valider\n" +#: packet.cc:411 +#, fuzzy, c-format +msgid "writing delayed revision cert on %s\n" +msgstr "insertion de la nouvelle révision %s\n" -#~ msgid "" -#~ "new manifest '%s'\n" -#~ "new revision '%s'\n" -#~ msgstr "" -#~ "nouveau manifeste « %s »\n" -#~ "nouvelle révision « %s »\n" +#: packet.cc:418 +#, c-format +msgid "discarding revision cert packet %s with unmet dependencies\n" +msgstr "" -#~ msgid "--message and --message-file are mutually exclusive" -#~ msgstr "--message et --message-file sont mutuellement exclusifs" +#: packet.cc:425 +#, fuzzy, c-format +msgid "writing delayed public key %s\n" +msgstr "vérification de %d clefs publiques\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" +#: packet.cc:438 +#, c-format +msgid "writing delayed private key %s\n" +msgstr "" -#, fuzzy -#~ msgid "empty log message; commit canceled" -#~ msgstr "message du journal vide" +#: packet.cc:608 +#, fuzzy, c-format +msgid "noting acceptence of revision %s\n" +msgstr "insertion de la nouvelle révision %s\n" -#~ msgid "revision %s already in database\n" -#~ msgstr "la révision %s est déjà dans la base de données\n" +#: packet.cc:621 +#, c-format +msgid "noting acceptence of manifest %s\n" +msgstr "" -#~ msgid "inserting new revision %s\n" -#~ msgstr "insertion de la nouvelle révision %s\n" +#: packet.cc:634 +#, c-format +msgid "noting acceptence of file %s\n" +msgstr "" -#~ msgid "file '%s' modified during commit, aborting" -#~ msgstr "le fichier « %s » a été modifié pendant le commit, interruption" +#: packet.cc:656 +#, fuzzy, c-format +msgid "skipping existing file version %s\n" +msgstr "omission du fichier %s qui peut ignoré\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 ?" +#: packet.cc:696 +#, c-format +msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n" +msgstr "" -#~ msgid "current revision has no ancestor" -#~ msgstr "la révision actuelle n'existe pas" +#: packet.cc:702 +#, c-format +msgid "delaying file delta %s -> %s for preimage\n" +msgstr "" -#~ msgid "no common ancestor for %s and %s" -#~ msgstr "pas d'ancêtre commun pour %s et %s" +#: packet.cc:712 +#, fuzzy, c-format +msgid "skipping delta to existing file version %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#~ msgid "updating %s to %s\n" -#~ msgstr "mise à jour de %s en %s\n" +#: packet.cc:740 +#, c-format +msgid "reconstructed file from reverse delta '%s' -> '%s' has wrong id '%s'\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" +#: packet.cc:746 +#, c-format +msgid "delaying reverse file delta %s -> %s for preimage\n" +msgstr "" -#~ msgid "multiple update candidates:\n" -#~ msgstr "plusieurs candidats pour la mise à jour :\n" +#: packet.cc:756 +#, fuzzy, c-format +msgid "skipping reverse delta to existing file version %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#~ msgid "choose one with 'monotone update -r'\n" -#~ msgstr "choisissez en un avec « monotone update -r »\n" +#: packet.cc:773 +#, fuzzy, c-format +msgid "skipping existing manifest version %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#~ msgid "already up to date at %s\n" -#~ msgstr "déjà à jour en %s\n" +#: packet.cc:814 +#, c-format +msgid "reconstructed manifest from delta '%s' -> '%s' has wrong id '%s'\n" +msgstr "" -#~ msgid "selected update target %s\n" -#~ msgstr "sélection de la cible %s pour la mise à jour\n" +#: packet.cc:820 +#, c-format +msgid "delaying manifest delta %s -> %s for preimage\n" +msgstr "" -#~ msgid "updated to base revision %s\n" -#~ msgstr "mise à jour vers la révision de base %s\n" +#: packet.cc:830 +#, fuzzy, c-format +msgid "skipping delta to existing manifest version %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#, fuzzy -#~ msgid "" -#~ "common ancestor %s found\n" -#~ "trying 3-way merge\n" -#~ msgstr "aucun ancêtre commun n'a été trouvé" +#: packet.cc:858 +#, c-format +msgid "" +"reconstructed manifest from reverse delta '%s' -> '%s' has wrong id '%s'\n" +msgstr "" -#~ msgid "branch '%s' is merged\n" -#~ msgstr "la branche « %s » est fusionnée\n" +#: packet.cc:864 +#, c-format +msgid "delaying manifest reverse delta %s -> %s for preimage\n" +msgstr "" -#~ msgid "[source] %s\n" -#~ msgstr "[source] %s\n" +#: packet.cc:874 +#, c-format +msgid "skipping reverse delta to existing manifest version %s\n" +msgstr "" -#~ msgid "[merged] %s\n" -#~ msgstr "[fusionné] %s\n" +#: packet.cc:896 +#, fuzzy, c-format +msgid "delaying revision %s for new manifest %s\n" +msgstr "noeud %d = révision %s = manifeste %s\n" -#~ msgid "branch '%s' is not merged\n" -#~ msgstr "la branche « %s » n'est pas fusionnée\n" +#: packet.cc:910 +#, fuzzy, c-format +msgid "delaying revision %s for old manifest %s\n" +msgstr "noeud %d = révision %s = manifeste %s\n" -#~ msgid "[target] %s\n" -#~ msgstr "[cible] %s\n" +#: packet.cc:920 +#, fuzzy, c-format +msgid "delaying revision %s for old revision %s\n" +msgstr "la révision de base %s n'existe pas dans la base de données\n" -#~ msgid "%s is not an ancestor of %s" -#~ msgstr "%s n'est pas un ancêtre de %s" +#: packet.cc:933 +#, fuzzy, c-format +msgid "delaying revision %s for old file %s\n" +msgstr "erreur lors de la lecture du fichier RCS %s : %s\n" -#~ msgid "%s is already an ancestor of %s" -#~ msgstr "%s est déjà un ancêtre de %s" +#: packet.cc:943 +#, fuzzy, c-format +msgid "delaying revision %s for new file %s\n" +msgstr "noeud %d = révision %s = manifeste %s\n" -#~ msgid "no such file '%s' in revision '%s'\n" -#~ msgstr "aucun fichier « %s » dans la révision « %s »\n" +#: packet.cc:961 +#, fuzzy, c-format +msgid "skipping existing revision %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#, fuzzy -#~ msgid "checking %d files\n" -#~ msgstr "la vérification de « %s » a échouée" +#: packet.cc:979 +#, fuzzy, c-format +msgid "delaying revision cert on %s\n" +msgstr "insertion de la nouvelle révision %s\n" -#, fuzzy -#~ msgid "checking file %s\n" -#~ msgstr "importation du fichier « %s »\n" +#: packet.cc:992 +#, fuzzy, c-format +msgid "skipping existing revision cert %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#~ msgid "checking manifest %s\n" -#~ msgstr "vérification du manifeste « %s »\n" +#: packet.cc:1006 +#, fuzzy, c-format +msgid "skipping prohibited public key %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#~ msgid "error parsing manifest %s: %s" -#~ msgstr "erreur lors de l'analyse du manifeste %s : %s" +#: packet.cc:1019 +#, 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 "checking %d revisions\n" -#~ msgstr "verification de %d révisions\n" +#: packet.cc:1020 +#, fuzzy, c-format +msgid "skipping existing public key %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#~ msgid "checking revision %s\n" -#~ msgstr "vérification de la révisions %s\n" +#: packet.cc:1033 +#, fuzzy, c-format +msgid "skipping prohibited key pair %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#, fuzzy -#~ msgid "error parsing revision %s: %s" -#~ msgstr "erreur lors de la lecture du fichier RCS %s : %s\n" +#: packet.cc:1042 +#, fuzzy, c-format +msgid "skipping existing key pair %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#~ msgid "checking %d public keys\n" -#~ msgstr "vérification de %d clefs publiques\n" +#: packet.cc:1078 +#, c-format +msgid "packet valve opened\n" +msgstr "" -#, fuzzy -#~ msgid "checking %d revision certs\n" -#~ msgstr "insertion de la nouvelle révision %s\n" +#: packet.cc:1090 +#, c-format +msgid "wrote %i queued packets\n" +msgstr "écriture de %i paquets en attente\n" -#~ msgid "file %s unreferenced\n" -#~ msgstr "fichier %s non-référencé\n" +#: packet.cc:1362 +#, c-format +msgid "malformed packet" +msgstr "paquet malformé" -#, 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:1378 +#, fuzzy, c-format +msgid "read data packet" +msgstr "lecture d'un paquet de donnée\n" -#, 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:1398 +#, fuzzy, c-format +msgid "read delta packet" +msgstr "lecture d'un paquet delta\n" -#, fuzzy -#~ msgid "key %s signed %d certs\n" -#~ msgstr "clef et certificat" +#: packet.cc:1429 +#, fuzzy, c-format +msgid "read cert packet" +msgstr "lecture d'un paquet certificat\n" -#, fuzzy -#~ msgid "%d missing files\n" -#~ msgstr "importation du fichier « %s »\n" +#: packet.cc:1449 packet.cc:1468 +#, fuzzy, c-format +msgid "read pubkey data packet" +msgstr "lecture d'un paquet de données\n" -#~ msgid "%d unreferenced files\n" -#~ msgstr "%d fichiers non-référencés\n" +#: packet.cc:1458 +#, fuzzy, c-format +msgid "read keypair data packet" +msgstr "lecture d'un paquet de données\n" -#, fuzzy -#~ msgid "%d missing manifests\n" -#~ msgstr "noeud %d = révision %s = manifeste %s\n" +#: packet.cc:1481 +#, fuzzy, c-format +msgid "unknown packet type: '%s'" +msgstr "chemin inconnu « %s »\n" -#~ msgid "%d unreferenced manifests\n" -#~ msgstr "%d manifestes non-référencés\n" +#: rcs_file.cc:343 +#, c-format +msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n" +msgstr "" -#~ msgid "%d incomplete manifests\n" -#~ msgstr "%d manifestes incomplets\n" +#: rcs_file.cc:362 +#, c-format +msgid "parse failure %d:%d: expecting word '%s'\n" +msgstr "" -#, fuzzy -#~ msgid "%d missing revisions\n" -#~ msgstr "insertion de la nouvelle révision %s\n" +#: rcs_file.cc:377 +#, c-format +msgid "parse failure %d:%d: expecting word\n" +msgstr "" -#, fuzzy -#~ msgid "%d incomplete revisions\n" -#~ msgstr "nouvelle révisions %s\n" +#: rcs_import.cc:247 +#, fuzzy, c-format +msgid "Calculating time of %s\n" +msgstr "mise à jour de %s en %s\n" -#~ msgid "%d missing keys\n" -#~ msgstr "%d clefs manquantes\n" +#: rcs_import.cc:281 +#, fuzzy, c-format +msgid "version %s -> tag %s\n" +msgstr "la version %s a %d lignes\n" -#~ msgid "%d missing certs\n" -#~ msgstr "%d certificats manquants\n" +#: rcs_import.cc:448 +#, fuzzy, c-format +msgid "skipping identity file edge\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#, fuzzy -#~ msgid "%d mismatched certs\n" -#~ msgstr "%d" +#: rcs_import.cc:456 rcs_import.cc:482 +#, c-format +msgid "existing path to %s found, skipping\n" +msgstr "" -#~ msgid "%d bad signatures\n" -#~ msgstr "%d mauvaises signatures\n" +#: rcs_import.cc:474 +#, c-format +msgid "skipping identity manifest edge\n" +msgstr "" -#~ msgid "serious problems detected" -#~ msgstr "problèmes sérieux détectés" +#: rcs_import.cc:592 +#, c-format +msgid "version %s has %d lines\n" +msgstr "la version %s a %d lignes\n" -#~ msgid "minor problems detected\n" -#~ msgstr "problèmes mineurs détectés\n" +#: rcs_import.cc:605 +#, fuzzy, c-format +msgid "following RCS edge %s -> %s\n" +msgstr "déplacement du dossier %s -> %s\n" -#~ msgid "database is good\n" -#~ msgstr "la base de données est bonne\n" +#: rcs_import.cc:608 +#, fuzzy, c-format +msgid "constructed RCS version %s, inserting into database\n" +msgstr "" +"la version du manifeste « %s » existe déjà dans notre base de données\n" -#~ msgid "database %s does not exist" -#~ msgstr "la base de données %s n'existe pas" +#: rcs_import.cc:651 +#, c-format +msgid "following RCS branch %s = '%s'\n" +msgstr "" -#~ msgid "%s is a directory, not a database" -#~ msgstr "%s est un dossier, pas une base de données" +#: rcs_import.cc:661 +#, c-format +msgid "finished RCS branch %s = '%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" +#: rcs_import.cc:682 rcs_import.cc:730 +#, c-format +msgid "parsing RCS file %s\n" +msgstr "analyse du fichier RCS %s\n" -#~ msgid "sqlite error: %d: %s" -#~ msgstr "erreur sqlite : %d : %s" +#: 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 "could not initialize database: %s: already exists" -#~ msgstr "impossible d'initialiser la base de données : %s : elle existe déjà" +#: rcs_import.cc:773 +#, c-format +msgid "importing file '%s'\n" +msgstr "importation du fichier « %s »\n" -#~ msgid "cannot create %s; it already exists" -#~ msgstr "impossible de créer %s car ceci existe déjà" +#: rcs_import.cc:845 +#, c-format +msgid "first version in branch %s would be %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" +#: rcs_import.cc:852 +#, c-format +msgid "file branchpoint for %s at %s\n" +msgstr "" -#~ msgid "database schema version: %s" -#~ msgstr "version du schéma de la base de données : %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 "statement cache statistics\n" -#~ msgstr "statistiques relatives au cache des expressions\n" +#: rcs_import.cc:926 +#, fuzzy, c-format +msgid "skipping non-RCS file %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#~ msgid "prepared %d statements\n" -#~ msgstr "%d expressions préparées\n" +#: rcs_import.cc:1105 +#, c-format +msgid "examining next commit [t:%d] [p:%s] [a:%s] [c:%s]\n" +msgstr "" -#~ msgid "%d executions of %s\n" -#~ msgstr "%d exécutions de %s\n" +#: rcs_import.cc:1118 +#, c-format +msgid "expiring cluster\n" +msgstr "" -#, fuzzy -#~ msgid "after get_branch_heads for %s, heads has %d entries\n" -#~ msgstr "la branche %s a %d entrées\n" +#: rcs_import.cc:1134 +#, c-format +msgid "examining cluster %d to see if it touched %d\n" +msgstr "" -#~ msgid "no database specified" -#~ msgstr "aucune base de données n'a été spécifiée" +#: rcs_import.cc:1142 +#, c-format +msgid "found cluster touching %d: [t:%d] [a:%d] [c:%d]\n" +msgstr "" -#~ msgid "could not open database '%s': %s" -#~ msgstr "impossible d'ouvrir la base de données « %s » : %s" +#: rcs_import.cc:1150 +#, c-format +msgid "last modification time is %d\n" +msgstr "la date de dernière modification est %d\n" -#~ msgid "conflicting prefixes\n" -#~ msgstr "préfixes en conflit\n" +#: rcs_import.cc:1166 +#, c-format +msgid "picked existing cluster [t:%d] [a:%d] [c:%d]\n" +msgstr "" -#~ msgid "conflicting suffixes\n" -#~ msgstr "suffixes en conflit\n" +#: rcs_import.cc:1180 +#, c-format +msgid "building new cluster [t:%d] [a:%d] [c:%d]\n" +msgstr "" -#~ msgid "conflict detected. no merge.\n" -#~ msgstr "conflit détecté, pas de fusion.\n" +#: rcs_import.cc:1205 +#, c-format +msgid "finished branch commits, writing all pending clusters\n" +msgstr "" -#~ msgid "files are identical\n" -#~ msgstr "les fichiers sont identiques\n" +#: rcs_import.cc:1211 +#, c-format +msgid "finished writing pending clusters\n" +msgstr "" -#~ 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" +#: 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 "" -#~ "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" +#: rcs_import.cc:1235 +#, c-format +msgid "need base --branch argument for importing" +msgstr "" -#~ msgid "file '%s' does not exist in working copy" -#~ msgstr "le fichier « %s » n'existe pas dans la copie de travail" +#: rcs_import.cc:1247 +#, c-format +msgid "path %s does not exist" +msgstr "le chemin %s n'existe pas" -#~ 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_import.cc:1266 +#, c-format +msgid "branch %s has %d entries\n" +msgstr "la branche %s a %d entrées\n" -#~ msgid "" -#~ "could not create directory '%s'\n" -#~ "%s" -#~ msgstr "" -#~ "impossible de créer le dossier « %s »\n" -#~ "%s" +#: rcs_import.cc:1276 +#, fuzzy, c-format +msgid "trunk has %d entries\n" +msgstr "la branche %s a %d entrées\n" -#~ msgid "could not create directory '%s'" -#~ msgstr "impossible de créer le dossier « %s »" +#: rcs_import.cc:1283 +msgid "tags" +msgstr "" -#, fuzzy -#~ msgid "failed to create directory '%s' for '%s'" -#~ msgstr "impossible de créer le dossier : %s : %s\n" +#: rcs_import.cc:1329 +#, fuzzy, c-format +msgid "initial cluster on branch %s has %d live entries\n" +msgstr "la branche %s a %d entrées\n" -#~ msgid "file to delete '%s' does not exist" -#~ msgstr "le fichier à supprimer « %s » n'existe pas" +#: rcs_import.cc:1336 +#, fuzzy, c-format +msgid "initial cluster contains %s at %s\n" +msgstr "le chemin initial est %s\n" -#, fuzzy -#~ msgid "file to delete, '%s', is not a file but a directory" -#~ msgstr "le fichier à supprimer « %s » n'existe pas" +#: rcs_import.cc:1382 +#, fuzzy, c-format +msgid "storing manifest '%s' (base %s)\n" +msgstr "erreur lors de l'analyse du manifeste %s : %s" -#, fuzzy -#~ msgid "directory to delete, '%s', does not exist" -#~ msgstr "le dossier à supprimer « %s » n'existe pas" +#: rcs_import.cc:1387 +#, fuzzy, c-format +msgid "storing head %s\n" +msgstr "importation du fichier « %s »\n" -#, fuzzy -#~ msgid "directory to delete, '%s', is a file" -#~ msgstr "le dossier à supprimer « %s » n'existe pas" +#: rcs_import.cc:1402 +#, c-format +msgid "skipping delta to null manifest\n" +msgstr "" -#, fuzzy -#~ msgid "rename target '%s' already exists" -#~ msgstr "le fichier pid « %s » existe déjà" +#: rcs_import.cc:1414 +#, c-format +msgid "skipping cyclical manifest delta %s -> %s\n" +msgstr "" -#, fuzzy -#~ msgid "rename source path '%s' does not exist" -#~ msgstr "le chemin %s n'existe pas" +#: rcs_import.cc:1420 +#, fuzzy, c-format +msgid "writing full manifest %s\n" +msgstr "vérification du manifeste « %s »\n" -#~ msgid "file %s does not exist" -#~ msgstr "le fichier %s n'existe pas" +#: rcs_import.cc:1430 +#, fuzzy, c-format +msgid "storing manifest delta %s -> %s\n" +msgstr "erreur lors de l'analyse du manifeste %s : %s" -#~ 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:1492 +#, c-format +msgid "adding entry state '%s' on '%s'\n" +msgstr "" -#~ msgid "cannot open file %s for reading" -#~ msgstr "impossible d'ouvrir le fichier %s pour le lire" +#: rcs_import.cc:1499 +#, c-format +msgid "applying state delta on '%s' : '%s' -> '%s'\n" +msgstr "" -#~ msgid "Cannot read standard input multiple times" -#~ msgstr "Impossible de lire l'entrée standard plusieurs fois" +#: rcs_import.cc:1510 +#, c-format +msgid "deleting entry state '%s' on '%s'\n" +msgstr "" -#~ msgid "cannot open file %s for writing" -#~ msgstr "impossible d'ouvrir le fichier %s pour l'écrire" +#: rcs_import.cc:1529 +#, c-format +msgid "BEGIN consume_cluster()\n" +msgstr "" -#~ msgid "no such file or directory: '%s'" -#~ msgstr "Aucun fichier ou répertoire de ce type : « %s »" +#: rcs_import.cc:1549 +#, c-format +msgid "END consume_cluster('%s') (parent '%s')\n" +msgstr "" -#~ msgid "got empty passphrase from get_passphrase() hook" -#~ msgstr "la phrase de passe obtenue depuis get_passphrase() est vide" +#: 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 "empty passphrase not allowed" -#~ msgstr "la phrase de passe ne doit pas être vide" +#: revision.cc:128 +#, fuzzy, c-format +msgid "Verifying revision %s has sane history (to depth %i)\n" +msgstr "la révision %s est déjà dans la base de données\n" -#~ msgid "confirm passphrase for key ID [%s]: " -#~ msgstr "confirmez la phrase de passe pour la clef d'ID [%s] :" +#: revision.cc:166 +#, fuzzy, c-format +msgid "Examining %s -> %s\n" +msgstr "déplacement du dossier %s -> %s\n" -#~ msgid "passphrases do not match, try again\n" -#~ msgstr "les phrases de passe ne correspondent pas, essayez à nouveau\n" +#: revision.cc:243 +#, fuzzy, c-format +msgid "%s and %s have no common ancestor, so done\n" +msgstr "aucun ancêtre commun n'a été trouvé" -#~ msgid "no passphrase given" -#~ msgstr "aucune phrase de passe fournie" +#: revision.cc:249 +#, fuzzy, c-format +msgid "already checked common ancestor, so done\n" +msgstr "l'ancêtre commun est %s\n" -#~ 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" +#: revision.cc:252 +#, c-format +msgid "%s is a merge; verifying paths to common ancestor %s are sane\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" +#: revision.cc:310 +#, fuzzy, c-format +msgid "loading parents for node %d\n" +msgstr "parent %s -> noeud %d\n" -#~ msgid "passphrase for '%s' is incorrect" -#~ msgstr "la phrase de passe pour « %s » est incorrecte" +#: revision.cc:332 +#, c-format +msgid "parent %s -> node %d\n" +msgstr "parent %s -> noeud %d\n" -#, fuzzy -#~ msgid "Lua::ok(): failed" -#~ msgstr "Lua::ok() : échec = %i" +#: revision.cc:482 +#, c-format +msgid "found %d intersecting nodes\n" +msgstr "" -#~ msgid "lua stack: %s" -#~ msgstr "pile lua : %s" +#: revision.cc:535 +#, fuzzy, c-format +msgid "searching for common ancestor, left=%s right=%s\n" +msgstr "pas d'ancêtre commun pour « %s » et « %s »\n" -#~ msgid "lua: extracted string = %s" -#~ msgstr "lua : chaîne extraite = %s" +#: revision.cc:540 +#, fuzzy, c-format +msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n" +msgstr "l'ancêtre commun est %s\n" -#~ msgid "lua: extracted int = %i" -#~ msgstr "lua : int extrait = %i" +#: revision.cc:545 +#, c-format +msgid "found node %d, ancestor of left %s and dominating right %s\n" +msgstr "" -#~ msgid "lua: extracted double = %i" -#~ msgstr "lua : double extrait = %i" +#: revision.cc:552 +#, c-format +msgid "found node %d, ancestor of right %s and dominating left %s\n" +msgstr "" -#~ msgid "lua: extracted bool = %i" -#~ msgstr "lua : bool extrait = %i" +#: revision.cc:589 +#, fuzzy, c-format +msgid "searching for least common ancestor, left=%s right=%s\n" +msgstr "l'ancêtre commun est %s\n" -#~ msgid "%s called with an invalid parameter" -#~ msgstr "%s a été appelé avec un paramètre invalide" +#: revision.cc:593 +#, fuzzy, c-format +msgid "least common ancestor scan [par=%d,anc=%d]\n" +msgstr "l'ancêtre commun est %s\n" -#~ msgid "Directory '%s' does not exists" -#~ msgstr "le dossier « %s » n'existe pas" +#: revision.cc:598 +#, fuzzy, c-format +msgid "found node %d, ancestor of left %s and right %s\n" +msgstr "pas d'ancêtre commun pour « %s » et « %s »\n" -#~ msgid "'%s' is not a directory" -#~ msgstr "« %s » n'est pas un dossier" +#: 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 "opening rcfile '%s' ...\n" -#~ msgstr "ouverture du fichier rc « %s » ...\n" +#: revision.cc:764 +#, c-format +msgid "new root: %s\n" +msgstr "nouvelle racine : %s\n" -#~ msgid "'%s' is ok\n" -#~ msgstr "« %s » est 0K\n" +#: revision.cc:779 +#, c-format +msgid "new leaf: %s\n" +msgstr "nouvelle feuille : %s\n" -#~ msgid "lua error while loading '%s'" -#~ msgstr "erreur lua lors du chargement de « %s »" +#: revision.cc:921 +#, c-format +msgid "exploring changesets from parents of %s, seeking towards %s\n" +msgstr "" -#~ msgid "rcfile '%s' does not exist" -#~ msgstr "le fichier rc « %s » n'existe pas" +#: revision.cc:934 +#, fuzzy, c-format +msgid "considering parent %s of %s\n" +msgstr "connexion à %s\n" -#~ msgid "scanning file %s\n" -#~ msgstr "analyse du fichier %s\n" +#: revision.cc:960 +#, fuzzy, c-format +msgid "revision %s is relevant, composing with edge to %s\n" +msgstr "la révision %s n'est pas membre de la branche %s\n" -#, 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" +#: revision.cc:967 +#, fuzzy, c-format +msgid "parent %s of %s is not relevant\n" +msgstr "le chemin %s n'existe pas\n" -#~ msgid "command line: %s\n" -#~ msgstr "ligne de commande : %s\n" +#: revision.cc:1003 +#, c-format +msgid "adding parents of %s to subgraph\n" +msgstr "" -#~ msgid "set locale: LC_ALL=%s\n" -#~ msgstr "paramétrage de la locale : LC_ALL=%s\n" +#: revision.cc:1013 +#, fuzzy, c-format +msgid "found parent %s of %s\n" +msgstr "parent %s -> noeud %d\n" -#~ msgid "syntax error near the \"%s\" option: %s" -#~ msgstr "erreur de syntaxe près de l'option « %s » : %s" +#: revision.cc:1017 +#, c-format +msgid "adding parent %s to next frontier\n" +msgstr "" -#~ msgid "monotone %s doesn't use the option %s" -#~ msgstr "monotone %s n'utilise pas l'option %s" +#: revision.cc:1032 +#, c-format +msgid "calculating composite changeset between %s and %s\n" +msgstr "" -#~ msgid "Options specific to 'monotone %s':" -#~ msgstr "Options spécifiques à « monotone %s » :" +#: revision.cc:1050 +#, fuzzy, c-format +msgid "calculating changeset from %s to %s\n" +msgstr "conversion de %d octets de %s en %s\n" -#~ msgid "%s (base revision: %s)" -#~ msgstr "%s (révision de base : %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 "" -#~ "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" +#: revision.cc:1055 +#, c-format +msgid "common ancestor is %s\n" +msgstr "l'ancêtre commun est %s\n" -#~ msgid "unknown item type 0x%x for '%s'" -#~ msgstr "type d'élément inconnu 0x%x pour « %s »" +#: revision.cc:1086 +#, c-format +msgid "analyzing manifest changes from '%s' -> '%s'\n" +msgstr "" -#~ msgid "unknown netcmd code 0x%x" -#~ msgstr "code de commande netcmd inconnu 0x%x" +#: revision.cc:1099 +#, fuzzy, c-format +msgid "splitting ancestry for file %s\n" +msgstr "%s n'est pas un ancêtre de %s" -#~ msgid "oversized payload of '%d' bytes" -#~ msgstr "charge utile surdimensionnée de '%d' octets" +#: revision.cc:1166 +#, c-format +msgid "noting ancestry from child %d -> parent %d\n" +msgstr "" -#~ 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:1199 +#, fuzzy, c-format +msgid "setting epoch for %s to %s\n" +msgstr "conversion de %d octets de %s en %s\n" -#~ 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:1255 +#, c-format +msgid "scanning for nodes with 3+ parents\n" +msgstr "" -#~ msgid "check of '%s' failed" -#~ msgstr "la vérification de « %s » a échouée" +#: revision.cc:1296 +#, c-format +msgid "optimizing out redundant edge %i -> %i\n" +msgstr "" -#~ msgid "error: %s\n" -#~ msgstr "erreur : %s\n" +#: revision.cc:1323 +#, c-format +msgid "rebuilding %d nodes\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:1360 +#, fuzzy, c-format +msgid "node %d = manifest %s\n" +msgstr "noeud %d = révision %s = manifeste %s\n" -#~ 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:1371 +#, c-format +msgid "loaded '%s' manifest cert for node %s\n" +msgstr "" -#, fuzzy -#~ msgid "received network error: %s" -#~ msgstr "erreur réseau : %s" +#: revision.cc:1399 +#, c-format +msgid "node %d = revision %s = manifest %s\n" +msgstr "noeud %d = révision %s = manifeste %s\n" -#~ msgid "server key has name %s, hash %s\n" -#~ msgstr "le nom du serveur est %s, et son hachi %s :)\n" +#: revision.cc:1411 +#, fuzzy, c-format +msgid "loaded '%s' revision cert for node %s\n" +msgstr "noeud %d = révision %s = manifeste %s\n" -#~ 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:1435 +#, fuzzy, c-format +msgid "processing node %d\n" +msgstr "parent %s -> noeud %d\n" -#~ msgid "server key changed" -#~ msgstr "la clef du serveur a changée" +#: revision.cc:1439 +#, c-format +msgid "node %d already processed, skipping\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:1453 +#, c-format +msgid "node %d is a root node\n" +msgstr "le noeud %d est un noeud racine\n" -#~ msgid "anonymous access to branch '%s' denied by server" -#~ msgstr "accès anonyme à la branche « %s » refusé par le serveur" +#: revision.cc:1469 revision.cc:1552 +#, fuzzy, c-format +msgid "parent node %d = revision %s\n" +msgstr "noeud %d = révision %s = manifeste %s\n" -#~ msgid "access to branch '%s' denied by server" -#~ msgstr "accès à la branche « %s » refusé par le serveur" +#: revision.cc:1531 +#, c-format +msgid "processing edge from child %d -> parent %d\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:1569 +#, fuzzy, c-format +msgid "mapped node %d to revision %s\n" +msgstr "mise à jour vers la révision de base %s\n" -#~ 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:1575 +#, fuzzy, c-format +msgid "skipping already existing revision %s\n" +msgstr "%s existe déjà dans la révision actuelle\n" -#~ msgid "client signature OK, accepting authentication\n" -#~ msgstr "signature du client 0K, authentification acceptée\n" +#: revision.cc:1587 +#, c-format +msgid "rebuilding revision graph from existing graph\n" +msgstr "" -#~ msgid "bad client signature\n" -#~ msgstr "signature du client invalide\n" +#: revision.cc:1619 +#, fuzzy, c-format +msgid "rebuilding revision graph from manifest certs\n" +msgstr "noeud %d = révision %s = manifeste %s\n" -#~ msgid "server signature OK, accepting authentication\n" -#~ msgstr "signature du serveur 0K, authentification acceptée\n" +#: sanity.cc:38 +#, fuzzy, c-format +msgid "started up on %s\n" +msgstr "déjà à jour en %s\n" -#~ msgid "bad server signature\n" -#~ msgstr "signature du serveur invalide\n" +#: sanity.cc:54 +#, c-format +msgid "wrote debugging log to %sif reporting a bug, please include this file" +msgstr "" -#~ msgid "unknown server key\n" -#~ msgstr "clef du serveur inconnue\n" +#: sanity.cc:59 +#, fuzzy, c-format +msgid "failed to write debugging log to %s\n" +msgstr "impossible d'écrire le journal de debogage sur %s" -#~ 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" +#: sanity.cc:110 +#, c-format +msgid "fatal: formatter failed on %s:%d: %s" +msgstr "fatal : le formatteur a échoué à %s:%d : %s" -#~ msgid "cert '%s' already exists in our database\n" -#~ msgstr "le certificat « %s » existe déjà dans notre base de données\n" +#: sanity.cc:184 +msgid "misuse: " +msgstr "mauvais usage : " -#~ msgid "revision '%s' already exists in our database\n" -#~ msgstr "la révision « %s » existe déjà dans notre base de données\n" +#: sanity.cc:196 +msgid "error: " +msgstr "erreur :" -#, fuzzy -#~ msgid "received revision '%s'\n" -#~ msgstr "erreur réseau : %s" +#: sanity.cc:234 +#, c-format +msgid "ignoring request to give last gasp; already in process of dumping\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" +#: sanity.cc:238 +#, c-format +msgid "saving current work set: %i items" +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" +#: sanity.cc:240 +#, c-format +msgid "Current work set: %i items\n" +msgstr "" -#, fuzzy -#~ msgid "Received warning from usher: %s" -#~ msgstr "erreur réseau : %s" +#: sanity.cc:254 sanity.cc:260 +#, c-format +msgid "ignoring error trigged by saving work set to debug log" +msgstr "" -#, fuzzy -#~ msgid "Received greeting from usher: %s" -#~ msgstr "erreur réseau : %s" +#: sanity.cc:264 +#, c-format +msgid "finished saving work set" +msgstr "" -#~ msgid "Sent reply." -#~ msgstr "Réponse envoyée." +#: schema_migration.cc:47 +#, fuzzy, c-format +msgid "executing SQL '%s'" +msgstr "exécution de la commande « %s »\n" -#~ msgid "failed to process '%s' packet" -#~ msgstr "échec du traitement du paquet « %s »" +#: schema_migration.cc:49 +#, c-format +msgid "result: %i (%s)" +msgstr "" -#~ msgid "connecting to %s\n" -#~ msgstr "connexion à %s\n" +#: schema_migration.cc:51 +#, fuzzy, c-format +msgid "errmsg: %s" +msgstr "erreur : %s\n" -#, 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" +#: schema_migration.cc:184 +#, c-format +msgid "failure extracting schema from sqlite_master" +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" +#: schema_migration.cc:227 +#, c-format +msgid "error at transaction BEGIN statement" +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" +#: schema_migration.cc:254 +#, c-format +msgid "migration step failed: %s" +msgstr "" -#~ msgid "terminated exchange with %s\n" -#~ msgstr "échange avorté avec %s\n" +#: schema_migration.cc:268 +#, c-format +msgid "mismatched result of migration, got %s, wanted %s" +msgstr "" -#~ msgid "successful exchange with %s\n" -#~ msgstr "échange réussi avec %s\n" +#: schema_migration.cc:271 +#, fuzzy, c-format +msgid "committing changes to database" +msgstr "paramétrer le nom de la base de données" -#~ msgid "accepting new connection on %s : %s\n" -#~ msgstr "nouvelle connexion sur %s : %s\n" +#: schema_migration.cc:273 +#, c-format +msgid "failure on COMMIT" +msgstr "" -#~ msgid "accept() returned a dead client\n" -#~ msgstr "accept() à renvoyée un client mort\n" +#: schema_migration.cc:275 +#, c-format +msgid "optimizing database" +msgstr "" -#, fuzzy -#~ msgid "accepted new client connection from %s : %s\n" -#~ msgstr "connexion d'un nouveau client de %s\n" +#: schema_migration.cc:277 +#, c-format +msgid "error vacuuming after migration" +msgstr "" -#~ msgid "fd %d (peer %s) read failed, disconnecting\n" -#~ msgstr "la lecture sur le fd %d (pair %s) a échouée, déconnexion\n" +#: schema_migration.cc:280 +#, c-format +msgid "error running analyze after migration" +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" +#: schema_migration.cc:287 +#, 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 "fd %d (peer %s) processing finished, disconnecting\n" -#~ msgstr "traitement du fd %d (pair %s) terminé, déconnexion\n" +#: schema_migration.cc:292 +#, 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 "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" +#: schema_migration.cc:842 +#, 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" -#, fuzzy -#~ msgid "beginning service on %s : %s\n" -#~ msgstr "début du service sur %s : %d\n" +#: schema_migration.cc:845 +#, fuzzy, c-format +msgid "moving key '%s' from database to %s" +msgstr "aucune clef publique « %s » dans la base de données" -#~ msgid "finding items to synchronize:\n" -#~ msgstr "recherche d'éléments à synchroniser :\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 "including branch %s" -#~ msgstr "inclusion de la branche %s" +#: std_hooks.lua:211 +#, 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 "Cannot find key '%s'" -#~ msgstr "Impossible de trouver la clef « %s »" +#: std_hooks.lua:553 +msgid "executing external 2-way merge command\n" +msgstr "" -#~ msgid "network error: %s" -#~ msgstr "erreur réseau : %s" +#: std_hooks.lua:661 +msgid "executing external 3-way merge command\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" +#: transforms.cc:521 +#, c-format +msgid "converting %d bytes from %s to %s\n" +msgstr "conversion de %d octets de %s en %s\n" -#, fuzzy -#~ msgid "skipping prohibited key pair %s\n" -#~ msgstr "omission du fichier %s qui peut ignoré\n" +#: transforms.cc:527 +#, c-format +msgid "failed to convert string from %s to %s: '%s'" +msgstr "impossible de convertir la chaîne de %s en %s : « %s »" -#, fuzzy -#~ msgid "skipping existing key pair %s\n" -#~ msgstr "omission du fichier %s qui peut ignoré\n" +#: transforms.cc:667 +#, fuzzy, c-format +msgid "converting %d bytes from IDNA ACE to UTF-8\n" +msgstr "conversion de %d octets d'UTF-8 en IDNA ACE\n" -#~ msgid "wrote %i queued packets\n" -#~ msgstr "écriture de %i paquets en attente\n" +#: transforms.cc:670 transforms.cc:684 +#, fuzzy, c-format +msgid "error converting %d UTF-8 bytes to IDNA ACE: %s" +msgstr "conversion de %d octets d'UTF-8 en IDNA ACE\n" -#~ msgid "malformed packet" -#~ msgstr "paquet malformé" +#: transforms.cc:681 +#, 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" -#, fuzzy -#~ msgid "read data packet" -#~ msgstr "lecture d'un paquet de donnée\n" +#: transforms.cc:829 +#, fuzzy, c-format +msgid "doing linesep conversion to %s\n" +msgstr "conversion des " -#, fuzzy -#~ msgid "read delta packet" -#~ msgstr "lecture d'un paquet delta\n" +#: ui.cc:120 +#, c-format +msgid "%.1f M" +msgstr "%.1f Mi" -#, fuzzy -#~ msgid "read cert packet" -#~ msgstr "lecture d'un paquet certificat\n" +#: ui.cc:125 +#, c-format +msgid "%.1f k" +msgstr "%.1f ki" -#, fuzzy -#~ msgid "read pubkey data packet" -#~ msgstr "lecture d'un paquet de données\n" +#: ui.cc:134 +#, c-format +msgid "%d" +msgstr "%d" -#, fuzzy -#~ msgid "read keypair data packet" -#~ msgstr "lecture d'un paquet de données\n" +#: 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 "" -#, fuzzy -#~ msgid "unknown packet type: '%s'" -#~ msgstr "chemin inconnu « %s »\n" +#: ui.cc:369 +msgid "monotone: " +msgstr "monotone: " -#~ msgid "version %s has %d lines\n" -#~ msgstr "la version %s a %d lignes\n" +#: update.cc:66 +#, c-format +msgid "failed to decode boolean testresult cert value '%s'\n" +msgstr "" -#~ msgid "parsing RCS file %s\n" -#~ msgstr "analyse du fichier RCS %s\n" +#: update.cc:78 +#, fuzzy, c-format +msgid "Considering update target %s\n" +msgstr "sélection de la cible %s pour la mise à jour\n" -#~ msgid "parsed RCS file %s OK\n" -#~ msgstr "analyse du fichier RCS %s OK\n" +#: update.cc:88 +#, c-format +msgid "%s not in branch %s\n" +msgstr "%s n'est pas dans la branche %s\n" -#~ msgid "importing file '%s'\n" -#~ msgstr "importation du fichier « %s »\n" +#: update.cc:97 +#, fuzzy, c-format +msgid "%s is acceptable update candidate\n" +msgstr "plusieurs candidats pour la mise à jour :\n" -#~ msgid "error reading RCS file %s: %s\n" -#~ msgstr "erreur lors de la lecture du fichier RCS %s : %s\n" +#: update.cc:102 +#, c-format +msgid "%s has unacceptable test results\n" +msgstr "" -#~ msgid "last modification time is %d\n" -#~ msgstr "la date de dernière modification est %d\n" +#: update.cc:160 +#, c-format +msgid "cannot determine branch for update" +msgstr "impossible de déterminer la branche pour la mise à jour" -#~ msgid "path %s does not exist" -#~ msgstr "le chemin %s n'existe pas" +#: vocab.cc:53 +#, c-format +msgid "hex encoded ID '%s' size != %d" +msgstr "" -#~ msgid "branch %s has %d entries\n" -#~ msgstr "la branche %s a %d entrées\n" +#: 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 "verifying new revisions (this may take a while)\n" -#~ msgstr "vérification des nouvelles révisions (ceci peut prendre du temps)\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 "parent %s -> node %d\n" -#~ msgstr "parent %s -> noeud %d\n" +#: 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 "checking whether %s is an ancestor of %s\n" -#~ msgstr "vérification si %s est un ancêtre de %s\n" +#: 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 "new root: %s\n" -#~ msgstr "nouvelle racine : %s\n" +#: vocab.cc:114 +#, c-format +msgid "Invalid key length of %d bytes" +msgstr "Longueur de clef invalide de %d octets" -#~ msgid "new leaf: %s\n" -#~ msgstr "nouvelle feuille : %s\n" +#: vocab.cc:132 +#, c-format +msgid "Invalid hmac length of %d bytes" +msgstr "Longueur hmac invalide de %d octets" -#~ msgid "no common ancestor for %s and %s\n" -#~ msgstr "pas d'ancêtre commun pour « %s » et « %s »\n" +#: work.cc:64 +#, c-format +msgid "skipping ignorable file %s\n" +msgstr "omission du fichier %s qui peut ignoré\n" -#~ msgid "common ancestor is %s\n" -#~ msgstr "l'ancêtre commun est %s\n" +#: 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 "node %d = revision %s = manifest %s\n" -#~ msgstr "noeud %d = révision %s = manifeste %s\n" +#: work.cc:74 +#, fuzzy, c-format +msgid "adding %s to working copy add set\n" +msgstr "ajouter des fichiers à la copie de travail" -#~ msgid "node %d is a root node\n" -#~ msgstr "le noeud %d est un noeud racine\n" +#: work.cc:136 +#, c-format +msgid "adding attribute '%s' on file %s to %s\n" +msgstr "" -#~ msgid "failed to write debugging log to %s" -#~ msgstr "impossible d'écrire le journal de debogage sur %s" +#: work.cc:203 +#, fuzzy, c-format +msgid "invalid path ''" +msgstr "chem" -#~ msgid "fatal: formatter failed on %s:%d: %s" -#~ msgstr "fatal : le formatteur a échoué à %s:%d : %s" +#: work.cc:207 +#, c-format +msgid "skipping %s, not currently tracked\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" +#: work.cc:211 +#, fuzzy, c-format +msgid "adding %s to working copy delete set\n" +msgstr "ajouter des fichiers à la copie de travail" -#~ 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" +#: 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" -#, 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" +#: work.cc:227 +#, c-format +msgid "dropped attributes for file %s from %s\n" +msgstr "" -#, fuzzy -#~ msgid "moving key '%s' from database to %s" -#~ msgstr "aucune clef publique « %s » dans la base de données" +#: work.cc:253 +#, fuzzy, c-format +msgid "invalid source path ''" +msgstr "chem" -#~ msgid "converting %d bytes from %s to %s\n" -#~ msgstr "conversion de %d octets de %s en %s\n" +#: work.cc:254 +#, fuzzy, c-format +msgid "invalid destination path ''" +msgstr "chem" -#~ msgid "failed to convert string from %s to %s: '%s'" -#~ msgstr "impossible de convertir la chaîne de %s en %s : « %s »" +#: 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 "converting %d bytes from UTF-8 to IDNA ACE\n" -#~ msgstr "conversion de %d octets d'UTF-8 en IDNA ACE\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" -#, fuzzy -#~ msgid "doing linesep conversion to %s\n" -#~ msgstr "conversion des " +#: work.cc:270 +#, fuzzy, c-format +msgid "adding %s -> %s to working copy rename set\n" +msgstr "création d'une copie de travail dans %s\n" -#~ msgid "%d" -#~ msgstr "%d" +#: work.cc:293 +#, c-format +msgid "%s has existing attributes in %s; clean them up first" +msgstr "" -#~ msgid "%s not in branch %s\n" -#~ msgstr "%s n'est pas dans la branche %s\n" +#: work.cc:302 +#, fuzzy, c-format +msgid "moving attributes for %s to %s\n" +msgstr "conversion de %d octets de %s en %s\n" -#~ msgid "cannot determine branch for update" -#~ msgstr "impossible de déterminer la branche pour la mise à jour" +#: work.cc:321 +#, fuzzy, c-format +msgid "work path is %s\n" +msgstr "le chemin initial est %s\n" -#~ msgid "bad character '%c' in id name '%s'" -#~ msgstr "caractère invalide « %c » dans le nom de l'id « %s »" +#: work.cc:330 +#, fuzzy, c-format +msgid "checking for un-committed work file %s\n" +msgstr "importation du fichier « %s »\n" -#~ msgid "bad character '%c' in ace string '%s'" -#~ msgstr "caractère invalude « %c » dans la chaîne ace « %s »" +#: work.cc:334 +#, c-format +msgid "read rearrangement from %s\n" +msgstr "" -#~ msgid "bad character '%c' in cert name '%s'" -#~ msgstr "caractère invalide « %c » dans le nom du certificat « %s »" +#: work.cc:338 +#, c-format +msgid "no un-committed work file %s\n" +msgstr "" -#~ msgid "bad character '%c' in key name '%s'" -#~ msgstr "caractère invalide « %c » dans le nom de la clef « %s »" +#: work.cc:375 +#, fuzzy, c-format +msgid "revision path is %s\n" +msgstr "le chemin initial est %s\n" -#~ msgid "Invalid key length of %d bytes" -#~ msgstr "Longueur de clef invalide de %d octets" +#: 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" -#~ msgid "Invalid hmac length of %d bytes" -#~ msgstr "Longueur hmac invalide de %d octets" +#: 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" -#~ msgid "skipping ignorable file %s\n" -#~ msgstr "omission du fichier %s qui peut ignoré\n" +#: work.cc:389 +#, fuzzy, c-format +msgid "loading revision id from %s\n" +msgstr "vérification de la révisions %s\n" -#~ 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:396 +#, fuzzy, c-format +msgid "Problem with working directory: %s is unreadable" +msgstr "" +"ce dossier de travail est un nouveau projet, impossible de mettre à jour" -#, fuzzy -#~ msgid "invalid path ''" -#~ msgstr "chem" +#: work.cc:405 +#, fuzzy, c-format +msgid "writing revision id to %s\n" +msgstr "insertion de la nouvelle révision %s\n" -#~ 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: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" -#~ msgid "%s does not exist in current revision\n" -#~ msgstr "%s n'existe pas dans la révision actuelle\n" +#: work.cc:427 +#, c-format +msgid "old manifest is %s\n" +msgstr "l'ancien manifeste est %s\n" -#~ msgid "%s already exists in current revision\n" -#~ msgstr "%s existe déjà dans la révision actuelle\n" +#: work.cc:430 +#, fuzzy, c-format +msgid "base manifest %s does not exist in database\n" +msgstr "la révision de base %s n'existe pas dans la base de données\n" -#~ msgid "working copy is corrupt: %s does not exist" -#~ msgstr "la copie de travail est corrompue : %s n'existe pas" +#: work.cc:435 +#, c-format +msgid "old manifest has %d entries\n" +msgstr "l'ancien manifeste a %d entrées\n" -#~ msgid "working copy is corrupt: %s is a directory" -#~ msgstr "la copie de travail est corrompue : %s est un dossier" +#: work.cc:456 +#, fuzzy, c-format +msgid "user log path is %s\n" +msgstr "le chemin initial est %s\n" -#~ 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:505 +#, fuzzy, c-format +msgid "options path is %s\n" +msgstr "le chemin initial est %s\n" -#~ msgid "old manifest is %s\n" -#~ msgstr "l'ancien manifeste est %s\n" +#: work.cc:552 +#, fuzzy, c-format +msgid "local dump path is %s\n" +msgstr "le chemin initial est %s\n" -#~ msgid "old manifest has %d entries\n" -#~ msgstr "l'ancien manifeste a %d entrées\n" +#: work.cc:604 +#, fuzzy, c-format +msgid "attribute map path is %s\n" +msgstr "le chemin initial est %s\n" +#: 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" @@ -2067,15 +5166,9 @@ #~ msgid "public key '%s' not found in database" #~ msgstr "la clef « %s » n'existe pas dans la base de données" -#~ msgid "initial path is %s\n" -#~ msgstr "le chemin initial est %s\n" - #~ msgid "'%s' does not exist\n" #~ msgstr "« %s » n'existe pas\n" -#~ msgid "path %s does not exist\n" -#~ msgstr "le chemin %s n'existe pas\n" - #~ msgid "runtime error: %s\n" #~ msgstr "erreur d'exécution : %s\n" ============================================================ --- po/ja.po 0b4599ee497a230e6d90a6e4bc48b2f1d09b219a +++ po/ja.po bf3f6bcb48e546d32df49afe123e85694f37d6f7 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: monotone HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 14:41-0800\n" +"POT-Creation-Date: 2006-01-02 16:42-0800\n" "PO-Revision-Date: 2005-09-21 14:55+0900\n" "Last-Translator: Satoru SATOH \n" "Language-Team: Japanese \n" @@ -475,7 +475,7 @@ msgstr "PID ファイル '%s' は既に存在しています" #: commands.cc:323 commands.cc:1275 commands.cc:1355 commands.cc:1720 -#: commands.cc:2674 commands.cc:3362 commands.cc:3582 commands.cc:3619 +#: commands.cc:2684 commands.cc:3372 commands.cc:3592 commands.cc:3629 msgid "informative" msgstr "情報" @@ -516,8 +516,8 @@ "’monotone merge' を実行した方がよいでしょう" #: commands.cc:459 commands.cc:715 commands.cc:1374 commands.cc:1446 -#: commands.cc:1831 commands.cc:2721 commands.cc:2736 commands.cc:2739 -#: commands.cc:2937 commands.cc:3601 +#: commands.cc:1831 commands.cc:2731 commands.cc:2746 commands.cc:2749 +#: commands.cc:2947 commands.cc:3611 #, c-format msgid "no such revision '%s'" msgstr "リビジョン '%s' は存在しません" @@ -788,12 +788,12 @@ msgstr "空のコメント" #: commands.cc:1129 commands.cc:1166 commands.cc:1200 commands.cc:1332 -#: commands.cc:2198 commands.cc:2321 commands.cc:2886 commands.cc:3419 +#: commands.cc:2208 commands.cc:2331 commands.cc:2896 commands.cc:3429 msgid "working copy" msgstr "作業コピー" -#: commands.cc:1129 commands.cc:1166 commands.cc:1275 commands.cc:2321 -#: commands.cc:2674 commands.cc:3419 +#: commands.cc:1129 commands.cc:1166 commands.cc:1275 commands.cc:2331 +#: commands.cc:2684 commands.cc:3429 msgid "[PATH]..." msgstr "[PATH]..." @@ -813,8 +813,8 @@ msgid "rename entries in the working copy" msgstr "作業コピー内のエントリの名称を変更" -#: commands.cc:1229 commands.cc:1242 commands.cc:2807 commands.cc:2824 -#: commands.cc:3502 +#: commands.cc:1229 commands.cc:1242 commands.cc:2817 commands.cc:2834 +#: commands.cc:3512 msgid "debug" msgstr "デバッグ" @@ -880,8 +880,8 @@ msgid "dumping file '%s'\n" msgstr "ファイル '%s' をダンプ\n" -#: commands.cc:1397 commands.cc:1505 commands.cc:3162 commands.cc:3211 -#: commands.cc:3296 commands.cc:3303 commands.cc:3787 +#: commands.cc:1397 commands.cc:1505 commands.cc:3172 commands.cc:3221 +#: commands.cc:3306 commands.cc:3313 commands.cc:3797 msgid "tree" msgstr "ツリー" @@ -912,8 +912,8 @@ msgid "checkout directory '%s' already exists" msgstr "取り出すディレクトリ '%s' は既に存在しています" -#: commands.cc:1437 commands.cc:1518 commands.cc:3175 commands.cc:3245 -#: commands.cc:3248 +#: commands.cc:1437 commands.cc:1518 commands.cc:3185 commands.cc:3255 +#: commands.cc:3258 #, c-format msgid "branch '%s' is empty\n" msgstr "ブランチ '%s' は空です\n" @@ -948,7 +948,7 @@ msgid "no file %s found in database for %s" msgstr "ファイル %s (対象 %s)はデータベース内にはみつかりません" -#: commands.cc:1492 commands.cc:3489 +#: commands.cc:1492 commands.cc:3499 #, c-format msgid "writing file %s to %s\n" msgstr "ファイル %s を %s に書き込み中\n" @@ -957,7 +957,7 @@ msgid "show unmerged head revisions of branch" msgstr "ブランチの統合されていない最新リビジョンを表示" -#: commands.cc:1513 commands.cc:3171 +#: commands.cc:1513 commands.cc:3181 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "--branch=BRANCH というようにブランチを指定して下さい" @@ -1032,7 +1032,7 @@ msgid "write file delta packet to stdout" msgstr "ファイル差分パケットを標準出力に出力" -#: commands.cc:1809 commands.cc:1811 commands.cc:1868 commands.cc:2219 +#: commands.cc:1809 commands.cc:1811 commands.cc:1868 commands.cc:2229 #, c-format msgid "no such file '%s'" msgstr "ファイル '%s' は存在しません" @@ -1100,7 +1100,7 @@ msgstr[1] "%d パケット読み込み" #: commands.cc:1966 commands.cc:2060 commands.cc:2075 commands.cc:2089 -#: commands.cc:2104 +#: commands.cc:2104 commands.cc:2114 msgid "network" msgstr "ネットワーク" @@ -1158,7 +1158,7 @@ msgid "excluding: %s\n" msgstr "除外: %s\n" -#: commands.cc:2060 commands.cc:2075 commands.cc:2089 +#: commands.cc:2060 commands.cc:2075 commands.cc:2089 commands.cc:2104 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADDRESS[:PORTNUMBER] [PATTERN]]" @@ -1179,17 +1179,22 @@ msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) と同期" -#: commands.cc:2104 +#: commands.cc:2105 #, fuzzy +msgid "clone branches matching PATTERN from netsync server at ADDRESS" +msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) から取り込み" + +#: commands.cc:2114 +#, fuzzy msgid "PATTERN ..." msgstr "PATH..." -#: commands.cc:2105 +#: commands.cc:2115 #, fuzzy msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "ADDRESS で待機し、指定ブランチを接続クライアントに提供" -#: commands.cc:2118 +#: commands.cc:2128 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1197,11 +1202,11 @@ "永続的にパスフレーズを保存しておきたいのなら権限が必要です (フック " "persist_phrase_ok() を参照して下さい)" -#: commands.cc:2130 +#: commands.cc:2140 msgid "database" msgstr "データベース" -#: commands.cc:2131 +#: commands.cc:2141 msgid "" "init\n" "info\n" @@ -1233,11 +1238,11 @@ "rebuild\n" "set_epoch BRANCH EPOCH\n" -#: commands.cc:2145 +#: commands.cc:2155 msgid "manipulate database state" msgstr "データベースの状態を操作" -#: commands.cc:2198 +#: commands.cc:2208 msgid "" "set FILE ATTR VALUE\n" "get FILE [ATTR]\n" @@ -1247,35 +1252,35 @@ "get FILE [ATTR]\n" "drop FILE" -#: commands.cc:2199 +#: commands.cc:2209 msgid "set, get or drop file attributes" msgstr "ファイル属性を設定/取得/削除" -#: commands.cc:2287 work.cc:113 +#: commands.cc:2297 work.cc:113 #, c-format msgid "registering %s file in working copy\n" msgstr "作業コピー内の %s ファイルを登録\n" -#: commands.cc:2316 +#: commands.cc:2326 #, c-format msgid "failed to parse date string '%s': %s" msgstr "データ文字列 '%s' の解析に失敗: %s" -#: commands.cc:2322 +#: commands.cc:2332 msgid "commit working copy to database" msgstr "作業コピーをデータベースにコミット" -#: commands.cc:2340 +#: commands.cc:2350 #, c-format msgid "no changes to commit\n" msgstr "コミットすべき変更がありません\n" -#: commands.cc:2354 +#: commands.cc:2364 #, c-format msgid "beginning commit on branch '%s'\n" msgstr "ブランチ '%s' についてコミット開始\n" -#: commands.cc:2355 +#: commands.cc:2365 #, c-format msgid "" "new manifest '%s'\n" @@ -1284,12 +1289,12 @@ "新規マニフェスト '%s'\n" "新規リビジョン '%s'\n" -#: commands.cc:2362 +#: commands.cc:2372 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message と --message-file を同時に指定することはできません" -#: commands.cc:2365 +#: commands.cc:2375 #, c-format msgid "" "MT/log is non-empty and --message supplied\n" @@ -1300,7 +1305,7 @@ "もしかしたら MT/log を移動/削除したか、コマンド\n" "行から --message を削除したのではありませんか?" -#: commands.cc:2370 +#: commands.cc:2380 #, c-format msgid "" "MT/log is non-empty and --message-file supplied\n" @@ -1311,62 +1316,62 @@ "もしかしたら MT/log を移動/削除したか、コマンド\n" "行から --message-file を削除したのではありませんか?" -#: commands.cc:2388 +#: commands.cc:2398 #, c-format msgid "empty log message; commit canceled" msgstr "空のログメッセージ; コミットは取り消されました" -#: commands.cc:2400 +#: commands.cc:2410 #, c-format msgid "revision %s already in database\n" msgstr "リビジョン %s は既にデータベース内に存在しています\n" -#: commands.cc:2405 +#: commands.cc:2415 #, c-format msgid "inserting new revision %s\n" msgstr "新規リビジョン %s を挿入中\n" -#: commands.cc:2414 +#: commands.cc:2424 #, c-format msgid "skipping manifest %s, already in database\n" msgstr "既にデータベースにあるマニフェスト %s をスキップ\n" -#: commands.cc:2418 +#: commands.cc:2428 #, c-format msgid "inserting manifest delta %s -> %s\n" msgstr "マニフェスト差分 %s -> %s を挿入中\n" -#: commands.cc:2429 +#: commands.cc:2439 #, c-format msgid "inserting full manifest %s\n" msgstr "完全マニフェスト %s を挿入中\n" -#: commands.cc:2442 +#: commands.cc:2452 #, c-format msgid "skipping file delta %s, already in database\n" msgstr "既にデータベースにあるファイル差分 %s をスキップ\n" -#: commands.cc:2448 +#: commands.cc:2458 #, c-format msgid "inserting delta %s -> %s\n" msgstr "差分 %s -> %s を挿入中\n" -#: commands.cc:2458 commands.cc:2475 +#: commands.cc:2468 commands.cc:2485 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "ファイル '%s' は commit 前に変更されました. 中止します" -#: commands.cc:2468 +#: commands.cc:2478 #, c-format msgid "inserting full version %s\n" msgstr "完全なバージョン %s を挿入中\n" -#: commands.cc:2502 +#: commands.cc:2512 #, c-format msgid "committed revision %s\n" msgstr "リビジョン %s をコミット\n" -#: commands.cc:2508 +#: commands.cc:2518 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1375,7 +1380,7 @@ "注意: このリビジョンによって分岐が生じます\n" "注意: 分岐を望まないなら 'monotone merge' を実行して下さい" -#: commands.cc:2675 +#: commands.cc:2685 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the working directory and\n" @@ -1387,7 +1392,7 @@ "差分を、二つ指定されていればそれらリビジョン間の差分を表示します。\n" "形式が指定されていなければ、デフォルトでは unified 形式が使用されます。" -#: commands.cc:2691 +#: commands.cc:2701 #, c-format msgid "" "--diff-args requires --external\n" @@ -1396,47 +1401,47 @@ "--diff-args は --external を必要とします。\n" "--external を追加するか、--diff-args を省いてみてはどうですか?" -#: commands.cc:2725 +#: commands.cc:2735 #, c-format msgid "current revision has no ancestor" msgstr "現在のリビジョンには祖先がありません" -#: commands.cc:2764 +#: commands.cc:2774 #, c-format msgid "no common ancestor for %s and %s" msgstr "%s と %s には共通の祖先がありません" -#: commands.cc:2770 +#: commands.cc:2780 #, c-format msgid "concatenating un-committed changeset to composite\n" msgstr "合成のためにコミットされていない変更セットを連結\n" -#: commands.cc:2807 commands.cc:2824 +#: commands.cc:2817 commands.cc:2834 msgid "LEFT RIGHT" msgstr "LEFT RIGHT" -#: commands.cc:2807 +#: commands.cc:2817 msgid "print least common ancestor" msgstr "最も近い祖先を表示" -#: commands.cc:2820 +#: commands.cc:2830 msgid "no common ancestor found" msgstr "共通の祖先はありませんでした" -#: commands.cc:2824 +#: commands.cc:2834 msgid "print least common ancestor / dominator" msgstr "最も近い祖先 / 支配者を表示" -#: commands.cc:2838 +#: commands.cc:2848 msgid "no common ancestor/dominator found" msgstr "共通の祖先 / 支配者がみつかりません" -#: commands.cc:2863 +#: commands.cc:2873 #, fuzzy, c-format msgid "updating %s to %s" msgstr "%s を %s に更新中\n" -#: commands.cc:2887 +#: commands.cc:2897 msgid "" "update working copy.\n" "If a revision is given, base the update on that revision. If not,\n" @@ -1446,12 +1451,12 @@ "リビジョンが指定されていればそれに基づいて、指定されていなければ\n" "明示的または暗黙に指定されたブランチの最新版に基づいて更新します。" -#: commands.cc:2912 +#: commands.cc:2922 #, c-format msgid "this working directory is a new project; cannot update" msgstr "この作業ディレクトリは新規のプロジェクトです; 更新できません" -#: commands.cc:2919 +#: commands.cc:2929 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1462,32 +1467,32 @@ "もしかしたら --revision=<他のブランチのリビジョン> としたいのでは\n" "ありませんか?" -#: commands.cc:2924 +#: commands.cc:2934 #, c-format msgid "multiple update candidates:\n" msgstr "複数の更新候補:\n" -#: commands.cc:2928 +#: commands.cc:2938 #, c-format msgid "choose one with 'monotone update -r'\n" msgstr "'monotone update -r' として一つ選択\n" -#: commands.cc:2929 +#: commands.cc:2939 #, c-format msgid "multiple candidates remain after selection" msgstr "選択したものより後に複数の候補が残っています" -#: commands.cc:2944 +#: commands.cc:2954 #, c-format msgid "already up to date at %s\n" msgstr "%s は既に最新です\n" -#: commands.cc:2952 +#: commands.cc:2962 #, c-format msgid "selected update target %s\n" msgstr "選択された更新ターゲット %s\n" -#: commands.cc:2964 +#: commands.cc:2974 #, c-format msgid "" "revision %s is not a member of branch %s\n" @@ -1496,22 +1501,22 @@ "リビジョン %s はブランチ %s に属していません\n" "明示的に --branch を指定して再試行して下さい\n" -#: commands.cc:2979 +#: commands.cc:2989 #, c-format msgid "updating along chosen edge %s -> %s\n" msgstr "選択した先端 %s -> %s に従って更新中\n" -#: commands.cc:2990 +#: commands.cc:3000 #, c-format msgid "merging working copy with chosen edge %s -> %s\n" msgstr "作業コピーを選択した先端 %s -> %s と統合中\n" -#: commands.cc:3039 +#: commands.cc:3049 #, c-format msgid "updated to base revision %s\n" msgstr "基準リビジョン %s に更新\n" -#: commands.cc:3105 +#: commands.cc:3115 #, c-format msgid "" "common ancestor %s found\n" @@ -1520,89 +1525,89 @@ "共通の祖先 %s を発見\n" "3方結合を試みています\n" -#: commands.cc:3116 +#: commands.cc:3126 #, c-format msgid "no common ancestor found, synthesizing edges\n" msgstr "共通の祖先がありませんでしたので、先端同士を同期中\n" -#: commands.cc:3162 +#: commands.cc:3172 msgid "merge unmerged heads of branch" msgstr "統合されていないブランチの複数の最新版を統合" -#: commands.cc:3176 +#: commands.cc:3186 #, c-format msgid "branch '%s' is merged\n" msgstr "ブランチ '%s' を統合\n" -#: commands.cc:3182 +#: commands.cc:3192 #, c-format msgid "starting with revision 1 / %d\n" msgstr "リビジョン 1 / %d について作業開始\n" -#: commands.cc:3186 +#: commands.cc:3196 #, c-format msgid "merging with revision %d / %d\n" msgstr "リビジョン %d / %d について統合中\n" -#: commands.cc:3187 commands.cc:3188 commands.cc:3255 commands.cc:3339 -#: commands.cc:3340 +#: commands.cc:3197 commands.cc:3198 commands.cc:3265 commands.cc:3349 +#: commands.cc:3350 #, c-format msgid "[source] %s\n" msgstr "[元] %s\n" -#: commands.cc:3205 commands.cc:3292 commands.cc:3359 +#: commands.cc:3215 commands.cc:3302 commands.cc:3369 #, c-format msgid "[merged] %s\n" msgstr "[統合済み] %s\n" -#: commands.cc:3208 +#: commands.cc:3218 #, c-format msgid "note: your working copies have not been updated\n" msgstr "注意: 作業コピーは更新されていません\n" -#: commands.cc:3211 +#: commands.cc:3221 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "SOURCE-BRANCH DEST-BRANCH" -#: commands.cc:3212 +#: commands.cc:3222 msgid "merge from one branch to another asymmetrically" msgstr "一方のブランチを他方に非同期に統合" -#: commands.cc:3246 commands.cc:3249 +#: commands.cc:3256 commands.cc:3259 #, c-format msgid "branch '%s' is not merged\n" msgstr "ブランチ '%s' は統合されていません\n" -#: commands.cc:3254 +#: commands.cc:3264 #, c-format msgid "propagating %s -> %s\n" msgstr "伝播中 %s -> %s\n" -#: commands.cc:3256 +#: commands.cc:3266 #, c-format msgid "[target] %s\n" msgstr "[先] %s\n" -#: commands.cc:3261 +#: commands.cc:3271 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "ブランチ '%s' はブランチ '%s' に対して最新です\n" -#: commands.cc:3263 +#: commands.cc:3273 #, c-format msgid "no action taken\n" msgstr "何もしません\n" -#: commands.cc:3267 +#: commands.cc:3277 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "統合は必要ありません. %s をブランチ '%s' 内に取り込み中\n" -#: commands.cc:3296 +#: commands.cc:3306 msgid "refresh the inodeprint cache" msgstr "i-node 表示キャッシュを更新" -#: commands.cc:3304 +#: commands.cc:3314 msgid "" "LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" @@ -1610,69 +1615,69 @@ "LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" -#: commands.cc:3306 +#: commands.cc:3316 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "明示的に指定した二つのリビジョンを統合。結果は指定ブランチへ。" -#: commands.cc:3321 commands.cc:3323 +#: commands.cc:3331 commands.cc:3333 #, c-format msgid "%s is not an ancestor of %s" msgstr "%s は %s の祖先ではありません" -#: commands.cc:3332 +#: commands.cc:3342 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s と %s は同じリビジョンです. 中止します" -#: commands.cc:3334 commands.cc:3336 +#: commands.cc:3344 commands.cc:3346 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s は既に %s の祖先となっています" -#: commands.cc:3362 +#: commands.cc:3372 msgid "(revision|manifest|file|key) PARTIAL-ID" msgstr "(revision|manifest|file|key) PARTIAL-ID" -#: commands.cc:3363 +#: commands.cc:3373 msgid "complete partial id" msgstr "部分 ID を補完" -#: commands.cc:3372 +#: commands.cc:3382 #, c-format msgid "non-hex digits in partial id" msgstr "部分 ID に十六進数が含まれていません" -#: commands.cc:3420 +#: commands.cc:3430 #, fuzzy msgid "revert file(s), dir(s) or entire working copy (\".\")" msgstr "ファイル、ディレクトリまたは完全な作業コピーの変更を破棄" -#: commands.cc:3448 +#: commands.cc:3458 #, c-format msgid "revert adding find_missing entries to %d original args elements\n" msgstr "" -#: commands.cc:3457 +#: commands.cc:3467 #, c-format msgid "" "after adding everything from find_missing, revert args_copy has %d elements\n" msgstr "" -#: commands.cc:3481 +#: commands.cc:3491 #, fuzzy, c-format msgid "reverting %s to %s" msgstr "%s を %s から %s へ戻しています\n" -#: commands.cc:3485 +#: commands.cc:3495 #, c-format msgid "no file version %s found in database for %s" msgstr "バージョン %s のファイルはデータベース内にみつかりません (対象: %s)" -#: commands.cc:3502 +#: commands.cc:3512 msgid "RCSFILE..." msgstr "RCSFILE..." -#: commands.cc:3503 +#: commands.cc:3513 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " @@ -1682,51 +1687,51 @@ "このコマンドは (CVS の) リビジョンを再構築または取り込みはしません。おそらく" "あなたの期待しているのは cvs_import でしょう。" -#: commands.cc:3519 +#: commands.cc:3529 msgid "rcs" msgstr "RCS 関連" -#: commands.cc:3519 +#: commands.cc:3529 msgid "CVSROOT" msgstr "CVSROOT" -#: commands.cc:3519 +#: commands.cc:3529 msgid "import all versions in CVS repository" msgstr "CVS リポジトリ内のすべてのバージョンを取り込む" -#: commands.cc:3582 +#: commands.cc:3592 msgid "PATH" msgstr "PATH" -#: commands.cc:3583 +#: commands.cc:3593 msgid "print annotated copy of the file from REVISION" msgstr "REVISION の注釈付きのファイルのコピーを表示" -#: commands.cc:3600 +#: commands.cc:3610 #, c-format msgid "no revision for file '%s' in database" msgstr "ファイル '%s' に対するリビジョンはデータベース内にみつかりませんでした" -#: commands.cc:3603 +#: commands.cc:3613 #, c-format msgid "annotate file file_path '%s'\n" msgstr "注釈ファイル file_path '%s'\n" -#: commands.cc:3612 +#: commands.cc:3622 #, c-format msgid "no such file '%s' in revision '%s'\n" msgstr "ファイル '%s' はリビジョン %s 内にはありません\n" -#: commands.cc:3614 +#: commands.cc:3624 #, c-format msgid "annotate for file_id %s\n" msgstr "file_id %s に対する注釈\n" -#: commands.cc:3619 +#: commands.cc:3629 msgid "[FILE]" msgstr "[FILE]" -#: commands.cc:3620 +#: commands.cc:3630 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -1734,34 +1739,34 @@ "降順で履歴を表示 ('FILE' でフィルタ)。一つ以上のリビジョンが指定されて\n" "いればそれを開始点として利用。" -#: commands.cc:3680 +#: commands.cc:3690 #, c-format msgid "revision %s does not exist in db, skipping\n" msgstr "リビジョン %s は db 内にありません. スキップします\n" -#: commands.cc:3713 +#: commands.cc:3723 #, c-format msgid "revision '%s' in '%s' maps to '%s' in %s\n" msgstr "リビジョン '%s' ('%s' 内) を '%s' (%s 内) にマップ\n" -#: commands.cc:3787 +#: commands.cc:3797 msgid "DIRECTORY" msgstr "DIRECTORY" -#: commands.cc:3787 +#: commands.cc:3797 msgid "setup a new working copy directory" msgstr "新規作業コピーディレクトリを作成" -#: commands.cc:3793 +#: commands.cc:3803 #, c-format msgid "need --branch argument for setup" msgstr "作成には --branch 引数が必要です" -#: commands.cc:3802 +#: commands.cc:3812 msgid "automation" msgstr "自動化" -#: commands.cc:3803 +#: commands.cc:3813 #, fuzzy msgid "" "interface_version\n" @@ -1805,31 +1810,31 @@ "get_manifest [ID]\n" "get_revision [ID]\n" -#: commands.cc:3823 +#: commands.cc:3833 msgid "automation interface" msgstr "自動化インターフェース" -#: commands.cc:3837 commands.cc:3853 +#: commands.cc:3847 commands.cc:3863 msgid "vars" msgstr "変数" -#: commands.cc:3837 +#: commands.cc:3847 msgid "DOMAIN NAME VALUE" msgstr "DOMAIN NAME VALUE" -#: commands.cc:3838 +#: commands.cc:3848 msgid "set the database variable NAME to VALUE, in domain DOMAIN" msgstr "ドメイン DOMAIN のデータベース変数 NAME を VALUE に設定" -#: commands.cc:3853 +#: commands.cc:3863 msgid "DOMAIN NAME" msgstr "DOMAIN NAME" -#: commands.cc:3854 +#: commands.cc:3864 msgid "remove the database variable NAME in domain DOMAIN" msgstr "ドメイン DOMAIN のデータベース変数 NAME を消去" -#: commands.cc:3865 +#: commands.cc:3875 #, c-format msgid "no var with name %s in domain %s" msgstr "%s という変数はドメイン %s 内にはありません" ============================================================ --- po/pt_BR.po d364d01614746e1da2256825f652af89b6836197 +++ po/pt_BR.po 5c5094c58a3e7acffb1cf31073b12fbe6b6bcd22 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Monotone 0.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 14:41-0800\n" +"POT-Creation-Date: 2006-01-02 16:42-0800\n" "PO-Revision-Date: 2005-11-30 13:45-0200\n" "Last-Translator: Alex Sandro Queiroz e Silva \n" "Language-Team: Alex Sandro Queiroz e Silva \n" @@ -471,7 +471,7 @@ msgstr "arquivo pid '%s' já existe" #: commands.cc:323 commands.cc:1275 commands.cc:1355 commands.cc:1720 -#: commands.cc:2674 commands.cc:3362 commands.cc:3582 commands.cc:3619 +#: commands.cc:2684 commands.cc:3372 commands.cc:3592 commands.cc:3629 msgid "informative" msgstr "informativo" @@ -510,8 +510,8 @@ "considere usar 'monotone merge'" #: commands.cc:459 commands.cc:715 commands.cc:1374 commands.cc:1446 -#: commands.cc:1831 commands.cc:2721 commands.cc:2736 commands.cc:2739 -#: commands.cc:2937 commands.cc:3601 +#: commands.cc:1831 commands.cc:2731 commands.cc:2746 commands.cc:2749 +#: commands.cc:2947 commands.cc:3611 #, c-format msgid "no such revision '%s'" msgstr "versão '%s' não existe" @@ -788,12 +788,12 @@ msgstr "comentário vazio" #: commands.cc:1129 commands.cc:1166 commands.cc:1200 commands.cc:1332 -#: commands.cc:2198 commands.cc:2321 commands.cc:2886 commands.cc:3419 +#: commands.cc:2208 commands.cc:2331 commands.cc:2896 commands.cc:3429 msgid "working copy" msgstr "cópia de trabalho" -#: commands.cc:1129 commands.cc:1166 commands.cc:1275 commands.cc:2321 -#: commands.cc:2674 commands.cc:3419 +#: commands.cc:1129 commands.cc:1166 commands.cc:1275 commands.cc:2331 +#: commands.cc:2684 commands.cc:3429 msgid "[PATH]..." msgstr "[CAMINHO]..." @@ -813,8 +813,8 @@ msgid "rename entries in the working copy" msgstr "renomeia entradas na cópia de trabalho" -#: commands.cc:1229 commands.cc:1242 commands.cc:2807 commands.cc:2824 -#: commands.cc:3502 +#: commands.cc:1229 commands.cc:1242 commands.cc:2817 commands.cc:2834 +#: commands.cc:3512 msgid "debug" msgstr "depuração" @@ -880,8 +880,8 @@ msgid "dumping file '%s'\n" msgstr "" -#: commands.cc:1397 commands.cc:1505 commands.cc:3162 commands.cc:3211 -#: commands.cc:3296 commands.cc:3303 commands.cc:3787 +#: commands.cc:1397 commands.cc:1505 commands.cc:3172 commands.cc:3221 +#: commands.cc:3306 commands.cc:3313 commands.cc:3797 msgid "tree" msgstr "árvore" @@ -907,8 +907,8 @@ msgid "checkout directory '%s' already exists" msgstr "" -#: commands.cc:1437 commands.cc:1518 commands.cc:3175 commands.cc:3245 -#: commands.cc:3248 +#: commands.cc:1437 commands.cc:1518 commands.cc:3185 commands.cc:3255 +#: commands.cc:3258 #, c-format msgid "branch '%s' is empty\n" msgstr "ramo '%s' está vazio\n" @@ -943,7 +943,7 @@ msgid "no file %s found in database for %s" msgstr "nenhum arquivo %s encontrado no banco de dados para %s" -#: commands.cc:1492 commands.cc:3489 +#: commands.cc:1492 commands.cc:3499 #, c-format msgid "writing file %s to %s\n" msgstr "escrevendo arquivo %s em %s\n" @@ -952,7 +952,7 @@ msgid "show unmerged head revisions of branch" msgstr "mostra frentes não combinadas do ramo" -#: commands.cc:1513 commands.cc:3171 +#: commands.cc:1513 commands.cc:3181 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "por favor especifique um ramo com --branch=RAMO" @@ -1025,7 +1025,7 @@ msgid "write file delta packet to stdout" msgstr "escreve pacote de delta de arquivo em stdout" -#: commands.cc:1809 commands.cc:1811 commands.cc:1868 commands.cc:2219 +#: commands.cc:1809 commands.cc:1811 commands.cc:1868 commands.cc:2229 #, c-format msgid "no such file '%s'" msgstr "não há arquivo '%s'" @@ -1093,7 +1093,7 @@ msgstr[1] "" #: commands.cc:1966 commands.cc:2060 commands.cc:2075 commands.cc:2089 -#: commands.cc:2104 +#: commands.cc:2104 commands.cc:2114 msgid "network" msgstr "" @@ -1151,7 +1151,7 @@ msgid "excluding: %s\n" msgstr "" -#: commands.cc:2060 commands.cc:2075 commands.cc:2089 +#: commands.cc:2060 commands.cc:2075 commands.cc:2089 commands.cc:2104 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "" @@ -1172,25 +1172,29 @@ msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "" -#: commands.cc:2104 +#: commands.cc:2105 +msgid "clone branches matching PATTERN from netsync server at ADDRESS" +msgstr "" + +#: commands.cc:2114 msgid "PATTERN ..." msgstr "" -#: commands.cc:2105 +#: commands.cc:2115 msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "" -#: commands.cc:2118 +#: commands.cc:2128 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" msgstr "" -#: commands.cc:2130 +#: commands.cc:2140 msgid "database" msgstr "" -#: commands.cc:2131 +#: commands.cc:2141 msgid "" "init\n" "info\n" @@ -1208,58 +1212,58 @@ "set_epoch BRANCH EPOCH\n" msgstr "" -#: commands.cc:2145 +#: commands.cc:2155 msgid "manipulate database state" msgstr "" -#: commands.cc:2198 +#: commands.cc:2208 msgid "" "set FILE ATTR VALUE\n" "get FILE [ATTR]\n" "drop FILE" msgstr "" -#: commands.cc:2199 +#: commands.cc:2209 msgid "set, get or drop file attributes" msgstr "" -#: commands.cc:2287 work.cc:113 +#: commands.cc:2297 work.cc:113 #, c-format msgid "registering %s file in working copy\n" msgstr "" -#: commands.cc:2316 +#: commands.cc:2326 #, c-format msgid "failed to parse date string '%s': %s" msgstr "" -#: commands.cc:2322 +#: commands.cc:2332 msgid "commit working copy to database" msgstr "" -#: commands.cc:2340 +#: commands.cc:2350 #, c-format msgid "no changes to commit\n" msgstr "" -#: commands.cc:2354 +#: commands.cc:2364 #, c-format msgid "beginning commit on branch '%s'\n" msgstr "" -#: commands.cc:2355 +#: commands.cc:2365 #, c-format msgid "" "new manifest '%s'\n" "new revision '%s'\n" msgstr "" -#: commands.cc:2362 +#: commands.cc:2372 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "" -#: commands.cc:2365 +#: commands.cc:2375 #, c-format msgid "" "MT/log is non-empty and --message supplied\n" @@ -1267,7 +1271,7 @@ "or remove --message from the command line?" msgstr "" -#: commands.cc:2370 +#: commands.cc:2380 #, c-format msgid "" "MT/log is non-empty and --message-file supplied\n" @@ -1275,69 +1279,69 @@ "or remove --message-file from the command line?" msgstr "" -#: commands.cc:2388 +#: commands.cc:2398 #, c-format msgid "empty log message; commit canceled" msgstr "" -#: commands.cc:2400 +#: commands.cc:2410 #, c-format msgid "revision %s already in database\n" msgstr "" -#: commands.cc:2405 +#: commands.cc:2415 #, c-format msgid "inserting new revision %s\n" msgstr "" -#: commands.cc:2414 +#: commands.cc:2424 #, c-format msgid "skipping manifest %s, already in database\n" msgstr "" -#: commands.cc:2418 +#: commands.cc:2428 #, c-format msgid "inserting manifest delta %s -> %s\n" msgstr "" -#: commands.cc:2429 +#: commands.cc:2439 #, c-format msgid "inserting full manifest %s\n" msgstr "" -#: commands.cc:2442 +#: commands.cc:2452 #, c-format msgid "skipping file delta %s, already in database\n" msgstr "" -#: commands.cc:2448 +#: commands.cc:2458 #, c-format msgid "inserting delta %s -> %s\n" msgstr "" -#: commands.cc:2458 commands.cc:2475 +#: commands.cc:2468 commands.cc:2485 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "" -#: commands.cc:2468 +#: commands.cc:2478 #, c-format msgid "inserting full version %s\n" msgstr "" -#: commands.cc:2502 +#: commands.cc:2512 #, c-format msgid "committed revision %s\n" msgstr "" -#: commands.cc:2508 +#: commands.cc:2518 #, c-format msgid "" "note: this revision creates divergence\n" "note: you may (or may not) wish to run 'monotone merge'" msgstr "" -#: commands.cc:2675 +#: commands.cc:2685 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the working directory and\n" @@ -1345,66 +1349,66 @@ "them is given. If no format is specified, unified is used by default." msgstr "" -#: commands.cc:2691 +#: commands.cc:2701 #, c-format msgid "" "--diff-args requires --external\n" "try adding --external or removing --diff-args?" msgstr "" -#: commands.cc:2725 +#: commands.cc:2735 #, c-format msgid "current revision has no ancestor" msgstr "" -#: commands.cc:2764 +#: commands.cc:2774 #, c-format msgid "no common ancestor for %s and %s" msgstr "" -#: commands.cc:2770 +#: commands.cc:2780 #, c-format msgid "concatenating un-committed changeset to composite\n" msgstr "" -#: commands.cc:2807 commands.cc:2824 +#: commands.cc:2817 commands.cc:2834 msgid "LEFT RIGHT" msgstr "" -#: commands.cc:2807 +#: commands.cc:2817 msgid "print least common ancestor" msgstr "" -#: commands.cc:2820 +#: commands.cc:2830 msgid "no common ancestor found" msgstr "" -#: commands.cc:2824 +#: commands.cc:2834 msgid "print least common ancestor / dominator" msgstr "" -#: commands.cc:2838 +#: commands.cc:2848 msgid "no common ancestor/dominator found" msgstr "" -#: commands.cc:2863 +#: commands.cc:2873 #, fuzzy, c-format msgid "updating %s to %s" msgstr "escrevendo arquivo %s em %s\n" -#: commands.cc:2887 +#: commands.cc:2897 msgid "" "update working copy.\n" "If a revision is given, base the update on that revision. If not,\n" "base the update on the head of the branch (given or implicit)." msgstr "" -#: commands.cc:2912 +#: commands.cc:2922 #, c-format msgid "this working directory is a new project; cannot update" msgstr "" -#: commands.cc:2919 +#: commands.cc:2929 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1412,294 +1416,294 @@ "maybe you want --revision=" msgstr "" -#: commands.cc:2924 +#: commands.cc:2934 #, c-format msgid "multiple update candidates:\n" msgstr "" -#: commands.cc:2928 +#: commands.cc:2938 #, c-format msgid "choose one with 'monotone update -r'\n" msgstr "" -#: commands.cc:2929 +#: commands.cc:2939 #, c-format msgid "multiple candidates remain after selection" msgstr "" -#: commands.cc:2944 +#: commands.cc:2954 #, c-format msgid "already up to date at %s\n" msgstr "" -#: commands.cc:2952 +#: commands.cc:2962 #, c-format msgid "selected update target %s\n" msgstr "" -#: commands.cc:2964 +#: commands.cc:2974 #, c-format msgid "" "revision %s is not a member of branch %s\n" "try again with explicit --branch\n" msgstr "" -#: commands.cc:2979 +#: commands.cc:2989 #, c-format msgid "updating along chosen edge %s -> %s\n" msgstr "" -#: commands.cc:2990 +#: commands.cc:3000 #, c-format msgid "merging working copy with chosen edge %s -> %s\n" msgstr "" -#: commands.cc:3039 +#: commands.cc:3049 #, c-format msgid "updated to base revision %s\n" msgstr "" -#: commands.cc:3105 +#: commands.cc:3115 #, c-format msgid "" "common ancestor %s found\n" "trying 3-way merge\n" msgstr "" -#: commands.cc:3116 +#: commands.cc:3126 #, c-format msgid "no common ancestor found, synthesizing edges\n" msgstr "" -#: commands.cc:3162 +#: commands.cc:3172 msgid "merge unmerged heads of branch" msgstr "" -#: commands.cc:3176 +#: commands.cc:3186 #, c-format msgid "branch '%s' is merged\n" msgstr "" -#: commands.cc:3182 +#: commands.cc:3192 #, c-format msgid "starting with revision 1 / %d\n" msgstr "" -#: commands.cc:3186 +#: commands.cc:3196 #, c-format msgid "merging with revision %d / %d\n" msgstr "" -#: commands.cc:3187 commands.cc:3188 commands.cc:3255 commands.cc:3339 -#: commands.cc:3340 +#: commands.cc:3197 commands.cc:3198 commands.cc:3265 commands.cc:3349 +#: commands.cc:3350 #, c-format msgid "[source] %s\n" msgstr "" -#: commands.cc:3205 commands.cc:3292 commands.cc:3359 +#: commands.cc:3215 commands.cc:3302 commands.cc:3369 #, c-format msgid "[merged] %s\n" msgstr "" -#: commands.cc:3208 +#: commands.cc:3218 #, c-format msgid "note: your working copies have not been updated\n" msgstr "" -#: commands.cc:3211 +#: commands.cc:3221 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "" -#: commands.cc:3212 +#: commands.cc:3222 msgid "merge from one branch to another asymmetrically" msgstr "" -#: commands.cc:3246 commands.cc:3249 +#: commands.cc:3256 commands.cc:3259 #, c-format msgid "branch '%s' is not merged\n" msgstr "" -#: commands.cc:3254 +#: commands.cc:3264 #, c-format msgid "propagating %s -> %s\n" msgstr "" -#: commands.cc:3256 +#: commands.cc:3266 #, c-format msgid "[target] %s\n" msgstr "" -#: commands.cc:3261 +#: commands.cc:3271 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "" -#: commands.cc:3263 +#: commands.cc:3273 #, c-format msgid "no action taken\n" msgstr "" -#: commands.cc:3267 +#: commands.cc:3277 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "" -#: commands.cc:3296 +#: commands.cc:3306 msgid "refresh the inodeprint cache" msgstr "" -#: commands.cc:3304 +#: commands.cc:3314 msgid "" "LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" msgstr "" -#: commands.cc:3306 +#: commands.cc:3316 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" -#: commands.cc:3321 commands.cc:3323 +#: commands.cc:3331 commands.cc:3333 #, c-format msgid "%s is not an ancestor of %s" msgstr "" -#: commands.cc:3332 +#: commands.cc:3342 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "" -#: commands.cc:3334 commands.cc:3336 +#: commands.cc:3344 commands.cc:3346 #, c-format msgid "%s is already an ancestor of %s" msgstr "" -#: commands.cc:3362 +#: commands.cc:3372 msgid "(revision|manifest|file|key) PARTIAL-ID" msgstr "" -#: commands.cc:3363 +#: commands.cc:3373 msgid "complete partial id" msgstr "" -#: commands.cc:3372 +#: commands.cc:3382 #, c-format msgid "non-hex digits in partial id" msgstr "" -#: commands.cc:3420 +#: commands.cc:3430 msgid "revert file(s), dir(s) or entire working copy (\".\")" msgstr "" -#: commands.cc:3448 +#: commands.cc:3458 #, c-format msgid "revert adding find_missing entries to %d original args elements\n" msgstr "" -#: commands.cc:3457 +#: commands.cc:3467 #, c-format msgid "" "after adding everything from find_missing, revert args_copy has %d elements\n" msgstr "" -#: commands.cc:3481 +#: commands.cc:3491 #, fuzzy, c-format msgid "reverting %s to %s" msgstr "escrevendo arquivo %s em %s\n" -#: commands.cc:3485 +#: commands.cc:3495 #, c-format msgid "no file version %s found in database for %s" msgstr "" -#: commands.cc:3502 +#: commands.cc:3512 msgid "RCSFILE..." msgstr "" -#: commands.cc:3503 +#: commands.cc:3513 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " "cvs_import" msgstr "" -#: commands.cc:3519 +#: commands.cc:3529 msgid "rcs" msgstr "" -#: commands.cc:3519 +#: commands.cc:3529 msgid "CVSROOT" msgstr "" -#: commands.cc:3519 +#: commands.cc:3529 msgid "import all versions in CVS repository" msgstr "" -#: commands.cc:3582 +#: commands.cc:3592 msgid "PATH" msgstr "" -#: commands.cc:3583 +#: commands.cc:3593 msgid "print annotated copy of the file from REVISION" msgstr "" -#: commands.cc:3600 +#: commands.cc:3610 #, c-format msgid "no revision for file '%s' in database" msgstr "" -#: commands.cc:3603 +#: commands.cc:3613 #, c-format msgid "annotate file file_path '%s'\n" msgstr "" -#: commands.cc:3612 +#: commands.cc:3622 #, c-format msgid "no such file '%s' in revision '%s'\n" msgstr "" -#: commands.cc:3614 +#: commands.cc:3624 #, c-format msgid "annotate for file_id %s\n" msgstr "" -#: commands.cc:3619 +#: commands.cc:3629 msgid "[FILE]" msgstr "" -#: commands.cc:3620 +#: commands.cc:3630 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." msgstr "" -#: commands.cc:3680 +#: commands.cc:3690 #, c-format msgid "revision %s does not exist in db, skipping\n" msgstr "" -#: commands.cc:3713 +#: commands.cc:3723 #, c-format msgid "revision '%s' in '%s' maps to '%s' in %s\n" msgstr "" -#: commands.cc:3787 +#: commands.cc:3797 msgid "DIRECTORY" msgstr "" -#: commands.cc:3787 +#: commands.cc:3797 msgid "setup a new working copy directory" msgstr "" -#: commands.cc:3793 +#: commands.cc:3803 #, c-format msgid "need --branch argument for setup" msgstr "" -#: commands.cc:3802 +#: commands.cc:3812 msgid "automation" msgstr "" -#: commands.cc:3803 +#: commands.cc:3813 msgid "" "interface_version\n" "heads [BRANCH]\n" @@ -1723,31 +1727,31 @@ "keys\n" msgstr "" -#: commands.cc:3823 +#: commands.cc:3833 msgid "automation interface" msgstr "" -#: commands.cc:3837 commands.cc:3853 +#: commands.cc:3847 commands.cc:3863 msgid "vars" msgstr "" -#: commands.cc:3837 +#: commands.cc:3847 msgid "DOMAIN NAME VALUE" msgstr "" -#: commands.cc:3838 +#: commands.cc:3848 msgid "set the database variable NAME to VALUE, in domain DOMAIN" msgstr "" -#: commands.cc:3853 +#: commands.cc:3863 msgid "DOMAIN NAME" msgstr "" -#: commands.cc:3854 +#: commands.cc:3864 msgid "remove the database variable NAME in domain DOMAIN" msgstr "" -#: commands.cc:3865 +#: commands.cc:3875 #, c-format msgid "no var with name %s in domain %s" msgstr ""