#
# patch "ChangeLog"
# from [914e23941cb7f78e16e08f86cef0b2e060782250]
# to [7dc21d3a46c6ecd94685ab21e67b131b32002f12]
#
# patch "po/fr.po"
# from [41fc7b72e3b2c116bdded67313dde960bae9eea4]
# to [1cd6b3ce1a7f5251736e79f75f5a3e59cb0ce119]
#
========================================================================
--- ChangeLog 914e23941cb7f78e16e08f86cef0b2e060782250
+++ ChangeLog 7dc21d3a46c6ecd94685ab21e67b131b32002f12
@@ -1,5 +1,9 @@
2005-08-30 Benoît Dejean
+ * po/fr.po: Updated French translation.
+
+2005-08-30 Benoît Dejean
+
* commands.cc: Merged some error messages.
2005-08-30 Benoît Dejean
========================================================================
--- po/fr.po 41fc7b72e3b2c116bdded67313dde960bae9eea4
+++ po/fr.po 1cd6b3ce1a7f5251736e79f75f5a3e59cb0ce119
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: monotone 0.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 09:57+0200\n"
-"PO-Revision-Date: 2005-08-26 04:07+0200\n"
+"POT-Creation-Date: 2005-08-30 20:58+0200\n"
+"PO-Revision-Date: 2005-08-30 20:59+0200\n"
"Last-Translator: Benoît Dejean \n"
"Language-Team: Benoît Dejean \n"
"MIME-Version: 1.0\n"
@@ -15,139 +15,104 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: ../app_state.cc:58
+#: ../app_state.cc:51
#, c-format
msgid "initializing from directory %s\n"
msgstr ""
-#: ../app_state.cc:59
+#: ../app_state.cc:62
#, c-format
-msgid "found working copy directory %s\n"
-msgstr ""
-
-#: ../app_state.cc:61
-#, c-format
-msgid "cannot change to directory to %s\n"
-msgstr ""
-
-#: ../app_state.cc:69
-#, c-format
msgid "branch name is '%s'\n"
msgstr "le nom de la branche est « %s »\n"
-#: ../app_state.cc:75
+#: ../app_state.cc:69
#, c-format
-msgid "relative directory is '%s'\n"
-msgstr ""
-
-#: ../app_state.cc:82
-#, c-format
msgid "setting dump path to %s\n"
msgstr ""
-#: ../app_state.cc:93
+#: ../app_state.cc:83
#, c-format
msgid "working copy directory required but not found%s%s"
msgstr ""
-#: ../app_state.cc:101
+#: ../app_state.cc:91
msgid "invalid directory ''"
msgstr ""
-#: ../app_state.cc:105
+#: ../app_state.cc:93
#, c-format
-msgid "cannot change to initial directory %s\n"
-msgstr ""
-
-#: ../app_state.cc:109
-#, c-format
-msgid "create working copy in %s\n"
+msgid "creating working copy in %s\n"
msgstr "création d'une copie de travail dans %s\n"
-#: ../app_state.cc:120
+#: ../app_state.cc:99
#, c-format
-msgid "could not create directory: %s: %s\n"
-msgstr "impossible de créer le dossier : %s : %s\n"
-
-#: ../app_state.cc:125
-#, c-format
-msgid "cannot change to new directory %s\n"
+msgid "monotone bookkeeping directory '%s' already exists in '%s'\n"
msgstr ""
-#: ../app_state.cc:134
+#: ../app_state.cc:102
#, c-format
-msgid "monotone book-keeping directory '%s' already exists in '%s'\n"
+msgid "creating bookkeeping directory '%s' for working copy in '%s'\n"
msgstr ""
-#: ../app_state.cc:137
+#: ../app_state.cc:132
#, c-format
-msgid "creating book-keeping directory '%s' for working copy in '%s'\n"
-msgstr ""
-
-#: ../app_state.cc:159
-#, c-format
-msgid "'%s' prefixed to '%s'\n"
-msgstr ""
-
-#: ../app_state.cc:178
-#, c-format
msgid "'%s' ignored by restricted path set\n"
msgstr ""
-#: ../app_state.cc:183
+#: ../app_state.cc:137
#, c-format
msgid "unknown path '%s'\n"
msgstr "chemin inconnu « %s »\n"
-#: ../app_state.cc:185
+#: ../app_state.cc:139
#, c-format
msgid "'%s' added to restricted path set\n"
msgstr ""
-#: ../app_state.cc:226
+#: ../app_state.cc:178
#, c-format
msgid "checking restricted path set for '%s'\n"
msgstr ""
-#: ../app_state.cc:233
+#: ../app_state.cc:185
#, c-format
msgid "path '%s' found in restricted path set; '%s' included\n"
msgstr ""
-#: ../app_state.cc:239
+#: ../app_state.cc:191
#, c-format
msgid "path '%s' not found in restricted path set; '%s' excluded\n"
msgstr ""
-#: ../app_state.cc:298
-#, c-format
-msgid "search root '%s' does not exist\n"
-msgstr ""
+#: ../app_state.cc:248
+#, fuzzy, c-format
+msgid "search root '%s' does not exist"
+msgstr "le fichier rc « %s » n'existe pas"
-#: ../app_state.cc:300
+#: ../app_state.cc:249
#, c-format
msgid "search root '%s' is not a directory\n"
msgstr ""
-#: ../app_state.cc:301
+#: ../app_state.cc:251
#, c-format
msgid "set search root to %s\n"
msgstr ""
-#: ../app_state.cc:332
+#: ../app_state.cc:282
msgid "negative depth not allowed\n"
msgstr ""
-#: ../app_state.cc:340
+#: ../app_state.cc:290
msgid "negative or zero last not allowed\n"
msgstr ""
-#: ../app_state.cc:449
+#: ../app_state.cc:399
#, c-format
msgid "Failed to read options file %s"
msgstr ""
-#: ../app_state.cc:466
+#: ../app_state.cc:416
#, c-format
msgid "Failed to write options file %s"
msgstr ""
@@ -211,7 +176,7 @@
msgid "cert: signable text %s\n"
msgstr ""
-#: ../cert.cc:364 ../keys.cc:482
+#: ../cert.cc:364 ../keys.cc:508
#, c-format
msgid "no private key '%s' found in database or get_priv_key hook"
msgstr ""
@@ -236,8 +201,8 @@
"multiple branch certs found for revision %s, please provide a branch name"
msgstr ""
-#: ../cert.cc:507 ../rcs_import.cc:1234 ../revision.cc:1592
-#: ../revision.cc:1624
+#: ../cert.cc:507 ../rcs_import.cc:1231 ../revision.cc:1594
+#: ../revision.cc:1626
msgid "no unique private key for cert construction"
msgstr ""
@@ -246,12 +211,12 @@
msgid "no default author name for branch '%s'"
msgstr ""
-#: ../change_set.cc:290
+#: ../change_set.cc:289
#, c-format
msgid "tid %d: parent %d, type %s, name %s\n"
msgstr ""
-#: ../change_set.cc:316
+#: ../change_set.cc:315
#, c-format
msgid "%d -> %d\n"
msgstr ""
@@ -450,65 +415,67 @@
msgid "inverse is delta %s -> %s on %s\n"
msgstr ""
-#: ../change_set.cc:2448 ../change_set.cc:2497
+#: ../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:2455 ../change_set.cc:2505
+#: ../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:138
+#: ../commands.cc:136
#, c-format
msgid "expanding command '%s'\n"
msgstr ""
-#: ../commands.cc:155
+#: ../commands.cc:153
#, c-format
msgid "expanded command to '%s'\n"
msgstr ""
-#: ../commands.cc:160
+#: ../commands.cc:158
#, c-format
msgid "command '%s' has multiple ambiguous expansions: \n"
msgstr ""
-#: ../commands.cc:203
+#: ../commands.cc:201
msgid "commands:"
msgstr "commandes :"
-#: ../commands.cc:247
+#: ../commands.cc:245
#, c-format
msgid "executing command '%s'\n"
msgstr "exécution de la commande « %s »\n"
-#: ../commands.cc:253
+#: ../commands.cc:251
#, c-format
msgid "unknown command '%s'\n"
msgstr "commande inconnue « %s »\n"
-#: ../commands.cc:300
+#: ../commands.cc:298
#, c-format
msgid "pid file '%s' already exists"
msgstr "le fichier pid « %s » existe déjà "
-#: ../commands.cc:370
-msgid "Enter Log. Lines beginning with `MT:' are removed automatically\n"
+#: ../commands.cc:368
+msgid ""
+"Enter a description of this change.\n"
+"Lines beginning with `MT:' are removed automatically.\n"
msgstr ""
-"Saisissez le journal. Les lignes débutant par « MT: » sont supprimées "
-"automatiquement\n"
+"Saisissez une description pour cette modification.\n"
+"Les lignes débutant par « MT: » sont supprimées automatiquement.\n"
-#: ../commands.cc:376
+#: ../commands.cc:375
msgid "edit of log message failed"
msgstr "l'édition du message du journal a échouée"
-#: ../commands.cc:385
+#: ../commands.cc:384
msgid "note: "
msgstr ""
-#: ../commands.cc:386
+#: ../commands.cc:385
#, c-format
msgid ""
"branch '%s' has multiple heads\n"
@@ -517,115 +484,138 @@
"la branche « %s » a plusieurs heads\n"
"vous devriez peut-être lancer « monotone merge »"
-#: ../commands.cc:446 ../commands.cc:3511
+#: ../commands.cc:445 ../commands.cc:1810 ../commands.cc:3533
#, c-format
msgid "no such revision '%s'"
-msgstr ""
+msgstr "aucune révision « %s »"
-#: ../commands.cc:453
+#: ../commands.cc:452
#, c-format
msgid "expanding selection '%s'\n"
msgstr ""
-#: ../commands.cc:461
+#: ../commands.cc:460
#, c-format
msgid "no match for selection '%s'"
msgstr ""
-#: ../commands.cc:464
+#: ../commands.cc:463
#, c-format
msgid "selection '%s' has multiple ambiguous expansions: \n"
msgstr ""
-#: ../commands.cc:471
+#: ../commands.cc:470
#, c-format
msgid "expanded to '%s'\n"
msgstr ""
-#: ../commands.cc:480 ../commands.cc:510
+#: ../commands.cc:481
msgid "non-hex digits in id"
msgstr ""
-#: ../commands.cc:489 ../commands.cc:519
+#: ../commands.cc:490
+#, fuzzy, c-format
+msgid "partial id '%s' does not have an expansion"
+msgstr "le fichier rc « %s » n'existe pas"
+
+#: ../commands.cc:493
#, c-format
-msgid "partial id '%s' does not have a unique expansion"
+msgid "partial id '%s' has multiple ambiguous expansions: \n"
msgstr ""
-#: ../commands.cc:492 ../commands.cc:522
+#: ../commands.cc:500
#, c-format
-msgid "partial id '%s' has multiple ambiguous expansions: \n"
+msgid "expanded partial id '%s' to '%s'\n"
msgstr ""
-#: ../commands.cc:499 ../commands.cc:529
+#: ../commands.cc:527
#, c-format
-msgid ""
-"expanding partial id '%s'\n"
-"expanded to '%s'\n"
+msgid "warning: no public key '%s' found in database\n"
msgstr ""
-#: ../commands.cc:557
+#: ../commands.cc:537
#, c-format
-msgid "warning: no public key '%s' found in database\n"
+msgid ""
+"Key : %s\n"
+"Sig : %s\n"
+"Name : %s\n"
+"Value : %s\n"
msgstr ""
+"Clé : %s\n"
+"Signature : %s\n"
+"Nom : %s\n"
+"Valeur : %s\n"
-#: ../commands.cc:666
+#: ../commands.cc:571
+msgid "ok"
+msgstr "0K"
+
+#: ../commands.cc:574
+msgid "bad"
+msgstr "mauvais"
+
+#: ../commands.cc:577
+msgid "unknown"
+msgstr "inconnu"
+
+#: ../commands.cc:652
msgid "no keys found\n"
msgstr ""
-#: ../commands.cc:668
+#: ../commands.cc:654
#, c-format
msgid "no keys found matching '%s'\n"
msgstr ""
-#: ../commands.cc:680 ../commands.cc:1389 ../commands.cc:1443
-#: ../commands.cc:2870
+#: ../commands.cc:666 ../commands.cc:1384 ../commands.cc:1442
+#: ../commands.cc:2893
#, c-format
msgid "no revision %s found in database"
msgstr ""
-#: ../commands.cc:686
+#: ../commands.cc:672
#, c-format
msgid "revision %s already has children. We cannot kill it."
msgstr ""
-#: ../commands.cc:816 ../commands.cc:838 ../commands.cc:870 ../commands.cc:894
-#: ../commands.cc:934
+#: ../commands.cc:802 ../commands.cc:824 ../commands.cc:856 ../commands.cc:880
+#: ../commands.cc:920
msgid "key and cert"
msgstr "clef et certificat"
-#: ../commands.cc:816 ../commands.cc:838 ../commands.cc:870
+#: ../commands.cc:802 ../commands.cc:824 ../commands.cc:856
msgid "KEYID"
msgstr "IDCLEF"
-#: ../commands.cc:816
+#: ../commands.cc:802
msgid "generate an RSA key-pair"
msgstr "générer une paire de clefs RSA"
-#: ../commands.cc:826
+#: ../commands.cc:812
#, c-format
msgid "key '%s' already exists in database"
msgstr "la clef « %s » est déjà dans la base de données"
-#: ../commands.cc:830
+#: ../commands.cc:816
#, c-format
msgid "generating key-pair '%s'\n"
msgstr ""
-#: ../commands.cc:832
+#: ../commands.cc:818
#, c-format
msgid "storing key-pair '%s' in database\n"
msgstr ""
-#: ../commands.cc:838
+#: ../commands.cc:824
msgid "drop a public and private key"
msgstr "supprimer une clef publique et privée"
-#: ../commands.cc:849
+#: ../commands.cc:835
#, c-format
msgid "dropping public key '%s' from database\n"
msgstr ""
-#: ../commands.cc:856
+#: ../commands.cc:842
#, c-format
msgid ""
"dropping private key '%s' from database\n"
@@ -634,54 +624,54 @@
"suppression de la clef privée « %s » de la base de données\n"
"\n"
-#: ../commands.cc:857
+#: ../commands.cc:843
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:865
+#: ../commands.cc:851
#, c-format
msgid "public or private key '%s' does not exist in database"
msgstr ""
-#: ../commands.cc:871
+#: ../commands.cc:857
msgid "change passphrase of a private RSA key"
msgstr ""
-#: ../commands.cc:882
+#: ../commands.cc:868
#, c-format
msgid "key '%s' does not exist in database"
msgstr ""
-#: ../commands.cc:889
+#: ../commands.cc:875
msgid "passphrase changed\n"
msgstr "la phrase de passe à changée\n"
-#: ../commands.cc:894
+#: ../commands.cc:880
msgid "REVISION CERTNAME [CERTVAL]"
msgstr ""
-#: ../commands.cc:895
+#: ../commands.cc:881
msgid "create a cert for a revision"
msgstr ""
-#: ../commands.cc:915
+#: ../commands.cc:901
msgid "no unique private key found, and no key specified"
msgstr ""
-#: ../commands.cc:934
+#: ../commands.cc:920
msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
msgstr ""
-#: ../commands.cc:935
+#: ../commands.cc:921
msgid ""
"test whether a hypothetical cert would be trusted\n"
"by current settings"
msgstr ""
-#: ../commands.cc:968
+#: ../commands.cc:954
#, c-format
msgid ""
"if a cert on: %s\n"
@@ -691,79 +681,79 @@
"it would be: %s\n"
msgstr ""
-#: ../commands.cc:977
+#: ../commands.cc:963
msgid "trusted"
msgstr ""
-#: ../commands.cc:977
+#: ../commands.cc:963
msgid "UNtrusted"
msgstr ""
-#: ../commands.cc:980 ../commands.cc:993 ../commands.cc:1005
-#: ../commands.cc:1022 ../commands.cc:1068
+#: ../commands.cc:966 ../commands.cc:979 ../commands.cc:991
+#: ../commands.cc:1008 ../commands.cc:1054
msgid "review"
msgstr ""
-#: ../commands.cc:980
+#: ../commands.cc:966
msgid "REVISION TAGNAME"
msgstr ""
-#: ../commands.cc:981
+#: ../commands.cc:967
#, fuzzy
msgid "put a symbolic tag cert on a revision version"
msgstr "mettre une certificat-étiquette symbolique"
-#: ../commands.cc:993
+#: ../commands.cc:979
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr ""
-#: ../commands.cc:994
+#: ../commands.cc:980
msgid "note the results of running a test on a revision"
msgstr ""
-#: ../commands.cc:1005 ../commands.cc:1022
+#: ../commands.cc:991 ../commands.cc:1008
msgid "REVISION"
msgstr ""
-#: ../commands.cc:1006
+#: ../commands.cc:992
msgid "approve of a particular revision"
msgstr ""
-#: ../commands.cc:1017
+#: ../commands.cc:1003
msgid "need --branch argument for approval"
msgstr ""
-#: ../commands.cc:1023
+#: ../commands.cc:1009
msgid "disapprove of a particular revision"
msgstr ""
-#: ../commands.cc:1036
+#: ../commands.cc:1022
#, c-format
msgid "revision %s has %d changesets, cannot invert\n"
msgstr ""
-#: ../commands.cc:1040
+#: ../commands.cc:1026
msgid "need --branch argument for disapproval"
msgstr ""
-#: ../commands.cc:1063
+#: ../commands.cc:1049
#, c-format
msgid "disapproval of revision %s"
msgstr ""
-#: ../commands.cc:1068
+#: ../commands.cc:1054
msgid "REVISION [COMMENT]"
msgstr ""
-#: ../commands.cc:1069
+#: ../commands.cc:1055
msgid "comment on a particular revision"
msgstr ""
-#: ../commands.cc:1079
+#: ../commands.cc:1065
msgid "edit comment failed"
-msgstr ""
+msgstr "l'édition du commentaire a échouée"
-#: ../commands.cc:1082
+#: ../commands.cc:1068
msgid "empty comment"
msgstr "commentaire vide"
@@ -774,141 +764,141 @@
#. write_change_set(cs, dat);
#. cout << "change set '" << name << "'\n" << dat << endl;
#. }
-#: ../commands.cc:1092 ../commands.cc:1117 ../commands.cc:1144
-#: ../commands.cc:1275 ../commands.cc:2139 ../commands.cc:2266
-#: ../commands.cc:2819 ../commands.cc:3352
+#: ../commands.cc:1078 ../commands.cc:1103 ../commands.cc:1130
+#: ../commands.cc:1262 ../commands.cc:2160 ../commands.cc:2287
+#: ../commands.cc:2842 ../commands.cc:3375
msgid "working copy"
msgstr "copie de travail"
-#: ../commands.cc:1092 ../commands.cc:1117
+#: ../commands.cc:1078 ../commands.cc:1103
msgid "PATH..."
msgstr "CHEMIN..."
-#: ../commands.cc:1093
+#: ../commands.cc:1079
msgid "add files to working copy"
msgstr "ajouter des fichiers à la copie de travail"
-#: ../commands.cc:1118
+#: ../commands.cc:1104
msgid "drop files from working copy"
msgstr "supprimer des fichiers de la copie de travail"
-#: ../commands.cc:1144
+#: ../commands.cc:1130
msgid "SRC DST"
msgstr ""
-#: ../commands.cc:1145
+#: ../commands.cc:1131
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:1172 ../commands.cc:1185 ../commands.cc:2740
-#: ../commands.cc:2757 ../commands.cc:3412
+#: ../commands.cc:1159 ../commands.cc:1172 ../commands.cc:2763
+#: ../commands.cc:2780 ../commands.cc:3435
msgid "debug"
msgstr ""
-#: ../commands.cc:1172
+#: ../commands.cc:1159
msgid "load file contents into db"
-msgstr ""
+msgstr "charger le contenu du fichier dans la base de données"
-#: ../commands.cc:1185
+#: ../commands.cc:1172
msgid " "
msgstr " "
-#: ../commands.cc:1186
+#: ../commands.cc:1173
msgid "merge 3 files and output result"
msgstr ""
-#: ../commands.cc:1196
+#: ../commands.cc:1183
msgid "ancestor file id does not exist"
msgstr ""
-#: ../commands.cc:1199
+#: ../commands.cc:1186
msgid "left file id does not exist"
msgstr ""
-#: ../commands.cc:1202
+#: ../commands.cc:1189
msgid "right file id does not exist"
msgstr ""
-#: ../commands.cc:1213
+#: ../commands.cc:1200
msgid "merge failed"
msgstr ""
-#: ../commands.cc:1218 ../commands.cc:1298 ../commands.cc:1696
-#: ../commands.cc:2607 ../commands.cc:3295 ../commands.cc:3491
-#: ../commands.cc:3529
+#: ../commands.cc:1205 ../commands.cc:1285 ../commands.cc:1699
+#: ../commands.cc:2630 ../commands.cc:3318 ../commands.cc:3514
+#: ../commands.cc:3551
msgid "informative"
msgstr "information"
-#: ../commands.cc:1218 ../commands.cc:2266 ../commands.cc:2607
-#: ../commands.cc:3352
+#: ../commands.cc:1205 ../commands.cc:2287 ../commands.cc:2630
+#: ../commands.cc:3375
msgid "[PATH]..."
msgstr ""
-#: ../commands.cc:1218
+#: ../commands.cc:1205
msgid "show status of working copy"
msgstr ""
-#: ../commands.cc:1275
+#: ../commands.cc:1262
msgid "[PATH]"
msgstr ""
-#: ../commands.cc:1276
+#: ../commands.cc:1263
msgid "calculate identity of PATH or stdin"
msgstr ""
-#: ../commands.cc:1299
+#: ../commands.cc:1286
msgid ""
"(file|manifest|revision) [ID]\n"
"file REVISION FILENAME"
msgstr ""
-#: ../commands.cc:1301
+#: ../commands.cc:1288
msgid "write file, manifest, or revision from database to stdout"
msgstr ""
-#: ../commands.cc:1321
+#: ../commands.cc:1308
#, c-format
msgid "no file version %s found in database"
msgstr ""
-#: ../commands.cc:1333
+#: ../commands.cc:1326
#, c-format
msgid "no file '%s' found in revision '%s'\n"
msgstr ""
-#: ../commands.cc:1338
+#: ../commands.cc:1333
#, c-format
msgid "dumping file %s\n"
msgstr ""
-#: ../commands.cc:1362
+#: ../commands.cc:1357
#, c-format
msgid "no manifest version %s found in database"
msgstr ""
-#: ../commands.cc:1366
+#: ../commands.cc:1361
#, c-format
msgid "dumping manifest %s\n"
msgstr ""
-#: ../commands.cc:1393
+#: ../commands.cc:1388
#, c-format
msgid "dumping revision %s\n"
msgstr ""
-#: ../commands.cc:1403 ../commands.cc:1502 ../commands.cc:3095
-#: ../commands.cc:3144 ../commands.cc:3229 ../commands.cc:3236
-#: ../commands.cc:3698
+#: ../commands.cc:1398 ../commands.cc:1505 ../commands.cc:3118
+#: ../commands.cc:3167 ../commands.cc:3252 ../commands.cc:3259
+#: ../commands.cc:3720
msgid "tree"
msgstr "arborescence"
-#: ../commands.cc:1403
+#: ../commands.cc:1398
msgid "[DIRECTORY]\n"
msgstr ""
-#: ../commands.cc:1404
+#: ../commands.cc:1399
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"
@@ -918,80 +908,85 @@
#. no checkout dir specified, use branch name for dir
#. use branch head revision
-#: ../commands.cc:1419 ../commands.cc:1431
+#: ../commands.cc:1416 ../commands.cc:1430
msgid "need --branch argument for branch-based checkout"
msgstr ""
-#: ../commands.cc:1434
+#: ../commands.cc:1433
#, c-format
msgid "branch %s is empty"
msgstr "la branche %s est vide"
-#: ../commands.cc:1435
+#: ../commands.cc:1434
#, c-format
msgid "branch %s has multiple heads"
msgstr ""
-#: ../commands.cc:1456
+#: ../commands.cc:1455
#, c-format
msgid "found %d %s branch certs on revision %s\n"
msgstr ""
-#: ../commands.cc:1461
+#: ../commands.cc:1460
#, c-format
msgid "revision %s is not a member of branch %s\n"
msgstr ""
-#: ../commands.cc:1477
+#: ../commands.cc:1466
+#, fuzzy, c-format
+msgid "checkout directory '%s' already exists"
+msgstr "le fichier pid « %s » existe déjà "
+
+#: ../commands.cc:1480
#, c-format
msgid "no manifest %s found in database"
msgstr ""
-#: ../commands.cc:1479
+#: ../commands.cc:1482
#, c-format
msgid "checking out revision %s to directory %s\n"
msgstr ""
-#: ../commands.cc:1485
+#: ../commands.cc:1488
#, c-format
msgid "no file %s found in database for %s"
msgstr ""
-#: ../commands.cc:1489 ../commands.cc:3399
+#: ../commands.cc:1492 ../commands.cc:3422
#, c-format
msgid "writing file %s to %s\n"
msgstr ""
-#: ../commands.cc:1502
+#: ../commands.cc:1505
msgid "show unmerged head revisions of branch"
msgstr ""
-#: ../commands.cc:1510 ../commands.cc:3104
+#: ../commands.cc:1513 ../commands.cc:3127
msgid "please specify a branch, with --branch=BRANCH"
-msgstr ""
+msgstr "veuillez préciser une branche avec --branch=BRANCHE"
-#: ../commands.cc:1515 ../commands.cc:3108 ../commands.cc:3178
-#: ../commands.cc:3181
+#: ../commands.cc:1518 ../commands.cc:3131 ../commands.cc:3201
+#: ../commands.cc:3204
#, c-format
msgid "branch '%s' is empty\n"
msgstr "la branche « %s » est vide\n"
-#: ../commands.cc:1517
+#: ../commands.cc:1520
#, c-format
msgid "branch '%s' is currently merged:\n"
msgstr "la branche « %s » est actuellement fusionnée :\n"
-#: ../commands.cc:1519
+#: ../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:1558
+#: ../commands.cc:1561
#, c-format
msgid "no epoch for branch %s\n"
msgstr ""
-#: ../commands.cc:1697
+#: ../commands.cc:1700
msgid ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -1005,200 +1000,203 @@
"missing"
msgstr ""
-#: ../commands.cc:1707
+#: ../commands.cc:1710
msgid ""
"show database objects, or the current working copy manifest,\n"
"or unknown, intentionally ignored, or missing state files"
msgstr ""
-#: ../commands.cc:1744 ../commands.cc:1770 ../commands.cc:1794
-#: ../commands.cc:1812 ../commands.cc:1831 ../commands.cc:1850
-#: ../commands.cc:1868 ../commands.cc:1884 ../commands.cc:1904
+#: ../commands.cc:1747 ../commands.cc:1773 ../commands.cc:1797
+#: ../commands.cc:1815 ../commands.cc:1834 ../commands.cc:1853
+#: ../commands.cc:1871 ../commands.cc:1887 ../commands.cc:1907
msgid "packet i/o"
msgstr ""
-#: ../commands.cc:1744 ../commands.cc:1770
+#: ../commands.cc:1747 ../commands.cc:1773
msgid "OLDID NEWID"
msgstr ""
-#: ../commands.cc:1745
+#: ../commands.cc:1748
msgid "write manifest delta packet to stdout"
msgstr ""
-#: ../commands.cc:1759 ../commands.cc:1761 ../commands.cc:1825
+#: ../commands.cc:1762 ../commands.cc:1764 ../commands.cc:1828
#, c-format
-msgid "no such manifest %s"
-msgstr ""
+msgid "no such manifest '%s'"
+msgstr "aucun manifeste « %s »"
-#: ../commands.cc:1771
+#: ../commands.cc:1774
msgid "write file delta packet to stdout"
msgstr ""
-#: ../commands.cc:1785 ../commands.cc:1787 ../commands.cc:1844
-#: ../commands.cc:2160
+#: ../commands.cc:1788 ../commands.cc:1790 ../commands.cc:1847
+#: ../commands.cc:2181
#, c-format
-msgid "no such file %s"
-msgstr ""
+msgid "no such file '%s'"
+msgstr "aucun fichier « %s »"
-#: ../commands.cc:1794 ../commands.cc:1812 ../commands.cc:1831
-#: ../commands.cc:1850 ../commands.cc:1868 ../commands.cc:1884
+#: ../commands.cc:1797 ../commands.cc:1815 ../commands.cc:1834
+#: ../commands.cc:1853 ../commands.cc:1871 ../commands.cc:1887
msgid "ID"
msgstr ""
-#: ../commands.cc:1794
+#: ../commands.cc:1797
msgid "write revision data packet to stdout"
msgstr ""
-#: ../commands.cc:1807
-#, c-format
-msgid "no such revision %s"
-msgstr ""
-
-#: ../commands.cc:1812
+#: ../commands.cc:1815
msgid "write manifest data packet to stdout"
msgstr ""
-#: ../commands.cc:1831
+#: ../commands.cc:1834
msgid "write file data packet to stdout"
msgstr ""
-#: ../commands.cc:1850
+#: ../commands.cc:1853
msgid "write cert packets to stdout"
msgstr ""
-#: ../commands.cc:1868
+#: ../commands.cc:1871
msgid "write public key packet to stdout"
msgstr ""
-#: ../commands.cc:1876
+#: ../commands.cc:1879
#, c-format
msgid "public key '%s' does not exist in database"
msgstr ""
-#: ../commands.cc:1884
+#: ../commands.cc:1887
msgid "write private key packet to stdout"
msgstr ""
-#: ../commands.cc:1892
+#: ../commands.cc:1895
#, c-format
msgid "public and private key '%s' do not exist in database"
msgstr ""
-#: ../commands.cc:1904
-msgid "read packets from stdin"
-msgstr "lecture des paquets depuis l'entrée standard"
+#: ../commands.cc:1908
+msgid "read packets from files or stdin"
+msgstr "lecture des paquets depuis des fichiers ou l'entrée standard"
-#: ../commands.cc:1909
+#: ../commands.cc:1916
msgid "no packets found on stdin"
msgstr "aucun paquet trouvé sur l'entrée standard"
-#: ../commands.cc:1910
+#: ../commands.cc:1927
+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:1931
#, c-format
msgid "read %d packet"
msgid_plural "read %d packets"
msgstr[0] "lu %d paquet"
msgstr[1] "lu %d paquets"
-#: ../commands.cc:1914 ../commands.cc:2003 ../commands.cc:2018
-#: ../commands.cc:2032 ../commands.cc:2047
+#: ../commands.cc:1935 ../commands.cc:2024 ../commands.cc:2039
+#: ../commands.cc:2053 ../commands.cc:2068
msgid "network"
msgstr "réseau"
-#: ../commands.cc:1915
+#: ../commands.cc:1936
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:1949
+#: ../commands.cc:1970
#, c-format
msgid "setting default server to %s\n"
msgstr ""
-#: ../commands.cc:1955
+#: ../commands.cc:1976
msgid "no hostname given"
msgstr ""
-#: ../commands.cc:1957
+#: ../commands.cc:1978
msgid "no server given and no default server set"
msgstr ""
-#: ../commands.cc:1961
+#: ../commands.cc:1982
#, c-format
msgid "using default server address: %s\n"
-msgstr ""
+msgstr "utilisation de l'adresse par défaut du serveur : %s\n"
-#: ../commands.cc:1973
+#: ../commands.cc:1994
#, c-format
msgid "setting default branch include pattern to '%s'\n"
msgstr ""
-#: ../commands.cc:1979
+#: ../commands.cc:2000
#, c-format
msgid "setting default branch exclude pattern to '%s'\n"
msgstr ""
-#: ../commands.cc:1985
+#: ../commands.cc:2006
msgid "no branch pattern given"
msgstr ""
-#: ../commands.cc:1987
+#: ../commands.cc:2008
msgid "no branch pattern given and no default pattern set"
msgstr ""
-#: ../commands.cc:1991
+#: ../commands.cc:2012
#, c-format
msgid "using default branch include pattern: '%s'\n"
msgstr ""
-#: ../commands.cc:1999
+#: ../commands.cc:2020
#, c-format
msgid "excluding: %s\n"
msgstr ""
-#: ../commands.cc:2003 ../commands.cc:2018 ../commands.cc:2032
+#: ../commands.cc:2024 ../commands.cc:2039 ../commands.cc:2053
msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
-msgstr ""
+msgstr "[ADRESSE[:PORT] [MOTIF]]"
-#: ../commands.cc:2004
+#: ../commands.cc:2025
msgid "push branches matching PATTERN to netsync server at ADDRESS"
msgstr ""
+"envoie les branches correspondant au MOTIF au serveur netsync à l'ADRESSE"
-#: ../commands.cc:2011 ../commands.cc:2040 ../commands.cc:2057
+#: ../commands.cc:2032 ../commands.cc:2061 ../commands.cc:2078
msgid "could not guess default signing key"
msgstr ""
-#: ../commands.cc:2019
+#: ../commands.cc:2040
msgid "pull branches matching PATTERN from netsync server at ADDRESS"
msgstr ""
-#: ../commands.cc:2026
+#: ../commands.cc:2047
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:2033
+#: ../commands.cc:2054
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
msgstr ""
-#: ../commands.cc:2047
+#: ../commands.cc:2068
msgid "ADDRESS[:PORTNUMBER] PATTERN ..."
msgstr "ADRESSE[:PORT] MOTIF ..."
-#: ../commands.cc:2048
+#: ../commands.cc:2069
msgid ""
"listen on ADDRESS and serve the specified branches to connecting clients"
msgstr ""
-#: ../commands.cc:2061
+#: ../commands.cc:2082
msgid ""
"need permission to store persistent passphrase (see hook persist_phrase_ok())"
msgstr ""
-#: ../commands.cc:2071
+#: ../commands.cc:2092
msgid "database"
msgstr "base de données"
-#: ../commands.cc:2072
+#: ../commands.cc:2093
msgid ""
"init\n"
"info\n"
@@ -1216,140 +1214,141 @@
"set_epoch BRANCH EPOCH\n"
msgstr ""
-#: ../commands.cc:2086
+#: ../commands.cc:2107
msgid "manipulate database state"
msgstr "manipule l'état de la base de données"
-#: ../commands.cc:2139
+#: ../commands.cc:2160
msgid ""
"set FILE ATTR VALUE\n"
"get FILE [ATTR]\n"
"drop FILE"
msgstr ""
-#: ../commands.cc:2140
+#: ../commands.cc:2161
msgid "set, get or drop file attributes"
msgstr ""
-#: ../commands.cc:2228 ../work.cc:118
+#: ../commands.cc:2249 ../work.cc:113
#, c-format
msgid "registering %s file in working copy\n"
msgstr ""
-#: ../commands.cc:2257
+#: ../commands.cc:2278
#, c-format
msgid "failed to parse date string '%s': %s"
msgstr ""
-#: ../commands.cc:2261
+#: ../commands.cc:2282
#, c-format
msgid "failed to parse date string '%s'"
msgstr ""
-#: ../commands.cc:2267
+#: ../commands.cc:2288
msgid "commit working copy to database"
msgstr ""
-#: ../commands.cc:2285
+#: ../commands.cc:2306
#, fuzzy
msgid "no changes to commit\n"
msgstr "aucun changement à commiter\n"
-#: ../commands.cc:2296
+#: ../commands.cc:2317
#, c-format
msgid "beginning commit on branch '%s'\n"
msgstr ""
-#: ../commands.cc:2297
+#: ../commands.cc:2318
#, c-format
-msgid "new manifest %s\n"
-msgstr "nouveau manifeste %s\n"
+msgid ""
+"new manifest '%s'\n"
+"new revision '%s'\n"
+msgstr ""
+"nouveau manifeste « %s »\n"
+"nouvelle révision « %s »\n"
-#: ../commands.cc:2298
-#, c-format
-msgid "new revision %s\n"
-msgstr "nouvelle révisions %s\n"
-
-#: ../commands.cc:2302
+#: ../commands.cc:2325
msgid "--message and --message-file are mutually exclusive"
msgstr "--message et --message-file sont mutuellement exclusifs"
-#: ../commands.cc:2305
+#: ../commands.cc:2328
+#, 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 ""
+msgstr "MT/log n'est pas vide et --message-file a été passé\n"
-#: ../commands.cc:2310
+#: ../commands.cc:2333
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:2328
-msgid "empty log message"
+#: ../commands.cc:2351
+#, fuzzy
+msgid "empty log message; commit canceled"
msgstr "message du journal vide"
-#: ../commands.cc:2340
+#: ../commands.cc:2363
#, 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:2345
+#: ../commands.cc:2368
#, c-format
msgid "inserting new revision %s\n"
-msgstr ""
+msgstr "insertion de la nouvelle révision %s\n"
-#: ../commands.cc:2354
+#: ../commands.cc:2377
#, c-format
msgid "skipping manifest %s, already in database\n"
msgstr ""
-#: ../commands.cc:2358
+#: ../commands.cc:2381
#, c-format
msgid "inserting manifest delta %s -> %s\n"
msgstr ""
-#: ../commands.cc:2369
+#: ../commands.cc:2392
#, c-format
msgid "inserting full manifest %s\n"
msgstr ""
-#: ../commands.cc:2382
+#: ../commands.cc:2405
#, c-format
msgid "skipping file delta %s, already in database\n"
msgstr ""
-#: ../commands.cc:2388
+#: ../commands.cc:2411
#, c-format
msgid "inserting delta %s -> %s\n"
msgstr ""
-#: ../commands.cc:2398 ../commands.cc:2415
+#: ../commands.cc:2421 ../commands.cc:2438
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "le fichier « %s » a été modifié pendant le commit, interruption"
-#: ../commands.cc:2408
+#: ../commands.cc:2431
#, c-format
msgid "inserting full version %s\n"
msgstr ""
-#: ../commands.cc:2442
+#: ../commands.cc:2465
#, c-format
msgid "committed revision %s\n"
msgstr ""
-#: ../commands.cc:2448
+#: ../commands.cc:2471
msgid ""
"note: this revision creates divergence\n"
"note: you may (or may not) wish to run 'monotone merge'"
msgstr ""
-#: ../commands.cc:2608
+#: ../commands.cc:2631
msgid ""
"show current diffs on stdout.\n"
"If one revision is given, the diff between the working directory and\n"
@@ -1357,103 +1356,103 @@
"them is given. If no format is specified, unified is used by default."
msgstr ""
-#: ../commands.cc:2624
+#: ../commands.cc:2647
msgid ""
"--diff-args requires --external\n"
"try adding --external or removing --diff-args?"
msgstr ""
-#: ../commands.cc:2654 ../commands.cc:2669 ../commands.cc:2672
+#: ../commands.cc:2677 ../commands.cc:2692 ../commands.cc:2695
#, c-format
msgid "revision %s does not exist"
msgstr "la révision %s n'existe pas"
-#: ../commands.cc:2658
+#: ../commands.cc:2681
msgid "current revision has no ancestor"
msgstr "la révision actuelle n'existe pas"
-#: ../commands.cc:2697
+#: ../commands.cc:2720
#, c-format
msgid "no common ancestor for %s and %s"
msgstr "pas d'ancêtre commun pour %s et %s"
-#: ../commands.cc:2703
+#: ../commands.cc:2726
msgid "concatenating un-committed changeset to composite\n"
msgstr ""
-#: ../commands.cc:2730
+#: ../commands.cc:2753
msgid "# no changes"
msgstr ""
-#: ../commands.cc:2740 ../commands.cc:2757
+#: ../commands.cc:2763 ../commands.cc:2780
msgid "LEFT RIGHT"
msgstr "GAUCHE DROITE"
-#: ../commands.cc:2740
+#: ../commands.cc:2763
#, fuzzy
msgid "print least common ancestor"
msgstr "l'ancêtre commun est %s\n"
-#: ../commands.cc:2753
-#, fuzzy
+#: ../commands.cc:2776
msgid "no common ancestor found"
-msgstr "l'ancêtre commun est %s\n"
+msgstr "aucun ancêtre commun n'a été trouvé"
-#: ../commands.cc:2757
+#: ../commands.cc:2780
msgid "print least common ancestor / dominator"
msgstr ""
-#: ../commands.cc:2771
+#: ../commands.cc:2794
#, fuzzy
msgid "no common ancestor/dominator found"
msgstr "l'ancêtre commun est %s\n"
-#: ../commands.cc:2796
+#: ../commands.cc:2819
#, c-format
msgid "updating %s to %s\n"
msgstr ""
-#: ../commands.cc:2820
+#: ../commands.cc:2843
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:2845
+#: ../commands.cc:2868
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:2852
+#: ../commands.cc:2875
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:2857
+#: ../commands.cc:2880
msgid "multiple update candidates:\n"
msgstr "plusieurs candidats pour la mise-à -jour :\n"
-#: ../commands.cc:2861
+#: ../commands.cc:2884
msgid "choose one with 'monotone update -r'\n"
msgstr "choisissez en un avec « monotone update -r »\n"
-#: ../commands.cc:2862
+#: ../commands.cc:2885
msgid "multiple candidates remain after selection"
msgstr ""
-#: ../commands.cc:2877
+#: ../commands.cc:2900
#, c-format
msgid "already up to date at %s\n"
msgstr "déjà à jour en %s\n"
-#: ../commands.cc:2881
+#: ../commands.cc:2904
#, c-format
msgid "selected update target %s\n"
-msgstr ""
+msgstr "sélection de la cible %s pour la mise-à -jour\n"
-#: ../commands.cc:2893
+#: ../commands.cc:2916
#, c-format
msgid ""
"revision %s is not a member of branch %s\n"
@@ -1461,61 +1460,62 @@
msgstr ""
#. working copy has no changes
-#: ../commands.cc:2908
+#: ../commands.cc:2931
#, c-format
msgid "updating along chosen edge %s -> %s\n"
msgstr ""
-#: ../commands.cc:2919
+#: ../commands.cc:2942
#, c-format
msgid "merging working copy with chosen edge %s -> %s\n"
msgstr ""
-#: ../commands.cc:2968
+#: ../commands.cc:2991
#, c-format
msgid "updated to base revision %s\n"
msgstr "mise à jour vers la révision de base %s\n"
-#: ../commands.cc:3034
+#: ../commands.cc:3057
#, c-format
msgid "common ancestor %s found\n"
msgstr ""
-#: ../commands.cc:3035
+#: ../commands.cc:3058
msgid "trying 3-way merge\n"
msgstr ""
-#: ../commands.cc:3045
+#: ../commands.cc:3068
msgid "no common ancestor found, synthesizing edges\n"
msgstr ""
-#: ../commands.cc:3095
+#: ../commands.cc:3118
+#, fuzzy
msgid "merge unmerged heads of branch"
-msgstr ""
+msgstr "fusionne les"
-#: ../commands.cc:3109
+#: ../commands.cc:3132
#, c-format
msgid "branch '%s' is merged\n"
msgstr "la branche « %s » est fusionnée\n"
-#: ../commands.cc:3115
+#: ../commands.cc:3138
#, c-format
msgid "starting with revision 1 / %d\n"
msgstr ""
-#: ../commands.cc:3119
+#: ../commands.cc:3142
#, c-format
msgid "merging with revision %d / %d\n"
msgstr ""
#. Somewhat redundant, but consistent with output of plain "merge" command.
-#: ../commands.cc:3120 ../commands.cc:3121 ../commands.cc:3188
-#: ../commands.cc:3272 ../commands.cc:3273
+#: ../commands.cc:3143 ../commands.cc:3144 ../commands.cc:3211
+#: ../commands.cc:3295 ../commands.cc:3296
#, c-format
msgid "[source] %s\n"
msgstr ""
-#: ../commands.cc:3133
+#: ../commands.cc:3156
#, c-format
msgid ""
"merge of %s\n"
@@ -1524,89 +1524,89 @@
"fusion de %s\n"
" et %s\n"
-#: ../commands.cc:3138 ../commands.cc:3225 ../commands.cc:3292
+#: ../commands.cc:3161 ../commands.cc:3248 ../commands.cc:3315
#, c-format
msgid "[merged] %s\n"
msgstr ""
-#: ../commands.cc:3141
+#: ../commands.cc:3164
msgid "note: your working copies have not been updated\n"
msgstr ""
-#: ../commands.cc:3144
+#: ../commands.cc:3167
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr ""
-#: ../commands.cc:3145
+#: ../commands.cc:3168
msgid "merge from one branch to another asymmetrically"
msgstr ""
-#: ../commands.cc:3179 ../commands.cc:3182
+#: ../commands.cc:3202 ../commands.cc:3205
#, c-format
msgid "branch '%s' is not merged\n"
msgstr "la branche « %s » n'est pas fusionnée\n"
-#: ../commands.cc:3187
+#: ../commands.cc:3210
#, c-format
msgid "propagating %s -> %s\n"
msgstr ""
-#: ../commands.cc:3189
+#: ../commands.cc:3212
#, c-format
msgid "[target] %s\n"
msgstr ""
-#: ../commands.cc:3194
+#: ../commands.cc:3217
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
msgstr ""
-#: ../commands.cc:3196
+#: ../commands.cc:3219
msgid "no action taken\n"
msgstr ""
-#: ../commands.cc:3200
+#: ../commands.cc:3223
#, c-format
msgid "no merge necessary; putting %s in branch '%s'\n"
msgstr ""
-#: ../commands.cc:3217
+#: ../commands.cc:3240
#, c-format
msgid ""
"propagate from branch '%s' (head %s)\n"
" to branch '%s' (head %s)\n"
msgstr ""
-#: ../commands.cc:3229
+#: ../commands.cc:3252
msgid "refresh the inodeprint cache"
msgstr ""
-#: ../commands.cc:3237
+#: ../commands.cc:3260
msgid ""
"LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n"
"LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH"
msgstr ""
-#: ../commands.cc:3239
+#: ../commands.cc:3262
msgid "merge two explicitly given revisions, placing result in given branch"
msgstr ""
-#: ../commands.cc:3254 ../commands.cc:3256
+#: ../commands.cc:3277 ../commands.cc:3279
#, c-format
msgid "%s is not an ancestor of %s"
msgstr "%s n'est pas un ancêtre de %s"
-#: ../commands.cc:3265
+#: ../commands.cc:3288
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr ""
-#: ../commands.cc:3267 ../commands.cc:3269
+#: ../commands.cc:3290 ../commands.cc:3292
#, c-format
msgid "%s is already an ancestor of %s"
msgstr ""
-#: ../commands.cc:3283
+#: ../commands.cc:3306
#, c-format
msgid ""
"explicit_merge of %s\n"
@@ -1615,116 +1615,118 @@
" to branch '%s'\n"
msgstr ""
-#: ../commands.cc:3295
+#: ../commands.cc:3318
msgid "(revision|manifest|file|key) PARTIAL-ID"
msgstr ""
-#: ../commands.cc:3296
+#: ../commands.cc:3319
msgid "complete partial id"
msgstr ""
-#: ../commands.cc:3305
+#: ../commands.cc:3328
msgid "non-hex digits in partial id"
msgstr ""
-#: ../commands.cc:3353
+#: ../commands.cc:3376
msgid "revert file(s), dir(s) or entire working copy"
msgstr ""
-#: ../commands.cc:3391
+#: ../commands.cc:3414
#, c-format
msgid "reverting %s from %s to %s\n"
msgstr ""
-#: ../commands.cc:3395
+#: ../commands.cc:3418
#, c-format
msgid "no file version %s found in database for %s"
msgstr ""
-#: ../commands.cc:3412
+#: ../commands.cc:3435
msgid "RCSFILE..."
msgstr ""
-#: ../commands.cc:3413
+#: ../commands.cc:3436
msgid ""
"parse versions in RCS files\n"
"this command doesn't reconstruct or import revisions. you probably want "
"cvs_import"
msgstr ""
-#: ../commands.cc:3428
+#: ../commands.cc:3451
msgid "rcs"
msgstr ""
-#: ../commands.cc:3428
+#: ../commands.cc:3451
msgid "CVSROOT"
msgstr ""
-#: ../commands.cc:3428
+#: ../commands.cc:3451
msgid "import all versions in CVS repository"
msgstr ""
-#: ../commands.cc:3491
+#: ../commands.cc:3514
msgid "PATH"
msgstr ""
-#: ../commands.cc:3492
+#: ../commands.cc:3515
msgid "print annotated copy of the file from REVISION"
msgstr ""
-#: ../commands.cc:3510
+#: ../commands.cc:3532
#, c-format
msgid "no revision for file '%s' in database"
msgstr ""
-#: ../commands.cc:3513
+#: ../commands.cc:3535
#, c-format
msgid "annotate file file_path '%s'\n"
msgstr ""
-#: ../commands.cc:3522
-#, c-format
-msgid "No such file '%s' in revision %s\n"
+#: ../commands.cc:3544
+#, fuzzy, c-format
+msgid "no such file '%s' in revision '%s'\n"
msgstr ""
+"nouveau manifeste « %s »\n"
+"nouvelle révision « %s »\n"
-#: ../commands.cc:3524
+#: ../commands.cc:3546
#, c-format
msgid "annotate for file_id %s\n"
msgstr ""
-#: ../commands.cc:3529
+#: ../commands.cc:3551
msgid "[FILE]"
msgstr ""
-#: ../commands.cc:3530
+#: ../commands.cc:3552
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:3590
+#: ../commands.cc:3612
#, c-format
msgid "revision %s does not exist in db, skipping\n"
msgstr ""
-#: ../commands.cc:3623
+#: ../commands.cc:3645
#, c-format
msgid "revision '%s' in '%s' maps to '%s' in %s\n"
msgstr ""
-#: ../commands.cc:3698
+#: ../commands.cc:3720
msgid "DIRECTORY"
msgstr ""
-#: ../commands.cc:3698
+#: ../commands.cc:3720
msgid "setup a new working copy directory"
msgstr ""
-#: ../commands.cc:3712
+#: ../commands.cc:3734
msgid "automation"
msgstr "automatisation"
-#: ../commands.cc:3713
+#: ../commands.cc:3735
msgid ""
"interface_version\n"
"heads [BRANCH]\n"
@@ -1744,52 +1746,57 @@
"select SELECTOR\n"
msgstr ""
-#: ../commands.cc:3729
+#: ../commands.cc:3751
msgid "automation interface"
msgstr ""
-#: ../commands.cc:3743 ../commands.cc:3759
+#: ../commands.cc:3765 ../commands.cc:3781
msgid "vars"
msgstr "variables"
-#: ../commands.cc:3743
+#: ../commands.cc:3765
msgid "DOMAIN NAME VALUE"
msgstr ""
-#: ../commands.cc:3744
+#: ../commands.cc:3766
msgid "set the database variable NAME to VALUE, in domain DOMAIN"
msgstr ""
-#: ../commands.cc:3759
+#: ../commands.cc:3781
msgid "DOMAIN NAME"
msgstr ""
-#: ../commands.cc:3760
+#: ../commands.cc:3782
msgid "remove the database variable NAME in domain DOMAIN"
msgstr ""
-#: ../commands.cc:3771
+#: ../commands.cc:3793
#, c-format
msgid "no var with name %s in domain %s"
msgstr ""
-#: ../database.cc:82
+#: ../database.cc:80
#, c-format
msgid ""
"database schemas do not match: wanted %s, got %s. try migrating database"
msgstr ""
-#: ../database.cc:139
+#: ../database.cc:135 ../database.cc:197
#, c-format
-msgid "database %s is a directory\n"
-msgstr ""
+msgid "database %s does not exist"
+msgstr "la base de données %s n'existe pas"
-#: ../database.cc:146
+#: ../database.cc:136
#, c-format
+msgid "%s is a directory, not a database"
+msgstr "%s est un dossier, pas une base de données"
+
+#: ../database.cc:143
+#, c-format
msgid "unable to probe database version in file %s"
msgstr ""
-#: ../database.cc:153
+#: ../database.cc:150
#, c-format
msgid "database %s is not an sqlite version 3 file, try dump and reload"
msgstr ""
@@ -1797,43 +1804,39 @@
#. 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
+#: ../database.cc:172 ../database.cc:183
#, c-format
msgid "sqlite error: %d: %s"
msgstr "erreur sqlite : %d : %s"
-#: ../database.cc:181
+#: ../database.cc:177
msgid "make sure database and containing directory are writeable"
msgstr ""
-#: ../database.cc:201
+#: ../database.cc:198
#, c-format
-msgid "database %s does not exist"
-msgstr "la base de données %s n'existe pas"
-
-#: ../database.cc:203
-#, c-format
msgid "database %s is a directory"
msgstr ""
-#: ../database.cc:230
+#: ../database.cc:224
#, c-format
msgid "could not initialize database: %s: already exists"
msgstr ""
-#: ../database.cc:235
+#: ../database.cc:229
#, c-format
msgid ""
"existing (possibly stale) journal file '%s' has same stem as new database '%"
-"s'"
+"s'\n"
+"cancelling database creation"
msgstr ""
-#: ../database.cc:353
+#: ../database.cc:348
#, c-format
-msgid "cannot create %s; it already exists\n"
-msgstr ""
+msgid "cannot create %s; it already exists"
+msgstr "impossible de créer %s car ceci existe déjà "
-#: ../database.cc:416
+#: ../database.cc:411
#, c-format
msgid ""
"schema version : %s\n"
@@ -1928,6 +1931,11 @@
msgid "wanted %d rows got %s in query: %s\n"
msgstr ""
+#: ../database.cc:681
+#, c-format
+msgid "cannot change filename to %s while db is open"
+msgstr ""
+
#: ../database.cc:879
#, c-format
msgid "version cache expiring %s\n"
@@ -2161,149 +2169,150 @@
#: ../diff_patch.cc:711
#, c-format
-msgid "file %s does not exist in working copy"
-msgstr "le fichier %s n'existe pas dans la copie de travail"
+msgid "file '%s' does not exist in working copy"
+msgstr "le fichier « %s » n'existe pas dans la copie de travail"
-#: ../diff_patch.cc:715
+#: ../diff_patch.cc:712
#, c-format
-msgid "file %s in working copy has id %s, wanted %s"
+msgid "'%s' in working copy is a directory, not a file"
msgstr ""
-#: ../file_io.cc:38
+#: ../diff_patch.cc:716
#, c-format
-msgid "initial path is %s\n"
-msgstr "le chemin initial est %s\n"
-
-#: ../file_io.cc:51
-#, c-format
-msgid "searching for '%s' directory with root '%s'\n"
+msgid "file %s in working copy has id %s, wanted %s"
msgstr ""
-#: ../file_io.cc:65
+#: ../file_io.cc:115
#, c-format
-msgid "'%s' not found in '%s' with '%s' removed\n"
+msgid "expected file '%s', but it is a directory."
msgstr ""
-#: ../file_io.cc:72
+#: ../file_io.cc:156 ../file_io.cc:163
#, c-format
-msgid "search for '%s' ended at '%s' with '%s' removed\n"
+msgid ""
+"could not create directory '%s'\n"
+"it is a file"
msgstr ""
+"impossible de créer le dossier « %s »\n"
+"car c'est un fichier"
-#: ../file_io.cc:77
+#: ../file_io.cc:158
#, c-format
-msgid "'%s' does not exist\n"
-msgstr "« %s » n'existe pas\n"
-
-#: ../file_io.cc:83
-#, c-format
-msgid "'%s' is not a directory\n"
+msgid ""
+"could not create directory '%s'\n"
+"%s"
msgstr ""
+"impossible de créer le dossier « %s »\n"
+"%s"
-#: ../file_io.cc:90
+#: ../file_io.cc:162
#, c-format
-msgid "problems with '%s' (missing '.' or '..')\n"
-msgstr ""
+msgid "could not create directory '%s'"
+msgstr "impossible de créer le dossier « %s »"
-#: ../file_io.cc:116
-msgid "Searching for home directory\n"
-msgstr ""
+#: ../file_io.cc:175
+#, fuzzy, c-format
+msgid "failed to create directory '%s' for '%s'"
+msgstr "impossible de créer le dossier : %s : %s\n"
-#: ../file_io.cc:122
-msgid "Home directory from MONOTONE_HOME\n"
-msgstr ""
+#: ../file_io.cc:183
+#, c-format
+msgid "file to delete '%s' does not exist"
+msgstr "le fichier à supprimer « %s » n'existe pas"
-#: ../file_io.cc:132
-msgid "Home directory from HOME\n"
-msgstr ""
+#: ../file_io.cc:184
+#, 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:139
-msgid "Home directory from USERPROFILE\n"
-msgstr ""
+#: ../file_io.cc:192
+#, fuzzy, c-format
+msgid "directory to delete, '%s', does not exist"
+msgstr "le dossier à supprimer « %s » n'existe pas"
-#: ../file_io.cc:148
-msgid "Home directory from HOMEDRIVE+HOMEPATH\n"
-msgstr ""
+#: ../file_io.cc:193
+#, fuzzy, c-format
+msgid "directory to delete, '%s', is a file"
+msgstr "le dossier à supprimer « %s » n'existe pas"
-#. And if things _still_ didn't work, give up.
-#: ../file_io.cc:152
-msgid ""
-"could not find home directory (tried MONOTONE_HOME, HOME (if cygwin/mingw), "
-"USERPROFILE, HOMEDRIVE/HOMEPATH"
+#: ../file_io.cc:202
+#, c-format
+msgid "rename source file '%s' does not exist"
msgstr ""
-#: ../file_io.cc:160
+#: ../file_io.cc:203
#, c-format
-msgid "could not find home directory for uid %d"
+msgid "rename source file '%s' is a directory -- bug in monotone?"
msgstr ""
-#: ../file_io.cc:205
+#: ../file_io.cc:206 ../file_io.cc:219
+#, fuzzy, c-format
+msgid "rename target '%s' already exists"
+msgstr "le fichier pid « %s » existe déjà "
+
+#: ../file_io.cc:215
#, c-format
-msgid "could not find home directory for user %s"
+msgid "rename source dir '%s' does not exist"
msgstr ""
-#: ../file_io.cc:268
+#: ../file_io.cc:216
#, c-format
-msgid "expected file '%s', but it is a directory."
+msgid "rename source dir '%s' is a file -- bug in monotone?"
msgstr ""
-#: ../file_io.cc:295 ../file_io.cc:303
-#, c-format
-msgid "file to delete '%s' does not exist"
-msgstr "le fichier à supprimer « %s » n'existe pas"
+#: ../file_io.cc:230
+#, fuzzy, c-format
+msgid "rename source path '%s' does not exist"
+msgstr "le chemin %s n'existe pas"
-#: ../file_io.cc:311 ../file_io.cc:319
+#: ../file_io.cc:245
#, c-format
-msgid "directory to delete '%s' does not exist"
-msgstr "le dossier à supprimer « %s » n'existe pas"
+msgid "file %s does not exist"
+msgstr "le fichier %s n'existe pas"
-#: ../file_io.cc:328 ../file_io.cc:340
+#: ../file_io.cc:246
#, c-format
-msgid "rename source file '%s' does not exist"
+msgid "file %s cannot be read as data; it is a directory"
msgstr ""
-#: ../file_io.cc:330 ../file_io.cc:342
+#: ../file_io.cc:250
#, c-format
-msgid "rename target file '%s' already exists"
+msgid "cannot open file %s for reading"
msgstr ""
-#: ../file_io.cc:352 ../file_io.cc:364
-#, c-format
-msgid "rename source dir '%s' does not exist"
-msgstr ""
+#: ../file_io.cc:294
+msgid "Cannot read standard input multiple times"
+msgstr "Impossible de lire l'entrée standard plusieurs fois"
-#: ../file_io.cc:354 ../file_io.cc:366
+#: ../file_io.cc:324
#, c-format
-msgid "rename target dir '%s' already exists"
+msgid "file '%s' cannot be overwritten as data; it is a directory"
msgstr ""
-#: ../file_io.cc:419
-msgid "Cannot read standard input multiple times"
-msgstr "Impossible de lire l'entrée standard plusieurs fois"
-
-#: ../file_io.cc:510
+#: ../file_io.cc:338
#, c-format
-msgid "file '%s' does not exist"
-msgstr "le fichier « %s » n'existe pas"
+msgid "cannot open file %s for writing"
+msgstr ""
-#: ../file_io.cc:551
+#: ../file_io.cc:345
#, c-format
msgid "removing %s failed"
msgstr "la suppression de %s a échouée"
-#: ../file_io.cc:642
+#: ../file_io.cc:407
#, c-format
msgid "ignoring book keeping entry %s\n"
msgstr ""
-#: ../file_io.cc:661
+#: ../file_io.cc:427
#, c-format
msgid "caught runtime error %s constructing file path for %s\n"
msgstr ""
-#: ../file_io.cc:693
-#, c-format
-msgid "no such file or directory: %s"
-msgstr ""
+#: ../file_io.cc:451
+#, fuzzy
+msgid "no such file or directory"
+msgstr "le chemin %s n'est pas un dossier"
#: ../keys.cc:42
#, c-format
@@ -2374,124 +2383,124 @@
msgid "checking %d-byte (%d decoded) signature\n"
msgstr ""
-#: ../keys.cc:484
+#: ../keys.cc:510
#, c-format
msgid "no public key '%s' found in database"
msgstr ""
-#: ../keys.cc:495
+#: ../keys.cc:521
#, c-format
msgid "passphrase for '%s' is incorrect"
msgstr ""
-#: ../lua.cc:105
+#: ../lua.cc:106
#, c-format
msgid "lua failure: %s; stack = %s\n"
msgstr ""
-#: ../lua.cc:111
+#: ../lua.cc:112
#, c-format
msgid "Lua::ok(): failed = %i"
msgstr ""
-#: ../lua.cc:120
+#: ../lua.cc:121
#, c-format
msgid "lua stack: %s"
msgstr ""
-#: ../lua.cc:200
+#: ../lua.cc:201
#, c-format
msgid "lua: extracted string = %s"
msgstr ""
-#: ../lua.cc:213
+#: ../lua.cc:214
#, c-format
msgid "lua: extracted int = %i"
msgstr ""
-#: ../lua.cc:226
+#: ../lua.cc:227
#, c-format
msgid "lua: extracted double = %i"
msgstr ""
-#: ../lua.cc:240
+#: ../lua.cc:241
#, c-format
msgid "lua: extracted bool = %i"
msgstr ""
-#: ../lua.cc:360
+#: ../lua.cc:361
#, c-format
msgid "loading lua hook %s"
msgstr ""
-#: ../lua.cc:523
+#: ../lua.cc:524
msgid "guess_binary called with an invalid parameter"
msgstr ""
-#: ../lua.cc:532
+#: ../lua.cc:533
msgid "Include called with an invalid parameter"
msgstr ""
-#: ../lua.cc:547
+#: ../lua.cc:548
msgid "IncludeDir called with an invalid parameter"
msgstr ""
-#: ../lua.cc:550
+#: ../lua.cc:551
#, c-format
msgid "Directory '%s' does not exists"
msgstr "le dossier « %s » n'existe pas"
-#: ../lua.cc:551
+#: ../lua.cc:552
#, c-format
msgid "'%s' is not a directory"
msgstr "« %s » n'est pas un dossier"
-#: ../lua.cc:570 ../lua.cc:696
+#: ../lua.cc:571 ../lua.cc:697
#, c-format
msgid "lua error while loading rcfile '%s'"
msgstr ""
-#: ../lua.cc:693 ../lua.cc:706
+#: ../lua.cc:694 ../lua.cc:707
#, c-format
msgid "opening rcfile '%s' ...\n"
msgstr "ouverture du fichier rc « %s » ...\n"
-#: ../lua.cc:697 ../lua.cc:709
+#: ../lua.cc:698 ../lua.cc:710
#, c-format
msgid "'%s' is ok\n"
msgstr ""
-#: ../lua.cc:708
+#: ../lua.cc:709
#, c-format
msgid "lua error while loading '%s'"
msgstr ""
-#: ../lua.cc:713
+#: ../lua.cc:714
#, c-format
msgid "rcfile '%s' does not exist"
msgstr "le fichier rc « %s » n'existe pas"
-#: ../lua.cc:714
+#: ../lua.cc:715
#, c-format
msgid "skipping nonexistent rcfile '%s'\n"
msgstr ""
-#: ../lua.cc:1155
+#: ../lua.cc:1156
#, c-format
msgid "calling attr_init_function for %s"
msgstr ""
-#: ../lua.cc:1159
+#: ../lua.cc:1160
#, c-format
msgid " calling an attr_init_function for %s"
msgstr ""
-#: ../lua.cc:1172
+#: ../lua.cc:1173
#, c-format
msgid " added attr %s = %s"
msgstr ""
-#: ../lua.cc:1176
+#: ../lua.cc:1177
msgid " no attr added"
msgstr ""
@@ -2528,189 +2537,189 @@
msgid "mismatched node hash value %s, expected %s"
msgstr ""
-#: ../monotone.cc:50
+#: ../monotone.cc:51
msgid "select branch cert for operation"
msgstr ""
-#: ../monotone.cc:51
+#: ../monotone.cc:52
msgid "select revision id for operation"
msgstr ""
-#: ../monotone.cc:52
+#: ../monotone.cc:53
#, fuzzy
msgid "set commit changelog message"
msgstr "message du journal vide"
-#: ../monotone.cc:53
+#: ../monotone.cc:54
msgid "set filename containing commit changelog message"
msgstr ""
-#: ../monotone.cc:54
+#: ../monotone.cc:55
msgid "override date/time for commit"
msgstr ""
-#: ../monotone.cc:55
+#: ../monotone.cc:56
msgid "override author for commit"
msgstr ""
-#: ../monotone.cc:56
+#: ../monotone.cc:57
msgid "limit the number of levels of directories to descend"
msgstr ""
-#: ../monotone.cc:57
+#: ../monotone.cc:58
msgid "limit the log output to the given number of entries"
msgstr ""
-#: ../monotone.cc:58
+#: ../monotone.cc:59
msgid "record process id of server"
msgstr ""
-#: ../monotone.cc:59
+#: ../monotone.cc:60
msgid "print a brief version of the normal output"
msgstr ""
-#: ../monotone.cc:60
+#: ../monotone.cc:61
msgid "print diffs along with logs"
msgstr ""
-#: ../monotone.cc:61
+#: ../monotone.cc:62
msgid "skip merges when printing logs"
msgstr ""
-#: ../monotone.cc:62
+#: ../monotone.cc:63
msgid "use the current arguments as the future default"
msgstr ""
-#: ../monotone.cc:63
+#: ../monotone.cc:64
msgid "leave out branches matching a pattern"
msgstr ""
-#: ../monotone.cc:64
+#: ../monotone.cc:65
msgid "Use unified diff format"
msgstr "Utiliser le format diff unifié"
-#: ../monotone.cc:65
+#: ../monotone.cc:66
msgid "Use context diff format"
msgstr "Utiliser le format diff contextuel"
-#: ../monotone.cc:66
+#: ../monotone.cc:67
msgid "Use external diff hook for generating diffs"
msgstr ""
-#: ../monotone.cc:67
+#: ../monotone.cc:68
msgid "Argument to pass external diff hook"
msgstr ""
-#: ../monotone.cc:68
+#: ../monotone.cc:69
msgid "Use least common ancestor as ancestor for merge"
msgstr ""
-#: ../monotone.cc:69
+#: ../monotone.cc:70
msgid "Perform the associated file operation"
msgstr ""
-#: ../monotone.cc:78
+#: ../monotone.cc:79
msgid "print debug log to stderr while running"
msgstr ""
-#: ../monotone.cc:79
+#: ../monotone.cc:80
msgid "file to dump debugging log to, on failure"
msgstr ""
-#: ../monotone.cc:80
+#: ../monotone.cc:81
msgid "suppress log and progress messages"
msgstr ""
-#: ../monotone.cc:81
+#: ../monotone.cc:82
msgid "display help message"
msgstr "afficher le message d'aide"
-#: ../monotone.cc:82
+#: ../monotone.cc:83
msgid "print version number, then exit"
msgstr "afficher le numéro de version, puis quitte"
-#: ../monotone.cc:83
+#: ../monotone.cc:84
msgid "print detailed version number, then exit"
msgstr "afficher le numéro de version détaillée, puis quitte"
-#: ../monotone.cc:84
+#: ../monotone.cc:85
msgid "insert command line arguments taken from the given file"
msgstr ""
-#: ../monotone.cc:85
+#: ../monotone.cc:86
msgid "set ticker style (count|dot|none) [count]"
msgstr ""
-#: ../monotone.cc:86
+#: ../monotone.cc:87
msgid "do not load standard lua hooks"
msgstr "ne pas charger les hooks standards lua"
-#: ../monotone.cc:87
+#: ../monotone.cc:88
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:88
+#: ../monotone.cc:89
msgid "load extra rc file"
msgstr "charger un fichier rc supplémentaire"
-#: ../monotone.cc:89
+#: ../monotone.cc:90
msgid "set key for signatures"
msgstr ""
-#: ../monotone.cc:90
+#: ../monotone.cc:91
msgid "set name of database"
msgstr ""
-#: ../monotone.cc:91
+#: ../monotone.cc:92
msgid "limit search for working copy to specified root"
msgstr ""
-#: ../monotone.cc:92
+#: ../monotone.cc:93
msgid "verbose completion output"
msgstr ""
-#: ../monotone.cc:198
+#: ../monotone.cc:199
#, c-format
msgid "problem parsing arguments from file %s: %s"
msgstr ""
-#: ../monotone.cc:207
+#: ../monotone.cc:208
#, c-format
msgid "weird error when stuffing arguments read from %s: %s\n"
msgstr ""
-#: ../monotone.cc:257
+#: ../monotone.cc:258
#, c-format
msgid "command line: %s\n"
msgstr "ligne de commande : %s\n"
-#: ../monotone.cc:260
+#: ../monotone.cc:261
#, c-format
msgid "set locale: LC_ALL=%s\n"
msgstr "paramétrage de la locale : LC_ALL=%s\n"
-#: ../monotone.cc:455
+#: ../monotone.cc:457
#, c-format
msgid "syntax error near the \"%s\" option: %s"
msgstr ""
-#: ../monotone.cc:494
+#: ../monotone.cc:496
#, c-format
msgid "monotone %s doesn't use the option %s"
-msgstr ""
+msgstr "monotone %s n'utilise pas l'option %s"
-#: ../monotone.cc:516
+#: ../monotone.cc:518
#, c-format
msgid "Removed 'hidden' from option # %d\n"
msgstr ""
-#: ../monotone.cc:522 ../monotone.cc:533
+#: ../monotone.cc:524 ../monotone.cc:535
#, c-format
msgid "Added 'hidden' to option # %d\n"
msgstr ""
-#: ../monotone.cc:529
+#: ../monotone.cc:531
#, c-format
msgid "Options specific to 'monotone %s':"
msgstr "Options spécifiques à « monotone %s » :"
@@ -2730,7 +2739,7 @@
#: ../netcmd.cc:42
#, c-format
msgid "unknown item type 0x%x for '%s'"
-msgstr ""
+msgstr "type d'élément inconnu 0x%x pour « %s »"
#: ../netcmd.cc:89
#, c-format
@@ -2765,6 +2774,7 @@
#, 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
@@ -3639,7 +3649,7 @@
msgstr ""
#: ../netsync.cc:3323
-#, fuzzy, c-format
+#, c-format
msgid "read from fd %d (peer %s) closed OK after goodbye\n"
msgstr "lecture depuis le fd %d (pair %s) fermée OK après aurevoir\n"
@@ -3715,12 +3725,12 @@
#: ../netsync.cc:3496
#, c-format
msgid "fd %d (peer %s) processing finished, disconnecting\n"
-msgstr ""
+msgstr "traitement du fd %d (pair %s) terminé, déconnexion\n"
#: ../netsync.cc:3518
#, c-format
msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
-msgstr ""
+msgstr "le fd %d (pair %s) est inactif depuis trop longtemps, déconnexion\n"
#: ../netsync.cc:3524
#, c-format
@@ -3791,245 +3801,245 @@
msgid "network error: %s"
msgstr "erreur réseau : %s"
-#: ../packet.cc:324
+#: ../packet.cc:325
#, c-format
msgid "writing delayed revision data packet for %s\n"
msgstr ""
-#: ../packet.cc:331
+#: ../packet.cc:332
#, c-format
msgid "discarding revision data packet %s with unmet dependencies\n"
msgstr ""
-#: ../packet.cc:337
+#: ../packet.cc:338
#, c-format
msgid "writing delayed manifest data packet for %s\n"
msgstr ""
-#: ../packet.cc:344
+#: ../packet.cc:345
#, c-format
msgid "discarding manifest data packet %s with unmet dependencies\n"
msgstr ""
-#: ../packet.cc:350
+#: ../packet.cc:351
#, c-format
msgid "writing delayed file data packet for %s\n"
msgstr ""
-#: ../packet.cc:363
+#: ../packet.cc:364
#, c-format
msgid "writing delayed manifest %s packet for %s -> %s\n"
msgstr ""
-#: ../packet.cc:376
+#: ../packet.cc:377
#, c-format
msgid "discarding manifest delta packet %s -> %s with unmet dependencies\n"
msgstr ""
-#: ../packet.cc:383
+#: ../packet.cc:384
#, c-format
msgid "writing delayed file %s packet for %s -> %s\n"
msgstr ""
-#: ../packet.cc:396
+#: ../packet.cc:397
#, c-format
msgid "discarding file delta packet %s -> %s with unmet dependencies\n"
msgstr ""
-#: ../packet.cc:403
+#: ../packet.cc:404
#, c-format
msgid "writing delayed revision cert on %s\n"
msgstr ""
-#: ../packet.cc:410
+#: ../packet.cc:411
#, c-format
msgid "discarding revision cert packet %s with unmet dependencies\n"
msgstr ""
-#: ../packet.cc:417
+#: ../packet.cc:418
#, c-format
msgid "writing delayed public key %s\n"
msgstr ""
-#: ../packet.cc:430
+#: ../packet.cc:431
#, c-format
msgid "writing delayed private key %s\n"
msgstr ""
-#: ../packet.cc:600
+#: ../packet.cc:601
#, c-format
msgid "noting acceptence of revision %s\n"
msgstr ""
-#: ../packet.cc:613
+#: ../packet.cc:614
#, c-format
msgid "noting acceptence of manifest %s\n"
msgstr ""
-#: ../packet.cc:626
+#: ../packet.cc:627
#, c-format
msgid "noting acceptence of file %s\n"
msgstr ""
-#: ../packet.cc:648
+#: ../packet.cc:649
#, c-format
msgid "skipping existing file version %s\n"
msgstr ""
-#: ../packet.cc:676
+#: ../packet.cc:677
#, c-format
msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n"
msgstr ""
-#: ../packet.cc:682
+#: ../packet.cc:683
#, c-format
msgid "delaying file delta %s -> %s for preimage\n"
msgstr ""
-#: ../packet.cc:692
+#: ../packet.cc:693
#, c-format
msgid "skipping delta to existing file version %s\n"
msgstr ""
-#: ../packet.cc:720
+#: ../packet.cc:721
#, c-format
msgid "reconstructed file from reverse delta '%s' -> '%s' has wrong id '%s'\n"
msgstr ""
-#: ../packet.cc:726
+#: ../packet.cc:727
#, c-format
msgid "delaying reverse file delta %s -> %s for preimage\n"
msgstr ""
-#: ../packet.cc:736
+#: ../packet.cc:737
#, c-format
msgid "skipping reverse delta to existing file version %s\n"
msgstr ""
-#: ../packet.cc:753
+#: ../packet.cc:754
#, c-format
msgid "skipping existing manifest version %s\n"
msgstr ""
-#: ../packet.cc:781
+#: ../packet.cc:782
#, c-format
msgid "reconstructed manifest from delta '%s' -> '%s' has wrong id '%s'\n"
msgstr ""
-#: ../packet.cc:787
+#: ../packet.cc:788
#, c-format
msgid "delaying manifest delta %s -> %s for preimage\n"
msgstr ""
-#: ../packet.cc:797
+#: ../packet.cc:798
#, c-format
msgid "skipping delta to existing manifest version %s\n"
msgstr ""
-#: ../packet.cc:825
+#: ../packet.cc:826
#, c-format
msgid ""
"reconstructed manifest from reverse delta '%s' -> '%s' has wrong id '%s'\n"
msgstr ""
-#: ../packet.cc:831
+#: ../packet.cc:832
#, c-format
msgid "delaying manifest reverse delta %s -> %s for preimage\n"
msgstr ""
-#: ../packet.cc:841
+#: ../packet.cc:842
#, c-format
msgid "skipping reverse delta to existing manifest version %s\n"
msgstr ""
-#: ../packet.cc:863
+#: ../packet.cc:864
#, c-format
msgid "delaying revision %s for new manifest %s\n"
msgstr ""
-#: ../packet.cc:877
+#: ../packet.cc:878
#, c-format
msgid "delaying revision %s for old manifest %s\n"
msgstr ""
-#: ../packet.cc:887
+#: ../packet.cc:888
#, c-format
msgid "delaying revision %s for old revision %s\n"
msgstr ""
-#: ../packet.cc:900
+#: ../packet.cc:901
#, c-format
msgid "delaying revision %s for old file %s\n"
msgstr ""
-#: ../packet.cc:910
+#: ../packet.cc:911
#, c-format
msgid "delaying revision %s for new file %s\n"
msgstr ""
-#: ../packet.cc:928
+#: ../packet.cc:929
#, c-format
msgid "skipping existing revision %s\n"
msgstr ""
-#: ../packet.cc:946
+#: ../packet.cc:947
#, c-format
msgid "delaying revision cert on %s\n"
msgstr ""
-#: ../packet.cc:959
+#: ../packet.cc:960
#, c-format
msgid "skipping existing revision cert %s\n"
msgstr ""
-#: ../packet.cc:973
+#: ../packet.cc:974
#, c-format
msgid "skipping prohibited public key %s\n"
msgstr ""
-#: ../packet.cc:986
+#: ../packet.cc:987
#, c-format
msgid "key '%s' is not equal to key '%s' in database\n"
msgstr ""
"la clef « %s » n'est pas égale à la clef « %s » dans la base de données\n"
-#: ../packet.cc:987
+#: ../packet.cc:988
#, c-format
msgid "skipping existing public key %s\n"
msgstr ""
-#: ../packet.cc:1000
+#: ../packet.cc:1001
#, c-format
msgid "skipping prohibited private key %s\n"
msgstr ""
-#: ../packet.cc:1009
+#: ../packet.cc:1010
#, c-format
msgid "skipping existing private key %s\n"
msgstr ""
-#: ../packet.cc:1045
+#: ../packet.cc:1046
msgid "packet valve opened\n"
msgstr ""
-#: ../packet.cc:1057
+#: ../packet.cc:1058
#, c-format
msgid "wrote %i queued packets\n"
msgstr ""
-#: ../packet.cc:1306
+#: ../packet.cc:1307
msgid "read data packet\n"
msgstr "lecture d'un paquet de donnée\n"
-#: ../packet.cc:1328
+#: ../packet.cc:1329
msgid "read delta packet\n"
-msgstr ""
+msgstr "lecture d'un paquet delta\n"
-#: ../packet.cc:1359
+#: ../packet.cc:1360
msgid "read cert packet\n"
msgstr ""
-#: ../packet.cc:1385
+#: ../packet.cc:1386
msgid "read key data packet\n"
msgstr ""
@@ -4048,229 +4058,224 @@
msgid "parse failure %d:%d: expecting word\n"
msgstr ""
-#: ../rcs_import.cc:249
+#: ../rcs_import.cc:247
#, c-format
msgid "Calculating time of %s\n"
msgstr ""
-#: ../rcs_import.cc:283
+#: ../rcs_import.cc:281
#, c-format
msgid "version %s -> tag %s\n"
msgstr ""
-#: ../rcs_import.cc:450
+#: ../rcs_import.cc:448
msgid "skipping identity file edge\n"
msgstr ""
#. we already have a way to get to this old version,
#. no need to insert another reconstruction path
-#: ../rcs_import.cc:458 ../rcs_import.cc:484
+#: ../rcs_import.cc:456 ../rcs_import.cc:482
#, c-format
msgid "existing path to %s found, skipping\n"
msgstr ""
-#: ../rcs_import.cc:476
+#: ../rcs_import.cc:474
msgid "skipping identity manifest edge\n"
msgstr ""
-#: ../rcs_import.cc:594
+#: ../rcs_import.cc:592
#, c-format
msgid "version %s has %d lines\n"
msgstr ""
-#: ../rcs_import.cc:607
+#: ../rcs_import.cc:605
#, c-format
msgid "following RCS edge %s -> %s\n"
msgstr ""
-#: ../rcs_import.cc:610
+#: ../rcs_import.cc:608
#, c-format
msgid "constructed RCS version %s, inserting into database\n"
msgstr ""
-#: ../rcs_import.cc:653
+#: ../rcs_import.cc:651
#, c-format
msgid "following RCS branch %s = '%s'\n"
msgstr ""
-#: ../rcs_import.cc:663
+#: ../rcs_import.cc:661
#, c-format
msgid "finished RCS branch %s = '%s'\n"
msgstr ""
-#: ../rcs_import.cc:684 ../rcs_import.cc:733
+#: ../rcs_import.cc:682 ../rcs_import.cc:730
#, c-format
msgid "parsing RCS file %s\n"
msgstr "analyse du fichier RCS %s\n"
-#: ../rcs_import.cc:686 ../rcs_import.cc:736
+#: ../rcs_import.cc:684 ../rcs_import.cc:733
#, c-format
msgid "parsed RCS file %s OK\n"
msgstr "analyse du fichier RCS %s OK\n"
-#: ../rcs_import.cc:776
+#: ../rcs_import.cc:773
#, c-format
msgid "importing file '%s'\n"
msgstr "importation du fichier « %s »\n"
-#: ../rcs_import.cc:848
+#: ../rcs_import.cc:845
#, c-format
msgid "first version in branch %s would be %s\n"
msgstr ""
-#: ../rcs_import.cc:855
+#: ../rcs_import.cc:852
#, c-format
msgid "file branchpoint for %s at %s\n"
msgstr ""
-#: ../rcs_import.cc:925
+#: ../rcs_import.cc:922
#, c-format
msgid "error reading RCS file %s: %s\n"
msgstr "erreur lors de la lecture du fichier RCS %s : %s\n"
-#: ../rcs_import.cc:929
+#: ../rcs_import.cc:926
#, c-format
msgid "skipping non-RCS file %s\n"
msgstr ""
-#: ../rcs_import.cc:1108
+#: ../rcs_import.cc:1105
#, c-format
msgid "examining next commit [t:%d] [p:%s] [a:%s] [c:%s]\n"
msgstr ""
-#: ../rcs_import.cc:1121
+#: ../rcs_import.cc:1118
msgid "expiring cluster\n"
msgstr ""
-#: ../rcs_import.cc:1137
+#: ../rcs_import.cc:1134
#, c-format
msgid "examining cluster %d to see if it touched %d\n"
msgstr ""
-#: ../rcs_import.cc:1145
+#: ../rcs_import.cc:1142
#, c-format
msgid "found cluster touching %d: [t:%d] [a:%d] [c:%d]\n"
msgstr ""
-#: ../rcs_import.cc:1153
+#: ../rcs_import.cc:1150
#, c-format
msgid "last modification time is %d\n"
msgstr "la date de dernière modification est %d\n"
-#: ../rcs_import.cc:1169
+#: ../rcs_import.cc:1166
#, c-format
msgid "picked existing cluster [t:%d] [a:%d] [c:%d]\n"
msgstr ""
-#: ../rcs_import.cc:1183
+#: ../rcs_import.cc:1180
#, c-format
msgid "building new cluster [t:%d] [a:%d] [c:%d]\n"
msgstr ""
#. now we are done this lineage; flush all remaining clusters
-#: ../rcs_import.cc:1208
+#: ../rcs_import.cc:1205
msgid "finished branch commits, writing all pending clusters\n"
msgstr ""
-#: ../rcs_import.cc:1214
+#: ../rcs_import.cc:1211
msgid "finished writing pending clusters\n"
msgstr ""
-#: ../rcs_import.cc:1226
+#: ../rcs_import.cc:1223
#, c-format
msgid ""
"%s appears to be a CVS repository root directory\n"
"try importing a module instead, with 'cvs_import %s/"
msgstr ""
-#: ../rcs_import.cc:1239
+#: ../rcs_import.cc:1236
msgid "need base --branch argument for importing"
msgstr ""
-#: ../rcs_import.cc:1251
+#: ../rcs_import.cc:1248
#, c-format
msgid "path %s does not exist"
msgstr "le chemin %s n'existe pas"
-#: ../rcs_import.cc:1253
+#: ../rcs_import.cc:1249
#, c-format
msgid "path %s is not a directory"
msgstr "le chemin %s n'est pas un dossier"
-#: ../rcs_import.cc:1256
+#: ../rcs_import.cc:1267
#, c-format
-msgid "could not change directory to %s"
-msgstr ""
-
-#: ../rcs_import.cc:1272
-#, c-format
msgid "branch %s has %d entries\n"
msgstr ""
-#: ../rcs_import.cc:1282
+#: ../rcs_import.cc:1277
#, c-format
msgid "trunk has %d entries\n"
msgstr ""
-#: ../rcs_import.cc:1335
+#: ../rcs_import.cc:1330
#, c-format
msgid "initial cluster on branch %s has %d live entries\n"
msgstr ""
-#: ../rcs_import.cc:1342
+#: ../rcs_import.cc:1337
#, c-format
msgid "initial cluster contains %s at %s\n"
msgstr ""
-#: ../rcs_import.cc:1388
+#: ../rcs_import.cc:1383
#, c-format
msgid "storing manifest '%s' (base %s)\n"
msgstr ""
-#: ../rcs_import.cc:1393
+#: ../rcs_import.cc:1388
#, c-format
msgid "storing head %s\n"
msgstr ""
-#: ../rcs_import.cc:1408
+#: ../rcs_import.cc:1403
msgid "skipping delta to null manifest\n"
msgstr ""
-#: ../rcs_import.cc:1420
+#: ../rcs_import.cc:1415
#, c-format
msgid "skipping cyclical manifest delta %s -> %s\n"
msgstr ""
-#: ../rcs_import.cc:1426
+#: ../rcs_import.cc:1421
#, c-format
msgid "writing full manifest %s\n"
msgstr ""
-#: ../rcs_import.cc:1436
+#: ../rcs_import.cc:1431
#, c-format
msgid "storing manifest delta %s -> %s\n"
msgstr ""
-#: ../rcs_import.cc:1498
+#: ../rcs_import.cc:1493
#, c-format
msgid "adding entry state '%s' on '%s'\n"
msgstr ""
-#: ../rcs_import.cc:1505
+#: ../rcs_import.cc:1500
#, c-format
msgid "applying state delta on '%s' : '%s' -> '%s'\n"
msgstr ""
-#: ../rcs_import.cc:1516
+#: ../rcs_import.cc:1511
#, c-format
msgid "deleting entry state '%s' on '%s'\n"
msgstr ""
-#: ../rcs_import.cc:1535
+#: ../rcs_import.cc:1530
msgid "BEGIN consume_cluster()\n"
msgstr ""
-#: ../rcs_import.cc:1555
+#: ../rcs_import.cc:1550
#, c-format
msgid "END consume_cluster('%s') (parent '%s')\n"
msgstr ""
@@ -4308,139 +4313,139 @@
msgid "loading parents for node %d\n"
msgstr ""
-#: ../revision.cc:330
+#: ../revision.cc:332
#, c-format
msgid "parent %s -> node %d\n"
msgstr "parent %s -> noeud %d\n"
-#: ../revision.cc:480
+#: ../revision.cc:482
#, c-format
msgid "found %d intersecting nodes\n"
msgstr ""
-#: ../revision.cc:533
+#: ../revision.cc:535
#, c-format
msgid "searching for common ancestor, left=%s right=%s\n"
msgstr ""
-#: ../revision.cc:538
+#: ../revision.cc:540
#, c-format
msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n"
msgstr ""
-#: ../revision.cc:543
+#: ../revision.cc:545
#, c-format
msgid "found node %d, ancestor of left %s and dominating right %s\n"
msgstr ""
-#: ../revision.cc:550
+#: ../revision.cc:552
#, c-format
msgid "found node %d, ancestor of right %s and dominating left %s\n"
msgstr ""
-#: ../revision.cc:587
+#: ../revision.cc:589
#, c-format
msgid "searching for least common ancestor, left=%s right=%s\n"
msgstr ""
-#: ../revision.cc:591
+#: ../revision.cc:593
#, c-format
msgid "least common ancestor scan [par=%d,anc=%d]\n"
msgstr ""
-#: ../revision.cc:596
+#: ../revision.cc:598
#, c-format
msgid "found node %d, ancestor of left %s and right %s\n"
msgstr ""
-#: ../revision.cc:650
+#: ../revision.cc:652
#, 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:762
+#: ../revision.cc:764
#, c-format
msgid "new root: %s\n"
msgstr "nouvelle racine : %s\n"
-#: ../revision.cc:777
+#: ../revision.cc:779
#, c-format
msgid "new leaf: %s\n"
msgstr "nouvelle feuille : %s\n"
-#: ../revision.cc:919
+#: ../revision.cc:921
#, c-format
msgid "exploring changesets from parents of %s, seeking towards %s\n"
msgstr ""
-#: ../revision.cc:932
+#: ../revision.cc:934
#, c-format
msgid "considering parent %s of %s\n"
msgstr ""
-#: ../revision.cc:958
+#: ../revision.cc:960
#, c-format
msgid "revision %s is relevant, composing with edge to %s\n"
msgstr ""
-#: ../revision.cc:965
+#: ../revision.cc:967
#, c-format
msgid "parent %s of %s is not relevant\n"
msgstr ""
-#: ../revision.cc:1001
+#: ../revision.cc:1003
#, c-format
msgid "adding parents of %s to subgraph\n"
msgstr ""
-#: ../revision.cc:1011
+#: ../revision.cc:1013
#, c-format
msgid "found parent %s of %s\n"
msgstr ""
-#: ../revision.cc:1015
+#: ../revision.cc:1017
#, c-format
msgid "adding parent %s to next frontier\n"
msgstr ""
-#: ../revision.cc:1030
+#: ../revision.cc:1032
#, c-format
msgid "calculating composite changeset between %s and %s\n"
msgstr ""
-#: ../revision.cc:1048
+#: ../revision.cc:1050
#, c-format
msgid "calculating changeset from %s to %s\n"
msgstr ""
-#: ../revision.cc:1052
+#: ../revision.cc:1054
#, c-format
msgid "no common ancestor for %s and %s\n"
msgstr ""
-#: ../revision.cc:1053
+#: ../revision.cc:1055
#, c-format
msgid "common ancestor is %s\n"
msgstr "l'ancêtre commun est %s\n"
-#: ../revision.cc:1084
+#: ../revision.cc:1086
#, c-format
msgid "analyzing manifest changes from '%s' -> '%s'\n"
msgstr ""
-#: ../revision.cc:1097
+#: ../revision.cc:1099
#, c-format
msgid "splitting ancestry for file %s\n"
msgstr ""
-#: ../revision.cc:1164
+#: ../revision.cc:1166
#, c-format
msgid "noting ancestry from child %d -> parent %d\n"
msgstr ""
-#: ../revision.cc:1197
+#: ../revision.cc:1199
#, c-format
msgid "setting epoch for %s to %s\n"
msgstr ""
@@ -4463,80 +4468,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:1253
+#: ../revision.cc:1255
msgid "scanning for nodes with 3+ parents\n"
msgstr ""
-#: ../revision.cc:1294
+#: ../revision.cc:1296
#, c-format
msgid "optimizing out redundant edge %i -> %i\n"
msgstr ""
-#: ../revision.cc:1321
+#: ../revision.cc:1323
#, c-format
msgid "rebuilding %d nodes\n"
msgstr ""
-#: ../revision.cc:1358
+#: ../revision.cc:1360
#, c-format
msgid "node %d = manifest %s\n"
msgstr ""
-#: ../revision.cc:1369
+#: ../revision.cc:1371
#, c-format
msgid "loaded '%s' manifest cert for node %s\n"
msgstr ""
-#: ../revision.cc:1397
+#: ../revision.cc:1399
#, c-format
msgid "node %d = revision %s = manifest %s\n"
msgstr "noeud %d = révision %s = manifeste %s\n"
-#: ../revision.cc:1409
+#: ../revision.cc:1411
#, c-format
msgid "loaded '%s' revision cert for node %s\n"
msgstr ""
-#: ../revision.cc:1433
+#: ../revision.cc:1435
#, c-format
msgid "processing node %d\n"
msgstr ""
-#: ../revision.cc:1437
+#: ../revision.cc:1439
#, c-format
msgid "node %d already processed, skipping\n"
msgstr ""
-#: ../revision.cc:1451
+#: ../revision.cc:1453
#, c-format
msgid "node %d is a root node\n"
msgstr ""
-#: ../revision.cc:1467 ../revision.cc:1550
+#: ../revision.cc:1469 ../revision.cc:1552
#, c-format
msgid "parent node %d = revision %s\n"
msgstr ""
-#: ../revision.cc:1529
+#: ../revision.cc:1531
#, c-format
msgid "processing edge from child %d -> parent %d\n"
msgstr ""
-#: ../revision.cc:1567
+#: ../revision.cc:1569
#, c-format
msgid "mapped node %d to revision %s\n"
msgstr ""
-#: ../revision.cc:1573
+#: ../revision.cc:1575
#, c-format
msgid "skipping already existing revision %s\n"
msgstr ""
-#: ../revision.cc:1585
+#: ../revision.cc:1587
msgid "rebuilding revision graph from existing graph\n"
msgstr ""
-#: ../revision.cc:1618
+#: ../revision.cc:1620
msgid "rebuilding revision graph from manifest certs\n"
msgstr ""
@@ -4545,6 +4550,16 @@
msgid "started up on %s\n"
msgstr ""
+#: ../sanity.cc:53
+#, c-format
+msgid "wrote debugging log to %s"
+msgstr ""
+
+#: ../sanity.cc:56
+#, c-format
+msgid "failed to write debugging log to %s"
+msgstr "impossible d'écrire le journal de debogage sur %s"
+
#: ../sanity.cc:107
#, c-format
msgid "fatal: formatter failed on %s:%d: %s"
@@ -4580,12 +4595,12 @@
msgid "finished saving work set"
msgstr ""
-#: ../sanity.hh:239
+#: ../sanity.hh:241
#, c-format
msgid "----- begin '%s' (in %s, at %s:%d)\n"
msgstr ""
-#: ../sanity.hh:243
+#: ../sanity.hh:245
#, c-format
msgid "----- end '%s' (in %s, at %s:%d)\n"
msgstr ""
@@ -4608,32 +4623,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:524
+#: ../transforms.cc:520
#, c-format
msgid "converting %d bytes from %s to %s\n"
msgstr "conversion de %d octets de %s en %s\n"
-#: ../transforms.cc:530
+#: ../transforms.cc:526
#, c-format
msgid "failed to convert string from %s to %s: '%s'"
msgstr "impossible de convertir la chaîne de %s en %s : « %s »"
-#: ../transforms.cc:578
+#: ../transforms.cc:651
#, c-format
msgid "converting %d bytes from IDNA ACE to UTF-8\n"
msgstr ""
-#: ../transforms.cc:581 ../transforms.cc:595
+#: ../transforms.cc:654 ../transforms.cc:668
#, c-format
msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
msgstr ""
-#: ../transforms.cc:592
+#: ../transforms.cc:665
#, 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:861
+#: ../transforms.cc:813
#, c-format
msgid "doing linesep conversion to %s\n"
msgstr ""
@@ -4696,73 +4711,43 @@
#: ../update.cc:160
msgid "cannot determine branch for update"
-msgstr ""
+msgstr "impossible de déterminer la branche pour la mise-à -jour"
-#: ../vocab.cc:57
+#: ../vocab.cc:53
#, c-format
msgid "hex encoded ID '%s' size != %d"
msgstr ""
-#: ../vocab.cc:60
+#: ../vocab.cc:56
#, c-format
msgid "bad character '%c' in id name '%s'"
msgstr ""
-#: ../vocab.cc:73
+#: ../vocab.cc:69
#, c-format
msgid "bad character '%c' in ace string '%s'"
msgstr ""
-#: ../vocab.cc:87
+#: ../vocab.cc:83
#, c-format
msgid "bad character '%c' in cert name '%s'"
msgstr ""
-#: ../vocab.cc:100
+#: ../vocab.cc:96
#, c-format
msgid "bad character '%c' in key name '%s'"
msgstr ""
-#: ../vocab.cc:118
+#: ../vocab.cc:114
#, c-format
msgid "Invalid key length of %d bytes"
-msgstr ""
+msgstr "Longueur de clef invalide de %d octets"
-#: ../vocab.cc:136
+#: ../vocab.cc:132
#, c-format
msgid "Invalid hmac length of %d bytes"
msgstr "Longueur hmac invalide de %d octets"
-#: ../vocab.cc:166
-#, c-format
-msgid "prohibited absolute path '%s'"
-msgstr ""
-
-#: ../vocab.cc:171
-#, c-format
-msgid "empty path component in '%s'"
-msgstr ""
-
-#: ../vocab.cc:174
-#, c-format
-msgid "prohibited path component '%s' in '%s'"
-msgstr ""
-
-#: ../vocab.cc:178
-#, c-format
-msgid "bad character '%d' in path component '%s' of '%s'"
-msgstr ""
-
-#: ../vocab.cc:184
-#, c-format
-msgid "null byte in path component '%s' of '%s'"
-msgstr ""
-
-#: ../vocab.cc:239
-#, c-format
-msgid "prohibited book-keeping path in '%s'"
-msgstr ""
-
#: ../work.cc:64
#, c-format
msgid "skipping ignorable file %s\n"
@@ -4778,31 +4763,26 @@
msgid "adding %s to working copy add set\n"
msgstr ""
-#: ../work.cc:102 ../work.cc:208
-msgid "invalid path ''"
+#: ../work.cc:136
+#, c-format
+msgid "adding attribute '%s' on file %s to %s\n"
msgstr ""
-#: ../work.cc:104
-#, c-format
-msgid "path %s does not exist\n"
-msgstr "le chemin %s n'existe pas\n"
-
-#: ../work.cc:141
-#, c-format
-msgid "adding attribute '%s' on file %s to %s\n"
+#: ../work.cc:203
+msgid "invalid path ''"
msgstr ""
-#: ../work.cc:212
+#: ../work.cc:207
#, c-format
msgid "skipping %s, not currently tracked\n"
msgstr ""
-#: ../work.cc:216
+#: ../work.cc:211
#, c-format
msgid "adding %s to working copy delete set\n"
msgstr ""
-#: ../work.cc:220
+#: ../work.cc:215
#, c-format
msgid ""
"sorry -- 'drop ' is currently broken.\n"
@@ -4811,135 +4791,130 @@
"désolé mais « drop  » est actuellement cassé.\n"
"essayez « find %s -type f | monotone drop address@hidden"
-#: ../work.cc:232
+#: ../work.cc:227
#, c-format
msgid "dropped attributes for file %s from %s\n"
msgstr ""
-#: ../work.cc:237
-#, c-format
-msgid "Can't remove %s: %s\n"
-msgstr ""
-
-#: ../work.cc:261
+#: ../work.cc:253
msgid "invalid source path ''"
msgstr ""
-#: ../work.cc:262
+#: ../work.cc:254
msgid "invalid destination path ''"
msgstr ""
-#: ../work.cc:273
+#: ../work.cc:265
#, c-format
msgid "%s does not exist in current revision\n"
msgstr ""
-#: ../work.cc:276
+#: ../work.cc:268
#, c-format
msgid "%s already exists in current revision\n"
msgstr ""
-#: ../work.cc:278
+#: ../work.cc:270
#, c-format
msgid "adding %s -> %s to working copy rename set\n"
msgstr ""
-#: ../work.cc:287
+#: ../work.cc:293
#, c-format
-msgid "Can't rename %s to %s: %s\n"
-msgstr ""
-
-#: ../work.cc:304
-#, c-format
msgid "%s has existing attributes in %s; clean them up first"
msgstr ""
-#: ../work.cc:313
+#: ../work.cc:302
#, c-format
msgid "moving attributes for %s to %s\n"
msgstr ""
-#: ../work.cc:332
+#: ../work.cc:321
#, c-format
msgid "work path is %s\n"
msgstr ""
-#: ../work.cc:341
+#: ../work.cc:330
#, c-format
msgid "checking for un-committed work file %s\n"
msgstr ""
-#: ../work.cc:345
+#: ../work.cc:334
#, c-format
msgid "read rearrangement from %s\n"
msgstr ""
-#: ../work.cc:349
+#: ../work.cc:338
#, c-format
msgid "no un-committed work file %s\n"
msgstr ""
-#: ../work.cc:386
+#: ../work.cc:375
#, c-format
msgid "revision path is %s\n"
msgstr ""
-#: ../work.cc:396
+#: ../work.cc:385
#, c-format
-msgid "working copy is corrupt: %s does not exist\n"
+msgid "working copy is corrupt: %s does not exist"
+msgstr "la copie de travail est corrompue : %s n'existe pas"
+
+#: ../work.cc:386
+#, c-format
+msgid "working copy is corrupt: %s is a directory"
msgstr ""
-#: ../work.cc:399
+#: ../work.cc:389
#, c-format
msgid "loading revision id from %s\n"
msgstr ""
-#: ../work.cc:406
+#: ../work.cc:396
#, c-format
msgid "Problem with working directory: %s is unreadable"
msgstr ""
-#: ../work.cc:415
+#: ../work.cc:405
#, c-format
msgid "writing revision id to %s\n"
msgstr ""
-#: ../work.cc:434
+#: ../work.cc:424
#, c-format
msgid "base revision %s does not exist in database\n"
msgstr ""
-#: ../work.cc:437
+#: ../work.cc:427
#, c-format
msgid "old manifest is %s\n"
msgstr ""
-#: ../work.cc:440
+#: ../work.cc:430
#, c-format
msgid "base manifest %s does not exist in database\n"
msgstr ""
-#: ../work.cc:445
+#: ../work.cc:435
#, c-format
msgid "old manifest has %d entries\n"
msgstr ""
-#: ../work.cc:466
+#: ../work.cc:456
#, c-format
msgid "user log path is %s\n"
msgstr ""
-#: ../work.cc:515
+#: ../work.cc:505
#, c-format
msgid "options path is %s\n"
msgstr ""
-#: ../work.cc:562
+#: ../work.cc:552
#, c-format
msgid "local dump path is %s\n"
msgstr ""
-#: ../work.cc:614
+#: ../work.cc:604
#, c-format
msgid "attribute map path is %s\n"
msgstr ""
@@ -4952,6 +4927,18 @@
msgid "computed binary delta instructions\n"
msgstr ""
+#~ msgid "new revision %s\n"
+#~ msgstr "nouvelle révisions %s\n"
+
+#~ 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"