# # patch "ChangeLog" # from [99b2e53cf0e87a84af45b896db837b41c5aef7ba] # to [8327086e1740e727d83ac409f5ae88c95d9d445c] # # patch "po/fr.po" # from [7f0b0a38639734fa5877a6e3029519aced52d9f3] # to [c8d339548712a86c7b9f76ae102f07a9d8fd13c7] # ======================================================================== --- ChangeLog 99b2e53cf0e87a84af45b896db837b41c5aef7ba +++ ChangeLog 8327086e1740e727d83ac409f5ae88c95d9d445c @@ -1,5 +1,9 @@ 2005-08-25 Benoît Dejean + * po/fr.po: Updated French translation. + +2005-08-25 Benoît Dejean + * database.cc (database::version): Marked string for i18n and simplifed. (database::info): Reworked to merge all strings for i18n. ======================================================================== --- po/fr.po 7f0b0a38639734fa5877a6e3029519aced52d9f3 +++ po/fr.po c8d339548712a86c7b9f76ae102f07a9d8fd13c7 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: monotone 0.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-08-24 01:13+0200\n" -"PO-Revision-Date: 2005-08-24 02:08+0200\n" +"POT-Creation-Date: 2005-08-25 03:18+0200\n" +"PO-Revision-Date: 2005-08-25 03:18+0200\n" "Last-Translator: Benoît Dejean \n" "Language-Team: Benoît Dejean \n" "MIME-Version: 1.0\n" @@ -211,7 +211,7 @@ msgid "cert: signable text %s\n" msgstr "" -#: ../cert.cc:364 ../keys.cc:480 +#: ../cert.cc:364 ../keys.cc:482 #, c-format msgid "no private key '%s' found in database or get_priv_key hook" msgstr "" @@ -236,8 +236,8 @@ "multiple branch certs found for revision %s, please provide a branch name" msgstr "" -#: ../cert.cc:507 ../rcs_import.cc:1234 ../revision.cc:1588 -#: ../revision.cc:1620 +#: ../cert.cc:507 ../rcs_import.cc:1234 ../revision.cc:1592 +#: ../revision.cc:1624 msgid "no unique private key for cert construction" msgstr "" @@ -450,148 +450,142 @@ msgid "inverse is delta %s -> %s on %s\n" msgstr "" -#: ../change_set.cc:2443 +#: ../change_set.cc:2448 ../change_set.cc:2497 #, c-format -msgid "moving %s -> %s\n" -msgstr "" - -#: ../change_set.cc:2492 -#, c-format msgid "moving file %s -> %s\n" msgstr "déplacement du fichier %s -> %s\n" -#: ../change_set.cc:2500 +#: ../change_set.cc:2455 ../change_set.cc:2505 #, c-format msgid "moving dir %s -> %s\n" msgstr "déplacement du dossier %s -> %s\n" -#: ../change_set.cc:3000 +#: ../change_set.cc:3005 #, c-format msgid "[begin changeset %s]\n" msgstr "" -#: ../change_set.cc:3006 +#: ../change_set.cc:3011 #, c-format msgid "[end changeset %s]\n" msgstr "" -#: ../change_set.cc:3038 +#: ../change_set.cc:3043 msgid "beginning disjoint_merge_test\n" msgstr "" -#: ../change_set.cc:3056 +#: ../change_set.cc:3061 msgid "finished disjoint_merge_test\n" msgstr "" -#: ../change_set.cc:3128 ../change_set.cc:3213 ../change_set.cc:3258 +#: ../change_set.cc:3133 ../change_set.cc:3218 ../change_set.cc:3263 #, c-format msgid "informative failure: %s\n" msgstr "" -#: ../change_set.cc:3132 ../change_set.cc:3217 ../change_set.cc:3262 +#: ../change_set.cc:3137 ../change_set.cc:3222 ../change_set.cc:3267 #, c-format msgid "runtime error: %s\n" msgstr "erreur d'exécution : %s\n" -#: ../change_set.cc:3139 +#: ../change_set.cc:3144 msgid "STARTING invert_change_test\n" msgstr "" -#: ../change_set.cc:3173 +#: ../change_set.cc:3178 msgid "ENDING invert_change_test\n" msgstr "" -#: ../change_set.cc:3282 +#: ../change_set.cc:3287 #, c-format msgid "%s:%d" msgstr "" -#: ../change_set.cc:3284 +#: ../change_set.cc:3289 #, c-format msgid "BEGINNING concatenation test %s\n" msgstr "" -#: ../change_set.cc:3289 +#: ../change_set.cc:3294 #, c-format msgid "FINISHING concatenation test %s\n" msgstr "" -#: ../change_set.cc:3344 +#: ../change_set.cc:3349 #, c-format msgid "RUNNING bad_concatenate_change_test %s\n" msgstr "" -#: ../change_set.cc:3352 +#: ../change_set.cc:3357 msgid "skipping change_set printing, one or both are not sane\n" msgstr "" -#: ../change_set.cc:3357 +#: ../change_set.cc:3362 msgid "concat change_set is insane\n" msgstr "" -#: ../change_set.cc:3360 +#: ../change_set.cc:3365 msgid "Checking combined change set\n" msgstr "" -#: ../change_set.cc:3367 +#: ../change_set.cc:3372 msgid "combined_concat is insane\n" msgstr "" -#: ../change_set.cc:3373 +#: ../change_set.cc:3378 #, c-format msgid "RUNNING bad_concatenate_change_test %s again backwards\n" msgstr "" -#: ../commands.cc:133 +#: ../commands.cc:138 #, c-format msgid "expanding command '%s'\n" msgstr "" -#: ../commands.cc:150 +#: ../commands.cc:155 #, c-format msgid "expanded command to '%s'\n" msgstr "" -#: ../commands.cc:155 +#: ../commands.cc:160 #, c-format msgid "command '%s' has multiple ambiguous expansions: \n" msgstr "" -#: ../commands.cc:190 +#: ../commands.cc:195 msgid "commands:" msgstr "commandes :" -#: ../commands.cc:234 +#: ../commands.cc:239 #, c-format msgid "executing command '%s'\n" msgstr "exécution de la commande « %s »\n" -#: ../commands.cc:240 +#: ../commands.cc:245 #, c-format msgid "unknown command '%s'\n" msgstr "commande inconnue « %s »\n" -#: ../commands.cc:287 +#: ../commands.cc:292 #, c-format msgid "pid file '%s' already exists" msgstr "le fichier pid « %s » existe déjà" -#: ../commands.cc:357 -#, fuzzy +#: ../commands.cc:362 msgid "Enter Log. Lines beginning with `MT:' are removed automatically\n" msgstr "" "Saisissez le journal. Les lignes débutant par « MT: » sont supprimées " "automatiquement\n" -#: ../commands.cc:363 +#: ../commands.cc:368 msgid "edit of log message failed" msgstr "l'édition du message du journal a échouée" -#: ../commands.cc:372 +#: ../commands.cc:377 msgid "note: " msgstr "" -#: ../commands.cc:373 +#: ../commands.cc:378 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -600,233 +594,235 @@ "la branche « %s » a plusieurs heads\n" "vous devriez peut-être lancer « monotone merge »" -#: ../commands.cc:433 ../commands.cc:3485 +#: ../commands.cc:438 ../commands.cc:3495 #, c-format msgid "no such revision '%s'" msgstr "" -#: ../commands.cc:440 +#: ../commands.cc:445 #, c-format msgid "expanding selection '%s'\n" msgstr "" -#: ../commands.cc:448 +#: ../commands.cc:453 #, c-format msgid "no match for selection '%s'" msgstr "" -#: ../commands.cc:451 +#: ../commands.cc:456 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "" -#: ../commands.cc:458 +#: ../commands.cc:463 #, c-format msgid "expanded to '%s'\n" msgstr "" -#: ../commands.cc:467 ../commands.cc:497 +#: ../commands.cc:472 ../commands.cc:502 msgid "non-hex digits in id" msgstr "" -#: ../commands.cc:476 ../commands.cc:506 +#: ../commands.cc:481 ../commands.cc:511 #, c-format msgid "partial id '%s' does not have a unique expansion" msgstr "" -#: ../commands.cc:479 ../commands.cc:509 +#: ../commands.cc:484 ../commands.cc:514 #, c-format msgid "partial id '%s' has multiple ambiguous expansions: \n" msgstr "" -#: ../commands.cc:486 ../commands.cc:516 +#: ../commands.cc:491 ../commands.cc:521 #, c-format msgid "" "expanding partial id '%s'\n" "expanded to '%s'\n" msgstr "" -#: ../commands.cc:544 +#: ../commands.cc:549 #, c-format msgid "warning: no public key '%s' found in database\n" msgstr "" -#: ../commands.cc:653 +#: ../commands.cc:658 msgid "no keys found\n" msgstr "" -#: ../commands.cc:655 +#: ../commands.cc:660 #, c-format msgid "no keys found matching '%s'\n" msgstr "" -#: ../commands.cc:667 ../commands.cc:1368 ../commands.cc:1422 -#: ../commands.cc:2844 +#: ../commands.cc:672 ../commands.cc:1373 ../commands.cc:1427 +#: ../commands.cc:2854 #, c-format msgid "no revision %s found in database" msgstr "" -#: ../commands.cc:673 +#: ../commands.cc:678 #, c-format msgid "revision %s already has children. We cannot kill it." msgstr "" -#: ../commands.cc:803 ../commands.cc:825 ../commands.cc:857 ../commands.cc:881 -#: ../commands.cc:921 +#: ../commands.cc:808 ../commands.cc:830 ../commands.cc:862 ../commands.cc:886 +#: ../commands.cc:926 msgid "key and cert" -msgstr "" +msgstr "clef et certificat" -#: ../commands.cc:803 ../commands.cc:825 ../commands.cc:857 +#: ../commands.cc:808 ../commands.cc:830 ../commands.cc:862 msgid "KEYID" -msgstr "" +msgstr "IDCLEF" -#: ../commands.cc:803 +#: ../commands.cc:808 msgid "generate an RSA key-pair" -msgstr "" +msgstr "générer une paire de clefs RSA" -#: ../commands.cc:813 +#: ../commands.cc:818 #, c-format msgid "key '%s' already exists in database" -msgstr "" +msgstr "la clef « %s » est déjà dans la base de données" -#: ../commands.cc:817 +#: ../commands.cc:822 #, c-format msgid "generating key-pair '%s'\n" msgstr "" -#: ../commands.cc:819 +#: ../commands.cc:824 #, c-format msgid "storing key-pair '%s' in database\n" msgstr "" -#: ../commands.cc:825 +#: ../commands.cc:830 msgid "drop a public and private key" -msgstr "" +msgstr "supprimer une clef publique et privée" -#: ../commands.cc:836 +#: ../commands.cc:841 #, c-format msgid "dropping public key '%s' from database\n" msgstr "" -#: ../commands.cc:843 +#: ../commands.cc:848 #, c-format msgid "" "dropping private key '%s' from database\n" "\n" msgstr "" +"suppression de la clef privée « %s » de la base de données\n" +"\n" -#: ../commands.cc:844 +#: ../commands.cc:849 msgid "" "the private key data may not have been erased from the\n" "database. it is recommended that you use 'db dump' and\n" "'db load' to be sure." msgstr "" -#: ../commands.cc:852 +#: ../commands.cc:857 #, c-format msgid "public or private key '%s' does not exist in database" msgstr "" -#: ../commands.cc:858 +#: ../commands.cc:863 msgid "change passphrase of a private RSA key" msgstr "" -#: ../commands.cc:869 +#: ../commands.cc:874 #, c-format msgid "key '%s' does not exist in database" msgstr "" -#: ../commands.cc:876 +#: ../commands.cc:881 msgid "passphrase changed\n" msgstr "la phrase de passe à changée\n" -#: ../commands.cc:881 +#: ../commands.cc:886 msgid "REVISION CERTNAME [CERTVAL]" msgstr "" -#: ../commands.cc:882 +#: ../commands.cc:887 msgid "create a cert for a revision" msgstr "" -#: ../commands.cc:902 +#: ../commands.cc:907 msgid "no unique private key found, and no key specified" msgstr "" -#: ../commands.cc:921 +#: ../commands.cc:926 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "" -#: ../commands.cc:922 +#: ../commands.cc:927 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" msgstr "" -#: ../commands.cc:960 ../commands.cc:973 ../commands.cc:985 -#: ../commands.cc:1002 ../commands.cc:1048 +#: ../commands.cc:965 ../commands.cc:978 ../commands.cc:990 +#: ../commands.cc:1007 ../commands.cc:1053 msgid "review" msgstr "" -#: ../commands.cc:960 +#: ../commands.cc:965 msgid "REVISION TAGNAME" msgstr "" -#: ../commands.cc:961 +#: ../commands.cc:966 #, fuzzy msgid "put a symbolic tag cert on a revision version" msgstr "mettre une certificat-étiquette symbolique" -#: ../commands.cc:973 +#: ../commands.cc:978 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "" -#: ../commands.cc:974 +#: ../commands.cc:979 msgid "note the results of running a test on a revision" msgstr "" -#: ../commands.cc:985 ../commands.cc:1002 +#: ../commands.cc:990 ../commands.cc:1007 msgid "REVISION" msgstr "" -#: ../commands.cc:986 +#: ../commands.cc:991 msgid "approve of a particular revision" msgstr "" -#: ../commands.cc:997 +#: ../commands.cc:1002 msgid "need --branch argument for approval" msgstr "" -#: ../commands.cc:1003 +#: ../commands.cc:1008 msgid "disapprove of a particular revision" msgstr "" -#: ../commands.cc:1016 +#: ../commands.cc:1021 #, c-format msgid "revision %s has %d changesets, cannot invert\n" msgstr "" -#: ../commands.cc:1020 +#: ../commands.cc:1025 msgid "need --branch argument for disapproval" msgstr "" -#: ../commands.cc:1043 +#: ../commands.cc:1048 #, c-format msgid "disapproval of revision %s" msgstr "" -#: ../commands.cc:1048 +#: ../commands.cc:1053 msgid "REVISION [COMMENT]" msgstr "" -#: ../commands.cc:1049 +#: ../commands.cc:1054 msgid "comment on a particular revision" msgstr "" -#: ../commands.cc:1059 +#: ../commands.cc:1064 msgid "edit comment failed" msgstr "" -#: ../commands.cc:1062 +#: ../commands.cc:1067 msgid "empty comment" msgstr "commentaire vide" @@ -837,141 +833,141 @@ #. write_change_set(cs, dat); #. cout << "change set '" << name << "'\n" << dat << endl; #. } -#: ../commands.cc:1072 ../commands.cc:1097 ../commands.cc:1124 -#: ../commands.cc:1254 ../commands.cc:2118 ../commands.cc:2245 -#: ../commands.cc:2793 ../commands.cc:3326 +#: ../commands.cc:1077 ../commands.cc:1102 ../commands.cc:1129 +#: ../commands.cc:1259 ../commands.cc:2123 ../commands.cc:2250 +#: ../commands.cc:2803 ../commands.cc:3336 msgid "working copy" msgstr "copie de travail" -#: ../commands.cc:1072 ../commands.cc:1097 +#: ../commands.cc:1077 ../commands.cc:1102 msgid "PATH..." msgstr "CHEMIN..." -#: ../commands.cc:1073 +#: ../commands.cc:1078 msgid "add files to working copy" msgstr "ajouter des fichiers à la copie de travail" -#: ../commands.cc:1098 +#: ../commands.cc:1103 msgid "drop files from working copy" msgstr "supprimer des fichiers de la copie de travail" -#: ../commands.cc:1124 +#: ../commands.cc:1129 msgid "SRC DST" msgstr "" -#: ../commands.cc:1125 +#: ../commands.cc:1130 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:1151 ../commands.cc:1164 ../commands.cc:2714 -#: ../commands.cc:2731 ../commands.cc:3386 +#: ../commands.cc:1156 ../commands.cc:1169 ../commands.cc:2724 +#: ../commands.cc:2741 ../commands.cc:3396 msgid "debug" msgstr "" -#: ../commands.cc:1151 +#: ../commands.cc:1156 msgid "load file contents into db" msgstr "" -#: ../commands.cc:1164 +#: ../commands.cc:1169 msgid " " msgstr " " -#: ../commands.cc:1165 +#: ../commands.cc:1170 msgid "merge 3 files and output result" msgstr "" -#: ../commands.cc:1175 +#: ../commands.cc:1180 msgid "ancestor file id does not exist" msgstr "" -#: ../commands.cc:1178 +#: ../commands.cc:1183 msgid "left file id does not exist" msgstr "" -#: ../commands.cc:1181 +#: ../commands.cc:1186 msgid "right file id does not exist" msgstr "" -#: ../commands.cc:1192 +#: ../commands.cc:1197 msgid "merge failed" msgstr "" -#: ../commands.cc:1197 ../commands.cc:1277 ../commands.cc:1675 -#: ../commands.cc:2586 ../commands.cc:3269 ../commands.cc:3465 -#: ../commands.cc:3503 +#: ../commands.cc:1202 ../commands.cc:1282 ../commands.cc:1680 +#: ../commands.cc:2591 ../commands.cc:3279 ../commands.cc:3475 +#: ../commands.cc:3513 msgid "informative" -msgstr "" +msgstr "information" -#: ../commands.cc:1197 ../commands.cc:2245 ../commands.cc:2586 -#: ../commands.cc:3326 +#: ../commands.cc:1202 ../commands.cc:2250 ../commands.cc:2591 +#: ../commands.cc:3336 msgid "[PATH]..." msgstr "" -#: ../commands.cc:1197 +#: ../commands.cc:1202 msgid "show status of working copy" msgstr "" -#: ../commands.cc:1254 +#: ../commands.cc:1259 msgid "[PATH]" msgstr "" -#: ../commands.cc:1255 +#: ../commands.cc:1260 msgid "calculate identity of PATH or stdin" msgstr "" -#: ../commands.cc:1278 +#: ../commands.cc:1283 msgid "" "(file|manifest|revision) [ID]\n" "file REVISION FILENAME" msgstr "" -#: ../commands.cc:1280 +#: ../commands.cc:1285 msgid "write file, manifest, or revision from database to stdout" msgstr "" -#: ../commands.cc:1300 +#: ../commands.cc:1305 #, c-format msgid "no file version %s found in database" msgstr "" -#: ../commands.cc:1312 +#: ../commands.cc:1317 #, c-format msgid "no file '%s' found in revision '%s'\n" msgstr "" -#: ../commands.cc:1317 +#: ../commands.cc:1322 #, c-format msgid "dumping file %s\n" msgstr "" -#: ../commands.cc:1341 +#: ../commands.cc:1346 #, c-format msgid "no manifest version %s found in database" msgstr "" -#: ../commands.cc:1345 +#: ../commands.cc:1350 #, c-format msgid "dumping manifest %s\n" msgstr "" -#: ../commands.cc:1372 +#: ../commands.cc:1377 #, c-format msgid "dumping revision %s\n" msgstr "" -#: ../commands.cc:1382 ../commands.cc:1481 ../commands.cc:3069 -#: ../commands.cc:3118 ../commands.cc:3203 ../commands.cc:3210 -#: ../commands.cc:3672 +#: ../commands.cc:1387 ../commands.cc:1486 ../commands.cc:3079 +#: ../commands.cc:3128 ../commands.cc:3213 ../commands.cc:3220 +#: ../commands.cc:3682 msgid "tree" -msgstr "" +msgstr "arborescence" -#: ../commands.cc:1382 +#: ../commands.cc:1387 msgid "[DIRECTORY]\n" msgstr "" -#: ../commands.cc:1383 +#: ../commands.cc:1388 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" @@ -981,80 +977,80 @@ #. no checkout dir specified, use branch name for dir #. use branch head revision -#: ../commands.cc:1398 ../commands.cc:1410 +#: ../commands.cc:1403 ../commands.cc:1415 msgid "need --branch argument for branch-based checkout" msgstr "" -#: ../commands.cc:1413 +#: ../commands.cc:1418 #, c-format msgid "branch %s is empty" msgstr "la branche %s est vide" -#: ../commands.cc:1414 +#: ../commands.cc:1419 #, c-format msgid "branch %s has multiple heads" msgstr "" -#: ../commands.cc:1435 +#: ../commands.cc:1440 #, c-format msgid "found %d %s branch certs on revision %s\n" msgstr "" -#: ../commands.cc:1440 +#: ../commands.cc:1445 #, c-format msgid "revision %s is not a member of branch %s\n" msgstr "" -#: ../commands.cc:1456 +#: ../commands.cc:1461 #, c-format msgid "no manifest %s found in database" msgstr "" -#: ../commands.cc:1458 +#: ../commands.cc:1463 #, c-format msgid "checking out revision %s to directory %s\n" msgstr "" -#: ../commands.cc:1464 +#: ../commands.cc:1469 #, c-format msgid "no file %s found in database for %s" msgstr "" -#: ../commands.cc:1468 ../commands.cc:3373 +#: ../commands.cc:1473 ../commands.cc:3383 #, c-format msgid "writing file %s to %s\n" msgstr "" -#: ../commands.cc:1481 +#: ../commands.cc:1486 msgid "show unmerged head revisions of branch" msgstr "" -#: ../commands.cc:1489 ../commands.cc:3078 +#: ../commands.cc:1494 ../commands.cc:3088 msgid "please specify a branch, with --branch=BRANCH" msgstr "" -#: ../commands.cc:1494 ../commands.cc:3082 ../commands.cc:3152 -#: ../commands.cc:3155 +#: ../commands.cc:1499 ../commands.cc:3092 ../commands.cc:3162 +#: ../commands.cc:3165 #, c-format msgid "branch '%s' is empty\n" msgstr "la branche « %s » est vide\n" -#: ../commands.cc:1496 +#: ../commands.cc:1501 #, c-format msgid "branch '%s' is currently merged:\n" msgstr "la branche « %s » est actuellement fusionnée :\n" -#: ../commands.cc:1498 +#: ../commands.cc:1503 #, c-format msgid "branch '%s' is currently unmerged:\n" msgstr "la branche « %s » n'est actuellement pas fusionnée :\n" -#: ../commands.cc:1537 +#: ../commands.cc:1542 #, c-format msgid "no epoch for branch %s\n" msgstr "" -#: ../commands.cc:1676 +#: ../commands.cc:1681 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -1068,200 +1064,200 @@ "missing" msgstr "" -#: ../commands.cc:1686 +#: ../commands.cc:1691 msgid "" "show database objects, or the current working copy manifest,\n" "or unknown, intentionally ignored, or missing state files" msgstr "" -#: ../commands.cc:1723 ../commands.cc:1749 ../commands.cc:1773 -#: ../commands.cc:1791 ../commands.cc:1810 ../commands.cc:1829 -#: ../commands.cc:1847 ../commands.cc:1863 ../commands.cc:1883 +#: ../commands.cc:1728 ../commands.cc:1754 ../commands.cc:1778 +#: ../commands.cc:1796 ../commands.cc:1815 ../commands.cc:1834 +#: ../commands.cc:1852 ../commands.cc:1868 ../commands.cc:1888 msgid "packet i/o" msgstr "" -#: ../commands.cc:1723 ../commands.cc:1749 +#: ../commands.cc:1728 ../commands.cc:1754 msgid "OLDID NEWID" msgstr "" -#: ../commands.cc:1724 +#: ../commands.cc:1729 msgid "write manifest delta packet to stdout" msgstr "" -#: ../commands.cc:1738 ../commands.cc:1740 ../commands.cc:1804 +#: ../commands.cc:1743 ../commands.cc:1745 ../commands.cc:1809 #, c-format msgid "no such manifest %s" msgstr "" -#: ../commands.cc:1750 +#: ../commands.cc:1755 msgid "write file delta packet to stdout" msgstr "" -#: ../commands.cc:1764 ../commands.cc:1766 ../commands.cc:1823 -#: ../commands.cc:2139 +#: ../commands.cc:1769 ../commands.cc:1771 ../commands.cc:1828 +#: ../commands.cc:2144 #, c-format msgid "no such file %s" msgstr "" -#: ../commands.cc:1773 ../commands.cc:1791 ../commands.cc:1810 -#: ../commands.cc:1829 ../commands.cc:1847 ../commands.cc:1863 +#: ../commands.cc:1778 ../commands.cc:1796 ../commands.cc:1815 +#: ../commands.cc:1834 ../commands.cc:1852 ../commands.cc:1868 msgid "ID" msgstr "" -#: ../commands.cc:1773 +#: ../commands.cc:1778 msgid "write revision data packet to stdout" msgstr "" -#: ../commands.cc:1786 +#: ../commands.cc:1791 #, c-format msgid "no such revision %s" msgstr "" -#: ../commands.cc:1791 +#: ../commands.cc:1796 msgid "write manifest data packet to stdout" msgstr "" -#: ../commands.cc:1810 +#: ../commands.cc:1815 msgid "write file data packet to stdout" msgstr "" -#: ../commands.cc:1829 +#: ../commands.cc:1834 msgid "write cert packets to stdout" msgstr "" -#: ../commands.cc:1847 +#: ../commands.cc:1852 msgid "write public key packet to stdout" msgstr "" -#: ../commands.cc:1855 +#: ../commands.cc:1860 #, c-format msgid "public key '%s' does not exist in database" msgstr "" -#: ../commands.cc:1863 +#: ../commands.cc:1868 msgid "write private key packet to stdout" msgstr "" -#: ../commands.cc:1871 +#: ../commands.cc:1876 #, c-format msgid "public and private key '%s' do not exist in database" msgstr "" -#: ../commands.cc:1883 +#: ../commands.cc:1888 msgid "read packets from stdin" msgstr "lecture des paquets depuis l'entrée standard" -#: ../commands.cc:1888 +#: ../commands.cc:1893 msgid "no packets found on stdin" msgstr "aucun paquet trouvé sur l'entrée standard" -#: ../commands.cc:1889 +#: ../commands.cc:1894 #, c-format msgid "read %d packet" msgid_plural "read %d packets" msgstr[0] "lu %d paquet" msgstr[1] "lu %d paquets" -#: ../commands.cc:1893 ../commands.cc:1982 ../commands.cc:1997 -#: ../commands.cc:2011 ../commands.cc:2026 +#: ../commands.cc:1898 ../commands.cc:1987 ../commands.cc:2002 +#: ../commands.cc:2016 ../commands.cc:2031 msgid "network" msgstr "réseau" -#: ../commands.cc:1894 +#: ../commands.cc:1899 msgid "rebuild the indices used to sync over the network" msgstr "" -#: ../commands.cc:1928 +#: ../commands.cc:1933 #, c-format msgid "setting default server to %s\n" msgstr "" -#: ../commands.cc:1934 +#: ../commands.cc:1939 msgid "no hostname given" msgstr "" -#: ../commands.cc:1936 +#: ../commands.cc:1941 msgid "no server given and no default server set" msgstr "" -#: ../commands.cc:1940 +#: ../commands.cc:1945 #, c-format msgid "using default server address: %s\n" msgstr "" -#: ../commands.cc:1952 +#: ../commands.cc:1957 #, c-format msgid "setting default branch include pattern to '%s'\n" msgstr "" -#: ../commands.cc:1958 +#: ../commands.cc:1963 #, c-format msgid "setting default branch exclude pattern to '%s'\n" msgstr "" -#: ../commands.cc:1964 +#: ../commands.cc:1969 msgid "no branch pattern given" msgstr "" -#: ../commands.cc:1966 +#: ../commands.cc:1971 msgid "no branch pattern given and no default pattern set" msgstr "" -#: ../commands.cc:1970 +#: ../commands.cc:1975 #, c-format msgid "using default branch include pattern: '%s'\n" msgstr "" -#: ../commands.cc:1978 +#: ../commands.cc:1983 #, c-format msgid "excluding: %s\n" msgstr "" -#: ../commands.cc:1982 ../commands.cc:1997 ../commands.cc:2011 +#: ../commands.cc:1987 ../commands.cc:2002 ../commands.cc:2016 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "" -#: ../commands.cc:1983 +#: ../commands.cc:1988 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "" -#: ../commands.cc:1990 ../commands.cc:2019 ../commands.cc:2036 +#: ../commands.cc:1995 ../commands.cc:2024 ../commands.cc:2041 msgid "could not guess default signing key" msgstr "" -#: ../commands.cc:1998 +#: ../commands.cc:2003 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "" -#: ../commands.cc:2005 +#: ../commands.cc:2010 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:2012 +#: ../commands.cc:2017 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "" -#: ../commands.cc:2026 +#: ../commands.cc:2031 msgid "ADDRESS[:PORTNUMBER] PATTERN ..." msgstr "ADRESSE[:PORT] MOTIF ..." -#: ../commands.cc:2027 +#: ../commands.cc:2032 msgid "" "listen on ADDRESS and serve the specified branches to connecting clients" msgstr "" -#: ../commands.cc:2040 +#: ../commands.cc:2045 msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" msgstr "" -#: ../commands.cc:2050 +#: ../commands.cc:2055 msgid "database" msgstr "base de données" -#: ../commands.cc:2051 +#: ../commands.cc:2056 msgid "" "init\n" "info\n" @@ -1279,140 +1275,140 @@ "set_epoch BRANCH EPOCH\n" msgstr "" -#: ../commands.cc:2065 +#: ../commands.cc:2070 msgid "manipulate database state" msgstr "manipule l'état de la base de données" -#: ../commands.cc:2118 +#: ../commands.cc:2123 msgid "" "set FILE ATTR VALUE\n" "get FILE [ATTR]\n" "drop FILE" msgstr "" -#: ../commands.cc:2119 +#: ../commands.cc:2124 msgid "set, get or drop file attributes" msgstr "" -#: ../commands.cc:2207 ../work.cc:114 +#: ../commands.cc:2212 ../work.cc:114 #, c-format msgid "registering %s file in working copy\n" msgstr "" -#: ../commands.cc:2236 +#: ../commands.cc:2241 #, c-format msgid "failed to parse date string '%s': %s" msgstr "" -#: ../commands.cc:2240 +#: ../commands.cc:2245 #, c-format msgid "failed to parse date string '%s'" msgstr "" -#: ../commands.cc:2246 +#: ../commands.cc:2251 msgid "commit working copy to database" msgstr "" -#: ../commands.cc:2264 +#: ../commands.cc:2269 #, fuzzy msgid "no changes to commit\n" msgstr "aucun changement à commiter\n" -#: ../commands.cc:2275 +#: ../commands.cc:2280 #, c-format msgid "beginning commit on branch '%s'\n" msgstr "" -#: ../commands.cc:2276 +#: ../commands.cc:2281 #, c-format msgid "new manifest %s\n" msgstr "nouveau manifeste %s\n" -#: ../commands.cc:2277 +#: ../commands.cc:2282 #, c-format msgid "new revision %s\n" msgstr "nouvelle révisions %s\n" -#: ../commands.cc:2281 +#: ../commands.cc:2286 msgid "--message and --message-file are mutually exclusive" msgstr "--message et --message-file sont mutuellement exclusifs" -#: ../commands.cc:2284 +#: ../commands.cc:2289 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 "" -#: ../commands.cc:2289 +#: ../commands.cc:2294 msgid "" "MT/log is non-empty and --message-file supplied\n" "perhaps move or delete MT/log,\n" "or remove --message-file from the command line?" msgstr "" -#: ../commands.cc:2307 +#: ../commands.cc:2312 msgid "empty log message" msgstr "message du journal vide" -#: ../commands.cc:2319 +#: ../commands.cc:2324 #, c-format msgid "revision %s already in database\n" msgstr "la révision %s est déjà dans la base de données\n" #. new revision -#: ../commands.cc:2324 +#: ../commands.cc:2329 #, c-format msgid "inserting new revision %s\n" msgstr "" -#: ../commands.cc:2333 +#: ../commands.cc:2338 #, c-format msgid "skipping manifest %s, already in database\n" msgstr "" -#: ../commands.cc:2337 +#: ../commands.cc:2342 #, c-format msgid "inserting manifest delta %s -> %s\n" msgstr "" -#: ../commands.cc:2348 +#: ../commands.cc:2353 #, c-format msgid "inserting full manifest %s\n" msgstr "" -#: ../commands.cc:2361 +#: ../commands.cc:2366 #, c-format msgid "skipping file delta %s, already in database\n" msgstr "" -#: ../commands.cc:2367 +#: ../commands.cc:2372 #, c-format msgid "inserting delta %s -> %s\n" msgstr "" -#: ../commands.cc:2377 ../commands.cc:2394 +#: ../commands.cc:2382 ../commands.cc:2399 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "le fichier « %s » a été modifié pendant le commit, interruption" -#: ../commands.cc:2387 +#: ../commands.cc:2392 #, c-format msgid "inserting full version %s\n" msgstr "" -#: ../commands.cc:2421 +#: ../commands.cc:2426 #, c-format msgid "committed revision %s\n" msgstr "" -#: ../commands.cc:2427 +#: ../commands.cc:2432 msgid "" "note: this revision creates divergence\n" "note: you may (or may not) wish to run 'monotone merge'" msgstr "" -#: ../commands.cc:2587 +#: ../commands.cc:2592 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the working directory and\n" @@ -1420,92 +1416,98 @@ "them is given. If no format is specified, unified is used by default." msgstr "" -#: ../commands.cc:2628 ../commands.cc:2643 ../commands.cc:2646 +#: ../commands.cc:2608 +msgid "" +"--diff-args requires --external\n" +"try adding --external or removing --diff-args?" +msgstr "" + +#: ../commands.cc:2638 ../commands.cc:2653 ../commands.cc:2656 #, c-format msgid "revision %s does not exist" msgstr "la révision %s n'existe pas" -#: ../commands.cc:2632 +#: ../commands.cc:2642 msgid "current revision has no ancestor" msgstr "la révision actuelle n'existe pas" -#: ../commands.cc:2671 +#: ../commands.cc:2681 #, c-format msgid "no common ancestor for %s and %s" -msgstr "" +msgstr "pas d'ancêtre commun pour %s et %s" -#: ../commands.cc:2677 +#: ../commands.cc:2687 msgid "concatenating un-committed changeset to composite\n" msgstr "" -#: ../commands.cc:2704 +#: ../commands.cc:2714 msgid "# no changes" msgstr "" -#: ../commands.cc:2714 ../commands.cc:2731 +#: ../commands.cc:2724 ../commands.cc:2741 msgid "LEFT RIGHT" -msgstr "" +msgstr "GAUCHE DROITE" -#: ../commands.cc:2714 +#: ../commands.cc:2724 #, fuzzy msgid "print least common ancestor" msgstr "l'ancêtre commun est %s\n" -#: ../commands.cc:2731 +#: ../commands.cc:2741 msgid "print least common ancestor / dominator" msgstr "" -#: ../commands.cc:2745 +#: ../commands.cc:2755 #, fuzzy msgid "no common ancestor/dominator found" msgstr "l'ancêtre commun est %s\n" -#: ../commands.cc:2770 +#: ../commands.cc:2780 #, c-format msgid "updating %s to %s\n" msgstr "" -#: ../commands.cc:2794 +#: ../commands.cc:2804 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:2819 +#: ../commands.cc:2829 msgid "this working directory is a new project; cannot update" msgstr "" -#: ../commands.cc:2826 +#: ../commands.cc:2836 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:2831 +#: ../commands.cc:2841 msgid "multiple update candidates:\n" msgstr "plusieurs candidats pour la mise-à-jour :\n" -#: ../commands.cc:2835 +#: ../commands.cc:2845 msgid "choose one with 'monotone update -r'\n" msgstr "choisissez en un avec « monotone update -r »\n" -#: ../commands.cc:2836 +#: ../commands.cc:2846 msgid "multiple candidates remain after selection" msgstr "" -#: ../commands.cc:2851 +#: ../commands.cc:2861 #, c-format msgid "already up to date at %s\n" msgstr "déjà à jour en %s\n" -#: ../commands.cc:2855 +#: ../commands.cc:2865 #, c-format msgid "selected update target %s\n" msgstr "" -#: ../commands.cc:2867 +#: ../commands.cc:2877 #, c-format msgid "" "revision %s is not a member of branch %s\n" @@ -1513,150 +1515,152 @@ msgstr "" #. working copy has no changes -#: ../commands.cc:2882 +#: ../commands.cc:2892 #, c-format msgid "updating along chosen edge %s -> %s\n" msgstr "" -#: ../commands.cc:2893 +#: ../commands.cc:2903 #, c-format msgid "merging working copy with chosen edge %s -> %s\n" msgstr "" -#: ../commands.cc:2942 +#: ../commands.cc:2952 #, c-format msgid "updated to base revision %s\n" msgstr "mise à jour vers la révision de base %s\n" -#: ../commands.cc:3008 +#: ../commands.cc:3018 #, c-format msgid "common ancestor %s found\n" msgstr "" -#: ../commands.cc:3009 +#: ../commands.cc:3019 msgid "trying 3-way merge\n" msgstr "" -#: ../commands.cc:3019 +#: ../commands.cc:3029 msgid "no common ancestor found, synthesizing edges\n" msgstr "" -#: ../commands.cc:3069 +#: ../commands.cc:3079 msgid "merge unmerged heads of branch" msgstr "" -#: ../commands.cc:3083 +#: ../commands.cc:3093 #, c-format msgid "branch '%s' is merged\n" msgstr "la branche « %s » est fusionnée\n" -#: ../commands.cc:3089 +#: ../commands.cc:3099 #, c-format msgid "starting with revision 1 / %d\n" msgstr "" -#: ../commands.cc:3093 +#: ../commands.cc:3103 #, c-format msgid "merging with revision %d / %d\n" msgstr "" #. Somewhat redundant, but consistent with output of plain "merge" command. -#: ../commands.cc:3094 ../commands.cc:3095 ../commands.cc:3162 -#: ../commands.cc:3246 ../commands.cc:3247 +#: ../commands.cc:3104 ../commands.cc:3105 ../commands.cc:3172 +#: ../commands.cc:3256 ../commands.cc:3257 #, c-format msgid "[source] %s\n" msgstr "" -#: ../commands.cc:3107 +#: ../commands.cc:3117 #, c-format msgid "" "merge of %s\n" " and %s\n" msgstr "" +"fusion de %s\n" +" et %s\n" -#: ../commands.cc:3112 ../commands.cc:3199 ../commands.cc:3266 +#: ../commands.cc:3122 ../commands.cc:3209 ../commands.cc:3276 #, c-format msgid "[merged] %s\n" msgstr "" -#: ../commands.cc:3115 +#: ../commands.cc:3125 msgid "note: your working copies have not been updated\n" msgstr "" -#: ../commands.cc:3118 +#: ../commands.cc:3128 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "" -#: ../commands.cc:3119 +#: ../commands.cc:3129 msgid "merge from one branch to another asymmetrically" msgstr "" -#: ../commands.cc:3153 ../commands.cc:3156 +#: ../commands.cc:3163 ../commands.cc:3166 #, c-format msgid "branch '%s' is not merged\n" msgstr "la branche « %s » n'est pas fusionnée\n" -#: ../commands.cc:3161 +#: ../commands.cc:3171 #, c-format msgid "propagating %s -> %s\n" msgstr "" -#: ../commands.cc:3163 +#: ../commands.cc:3173 #, c-format msgid "[target] %s\n" msgstr "" -#: ../commands.cc:3168 +#: ../commands.cc:3178 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "" -#: ../commands.cc:3170 +#: ../commands.cc:3180 msgid "no action taken\n" msgstr "" -#: ../commands.cc:3174 +#: ../commands.cc:3184 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "" -#: ../commands.cc:3191 +#: ../commands.cc:3201 #, c-format msgid "" "propagate from branch '%s' (head %s)\n" " to branch '%s' (head %s)\n" msgstr "" -#: ../commands.cc:3203 +#: ../commands.cc:3213 msgid "refresh the inodeprint cache" msgstr "" -#: ../commands.cc:3211 +#: ../commands.cc:3221 msgid "" "LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" msgstr "" -#: ../commands.cc:3213 +#: ../commands.cc:3223 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" -#: ../commands.cc:3228 ../commands.cc:3230 +#: ../commands.cc:3238 ../commands.cc:3240 #, c-format msgid "%s is not an ancestor of %s" msgstr "%s n'est pas un ancêtre de %s" -#: ../commands.cc:3239 +#: ../commands.cc:3249 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "" -#: ../commands.cc:3241 ../commands.cc:3243 +#: ../commands.cc:3251 ../commands.cc:3253 #, c-format msgid "%s is already an ancestor of %s" msgstr "" -#: ../commands.cc:3257 +#: ../commands.cc:3267 #, c-format msgid "" "explicit_merge of %s\n" @@ -1665,116 +1669,116 @@ " to branch '%s'\n" msgstr "" -#: ../commands.cc:3269 +#: ../commands.cc:3279 msgid "(revision|manifest|file|key) PARTIAL-ID" msgstr "" -#: ../commands.cc:3270 +#: ../commands.cc:3280 msgid "complete partial id" msgstr "" -#: ../commands.cc:3279 +#: ../commands.cc:3289 msgid "non-hex digits in partial id" msgstr "" -#: ../commands.cc:3327 +#: ../commands.cc:3337 msgid "revert file(s), dir(s) or entire working copy" msgstr "" -#: ../commands.cc:3365 +#: ../commands.cc:3375 #, c-format msgid "reverting %s from %s to %s\n" msgstr "" -#: ../commands.cc:3369 +#: ../commands.cc:3379 #, c-format msgid "no file version %s found in database for %s" msgstr "" -#: ../commands.cc:3386 +#: ../commands.cc:3396 msgid "RCSFILE..." msgstr "" -#: ../commands.cc:3387 +#: ../commands.cc:3397 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions. you probably want " "cvs_import" msgstr "" -#: ../commands.cc:3402 +#: ../commands.cc:3412 msgid "rcs" msgstr "" -#: ../commands.cc:3402 +#: ../commands.cc:3412 msgid "CVSROOT" msgstr "" -#: ../commands.cc:3402 +#: ../commands.cc:3412 msgid "import all versions in CVS repository" msgstr "" -#: ../commands.cc:3465 +#: ../commands.cc:3475 msgid "PATH" msgstr "" -#: ../commands.cc:3466 +#: ../commands.cc:3476 msgid "print annotated copy of the file from REVISION" msgstr "" -#: ../commands.cc:3484 +#: ../commands.cc:3494 #, c-format msgid "no revision for file '%s' in database" msgstr "" -#: ../commands.cc:3487 +#: ../commands.cc:3497 #, c-format msgid "annotate file file_path '%s'\n" msgstr "" -#: ../commands.cc:3496 +#: ../commands.cc:3506 #, c-format msgid "No such file '%s' in revision %s\n" msgstr "" -#: ../commands.cc:3498 +#: ../commands.cc:3508 #, c-format msgid "annotate for file_id %s\n" msgstr "" -#: ../commands.cc:3503 +#: ../commands.cc:3513 msgid "[FILE]" msgstr "" -#: ../commands.cc:3504 +#: ../commands.cc:3514 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:3564 +#: ../commands.cc:3574 #, c-format msgid "revision %s does not exist in db, skipping\n" msgstr "" -#: ../commands.cc:3597 +#: ../commands.cc:3607 #, c-format msgid "revision '%s' in '%s' maps to '%s' in %s\n" msgstr "" -#: ../commands.cc:3672 +#: ../commands.cc:3682 msgid "DIRECTORY" msgstr "" -#: ../commands.cc:3672 +#: ../commands.cc:3682 msgid "setup a new working copy directory" msgstr "" -#: ../commands.cc:3686 +#: ../commands.cc:3696 msgid "automation" -msgstr "" +msgstr "automatisation" -#: ../commands.cc:3687 +#: ../commands.cc:3697 msgid "" "interface_version\n" "heads [BRANCH]\n" @@ -1794,31 +1798,31 @@ "select SELECTOR\n" msgstr "" -#: ../commands.cc:3703 +#: ../commands.cc:3713 msgid "automation interface" msgstr "" -#: ../commands.cc:3717 ../commands.cc:3733 +#: ../commands.cc:3727 ../commands.cc:3743 msgid "vars" -msgstr "" +msgstr "variables" -#: ../commands.cc:3717 +#: ../commands.cc:3727 msgid "DOMAIN NAME VALUE" msgstr "" -#: ../commands.cc:3718 +#: ../commands.cc:3728 msgid "set the database variable NAME to VALUE, in domain DOMAIN" msgstr "" -#: ../commands.cc:3733 +#: ../commands.cc:3743 msgid "DOMAIN NAME" msgstr "" -#: ../commands.cc:3734 +#: ../commands.cc:3744 msgid "remove the database variable NAME in domain DOMAIN" msgstr "" -#: ../commands.cc:3745 +#: ../commands.cc:3755 #, c-format msgid "no var with name %s in domain %s" msgstr "" @@ -1844,102 +1848,147 @@ msgid "database %s is not an sqlite version 3 file, try dump and reload" msgstr "" -#: ../database.cc:169 +#. first log the code so we can find _out_ what the confusing code +#. was... note that code does not uniquely identify the errmsg, unlike +#. errno's. +#: ../database.cc:176 ../database.cc:187 #, c-format -msgid "sqlite error [%d]: %s" -msgstr "erreur sqlite [%d] : %s" +msgid "sqlite error: %d: %s" +msgstr "erreur sqlite : %d : %s" -#: ../database.cc:177 -msgid "no database specified" +#: ../database.cc:181 +msgid "make sure database and containing directory are writeable" msgstr "" -#: ../database.cc:182 +#: ../database.cc:201 #, c-format msgid "database %s does not exist" msgstr "la base de données %s n'existe pas" -#: ../database.cc:184 +#: ../database.cc:203 #, c-format msgid "database %s is a directory" msgstr "" -#: ../database.cc:213 +#: ../database.cc:230 #, c-format msgid "could not initialize database: %s: already exists" msgstr "" -#: ../database.cc:218 +#: ../database.cc:235 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" "s'" msgstr "" -#: ../database.cc:334 ../database.cc:435 ../database.cc:452 -msgid "need database name" +#: ../database.cc:353 +#, c-format +msgid "cannot create %s; it already exists\n" msgstr "" -#: ../database.cc:336 +#: ../database.cc:416 #, c-format -msgid "cannot create %s; it already exists\n" +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:530 +#: ../database.cc:464 +#, c-format +msgid "database schema version: %s" +msgstr "version du schéma de la base de données : %s" + +#: ../database.cc:544 msgid "statement cache statistics\n" msgstr "statistiques relatives au cache des expressions\n" -#: ../database.cc:531 +#: ../database.cc:545 #, c-format msgid "prepared %d statements\n" msgstr "%d expressions préparées\n" -#: ../database.cc:536 +#: ../database.cc:550 #, c-format msgid "%d executions of %s\n" msgstr "%d exécutions de %s\n" -#: ../database.cc:593 +#: ../database.cc:607 #, c-format msgid "prepared statement %s\n" msgstr "" -#: ../database.cc:597 +#: ../database.cc:611 #, c-format msgid "multiple statements in query: %s\n" msgstr "" -#: ../database.cc:603 +#: ../database.cc:617 #, c-format msgid "wanted %d columns got %d in query: %s\n" msgstr "" -#: ../database.cc:609 +#: ../database.cc:623 #, c-format msgid "binding %d parameters for %s\n" msgstr "" -#: ../database.cc:623 +#: ../database.cc:637 #, c-format msgid "binding %d with value '%s'\n" msgstr "" -#: ../database.cc:639 +#: ../database.cc:653 #, c-format msgid "null result in query: %s\n" msgstr "" -#: ../database.cc:657 +#: ../database.cc:671 #, c-format msgid "wanted %d rows got %s in query: %s\n" msgstr "" -#: ../database.cc:865 +#: ../database.cc:879 #, c-format msgid "version cache expiring %s\n" msgstr "" #. ++cache_hits; -#: ../database.cc:887 +#: ../database.cc:901 #, c-format msgid "version cache hit on %s\n" msgstr "" @@ -1960,47 +2009,56 @@ #. node, so it much cheaper in terms of memory. #. #. we also maintain a cycle-detecting set, just to be safe -#: ../database.cc:932 +#: ../database.cc:946 #, c-format msgid "reconstructing %s in %s\n" msgstr "" -#: ../database.cc:986 +#: ../database.cc:1000 #, c-format msgid "inserting edge: %s <- %s\n" msgstr "" -#: ../database.cc:990 +#: ../database.cc:1004 #, c-format msgid "skipping merge edge %s <- %s\n" msgstr "" -#: ../database.cc:1036 +#: ../database.cc:1050 #, c-format msgid "following delta %s -> %s\n" msgstr "" #. perform the actual SQL transactions to kill rev rid here -#: ../database.cc:1400 +#: ../database.cc:1414 #, c-format msgid "Killing revision %s locally\n" msgstr "" -#: ../database.cc:1412 +#: ../database.cc:1426 #, c-format msgid "Deleting all references to branch %s\n" msgstr "" -#: ../database.cc:1425 +#: ../database.cc:1439 #, c-format msgid "Deleting all references to tag %s\n" msgstr "" -#: ../database.cc:1575 ../database.cc:1587 +#: ../database.cc:1589 ../database.cc:1601 #, c-format msgid "another key with name '%s' already exists" msgstr "" +#: ../database.cc:2450 +msgid "no database specified" +msgstr "aucune base de données n'a été spécifiée" + +#: ../database.cc:2461 +#, c-format +msgid "could not open database '%s': %s" +msgstr "impossible d'ouvrir la base de données « %s » : %s" + #. Coming into loop we have: #. i #. z --pres--> z 0 @@ -2118,6 +2176,11 @@ "[ 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:606 msgid "lua merge3 hook merged ok\n" @@ -2136,6 +2199,10 @@ "[ 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:663 msgid "lua merge2 hook merged ok\n" @@ -2149,7 +2216,7 @@ #: ../diff_patch.cc:711 #, c-format msgid "file %s does not exist in working copy" -msgstr "" +msgstr "le fichier %s n'existe pas dans la copie de travail" #: ../diff_patch.cc:715 #, c-format @@ -2307,7 +2374,7 @@ #: ../keys.cc:103 #, c-format -msgid "confirm passphrase for key ID [%s]" +msgid "confirm passphrase for key ID [%s]: " msgstr "" #: ../keys.cc:108 @@ -2328,46 +2395,45 @@ #: ../keys.cc:184 #, c-format -msgid "generated %d-byte public key\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" -#: ../keys.cc:185 +#: ../keys.cc:207 ../keys.cc:263 #, c-format -msgid "generated %d-byte (encrypted) private key\n" -msgstr "" - -#: ../keys.cc:205 ../keys.cc:261 -#, c-format msgid "building signer from %d-byte decrypted private key\n" msgstr "" -#: ../keys.cc:254 +#: ../keys.cc:256 #, c-format msgid "base64-decoding %d-byte private key\n" msgstr "" -#: ../keys.cc:298 +#: ../keys.cc:300 #, c-format msgid "produced %d-byte signature\n" msgstr "" -#: ../keys.cc:326 +#: ../keys.cc:328 #, c-format msgid "building verifier for %d-byte pub key\n" msgstr "" #. check the text+sig against the key -#: ../keys.cc:348 +#: ../keys.cc:350 #, c-format msgid "checking %d-byte (%d decoded) signature\n" msgstr "" -#: ../keys.cc:482 +#: ../keys.cc:484 #, c-format msgid "no public key '%s' found in database" msgstr "" -#: ../keys.cc:493 +#: ../keys.cc:495 #, c-format msgid "passphrase for '%s' is incorrect" msgstr "" @@ -2442,7 +2508,7 @@ #: ../lua.cc:693 ../lua.cc:706 #, c-format msgid "opening rcfile '%s' ...\n" -msgstr "" +msgstr "ouverture du fichier rc « %s » ...\n" #: ../lua.cc:697 ../lua.cc:709 #, c-format @@ -2501,6 +2567,10 @@ "'monotone drop FILE' to remove it permanently, or\n" "'monotone revert FILE' to restore it\n" 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 @@ -2632,7 +2702,7 @@ #: ../monotone.cc:87 msgid "load extra rc file" -msgstr "" +msgstr "charger un fichier rc supplémentaire" #: ../monotone.cc:88 msgid "set key for signatures" @@ -2786,7 +2856,7 @@ #. xgettext: please use short message and try to avoid multibytes chars #: ../netsync.cc:667 ../netsync.cc:684 msgid "revs written" -msgstr "revs ecrites" +msgstr "révs écrites" #. xgettext: please use short message and try to avoid multibytes chars #: ../netsync.cc:669 @@ -2796,7 +2866,7 @@ #. xgettext: please use short message and try to avoid multibytes chars #: ../netsync.cc:671 ../netsync.cc:686 msgid "revs in" -msgstr "revs in" +msgstr "révs in" #. xgettext: please use short message and try to avoid multibytes chars #: ../netsync.cc:676 @@ -2806,7 +2876,7 @@ #. xgettext: please use short message and try to avoid multibytes chars #: ../netsync.cc:678 ../netsync.cc:688 msgid "revs out" -msgstr "revs out" +msgstr "révs out" #. But otherwise, we're ready to go! #: ../netsync.cc:746 @@ -3751,7 +3821,7 @@ #. xgettext: please use short message and try to avoid multibytes chars #: ../netsync.cc:3688 msgid "revisions" -msgstr "revisions" +msgstr "révisions" #. xgettext: please use short message and try to avoid multibytes chars #: ../netsync.cc:3690 @@ -4285,144 +4355,144 @@ msgid "%s is a merge; verifying paths to common ancestor %s are sane\n" msgstr "" -#: ../revision.cc:306 +#: ../revision.cc:310 #, c-format msgid "loading parents for node %d\n" msgstr "" -#: ../revision.cc:326 +#: ../revision.cc:330 #, c-format msgid "parent %s -> node %d\n" msgstr "parent %s -> noeud %d\n" -#: ../revision.cc:476 +#: ../revision.cc:480 #, c-format msgid "found %d intersecting nodes\n" msgstr "" -#: ../revision.cc:529 +#: ../revision.cc:533 #, c-format msgid "searching for common ancestor, left=%s right=%s\n" msgstr "" -#: ../revision.cc:534 +#: ../revision.cc:538 #, c-format msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n" msgstr "" -#: ../revision.cc:539 +#: ../revision.cc:543 #, c-format msgid "found node %d, ancestor of left %s and dominating right %s\n" msgstr "" -#: ../revision.cc:546 +#: ../revision.cc:550 #, c-format msgid "found node %d, ancestor of right %s and dominating left %s\n" msgstr "" -#: ../revision.cc:583 +#: ../revision.cc:587 #, c-format msgid "searching for least common ancestor, left=%s right=%s\n" msgstr "" -#: ../revision.cc:587 +#: ../revision.cc:591 #, c-format msgid "least common ancestor scan [par=%d,anc=%d]\n" msgstr "" -#: ../revision.cc:592 +#: ../revision.cc:596 #, c-format msgid "found node %d, ancestor of left %s and right %s\n" msgstr "" -#: ../revision.cc:646 +#: ../revision.cc:650 #, c-format msgid "checking whether %s is an ancestor of %s\n" msgstr "" #. now stick them in our ordering (if wanted) and remove them from the #. graph, calculating the new roots as we go -#: ../revision.cc:758 +#: ../revision.cc:762 #, c-format msgid "new root: %s\n" msgstr "nouvelle racine : %s\n" -#: ../revision.cc:773 +#: ../revision.cc:777 #, c-format msgid "new leaf: %s\n" msgstr "nouvelle feuille : %s\n" -#: ../revision.cc:915 +#: ../revision.cc:919 #, c-format msgid "exploring changesets from parents of %s, seeking towards %s\n" msgstr "" -#: ../revision.cc:928 +#: ../revision.cc:932 #, c-format msgid "considering parent %s of %s\n" msgstr "" -#: ../revision.cc:954 +#: ../revision.cc:958 #, c-format msgid "revision %s is relevant, composing with edge to %s\n" msgstr "" -#: ../revision.cc:961 +#: ../revision.cc:965 #, c-format msgid "parent %s of %s is not relevant\n" msgstr "" -#: ../revision.cc:997 +#: ../revision.cc:1001 #, c-format msgid "adding parents of %s to subgraph\n" msgstr "" -#: ../revision.cc:1007 +#: ../revision.cc:1011 #, c-format msgid "found parent %s of %s\n" msgstr "" -#: ../revision.cc:1011 +#: ../revision.cc:1015 #, c-format msgid "adding parent %s to next frontier\n" msgstr "" -#: ../revision.cc:1026 +#: ../revision.cc:1030 #, c-format msgid "calculating composite changeset between %s and %s\n" msgstr "" -#: ../revision.cc:1044 +#: ../revision.cc:1048 #, c-format msgid "calculating changeset from %s to %s\n" msgstr "" -#: ../revision.cc:1048 +#: ../revision.cc:1052 #, c-format msgid "no common ancestor for %s and %s\n" msgstr "" -#: ../revision.cc:1049 +#: ../revision.cc:1053 #, c-format msgid "common ancestor is %s\n" msgstr "l'ancêtre commun est %s\n" -#: ../revision.cc:1080 +#: ../revision.cc:1084 #, c-format msgid "analyzing manifest changes from '%s' -> '%s'\n" msgstr "" -#: ../revision.cc:1093 +#: ../revision.cc:1097 #, c-format msgid "splitting ancestry for file %s\n" msgstr "" -#: ../revision.cc:1160 +#: ../revision.cc:1164 #, c-format msgid "noting ancestry from child %d -> parent %d\n" msgstr "" -#: ../revision.cc:1193 +#: ../revision.cc:1197 #, c-format msgid "setting epoch for %s to %s\n" msgstr "" @@ -4445,80 +4515,80 @@ #. FIXME: remove this method eventually, since it is (mildly) destructive on #. history, and isn't really doing anything that necessarily needs to happen #. anyway. -#: ../revision.cc:1249 +#: ../revision.cc:1253 msgid "scanning for nodes with 3+ parents\n" msgstr "" -#: ../revision.cc:1290 +#: ../revision.cc:1294 #, c-format msgid "optimizing out redundant edge %i -> %i\n" msgstr "" -#: ../revision.cc:1317 +#: ../revision.cc:1321 #, c-format msgid "rebuilding %d nodes\n" msgstr "" -#: ../revision.cc:1354 +#: ../revision.cc:1358 #, c-format msgid "node %d = manifest %s\n" msgstr "" -#: ../revision.cc:1365 +#: ../revision.cc:1369 #, c-format msgid "loaded '%s' manifest cert for node %s\n" msgstr "" -#: ../revision.cc:1393 +#: ../revision.cc:1397 #, c-format msgid "node %d = revision %s = manifest %s\n" msgstr "noeud %d = révision %s = manifeste %s\n" -#: ../revision.cc:1405 +#: ../revision.cc:1409 #, c-format msgid "loaded '%s' revision cert for node %s\n" msgstr "" -#: ../revision.cc:1429 +#: ../revision.cc:1433 #, c-format msgid "processing node %d\n" msgstr "" -#: ../revision.cc:1433 +#: ../revision.cc:1437 #, c-format msgid "node %d already processed, skipping\n" msgstr "" -#: ../revision.cc:1447 +#: ../revision.cc:1451 #, c-format msgid "node %d is a root node\n" msgstr "" -#: ../revision.cc:1463 ../revision.cc:1546 +#: ../revision.cc:1467 ../revision.cc:1550 #, c-format msgid "parent node %d = revision %s\n" msgstr "" -#: ../revision.cc:1525 +#: ../revision.cc:1529 #, c-format msgid "processing edge from child %d -> parent %d\n" msgstr "" -#: ../revision.cc:1563 +#: ../revision.cc:1567 #, c-format msgid "mapped node %d to revision %s\n" msgstr "" -#: ../revision.cc:1569 +#: ../revision.cc:1573 #, c-format msgid "skipping already existing revision %s\n" msgstr "" -#: ../revision.cc:1581 +#: ../revision.cc:1585 msgid "rebuilding revision graph from existing graph\n" msgstr "" -#: ../revision.cc:1614 +#: ../revision.cc:1618 msgid "rebuilding revision graph from manifest certs\n" msgstr "" @@ -4570,7 +4640,9 @@ #: ../schema_migration.cc:262 #, 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" +msgstr "" +"le schéma de la base de données %s est inconnu; impossible d'effectuer la " +"migration" #. We really want 'db migrate' on an up-to-date schema to be a no-op #. (no vacuum or anything, even), so that automated scripts can fire @@ -4583,32 +4655,32 @@ "aucune migration n'a été effectuée; le schéma de la base de données est déjà " "à jour en %s\n" -#: ../transforms.cc:485 +#: ../transforms.cc:524 #, c-format msgid "converting %d bytes from %s to %s\n" msgstr "conversion de %d octets de %s en %s\n" -#: ../transforms.cc:491 +#: ../transforms.cc:530 #, c-format msgid "failed to convert string from %s to %s: '%s'" msgstr "impossible de convertir la chaîne de %s en %s : « %s »" -#: ../transforms.cc:539 +#: ../transforms.cc:578 #, c-format msgid "converting %d bytes from IDNA ACE to UTF-8\n" msgstr "" -#: ../transforms.cc:542 ../transforms.cc:556 +#: ../transforms.cc:581 ../transforms.cc:595 #, c-format msgid "error converting %d UTF-8 bytes to IDNA ACE: %s" msgstr "" -#: ../transforms.cc:553 +#: ../transforms.cc:592 #, c-format msgid "converting %d bytes from UTF-8 to IDNA ACE\n" msgstr "conversion de %d octets d'UTF-8 en IDNA ACE\n" -#: ../transforms.cc:807 +#: ../transforms.cc:855 #, c-format msgid "doing linesep conversion to %s\n" msgstr "" @@ -4631,7 +4703,7 @@ msgid "%d" msgstr "%d" -#: ../ui.cc:316 +#: ../ui.cc:323 #, c-format msgid "" "fatal: %s\n" @@ -4640,7 +4712,7 @@ "and a description of what you were doing to %s.\n" msgstr "" -#: ../ui.cc:359 +#: ../ui.cc:366 msgid "monotone: " msgstr "" @@ -4917,5 +4989,12 @@ msgid "computed binary delta instructions\n" msgstr "" +#~ msgid "" +#~ "sqlite error: %s\n" +#~ "%s" +#~ msgstr "" +#~ "erreur sqlite : %s\n" +#~ "%s" + #~ msgid "network error: %s\n" #~ msgstr "erreur réseau : %s\n"