#
#
# patch "ChangeLog"
# from [052f287a6914a9b74d4155d0eaeb71d322ec732d]
# to [012316a22aa364034903caa6fa70d1cc342c0ffd]
#
# patch "NEWS"
# from [19d7e96291e979d06c34138d99eabf0de582bb4c]
# to [1e87b8d8f8d9e3829f5b4da06365855ff42e70c9]
#
# patch "po/fr.po"
# from [19aadf74f9e170d53777ab4fdf52b7796968291f]
# to [5369924e1143c09be2c6835fdaf1e076347d19b8]
#
# patch "po/ja.po"
# from [029a04ebdd9ccfdc9af27f26fec92513895b98ec]
# to [0b4599ee497a230e6d90a6e4bc48b2f1d09b219a]
#
# patch "po/pt_BR.po"
# from [2d7e07f3ec6016280b9b73b5107b462fae3f66bf]
# to [d364d01614746e1da2256825f652af89b6836197]
#
============================================================
--- ChangeLog 052f287a6914a9b74d4155d0eaeb71d322ec732d
+++ ChangeLog 012316a22aa364034903caa6fa70d1cc342c0ffd
@@ -1,3 +1,7 @@
+2005-12-29 Nathaniel Smith
+
+ * NEWS: Write up for 0.25.
+
2005-12-29 Matthew Gregan
* sqlite/{pager.c,sqlite3.h}: Upgrade to SQLite 3.2.8.
============================================================
--- NEWS 19d7e96291e979d06c34138d99eabf0de582bb4c
+++ NEWS 1e87b8d8f8d9e3829f5b4da06365855ff42e70c9
@@ -1,20 +1,35 @@
-????????????????????????????
+Thu Dec 29 23:10:03 PST 2005
0.25 release.
- ipv6 now supported.
- revert now requires an argument.
- 'revert' gives feedback while running
- database locking was further tweaked, to allow more concurrent
- access when safe
- bug fix: don't print out hundreds of lines of tickers on win32.
- bug fix: can now import 0.23-and-earlier private key packets
- bug fix: log --diffs restricted to some files now only prints
- diffs for those files.
- win9x support?
+ Incompatible command line changes:
+ - 'monotone revert' now requires an argument. To revert your
+ entire working copy,
+ $ monotone revert
+ no longer works; instead, go to the root of your working
+ copy and run
+ $ monotone revert .
- new translations: pt_BR
+ New features:
+ - Netsync now supports IPv6 (where OS support exists)
+ Bugs fixed:
+ - 'revert' gives feedback describing what it changes
+ - Database locking further tweaked, to allow more concurrent
+ access in situations where this is safe.
+ - On win32, ticker display was fixed, so that it no longer
+ prints a new line at each update.
+ - 'read' can now understand (and migrate) privkey packets
+ generated by monotone version 0.23 or earlier.
+ - 'log --diffs ' now prints only diffs for the given
+ files (previously, it would print only revisions in which
+ the given files changed, but would print all diffs for those
+ revisions).
+ - Win9x and WinNT 4 compatibility fixes.
+
+ New translations:
+ - pt_BR
+
Sat Nov 27 22:29:38 PST 2005
0.24 release.
============================================================
--- po/fr.po 19aadf74f9e170d53777ab4fdf52b7796968291f
+++ po/fr.po 5369924e1143c09be2c6835fdaf1e076347d19b8
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: monotone 0.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-28 19:39+0100\n"
+"POT-Creation-Date: 2005-12-29 14:41-0800\n"
"PO-Revision-Date: 2005-11-28 21:12+0100\n"
"Last-Translator: Benoît Dejean \n"
"Language-Team: Benoît Dejean \n"
@@ -15,25 +15,479 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: ../commands.cc:201
+#: app_state.cc:66
+#, c-format
+msgid "initializing from directory %s\n"
+msgstr ""
+
+#: app_state.cc:87
+#, c-format
+msgid "branch name is '%s'\n"
+msgstr "le nom de la branche est « %s »\n"
+
+#: app_state.cc:94
+#, c-format
+msgid "setting dump path to %s\n"
+msgstr ""
+
+#: app_state.cc:108
+#, c-format
+msgid "working copy directory required but not found%s%s"
+msgstr ""
+
+#: app_state.cc:116
+#, fuzzy, c-format
+msgid "invalid directory ''"
+msgstr "chem"
+
+#: app_state.cc:118
+#, c-format
+msgid "creating working copy in %s\n"
+msgstr "création d'une copie de travail dans %s\n"
+
+#: app_state.cc:124
+#, fuzzy, c-format
+msgid "monotone bookkeeping directory '%s' already exists in '%s'\n"
+msgstr "le fichier pid « %s » existe déjà "
+
+#: app_state.cc:127
+#, fuzzy, c-format
+msgid "creating bookkeeping directory '%s' for working copy in '%s'\n"
+msgstr "création d'une copie de travail dans %s\n"
+
+#: app_state.cc:158
+#, c-format
+msgid "'%s' ignored by restricted path set\n"
+msgstr ""
+
+#: app_state.cc:163 app_state.cc:181
+#, c-format
+msgid "unknown path '%s'\n"
+msgstr "chemin inconnu « %s »\n"
+
+#: app_state.cc:165
+#, c-format
+msgid "'%s' added to restricted path set\n"
+msgstr ""
+
+#: app_state.cc:176
+#, c-format
+msgid "'%s' ignored by excluded path set\n"
+msgstr ""
+
+#: app_state.cc:183
+#, c-format
+msgid "'%s' added to excluded path set\n"
+msgstr ""
+
+#: app_state.cc:210
+#, c-format
+msgid "checking excluded path set for '%s'\n"
+msgstr ""
+
+#: app_state.cc:217 app_state.cc:250
+#, c-format
+msgid "path '%s' found in excluded path set; '%s' excluded\n"
+msgstr ""
+
+#: app_state.cc:236
+#, fuzzy, c-format
+msgid "checking restricted path set for '%s'\n"
+msgstr "vérification de la révisions %s\n"
+
+#: app_state.cc:244
+#, c-format
+msgid "path '%s' found in restricted path set; '%s' included\n"
+msgstr ""
+
+#: app_state.cc:332
+#, fuzzy, c-format
+msgid "search root '%s' does not exist"
+msgstr "le fichier rc « %s » n'existe pas"
+
+#: app_state.cc:333
+#, fuzzy, c-format
+msgid "search root '%s' is not a directory\n"
+msgstr "la racin"
+
+#: app_state.cc:335
+#, c-format
+msgid "set search root to %s\n"
+msgstr ""
+
+#: app_state.cc:366
+#, c-format
+msgid "negative depth not allowed\n"
+msgstr "profondeur négative interdite\n"
+
+#: app_state.cc:374
+#, fuzzy, c-format
+msgid "negative or zero last not allowed\n"
+msgstr "profondeur négative interdite\n"
+
+#: app_state.cc:497
+#, c-format
+msgid "Failed to read options file %s"
+msgstr "La lecture du fichier d'options « %s » a échouée"
+
+#: app_state.cc:514
+#, c-format
+msgid "Failed to write options file %s"
+msgstr "L'écriture du fichier d'options « %s » a échouée"
+
+#: basic_io.cc:26 basic_io.cc:27
+#, c-format
+msgid "error in %s:%d:%d:E: %s"
+msgstr "erreur dans %s:%d:%d:EÂ : %s"
+
+#: cert.cc:51
+#, c-format
+msgid "cert ok\n"
+msgstr "certificat OK\n"
+
+#: cert.cc:58
+#, c-format
+msgid "ignoring bad signature by '%s' on '%s'\n"
+msgstr ""
+
+#: cert.cc:66
+#, c-format
+msgid "ignoring unknown signature by '%s' on '%s'\n"
+msgstr ""
+
+#: cert.cc:123
+#, c-format
+msgid "trust function liked %d signers of %s cert on manifest %s\n"
+msgstr ""
+
+#: cert.cc:129
+#, c-format
+msgid "trust function disliked %d signers of %s cert on manifest %s\n"
+msgstr ""
+
+#: cert.cc:176
+#, c-format
+msgid "trust function liked %d signers of %s cert on revision %s\n"
+msgstr ""
+
+#: cert.cc:182
+#, c-format
+msgid "trust function disliked %d signers of %s cert on revision %s\n"
+msgstr ""
+
+#: cert.cc:271
+#, c-format
+msgid "calculated cert hash '%s' does not match '%s'"
+msgstr ""
+
+#: cert.cc:305
+#, c-format
+msgid "cert: signable text %s\n"
+msgstr ""
+
+#: cert.cc:365
+#, fuzzy, c-format
+msgid "no private key '%s' found in key store or get_priv_key hook"
+msgstr "la clef publique ou privée « %s » n'existe pas dans la base de données"
+
+#: cert.cc:375
+#, c-format
+msgid "mismatch between key '%s' in key store and get_key_pair hook"
+msgstr ""
+
+#: cert.cc:461
+#, c-format
+msgid ""
+"you have no private key to make signatures with\n"
+"perhaps you need to 'genkey '"
+msgstr ""
+"vous n'avez pas de clef privé pour établir des signatures,\n"
+"vous avez sans doute besoin de faire « genkey  »"
+
+#: cert.cc:464
+#, c-format
+msgid ""
+"you have multiple private keys\n"
+"pick one to use for signatures by adding '-k' to your command"
+msgstr ""
+"vous avez plusieurs clefs privés\n"
+"choisissez-en une à utiliser pour vos signatures en ajoutant « -"
+"k » à votre commande"
+
+#: cert.cc:481
+#, c-format
+msgid "no branch found for empty revision, please provide a branch name"
+msgstr ""
+
+#: cert.cc:490
+#, c-format
+msgid "no branch certs found for revision %s, please provide a branch name"
+msgstr ""
+
+#: cert.cc:494
+#, c-format
+msgid ""
+"multiple branch certs found for revision %s, please provide a branch name"
+msgstr ""
+
+#: change_set.cc:289
+#, c-format
+msgid "tid %d: parent %d, type %s, name %s\n"
+msgstr ""
+
+#: change_set.cc:315
+#, c-format
+msgid "%d -> %d\n"
+msgstr ""
+
+#: change_set.cc:1540
+#, c-format
+msgid "concatenating change sets\n"
+msgstr ""
+
+#: change_set.cc:1563
+#, c-format
+msgid "concatenating %d and %d deltas\n"
+msgstr ""
+
+#: change_set.cc:1573
+#, fuzzy, c-format
+msgid "processing delta on %s\n"
+msgstr "connexion à %s\n"
+
+#: change_set.cc:1577
+#, c-format
+msgid "delta on %s in first changeset renamed to %s\n"
+msgstr ""
+
+#: change_set.cc:1582
+#, c-format
+msgid "discarding delta [%s]->[%s] for deleted file '%s'\n"
+msgstr ""
+
+#: change_set.cc:1600
+#, c-format
+msgid "fusing deltas on %s : %s -> %s and %s -> %s\n"
+msgstr ""
+
+#: change_set.cc:1614
+#, c-format
+msgid "delta on %s in second changeset copied forward\n"
+msgstr ""
+
+#: change_set.cc:1628
+#, c-format
+msgid "finished concatenation\n"
+msgstr ""
+
+#: change_set.cc:1734 change_set.cc:1741
+#, c-format
+msgid "delete of %s dominates rename to %s\n"
+msgstr ""
+
+#: change_set.cc:1751
+#, c-format
+msgid "unable to resolve file conflict '%s' -> '%s' vs. '%s'"
+msgstr ""
+
+#: change_set.cc:1755
+#, c-format
+msgid "unable to resolve dir conflict '%s' -> '%s' vs. '%s'"
+msgstr ""
+
+#: change_set.cc:1760
+#, c-format
+msgid "illegal conflict resolution '%s', wanted '%s' or '%s'\n"
+msgstr ""
+
+#: change_set.cc:1816
+#, c-format
+msgid "tid %d (%s) clobbered tid %d (%s)\n"
+msgstr ""
+
+#: change_set.cc:1852
+#, fuzzy, c-format
+msgid "skipping common change on %s (tid %d)\n"
+msgstr "pas d'ancêtre commun pour « %s » et « %s »\n"
+
+#: change_set.cc:1857
+#, c-format
+msgid "skipping neutral change of %s -> %s (tid %d)\n"
+msgstr ""
+
+#: change_set.cc:1864
+#, c-format
+msgid "propagating change on %s -> %s (tid %d)\n"
+msgstr ""
+
+#: change_set.cc:1880
+#, c-format
+msgid "conflict detected, resolved in A's favour\n"
+msgstr "conflit détecté, résolu en faveur de A\n"
+
+#: change_set.cc:1886
+#, c-format
+msgid "conflict detected, resolved in B's favour\n"
+msgstr "conflit détecté, résolu en faveur de B\n"
+
+#: change_set.cc:2053
+#, c-format
+msgid "reusing merge resolution '%s' : '%s' -> '%s'\n"
+msgstr ""
+
+#: change_set.cc:2062
+#, c-format
+msgid "merge of '%s' : '%s' vs. '%s' (no common ancestor) failed"
+msgstr ""
+
+#: change_set.cc:2069
+#, c-format
+msgid "merge of '%s' : '%s' -> '%s' vs '%s' failed"
+msgstr ""
+
+#: change_set.cc:2073
+#, c-format
+msgid "merge of '%s' : '%s' -> '%s' vs '%s' resolved to '%s'\n"
+msgstr ""
+
+#: change_set.cc:2131
+#, c-format
+msgid "skipping delta '%s'->'%s' on deleted file '%s'\n"
+msgstr ""
+
+#: change_set.cc:2139
+#, c-format
+msgid "merge is copying delta '%s' : '%s' -> '%s'\n"
+msgstr ""
+
+#: change_set.cc:2163
+#, c-format
+msgid "propagating new file addition delta on '%s' : '%s' -> '%s'\n"
+msgstr ""
+
+#: change_set.cc:2175
+#, c-format
+msgid "skipping new file addition delta on '%s' : '' -> '%s'\n"
+msgstr ""
+
+#: change_set.cc:2183
+#, c-format
+msgid "skipping common delta '%s' : '%s' -> '%s'\n"
+msgstr ""
+
+#: change_set.cc:2189
+#, c-format
+msgid "skipping neutral delta on '%s' : %s -> %s\n"
+msgstr ""
+
+#: change_set.cc:2197
+#, c-format
+msgid "propagating unperturbed delta on '%s' : '%s' -> '%s'\n"
+msgstr ""
+
+#: change_set.cc:2207
+#, c-format
+msgid "merging delta '%s' : '%s' -> '%s' vs. '%s'\n"
+msgstr ""
+
+#: change_set.cc:2220
+#, c-format
+msgid "resolved merge to '%s' : '%s' -> '%s'\n"
+msgstr ""
+
+#: change_set.cc:2249
+#, fuzzy, c-format
+msgid "merging change sets\n"
+msgstr "échange avorté avec %s\n"
+
+#: change_set.cc:2311
+#, c-format
+msgid "finished merge\n"
+msgstr ""
+
+#: change_set.cc:2330
+#, c-format
+msgid "inverting change set\n"
+msgstr ""
+
+#: change_set.cc:2360
+#, c-format
+msgid "converted 'delete %s' to 'add as %s' in inverse\n"
+msgstr ""
+
+#: change_set.cc:2369
+#, c-format
+msgid "converted add %s to delete in inverse\n"
+msgstr ""
+
+#: change_set.cc:2379
+#, fuzzy, c-format
+msgid "converting delta %s -> %s on %s\n"
+msgstr "conversion de %d octets de %s en %s\n"
+
+#: change_set.cc:2381
+#, c-format
+msgid "inverse is delta %s -> %s on %s\n"
+msgstr ""
+
+#: change_set.cc:2447 change_set.cc:2495
+#, c-format
+msgid "moving file %s -> %s\n"
+msgstr "déplacement du fichier %s -> %s\n"
+
+#: change_set.cc:2454 change_set.cc:2503
+#, c-format
+msgid "moving dir %s -> %s\n"
+msgstr "déplacement du dossier %s -> %s\n"
+
+#: commands.cc:136
+#, fuzzy, c-format
+msgid "expanding command '%s'\n"
+msgstr "exécution de la commande « %s »\n"
+
+#: commands.cc:153
+#, fuzzy, c-format
+msgid "expanded command to '%s'\n"
+msgstr "exécution de la commande « %s »\n"
+
+#: commands.cc:158
+#, fuzzy, c-format
+msgid "command '%s' has multiple ambiguous expansions:\n"
+msgstr "la sélection « %s » a plusieurs expansions ambigües : \n"
+
+#: commands.cc:201
msgid "commands:"
msgstr "commandes :"
-#: ../commands.cc:323 ../commands.cc:1275 ../commands.cc:1355
-#: ../commands.cc:1720 ../commands.cc:2670 ../commands.cc:3358
-#: ../commands.cc:3575 ../commands.cc:3612
+#: commands.cc:246
+#, c-format
+msgid "executing command '%s'\n"
+msgstr "exécution de la commande « %s »\n"
+
+#: commands.cc:252
+#, c-format
+msgid "unknown command '%s'\n"
+msgstr "commande inconnue « %s »\n"
+
+#: commands.cc:299
+#, c-format
+msgid "pid file '%s' already exists"
+msgstr "le fichier pid « %s » existe déjà "
+
+#: commands.cc:323 commands.cc:1275 commands.cc:1355 commands.cc:1720
+#: commands.cc:2674 commands.cc:3362 commands.cc:3582 commands.cc:3619
msgid "informative"
msgstr "information"
-#: ../commands.cc:323
+#: commands.cc:323
msgid "command [ARGS...]"
msgstr "commande [ARGUMENTS...]"
-#: ../commands.cc:323
+#: commands.cc:323
msgid "display command help"
msgstr "afficher l'aide de la commande"
-#: ../commands.cc:382
+#: commands.cc:382
msgid ""
"Enter a description of this change.\n"
"Lines beginning with `MT:' are removed automatically.\n"
@@ -41,11 +495,16 @@
"Saisissez une description pour cette modification.\n"
"Les lignes débutant par « MT: » sont supprimées automatiquement.\n"
-#: ../commands.cc:398
+#: commands.cc:389
+#, c-format
+msgid "edit of log message failed"
+msgstr "l'édition du message du journal a échouée"
+
+#: commands.cc:398
msgid "note: "
msgstr "note : "
-#: ../commands.cc:399
+#: commands.cc:399
#, c-format
msgid ""
"branch '%s' has multiple heads\n"
@@ -54,8 +513,60 @@
"la branche « %s » a plusieurs heads\n"
"vous devriez peut-être lancer « monotone merge »"
-#: ../commands.cc:551
+#: commands.cc:459 commands.cc:715 commands.cc:1374 commands.cc:1446
+#: commands.cc:1831 commands.cc:2721 commands.cc:2736 commands.cc:2739
+#: commands.cc:2937 commands.cc:3601
#, c-format
+msgid "no such revision '%s'"
+msgstr "aucune révision « %s »"
+
+#: commands.cc:466
+#, c-format
+msgid "expanding selection '%s'\n"
+msgstr "expansion de la sélection « %s »\n"
+
+#: commands.cc:474
+#, c-format
+msgid "no match for selection '%s'"
+msgstr "aucune correspondance pour la sélection « %s »"
+
+#: commands.cc:477
+#, c-format
+msgid "selection '%s' has multiple ambiguous expansions: \n"
+msgstr "la sélection « %s » a plusieurs expansions ambigües : \n"
+
+#: commands.cc:484
+#, fuzzy, c-format
+msgid "expanded to '%s'\n"
+msgstr "expansion de la sélection « %s »\n"
+
+#: commands.cc:495
+#, c-format
+msgid "non-hex digits in id"
+msgstr "chiffre non-héxadécimal dans l'id"
+
+#: commands.cc:504
+#, fuzzy, c-format
+msgid "partial id '%s' does not have an expansion"
+msgstr "le fichier rc « %s » n'existe pas"
+
+#: commands.cc:507
+#, fuzzy, c-format
+msgid "partial id '%s' has multiple ambiguous expansions:\n"
+msgstr "le fichier rc « %s » n'existe pas"
+
+#: commands.cc:514
+#, c-format
+msgid "expanded partial id '%s' to '%s'\n"
+msgstr ""
+
+#: commands.cc:541 netsync.cc:1942
+#, c-format
+msgid "no public key '%s' found in database"
+msgstr "aucune clef publique « %s » dans la base de données"
+
+#: commands.cc:551
+#, c-format
msgid ""
"Key : %s\n"
"Sig : %s\n"
@@ -67,192 +578,313 @@
"Nom : %s\n"
"Valeur : %s\n"
-#: ../commands.cc:585
+#: commands.cc:585
msgid "ok"
msgstr "0K"
-#: ../commands.cc:588
+#: commands.cc:588
msgid "bad"
msgstr "mauvais"
-#: ../commands.cc:591
+#: commands.cc:591
msgid "unknown"
msgstr "inconnu"
-#: ../commands.cc:851 ../commands.cc:875 ../commands.cc:912 ../commands.cc:933
-#: ../commands.cc:969
+#: commands.cc:678
+#, c-format
+msgid "(*) - only in %s/"
+msgstr "(*) - uniquement dans %s/"
+
+#: commands.cc:701
+#, c-format
+msgid "no keys found\n"
+msgstr "aucune clef trouvée\n"
+
+#: commands.cc:703
+#, c-format
+msgid "no keys found matching '%s'\n"
+msgstr "aucune clef correspondant à « %s »\n"
+
+#: commands.cc:721
+#, c-format
+msgid "revision %s already has children. We cannot kill it."
+msgstr "la révision %s a déjà des descendants. Impossible de la tuer."
+
+#: commands.cc:851 commands.cc:875 commands.cc:912 commands.cc:933
+#: commands.cc:969
msgid "key and cert"
msgstr "clef et certificat"
-#: ../commands.cc:851 ../commands.cc:875 ../commands.cc:912
+#: commands.cc:851 commands.cc:875 commands.cc:912
msgid "KEYID"
msgstr "IDCLEF"
-#: ../commands.cc:851
+#: commands.cc:851
msgid "generate an RSA key-pair"
msgstr "générer une paire de clefs RSA"
-#: ../commands.cc:875
+#: commands.cc:866
+#, c-format
+msgid "key '%s' already exists"
+msgstr "la clef « %s » existe déjà "
+
+#: commands.cc:869
+#, c-format
+msgid "generating key-pair '%s'"
+msgstr "génératio de la paire de clef « %s »"
+
+#: commands.cc:871
+#, fuzzy, c-format
+msgid "storing key-pair '%s' in %s/"
+msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs\n"
+
+#: commands.cc:875
msgid "drop a public and private key"
msgstr "supprimer une clef publique et privée"
-#: ../commands.cc:913
+#: commands.cc:889
+#, c-format
+msgid "dropping public key '%s' from database\n"
+msgstr "suppression de la clef publique « %s » de la base de données\n"
+
+#: commands.cc:899
+#, fuzzy, c-format
+msgid "dropping key pair '%s' from keystore\n"
+msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs\n"
+
+#: commands.cc:906
+#, fuzzy, c-format
+msgid "public or private key '%s' does not exist in keystore or database"
+msgstr "la clef publique ou privée « %s » n'existe pas dans la base de données"
+
+#: commands.cc:908
+#, fuzzy, c-format
+msgid ""
+"public or private key '%s' does not exist in keystore, and no database was "
+"specified"
+msgstr "la clef publique ou privée « %s » n'existe pas dans la base de données"
+
+#: commands.cc:913
msgid "change passphrase of a private RSA key"
msgstr "changer la phrase de passe pour une clef RSA privée"
-#: ../commands.cc:933
+#: commands.cc:923
+#, fuzzy, c-format
+msgid "key '%s' does not exist in the keystore"
+msgstr "la clef « %s » n'existe pas dans la base de données"
+
+#: commands.cc:930
+#, c-format
+msgid "passphrase changed\n"
+msgstr "la phrase de passe à changée\n"
+
+#: commands.cc:933
#, fuzzy
msgid "REVISION CERTNAME [CERTVAL]"
msgstr "RÃVISION CERTIFICAT "
-#: ../commands.cc:934
+#: commands.cc:934
msgid "create a cert for a revision"
msgstr "créer un certificat pour une révision"
-#: ../commands.cc:969
+#: commands.cc:969
msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
msgstr "RÃVISION NOM VALEUR SIGNATAIRE1 [SIGNATAIRE2 [...]]"
-#: ../commands.cc:970
+#: commands.cc:970
msgid ""
"test whether a hypothetical cert would be trusted\n"
"by current settings"
msgstr ""
-#: ../commands.cc:1012
+#: commands.cc:1003
+#, c-format
+msgid ""
+"if a cert on: %s\n"
+"with key: %s\n"
+"and value: %s\n"
+"was signed by: %s\n"
+"it would be: %s\n"
+msgstr ""
+
+#: commands.cc:1012
msgid "trusted"
msgstr "fiable"
-#: ../commands.cc:1012
+#: commands.cc:1012
msgid "UNtrusted"
msgstr "NON-fiable"
-#: ../commands.cc:1015 ../commands.cc:1028 ../commands.cc:1040
-#: ../commands.cc:1057 ../commands.cc:1103
+#: commands.cc:1015 commands.cc:1028 commands.cc:1040 commands.cc:1057
+#: commands.cc:1103
msgid "review"
msgstr ""
-#: ../commands.cc:1015
+#: commands.cc:1015
msgid "REVISION TAGNAME"
msgstr ""
-#: ../commands.cc:1016
+#: commands.cc:1016
#, fuzzy
msgid "put a symbolic tag cert on a revision version"
msgstr "mettre une certificat-étiquette symbolique"
-#: ../commands.cc:1028
+#: commands.cc:1028
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr ""
-#: ../commands.cc:1029
+#: commands.cc:1029
msgid "note the results of running a test on a revision"
msgstr ""
-#: ../commands.cc:1040 ../commands.cc:1057
+#: commands.cc:1040 commands.cc:1057
msgid "REVISION"
msgstr "RÃVISION"
-#: ../commands.cc:1041
+#: commands.cc:1041
msgid "approve of a particular revision"
msgstr "approuver une révision particulière"
-#: ../commands.cc:1058
+#: commands.cc:1052
+#, c-format
+msgid "need --branch argument for approval"
+msgstr ""
+
+#: commands.cc:1058
msgid "disapprove of a particular revision"
msgstr "désapprouver une révision en particulier"
-#: ../commands.cc:1103
+#: commands.cc:1071
+#, fuzzy, c-format
+msgid "revision '%s' has %d changesets, cannot invert\n"
+msgstr "la révision %s n'existe pas"
+
+#: commands.cc:1075
+#, c-format
+msgid "need --branch argument for disapproval"
+msgstr ""
+
+#: commands.cc:1103
msgid "REVISION [COMMENT]"
msgstr "RÃVISION [COMMENTAIRE]"
-#: ../commands.cc:1104
+#: commands.cc:1104
msgid "comment on a particular revision"
msgstr "commenter une révision en particulier"
-#. static void dump_change_set(string const & name,
-#. change_set & cs)
-#. {
-#. data dat;
-#. write_change_set(cs, dat);
-#. cout << "change set '" << name << "'\n" << dat << endl;
-#. }
-#: ../commands.cc:1129 ../commands.cc:1166 ../commands.cc:1200
-#: ../commands.cc:1332 ../commands.cc:2198 ../commands.cc:2321
-#: ../commands.cc:2882 ../commands.cc:3415
+#: commands.cc:1114
+#, c-format
+msgid "edit comment failed"
+msgstr "l'édition du commentaire a échouée"
+
+#: commands.cc:1117
+#, c-format
+msgid "empty comment"
+msgstr "commentaire vide"
+
+#: commands.cc:1129 commands.cc:1166 commands.cc:1200 commands.cc:1332
+#: commands.cc:2198 commands.cc:2321 commands.cc:2886 commands.cc:3419
msgid "working copy"
msgstr "copie de travail"
-#: ../commands.cc:1129 ../commands.cc:1166 ../commands.cc:1275
-#: ../commands.cc:2321 ../commands.cc:2670 ../commands.cc:3415
+#: commands.cc:1129 commands.cc:1166 commands.cc:1275 commands.cc:2321
+#: commands.cc:2674 commands.cc:3419
msgid "[PATH]..."
msgstr "[CHEMIN]..."
-#: ../commands.cc:1130
+#: commands.cc:1130
msgid "add files to working copy"
msgstr "ajouter des fichiers à la copie de travail"
-#: ../commands.cc:1167
+#: commands.cc:1167
msgid "drop files from working copy"
msgstr "supprimer des fichiers de la copie de travail"
-#: ../commands.cc:1200
+#: commands.cc:1200
msgid "SRC DST"
msgstr "SRC DST"
-#: ../commands.cc:1201
+#: commands.cc:1201
msgid "rename entries in the working copy"
msgstr "renommer des entrées dans la copie de travail"
-#. fload and fmerge are simple commands for debugging the line
-#. merger.
-#: ../commands.cc:1229 ../commands.cc:1242 ../commands.cc:2803
-#: ../commands.cc:2820 ../commands.cc:3495
+#: commands.cc:1229 commands.cc:1242 commands.cc:2807 commands.cc:2824
+#: commands.cc:3502
msgid "debug"
msgstr "debug"
-#: ../commands.cc:1229
+#: commands.cc:1229
msgid "load file contents into db"
msgstr "charger le contenu du fichier dans la base de données"
-#: ../commands.cc:1242
+#: commands.cc:1242
msgid " "
msgstr " "
-#: ../commands.cc:1243
+#: commands.cc:1243
msgid "merge 3 files and output result"
msgstr ""
-#: ../commands.cc:1275
+#: commands.cc:1253
+#, fuzzy, c-format
+msgid "ancestor file id does not exist"
+msgstr "l'id du fichier gauche n'existe pas"
+
+#: commands.cc:1256
+#, c-format
+msgid "left file id does not exist"
+msgstr "l'id du fichier gauche n'existe pas"
+
+#: commands.cc:1259
+#, c-format
+msgid "right file id does not exist"
+msgstr "l'id du fichier droit n'existe pas"
+
+#: commands.cc:1270
+#, c-format
+msgid "merge failed"
+msgstr "la fusion a échouée"
+
+#: commands.cc:1275
msgid "show status of working copy"
msgstr "afficher l'état de la copie de travail"
-#: ../commands.cc:1332
+#: commands.cc:1332
msgid "[PATH]"
msgstr "[CHEMIN]"
-#: ../commands.cc:1333
+#: commands.cc:1333
msgid "calculate identity of PATH or stdin"
msgstr "calculer l'identité du CHEMIN ou de l'entrée standard"
-#: ../commands.cc:1356
+#: commands.cc:1356
msgid "FILENAME"
msgstr "FICHIER"
-#: ../commands.cc:1357
+#: commands.cc:1357
msgid "write file from database to stdout"
msgstr "écrire un fichier de la base de donnée sur la sortie standard"
-#: ../commands.cc:1397 ../commands.cc:1505 ../commands.cc:3158
-#: ../commands.cc:3207 ../commands.cc:3292 ../commands.cc:3299
-#: ../commands.cc:3780
+#: commands.cc:1385
+#, c-format
+msgid "no file '%s' found in revision '%s'\n"
+msgstr "aucun fichier « %s » dans la révision « %s »\n"
+
+#: commands.cc:1389
+#, fuzzy, c-format
+msgid "dumping file '%s'\n"
+msgstr "importation du fichier « %s »\n"
+
+#: commands.cc:1397 commands.cc:1505 commands.cc:3162 commands.cc:3211
+#: commands.cc:3296 commands.cc:3303 commands.cc:3787
msgid "tree"
msgstr "arborescence"
-#: ../commands.cc:1397
+#: commands.cc:1397
msgid "[DIRECTORY]\n"
msgstr "[DOSSIER]\n"
-#: ../commands.cc:1398
+#: commands.cc:1398
msgid ""
"check out a revision from database into directory.\n"
"If a revision is given, that's the one that will be checked out.\n"
@@ -260,16 +892,88 @@
"If no directory is given, the branch name will be used as directory"
msgstr ""
"récupère une révision depuis une base de données dans un dossier. Si une\n"
-"révision est spécifiée, c'est celle-ci qui sera récupérée. Sinon, il s'agira\n"
+"révision est spécifiée, c'est celle-ci qui sera récupérée. Sinon, il "
+"s'agira\n"
"que la versionde de tête (spécifiée ou implicite).\n"
"Si aucun nom de dossier n'est fourni, le nom de la branche sera utilisé\n"
"comme nom de dossier"
-#: ../commands.cc:1505
+#: commands.cc:1415 commands.cc:1434
+#, c-format
+msgid "need --branch argument for branch-based checkout"
+msgstr ""
+
+#: commands.cc:1428
+#, fuzzy, c-format
+msgid "checkout directory '%s' already exists"
+msgstr "le fichier pid « %s » existe déjà "
+
+#: commands.cc:1437 commands.cc:1518 commands.cc:3175 commands.cc:3245
+#: commands.cc:3248
+#, c-format
+msgid "branch '%s' is empty\n"
+msgstr "la branche « %s » est vide\n"
+
+#: commands.cc:1438
+#, fuzzy, c-format
+msgid "branch %s has multiple heads"
+msgstr "la branche %s a %d entrées\n"
+
+#: commands.cc:1459
+#, fuzzy, c-format
+msgid "found %d %s branch certs on revision %s\n"
+msgstr "mise à jour vers la révision de base %s\n"
+
+#: commands.cc:1464
+#, c-format
+msgid "revision %s is not a member of branch %s\n"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
+
+#: commands.cc:1480
+#, fuzzy, c-format
+msgid "no manifest %s found in database"
+msgstr "aucune clef publique « %s » dans la base de données"
+
+#: commands.cc:1482
+#, fuzzy, c-format
+msgid "checking out revision %s to directory %s\n"
+msgstr "vérification de la révisions %s\n"
+
+#: commands.cc:1488
+#, fuzzy, c-format
+msgid "no file %s found in database for %s"
+msgstr "aucune clef publique « %s » dans la base de données"
+
+#: commands.cc:1492 commands.cc:3489
+#, fuzzy, c-format
+msgid "writing file %s to %s\n"
+msgstr "déplacement du fichier %s -> %s\n"
+
+#: commands.cc:1505
msgid "show unmerged head revisions of branch"
msgstr ""
-#: ../commands.cc:1721
+#: commands.cc:1513 commands.cc:3171
+#, c-format
+msgid "please specify a branch, with --branch=BRANCH"
+msgstr "veuillez préciser une branche avec --branch=BRANCHE"
+
+#: commands.cc:1520
+#, c-format
+msgid "branch '%s' is currently merged:\n"
+msgstr "la branche « %s » est actuellement fusionnée :\n"
+
+#: commands.cc:1522
+#, c-format
+msgid "branch '%s' is currently unmerged:\n"
+msgstr "la branche « %s » n'est actuellement pas fusionnée :\n"
+
+#: commands.cc:1561
+#, fuzzy, c-format
+msgid "no epoch for branch %s\n"
+msgstr "%s n'est pas dans la branche %s\n"
+
+#: commands.cc:1721
msgid ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -283,103 +987,206 @@
"missing"
msgstr ""
-#: ../commands.cc:1731
+#: commands.cc:1731
msgid ""
"show database objects, or the current working copy manifest,\n"
"or unknown, intentionally ignored, or missing state files"
msgstr ""
-#: ../commands.cc:1768 ../commands.cc:1794 ../commands.cc:1818
-#: ../commands.cc:1836 ../commands.cc:1855 ../commands.cc:1874
-#: ../commands.cc:1892 ../commands.cc:1920 ../commands.cc:1938
+#: commands.cc:1768 commands.cc:1794 commands.cc:1818 commands.cc:1836
+#: commands.cc:1855 commands.cc:1874 commands.cc:1892 commands.cc:1920
+#: commands.cc:1938
msgid "packet i/o"
msgstr ""
-#: ../commands.cc:1768 ../commands.cc:1794
+#: commands.cc:1768 commands.cc:1794
msgid "OLDID NEWID"
msgstr ""
-#: ../commands.cc:1769
+#: commands.cc:1769
msgid "write manifest delta packet to stdout"
msgstr ""
-#: ../commands.cc:1795
+#: commands.cc:1783 commands.cc:1785 commands.cc:1849
+#, c-format
+msgid "no such manifest '%s'"
+msgstr "aucun manifeste « %s »"
+
+#: commands.cc:1795
msgid "write file delta packet to stdout"
msgstr ""
-#: ../commands.cc:1818 ../commands.cc:1836 ../commands.cc:1855
-#: ../commands.cc:1874 ../commands.cc:1892 ../commands.cc:1920
+#: commands.cc:1809 commands.cc:1811 commands.cc:1868 commands.cc:2219
+#, c-format
+msgid "no such file '%s'"
+msgstr "aucun fichier « %s »"
+
+#: commands.cc:1818 commands.cc:1836 commands.cc:1855 commands.cc:1874
+#: commands.cc:1892 commands.cc:1920
msgid "ID"
msgstr "ID"
-#: ../commands.cc:1818
+#: commands.cc:1818
msgid "write revision data packet to stdout"
msgstr ""
-#: ../commands.cc:1836
+#: commands.cc:1836
msgid "write manifest data packet to stdout"
msgstr ""
-#: ../commands.cc:1855
+#: commands.cc:1855
msgid "write file data packet to stdout"
msgstr ""
-#: ../commands.cc:1874
+#: commands.cc:1874
msgid "write cert packets to stdout"
msgstr ""
-#: ../commands.cc:1892
+#: commands.cc:1892
msgid "write public key packet to stdout"
msgstr ""
-#: ../commands.cc:1920
+#: commands.cc:1914
+#, fuzzy, c-format
+msgid "public key '%s' does not exist"
+msgstr "le fichier rc « %s » n'existe pas"
+
+#: commands.cc:1920
msgid "write private key packet to stdout"
msgstr ""
-#: ../commands.cc:1939
+#: commands.cc:1928
+#, fuzzy, c-format
+msgid "public and private key '%s' do not exist in keystore"
+msgstr "la clef publique ou privée « %s » n'existe pas dans la base de données"
+
+#: commands.cc:1939
msgid "read packets from files or stdin"
msgstr "lecture des paquets depuis des fichiers ou l'entrée standard"
-#: ../commands.cc:1966 ../commands.cc:2060 ../commands.cc:2075
-#: ../commands.cc:2089 ../commands.cc:2104
+#: commands.cc:1947
+#, c-format
+msgid "no packets found on stdin"
+msgstr "aucun paquet trouvé sur l'entrée standard"
+
+#: commands.cc:1958
+#, c-format
+msgid "no packets found in given file"
+msgid_plural "no packets found in given files"
+msgstr[0] "aucun paquet trouvé dans le fichier spécifié"
+msgstr[1] "aucun paquet trouvé dans les fichiers spécifiés"
+
+#: commands.cc:1962
+#, c-format
+msgid "read %d packet"
+msgid_plural "read %d packets"
+msgstr[0] "lu %d paquet"
+msgstr[1] "lu %d paquets"
+
+#: commands.cc:1966 commands.cc:2060 commands.cc:2075 commands.cc:2089
+#: commands.cc:2104
msgid "network"
msgstr "réseau"
-#: ../commands.cc:1967
+#: commands.cc:1967
msgid "rebuild the indices used to sync over the network"
msgstr ""
"reconstruction des index utilisés pour la synchronisation par le réseau"
-#: ../commands.cc:2060 ../commands.cc:2075 ../commands.cc:2089
+#: commands.cc:2004
+#, fuzzy, c-format
+msgid "setting default server to %s\n"
+msgstr "utilisation de l'adresse par défaut du serveur : %s\n"
+
+#: commands.cc:2010
+#, c-format
+msgid "no hostname given"
+msgstr "aucun nom d'hôte fourni"
+
+#: commands.cc:2012
+#, c-format
+msgid "no server given and no default server set"
+msgstr ""
+
+#: commands.cc:2016
+#, c-format
+msgid "using default server address: %s\n"
+msgstr "utilisation de l'adresse par défaut du serveur : %s\n"
+
+#: commands.cc:2030
+#, c-format
+msgid "setting default branch include pattern to '%s'\n"
+msgstr ""
+
+#: commands.cc:2036
+#, c-format
+msgid "setting default branch exclude pattern to '%s'\n"
+msgstr ""
+
+#: commands.cc:2042
+#, fuzzy, c-format
+msgid "no branch pattern given"
+msgstr "aucune phrase de passe fournie"
+
+#: commands.cc:2044
+#, c-format
+msgid "no branch pattern given and no default pattern set"
+msgstr ""
+
+#: commands.cc:2048
+#, fuzzy, c-format
+msgid "using default branch include pattern: '%s'\n"
+msgstr "utilisation de l'adresse par défaut du serveur : %s\n"
+
+#: commands.cc:2056
+#, fuzzy, c-format
+msgid "excluding: %s\n"
+msgstr "inclusion de la branche %s"
+
+#: commands.cc:2060 commands.cc:2075 commands.cc:2089
msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
msgstr "[ADRESSE[:PORT] [MOTIF]]"
-#: ../commands.cc:2061
+#: commands.cc:2061
msgid "push branches matching PATTERN to netsync server at ADDRESS"
msgstr ""
"envoie les branches correspondant au MOTIF au serveur netsync à l'ADRESSE"
-#: ../commands.cc:2076
+#: commands.cc:2076
msgid "pull branches matching PATTERN from netsync server at ADDRESS"
msgstr ""
-#: ../commands.cc:2090
+#: commands.cc:2083
+#, c-format
+msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
+msgstr ""
+"récupération anonyme; utilisez -kNOMCLEF si vous avez besoin d'une "
+"authentification\n"
+
+#: commands.cc:2090
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
msgstr ""
-#: ../commands.cc:2104
+#: commands.cc:2104
msgid "PATTERN ..."
msgstr "CHEMIN ..."
-#: ../commands.cc:2105
+#: commands.cc:2105
msgid "serve the branches specified by PATTERNs to connecting clients"
-msgstr "servir les branches spécifiées par les MOTIFs aux clients qui se connectent"
+msgstr ""
+"servir les branches spécifiées par les MOTIFs aux clients qui se connectent"
-#: ../commands.cc:2130
+#: commands.cc:2118
+#, c-format
+msgid ""
+"need permission to store persistent passphrase (see hook persist_phrase_ok())"
+msgstr ""
+
+#: commands.cc:2130
msgid "database"
msgstr "base de données"
-#: ../commands.cc:2131
+#: commands.cc:2131
msgid ""
"init\n"
"info\n"
@@ -397,80 +1204,355 @@
"set_epoch BRANCH EPOCH\n"
msgstr ""
-#: ../commands.cc:2145
+#: commands.cc:2145
msgid "manipulate database state"
msgstr "manipule l'état de la base de données"
-#: ../commands.cc:2198
+#: commands.cc:2198
msgid ""
"set FILE ATTR VALUE\n"
"get FILE [ATTR]\n"
"drop FILE"
msgstr ""
-#: ../commands.cc:2199
+#: commands.cc:2199
msgid "set, get or drop file attributes"
msgstr ""
-#: ../commands.cc:2322
+#: commands.cc:2287 work.cc:113
+#, fuzzy, c-format
+msgid "registering %s file in working copy\n"
+msgstr "renommer des entrées dans la copie de travail"
+
+#: commands.cc:2316
+#, fuzzy, c-format
+msgid "failed to parse date string '%s': %s"
+msgstr "impossible de créer le dossier : %s : %s\n"
+
+#: commands.cc:2322
msgid "commit working copy to database"
msgstr ""
-#: ../commands.cc:2671
+#: commands.cc:2340
+#, c-format
+msgid "no changes to commit\n"
+msgstr "aucun changement à valider\n"
+
+#: commands.cc:2354
+#, fuzzy, c-format
+msgid "beginning commit on branch '%s'\n"
+msgstr "début du service sur %s : %d\n"
+
+#: commands.cc:2355
+#, c-format
msgid ""
+"new manifest '%s'\n"
+"new revision '%s'\n"
+msgstr ""
+"nouveau manifeste « %s »\n"
+"nouvelle révision « %s »\n"
+
+#: commands.cc:2362
+#, c-format
+msgid "--message and --message-file are mutually exclusive"
+msgstr "--message et --message-file sont mutuellement exclusifs"
+
+#: commands.cc:2365
+#, fuzzy, c-format
+msgid ""
+"MT/log is non-empty and --message supplied\n"
+"perhaps move or delete MT/log,\n"
+"or remove --message from the command line?"
+msgstr "MT/log n'est pas vide et --message-file a été passé\n"
+
+#: commands.cc:2370
+#, fuzzy, c-format
+msgid ""
+"MT/log is non-empty and --message-file supplied\n"
+"perhaps move or delete MT/log,\n"
+"or remove --message-file from the command line?"
+msgstr "MT/log n'est pas vide et --message-file a été passé\n"
+
+#: commands.cc:2388
+#, fuzzy, c-format
+msgid "empty log message; commit canceled"
+msgstr "message du journal vide"
+
+#: commands.cc:2400
+#, c-format
+msgid "revision %s already in database\n"
+msgstr "la révision %s est déjà dans la base de données\n"
+
+#: commands.cc:2405
+#, c-format
+msgid "inserting new revision %s\n"
+msgstr "insertion de la nouvelle révision %s\n"
+
+#: commands.cc:2414
+#, fuzzy, c-format
+msgid "skipping manifest %s, already in database\n"
+msgstr "la révision %s est déjà dans la base de données\n"
+
+#: commands.cc:2418
+#, fuzzy, c-format
+msgid "inserting manifest delta %s -> %s\n"
+msgstr "erreur lors de l'analyse du manifeste %s : %s"
+
+#: commands.cc:2429
+#, fuzzy, c-format
+msgid "inserting full manifest %s\n"
+msgstr "vérification du manifeste « %s »\n"
+
+#: commands.cc:2442
+#, fuzzy, c-format
+msgid "skipping file delta %s, already in database\n"
+msgstr "la révision %s est déjà dans la base de données\n"
+
+#: commands.cc:2448
+#, fuzzy, c-format
+msgid "inserting delta %s -> %s\n"
+msgstr "insertion de la nouvelle révision %s\n"
+
+#: commands.cc:2458 commands.cc:2475
+#, c-format
+msgid "file '%s' modified during commit, aborting"
+msgstr "le fichier « %s » a été modifié pendant le commit, interruption"
+
+#: commands.cc:2468
+#, fuzzy, c-format
+msgid "inserting full version %s\n"
+msgstr "insertion de la nouvelle révision %s\n"
+
+#: commands.cc:2502
+#, fuzzy, c-format
+msgid "committed revision %s\n"
+msgstr "erreur réseau : %s"
+
+#: commands.cc:2508
+#, c-format
+msgid ""
+"note: this revision creates divergence\n"
+"note: you may (or may not) wish to run 'monotone merge'"
+msgstr ""
+
+#: commands.cc:2675
+msgid ""
"show current diffs on stdout.\n"
"If one revision is given, the diff between the working directory and\n"
"that revision is shown. If two revisions are given, the diff between\n"
"them is given. If no format is specified, unified is used by default."
msgstr ""
-#: ../commands.cc:2803 ../commands.cc:2820
+#: commands.cc:2691
+#, c-format
+msgid ""
+"--diff-args requires --external\n"
+"try adding --external or removing --diff-args?"
+msgstr ""
+"--diff-args requiet --external\n"
+"essayez d'ajouter --external ou de retirer --diff-args ?"
+
+#: commands.cc:2725
+#, c-format
+msgid "current revision has no ancestor"
+msgstr "la révision actuelle n'existe pas"
+
+#: commands.cc:2764
+#, c-format
+msgid "no common ancestor for %s and %s"
+msgstr "pas d'ancêtre commun pour %s et %s"
+
+#: commands.cc:2770
+#, c-format
+msgid "concatenating un-committed changeset to composite\n"
+msgstr ""
+
+#: commands.cc:2807 commands.cc:2824
msgid "LEFT RIGHT"
msgstr "GAUCHE DROITE"
-#: ../commands.cc:2803
+#: commands.cc:2807
#, fuzzy
msgid "print least common ancestor"
msgstr "l'ancêtre commun est %s\n"
-#: ../commands.cc:2816
+#: commands.cc:2820
msgid "no common ancestor found"
msgstr "aucun ancêtre commun n'a été trouvé"
-#: ../commands.cc:2820
+#: commands.cc:2824
msgid "print least common ancestor / dominator"
msgstr ""
-#: ../commands.cc:2834
+#: commands.cc:2838
#, fuzzy
msgid "no common ancestor/dominator found"
msgstr "l'ancêtre commun est %s\n"
-#: ../commands.cc:2883
+#: commands.cc:2863
+#, fuzzy, c-format
+msgid "updating %s to %s"
+msgstr "mise à jour de %s en %s\n"
+
+#: commands.cc:2887
msgid ""
"update working copy.\n"
"If a revision is given, base the update on that revision. If not,\n"
"base the update on the head of the branch (given or implicit)."
msgstr ""
-#: ../commands.cc:3158
+#: commands.cc:2912
+#, c-format
+msgid "this working directory is a new project; cannot update"
+msgstr ""
+"ce dossier de travail est un nouveau projet, impossible de mettre à jour"
+
+#: commands.cc:2919
+#, c-format
+msgid ""
+"your request matches no descendents of the current revision\n"
+"in fact, it doesn't even match the current revision\n"
+"maybe you want --revision="
+msgstr ""
+
+#: commands.cc:2924
+#, c-format
+msgid "multiple update candidates:\n"
+msgstr "plusieurs candidats pour la mise à jour :\n"
+
+#: commands.cc:2928
+#, c-format
+msgid "choose one with 'monotone update -r'\n"
+msgstr "choisissez en un avec « monotone update -r »\n"
+
+#: commands.cc:2929
+#, c-format
+msgid "multiple candidates remain after selection"
+msgstr ""
+
+#: commands.cc:2944
+#, c-format
+msgid "already up to date at %s\n"
+msgstr "déjà à jour en %s\n"
+
+#: commands.cc:2952
+#, c-format
+msgid "selected update target %s\n"
+msgstr "sélection de la cible %s pour la mise à jour\n"
+
+#: commands.cc:2964
+#, fuzzy, c-format
+msgid ""
+"revision %s is not a member of branch %s\n"
+"try again with explicit --branch\n"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
+
+#: commands.cc:2979
+#, c-format
+msgid "updating along chosen edge %s -> %s\n"
+msgstr ""
+
+#: commands.cc:2990
+#, fuzzy, c-format
+msgid "merging working copy with chosen edge %s -> %s\n"
+msgstr "création d'une copie de travail dans %s\n"
+
+#: commands.cc:3039
+#, c-format
+msgid "updated to base revision %s\n"
+msgstr "mise à jour vers la révision de base %s\n"
+
+#: commands.cc:3105
+#, fuzzy, c-format
+msgid ""
+"common ancestor %s found\n"
+"trying 3-way merge\n"
+msgstr "aucun ancêtre commun n'a été trouvé"
+
+#: commands.cc:3116
+#, fuzzy, c-format
+msgid "no common ancestor found, synthesizing edges\n"
+msgstr "aucun ancêtre commun n'a été trouvé"
+
+#: commands.cc:3162
#, fuzzy
msgid "merge unmerged heads of branch"
msgstr "fusionne les"
-#: ../commands.cc:3207
+#: commands.cc:3176
+#, c-format
+msgid "branch '%s' is merged\n"
+msgstr "la branche « %s » est fusionnée\n"
+
+#: commands.cc:3182
+#, fuzzy, c-format
+msgid "starting with revision 1 / %d\n"
+msgstr "insertion de la nouvelle révision %s\n"
+
+#: commands.cc:3186
+#, fuzzy, c-format
+msgid "merging with revision %d / %d\n"
+msgstr "insertion de la nouvelle révision %s\n"
+
+#: commands.cc:3187 commands.cc:3188 commands.cc:3255 commands.cc:3339
+#: commands.cc:3340
+#, c-format
+msgid "[source] %s\n"
+msgstr "[source] %s\n"
+
+#: commands.cc:3205 commands.cc:3292 commands.cc:3359
+#, c-format
+msgid "[merged] %s\n"
+msgstr "[fusionné] %s\n"
+
+#: commands.cc:3208
+#, c-format
+msgid "note: your working copies have not been updated\n"
+msgstr ""
+
+#: commands.cc:3211
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr ""
-#: ../commands.cc:3208
+#: commands.cc:3212
msgid "merge from one branch to another asymmetrically"
msgstr ""
-#: ../commands.cc:3292
+#: commands.cc:3246 commands.cc:3249
+#, c-format
+msgid "branch '%s' is not merged\n"
+msgstr "la branche « %s » n'est pas fusionnée\n"
+
+#: commands.cc:3254
+#, fuzzy, c-format
+msgid "propagating %s -> %s\n"
+msgstr "mise à jour de %s en %s\n"
+
+#: commands.cc:3256
+#, c-format
+msgid "[target] %s\n"
+msgstr "[cible] %s\n"
+
+#: commands.cc:3261
+#, c-format
+msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
+msgstr ""
+
+#: commands.cc:3263
+#, c-format
+msgid "no action taken\n"
+msgstr ""
+
+#: commands.cc:3267
+#, c-format
+msgid "no merge necessary; putting %s in branch '%s'\n"
+msgstr ""
+
+#: commands.cc:3296
msgid "refresh the inodeprint cache"
msgstr "rafraîchir le cache d'inodeprint"
-#: ../commands.cc:3300
+#: commands.cc:3304
msgid ""
"LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n"
"LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH"
@@ -478,76 +1560,152 @@
"RÃVISION-GAUCHE RÃVISION-DROITE BRANCHE-DESTINATION\n"
"RÃVISION GAUCHE RÃVISION DROITE ANCÃTRE-COMMUN BRANCHE-DESTINATION"
-#: ../commands.cc:3302
+#: commands.cc:3306
msgid "merge two explicitly given revisions, placing result in given branch"
msgstr ""
-#: ../commands.cc:3358
+#: commands.cc:3321 commands.cc:3323
+#, c-format
+msgid "%s is not an ancestor of %s"
+msgstr "%s n'est pas un ancêtre de %s"
+
+#: commands.cc:3332
+#, c-format
+msgid "%s and %s are the same revision, aborting"
+msgstr ""
+
+#: commands.cc:3334 commands.cc:3336
+#, c-format
+msgid "%s is already an ancestor of %s"
+msgstr "%s est déjà un ancêtre de %s"
+
+#: commands.cc:3362
msgid "(revision|manifest|file|key) PARTIAL-ID"
msgstr ""
-#: ../commands.cc:3359
+#: commands.cc:3363
msgid "complete partial id"
msgstr ""
-#: ../commands.cc:3416
-msgid "revert file(s), dir(s) or entire working copy"
+#: commands.cc:3372
+#, fuzzy, c-format
+msgid "non-hex digits in partial id"
+msgstr "chiffre non-héxadécimal dans l'id"
+
+#: commands.cc:3420
+msgid "revert file(s), dir(s) or entire working copy (\".\")"
msgstr ""
-#: ../commands.cc:3495
+#: commands.cc:3448
+#, c-format
+msgid "revert adding find_missing entries to %d original args elements\n"
+msgstr ""
+
+#: commands.cc:3457
+#, c-format
+msgid ""
+"after adding everything from find_missing, revert args_copy has %d elements\n"
+msgstr ""
+
+#: commands.cc:3481
+#, fuzzy, c-format
+msgid "reverting %s to %s"
+msgstr "mise à jour de %s en %s\n"
+
+#: commands.cc:3485
+#, fuzzy, c-format
+msgid "no file version %s found in database for %s"
+msgstr "aucune clef publique « %s » dans la base de données"
+
+#: commands.cc:3502
msgid "RCSFILE..."
msgstr ""
-#: ../commands.cc:3496
+#: commands.cc:3503
msgid ""
"parse versions in RCS files\n"
"this command doesn't reconstruct or import revisions.you probably want "
"cvs_import"
msgstr ""
-#: ../commands.cc:3512
+#: commands.cc:3519
msgid "rcs"
msgstr ""
-#: ../commands.cc:3512
+#: commands.cc:3519
msgid "CVSROOT"
msgstr ""
-#: ../commands.cc:3512
+#: commands.cc:3519
msgid "import all versions in CVS repository"
msgstr ""
-#: ../commands.cc:3575
+#: commands.cc:3582
msgid "PATH"
msgstr "CHEMIN"
-#: ../commands.cc:3576
+#: commands.cc:3583
msgid "print annotated copy of the file from REVISION"
msgstr ""
-#: ../commands.cc:3612
+#: commands.cc:3600
+#, fuzzy, c-format
+msgid "no revision for file '%s' in database"
+msgstr "la révision %s est déjà dans la base de données\n"
+
+#: commands.cc:3603
+#, fuzzy, c-format
+msgid "annotate file file_path '%s'\n"
+msgstr "Impossible de trouver la clef « %s »"
+
+#: commands.cc:3612
+#, c-format
+msgid "no such file '%s' in revision '%s'\n"
+msgstr "aucun fichier « %s » dans la révision « %s »\n"
+
+#: commands.cc:3614
+#, c-format
+msgid "annotate for file_id %s\n"
+msgstr ""
+
+#: commands.cc:3619
msgid "[FILE]"
msgstr "[FICHIER]"
-#: ../commands.cc:3613
+#: commands.cc:3620
msgid ""
"print history in reverse order (filtering by 'FILE'). If one or more\n"
"revisions are given, use them as a starting point."
msgstr ""
-#: ../commands.cc:3780
+#: commands.cc:3680
+#, fuzzy, c-format
+msgid "revision %s does not exist in db, skipping\n"
+msgstr "la révision de base %s n'existe pas dans la base de données\n"
+
+#: commands.cc:3713
+#, fuzzy, c-format
+msgid "revision '%s' in '%s' maps to '%s' in %s\n"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
+
+#: commands.cc:3787
msgid "DIRECTORY"
msgstr "DOSSIER"
-#: ../commands.cc:3780
+#: commands.cc:3787
msgid "setup a new working copy directory"
msgstr "préparer un dossier pour une nouvelle copie de travail"
-#: ../commands.cc:3795
+#: commands.cc:3793
+#, c-format
+msgid "need --branch argument for setup"
+msgstr ""
+
+#: commands.cc:3802
msgid "automation"
msgstr "automatisation"
-#: ../commands.cc:3796
+#: commands.cc:3803
msgid ""
"interface_version\n"
"heads [BRANCH]\n"
@@ -571,1453 +1729,3390 @@
"keys\n"
msgstr ""
-#: ../commands.cc:3816
+#: commands.cc:3823
msgid "automation interface"
msgstr "interface d'automatisation"
-#: ../commands.cc:3830 ../commands.cc:3846
+#: commands.cc:3837 commands.cc:3853
msgid "vars"
msgstr "variables"
-#: ../commands.cc:3830
+#: commands.cc:3837
msgid "DOMAIN NAME VALUE"
msgstr "DOMAINE NOM VALEUR"
-#: ../commands.cc:3831
+#: commands.cc:3838
msgid "set the database variable NAME to VALUE, in domain DOMAIN"
msgstr ""
-#: ../commands.cc:3846
+#: commands.cc:3853
msgid "DOMAIN NAME"
msgstr "DOMAINE NOM VALEUR"
-#: ../commands.cc:3847
+#: commands.cc:3854
msgid "remove the database variable NAME in domain DOMAIN"
msgstr ""
-#: ../database_check.cc:111
+#: commands.cc:3865
+#, c-format
+msgid "no var with name %s in domain %s"
+msgstr ""
+
+#: database_check.cc:109
+#, fuzzy, c-format
+msgid "checking %d files\n"
+msgstr "la vérification de « %s » a échouée"
+
+#: database_check.cc:111
msgid "files"
msgstr "fichiers"
-#: ../database_check.cc:136 ../rcs_import.cc:1258
+#: database_check.cc:116
+#, fuzzy, c-format
+msgid "checking file %s\n"
+msgstr "importation du fichier « %s »\n"
+
+#: database_check.cc:134
+#, fuzzy, c-format
+msgid "checking %d manifests\n"
+msgstr "vérification du manifeste « %s »\n"
+
+#: database_check.cc:136 rcs_import.cc:1258
msgid "manifests"
msgstr "manifestes"
-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../database_check.cc:192 ../database_check.cc:380 ../netsync.cc:3497
-#: ../rcs_import.cc:1257
+#: database_check.cc:141
+#, c-format
+msgid "checking manifest %s\n"
+msgstr "vérification du manifeste « %s »\n"
+
+#: database_check.cc:153
+#, c-format
+msgid "error parsing manifest %s: %s"
+msgstr "erreur lors de l'analyse du manifeste %s : %s"
+
+#: database_check.cc:190
+#, c-format
+msgid "checking %d revisions\n"
+msgstr "verification de %d révisions\n"
+
+#: database_check.cc:192 database_check.cc:380 netsync.cc:3497
+#: rcs_import.cc:1257
msgid "revisions"
msgstr "révisions"
-#: ../database_check.cc:291
+#: database_check.cc:197
+#, c-format
+msgid "checking revision %s\n"
+msgstr "vérification de la révisions %s\n"
+
+#: database_check.cc:209
+#, fuzzy, c-format
+msgid "error parsing revision %s: %s"
+msgstr "erreur lors de la lecture du fichier RCS %s : %s\n"
+
+#: database_check.cc:277
+#, fuzzy, c-format
+msgid "checked %d revisions after starting with %d\n"
+msgstr "insertion de la nouvelle révision %s\n"
+
+#: database_check.cc:289
+#, fuzzy, c-format
+msgid "checking %d ancestry edges\n"
+msgstr "vérification du manifeste « %s »\n"
+
+#: database_check.cc:291
msgid "ancestry"
msgstr "ancêtre"
-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../database_check.cc:324 ../netsync.cc:3501
+#: database_check.cc:322
+#, c-format
+msgid "checking %d public keys\n"
+msgstr "vérification de %d clefs publiques\n"
+
+#: database_check.cc:324 netsync.cc:3501
msgid "keys"
msgstr "clefs"
-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../database_check.cc:350 ../netsync.cc:3499
+#: database_check.cc:348
+#, fuzzy, c-format
+msgid "checking %d revision certs\n"
+msgstr "insertion de la nouvelle révision %s\n"
+
+#: database_check.cc:350 netsync.cc:3499
msgid "certs"
msgstr "certs"
-#: ../database.cc:185
+#: database_check.cc:378
+#, fuzzy, c-format
+msgid "checking local history of %d revisions\n"
+msgstr "verification de %d révisions\n"
+
+#: database_check.cc:413
+#, fuzzy, c-format
+msgid "file %s missing (%d manifest references)\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
+
+#: database_check.cc:420
+#, c-format
+msgid "file %s unreferenced\n"
+msgstr "fichier %s non-référencé\n"
+
+#: database_check.cc:442
+#, fuzzy, c-format
+msgid "manifest %s missing (%d revision references)\n"
+msgstr "insertion de la nouvelle révision %s\n"
+
+#: database_check.cc:449
+#, fuzzy, c-format
+msgid "manifest %s unreferenced\n"
+msgstr "fichier %s non-référencé\n"
+
+#: database_check.cc:455
+#, c-format
+msgid "manifest %s incomplete (%d missing files)\n"
+msgstr ""
+
+#: database_check.cc:462
+#, c-format
+msgid "manifest %s is not parseable (perhaps with unnormalized paths?)\n"
+msgstr ""
+
+#: database_check.cc:469
+#, fuzzy, c-format
+msgid "manifest %s is not in normalized form\n"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
+
+#: database_check.cc:493
+#, c-format
+msgid "revision %s missing (%d revision references; %d cert references)\n"
+msgstr ""
+
+#: database_check.cc:500
+#, fuzzy, c-format
+msgid "revision %s incomplete (%d missing manifests)\n"
+msgstr "%d manifestes incomplets\n"
+
+#: database_check.cc:507
+#, fuzzy, c-format
+msgid "revision %s incomplete (%d missing revisions)\n"
+msgstr "nouvelle révisions %s\n"
+
+#: database_check.cc:514
+#, fuzzy, c-format
+msgid "revision %s incomplete (%d incomplete manifests)\n"
+msgstr "%d manifestes incomplets\n"
+
+#: database_check.cc:521
+#, c-format
+msgid ""
+"revision %s mismatched parents (%d ancestry parents; %d revision refs)\n"
+msgstr ""
+
+#: database_check.cc:530
+#, c-format
+msgid "revision %s mismatched children (%d ancestry children; %d parents)\n"
+msgstr ""
+
+#: database_check.cc:542
+#, fuzzy, c-format
+msgid "revision %s has bad history (%s)\n"
+msgstr "la révision %s est déjà dans la base de données\n"
+
+#: database_check.cc:549
+#, fuzzy, c-format
+msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
+
+#: database_check.cc:556
+#, fuzzy, c-format
+msgid "revision %s is not in normalized form\n"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
+
+#: database_check.cc:573
+#, fuzzy, c-format
+msgid "key %s signed %d certs\n"
+msgstr "clef et certificat"
+
+#: database_check.cc:580
+#, fuzzy, c-format
+msgid "key %s missing (signed %d certs)\n"
+msgstr "clef et certificat"
+
+#: database_check.cc:613
+#, c-format
+msgid "revision %s unchecked signature in %s cert from missing key %s\n"
+msgstr ""
+
+#: database_check.cc:621
+#, fuzzy, c-format
+msgid "revision %s bad signature in %s cert from key %s\n"
+msgstr "la révision %s est déjà dans la base de données\n"
+
+#: database_check.cc:636
+#, fuzzy, c-format
+msgid "revision %s missing %s cert\n"
+msgstr "%d certificats manquants\n"
+
+#: database_check.cc:645
+#, c-format
+msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)\n"
+msgstr ""
+
+#: database_check.cc:717
+#, fuzzy, c-format
+msgid "%d missing files\n"
+msgstr "importation du fichier « %s »\n"
+
+#: database_check.cc:719
+#, c-format
+msgid "%d unreferenced files\n"
+msgstr "%d fichiers non-référencés\n"
+
+#: database_check.cc:722
+#, fuzzy, c-format
+msgid "%d missing manifests\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
+
+#: database_check.cc:724
+#, c-format
+msgid "%d unreferenced manifests\n"
+msgstr "%d manifestes non-référencés\n"
+
+#: database_check.cc:726
+#, c-format
+msgid "%d incomplete manifests\n"
+msgstr "%d manifestes incomplets\n"
+
+#: database_check.cc:728
+#, c-format
+msgid "%d manifests not parseable (perhaps with invalid paths)\n"
+msgstr ""
+
+#: database_check.cc:731
+#, fuzzy, c-format
+msgid "%d manifests not in normalized form\n"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
+
+#: database_check.cc:734
+#, fuzzy, c-format
+msgid "%d missing revisions\n"
+msgstr "insertion de la nouvelle révision %s\n"
+
+#: database_check.cc:736
+#, fuzzy, c-format
+msgid "%d incomplete revisions\n"
+msgstr "nouvelle révisions %s\n"
+
+#: database_check.cc:738
+#, fuzzy, c-format
+msgid "%d mismatched parents\n"
+msgstr "%d"
+
+#: database_check.cc:740
+#, fuzzy, c-format
+msgid "%d mismatched children\n"
+msgstr "%d"
+
+#: database_check.cc:742
+#, fuzzy, c-format
+msgid "%d revisions with bad history\n"
+msgstr "la révision %s est déjà dans la base de données\n"
+
+#: database_check.cc:744
+#, c-format
+msgid "%d revisions not parseable (perhaps with invalid paths)\n"
+msgstr ""
+
+#: database_check.cc:747
+#, fuzzy, c-format
+msgid "%d revisions not in normalized form\n"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
+
+#: database_check.cc:750
+#, c-format
+msgid "%d missing keys\n"
+msgstr "%d clefs manquantes\n"
+
+#: database_check.cc:753
+#, c-format
+msgid "%d missing certs\n"
+msgstr "%d certificats manquants\n"
+
+#: database_check.cc:755
+#, fuzzy, c-format
+msgid "%d mismatched certs\n"
+msgstr "%d"
+
+#: database_check.cc:757
+#, c-format
+msgid "%d unchecked signatures due to missing keys\n"
+msgstr ""
+
+#: database_check.cc:759
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d mauvaises signatures\n"
+
+#: database_check.cc:784
+#, c-format
+msgid ""
+"check complete: %d files; %d manifests; %d revisions; %d keys; %d certs\n"
+msgstr ""
+
+#: database_check.cc:790
+#, fuzzy, c-format
+msgid "total problems detected: %d (%d serious)\n"
+msgstr "problèmes mineurs détectés\n"
+
+#: database_check.cc:792
+#, c-format
+msgid "serious problems detected"
+msgstr "problèmes sérieux détectés"
+
+#: database_check.cc:794
+#, c-format
+msgid "minor problems detected\n"
+msgstr "problèmes mineurs détectés\n"
+
+#: database_check.cc:796
+#, c-format
+msgid "database is good\n"
+msgstr "la base de données est bonne\n"
+
+#: database.cc:86
+#, c-format
+msgid ""
+"layout of database %s doesn't match this version of monotone\n"
+"wanted schema %s, got %s\n"
+"try 'monotone db migrate' to upgrade\n"
+"(this is irreversible; you may want to make a backup copy first)"
+msgstr ""
+
+#: database.cc:147
+#, fuzzy, c-format
+msgid "unable to probe database version in file %s"
+msgstr "La lecture du fichier d'options « %s » a échouée"
+
+#: database.cc:154
+#, c-format
+msgid "database %s is not an sqlite version 3 file, try dump and reload"
+msgstr ""
+"la base de données %s n'est pas un fichier sqlite version 3, essayer dump "
+"puis reload"
+
+#: database.cc:176 database.cc:187
+#, c-format
+msgid "sqlite error: %d: %s"
+msgstr "erreur sqlite : %d : %s"
+
+#: database.cc:181
msgid "make sure database and containing directory are writeable"
msgstr ""
-#: ../database.cc:494
+#: database.cc:226
+#, c-format
+msgid "could not initialize database: %s: already exists"
+msgstr "impossible d'initialiser la base de données : %s : elle existe déjà "
+
+#: database.cc:231
+#, c-format
+msgid ""
+"existing (possibly stale) journal file '%s' has same stem as new database '%"
+"s'\n"
+"cancelling database creation"
+msgstr ""
+
+#: database.cc:353
+#, c-format
+msgid "cannot create %s; it already exists"
+msgstr "impossible de créer %s car ceci existe déjà "
+
+#: database.cc:417
+#, c-format
+msgid ""
+"schema version : %s\n"
+"counts:\n"
+" full manifests : %u\n"
+" manifest deltas : %u\n"
+" full files : %u\n"
+" file deltas : %u\n"
+" revisions : %u\n"
+" ancestry edges : %u\n"
+" certs : %u\n"
+"bytes:\n"
+" full manifests : %u\n"
+" manifest deltas : %u\n"
+" full files : %u\n"
+" file deltas : %u\n"
+" revisions : %u\n"
+" cached ancestry : %u\n"
+" certs : %u\n"
+" total : %u\n"
+msgstr ""
+"version du schéma : %s\n"
+"comptes:\n"
+" manifestes complets : %u\n"
+" deltas de manifestes : %u\n"
+" fichiers complets : %u\n"
+" deltas de fichiers : %u\n"
+" révisions : %u\n"
+" ancestry edges : %u\n"
+" certificats : %u\n"
+"octets:\n"
+" manifestes complets : %u\n"
+" deltas de manifestes : %u\n"
+" fichiers complets : %u\n"
+" deltas de fichiers : %u\n"
+" révisions : %u\n"
+" cached ancestry : %u\n"
+" certificats : %u\n"
+" total : %u\n"
+
+#: database.cc:471
+#, c-format
+msgid "database schema version: %s"
+msgstr "version du schéma de la base de données : %s"
+
+#: database.cc:490
#, fuzzy
msgid "mcerts"
msgstr "mcerts"
-#: ../database.cc:495
+#: database.cc:491
#, fuzzy
msgid "pubkeys"
msgstr "clefs"
-#: ../database.cc:496
+#: database.cc:492
#, fuzzy
msgid "privkeys"
msgstr "clefs"
-#: ../main.cc:325
+#: database.cc:536
+#, c-format
+msgid "statement cache statistics\n"
+msgstr "statistiques relatives au cache des expressions\n"
+
+#: database.cc:537
+#, c-format
+msgid "prepared %d statements\n"
+msgstr "%d expressions préparées\n"
+
+#: database.cc:541
+#, c-format
+msgid "%d executions of %s\n"
+msgstr "%d exécutions de %s\n"
+
+#: database.cc:594
+#, fuzzy, c-format
+msgid "prepared statement %s\n"
+msgstr "%d expressions préparées\n"
+
+#: database.cc:598
+#, c-format
+msgid "multiple statements in query: %s\n"
+msgstr ""
+
+#: database.cc:604
+#, c-format
+msgid "wanted %d columns got %d in query: %s\n"
+msgstr ""
+
+#: database.cc:610
+#, c-format
+msgid "binding %d parameters for %s\n"
+msgstr ""
+
+#: database.cc:624
+#, fuzzy, c-format
+msgid "binding %d with value '%s'\n"
+msgstr "importation du fichier « %s »\n"
+
+#: database.cc:640
+#, c-format
+msgid "null result in query: %s\n"
+msgstr ""
+
+#: database.cc:658
+#, c-format
+msgid "wanted %d rows got %s in query: %s\n"
+msgstr ""
+
+#: database.cc:668
+#, c-format
+msgid "cannot change filename to %s while db is open"
+msgstr ""
+
+#: database.cc:686
+#, c-format
+msgid ""
+"Attempt to start exclusive transaction within non-exclusive transaction."
+msgstr ""
+
+#: database.cc:880
+#, c-format
+msgid "version cache expiring %s\n"
+msgstr ""
+
+#: database.cc:902
+#, c-format
+msgid "version cache hit on %s\n"
+msgstr ""
+
+#: database.cc:971
+#, fuzzy, c-format
+msgid "reconstructing %s in %s\n"
+msgstr "connexion à %s\n"
+
+#: database.cc:1077
+#, fuzzy, c-format
+msgid "following delta %s -> %s\n"
+msgstr "déplacement du dossier %s -> %s\n"
+
+#: database.cc:1499
+#, fuzzy, c-format
+msgid "Killing revision %s locally\n"
+msgstr "vérification de la révisions %s\n"
+
+#: database.cc:1511
+#, c-format
+msgid "Deleting all references to branch %s\n"
+msgstr ""
+
+#: database.cc:1524
+#, c-format
+msgid "Deleting all references to tag %s\n"
+msgstr ""
+
+#: database.cc:1625
+#, fuzzy, c-format
+msgid "another key with name '%s' already exists"
+msgstr "la clef « %s » existe déjà "
+
+#: database.cc:2253
+#, fuzzy, c-format
+msgid "after get_branch_heads for %s, heads has %d entries\n"
+msgstr "la branche %s a %d entrées\n"
+
+#: database.cc:2276
+#, c-format
+msgid "processing selector type %d with i->second '%s'\n"
+msgstr ""
+
+#: database.cc:2283
+#, c-format
+msgid "limiting to current branch '%s'\n"
+msgstr ""
+
+#: database.cc:2513
+#, c-format
+msgid "no database specified"
+msgstr "aucune base de données n'a été spécifiée"
+
+#: database.cc:2521
+#, c-format
+msgid "database %s does not exist"
+msgstr "la base de données %s n'existe pas"
+
+#: database.cc:2522
+#, c-format
+msgid "%s is a directory, not a database"
+msgstr "%s est un dossier, pas une base de données"
+
+#: database.cc:2547
+#, c-format
+msgid "could not open database '%s': %s"
+msgstr "impossible d'ouvrir la base de données « %s » : %s"
+
+#: database.cc:2592
+#, c-format
+msgid "attempting to rollback and close %d databases"
+msgstr ""
+
+#: database.cc:2601
+#, c-format
+msgid "exec_err = %d, close_err = %d"
+msgstr ""
+
+#: diff_patch.cc:209
+#, c-format
+msgid "exchanging preserved extent [%d+%d] with changed extent [%d+%d]\n"
+msgstr ""
+
+#: diff_patch.cc:300
+#, c-format
+msgid "conflicting edits: %s %d[%d] '%s' vs. %s %d[%d] '%s'\n"
+msgstr ""
+
+#: diff_patch.cc:328
+#, c-format
+msgid "conflicting edits: [%s %d %d] vs. [%s %d %d]\n"
+msgstr ""
+
+#: diff_patch.cc:376
+#, c-format
+msgid "calculating left edit script on %d -> %d lines\n"
+msgstr ""
+
+#: diff_patch.cc:384
+#, c-format
+msgid "calculating right edit script on %d -> %d lines\n"
+msgstr ""
+
+#: diff_patch.cc:392
+#, c-format
+msgid "calculating left extents on %d edits\n"
+msgstr ""
+
+#: diff_patch.cc:397
+#, c-format
+msgid "calculating right extents on %d edits\n"
+msgstr ""
+
+#: diff_patch.cc:402
+#, c-format
+msgid "normalizing %d right extents\n"
+msgstr ""
+
+#: diff_patch.cc:405
+#, c-format
+msgid "normalizing %d left extents\n"
+msgstr ""
+
+#: diff_patch.cc:411
+#, c-format
+msgid "conflicting prefixes\n"
+msgstr "préfixes en conflit\n"
+
+#: diff_patch.cc:417
+#, c-format
+msgid "conflicting suffixes\n"
+msgstr "suffixes en conflit\n"
+
+#: diff_patch.cc:421
+#, c-format
+msgid "merging %d left, %d right extents\n"
+msgstr ""
+
+#: diff_patch.cc:452
+#, c-format
+msgid "conflict detected. no merge.\n"
+msgstr "conflit détecté, pas de fusion.\n"
+
+#: diff_patch.cc:472
+#, c-format
+msgid "recording successful merge of %s <-> %s into %s\n"
+msgstr ""
+
+#: diff_patch.cc:530
+#, fuzzy, c-format
+msgid "trying to merge %s <-> %s (ancestor: %s)\n"
+msgstr "vérification si %s est un ancêtre de %s\n"
+
+#: diff_patch.cc:535 diff_patch.cc:640
+#, c-format
+msgid "files are identical\n"
+msgstr "les fichiers sont identiques\n"
+
+#: diff_patch.cc:577
+#, c-format
+msgid "internal 3-way merged ok\n"
+msgstr ""
+
+#: diff_patch.cc:591
+#, c-format
+msgid ""
+"help required for 3-way merge\n"
+"[ancestor] %s\n"
+"[ left] %s\n"
+"[ right] %s\n"
+"[ merged] %s\n"
+msgstr ""
+"aide requise pour la fusion de 3 fichiers\n"
+"[ ancêtre] %s\n"
+"[ gauche] %s\n"
+"[ droite] %s\n"
+"[fusionné] %s\n"
+
+#: diff_patch.cc:608
+#, c-format
+msgid "lua merge3 hook merged ok\n"
+msgstr ""
+
+#: diff_patch.cc:635
+#, fuzzy, c-format
+msgid "trying to merge %s <-> %s\n"
+msgstr "déplacement du dossier %s -> %s\n"
+
+#: diff_patch.cc:651
+#, c-format
+msgid ""
+"help required for 2-way merge\n"
+"[ left] %s\n"
+"[ right] %s\n"
+"[ merged] %s\n"
+msgstr ""
+"aide requise pour la fusion de 2 fichiers\n"
+"[ gauche] %s\n"
+"[ droite] %s\n"
+"[fusionné] %s\n"
+
+#: diff_patch.cc:665
+#, c-format
+msgid "lua merge2 hook merged ok\n"
+msgstr ""
+
+#: diff_patch.cc:696
+#, c-format
+msgid "temporarily recording merge of %s <-> %s into %s\n"
+msgstr ""
+
+#: diff_patch.cc:713
+#, c-format
+msgid "file '%s' does not exist in working copy"
+msgstr "le fichier « %s » n'existe pas dans la copie de travail"
+
+#: diff_patch.cc:714
+#, fuzzy, c-format
+msgid "'%s' in working copy is a directory, not a file"
+msgstr "%s est un dossier, pas une base de données"
+
+#: diff_patch.cc:718
+#, fuzzy, c-format
+msgid "file %s in working copy has id %s, wanted %s"
+msgstr "création d'une copie de travail dans %s\n"
+
+#: file_io.cc:116
+#, fuzzy, c-format
+msgid "expected file '%s', but it is a directory."
+msgstr "le fichier %s ne peut être lu; c'est un dossier"
+
+#: file_io.cc:186 file_io.cc:193
+#, c-format
+msgid ""
+"could not create directory '%s'\n"
+"it is a file"
+msgstr ""
+"impossible de créer le dossier « %s »\n"
+"car c'est un fichier"
+
+#: file_io.cc:188
+#, c-format
+msgid ""
+"could not create directory '%s'\n"
+"%s"
+msgstr ""
+"impossible de créer le dossier « %s »\n"
+"%s"
+
+#: file_io.cc:192
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "impossible de créer le dossier « %s »"
+
+#: file_io.cc:205
+#, fuzzy, c-format
+msgid "failed to create directory '%s' for '%s'"
+msgstr "impossible de créer le dossier : %s : %s\n"
+
+#: file_io.cc:213
+#, c-format
+msgid "file to delete '%s' does not exist"
+msgstr "le fichier à supprimer « %s » n'existe pas"
+
+#: file_io.cc:214
+#, fuzzy, c-format
+msgid "file to delete, '%s', is not a file but a directory"
+msgstr "le fichier à supprimer « %s » n'existe pas"
+
+#: file_io.cc:222
+#, fuzzy, c-format
+msgid "directory to delete, '%s', does not exist"
+msgstr "le dossier à supprimer « %s » n'existe pas"
+
+#: file_io.cc:223
+#, fuzzy, c-format
+msgid "directory to delete, '%s', is a file"
+msgstr "le dossier à supprimer « %s » n'existe pas"
+
+#: file_io.cc:232
+#, fuzzy, c-format
+msgid "rename source file '%s' does not exist"
+msgstr "le chemin %s n'existe pas"
+
+#: file_io.cc:233
+#, c-format
+msgid "rename source file '%s' is a directory -- bug in monotone?"
+msgstr ""
+
+#: file_io.cc:236 file_io.cc:249
+#, fuzzy, c-format
+msgid "rename target '%s' already exists"
+msgstr "le fichier pid « %s » existe déjà "
+
+#: file_io.cc:245
+#, fuzzy, c-format
+msgid "rename source dir '%s' does not exist"
+msgstr "le chemin %s n'existe pas"
+
+#: file_io.cc:246
+#, c-format
+msgid "rename source dir '%s' is a file -- bug in monotone?"
+msgstr ""
+
+#: file_io.cc:260
+#, fuzzy, c-format
+msgid "rename source path '%s' does not exist"
+msgstr "le chemin %s n'existe pas"
+
+#: file_io.cc:275
+#, c-format
+msgid "file %s does not exist"
+msgstr "le fichier %s n'existe pas"
+
+#: file_io.cc:276
+#, c-format
+msgid "file %s cannot be read as data; it is a directory"
+msgstr "le fichier %s ne peut être lu; c'est un dossier"
+
+#: file_io.cc:280
+#, c-format
+msgid "cannot open file %s for reading"
+msgstr "impossible d'ouvrir le fichier %s pour le lire"
+
+#: file_io.cc:347
+#, c-format
+msgid "Cannot read standard input multiple times"
+msgstr "Impossible de lire l'entrée standard plusieurs fois"
+
+#: file_io.cc:378
+#, fuzzy, c-format
+msgid "file '%s' cannot be overwritten as data; it is a directory"
+msgstr "le fichier %s ne peut être lu; c'est un dossier"
+
+#: file_io.cc:386
+#, c-format
+msgid "cannot open file %s for writing"
+msgstr "impossible d'ouvrir le fichier %s pour l'écrire"
+
+#: file_io.cc:477
+#, c-format
+msgid "ignoring book keeping entry %s\n"
+msgstr ""
+
+#: file_io.cc:497
+#, c-format
+msgid "caught runtime error %s constructing file path for %s\n"
+msgstr ""
+
+#: file_io.cc:521
+#, c-format
+msgid "no such file or directory: '%s'"
+msgstr "Aucun fichier ou répertoire de ce type : « %s »"
+
+#: keys.cc:42
+#, c-format
+msgid "running arc4 process on %d bytes of data\n"
+msgstr ""
+
+#: keys.cc:76
+#, c-format
+msgid "got empty passphrase from get_passphrase() hook"
+msgstr "la phrase de passe obtenue depuis get_passphrase() est vide"
+
+#: keys.cc:92
+#, c-format
+msgid "empty passphrase not allowed"
+msgstr "la phrase de passe ne doit pas être vide"
+
+#: keys.cc:99
+#, c-format
+msgid "confirm passphrase for key ID [%s]: "
+msgstr "confirmez la phrase de passe pour la clef d'ID [%s]Â :"
+
+#: keys.cc:104
+#, fuzzy, c-format
+msgid "empty passphrases not allowed, try again\n"
+msgstr "la phrase de passe ne doit pas être vide"
+
+#: keys.cc:105 keys.cc:112
+#, c-format
+msgid "too many failed passphrases\n"
+msgstr ""
+
+#: keys.cc:111
+#, c-format
+msgid "passphrases do not match, try again\n"
+msgstr "les phrases de passe ne correspondent pas, essayez à nouveau\n"
+
+#: keys.cc:118
+#, c-format
+msgid "no passphrase given"
+msgstr "aucune phrase de passe fournie"
+
+#: keys.cc:177
+#, c-format
+msgid ""
+"generated %d-byte public key\n"
+"generated %d-byte (encrypted) private key\n"
+msgstr ""
+"clef publique de %d octets générée\n"
+"clef privée (chiffrée) de %d octets générée\n"
+
+#: keys.cc:194
+#, fuzzy, c-format
+msgid "base64-decoding %d-byte private key\n"
+msgstr ""
+"clef publique de %d octets générée\n"
+"clef privée (chiffrée) de %d octets générée\n"
+
+#: keys.cc:199
+#, fuzzy, c-format
+msgid "have %d-byte encrypted private key\n"
+msgstr ""
+"clef publique de %d octets générée\n"
+"clef privée (chiffrée) de %d octets générée\n"
+
+#: keys.cc:244
+#, fuzzy, c-format
+msgid "base64-decoding %d-byte old private key\n"
+msgstr ""
+"clef publique de %d octets générée\n"
+"clef privée (chiffrée) de %d octets générée\n"
+
+#: keys.cc:255
+#, fuzzy, c-format
+msgid "building signer from %d-byte decrypted private key\n"
+msgstr ""
+"clef publique de %d octets générée\n"
+"clef privée (chiffrée) de %d octets générée\n"
+
+#: keys.cc:355
+#, fuzzy, c-format
+msgid "produced %d-byte signature\n"
+msgstr "signature du client invalide\n"
+
+#: keys.cc:383
+#, c-format
+msgid "building verifier for %d-byte pub key\n"
+msgstr ""
+
+#: keys.cc:405
+#, c-format
+msgid "checking %d-byte (%d decoded) signature\n"
+msgstr ""
+
+#: keys.cc:531
+#, c-format
+msgid "no key pair '%s' found in key store or get_priv_key hook"
+msgstr ""
+
+#: keys.cc:542
+#, c-format
+msgid "passphrase for '%s' is incorrect"
+msgstr "la phrase de passe pour « %s » est incorrecte"
+
+#: lua.cc:119
+#, c-format
+msgid "lua failure: %s; stack = %s\n"
+msgstr ""
+
+#: lua.cc:126
+#, fuzzy, c-format
+msgid "Lua::ok(): failed"
+msgstr "Lua::ok() : échec = %i"
+
+#: lua.cc:135
+#, c-format
+msgid "lua stack: %s"
+msgstr "pile lua : %s"
+
+#: lua.cc:215
+#, c-format
+msgid "lua: extracted string = %s"
+msgstr "lua : chaîne extraite = %s"
+
+#: lua.cc:228
+#, c-format
+msgid "lua: extracted int = %i"
+msgstr "lua : int extrait = %i"
+
+#: lua.cc:241
+#, c-format
+msgid "lua: extracted double = %i"
+msgstr "lua : double extrait = %i"
+
+#: lua.cc:255
+#, c-format
+msgid "lua: extracted bool = %i"
+msgstr "lua : bool extrait = %i"
+
+#: lua.cc:375
+#, fuzzy, c-format
+msgid "loading lua hook %s"
+msgstr "ne pas charger les hooks standards lua"
+
+#: lua.cc:538 lua.cc:567 lua.cc:582
+#, c-format
+msgid "%s called with an invalid parameter"
+msgstr "%s a été appelé avec un paramètre invalide"
+
+#: lua.cc:585
+#, c-format
+msgid "Directory '%s' does not exists"
+msgstr "le dossier « %s » n'existe pas"
+
+#: lua.cc:586 rcs_import.cc:1248
+#, c-format
+msgid "'%s' is not a directory"
+msgstr "« %s » n'est pas un dossier"
+
+#: lua.cc:605 lua.cc:900
+#, fuzzy, c-format
+msgid "lua error while loading rcfile '%s'"
+msgstr "erreur lua lors du chargement de « %s »"
+
+#: lua.cc:897 lua.cc:910
+#, c-format
+msgid "opening rcfile '%s' ...\n"
+msgstr "ouverture du fichier rc « %s » ...\n"
+
+#: lua.cc:901 lua.cc:913
+#, c-format
+msgid "'%s' is ok\n"
+msgstr "« %s » est 0K\n"
+
+#: lua.cc:912
+#, c-format
+msgid "lua error while loading '%s'"
+msgstr "erreur lua lors du chargement de « %s »"
+
+#: lua.cc:917
+#, c-format
+msgid "rcfile '%s' does not exist"
+msgstr "le fichier rc « %s » n'existe pas"
+
+#: lua.cc:918
+#, fuzzy, c-format
+msgid "skipping nonexistent rcfile '%s'\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
+
+#: lua.cc:1363
+#, c-format
+msgid "calling attr_init_function for %s"
+msgstr ""
+
+#: lua.cc:1367
+#, c-format
+msgid " calling an attr_init_function for %s"
+msgstr ""
+
+#: lua.cc:1380
+#, c-format
+msgid " added attr %s = %s"
+msgstr ""
+
+#: lua.cc:1384
+#, c-format
+msgid " no attr added"
+msgstr ""
+
+#: main.cc:325
msgid "interrupted"
msgstr "interrompu"
-#: ../main.cc:329
+#: main.cc:329
msgid "terminated by signal"
msgstr "terminé par un signal"
-#: ../monotone.cc:51
+#: manifest.cc:55
+#, c-format
+msgid "scanning file %s\n"
+msgstr "analyse du fichier %s\n"
+
+#: manifest.cc:188
+#, fuzzy, c-format
+msgid "missing %s"
+msgstr "%d clefs manquantes\n"
+
+#: manifest.cc:201
+#, fuzzy, c-format
+msgid ""
+"%d missing files\n"
+"to restore consistency, on each missing file run either\n"
+"'monotone drop FILE' to remove it permanently, or\n"
+"'monotone revert FILE' to restore it\n"
+"or to handle all at once, simple 'monotone drop --missing'\n"
+"or 'monotone revert --missing'"
+msgstr ""
+"%d fichiers manquants\n"
+"pour restaurer un état consistent, pour chaque fichier manquant\n"
+"lancer soit « monotone drop FICHIER » pour le supprimer définitivement,\n"
+"soit « monotone revert FICHIER » pour le restaurer\n"
+
+#: merkle_tree.cc:281
+#, c-format
+msgid "node level is %d, exceeds maximum %d"
+msgstr ""
+
+#: merkle_tree.cc:317
+#, c-format
+msgid "mismatched node hash value %s, expected %s"
+msgstr ""
+
+#: monotone.cc:51
msgid "select branch cert for operation"
msgstr ""
-#: ../monotone.cc:52
+#: monotone.cc:52
msgid "select revision id for operation"
msgstr ""
-#: ../monotone.cc:53
+#: monotone.cc:53
#, fuzzy
msgid "set commit changelog message"
msgstr "message du journal vide"
-#: ../monotone.cc:54
+#: monotone.cc:54
msgid "set filename containing commit changelog message"
msgstr ""
-#: ../monotone.cc:55
+#: monotone.cc:55
msgid "override date/time for commit"
msgstr ""
-#: ../monotone.cc:56
+#: monotone.cc:56
msgid "override author for commit"
msgstr ""
-#: ../monotone.cc:57
+#: monotone.cc:57
msgid "limit the number of levels of directories to descend"
msgstr ""
-#: ../monotone.cc:58
+#: monotone.cc:58
msgid "limit the log output to the given number of entries"
msgstr "limiter l'affichage du journal au nombre d'entrées spécifié"
-#: ../monotone.cc:59
+#: monotone.cc:59
msgid "record process id of server"
msgstr "enregistrer l'identifiant du processus serveur"
-#: ../monotone.cc:60
+#: monotone.cc:60
msgid "print a brief version of the normal output"
msgstr ""
-#: ../monotone.cc:61
+#: monotone.cc:61
msgid "print diffs along with logs"
msgstr ""
-#: ../monotone.cc:62
+#: monotone.cc:62
msgid "skip merges when printing logs"
msgstr ""
-#: ../monotone.cc:63
+#: monotone.cc:63
msgid "use the current arguments as the future default"
msgstr ""
-#: ../monotone.cc:64
+#: monotone.cc:64
msgid "leave out anything described by its argument"
msgstr ""
-#: ../monotone.cc:65
+#: monotone.cc:65
msgid "use unified diff format"
msgstr "utiliser le format diff unifié"
-#: ../monotone.cc:66
+#: monotone.cc:66
msgid "use context diff format"
msgstr "utiliser le format diff contextuel"
-#: ../monotone.cc:67
+#: monotone.cc:67
msgid "use external diff hook for generating diffs"
msgstr ""
-#: ../monotone.cc:68
+#: monotone.cc:68
msgid "argument to pass external diff hook"
msgstr ""
-#: ../monotone.cc:69
+#: monotone.cc:69
msgid "use least common ancestor as ancestor for merge"
msgstr ""
-#: ../monotone.cc:70
+#: monotone.cc:70
msgid "perform the associated file operation"
msgstr ""
-#: ../monotone.cc:71
+#: monotone.cc:71
msgid "address:port to listen on (default :5253)"
msgstr "écouteur sur adresse:port (défaut :5233)"
-#: ../monotone.cc:72
+#: monotone.cc:72
msgid "perform the operations for files missing from working directory"
msgstr ""
-#: ../monotone.cc:73
+#: monotone.cc:73
msgid "perform the operations for unknown files from working directory"
msgstr ""
-#: ../monotone.cc:74
+#: monotone.cc:74
msgid "push the specified key even if it hasn't signed anything"
msgstr ""
-#: ../monotone.cc:83
+#: monotone.cc:83
msgid "print debug log to stderr while running"
msgstr ""
-#: ../monotone.cc:84
+#: monotone.cc:84
msgid "file to dump debugging log to, on failure"
msgstr ""
-#: ../monotone.cc:85
+#: monotone.cc:85
msgid "suppress log and progress messages"
msgstr ""
-#: ../monotone.cc:86
+#: monotone.cc:86
msgid "display help message"
msgstr "afficher le message d'aide"
-#: ../monotone.cc:87
+#: monotone.cc:87
msgid "print version number, then exit"
msgstr "afficher le numéro de version, puis quitte"
-#: ../monotone.cc:88
+#: monotone.cc:88
msgid "print detailed version number, then exit"
msgstr "afficher le numéro de version détaillée, puis quitte"
-#: ../monotone.cc:89
+#: monotone.cc:89
msgid "insert command line arguments taken from the given file"
msgstr ""
-#: ../monotone.cc:90
+#: monotone.cc:90
msgid "set ticker style (count|dot|none)"
msgstr ""
-#: ../monotone.cc:91
+#: monotone.cc:91
msgid "do not load standard lua hooks"
msgstr "ne pas charger les hooks standards lua"
-#: ../monotone.cc:92
+#: monotone.cc:92
msgid "do not load ~/.monotone/monotonerc or MT/monotonerc lua files"
msgstr ""
"ne pas charger les fichiers lua ~/.monotone/monotonerc ou MT/monotonerc"
-#: ../monotone.cc:93
+#: monotone.cc:93
msgid "load extra rc file"
msgstr "charger un fichier rc supplémentaire"
-#: ../monotone.cc:94
+#: monotone.cc:94
msgid "set key for signatures"
msgstr "paramétrer la clef pour les signatures"
-#: ../monotone.cc:95
+#: monotone.cc:95
msgid "set name of database"
msgstr "paramétrer le nom de la base de données"
-#: ../monotone.cc:96
+#: monotone.cc:96
msgid "limit search for working copy to specified root"
msgstr ""
-#: ../monotone.cc:97
+#: monotone.cc:97
msgid "verbose completion output"
msgstr ""
-#: ../monotone.cc:98
+#: monotone.cc:98
msgid "set location of key store"
msgstr "paramétrer l'emplacement de l'entrepôt de données"
-#: ../monotone.cc:99
+#: monotone.cc:99
msgid "set location of configuration directory"
msgstr "paramétrer l'emplacement du dossier de configuration"
-#: ../monotone.cc:292
+#: monotone.cc:203
+#, fuzzy, c-format
+msgid "problem parsing arguments from file %s: %s"
+msgstr "erreur lors de la lecture du fichier RCS %s : %s\n"
+
+#: monotone.cc:212
+#, c-format
+msgid "weird error when stuffing arguments read from %s: %s\n"
+msgstr ""
+
+#: monotone.cc:261
+#, c-format
+msgid "command line: %s\n"
+msgstr "ligne de commande : %s\n"
+
+#: monotone.cc:264
+#, c-format
+msgid "set locale: LC_ALL=%s\n"
+msgstr "paramétrage de la locale : LC_ALL=%s\n"
+
+#: monotone.cc:292
msgid "[OPTION...] command [ARGS...]\n"
msgstr "[OPTION...] commande [ARGUMENTS...]\n"
-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:696
+#: monotone.cc:522
+#, c-format
+msgid "syntax error near the \"%s\" option: %s"
+msgstr "erreur de syntaxe près de l'option « %s » : %s"
+
+#: monotone.cc:561
+#, c-format
+msgid "monotone %s doesn't use the option %s"
+msgstr "monotone %s n'utilise pas l'option %s"
+
+#: monotone.cc:583
+#, c-format
+msgid "Removed 'hidden' from option # %d\n"
+msgstr ""
+
+#: monotone.cc:589 monotone.cc:600
+#, c-format
+msgid "Added 'hidden' to option # %d\n"
+msgstr ""
+
+#: monotone.cc:596
+#, c-format
+msgid "Options specific to 'monotone %s':"
+msgstr "Options spécifiques à « monotone %s » :"
+
+#: mt_version.cc:23
+#, c-format
+msgid "%s (base revision: %s)"
+msgstr "%s (révision de base : %s)"
+
+#: mt_version.cc:34
+#, c-format
+msgid ""
+"Running on: %s\n"
+"Changes since base revision: %s\n"
+msgstr ""
+"En cours d'exécution sur : %s\n"
+"Changements depuis la révision de base : %s\n"
+
+#: netcmd.cc:42
+#, c-format
+msgid "unknown item type 0x%x for '%s'"
+msgstr "type d'élément inconnu 0x%x pour « %s »"
+
+#: netcmd.cc:94
+#, c-format
+msgid "protocol version mismatch: wanted '%d' got '%d'"
+msgstr ""
+
+#: netcmd.cc:119
+#, c-format
+msgid "unknown netcmd code 0x%x"
+msgstr "code de commande netcmd inconnu 0x%x"
+
+#: netcmd.cc:130
+#, c-format
+msgid "oversized payload of '%d' bytes"
+msgstr "charge utile surdimensionnée de '%d' octets"
+
+#: netcmd.cc:159
+#, c-format
+msgid ""
+"bad HMAC checksum (got %s, wanted %s)\n"
+"this suggests data was corrupted in transit\n"
+msgstr ""
+"mauvaise somme de contrôle HMAC (reçu %s, attendu %s)\n"
+"ceci suggère que les données ont été corrompues pendant le transit\n"
+
+#: netcmd.cc:235 netcmd.cc:281
+#, fuzzy, c-format
+msgid "unknown role specifier %d"
+msgstr "aucune base de données n'a été spécifiée"
+
+#: netio.hh:38 netio.hh:56
+#, c-format
+msgid "need %d bytes to decode %s at %d, only have %d"
+msgstr ""
+"%d octets sont nécessaire pour décoder %s à %d, seulement %d sont disponibles"
+
+#: netio.hh:84 netio.hh:119
+#, c-format
+msgid "uleb128 decode for '%s' into %d-byte datum overflowed"
+msgstr ""
+
+#: netio.hh:139
+#, c-format
+msgid "ran out of bytes reading uleb128 value for '%s' at pos %d"
+msgstr ""
+
+#: netio.hh:275
+#, c-format
+msgid "decoding variable length string of %d bytes for '%s', maximum is %d"
+msgstr ""
+
+#: netio.hh:330
+#, fuzzy, c-format
+msgid "expected %s to end at %d, have %d bytes"
+msgstr ""
+"%d octets sont nécessaire pour décoder %s à %d, seulement %d sont disponibles"
+
+#: netsync.cc:243
+#, c-format
+msgid "check of '%s' failed"
+msgstr "la vérification de « %s » a échouée"
+
+#: netsync.cc:696
msgid "bytes in"
msgstr "octets â©"
-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:698
+#: netsync.cc:698
msgid "bytes out"
msgstr "octets â§"
-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:702 ../netsync.cc:719
+#: netsync.cc:702 netsync.cc:719
msgid "revs written"
msgstr "révs écrites"
-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:704
+#: netsync.cc:704
msgid "certs in"
msgstr "certs â©"
-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:706 ../netsync.cc:721
+#: netsync.cc:706 netsync.cc:721
msgid "revs in"
msgstr "révs â©"
-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:711
+#: netsync.cc:711
msgid "certs out"
msgstr "certs â§"
-#. xgettext: please use short message and try to avoid multibytes chars
-#: ../netsync.cc:713 ../netsync.cc:723
+#: netsync.cc:713 netsync.cc:723
msgid "revs out"
msgstr "révs â§"
-#: ../netsync.cc:1834 ../netsync.cc:2831 ../netsync.cc:2862
+#: netsync.cc:781
+#, c-format
+msgid "all epochs processed, opening database valve\n"
+msgstr ""
+
+#: netsync.cc:878
+#, c-format
+msgid "dropping outgoing netcmd (because we're in error unwind mode)\n"
+msgstr ""
+
+#: netsync.cc:902
+#, c-format
+msgid "error: %s\n"
+msgstr "erreur : %s\n"
+
+#: netsync.cc:910
+#, fuzzy, c-format
+msgid "analyzing %d entries in manifest\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
+
+#: netsync.cc:949
+#, c-format
+msgid "analyzing %d ancestry edges\n"
+msgstr ""
+
+#: netsync.cc:971
+#, c-format
+msgid "intermediate set_difference heads size %d"
+msgstr ""
+
+#: netsync.cc:1007
+#, c-format
+msgid "Dropping branch certs for unwanted branch %s"
+msgstr ""
+
+#: netsync.cc:1024
+#, c-format
+msgid "after step 2, heads size %d"
+msgstr ""
+
+#: netsync.cc:1048
+#, c-format
+msgid "after step 3, heads size %d"
+msgstr ""
+
+#: netsync.cc:1068
+#, c-format
+msgid "analyze_ancestry_graph"
+msgstr ""
+
+#: netsync.cc:1071
+#, c-format
+msgid "not all done in analyze_ancestry_graph"
+msgstr ""
+
+#: netsync.cc:1077
+#, c-format
+msgid "already analyzed_ancestry in analyze_ancestry_graph"
+msgstr ""
+
+#: netsync.cc:1081
+#, c-format
+msgid "analyze_ancestry_graph fetching"
+msgstr ""
+
+#: netsync.cc:1116
+#, c-format
+msgid "read %d bytes from fd %d (peer %s)\n"
+msgstr "%d octets lu sur le descripteur de fichier %d (pair %s)\n"
+
+#: netsync.cc:1119
+#, c-format
+msgid "in error unwind mode, so throwing them into the bit bucket\n"
+msgstr ""
+
+#: netsync.cc:1151
+#, c-format
+msgid "wrote %d bytes to fd %d (peer %s)\n"
+msgstr "%d octets écris sur le descripteur de fichier %d (pair %s)\n"
+
+#: netsync.cc:1159
+#, c-format
+msgid "finished flushing output queue in error unwind mode, disconnecting\n"
+msgstr ""
+
+#: netsync.cc:1173
+#, fuzzy, c-format
+msgid "queueing 'bye' command\n"
+msgstr "exécution de la commande « %s »\n"
+
+#: netsync.cc:1183
+#, c-format
+msgid "queueing 'error' command\n"
+msgstr ""
+
+#: netsync.cc:1196
+#, c-format
+msgid "queueing 'done' command for %s level %s\n"
+msgstr ""
+
+#: netsync.cc:1265
+#, c-format
+msgid "queueing request for refinement of %s node '%s', level %d\n"
+msgstr ""
+
+#: netsync.cc:1283
+#, c-format
+msgid "not queueing request for %s '%s' as we are in pure source role\n"
+msgstr ""
+
+#: netsync.cc:1290
+#, c-format
+msgid "not queueing request for %s '%s' as we already requested it\n"
+msgstr ""
+
+#: netsync.cc:1295
+#, c-format
+msgid "queueing request for data of %s item '%s'\n"
+msgstr ""
+
+#: netsync.cc:1319
+#, c-format
+msgid ""
+"not queueing request for %s delta '%s' -> '%s' as we are in pure source "
+"role\n"
+msgstr ""
+
+#: netsync.cc:1326
+#, c-format
+msgid ""
+"not queueing request for %s delta '%s' -> '%s' as we already requested the "
+"target\n"
+msgstr ""
+
+#: netsync.cc:1331
+#, c-format
+msgid "queueing request for contents of %s delta '%s' -> '%s'\n"
+msgstr ""
+
+#: netsync.cc:1351
+#, c-format
+msgid "not queueing %s data for '%s' as we are in pure sink role\n"
+msgstr ""
+
+#: netsync.cc:1356
+#, fuzzy, c-format
+msgid "queueing %d bytes of data for %s item '%s'\n"
+msgstr "conversion de %d octets de %s en %s\n"
+
+#: netsync.cc:1390
+#, c-format
+msgid "not queueing %s delta '%s' -> '%s' as we are in pure sink role\n"
+msgstr ""
+
+#: netsync.cc:1395
+#, c-format
+msgid "queueing %s delta '%s' -> '%s'\n"
+msgstr ""
+
+#: netsync.cc:1413
+#, c-format
+msgid ""
+"not queueing note of nonexistence of %s item '%s' as we are in pure sink "
+"role\n"
+msgstr ""
+
+#: netsync.cc:1418
+#, c-format
+msgid "queueing note of nonexistance of %s item '%s'\n"
+msgstr ""
+
+#: netsync.cc:1430
+#, c-format
+msgid "received 'bye' netcmd\n"
+msgstr ""
+
+#: netsync.cc:1438
+#, fuzzy, c-format
+msgid "received network error: %s"
+msgstr "erreur réseau : %s"
+
+#: netsync.cc:1455
+#, c-format
+msgid "received 'done' for empty %s level %d, marking as complete\n"
+msgstr ""
+
+#: netsync.cc:1477
+#, c-format
+msgid ""
+"received 'done' for %s level %d, which had refinements; sending echo of done "
+"for level %d\n"
+msgstr ""
+
+#: netsync.cc:1510
+#, c-format
+msgid "server key has name %s, hash %s\n"
+msgstr "le nom du serveur est %s, et son hachi %s :)\n"
+
+#: netsync.cc:1518
+#, c-format
+msgid ""
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
+"@ WARNING: SERVER IDENTIFICATION HAS CHANGED @\n"
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
+"IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY\n"
+"it is also possible that the server key has just been changed\n"
+"remote host sent key %s\n"
+"I expected %s\n"
+"'monotone unset %s %s' overrides this check\n"
+msgstr ""
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
+"@ ATTENTION : L'IDENTIFICATION DU SERVEUR A CHANGÃE @\n"
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
+"IL EST POSSIBLE QUE QUELQU'UN SOIT ENTRAIN DE FAIRE\n"
+"QUELQUE CHOSE DE MÃCHANT\n"
+"il est également possible que la clef du serveur ait juste\n"
+"changée\n"
+"l'hôte distant a envoyée la clef %s\n"
+"j'attendais %s\n"
+"« monotone unset %s %s » pour passer outre cette verification\n"
+
+#: netsync.cc:1528
+#, c-format
+msgid "server key changed"
+msgstr "la clef du serveur a changée"
+
+#: netsync.cc:1533
+#, c-format
+msgid ""
+"first time connecting to server %s\n"
+"I'll assume it's really them, but you might want to double-check\n"
+"their key's fingerprint: %s\n"
+msgstr ""
+"Première connexion au serveur %s\n"
+"Je considère qu'il s'agit vraiment de lui, mais vous devriez peut-être\n"
+"re-vérifier l'empreinte de leur clef : %s\n"
+
+#: netsync.cc:1540
+#, fuzzy, c-format
+msgid "saving public key for %s to database\n"
+msgstr "suppression de la clef publique « %s » de la base de données\n"
+
+#: netsync.cc:1547
+#, c-format
+msgid "received 'hello' netcmd from server '%s' with nonce '%s'\n"
+msgstr ""
+
+#: netsync.cc:1628
+#, c-format
+msgid "rejected attempt at anonymous connection for write\n"
+msgstr ""
+
+#: netsync.cc:1635
+#, c-format
+msgid "rejected attempt at anonymous connection while running as sink\n"
+msgstr ""
+
+#: netsync.cc:1652
+#, c-format
+msgid "anonymous access to branch '%s' denied by server"
+msgstr "accès anonyme à la branche « %s » refusé par le serveur"
+
+#: netsync.cc:1657
+#, fuzzy, c-format
+msgid "allowed anonymous read permission for '%s' excluding '%s'\n"
+msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n"
+
+#: netsync.cc:1689
+#, c-format
+msgid "detected replay attack in auth netcmd\n"
+msgstr ""
+
+#: netsync.cc:1714
+#, c-format
+msgid "remote public key hash '%s' is unknown\n"
+msgstr ""
+
+#: netsync.cc:1731
+#, fuzzy, c-format
+msgid ""
+"denied '%s' read permission for '%s' excluding '%s' while running as pure "
+"sink\n"
+msgstr "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n"
+
+#: netsync.cc:1747
+#, fuzzy, c-format
+msgid ""
+"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n"
+msgstr "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n"
+
+#: netsync.cc:1749
+#, c-format
+msgid "access to branch '%s' denied by server"
+msgstr "accès à la branche « %s » refusé par le serveur"
+
+#: netsync.cc:1757
+#, fuzzy, c-format
+msgid "allowed '%s' read permission for '%s' excluding '%s'\n"
+msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n"
+
+#: netsync.cc:1766
+#, fuzzy, c-format
+msgid ""
+"denied '%s' write permission for '%s' excluding '%s' while running as pure "
+"source\n"
+msgstr "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n"
+
+#: netsync.cc:1774
+#, c-format
+msgid "denied '%s' write permission for '%s' excluding '%s'\n"
+msgstr "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n"
+
+#: netsync.cc:1780
+#, c-format
+msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
+msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n"
+
+#: netsync.cc:1795
+#, c-format
+msgid "client signature OK, accepting authentication\n"
+msgstr "signature du client 0K, authentification acceptée\n"
+
+#: netsync.cc:1817
+#, c-format
+msgid "bad client signature\n"
+msgstr "signature du client invalide\n"
+
+#: netsync.cc:1832
+#, c-format
+msgid ""
+"received 'confirm' netcmd from server '%s' for pattern '%s' exclude '%s' in %"
+"s mode\n"
+msgstr ""
+
+#: netsync.cc:1834 netsync.cc:2831 netsync.cc:2862
msgid "source and sink"
msgstr "source et puit"
-#: ../netsync.cc:1835 ../netsync.cc:2832 ../netsync.cc:2863
+#: netsync.cc:1835 netsync.cc:2832 netsync.cc:2863
msgid "sink"
msgstr "puit"
-#: ../netsync.cc:1835 ../netsync.cc:2832 ../netsync.cc:2863
+#: netsync.cc:1835 netsync.cc:2832 netsync.cc:2863
msgid "source"
msgstr "source"
-#: ../rcs_import.cc:1283
-msgid "tags"
+#: netsync.cc:1848
+#, c-format
+msgid "server signature OK, accepting authentication\n"
+msgstr "signature du serveur 0K, authentification acceptée\n"
+
+#: netsync.cc:1853
+#, c-format
+msgid "bad server signature\n"
+msgstr "signature du serveur invalide\n"
+
+#: netsync.cc:1858
+#, c-format
+msgid "unknown server key\n"
+msgstr "clef du serveur inconnue\n"
+
+#: netsync.cc:1927
+#, fuzzy, c-format
+msgid "epoch with hash '%s' does not exist in our database"
+msgstr "la révision de base %s n'existe pas dans la base de données\n"
+
+#: netsync.cc:1937
+#, fuzzy, c-format
+msgid "public key '%s' is also called '%s'\n"
+msgstr "le fichier rc « %s » n'existe pas"
+
+#: netsync.cc:1956
+#, fuzzy, c-format
+msgid "revision '%s' does not exist in our database"
+msgstr "la révision de base %s n'existe pas dans la base de données\n"
+
+#: netsync.cc:1970
+#, fuzzy, c-format
+msgid "manifest '%s' does not exist in our database"
msgstr ""
+"la version du manifeste « %s » existe déjà dans notre base de données\n"
-#: ../sanity.cc:182
-msgid "misuse: "
-msgstr "mauvais usage : "
+#: netsync.cc:1984
+#, fuzzy, c-format
+msgid "file '%s' does not exist in our database"
+msgstr "le fichier « %s » n'existe pas dans la copie de travail"
-#: ../sanity.cc:194
-msgid "error: "
-msgstr "erreur :"
+#: netsync.cc:1998
+#, fuzzy, c-format
+msgid "cert '%s' does not exist in our database"
+msgstr "le certificat « %s » existe déjà dans notre base de données\n"
-#: ../std_hooks.lua:28
-msgid "Press enter when the subprocess has completed"
-msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé"
+#: netsync.cc:2017
+#, c-format
+msgid "received 'refine' netcmd on %s node '%s', level %d\n"
+msgstr ""
-#: ../std_hooks.lua:221
+#: netsync.cc:2022
#, c-format
-msgid "Error running editor '%s' to enter log message\n"
+msgid "no corresponding %s merkle node for prefix '%s', level %d\n"
msgstr ""
-"Erreur pendant l'exécution de « %s » pour saisir le message du journal\n"
-#: ../std_hooks.lua:563
-msgid "executing external 2-way merge command\n"
+#: netsync.cc:2077
+#, c-format
+msgid "found corresponding %s merkle node for prefix '%s', level %d\n"
msgstr ""
-#: ../std_hooks.lua:671
-msgid "executing external 3-way merge command\n"
+#: netsync.cc:2408
+#, c-format
+msgid "received 'send_data' netcmd requesting %s '%s'\n"
msgstr ""
-#. xgettext: mebibytes (2^20 bytes)
-#: ../ui.cc:119
+#: netsync.cc:2436
#, c-format
-msgid "%.1f M"
-msgstr "%.1f Mi"
+msgid "received 'send_delta' netcmd requesting %s edge '%s' -> '%s'\n"
+msgstr ""
-#. xgettext: kibibytes (2^10 bytes)
-#: ../ui.cc:124
+#: netsync.cc:2490
#, c-format
-msgid "%.1f k"
-msgstr "%.1f ki"
+msgid "delta requested for item type %s\n"
+msgstr ""
-#: ../ui.cc:369
-msgid "monotone: "
-msgstr "monotone: "
+#: netsync.cc:2513
+#, fuzzy, c-format
+msgid "epoch '%s' already exists in our database\n"
+msgstr "le certificat « %s » existe déjà dans notre base de données\n"
-#~ msgid "branch name is '%s'\n"
-#~ msgstr "le nom de la branche est « %s »\n"
+#: netsync.cc:2520
+#, fuzzy, c-format
+msgid "received epoch %s for branch %s\n"
+msgstr "erreur réseau : %s"
-#~ msgid "creating working copy in %s\n"
-#~ msgstr "création d'une copie de travail dans %s\n"
+#: netsync.cc:2527
+#, fuzzy, c-format
+msgid "branch %s has no epoch; setting epoch to %s\n"
+msgstr "la branche %s a %d entrées\n"
-#~ msgid "unknown path '%s'\n"
-#~ msgstr "chemin inconnu « %s »\n"
+#: netsync.cc:2533
+#, c-format
+msgid "branch %s already has an epoch; checking\n"
+msgstr ""
-#, fuzzy
-#~ msgid "search root '%s' does not exist"
-#~ msgstr "le fichier rc « %s » n'existe pas"
+#: netsync.cc:2544
+#, c-format
+msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
+msgstr ""
-#, fuzzy
-#~ msgid "search root '%s' is not a directory\n"
-#~ msgstr "la racin"
+#: netsync.cc:2555
+#, c-format
+msgid "public key '%s' already exists in our database\n"
+msgstr "la clef publique « %s » existe déjà dans notre base de données\n"
-#~ msgid "negative depth not allowed\n"
-#~ msgstr "profondeur négative interdite\n"
+#: netsync.cc:2564
+#, c-format
+msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
+msgstr ""
-#~ msgid "Failed to read options file %s"
-#~ msgstr "La lecture du fichier d'options « %s » a échouée"
+#: netsync.cc:2573
+#, c-format
+msgid "cert '%s' already exists in our database\n"
+msgstr "le certificat « %s » existe déjà dans notre base de données\n"
-#~ msgid "Failed to write options file %s"
-#~ msgstr "L'écriture du fichier d'options « %s » a échouée"
+#: netsync.cc:2581
+#, fuzzy, c-format
+msgid "hash check failed for revision cert '%s'"
+msgstr "insertion de la nouvelle révision %s\n"
-#~ msgid "error in %s:%d:%d:E: %s"
-#~ msgstr "erreur dans %s:%d:%d:EÂ : %s"
+#: netsync.cc:2597
+#, c-format
+msgid "revision '%s' already exists in our database\n"
+msgstr "la révision « %s » existe déjà dans notre base de données\n"
-#~ msgid "cert ok\n"
-#~ msgstr "certificat OK\n"
+#: netsync.cc:2600
+#, fuzzy, c-format
+msgid "received revision '%s'\n"
+msgstr "erreur réseau : %s"
-#~ msgid ""
-#~ "you have no private key to make signatures with\n"
-#~ "perhaps you need to 'genkey '"
-#~ msgstr ""
-#~ "vous n'avez pas de clef privé pour établir des signatures,\n"
-#~ "vous avez sans doute besoin de faire « genkey  »"
+#: netsync.cc:2619
+#, c-format
+msgid "manifest version '%s' already exists in our database\n"
+msgstr ""
+"la version du manifeste « %s » existe déjà dans notre base de données\n"
-#~ msgid ""
-#~ "you have multiple private keys\n"
-#~ "pick one to use for signatures by adding '-k' to your command"
-#~ msgstr ""
-#~ "vous avez plusieurs clefs privés\n"
-#~ "choisissez-en une à utiliser pour vos signatures en ajoutant « -"
-#~ "k » à votre commande"
+#: netsync.cc:2634
+#, c-format
+msgid "file version '%s' already exists in our database\n"
+msgstr "la version « %s » du fichier existe déjà dans notre base de données\n"
-#~ msgid "conflict detected, resolved in A's favour\n"
-#~ msgstr "conflit détecté, résolu en faveur de A\n"
+#: netsync.cc:2720
+#, c-format
+msgid "ignoring delta received for item type %s\n"
+msgstr ""
-#~ msgid "conflict detected, resolved in B's favour\n"
-#~ msgstr "conflit détecté, résolu en faveur de B\n"
+#: netsync.cc:2734
+#, c-format
+msgid "received 'nonexistant' netcmd for %s '%s'\n"
+msgstr ""
-#~ msgid "moving file %s -> %s\n"
-#~ msgstr "déplacement du fichier %s -> %s\n"
+#: netsync.cc:2746
+#, fuzzy, c-format
+msgid "Received warning from usher: %s"
+msgstr "erreur réseau : %s"
-#~ msgid "moving dir %s -> %s\n"
-#~ msgstr "déplacement du dossier %s -> %s\n"
+#: netsync.cc:2748
+#, fuzzy, c-format
+msgid "Received greeting from usher: %s"
+msgstr "erreur réseau : %s"
-#~ msgid "executing command '%s'\n"
-#~ msgstr "exécution de la commande « %s »\n"
+#: netsync.cc:2753
+#, c-format
+msgid "Sent reply."
+msgstr "Réponse envoyée."
-#~ msgid "unknown command '%s'\n"
-#~ msgstr "commande inconnue « %s »\n"
+#: netsync.cc:2828
+#, c-format
+msgid ""
+"received 'anonymous' netcmd from client for pattern '%s' excluding '%s' in %"
+"s mode\n"
+msgstr ""
-#~ msgid "pid file '%s' already exists"
-#~ msgstr "le fichier pid « %s » existe déjà "
+#: netsync.cc:2859
+#, c-format
+msgid ""
+"received 'auth(hmac)' netcmd from client '%s' for pattern '%s' exclude '%s' "
+"in %s mode with nonce1 '%s'\n"
+msgstr ""
-#~ msgid "edit of log message failed"
-#~ msgstr "l'édition du message du journal a échouée"
+#: netsync.cc:3031
+#, fuzzy, c-format
+msgid "processing %d byte input buffer from peer %s\n"
+msgstr "%d octets écris sur le descripteur de fichier %d (pair %s)\n"
-#~ msgid "no such revision '%s'"
-#~ msgstr "aucune révision « %s »"
+#: netsync.cc:3034
+#, c-format
+msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
+msgstr ""
-#~ msgid "expanding selection '%s'\n"
-#~ msgstr "expansion de la sélection « %s »\n"
+#: netsync.cc:3038
+#, c-format
+msgid "failed to process '%s' packet"
+msgstr "échec du traitement du paquet « %s »"
-#~ msgid "no match for selection '%s'"
-#~ msgstr "aucune correspondance pour la sélection « %s »"
+#: netsync.cc:3043 netsync.cc:3083 netsync.cc:3110
+#, fuzzy, c-format
+msgid "protocol error while processing peer %s: '%s'\n"
+msgstr "erreur lua lors du chargement de « %s »"
-#~ msgid "selection '%s' has multiple ambiguous expansions: \n"
-#~ msgstr "la sélection « %s » a plusieurs expansions ambigües : \n"
+#: netsync.cc:3068
+#, c-format
+msgid "connecting to %s\n"
+msgstr "connexion à %s\n"
-#~ msgid "non-hex digits in id"
-#~ msgstr "chiffre non-héxadécimal dans l'id"
+#: netsync.cc:3096
+#, fuzzy, c-format
+msgid "timed out waiting for I/O with peer %s, disconnecting\n"
+msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n"
-#, fuzzy
-#~ msgid "partial id '%s' does not have an expansion"
-#~ msgstr "le fichier rc « %s » n'existe pas"
+#: netsync.cc:3118
+#, fuzzy, c-format
+msgid "read from fd %d (peer %s) closed OK after goodbye\n"
+msgstr "la lecture du fd %d (pair %s) fermée OK après aurevoir\n"
-#, fuzzy
-#~ msgid "partial id '%s' has multiple ambiguous expansions:\n"
-#~ msgstr "le fichier rc « %s » n'existe pas"
+#: netsync.cc:3120
+#, c-format
+msgid "read from fd %d (peer %s) failed, disconnecting\n"
+msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n"
-#~ msgid "no public key '%s' found in database"
-#~ msgstr "aucune clef publique « %s » dans la base de données"
+#: netsync.cc:3130
+#, c-format
+msgid "write on fd %d (peer %s) closed OK after goodbye\n"
+msgstr "la écriture du fd %d (pair %s) a échouée, déconnexion\n"
-#~ msgid "(*) - only in %s/"
-#~ msgstr "(*) - uniquement dans %s/"
+#: netsync.cc:3132
+#, fuzzy, c-format
+msgid "write on fd %d (peer %s) failed, disconnecting\n"
+msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n"
-#~ msgid "no keys found\n"
-#~ msgstr "aucune clef trouvée\n"
+#: netsync.cc:3139
+#, fuzzy, c-format
+msgid "got OOB data on fd %d (peer %s), disconnecting\n"
+msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n"
-#~ msgid "no keys found matching '%s'\n"
-#~ msgstr "aucune clef correspondant à « %s »\n"
+#: netsync.cc:3148
+#, c-format
+msgid "terminated exchange with %s\n"
+msgstr "échange avorté avec %s\n"
-#~ msgid "revision %s already has children. We cannot kill it."
-#~ msgstr "la révision %s a déjà des descendants. Impossible de la tuer."
+#: netsync.cc:3156
+#, c-format
+msgid "successful exchange with %s\n"
+msgstr "échange réussi avec %s\n"
-#~ msgid "key '%s' already exists"
-#~ msgstr "la clef « %s » existe déjà "
+#: netsync.cc:3177
+#, fuzzy, c-format
+msgid "fd %d is armed\n"
+msgstr "le noeud %d est un noeud racine\n"
-#~ msgid "generating key-pair '%s'"
-#~ msgstr "génératio de la paire de clef « %s »"
+#: netsync.cc:3184
+#, c-format
+msgid "protocol error while processing peer %s: '%s', marking as bad\n"
+msgstr ""
-#, fuzzy
-#~ msgid "storing key-pair '%s' in %s/"
-#~ msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs\n"
+#: netsync.cc:3206
+#, c-format
+msgid "accepting new connection on %s : %s\n"
+msgstr "nouvelle connexion sur %s : %s\n"
-#~ msgid "dropping public key '%s' from database\n"
-#~ msgstr "suppression de la clef publique « %s » de la base de données\n"
+#: netsync.cc:3212
+#, c-format
+msgid "accept() returned a dead client\n"
+msgstr "accept() à renvoyée un client mort\n"
-#, fuzzy
-#~ msgid "dropping key pair '%s' from keystore\n"
-#~ msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs\n"
+#: netsync.cc:3216
+#, fuzzy, c-format
+msgid "accepted new client connection from %s : %s\n"
+msgstr "connexion d'un nouveau client de %s\n"
-#, fuzzy
-#~ msgid "public or private key '%s' does not exist in keystore or database"
-#~ msgstr ""
-#~ "la clef publique ou privée « %s » n'existe pas dans la base de données"
+#: netsync.cc:3244
+#, c-format
+msgid "protocol error while processing peer %s: '%s', disconnecting\n"
+msgstr ""
-#, fuzzy
-#~ msgid ""
-#~ "public or private key '%s' does not exist in keystore, and no database "
-#~ "was specified"
-#~ msgstr ""
-#~ "la clef publique ou privée « %s » n'existe pas dans la base de données"
+#: netsync.cc:3252
+#, c-format
+msgid "fd %d (peer %s) read failed, disconnecting\n"
+msgstr "la lecture sur le fd %d (pair %s) a échouée, déconnexion\n"
-#, fuzzy
-#~ msgid "key '%s' does not exist in the keystore"
-#~ msgstr "la clef « %s » n'existe pas dans la base de données"
+#: netsync.cc:3268
+#, c-format
+msgid "fd %d (peer %s) write failed, disconnecting\n"
+msgstr "l'écriture sur le fd %d (pair %s) a échouée, déconnexion\n"
-#~ msgid "passphrase changed\n"
-#~ msgstr "la phrase de passe à changée\n"
+#: netsync.cc:3292
+#, c-format
+msgid "fd %d (peer %s) processing finished, disconnecting\n"
+msgstr "traitement du fd %d (pair %s) terminé, déconnexion\n"
-#, fuzzy
-#~ msgid "revision '%s' has %d changesets, cannot invert\n"
-#~ msgstr "la révision %s n'existe pas"
+#: netsync.cc:3314
+#, c-format
+msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
+msgstr "le fd %d (pair %s) est inactif depuis trop longtemps, déconnexion\n"
-#~ msgid "edit comment failed"
-#~ msgstr "l'édition du commentaire a échouée"
+#: netsync.cc:3320
+#, fuzzy, c-format
+msgid "fd %d (peer %s) exchanged goodbyes and flushed output, disconnecting\n"
+msgstr "la lecture sur le fd %d (pair %s) a échouée, déconnexion\n"
-#~ msgid "empty comment"
-#~ msgstr "commentaire vide"
+#: netsync.cc:3366
+#, fuzzy, c-format
+msgid "beginning service on %s : %s\n"
+msgstr "début du service sur %s : %d\n"
-#~ msgid "left file id does not exist"
-#~ msgstr "l'id du fichier gauche n'existe pas"
+#: netsync.cc:3378
+#, c-format
+msgid "session limit %d reached, some connections will be refused\n"
+msgstr ""
-#~ msgid "right file id does not exist"
-#~ msgstr "l'id du fichier droit n'existe pas"
+#: netsync.cc:3384
+#, c-format
+msgid "i/o probe with %d armed\n"
+msgstr ""
-#~ msgid "merge failed"
-#~ msgstr "la fusion a échouée"
+#: netsync.cc:3394
+#, c-format
+msgid "timed out waiting for I/O (listening on %s : %s)\n"
+msgstr ""
-#~ msgid "no file '%s' found in revision '%s'\n"
-#~ msgstr "aucun fichier « %s » dans la révision « %s »\n"
+#: netsync.cc:3410
+#, c-format
+msgid "got woken up for action on unknown fd %d\n"
+msgstr ""
-#, fuzzy
-#~ msgid "dumping file '%s'\n"
-#~ msgstr "importation du fichier « %s »\n"
+#: netsync.cc:3425
+#, fuzzy, c-format
+msgid "got some OOB data on fd %d (peer %s), disconnecting\n"
+msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n"
-#, fuzzy
-#~ msgid "checkout directory '%s' already exists"
-#~ msgstr "le fichier pid « %s » existe déjà "
+#: netsync.cc:3487
+#, c-format
+msgid "finding items to synchronize:\n"
+msgstr "recherche d'éléments à synchroniser :\n"
-#~ msgid "branch '%s' is empty\n"
-#~ msgstr "la branche « %s » est vide\n"
+#: netsync.cc:3490
+#, c-format
+msgid "including branch %s"
+msgstr "inclusion de la branche %s"
-#~ msgid "revision %s is not a member of branch %s\n"
-#~ msgstr "la révision %s n'est pas membre de la branche %s\n"
+#: netsync.cc:3549
+#, c-format
+msgid "setting epoch on %s to zero\n"
+msgstr ""
-#~ msgid "please specify a branch, with --branch=BRANCH"
-#~ msgstr "veuillez préciser une branche avec --branch=BRANCHE"
+#: netsync.cc:3598
+#, c-format
+msgid "Cannot find key '%s'"
+msgstr "Impossible de trouver la clef « %s »"
-#~ msgid "branch '%s' is currently merged:\n"
-#~ msgstr "la branche « %s » est actuellement fusionnée :\n"
+#: netsync.cc:3652 netsync.cc:3656
+#, c-format
+msgid "network error: %s"
+msgstr "erreur réseau : %s"
-#~ msgid "branch '%s' is currently unmerged:\n"
-#~ msgstr "la branche « %s » n'est actuellement pas fusionnée :\n"
+#: netsync.cc:3710
+#, c-format
+msgid "ancestry_fetcher: got %d heads"
+msgstr ""
-#~ msgid "no such manifest '%s'"
-#~ msgstr "aucun manifeste « %s »"
+#: netsync.cc:3820
+#, c-format
+msgid "traversing head %s"
+msgstr ""
-#~ msgid "no such file '%s'"
-#~ msgstr "aucun fichier « %s »"
+#: packet.cc:330
+#, c-format
+msgid "writing delayed revision data packet for %s\n"
+msgstr ""
-#, fuzzy
-#~ msgid "public key '%s' does not exist"
-#~ msgstr "le fichier rc « %s » n'existe pas"
+#: packet.cc:337
+#, c-format
+msgid "discarding revision data packet %s with unmet dependencies\n"
+msgstr ""
-#, fuzzy
-#~ msgid "public and private key '%s' do not exist in keystore"
-#~ msgstr ""
-#~ "la clef publique ou privée « %s » n'existe pas dans la base de données"
+#: packet.cc:343
+#, c-format
+msgid "writing delayed manifest data packet for %s\n"
+msgstr ""
-#~ msgid "no packets found on stdin"
-#~ msgstr "aucun paquet trouvé sur l'entrée standard"
+#: packet.cc:350
+#, c-format
+msgid "discarding manifest data packet %s with unmet dependencies\n"
+msgstr ""
-#~ msgid "no packets found in given file"
-#~ msgid_plural "no packets found in given files"
-#~ msgstr[0] "aucun paquet trouvé dans le fichier spécifié"
-#~ msgstr[1] "aucun paquet trouvé dans les fichiers spécifiés"
+#: packet.cc:356
+#, c-format
+msgid "writing delayed file data packet for %s\n"
+msgstr ""
-#~ msgid "read %d packet"
-#~ msgid_plural "read %d packets"
-#~ msgstr[0] "lu %d paquet"
-#~ msgstr[1] "lu %d paquets"
+#: packet.cc:369
+#, c-format
+msgid "writing delayed manifest %s packet for %s -> %s%s\n"
+msgstr ""
-#~ msgid "no hostname given"
-#~ msgstr "aucun nom d'hôte fourni"
+#: packet.cc:383
+#, c-format
+msgid "discarding manifest delta packet %s -> %s with unmet dependencies\n"
+msgstr ""
-#~ msgid "using default server address: %s\n"
-#~ msgstr "utilisation de l'adresse par défaut du serveur : %s\n"
+#: packet.cc:390
+#, c-format
+msgid "writing delayed file %s packet for %s -> %s%s\n"
+msgstr ""
-#~ msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
-#~ msgstr ""
-#~ "récupération anonyme; utilisez -kNOMCLEF si vous avez besoin d'une "
-#~ "authentification\n"
+#: packet.cc:404
+#, c-format
+msgid "discarding file delta packet %s -> %s with unmet dependencies\n"
+msgstr ""
-#~ msgid "no changes to commit\n"
-#~ msgstr "aucun changement à valider\n"
+#: packet.cc:411
+#, fuzzy, c-format
+msgid "writing delayed revision cert on %s\n"
+msgstr "insertion de la nouvelle révision %s\n"
-#~ msgid ""
-#~ "new manifest '%s'\n"
-#~ "new revision '%s'\n"
-#~ msgstr ""
-#~ "nouveau manifeste « %s »\n"
-#~ "nouvelle révision « %s »\n"
+#: packet.cc:418
+#, c-format
+msgid "discarding revision cert packet %s with unmet dependencies\n"
+msgstr ""
-#~ msgid "--message and --message-file are mutually exclusive"
-#~ msgstr "--message et --message-file sont mutuellement exclusifs"
+#: packet.cc:425
+#, fuzzy, c-format
+msgid "writing delayed public key %s\n"
+msgstr "vérification de %d clefs publiques\n"
-#, fuzzy
-#~ msgid ""
-#~ "MT/log is non-empty and --message supplied\n"
-#~ "perhaps move or delete MT/log,\n"
-#~ "or remove --message from the command line?"
-#~ msgstr "MT/log n'est pas vide et --message-file a été passé\n"
+#: packet.cc:438
+#, c-format
+msgid "writing delayed private key %s\n"
+msgstr ""
-#, fuzzy
-#~ msgid "empty log message; commit canceled"
-#~ msgstr "message du journal vide"
+#: packet.cc:608
+#, fuzzy, c-format
+msgid "noting acceptence of revision %s\n"
+msgstr "insertion de la nouvelle révision %s\n"
-#~ msgid "revision %s already in database\n"
-#~ msgstr "la révision %s est déjà dans la base de données\n"
+#: packet.cc:621
+#, c-format
+msgid "noting acceptence of manifest %s\n"
+msgstr ""
-#~ msgid "inserting new revision %s\n"
-#~ msgstr "insertion de la nouvelle révision %s\n"
+#: packet.cc:634
+#, c-format
+msgid "noting acceptence of file %s\n"
+msgstr ""
-#~ msgid "file '%s' modified during commit, aborting"
-#~ msgstr "le fichier « %s » a été modifié pendant le commit, interruption"
+#: packet.cc:656
+#, fuzzy, c-format
+msgid "skipping existing file version %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#~ msgid ""
-#~ "--diff-args requires --external\n"
-#~ "try adding --external or removing --diff-args?"
-#~ msgstr ""
-#~ "--diff-args requiet --external\n"
-#~ "essayez d'ajouter --external ou de retirer --diff-args ?"
+#: packet.cc:696
+#, c-format
+msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n"
+msgstr ""
-#~ msgid "current revision has no ancestor"
-#~ msgstr "la révision actuelle n'existe pas"
+#: packet.cc:702
+#, c-format
+msgid "delaying file delta %s -> %s for preimage\n"
+msgstr ""
-#~ msgid "no common ancestor for %s and %s"
-#~ msgstr "pas d'ancêtre commun pour %s et %s"
+#: packet.cc:712
+#, fuzzy, c-format
+msgid "skipping delta to existing file version %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#~ msgid "updating %s to %s\n"
-#~ msgstr "mise à jour de %s en %s\n"
+#: packet.cc:740
+#, c-format
+msgid "reconstructed file from reverse delta '%s' -> '%s' has wrong id '%s'\n"
+msgstr ""
-#~ msgid "this working directory is a new project; cannot update"
-#~ msgstr ""
-#~ "ce dossier de travail est un nouveau projet, impossible de mettre à jour"
+#: packet.cc:746
+#, c-format
+msgid "delaying reverse file delta %s -> %s for preimage\n"
+msgstr ""
-#~ msgid "multiple update candidates:\n"
-#~ msgstr "plusieurs candidats pour la mise à jour :\n"
+#: packet.cc:756
+#, fuzzy, c-format
+msgid "skipping reverse delta to existing file version %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#~ msgid "choose one with 'monotone update -r'\n"
-#~ msgstr "choisissez en un avec « monotone update -r »\n"
+#: packet.cc:773
+#, fuzzy, c-format
+msgid "skipping existing manifest version %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#~ msgid "already up to date at %s\n"
-#~ msgstr "déjà à jour en %s\n"
+#: packet.cc:814
+#, c-format
+msgid "reconstructed manifest from delta '%s' -> '%s' has wrong id '%s'\n"
+msgstr ""
-#~ msgid "selected update target %s\n"
-#~ msgstr "sélection de la cible %s pour la mise à jour\n"
+#: packet.cc:820
+#, c-format
+msgid "delaying manifest delta %s -> %s for preimage\n"
+msgstr ""
-#~ msgid "updated to base revision %s\n"
-#~ msgstr "mise à jour vers la révision de base %s\n"
+#: packet.cc:830
+#, fuzzy, c-format
+msgid "skipping delta to existing manifest version %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#, fuzzy
-#~ msgid ""
-#~ "common ancestor %s found\n"
-#~ "trying 3-way merge\n"
-#~ msgstr "aucun ancêtre commun n'a été trouvé"
+#: packet.cc:858
+#, c-format
+msgid ""
+"reconstructed manifest from reverse delta '%s' -> '%s' has wrong id '%s'\n"
+msgstr ""
-#~ msgid "branch '%s' is merged\n"
-#~ msgstr "la branche « %s » est fusionnée\n"
+#: packet.cc:864
+#, c-format
+msgid "delaying manifest reverse delta %s -> %s for preimage\n"
+msgstr ""
-#~ msgid "[source] %s\n"
-#~ msgstr "[source] %s\n"
+#: packet.cc:874
+#, c-format
+msgid "skipping reverse delta to existing manifest version %s\n"
+msgstr ""
-#~ msgid "[merged] %s\n"
-#~ msgstr "[fusionné] %s\n"
+#: packet.cc:896
+#, fuzzy, c-format
+msgid "delaying revision %s for new manifest %s\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
-#~ msgid "branch '%s' is not merged\n"
-#~ msgstr "la branche « %s » n'est pas fusionnée\n"
+#: packet.cc:910
+#, fuzzy, c-format
+msgid "delaying revision %s for old manifest %s\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
-#~ msgid "[target] %s\n"
-#~ msgstr "[cible] %s\n"
+#: packet.cc:920
+#, fuzzy, c-format
+msgid "delaying revision %s for old revision %s\n"
+msgstr "la révision de base %s n'existe pas dans la base de données\n"
-#~ msgid "%s is not an ancestor of %s"
-#~ msgstr "%s n'est pas un ancêtre de %s"
+#: packet.cc:933
+#, fuzzy, c-format
+msgid "delaying revision %s for old file %s\n"
+msgstr "erreur lors de la lecture du fichier RCS %s : %s\n"
-#~ msgid "%s is already an ancestor of %s"
-#~ msgstr "%s est déjà un ancêtre de %s"
+#: packet.cc:943
+#, fuzzy, c-format
+msgid "delaying revision %s for new file %s\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
-#~ msgid "no such file '%s' in revision '%s'\n"
-#~ msgstr "aucun fichier « %s » dans la révision « %s »\n"
+#: packet.cc:961
+#, fuzzy, c-format
+msgid "skipping existing revision %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#, fuzzy
-#~ msgid "checking %d files\n"
-#~ msgstr "la vérification de « %s » a échouée"
+#: packet.cc:979
+#, fuzzy, c-format
+msgid "delaying revision cert on %s\n"
+msgstr "insertion de la nouvelle révision %s\n"
-#, fuzzy
-#~ msgid "checking file %s\n"
-#~ msgstr "importation du fichier « %s »\n"
+#: packet.cc:992
+#, fuzzy, c-format
+msgid "skipping existing revision cert %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#~ msgid "checking manifest %s\n"
-#~ msgstr "vérification du manifeste « %s »\n"
+#: packet.cc:1006
+#, fuzzy, c-format
+msgid "skipping prohibited public key %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#~ msgid "error parsing manifest %s: %s"
-#~ msgstr "erreur lors de l'analyse du manifeste %s : %s"
+#: packet.cc:1019
+#, c-format
+msgid "key '%s' is not equal to key '%s' in database\n"
+msgstr ""
+"la clef « %s » n'est pas égale à la clef « %s » dans la base de données\n"
-#~ msgid "checking %d revisions\n"
-#~ msgstr "verification de %d révisions\n"
+#: packet.cc:1020
+#, fuzzy, c-format
+msgid "skipping existing public key %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#~ msgid "checking revision %s\n"
-#~ msgstr "vérification de la révisions %s\n"
+#: packet.cc:1033
+#, fuzzy, c-format
+msgid "skipping prohibited key pair %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#, fuzzy
-#~ msgid "error parsing revision %s: %s"
-#~ msgstr "erreur lors de la lecture du fichier RCS %s : %s\n"
+#: packet.cc:1042
+#, fuzzy, c-format
+msgid "skipping existing key pair %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#~ msgid "checking %d public keys\n"
-#~ msgstr "vérification de %d clefs publiques\n"
+#: packet.cc:1078
+#, c-format
+msgid "packet valve opened\n"
+msgstr ""
-#, fuzzy
-#~ msgid "checking %d revision certs\n"
-#~ msgstr "insertion de la nouvelle révision %s\n"
+#: packet.cc:1090
+#, c-format
+msgid "wrote %i queued packets\n"
+msgstr "écriture de %i paquets en attente\n"
-#~ msgid "file %s unreferenced\n"
-#~ msgstr "fichier %s non-référencé\n"
+#: packet.cc:1362
+#, c-format
+msgid "malformed packet"
+msgstr "paquet malformé"
-#, fuzzy
-#~ msgid "revision %s has bad history (%s)\n"
-#~ msgstr "la révision %s est déjà dans la base de données\n"
+#: packet.cc:1378
+#, fuzzy, c-format
+msgid "read data packet"
+msgstr "lecture d'un paquet de donnée\n"
-#, fuzzy
-#~ msgid "revision %s is not in normalized form\n"
-#~ msgstr "la révision %s n'est pas membre de la branche %s\n"
+#: packet.cc:1398
+#, fuzzy, c-format
+msgid "read delta packet"
+msgstr "lecture d'un paquet delta\n"
-#, fuzzy
-#~ msgid "key %s signed %d certs\n"
-#~ msgstr "clef et certificat"
+#: packet.cc:1429
+#, fuzzy, c-format
+msgid "read cert packet"
+msgstr "lecture d'un paquet certificat\n"
-#, fuzzy
-#~ msgid "%d missing files\n"
-#~ msgstr "importation du fichier « %s »\n"
+#: packet.cc:1449 packet.cc:1468
+#, fuzzy, c-format
+msgid "read pubkey data packet"
+msgstr "lecture d'un paquet de données\n"
-#~ msgid "%d unreferenced files\n"
-#~ msgstr "%d fichiers non-référencés\n"
+#: packet.cc:1458
+#, fuzzy, c-format
+msgid "read keypair data packet"
+msgstr "lecture d'un paquet de données\n"
-#, fuzzy
-#~ msgid "%d missing manifests\n"
-#~ msgstr "noeud %d = révision %s = manifeste %s\n"
+#: packet.cc:1481
+#, fuzzy, c-format
+msgid "unknown packet type: '%s'"
+msgstr "chemin inconnu « %s »\n"
-#~ msgid "%d unreferenced manifests\n"
-#~ msgstr "%d manifestes non-référencés\n"
+#: rcs_file.cc:343
+#, c-format
+msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n"
+msgstr ""
-#~ msgid "%d incomplete manifests\n"
-#~ msgstr "%d manifestes incomplets\n"
+#: rcs_file.cc:362
+#, c-format
+msgid "parse failure %d:%d: expecting word '%s'\n"
+msgstr ""
-#, fuzzy
-#~ msgid "%d missing revisions\n"
-#~ msgstr "insertion de la nouvelle révision %s\n"
+#: rcs_file.cc:377
+#, c-format
+msgid "parse failure %d:%d: expecting word\n"
+msgstr ""
-#, fuzzy
-#~ msgid "%d incomplete revisions\n"
-#~ msgstr "nouvelle révisions %s\n"
+#: rcs_import.cc:247
+#, fuzzy, c-format
+msgid "Calculating time of %s\n"
+msgstr "mise à jour de %s en %s\n"
-#~ msgid "%d missing keys\n"
-#~ msgstr "%d clefs manquantes\n"
+#: rcs_import.cc:281
+#, fuzzy, c-format
+msgid "version %s -> tag %s\n"
+msgstr "la version %s a %d lignes\n"
-#~ msgid "%d missing certs\n"
-#~ msgstr "%d certificats manquants\n"
+#: rcs_import.cc:448
+#, fuzzy, c-format
+msgid "skipping identity file edge\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#, fuzzy
-#~ msgid "%d mismatched certs\n"
-#~ msgstr "%d"
+#: rcs_import.cc:456 rcs_import.cc:482
+#, c-format
+msgid "existing path to %s found, skipping\n"
+msgstr ""
-#~ msgid "%d bad signatures\n"
-#~ msgstr "%d mauvaises signatures\n"
+#: rcs_import.cc:474
+#, c-format
+msgid "skipping identity manifest edge\n"
+msgstr ""
-#~ msgid "serious problems detected"
-#~ msgstr "problèmes sérieux détectés"
+#: rcs_import.cc:592
+#, c-format
+msgid "version %s has %d lines\n"
+msgstr "la version %s a %d lignes\n"
-#~ msgid "minor problems detected\n"
-#~ msgstr "problèmes mineurs détectés\n"
+#: rcs_import.cc:605
+#, fuzzy, c-format
+msgid "following RCS edge %s -> %s\n"
+msgstr "déplacement du dossier %s -> %s\n"
-#~ msgid "database is good\n"
-#~ msgstr "la base de données est bonne\n"
+#: rcs_import.cc:608
+#, fuzzy, c-format
+msgid "constructed RCS version %s, inserting into database\n"
+msgstr ""
+"la version du manifeste « %s » existe déjà dans notre base de données\n"
-#~ msgid "database %s does not exist"
-#~ msgstr "la base de données %s n'existe pas"
+#: rcs_import.cc:651
+#, c-format
+msgid "following RCS branch %s = '%s'\n"
+msgstr ""
-#~ msgid "%s is a directory, not a database"
-#~ msgstr "%s est un dossier, pas une base de données"
+#: rcs_import.cc:661
+#, c-format
+msgid "finished RCS branch %s = '%s'\n"
+msgstr ""
-#~ msgid "database %s is not an sqlite version 3 file, try dump and reload"
-#~ msgstr ""
-#~ "la base de données %s n'est pas un fichier sqlite version 3, essayer dump "
-#~ "puis reload"
+#: rcs_import.cc:682 rcs_import.cc:730
+#, c-format
+msgid "parsing RCS file %s\n"
+msgstr "analyse du fichier RCS %s\n"
-#~ msgid "sqlite error: %d: %s"
-#~ msgstr "erreur sqlite : %d : %s"
+#: rcs_import.cc:684 rcs_import.cc:733
+#, c-format
+msgid "parsed RCS file %s OK\n"
+msgstr "analyse du fichier RCS %s OK\n"
-#~ msgid "could not initialize database: %s: already exists"
-#~ msgstr "impossible d'initialiser la base de données : %s : elle existe déjà "
+#: rcs_import.cc:773
+#, c-format
+msgid "importing file '%s'\n"
+msgstr "importation du fichier « %s »\n"
-#~ msgid "cannot create %s; it already exists"
-#~ msgstr "impossible de créer %s car ceci existe déjà "
+#: rcs_import.cc:845
+#, c-format
+msgid "first version in branch %s would be %s\n"
+msgstr ""
-#~ msgid ""
-#~ "schema version : %s\n"
-#~ "counts:\n"
-#~ " full manifests : %u\n"
-#~ " manifest deltas : %u\n"
-#~ " full files : %u\n"
-#~ " file deltas : %u\n"
-#~ " revisions : %u\n"
-#~ " ancestry edges : %u\n"
-#~ " certs : %u\n"
-#~ "bytes:\n"
-#~ " full manifests : %u\n"
-#~ " manifest deltas : %u\n"
-#~ " full files : %u\n"
-#~ " file deltas : %u\n"
-#~ " revisions : %u\n"
-#~ " cached ancestry : %u\n"
-#~ " certs : %u\n"
-#~ " total : %u\n"
-#~ msgstr ""
-#~ "version du schéma : %s\n"
-#~ "comptes:\n"
-#~ " manifestes complets : %u\n"
-#~ " deltas de manifestes : %u\n"
-#~ " fichiers complets : %u\n"
-#~ " deltas de fichiers : %u\n"
-#~ " révisions : %u\n"
-#~ " ancestry edges : %u\n"
-#~ " certificats : %u\n"
-#~ "octets:\n"
-#~ " manifestes complets : %u\n"
-#~ " deltas de manifestes : %u\n"
-#~ " fichiers complets : %u\n"
-#~ " deltas de fichiers : %u\n"
-#~ " révisions : %u\n"
-#~ " cached ancestry : %u\n"
-#~ " certificats : %u\n"
-#~ " total : %u\n"
+#: rcs_import.cc:852
+#, c-format
+msgid "file branchpoint for %s at %s\n"
+msgstr ""
-#~ msgid "database schema version: %s"
-#~ msgstr "version du schéma de la base de données : %s"
+#: rcs_import.cc:922
+#, c-format
+msgid "error reading RCS file %s: %s\n"
+msgstr "erreur lors de la lecture du fichier RCS %s : %s\n"
-#~ msgid "statement cache statistics\n"
-#~ msgstr "statistiques relatives au cache des expressions\n"
+#: rcs_import.cc:926
+#, fuzzy, c-format
+msgid "skipping non-RCS file %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#~ msgid "prepared %d statements\n"
-#~ msgstr "%d expressions préparées\n"
+#: rcs_import.cc:1105
+#, c-format
+msgid "examining next commit [t:%d] [p:%s] [a:%s] [c:%s]\n"
+msgstr ""
-#~ msgid "%d executions of %s\n"
-#~ msgstr "%d exécutions de %s\n"
+#: rcs_import.cc:1118
+#, c-format
+msgid "expiring cluster\n"
+msgstr ""
-#, fuzzy
-#~ msgid "after get_branch_heads for %s, heads has %d entries\n"
-#~ msgstr "la branche %s a %d entrées\n"
+#: rcs_import.cc:1134
+#, c-format
+msgid "examining cluster %d to see if it touched %d\n"
+msgstr ""
-#~ msgid "no database specified"
-#~ msgstr "aucune base de données n'a été spécifiée"
+#: rcs_import.cc:1142
+#, c-format
+msgid "found cluster touching %d: [t:%d] [a:%d] [c:%d]\n"
+msgstr ""
-#~ msgid "could not open database '%s': %s"
-#~ msgstr "impossible d'ouvrir la base de données « %s » : %s"
+#: rcs_import.cc:1150
+#, c-format
+msgid "last modification time is %d\n"
+msgstr "la date de dernière modification est %d\n"
-#~ msgid "conflicting prefixes\n"
-#~ msgstr "préfixes en conflit\n"
+#: rcs_import.cc:1166
+#, c-format
+msgid "picked existing cluster [t:%d] [a:%d] [c:%d]\n"
+msgstr ""
-#~ msgid "conflicting suffixes\n"
-#~ msgstr "suffixes en conflit\n"
+#: rcs_import.cc:1180
+#, c-format
+msgid "building new cluster [t:%d] [a:%d] [c:%d]\n"
+msgstr ""
-#~ msgid "conflict detected. no merge.\n"
-#~ msgstr "conflit détecté, pas de fusion.\n"
+#: rcs_import.cc:1205
+#, c-format
+msgid "finished branch commits, writing all pending clusters\n"
+msgstr ""
-#~ msgid "files are identical\n"
-#~ msgstr "les fichiers sont identiques\n"
+#: rcs_import.cc:1211
+#, c-format
+msgid "finished writing pending clusters\n"
+msgstr ""
-#~ msgid ""
-#~ "help required for 3-way merge\n"
-#~ "[ancestor] %s\n"
-#~ "[ left] %s\n"
-#~ "[ right] %s\n"
-#~ "[ merged] %s\n"
-#~ msgstr ""
-#~ "aide requise pour la fusion de 3 fichiers\n"
-#~ "[ ancêtre] %s\n"
-#~ "[ gauche] %s\n"
-#~ "[ droite] %s\n"
-#~ "[fusionné] %s\n"
+#: rcs_import.cc:1223
+#, c-format
+msgid ""
+"%s appears to be a CVS repository root directory\n"
+"try importing a module instead, with 'cvs_import %s/"
+msgstr ""
-#~ msgid ""
-#~ "help required for 2-way merge\n"
-#~ "[ left] %s\n"
-#~ "[ right] %s\n"
-#~ "[ merged] %s\n"
-#~ msgstr ""
-#~ "aide requise pour la fusion de 2 fichiers\n"
-#~ "[ gauche] %s\n"
-#~ "[ droite] %s\n"
-#~ "[fusionné] %s\n"
+#: rcs_import.cc:1235
+#, c-format
+msgid "need base --branch argument for importing"
+msgstr ""
-#~ msgid "file '%s' does not exist in working copy"
-#~ msgstr "le fichier « %s » n'existe pas dans la copie de travail"
+#: rcs_import.cc:1247
+#, c-format
+msgid "path %s does not exist"
+msgstr "le chemin %s n'existe pas"
-#~ msgid ""
-#~ "could not create directory '%s'\n"
-#~ "it is a file"
-#~ msgstr ""
-#~ "impossible de créer le dossier « %s »\n"
-#~ "car c'est un fichier"
+#: rcs_import.cc:1266
+#, c-format
+msgid "branch %s has %d entries\n"
+msgstr "la branche %s a %d entrées\n"
-#~ msgid ""
-#~ "could not create directory '%s'\n"
-#~ "%s"
-#~ msgstr ""
-#~ "impossible de créer le dossier « %s »\n"
-#~ "%s"
+#: rcs_import.cc:1276
+#, fuzzy, c-format
+msgid "trunk has %d entries\n"
+msgstr "la branche %s a %d entrées\n"
-#~ msgid "could not create directory '%s'"
-#~ msgstr "impossible de créer le dossier « %s »"
+#: rcs_import.cc:1283
+msgid "tags"
+msgstr ""
-#, fuzzy
-#~ msgid "failed to create directory '%s' for '%s'"
-#~ msgstr "impossible de créer le dossier : %s : %s\n"
+#: rcs_import.cc:1329
+#, fuzzy, c-format
+msgid "initial cluster on branch %s has %d live entries\n"
+msgstr "la branche %s a %d entrées\n"
-#~ msgid "file to delete '%s' does not exist"
-#~ msgstr "le fichier à supprimer « %s » n'existe pas"
+#: rcs_import.cc:1336
+#, fuzzy, c-format
+msgid "initial cluster contains %s at %s\n"
+msgstr "le chemin initial est %s\n"
-#, fuzzy
-#~ msgid "file to delete, '%s', is not a file but a directory"
-#~ msgstr "le fichier à supprimer « %s » n'existe pas"
+#: rcs_import.cc:1382
+#, fuzzy, c-format
+msgid "storing manifest '%s' (base %s)\n"
+msgstr "erreur lors de l'analyse du manifeste %s : %s"
-#, fuzzy
-#~ msgid "directory to delete, '%s', does not exist"
-#~ msgstr "le dossier à supprimer « %s » n'existe pas"
+#: rcs_import.cc:1387
+#, fuzzy, c-format
+msgid "storing head %s\n"
+msgstr "importation du fichier « %s »\n"
-#, fuzzy
-#~ msgid "directory to delete, '%s', is a file"
-#~ msgstr "le dossier à supprimer « %s » n'existe pas"
+#: rcs_import.cc:1402
+#, c-format
+msgid "skipping delta to null manifest\n"
+msgstr ""
-#, fuzzy
-#~ msgid "rename target '%s' already exists"
-#~ msgstr "le fichier pid « %s » existe déjà "
+#: rcs_import.cc:1414
+#, c-format
+msgid "skipping cyclical manifest delta %s -> %s\n"
+msgstr ""
-#, fuzzy
-#~ msgid "rename source path '%s' does not exist"
-#~ msgstr "le chemin %s n'existe pas"
+#: rcs_import.cc:1420
+#, fuzzy, c-format
+msgid "writing full manifest %s\n"
+msgstr "vérification du manifeste « %s »\n"
-#~ msgid "file %s does not exist"
-#~ msgstr "le fichier %s n'existe pas"
+#: rcs_import.cc:1430
+#, fuzzy, c-format
+msgid "storing manifest delta %s -> %s\n"
+msgstr "erreur lors de l'analyse du manifeste %s : %s"
-#~ msgid "file %s cannot be read as data; it is a directory"
-#~ msgstr "le fichier %s ne peut être lu; c'est un dossier"
+#: rcs_import.cc:1492
+#, c-format
+msgid "adding entry state '%s' on '%s'\n"
+msgstr ""
-#~ msgid "cannot open file %s for reading"
-#~ msgstr "impossible d'ouvrir le fichier %s pour le lire"
+#: rcs_import.cc:1499
+#, c-format
+msgid "applying state delta on '%s' : '%s' -> '%s'\n"
+msgstr ""
-#~ msgid "Cannot read standard input multiple times"
-#~ msgstr "Impossible de lire l'entrée standard plusieurs fois"
+#: rcs_import.cc:1510
+#, c-format
+msgid "deleting entry state '%s' on '%s'\n"
+msgstr ""
-#~ msgid "cannot open file %s for writing"
-#~ msgstr "impossible d'ouvrir le fichier %s pour l'écrire"
+#: rcs_import.cc:1529
+#, c-format
+msgid "BEGIN consume_cluster()\n"
+msgstr ""
-#~ msgid "no such file or directory: '%s'"
-#~ msgstr "Aucun fichier ou répertoire de ce type : « %s »"
+#: rcs_import.cc:1549
+#, c-format
+msgid "END consume_cluster('%s') (parent '%s')\n"
+msgstr ""
-#~ msgid "got empty passphrase from get_passphrase() hook"
-#~ msgstr "la phrase de passe obtenue depuis get_passphrase() est vide"
+#: revision.cc:126
+#, c-format
+msgid "verifying new revisions (this may take a while)\n"
+msgstr "vérification des nouvelles révisions (ceci peut prendre du temps)\n"
-#~ msgid "empty passphrase not allowed"
-#~ msgstr "la phrase de passe ne doit pas être vide"
+#: revision.cc:128
+#, fuzzy, c-format
+msgid "Verifying revision %s has sane history (to depth %i)\n"
+msgstr "la révision %s est déjà dans la base de données\n"
-#~ msgid "confirm passphrase for key ID [%s]: "
-#~ msgstr "confirmez la phrase de passe pour la clef d'ID [%s]Â :"
+#: revision.cc:166
+#, fuzzy, c-format
+msgid "Examining %s -> %s\n"
+msgstr "déplacement du dossier %s -> %s\n"
-#~ msgid "passphrases do not match, try again\n"
-#~ msgstr "les phrases de passe ne correspondent pas, essayez à nouveau\n"
+#: revision.cc:243
+#, fuzzy, c-format
+msgid "%s and %s have no common ancestor, so done\n"
+msgstr "aucun ancêtre commun n'a été trouvé"
-#~ msgid "no passphrase given"
-#~ msgstr "aucune phrase de passe fournie"
+#: revision.cc:249
+#, fuzzy, c-format
+msgid "already checked common ancestor, so done\n"
+msgstr "l'ancêtre commun est %s\n"
-#~ msgid ""
-#~ "generated %d-byte public key\n"
-#~ "generated %d-byte (encrypted) private key\n"
-#~ msgstr ""
-#~ "clef publique de %d octets générée\n"
-#~ "clef privée (chiffrée) de %d octets générée\n"
+#: revision.cc:252
+#, c-format
+msgid "%s is a merge; verifying paths to common ancestor %s are sane\n"
+msgstr ""
-#, fuzzy
-#~ msgid "have %d-byte encrypted private key\n"
-#~ msgstr ""
-#~ "clef publique de %d octets générée\n"
-#~ "clef privée (chiffrée) de %d octets générée\n"
+#: revision.cc:310
+#, fuzzy, c-format
+msgid "loading parents for node %d\n"
+msgstr "parent %s -> noeud %d\n"
-#~ msgid "passphrase for '%s' is incorrect"
-#~ msgstr "la phrase de passe pour « %s » est incorrecte"
+#: revision.cc:332
+#, c-format
+msgid "parent %s -> node %d\n"
+msgstr "parent %s -> noeud %d\n"
-#, fuzzy
-#~ msgid "Lua::ok(): failed"
-#~ msgstr "Lua::ok() : échec = %i"
+#: revision.cc:482
+#, c-format
+msgid "found %d intersecting nodes\n"
+msgstr ""
-#~ msgid "lua stack: %s"
-#~ msgstr "pile lua : %s"
+#: revision.cc:535
+#, fuzzy, c-format
+msgid "searching for common ancestor, left=%s right=%s\n"
+msgstr "pas d'ancêtre commun pour « %s » et « %s »\n"
-#~ msgid "lua: extracted string = %s"
-#~ msgstr "lua : chaîne extraite = %s"
+#: revision.cc:540
+#, fuzzy, c-format
+msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n"
+msgstr "l'ancêtre commun est %s\n"
-#~ msgid "lua: extracted int = %i"
-#~ msgstr "lua : int extrait = %i"
+#: revision.cc:545
+#, c-format
+msgid "found node %d, ancestor of left %s and dominating right %s\n"
+msgstr ""
-#~ msgid "lua: extracted double = %i"
-#~ msgstr "lua : double extrait = %i"
+#: revision.cc:552
+#, c-format
+msgid "found node %d, ancestor of right %s and dominating left %s\n"
+msgstr ""
-#~ msgid "lua: extracted bool = %i"
-#~ msgstr "lua : bool extrait = %i"
+#: revision.cc:589
+#, fuzzy, c-format
+msgid "searching for least common ancestor, left=%s right=%s\n"
+msgstr "l'ancêtre commun est %s\n"
-#~ msgid "%s called with an invalid parameter"
-#~ msgstr "%s a été appelé avec un paramètre invalide"
+#: revision.cc:593
+#, fuzzy, c-format
+msgid "least common ancestor scan [par=%d,anc=%d]\n"
+msgstr "l'ancêtre commun est %s\n"
-#~ msgid "Directory '%s' does not exists"
-#~ msgstr "le dossier « %s » n'existe pas"
+#: revision.cc:598
+#, fuzzy, c-format
+msgid "found node %d, ancestor of left %s and right %s\n"
+msgstr "pas d'ancêtre commun pour « %s » et « %s »\n"
-#~ msgid "'%s' is not a directory"
-#~ msgstr "« %s » n'est pas un dossier"
+#: revision.cc:652
+#, c-format
+msgid "checking whether %s is an ancestor of %s\n"
+msgstr "vérification si %s est un ancêtre de %s\n"
-#~ msgid "opening rcfile '%s' ...\n"
-#~ msgstr "ouverture du fichier rc « %s » ...\n"
+#: revision.cc:764
+#, c-format
+msgid "new root: %s\n"
+msgstr "nouvelle racine : %s\n"
-#~ msgid "'%s' is ok\n"
-#~ msgstr "« %s » est 0K\n"
+#: revision.cc:779
+#, c-format
+msgid "new leaf: %s\n"
+msgstr "nouvelle feuille : %s\n"
-#~ msgid "lua error while loading '%s'"
-#~ msgstr "erreur lua lors du chargement de « %s »"
+#: revision.cc:921
+#, c-format
+msgid "exploring changesets from parents of %s, seeking towards %s\n"
+msgstr ""
-#~ msgid "rcfile '%s' does not exist"
-#~ msgstr "le fichier rc « %s » n'existe pas"
+#: revision.cc:934
+#, fuzzy, c-format
+msgid "considering parent %s of %s\n"
+msgstr "connexion à %s\n"
-#~ msgid "scanning file %s\n"
-#~ msgstr "analyse du fichier %s\n"
+#: revision.cc:960
+#, fuzzy, c-format
+msgid "revision %s is relevant, composing with edge to %s\n"
+msgstr "la révision %s n'est pas membre de la branche %s\n"
-#, fuzzy
-#~ msgid ""
-#~ "%d missing files\n"
-#~ "to restore consistency, on each missing file run either\n"
-#~ "'monotone drop FILE' to remove it permanently, or\n"
-#~ "'monotone revert FILE' to restore it\n"
-#~ "or to handle all at once, simple 'monotone drop --missing'\n"
-#~ "or 'monotone revert --missing'"
-#~ msgstr ""
-#~ "%d fichiers manquants\n"
-#~ "pour restaurer un état consistent, pour chaque fichier manquant\n"
-#~ "lancer soit « monotone drop FICHIER » pour le supprimer définitivement,\n"
-#~ "soit « monotone revert FICHIER » pour le restaurer\n"
+#: revision.cc:967
+#, fuzzy, c-format
+msgid "parent %s of %s is not relevant\n"
+msgstr "le chemin %s n'existe pas\n"
-#~ msgid "command line: %s\n"
-#~ msgstr "ligne de commande : %s\n"
+#: revision.cc:1003
+#, c-format
+msgid "adding parents of %s to subgraph\n"
+msgstr ""
-#~ msgid "set locale: LC_ALL=%s\n"
-#~ msgstr "paramétrage de la locale : LC_ALL=%s\n"
+#: revision.cc:1013
+#, fuzzy, c-format
+msgid "found parent %s of %s\n"
+msgstr "parent %s -> noeud %d\n"
-#~ msgid "syntax error near the \"%s\" option: %s"
-#~ msgstr "erreur de syntaxe près de l'option « %s » : %s"
+#: revision.cc:1017
+#, c-format
+msgid "adding parent %s to next frontier\n"
+msgstr ""
-#~ msgid "monotone %s doesn't use the option %s"
-#~ msgstr "monotone %s n'utilise pas l'option %s"
+#: revision.cc:1032
+#, c-format
+msgid "calculating composite changeset between %s and %s\n"
+msgstr ""
-#~ msgid "Options specific to 'monotone %s':"
-#~ msgstr "Options spécifiques à « monotone %s » :"
+#: revision.cc:1050
+#, fuzzy, c-format
+msgid "calculating changeset from %s to %s\n"
+msgstr "conversion de %d octets de %s en %s\n"
-#~ msgid "%s (base revision: %s)"
-#~ msgstr "%s (révision de base : %s)"
+#: revision.cc:1054
+#, c-format
+msgid "no common ancestor for %s and %s\n"
+msgstr "pas d'ancêtre commun pour « %s » et « %s »\n"
-#~ msgid ""
-#~ "Running on: %s\n"
-#~ "Changes since base revision: %s\n"
-#~ msgstr ""
-#~ "En cours d'exécution sur : %s\n"
-#~ "Changements depuis la révision de base : %s\n"
+#: revision.cc:1055
+#, c-format
+msgid "common ancestor is %s\n"
+msgstr "l'ancêtre commun est %s\n"
-#~ msgid "unknown item type 0x%x for '%s'"
-#~ msgstr "type d'élément inconnu 0x%x pour « %s »"
+#: revision.cc:1086
+#, c-format
+msgid "analyzing manifest changes from '%s' -> '%s'\n"
+msgstr ""
-#~ msgid "unknown netcmd code 0x%x"
-#~ msgstr "code de commande netcmd inconnu 0x%x"
+#: revision.cc:1099
+#, fuzzy, c-format
+msgid "splitting ancestry for file %s\n"
+msgstr "%s n'est pas un ancêtre de %s"
-#~ msgid "oversized payload of '%d' bytes"
-#~ msgstr "charge utile surdimensionnée de '%d' octets"
+#: revision.cc:1166
+#, c-format
+msgid "noting ancestry from child %d -> parent %d\n"
+msgstr ""
-#~ msgid ""
-#~ "bad HMAC checksum (got %s, wanted %s)\n"
-#~ "this suggests data was corrupted in transit\n"
-#~ msgstr ""
-#~ "mauvaise somme de contrôle HMAC (reçu %s, attendu %s)\n"
-#~ "ceci suggère que les données ont été corrompues pendant le transit\n"
+#: revision.cc:1199
+#, fuzzy, c-format
+msgid "setting epoch for %s to %s\n"
+msgstr "conversion de %d octets de %s en %s\n"
-#~ msgid "need %d bytes to decode %s at %d, only have %d"
-#~ msgstr ""
-#~ "%d octets sont nécessaire pour décoder %s à %d, seulement %d sont "
-#~ "disponibles"
+#: revision.cc:1255
+#, c-format
+msgid "scanning for nodes with 3+ parents\n"
+msgstr ""
-#~ msgid "check of '%s' failed"
-#~ msgstr "la vérification de « %s » a échouée"
+#: revision.cc:1296
+#, c-format
+msgid "optimizing out redundant edge %i -> %i\n"
+msgstr ""
-#~ msgid "error: %s\n"
-#~ msgstr "erreur : %s\n"
+#: revision.cc:1323
+#, c-format
+msgid "rebuilding %d nodes\n"
+msgstr ""
-#~ msgid "read %d bytes from fd %d (peer %s)\n"
-#~ msgstr "%d octets lu sur le descripteur de fichier %d (pair %s)\n"
+#: revision.cc:1360
+#, fuzzy, c-format
+msgid "node %d = manifest %s\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
-#~ msgid "wrote %d bytes to fd %d (peer %s)\n"
-#~ msgstr "%d octets écris sur le descripteur de fichier %d (pair %s)\n"
+#: revision.cc:1371
+#, c-format
+msgid "loaded '%s' manifest cert for node %s\n"
+msgstr ""
-#, fuzzy
-#~ msgid "received network error: %s"
-#~ msgstr "erreur réseau : %s"
+#: revision.cc:1399
+#, c-format
+msgid "node %d = revision %s = manifest %s\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
-#~ msgid "server key has name %s, hash %s\n"
-#~ msgstr "le nom du serveur est %s, et son hachi %s :)\n"
+#: revision.cc:1411
+#, fuzzy, c-format
+msgid "loaded '%s' revision cert for node %s\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
-#~ msgid ""
-#~ "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
-#~ "@ WARNING: SERVER IDENTIFICATION HAS CHANGED @\n"
-#~ "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
-#~ "IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY\n"
-#~ "it is also possible that the server key has just been changed\n"
-#~ "remote host sent key %s\n"
-#~ "I expected %s\n"
-#~ "'monotone unset %s %s' overrides this check\n"
-#~ msgstr ""
-#~ "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
-#~ "@ ATTENTION : L'IDENTIFICATION DU SERVEUR A CHANGÃE @\n"
-#~ "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
-#~ "IL EST POSSIBLE QUE QUELQU'UN SOIT ENTRAIN DE FAIRE\n"
-#~ "QUELQUE CHOSE DE MÃCHANT\n"
-#~ "il est également possible que la clef du serveur ait juste\n"
-#~ "changée\n"
-#~ "l'hôte distant a envoyée la clef %s\n"
-#~ "j'attendais %s\n"
-#~ "« monotone unset %s %s » pour passer outre cette verification\n"
+#: revision.cc:1435
+#, fuzzy, c-format
+msgid "processing node %d\n"
+msgstr "parent %s -> noeud %d\n"
-#~ msgid "server key changed"
-#~ msgstr "la clef du serveur a changée"
+#: revision.cc:1439
+#, c-format
+msgid "node %d already processed, skipping\n"
+msgstr ""
-#~ msgid ""
-#~ "first time connecting to server %s\n"
-#~ "I'll assume it's really them, but you might want to double-check\n"
-#~ "their key's fingerprint: %s\n"
-#~ msgstr ""
-#~ "Première connexion au serveur %s\n"
-#~ "Je considère qu'il s'agit vraiment de lui, mais vous devriez peut-être\n"
-#~ "re-vérifier l'empreinte de leur clef : %s\n"
+#: revision.cc:1453
+#, c-format
+msgid "node %d is a root node\n"
+msgstr "le noeud %d est un noeud racine\n"
-#~ msgid "anonymous access to branch '%s' denied by server"
-#~ msgstr "accès anonyme à la branche « %s » refusé par le serveur"
+#: revision.cc:1469 revision.cc:1552
+#, fuzzy, c-format
+msgid "parent node %d = revision %s\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
-#~ msgid "access to branch '%s' denied by server"
-#~ msgstr "accès à la branche « %s » refusé par le serveur"
+#: revision.cc:1531
+#, c-format
+msgid "processing edge from child %d -> parent %d\n"
+msgstr ""
-#~ msgid "denied '%s' write permission for '%s' excluding '%s'\n"
-#~ msgstr ""
-#~ "permission d'écrire refuser à « %s » pour « %s » en excluant « %s »\n"
+#: revision.cc:1569
+#, fuzzy, c-format
+msgid "mapped node %d to revision %s\n"
+msgstr "mise à jour vers la révision de base %s\n"
-#~ msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
-#~ msgstr ""
-#~ "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »\n"
+#: revision.cc:1575
+#, fuzzy, c-format
+msgid "skipping already existing revision %s\n"
+msgstr "%s existe déjà dans la révision actuelle\n"
-#~ msgid "client signature OK, accepting authentication\n"
-#~ msgstr "signature du client 0K, authentification acceptée\n"
+#: revision.cc:1587
+#, c-format
+msgid "rebuilding revision graph from existing graph\n"
+msgstr ""
-#~ msgid "bad client signature\n"
-#~ msgstr "signature du client invalide\n"
+#: revision.cc:1619
+#, fuzzy, c-format
+msgid "rebuilding revision graph from manifest certs\n"
+msgstr "noeud %d = révision %s = manifeste %s\n"
-#~ msgid "server signature OK, accepting authentication\n"
-#~ msgstr "signature du serveur 0K, authentification acceptée\n"
+#: sanity.cc:38
+#, fuzzy, c-format
+msgid "started up on %s\n"
+msgstr "déjà à jour en %s\n"
-#~ msgid "bad server signature\n"
-#~ msgstr "signature du serveur invalide\n"
+#: sanity.cc:54
+#, c-format
+msgid "wrote debugging log to %sif reporting a bug, please include this file"
+msgstr ""
-#~ msgid "unknown server key\n"
-#~ msgstr "clef du serveur inconnue\n"
+#: sanity.cc:59
+#, fuzzy, c-format
+msgid "failed to write debugging log to %s\n"
+msgstr "impossible d'écrire le journal de debogage sur %s"
-#~ msgid "public key '%s' already exists in our database\n"
-#~ msgstr "la clef publique « %s » existe déjà dans notre base de données\n"
+#: sanity.cc:110
+#, c-format
+msgid "fatal: formatter failed on %s:%d: %s"
+msgstr "fatal : le formatteur a échoué à %s:%d : %s"
-#~ msgid "cert '%s' already exists in our database\n"
-#~ msgstr "le certificat « %s » existe déjà dans notre base de données\n"
+#: sanity.cc:184
+msgid "misuse: "
+msgstr "mauvais usage : "
-#~ msgid "revision '%s' already exists in our database\n"
-#~ msgstr "la révision « %s » existe déjà dans notre base de données\n"
+#: sanity.cc:196
+msgid "error: "
+msgstr "erreur :"
-#, fuzzy
-#~ msgid "received revision '%s'\n"
-#~ msgstr "erreur réseau : %s"
+#: sanity.cc:234
+#, c-format
+msgid "ignoring request to give last gasp; already in process of dumping\n"
+msgstr ""
-#~ msgid "manifest version '%s' already exists in our database\n"
-#~ msgstr ""
-#~ "la version du manifeste « %s » existe déjà dans notre base de données\n"
+#: sanity.cc:238
+#, c-format
+msgid "saving current work set: %i items"
+msgstr ""
-#~ msgid "file version '%s' already exists in our database\n"
-#~ msgstr ""
-#~ "la version « %s » du fichier existe déjà dans notre base de données\n"
+#: sanity.cc:240
+#, c-format
+msgid "Current work set: %i items\n"
+msgstr ""
-#, fuzzy
-#~ msgid "Received warning from usher: %s"
-#~ msgstr "erreur réseau : %s"
+#: sanity.cc:254 sanity.cc:260
+#, c-format
+msgid "ignoring error trigged by saving work set to debug log"
+msgstr ""
-#, fuzzy
-#~ msgid "Received greeting from usher: %s"
-#~ msgstr "erreur réseau : %s"
+#: sanity.cc:264
+#, c-format
+msgid "finished saving work set"
+msgstr ""
-#~ msgid "Sent reply."
-#~ msgstr "Réponse envoyée."
+#: schema_migration.cc:47
+#, fuzzy, c-format
+msgid "executing SQL '%s'"
+msgstr "exécution de la commande « %s »\n"
-#~ msgid "failed to process '%s' packet"
-#~ msgstr "échec du traitement du paquet « %s »"
+#: schema_migration.cc:49
+#, c-format
+msgid "result: %i (%s)"
+msgstr ""
-#~ msgid "connecting to %s\n"
-#~ msgstr "connexion à %s\n"
+#: schema_migration.cc:51
+#, fuzzy, c-format
+msgid "errmsg: %s"
+msgstr "erreur : %s\n"
-#, fuzzy
-#~ msgid "read from fd %d (peer %s) closed OK after goodbye\n"
-#~ msgstr "la lecture du fd %d (pair %s) fermée OK après aurevoir\n"
+#: schema_migration.cc:184
+#, c-format
+msgid "failure extracting schema from sqlite_master"
+msgstr ""
-#~ msgid "read from fd %d (peer %s) failed, disconnecting\n"
-#~ msgstr "la lecture du fd %d (pair %s) a échouée, déconnexion\n"
+#: schema_migration.cc:227
+#, c-format
+msgid "error at transaction BEGIN statement"
+msgstr ""
-#~ msgid "write on fd %d (peer %s) closed OK after goodbye\n"
-#~ msgstr "la écriture du fd %d (pair %s) a échouée, déconnexion\n"
+#: schema_migration.cc:254
+#, c-format
+msgid "migration step failed: %s"
+msgstr ""
-#~ msgid "terminated exchange with %s\n"
-#~ msgstr "échange avorté avec %s\n"
+#: schema_migration.cc:268
+#, c-format
+msgid "mismatched result of migration, got %s, wanted %s"
+msgstr ""
-#~ msgid "successful exchange with %s\n"
-#~ msgstr "échange réussi avec %s\n"
+#: schema_migration.cc:271
+#, fuzzy, c-format
+msgid "committing changes to database"
+msgstr "paramétrer le nom de la base de données"
-#~ msgid "accepting new connection on %s : %s\n"
-#~ msgstr "nouvelle connexion sur %s : %s\n"
+#: schema_migration.cc:273
+#, c-format
+msgid "failure on COMMIT"
+msgstr ""
-#~ msgid "accept() returned a dead client\n"
-#~ msgstr "accept() à renvoyée un client mort\n"
+#: schema_migration.cc:275
+#, c-format
+msgid "optimizing database"
+msgstr ""
-#, fuzzy
-#~ msgid "accepted new client connection from %s : %s\n"
-#~ msgstr "connexion d'un nouveau client de %s\n"
+#: schema_migration.cc:277
+#, c-format
+msgid "error vacuuming after migration"
+msgstr ""
-#~ msgid "fd %d (peer %s) read failed, disconnecting\n"
-#~ msgstr "la lecture sur le fd %d (pair %s) a échouée, déconnexion\n"
+#: schema_migration.cc:280
+#, c-format
+msgid "error running analyze after migration"
+msgstr ""
-#~ msgid "fd %d (peer %s) write failed, disconnecting\n"
-#~ msgstr "l'écriture sur le fd %d (pair %s) a échouée, déconnexion\n"
+#: schema_migration.cc:287
+#, c-format
+msgid "database schema %s is unknown; cannot perform migration"
+msgstr ""
+"le schéma de la base de données %s est inconnu; impossible d'effectuer la "
+"migration"
-#~ msgid "fd %d (peer %s) processing finished, disconnecting\n"
-#~ msgstr "traitement du fd %d (pair %s) terminé, déconnexion\n"
+#: schema_migration.cc:292
+#, c-format
+msgid "no migration performed; database schema already up-to-date at %s\n"
+msgstr ""
+"aucune migration n'a été effectuée; le schéma de la base de données est déjà "
+"Ã jour en %s\n"
-#~ msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
-#~ msgstr "le fd %d (pair %s) est inactif depuis trop longtemps, déconnexion\n"
+#: schema_migration.cc:842
+#, fuzzy, c-format
+msgid "public and private keys for %s don't match"
+msgstr "la clef publique ou privée « %s » n'existe pas dans la base de données"
-#, fuzzy
-#~ msgid "beginning service on %s : %s\n"
-#~ msgstr "début du service sur %s : %d\n"
+#: schema_migration.cc:845
+#, fuzzy, c-format
+msgid "moving key '%s' from database to %s"
+msgstr "aucune clef publique « %s » dans la base de données"
-#~ msgid "finding items to synchronize:\n"
-#~ msgstr "recherche d'éléments à synchroniser :\n"
+#: std_hooks.lua:28
+msgid "Press enter when the subprocess has completed"
+msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé"
-#~ msgid "including branch %s"
-#~ msgstr "inclusion de la branche %s"
+#: std_hooks.lua:211
+#, c-format
+msgid "Error running editor '%s' to enter log message\n"
+msgstr ""
+"Erreur pendant l'exécution de « %s » pour saisir le message du journal\n"
-#~ msgid "Cannot find key '%s'"
-#~ msgstr "Impossible de trouver la clef « %s »"
+#: std_hooks.lua:553
+msgid "executing external 2-way merge command\n"
+msgstr ""
-#~ msgid "network error: %s"
-#~ msgstr "erreur réseau : %s"
+#: std_hooks.lua:661
+msgid "executing external 3-way merge command\n"
+msgstr ""
-#~ msgid "key '%s' is not equal to key '%s' in database\n"
-#~ msgstr ""
-#~ "la clef « %s » n'est pas égale à la clef « %s » dans la base de données\n"
+#: transforms.cc:521
+#, c-format
+msgid "converting %d bytes from %s to %s\n"
+msgstr "conversion de %d octets de %s en %s\n"
-#, fuzzy
-#~ msgid "skipping prohibited key pair %s\n"
-#~ msgstr "omission du fichier %s qui peut ignoré\n"
+#: transforms.cc:527
+#, c-format
+msgid "failed to convert string from %s to %s: '%s'"
+msgstr "impossible de convertir la chaîne de %s en %s : « %s »"
-#, fuzzy
-#~ msgid "skipping existing key pair %s\n"
-#~ msgstr "omission du fichier %s qui peut ignoré\n"
+#: transforms.cc:667
+#, fuzzy, c-format
+msgid "converting %d bytes from IDNA ACE to UTF-8\n"
+msgstr "conversion de %d octets d'UTF-8 en IDNA ACE\n"
-#~ msgid "wrote %i queued packets\n"
-#~ msgstr "écriture de %i paquets en attente\n"
+#: transforms.cc:670 transforms.cc:684
+#, fuzzy, c-format
+msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
+msgstr "conversion de %d octets d'UTF-8 en IDNA ACE\n"
-#~ msgid "malformed packet"
-#~ msgstr "paquet malformé"
+#: transforms.cc:681
+#, c-format
+msgid "converting %d bytes from UTF-8 to IDNA ACE\n"
+msgstr "conversion de %d octets d'UTF-8 en IDNA ACE\n"
-#, fuzzy
-#~ msgid "read data packet"
-#~ msgstr "lecture d'un paquet de donnée\n"
+#: transforms.cc:829
+#, fuzzy, c-format
+msgid "doing linesep conversion to %s\n"
+msgstr "conversion des "
-#, fuzzy
-#~ msgid "read delta packet"
-#~ msgstr "lecture d'un paquet delta\n"
+#: ui.cc:120
+#, c-format
+msgid "%.1f M"
+msgstr "%.1f Mi"
-#, fuzzy
-#~ msgid "read cert packet"
-#~ msgstr "lecture d'un paquet certificat\n"
+#: ui.cc:125
+#, c-format
+msgid "%.1f k"
+msgstr "%.1f ki"
-#, fuzzy
-#~ msgid "read pubkey data packet"
-#~ msgstr "lecture d'un paquet de données\n"
+#: ui.cc:134
+#, c-format
+msgid "%d"
+msgstr "%d"
-#, fuzzy
-#~ msgid "read keypair data packet"
-#~ msgstr "lecture d'un paquet de données\n"
+#: ui.cc:326
+#, c-format
+msgid ""
+"fatal: %s\n"
+"this is almost certainly a bug in monotone.\n"
+"please send this error message, the output of 'monotone --full-version',\n"
+"and a description of what you were doing to %s.\n"
+msgstr ""
-#, fuzzy
-#~ msgid "unknown packet type: '%s'"
-#~ msgstr "chemin inconnu « %s »\n"
+#: ui.cc:369
+msgid "monotone: "
+msgstr "monotone: "
-#~ msgid "version %s has %d lines\n"
-#~ msgstr "la version %s a %d lignes\n"
+#: update.cc:66
+#, c-format
+msgid "failed to decode boolean testresult cert value '%s'\n"
+msgstr ""
-#~ msgid "parsing RCS file %s\n"
-#~ msgstr "analyse du fichier RCS %s\n"
+#: update.cc:78
+#, fuzzy, c-format
+msgid "Considering update target %s\n"
+msgstr "sélection de la cible %s pour la mise à jour\n"
-#~ msgid "parsed RCS file %s OK\n"
-#~ msgstr "analyse du fichier RCS %s OK\n"
+#: update.cc:88
+#, c-format
+msgid "%s not in branch %s\n"
+msgstr "%s n'est pas dans la branche %s\n"
-#~ msgid "importing file '%s'\n"
-#~ msgstr "importation du fichier « %s »\n"
+#: update.cc:97
+#, fuzzy, c-format
+msgid "%s is acceptable update candidate\n"
+msgstr "plusieurs candidats pour la mise à jour :\n"
-#~ msgid "error reading RCS file %s: %s\n"
-#~ msgstr "erreur lors de la lecture du fichier RCS %s : %s\n"
+#: update.cc:102
+#, c-format
+msgid "%s has unacceptable test results\n"
+msgstr ""
-#~ msgid "last modification time is %d\n"
-#~ msgstr "la date de dernière modification est %d\n"
+#: update.cc:160
+#, c-format
+msgid "cannot determine branch for update"
+msgstr "impossible de déterminer la branche pour la mise à jour"
-#~ msgid "path %s does not exist"
-#~ msgstr "le chemin %s n'existe pas"
+#: vocab.cc:53
+#, c-format
+msgid "hex encoded ID '%s' size != %d"
+msgstr ""
-#~ msgid "branch %s has %d entries\n"
-#~ msgstr "la branche %s a %d entrées\n"
+#: vocab.cc:56
+#, c-format
+msgid "bad character '%c' in id name '%s'"
+msgstr "caractère invalide « %c » dans le nom de l'id « %s »"
-#~ msgid "verifying new revisions (this may take a while)\n"
-#~ msgstr "vérification des nouvelles révisions (ceci peut prendre du temps)\n"
+#: vocab.cc:69
+#, c-format
+msgid "bad character '%c' in ace string '%s'"
+msgstr "caractère invalude « %c » dans la chaîne ace « %s »"
-#~ msgid "parent %s -> node %d\n"
-#~ msgstr "parent %s -> noeud %d\n"
+#: vocab.cc:83
+#, c-format
+msgid "bad character '%c' in cert name '%s'"
+msgstr "caractère invalide « %c » dans le nom du certificat « %s »"
-#~ msgid "checking whether %s is an ancestor of %s\n"
-#~ msgstr "vérification si %s est un ancêtre de %s\n"
+#: vocab.cc:96
+#, c-format
+msgid "bad character '%c' in key name '%s'"
+msgstr "caractère invalide « %c » dans le nom de la clef « %s »"
-#~ msgid "new root: %s\n"
-#~ msgstr "nouvelle racine : %s\n"
+#: vocab.cc:114
+#, c-format
+msgid "Invalid key length of %d bytes"
+msgstr "Longueur de clef invalide de %d octets"
-#~ msgid "new leaf: %s\n"
-#~ msgstr "nouvelle feuille : %s\n"
+#: vocab.cc:132
+#, c-format
+msgid "Invalid hmac length of %d bytes"
+msgstr "Longueur hmac invalide de %d octets"
-#~ msgid "no common ancestor for %s and %s\n"
-#~ msgstr "pas d'ancêtre commun pour « %s » et « %s »\n"
+#: work.cc:64
+#, c-format
+msgid "skipping ignorable file %s\n"
+msgstr "omission du fichier %s qui peut ignoré\n"
-#~ msgid "common ancestor is %s\n"
-#~ msgstr "l'ancêtre commun est %s\n"
+#: work.cc:70
+#, c-format
+msgid "skipping %s, already accounted for in working copy\n"
+msgstr "omission de %s qui existe déjà dans la copie de travail\n"
-#~ msgid "node %d = revision %s = manifest %s\n"
-#~ msgstr "noeud %d = révision %s = manifeste %s\n"
+#: work.cc:74
+#, fuzzy, c-format
+msgid "adding %s to working copy add set\n"
+msgstr "ajouter des fichiers à la copie de travail"
-#~ msgid "node %d is a root node\n"
-#~ msgstr "le noeud %d est un noeud racine\n"
+#: work.cc:136
+#, c-format
+msgid "adding attribute '%s' on file %s to %s\n"
+msgstr ""
-#~ msgid "failed to write debugging log to %s"
-#~ msgstr "impossible d'écrire le journal de debogage sur %s"
+#: work.cc:203
+#, fuzzy, c-format
+msgid "invalid path ''"
+msgstr "chem"
-#~ msgid "fatal: formatter failed on %s:%d: %s"
-#~ msgstr "fatal : le formatteur a échoué à %s:%d : %s"
+#: work.cc:207
+#, c-format
+msgid "skipping %s, not currently tracked\n"
+msgstr ""
-#~ msgid "database schema %s is unknown; cannot perform migration"
-#~ msgstr ""
-#~ "le schéma de la base de données %s est inconnu; impossible d'effectuer la "
-#~ "migration"
+#: work.cc:211
+#, fuzzy, c-format
+msgid "adding %s to working copy delete set\n"
+msgstr "ajouter des fichiers à la copie de travail"
-#~ msgid "no migration performed; database schema already up-to-date at %s\n"
-#~ msgstr ""
-#~ "aucune migration n'a été effectuée; le schéma de la base de données est "
-#~ "déjà à jour en %s\n"
+#: work.cc:215
+#, c-format
+msgid ""
+"sorry -- 'drop ' is currently broken.\n"
+"try 'find %s -type f | monotone drop address@hidden'\n"
+msgstr ""
+"désolé mais « drop  » est actuellement cassé.\n"
+"essayez « find %s -type f | monotone drop address@hidden"
-#, fuzzy
-#~ msgid "public and private keys for %s don't match"
-#~ msgstr ""
-#~ "la clef publique ou privée « %s » n'existe pas dans la base de données"
+#: work.cc:227
+#, c-format
+msgid "dropped attributes for file %s from %s\n"
+msgstr ""
-#, fuzzy
-#~ msgid "moving key '%s' from database to %s"
-#~ msgstr "aucune clef publique « %s » dans la base de données"
+#: work.cc:253
+#, fuzzy, c-format
+msgid "invalid source path ''"
+msgstr "chem"
-#~ msgid "converting %d bytes from %s to %s\n"
-#~ msgstr "conversion de %d octets de %s en %s\n"
+#: work.cc:254
+#, fuzzy, c-format
+msgid "invalid destination path ''"
+msgstr "chem"
-#~ msgid "failed to convert string from %s to %s: '%s'"
-#~ msgstr "impossible de convertir la chaîne de %s en %s : « %s »"
+#: work.cc:265
+#, c-format
+msgid "%s does not exist in current revision\n"
+msgstr "%s n'existe pas dans la révision actuelle\n"
-#~ msgid "converting %d bytes from UTF-8 to IDNA ACE\n"
-#~ msgstr "conversion de %d octets d'UTF-8 en IDNA ACE\n"
+#: work.cc:268
+#, c-format
+msgid "%s already exists in current revision\n"
+msgstr "%s existe déjà dans la révision actuelle\n"
-#, fuzzy
-#~ msgid "doing linesep conversion to %s\n"
-#~ msgstr "conversion des "
+#: work.cc:270
+#, fuzzy, c-format
+msgid "adding %s -> %s to working copy rename set\n"
+msgstr "création d'une copie de travail dans %s\n"
-#~ msgid "%d"
-#~ msgstr "%d"
+#: work.cc:293
+#, c-format
+msgid "%s has existing attributes in %s; clean them up first"
+msgstr ""
-#~ msgid "%s not in branch %s\n"
-#~ msgstr "%s n'est pas dans la branche %s\n"
+#: work.cc:302
+#, fuzzy, c-format
+msgid "moving attributes for %s to %s\n"
+msgstr "conversion de %d octets de %s en %s\n"
-#~ msgid "cannot determine branch for update"
-#~ msgstr "impossible de déterminer la branche pour la mise à jour"
+#: work.cc:321
+#, fuzzy, c-format
+msgid "work path is %s\n"
+msgstr "le chemin initial est %s\n"
-#~ msgid "bad character '%c' in id name '%s'"
-#~ msgstr "caractère invalide « %c » dans le nom de l'id « %s »"
+#: work.cc:330
+#, fuzzy, c-format
+msgid "checking for un-committed work file %s\n"
+msgstr "importation du fichier « %s »\n"
-#~ msgid "bad character '%c' in ace string '%s'"
-#~ msgstr "caractère invalude « %c » dans la chaîne ace « %s »"
+#: work.cc:334
+#, c-format
+msgid "read rearrangement from %s\n"
+msgstr ""
-#~ msgid "bad character '%c' in cert name '%s'"
-#~ msgstr "caractère invalide « %c » dans le nom du certificat « %s »"
+#: work.cc:338
+#, c-format
+msgid "no un-committed work file %s\n"
+msgstr ""
-#~ msgid "bad character '%c' in key name '%s'"
-#~ msgstr "caractère invalide « %c » dans le nom de la clef « %s »"
+#: work.cc:375
+#, fuzzy, c-format
+msgid "revision path is %s\n"
+msgstr "le chemin initial est %s\n"
-#~ msgid "Invalid key length of %d bytes"
-#~ msgstr "Longueur de clef invalide de %d octets"
+#: work.cc:385
+#, c-format
+msgid "working copy is corrupt: %s does not exist"
+msgstr "la copie de travail est corrompue : %s n'existe pas"
-#~ msgid "Invalid hmac length of %d bytes"
-#~ msgstr "Longueur hmac invalide de %d octets"
+#: work.cc:386
+#, c-format
+msgid "working copy is corrupt: %s is a directory"
+msgstr "la copie de travail est corrompue : %s est un dossier"
-#~ msgid "skipping ignorable file %s\n"
-#~ msgstr "omission du fichier %s qui peut ignoré\n"
+#: work.cc:389
+#, fuzzy, c-format
+msgid "loading revision id from %s\n"
+msgstr "vérification de la révisions %s\n"
-#~ msgid "skipping %s, already accounted for in working copy\n"
-#~ msgstr "omission de %s qui existe déjà dans la copie de travail\n"
+#: work.cc:396
+#, fuzzy, c-format
+msgid "Problem with working directory: %s is unreadable"
+msgstr ""
+"ce dossier de travail est un nouveau projet, impossible de mettre à jour"
-#, fuzzy
-#~ msgid "invalid path ''"
-#~ msgstr "chem"
+#: work.cc:405
+#, fuzzy, c-format
+msgid "writing revision id to %s\n"
+msgstr "insertion de la nouvelle révision %s\n"
-#~ msgid ""
-#~ "sorry -- 'drop ' is currently broken.\n"
-#~ "try 'find %s -type f | monotone drop address@hidden'\n"
-#~ msgstr ""
-#~ "désolé mais « drop  » est actuellement cassé.\n"
-#~ "essayez « find %s -type f | monotone drop address@hidden"
+#: work.cc:424
+#, c-format
+msgid "base revision %s does not exist in database\n"
+msgstr "la révision de base %s n'existe pas dans la base de données\n"
-#~ msgid "%s does not exist in current revision\n"
-#~ msgstr "%s n'existe pas dans la révision actuelle\n"
+#: work.cc:427
+#, c-format
+msgid "old manifest is %s\n"
+msgstr "l'ancien manifeste est %s\n"
-#~ msgid "%s already exists in current revision\n"
-#~ msgstr "%s existe déjà dans la révision actuelle\n"
+#: work.cc:430
+#, fuzzy, c-format
+msgid "base manifest %s does not exist in database\n"
+msgstr "la révision de base %s n'existe pas dans la base de données\n"
-#~ msgid "working copy is corrupt: %s does not exist"
-#~ msgstr "la copie de travail est corrompue : %s n'existe pas"
+#: work.cc:435
+#, c-format
+msgid "old manifest has %d entries\n"
+msgstr "l'ancien manifeste a %d entrées\n"
-#~ msgid "working copy is corrupt: %s is a directory"
-#~ msgstr "la copie de travail est corrompue : %s est un dossier"
+#: work.cc:456
+#, fuzzy, c-format
+msgid "user log path is %s\n"
+msgstr "le chemin initial est %s\n"
-#~ msgid "base revision %s does not exist in database\n"
-#~ msgstr "la révision de base %s n'existe pas dans la base de données\n"
+#: work.cc:505
+#, fuzzy, c-format
+msgid "options path is %s\n"
+msgstr "le chemin initial est %s\n"
-#~ msgid "old manifest is %s\n"
-#~ msgstr "l'ancien manifeste est %s\n"
+#: work.cc:552
+#, fuzzy, c-format
+msgid "local dump path is %s\n"
+msgstr "le chemin initial est %s\n"
-#~ msgid "old manifest has %d entries\n"
-#~ msgstr "l'ancien manifeste a %d entrées\n"
+#: work.cc:604
+#, fuzzy, c-format
+msgid "attribute map path is %s\n"
+msgstr "le chemin initial est %s\n"
+#: xdelta.cc:345
+#, c-format
+msgid "computing binary delta instructions\n"
+msgstr ""
+
+#: xdelta.cc:347
+#, c-format
+msgid "computed binary delta instructions\n"
+msgstr ""
+
#~ msgid "branch %s is empty"
#~ msgstr "la branche %s est vide"
@@ -2064,15 +5159,9 @@
#~ msgid "public key '%s' not found in database"
#~ msgstr "la clef « %s » n'existe pas dans la base de données"
-#~ msgid "initial path is %s\n"
-#~ msgstr "le chemin initial est %s\n"
-
#~ msgid "'%s' does not exist\n"
#~ msgstr "« %s » n'existe pas\n"
-#~ msgid "path %s does not exist\n"
-#~ msgstr "le chemin %s n'existe pas\n"
-
#~ msgid "runtime error: %s\n"
#~ msgstr "erreur d'exécution : %s\n"
============================================================
--- po/ja.po 029a04ebdd9ccfdc9af27f26fec92513895b98ec
+++ po/ja.po 0b4599ee497a230e6d90a6e4bc48b2f1d09b219a
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: monotone HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-30 03:00-0700\n"
+"POT-Creation-Date: 2005-12-29 14:41-0800\n"
"PO-Revision-Date: 2005-09-21 14:55+0900\n"
"Last-Translator: Satoru SATOH \n"
"Language-Team: Japanese \n"
@@ -16,122 +16,122 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app_state.cc:51
+#: app_state.cc:66
#, c-format
msgid "initializing from directory %s\n"
msgstr "ãã£ã¬ã¯ã㪠%s ããåæåä¸\n"
-#: app_state.cc:62
+#: app_state.cc:87
#, c-format
msgid "branch name is '%s'\n"
msgstr "ãã©ã³ãå㯠'%s' ã§ã\n"
-#: app_state.cc:69
+#: app_state.cc:94
#, c-format
msgid "setting dump path to %s\n"
msgstr "ãã³ããã¹ã %s ã«è¨å®\n"
-#: app_state.cc:83
+#: app_state.cc:108
#, c-format
msgid "working copy directory required but not found%s%s"
msgstr "ä½æ¥ã³ãã¼ãã£ã¬ã¯ããªãå¿
è¦ã§ãããã¿ã¤ããã¾ããã§ãã: %s%s"
-#: app_state.cc:91
+#: app_state.cc:116
#, c-format
msgid "invalid directory ''"
msgstr "ç¡å¹ãªãã£ã¬ã¯ã㪠''"
-#: app_state.cc:93
+#: app_state.cc:118
#, c-format
msgid "creating working copy in %s\n"
msgstr "%s å
ã«ä½æ¥ã³ãã¼ãä½æ\n"
-#: app_state.cc:99
+#: app_state.cc:124
#, c-format
msgid "monotone bookkeeping directory '%s' already exists in '%s'\n"
msgstr "monotone è¨é²ç°¿ç¨ãã£ã¬ã¯ã㪠'%s' ã¯æ¢ã« '%s' å
ã«åå¨ãã¦ãã¾ã\n"
-#: app_state.cc:102
+#: app_state.cc:127
#, c-format
msgid "creating bookkeeping directory '%s' for working copy in '%s'\n"
msgstr "ä½æ¥ã³ãã¼ã®è¨é²ç°¿ç¨ãã£ã¬ã¯ã㪠'%s' ã '%s' å
ã«ä½æ\n"
-#: app_state.cc:133
+#: app_state.cc:158
#, c-format
msgid "'%s' ignored by restricted path set\n"
msgstr "'%s' ã¯å¶éãã¹ã»ããã«ãã£ã¦ç¡è¦ããã¾ãã\n"
-#: app_state.cc:138 app_state.cc:156
+#: app_state.cc:163 app_state.cc:181
#, c-format
msgid "unknown path '%s'\n"
msgstr "ä¸æãªãã¹ '%s'\n"
-#: app_state.cc:140
+#: app_state.cc:165
#, c-format
msgid "'%s' added to restricted path set\n"
msgstr "'%s' ãå¶éãã¹ã»ããã«è¿½å ãã¾ãã\n"
-#: app_state.cc:151
+#: app_state.cc:176
#, c-format
msgid "'%s' ignored by excluded path set\n"
msgstr "'%s' ã¯é¤å¤ãã¹ã»ããã«ãã£ã¦ç¡è¦ããã¾ãã\n"
-#: app_state.cc:158
+#: app_state.cc:183
#, c-format
msgid "'%s' added to excluded path set\n"
msgstr "'%s' ãé¤å¤ãã¹ã»ããã«è¿½å ãã¾ãã\n"
-#: app_state.cc:185
+#: app_state.cc:210
#, c-format
msgid "checking excluded path set for '%s'\n"
msgstr "'%s' ã«ã¤ãã¦é¤å¤ãã¹ã»ããã調ã¹ã¦ãã¾ã\n"
-#: app_state.cc:192 app_state.cc:225
+#: app_state.cc:217 app_state.cc:250
#, c-format
msgid "path '%s' found in excluded path set; '%s' excluded\n"
msgstr "ãã¹ '%s' ã¯é¤å¤ãã¹ã»ããã«å«ã¾ãã¦ãã¾ã; '%s' ã¯é¤å¤ããã¾ã\n"
-#: app_state.cc:211
+#: app_state.cc:236
#, c-format
msgid "checking restricted path set for '%s'\n"
msgstr "'%s' ã«ã¤ãã¦å¶éãã¹ã»ããã調ã¹ã¦ãã¾ã\n"
-#: app_state.cc:219
+#: app_state.cc:244
#, c-format
msgid "path '%s' found in restricted path set; '%s' included\n"
msgstr "ãã¹ '%s' ã¯å¶éãã¹ã»ããã«å«ã¾ãã¦ãã¾ã; '%s' ã¯å«ãããã¾ã\n"
-#: app_state.cc:287
+#: app_state.cc:332
#, c-format
msgid "search root '%s' does not exist"
msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯åå¨ãã¾ãã"
-#: app_state.cc:288
+#: app_state.cc:333
#, c-format
msgid "search root '%s' is not a directory\n"
msgstr "æ¤ç´¢ã«ã¼ã '%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã\n"
-#: app_state.cc:290
+#: app_state.cc:335
#, c-format
msgid "set search root to %s\n"
msgstr "æ¤ç´¢ã«ã¼ãã %s ã«è¨å®\n"
-#: app_state.cc:321
+#: app_state.cc:366
#, c-format
msgid "negative depth not allowed\n"
msgstr "æ·±ãã®å¤ãè² ã«ãããã¨ã¯ã§ãã¾ãã\n"
-#: app_state.cc:329
+#: app_state.cc:374
#, c-format
msgid "negative or zero last not allowed\n"
msgstr "æçµå¤ãè² ã¾ãã¯é¶ã«ãããã¨ã¯ã§ãã¾ãã\n"
-#: app_state.cc:438
+#: app_state.cc:497
#, c-format
msgid "Failed to read options file %s"
msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®è§£æã«å¤±æ"
-#: app_state.cc:455
+#: app_state.cc:514
#, c-format
msgid "Failed to write options file %s"
msgstr "ãªãã·ã§ã³ãã¡ã¤ã« '%s' ã®æ¸ãè¾¼ã¿ã«å¤±æ"
@@ -141,91 +141,95 @@
msgid "error in %s:%d:%d:E: %s"
msgstr "ã¨ã©ã¼ %s:%d:%d:E: %s"
-#: cert.cc:49
+#: cert.cc:51
#, c-format
msgid "cert ok\n"
msgstr "証æ OK\n"
-#: cert.cc:56
+#: cert.cc:58
#, c-format
msgid "ignoring bad signature by '%s' on '%s'\n"
msgstr "'%s' ã«ãã '%s' ã¸ã®ä¸æ£ãªç½²åãç¡è¦ãã¾ã\n"
-#: cert.cc:64
+#: cert.cc:66
#, c-format
msgid "ignoring unknown signature by '%s' on '%s'\n"
msgstr "'%s' ã«ãã '%s' ã¸ã®ä¸æãªç½²åãç¡è¦ãã¾ã\n"
-#: cert.cc:121
+#: cert.cc:123
#, c-format
msgid "trust function liked %d signers of %s cert on manifest %s\n"
msgstr "trust function liked %d signers of %s cert on manifest %s\n"
-#: cert.cc:127
+#: cert.cc:129
#, c-format
msgid "trust function disliked %d signers of %s cert on manifest %s\n"
msgstr "trust function disliked %d signers of %s cert on manifest %s\n"
-#: cert.cc:174
+#: cert.cc:176
#, c-format
msgid "trust function liked %d signers of %s cert on revision %s\n"
msgstr "trust function liked %d signers of %s cert on revision %s\n"
-#: cert.cc:180
+#: cert.cc:182
#, c-format
msgid "trust function disliked %d signers of %s cert on revision %s\n"
msgstr "trust function disliked %d signers of %s cert on revision %s\n"
-#: cert.cc:269
+#: cert.cc:271
#, c-format
msgid "calculated cert hash '%s' does not match '%s'"
msgstr "è¨ç®ãã証æããã·ã¥ '%s' 㯠'%s' ã¨ä¸è´ãã¾ãã"
-#: cert.cc:303
+#: cert.cc:305
#, c-format
msgid "cert: signable text %s\n"
msgstr "証æ: ç½²åããã¹ã %s\n"
-#: cert.cc:364 keys.cc:508
-#, c-format
-msgid "no private key '%s' found in database or get_priv_key hook"
+#: cert.cc:365
+#, fuzzy, c-format
+msgid "no private key '%s' found in key store or get_priv_key hook"
msgstr ""
"ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«ã get_priv_key ããã¯å
ã«ãã¿ã¤ããã¾ãã"
-#: cert.cc:373
-#, c-format
-msgid "mismatch between private key '%s' in database and get_priv_key hook"
+#: cert.cc:375
+#, fuzzy, c-format
+msgid "mismatch between key '%s' in key store and get_key_pair hook"
msgstr ""
"ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã®ãã®ã¨ get_priv_key ããã¯å
ã®ãã®ãä¸è´ãã¦ã"
"ã¾ãã"
-#: cert.cc:477
+#: cert.cc:461
#, c-format
+msgid ""
+"you have no private key to make signatures with\n"
+"perhaps you need to 'genkey '"
+msgstr ""
+
+#: cert.cc:464
+#, c-format
+msgid ""
+"you have multiple private keys\n"
+"pick one to use for signatures by adding '-k' to your command"
+msgstr ""
+
+#: cert.cc:481
+#, c-format
msgid "no branch found for empty revision, please provide a branch name"
msgstr "ãªãã¸ã§ã³ã空ã®ãã©ã³ãã¯ããã¾ãã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: cert.cc:486
+#: cert.cc:490
#, c-format
msgid "no branch certs found for revision %s, please provide a branch name"
msgstr ""
"ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æãã¿ã¤ããã¾ãã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: cert.cc:490
+#: cert.cc:494
#, c-format
msgid ""
"multiple branch certs found for revision %s, please provide a branch name"
msgstr "ãªãã¸ã§ã³ %s ã®ãã©ã³ã証æã¯è¤æ°ããã¾ã. ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: cert.cc:507 rcs_import.cc:1231 revision.cc:1594 revision.cc:1626
-#, c-format
-msgid "no unique private key for cert construction"
-msgstr "証æä½æã®ããã®åºæã®ç§å¯éµãããã¾ãã"
-
-#: cert.cc:622
-#, c-format
-msgid "no default author name for branch '%s'"
-msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ããã©ã«ãã®ä½æè
åãããã¾ãã"
-
#: change_set.cc:289
#, c-format
msgid "tid %d: parent %d, type %s, name %s\n"
@@ -455,37 +459,37 @@
msgid "commands:"
msgstr "ã³ãã³ã:"
-#: commands.cc:245
+#: commands.cc:246
#, c-format
msgid "executing command '%s'\n"
msgstr "ã³ãã³ã '%s' ãå®è¡ä¸\n"
-#: commands.cc:251
+#: commands.cc:252
#, c-format
msgid "unknown command '%s'\n"
msgstr "ä¸æãªã³ãã³ã '%s'\n"
-#: commands.cc:298
+#: commands.cc:299
#, c-format
msgid "pid file '%s' already exists"
msgstr "PID ãã¡ã¤ã« '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: commands.cc:322 commands.cc:1218 commands.cc:1298 commands.cc:1641
-#: commands.cc:2571 commands.cc:3259 commands.cc:3456 commands.cc:3493
+#: commands.cc:323 commands.cc:1275 commands.cc:1355 commands.cc:1720
+#: commands.cc:2674 commands.cc:3362 commands.cc:3582 commands.cc:3619
msgid "informative"
msgstr "æ
å ±"
-#: commands.cc:322
+#: commands.cc:323
#, fuzzy
msgid "command [ARGS...]"
msgstr "[OPTION...] command [ARGS...]\n"
-#: commands.cc:322
+#: commands.cc:323
#, fuzzy
msgid "display command help"
msgstr "ãã«ãã¡ãã»ã¼ã¸ã表示"
-#: commands.cc:381
+#: commands.cc:382
msgid ""
"Enter a description of this change.\n"
"Lines beginning with `MT:' are removed automatically.\n"
@@ -493,16 +497,16 @@
"ãã®å¤æ´ã®èª¬æãå
¥åãã¦ä¸ãã\n"
"'MT:' ã§å§ã¾ãè¡ã¯èªåçã«åé¤ããã¾ã\n"
-#: commands.cc:388
+#: commands.cc:389
#, c-format
msgid "edit of log message failed"
msgstr "ãã°ã¡ãã»ã¼ã¸ã®ç·¨éã«å¤±æãã¾ãã"
-#: commands.cc:397
+#: commands.cc:398
msgid "note: "
msgstr "ãã¼ã: "
-#: commands.cc:398
+#: commands.cc:399
#, c-format
msgid ""
"branch '%s' has multiple heads\n"
@@ -511,59 +515,59 @@
"ãã©ã³ã '%s' ã«ã¯è¤æ°ã®ææ°çãããã¾ã\n"
"âmonotone merge' ãå®è¡ããæ¹ãããã§ããã"
-#: commands.cc:458 commands.cc:679 commands.cc:1317 commands.cc:1384
-#: commands.cc:1752 commands.cc:2618 commands.cc:2633 commands.cc:2636
-#: commands.cc:2834 commands.cc:3475
+#: commands.cc:459 commands.cc:715 commands.cc:1374 commands.cc:1446
+#: commands.cc:1831 commands.cc:2721 commands.cc:2736 commands.cc:2739
+#: commands.cc:2937 commands.cc:3601
#, c-format
msgid "no such revision '%s'"
msgstr "ãªãã¸ã§ã³ '%s' ã¯åå¨ãã¾ãã"
-#: commands.cc:465
+#: commands.cc:466
#, c-format
msgid "expanding selection '%s'\n"
msgstr "ã»ã¬ã¯ã·ã§ã³ '%s' ãå±é\n"
-#: commands.cc:473
+#: commands.cc:474
#, c-format
msgid "no match for selection '%s'"
msgstr "ã»ã¬ã¯ã·ã§ã³ '%s' ã«ä¸è´ãããã®ãããã¾ãã"
-#: commands.cc:476
+#: commands.cc:477
#, c-format
msgid "selection '%s' has multiple ambiguous expansions: \n"
msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ããã»ã¬ã¯ã·ã§ã³ã®åè£ã¯è¤æ°ããã¾ã: \n"
-#: commands.cc:483
+#: commands.cc:484
#, c-format
msgid "expanded to '%s'\n"
msgstr "'%s' ã«å±é\n"
-#: commands.cc:494
+#: commands.cc:495
#, c-format
msgid "non-hex digits in id"
msgstr "ID ã«åå
é²æ°ãå«ã¾ãã¦ãã¾ãã"
-#: commands.cc:503
+#: commands.cc:504
#, c-format
msgid "partial id '%s' does not have an expansion"
msgstr "é¨å ID '%s' ãä¸ã¤ã® ID ã«å±éãããã¨ã¯ã§ãã¾ãã"
-#: commands.cc:506
+#: commands.cc:507
#, c-format
msgid "partial id '%s' has multiple ambiguous expansions:\n"
msgstr "'%s' ã ãã§ã¯ææ§ã§ãå±éã§ãã ID ã®åè£ã¯è¤æ°ããã¾ã:\n"
-#: commands.cc:513
+#: commands.cc:514
#, c-format
msgid "expanded partial id '%s' to '%s'\n"
msgstr "é¨å ID '%s' ã '%s' ã«å±é\n"
-#: commands.cc:540 keys.cc:510 netsync.cc:2197
+#: commands.cc:541 netsync.cc:1942
#, c-format
msgid "no public key '%s' found in database"
msgstr "ãã¼ã¿ãã¼ã¹å
ã«å
¬ééµ '%s' ã¯ããã¾ãã"
-#: commands.cc:550
+#: commands.cc:551
#, c-format
msgid ""
"Key : %s\n"
@@ -576,133 +580,125 @@
"åå : %s\n"
"å¤ : %s\n"
-#: commands.cc:584
+#: commands.cc:585
msgid "ok"
msgstr "OK"
-#: commands.cc:587
+#: commands.cc:588
msgid "bad"
msgstr "NG"
-#: commands.cc:590
+#: commands.cc:591
msgid "unknown"
msgstr "ä¸æ"
-#: commands.cc:665
+#: commands.cc:678
#, c-format
+msgid "(*) - only in %s/"
+msgstr ""
+
+#: commands.cc:701
+#, c-format
msgid "no keys found\n"
msgstr "éµãã¿ã¤ããã¾ããã§ãã\n"
-#: commands.cc:667
+#: commands.cc:703
#, c-format
msgid "no keys found matching '%s'\n"
msgstr "'%s' ã«ä¸è´ããéµã¯ã¿ã¤ããã¾ããã§ãã\n"
-#: commands.cc:685
+#: commands.cc:721
#, c-format
msgid "revision %s already has children. We cannot kill it."
msgstr "ãªãã¸ã§ã³ %s ã¯æ¢ã«åãæã£ã¦ãã¦åé¤ã§ãã¾ãã"
-#: commands.cc:815 commands.cc:837 commands.cc:869 commands.cc:893
-#: commands.cc:933
+#: commands.cc:851 commands.cc:875 commands.cc:912 commands.cc:933
+#: commands.cc:969
msgid "key and cert"
msgstr "éµã¨è¨¼æ"
-#: commands.cc:815 commands.cc:837 commands.cc:869
+#: commands.cc:851 commands.cc:875 commands.cc:912
msgid "KEYID"
msgstr "KEYID"
-#: commands.cc:815
+#: commands.cc:851
msgid "generate an RSA key-pair"
msgstr "éµå¯¾ãçæ"
-#: commands.cc:825
-#, c-format
-msgid "key '%s' already exists in database"
-msgstr "éµ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¦ãã¾ã"
+#: commands.cc:866
+#, fuzzy, c-format
+msgid "key '%s' already exists"
+msgstr "PID ãã¡ã¤ã« '%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: commands.cc:829
-#, c-format
-msgid "generating key-pair '%s'\n"
+#: commands.cc:869
+#, fuzzy, c-format
+msgid "generating key-pair '%s'"
msgstr "éµå¯¾ '%s' ãçæ\n"
-#: commands.cc:831
-#, c-format
-msgid "storing key-pair '%s' in database\n"
+#: commands.cc:871
+#, fuzzy, c-format
+msgid "storing key-pair '%s' in %s/"
msgstr "éµå¯¾ '%s' ããã¼ã¿ãã¼ã¹ã«ä¿å\n"
-#: commands.cc:837
+#: commands.cc:875
msgid "drop a public and private key"
msgstr "å
¬ééµã¨ç§å¯éµãç ´æ£"
-#: commands.cc:848
+#: commands.cc:889
#, c-format
msgid "dropping public key '%s' from database\n"
msgstr "å
¬ééµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£\n"
-#: commands.cc:855
-#, c-format
-msgid ""
-"dropping private key '%s' from database\n"
-"\n"
-msgstr ""
-"ç§å¯éµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£\n"
-"\n"
+#: commands.cc:899
+#, fuzzy, c-format
+msgid "dropping key pair '%s' from keystore\n"
+msgstr "å
¬ééµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£\n"
-#: commands.cc:856
-#, c-format
-msgid ""
-"the private key data may not have been erased from the\n"
-"database. it is recommended that you use 'db dump' and\n"
-"'db load' to be sure."
-msgstr ""
-"ç§å¯éµãã¼ã¿ã¯ãã¼ã¿ãã¼ã¹ããåé¤ããã¦ããªã\n"
-"ããããã¾ããã'db dump' 㨠'db load' ã§ç¢ºããããã¨ã\n"
-"ãå§ããã¾ã"
+#: commands.cc:906
+#, fuzzy, c-format
+msgid "public or private key '%s' does not exist in keystore or database"
+msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¾ãã"
-#: commands.cc:864
-#, c-format
-msgid "public or private key '%s' does not exist in database"
+#: commands.cc:908
+#, fuzzy, c-format
+msgid ""
+"public or private key '%s' does not exist in keystore, and no database was "
+"specified"
msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¾ãã"
-#: commands.cc:870
+#: commands.cc:913
msgid "change passphrase of a private RSA key"
msgstr "ç§å¯ RSA éµã®ãã¹ãã¬ã¼ãºãå¤æ´"
-#: commands.cc:881
-#, c-format
-msgid "key '%s' does not exist in database"
+#: commands.cc:923
+#, fuzzy, c-format
+msgid "key '%s' does not exist in the keystore"
msgstr "éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«ããã¾ãã"
-#: commands.cc:888
+#: commands.cc:930
#, c-format
msgid "passphrase changed\n"
msgstr "ãã¹ãã¬ã¼ãºãå¤æ´ãã¾ãã\n"
-#: commands.cc:893
+#: commands.cc:933
msgid "REVISION CERTNAME [CERTVAL]"
msgstr "REVISION CERTNAME [CERTVAL]"
-#: commands.cc:894
+#: commands.cc:934
msgid "create a cert for a revision"
msgstr "ãªãã¸ã§ã³ã®è¨¼æãä½æ"
-#: commands.cc:914
-#, c-format
-msgid "no unique private key found, and no key specified"
-msgstr "åºæã®ç§å¯éµãã¿ã¤ãããããã¤éµãæå®ããã¦ãã¾ãã"
-
-#: commands.cc:933
+#: commands.cc:969
msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
msgstr "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"
-#: commands.cc:934
+#: commands.cc:970
msgid ""
"test whether a hypothetical cert would be trusted\n"
"by current settings"
msgstr "ç¾å¨ã®è¨å®ã§ä»®æ³è¨¼æãä¿¡é ¼å¯è½ããã¹ã"
-#: commands.cc:967
+#: commands.cc:1003
#, c-format
msgid ""
"if a cert on: %s\n"
@@ -717,186 +713,183 @@
"ç½²åè
: %s\n"
"ãã£ã¦ãããã %s ã§ããã\n"
-#: commands.cc:976
+#: commands.cc:1012
msgid "trusted"
msgstr "trusted"
-#: commands.cc:976
+#: commands.cc:1012
msgid "UNtrusted"
msgstr "UNtrusted"
-#: commands.cc:979 commands.cc:992 commands.cc:1004 commands.cc:1021
-#: commands.cc:1067
+#: commands.cc:1015 commands.cc:1028 commands.cc:1040 commands.cc:1057
+#: commands.cc:1103
msgid "review"
msgstr "ã¬ãã¥ã¼"
-#: commands.cc:979
+#: commands.cc:1015
msgid "REVISION TAGNAME"
msgstr "REVISION TAGNAME"
-#: commands.cc:980
+#: commands.cc:1016
msgid "put a symbolic tag cert on a revision version"
msgstr "象徴çãªã¿ã°è¨¼æããªãã¸ã§ã³ãã¼ã¸ã§ã³ã«ä»å "
-#: commands.cc:992
+#: commands.cc:1028
msgid "ID (pass|fail|true|false|yes|no|1|0)"
msgstr "ID (pass|fail|true|false|yes|no|1|0)"
-#: commands.cc:993
+#: commands.cc:1029
msgid "note the results of running a test on a revision"
msgstr "ãªãã¸ã§ã³ã®ãã¹ãã®å®è¡çµæãè¨é²"
-#: commands.cc:1004 commands.cc:1021
+#: commands.cc:1040 commands.cc:1057
msgid "REVISION"
msgstr "REVISION"
-#: commands.cc:1005
+#: commands.cc:1041
msgid "approve of a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ãæ¿èª"
-#: commands.cc:1016
+#: commands.cc:1052
#, c-format
msgid "need --branch argument for approval"
msgstr "æ¿èªã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: commands.cc:1022
+#: commands.cc:1058
msgid "disapprove of a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ãéæ¿èª"
-#: commands.cc:1035
+#: commands.cc:1071
#, c-format
msgid "revision '%s' has %d changesets, cannot invert\n"
msgstr "ãªãã¸ã§ã³ '%s' ã«ã¯ %d åã®å¤æ´ã»ããããããå転ã§ãã¾ãã\n"
-#: commands.cc:1039
+#: commands.cc:1075
#, c-format
msgid "need --branch argument for disapproval"
msgstr "éæ¿èªã¨ããã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: commands.cc:1067
+#: commands.cc:1103
msgid "REVISION [COMMENT]"
msgstr "REVISION [COMMENT]"
-#: commands.cc:1068
+#: commands.cc:1104
msgid "comment on a particular revision"
msgstr "ç¹å®ã®ãªãã¸ã§ã³ã«ã³ã¡ã³ã"
-#: commands.cc:1078
+#: commands.cc:1114
#, c-format
msgid "edit comment failed"
msgstr "ã³ã¡ã³ãç·¨éã«å¤±æ"
-#: commands.cc:1081
+#: commands.cc:1117
#, c-format
msgid "empty comment"
msgstr "空ã®ã³ã¡ã³ã"
-#: commands.cc:1091 commands.cc:1116 commands.cc:1143 commands.cc:1275
-#: commands.cc:2102 commands.cc:2225 commands.cc:2783 commands.cc:3316
+#: commands.cc:1129 commands.cc:1166 commands.cc:1200 commands.cc:1332
+#: commands.cc:2198 commands.cc:2321 commands.cc:2886 commands.cc:3419
msgid "working copy"
msgstr "ä½æ¥ã³ãã¼"
-#: commands.cc:1091 commands.cc:1116
-msgid "PATH..."
-msgstr "PATH..."
+#: commands.cc:1129 commands.cc:1166 commands.cc:1275 commands.cc:2321
+#: commands.cc:2674 commands.cc:3419
+msgid "[PATH]..."
+msgstr "[PATH]..."
-#: commands.cc:1092
+#: commands.cc:1130
msgid "add files to working copy"
msgstr "ãã¡ã¤ã«ãä½æ¥ã³ãã¼ã«è¿½å "
-#: commands.cc:1117
+#: commands.cc:1167
msgid "drop files from working copy"
msgstr "ãã¡ã¤ã«ãä½æ¥ã³ãã¼ããåé¤"
-#: commands.cc:1143
+#: commands.cc:1200
msgid "SRC DST"
msgstr "SRC DST"
-#: commands.cc:1144
+#: commands.cc:1201
msgid "rename entries in the working copy"
msgstr "ä½æ¥ã³ãã¼å
ã®ã¨ã³ããªã®å称ãå¤æ´"
-#: commands.cc:1172 commands.cc:1185 commands.cc:2704 commands.cc:2721
-#: commands.cc:3376
+#: commands.cc:1229 commands.cc:1242 commands.cc:2807 commands.cc:2824
+#: commands.cc:3502
msgid "debug"
msgstr "ãããã°"
-#: commands.cc:1172
+#: commands.cc:1229
msgid "load file contents into db"
msgstr "ãã¡ã¤ã«ã®å
容ããã¼ã¿ãã¼ã¹ã«èªã¿è¾¼ã¿"
-#: commands.cc:1185
+#: commands.cc:1242
msgid " "
msgstr "<親> <å·¦> <å³>"
-#: commands.cc:1186
+#: commands.cc:1243
msgid "merge 3 files and output result"
msgstr "ä¸ã¤ã®ãã¡ã¤ã«ãçµ±åãçµæãåºå"
-#: commands.cc:1196
+#: commands.cc:1253
#, c-format
msgid "ancestor file id does not exist"
msgstr "ç¥å
ã®ãã¡ã¤ã« ID ã¯åå¨ãã¾ãã"
-#: commands.cc:1199
+#: commands.cc:1256
#, c-format
msgid "left file id does not exist"
msgstr "å·¦ãã¡ã¤ã« ID ã¯åå¨ãã¾ãã"
-#: commands.cc:1202
+#: commands.cc:1259
#, c-format
msgid "right file id does not exist"
msgstr "å³ãã¡ã¤ã« ID ã¯åå¨ãã¾ãã"
-#: commands.cc:1213
+#: commands.cc:1270
#, c-format
msgid "merge failed"
msgstr "çµ±å失æ"
-#: commands.cc:1218 commands.cc:2225 commands.cc:2571 commands.cc:3316
-msgid "[PATH]..."
-msgstr "[PATH]..."
-
-#: commands.cc:1218
+#: commands.cc:1275
msgid "show status of working copy"
msgstr "ä½æ¥ã³ãã¼ã®ç¶æ
ã表示"
-#: commands.cc:1275
+#: commands.cc:1332
msgid "[PATH]"
msgstr "[PATH]"
-#: commands.cc:1276
+#: commands.cc:1333
msgid "calculate identity of PATH or stdin"
msgstr "PATH ã¾ãã¯æ¨æºå
¥åãèå¥"
-#: commands.cc:1299
+#: commands.cc:1356
msgid "FILENAME"
msgstr "FILENAME"
-#: commands.cc:1300
+#: commands.cc:1357
msgid "write file from database to stdout"
msgstr "ãã¼ã¿ãã¼ã¹ã®ãã¡ã¤ã«ãæ¨æºåºåã«æ¸ãåºã"
-#: commands.cc:1328
+#: commands.cc:1385
#, c-format
msgid "no file '%s' found in revision '%s'\n"
msgstr "ãã¡ã¤ã« '%s' ã¯ãªãã¸ã§ã³ '%s' ã«ã¯ããã¾ããã§ãã\n"
-#: commands.cc:1332
+#: commands.cc:1389
#, c-format
msgid "dumping file '%s'\n"
msgstr "ãã¡ã¤ã« '%s' ããã³ã\n"
-#: commands.cc:1340 commands.cc:1447 commands.cc:3059 commands.cc:3108
-#: commands.cc:3193 commands.cc:3200 commands.cc:3661
+#: commands.cc:1397 commands.cc:1505 commands.cc:3162 commands.cc:3211
+#: commands.cc:3296 commands.cc:3303 commands.cc:3787
msgid "tree"
msgstr "ããªã¼"
-#: commands.cc:1340
+#: commands.cc:1397
msgid "[DIRECTORY]\n"
msgstr "[DIRECTORY]\n"
-#: commands.cc:1341
+#: commands.cc:1398
msgid ""
"check out a revision from database into directory.\n"
"If a revision is given, that's the one that will be checked out.\n"
@@ -909,86 +902,82 @@
"åãåºãã¾ãããã£ã¬ã¯ããªãæªæå®ãªããã£ã¬ã¯ããªåã¨ãã¦\n"
"ãã©ã³ãåã使ãã¾ã"
-#: commands.cc:1358 commands.cc:1372
+#: commands.cc:1415 commands.cc:1434
#, c-format
msgid "need --branch argument for branch-based checkout"
msgstr "ãã©ã³ããåºæºã«ãããã§ãã¯ã¢ã¦ãã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: commands.cc:1375
+#: commands.cc:1428
#, c-format
-msgid "branch %s is empty"
-msgstr "ãã©ã³ã %s ã¯ç©ºã§ã"
+msgid "checkout directory '%s' already exists"
+msgstr "åãåºããã£ã¬ã¯ã㪠'%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-#: commands.cc:1376
+#: commands.cc:1437 commands.cc:1518 commands.cc:3175 commands.cc:3245
+#: commands.cc:3248
#, c-format
+msgid "branch '%s' is empty\n"
+msgstr "ãã©ã³ã '%s' ã¯ç©ºã§ã\n"
+
+#: commands.cc:1438
+#, c-format
msgid "branch %s has multiple heads"
msgstr "ãã©ã³ã %s ã«ã¯è¤æ°ã®ææ°çãåå¨ãã¦ãã¾ã"
-#: commands.cc:1397
+#: commands.cc:1459
#, c-format
msgid "found %d %s branch certs on revision %s\n"
msgstr "%d %s ãã©ã³ã証æããªãã¸ã§ã³ %s ã§ã¿ã¤ããã¾ãã\n"
-#: commands.cc:1402
+#: commands.cc:1464
#, c-format
msgid "revision %s is not a member of branch %s\n"
msgstr "ãªãã¸ã§ã³ %s ã¯ãã©ã³ã %s ã«ã¯å±ãã¦ãã¾ãã\n"
-#: commands.cc:1408
+#: commands.cc:1480
#, c-format
-msgid "checkout directory '%s' already exists"
-msgstr "åãåºããã£ã¬ã¯ã㪠'%s' ã¯æ¢ã«åå¨ãã¦ãã¾ã"
-
-#: commands.cc:1422
-#, c-format
msgid "no manifest %s found in database"
msgstr "ãããã§ã¹ã %s ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¯ã¿ã¤ããã¾ãã"
-#: commands.cc:1424
+#: commands.cc:1482
#, c-format
msgid "checking out revision %s to directory %s\n"
msgstr "ãªãã¸ã§ã³ %s ããã£ã¬ã¯ã㪠%s ã«åãåºãä¸\n"
-#: commands.cc:1430
+#: commands.cc:1488
#, c-format
msgid "no file %s found in database for %s"
msgstr "ãã¡ã¤ã« %s (対象 %s)ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¯ã¿ã¤ããã¾ãã"
-#: commands.cc:1434 commands.cc:3363
+#: commands.cc:1492 commands.cc:3489
#, c-format
msgid "writing file %s to %s\n"
msgstr "ãã¡ã¤ã« %s ã %s ã«æ¸ãè¾¼ã¿ä¸\n"
-#: commands.cc:1447
+#: commands.cc:1505
msgid "show unmerged head revisions of branch"
msgstr "ãã©ã³ãã®çµ±åããã¦ããªãææ°ãªãã¸ã§ã³ã表示"
-#: commands.cc:1455 commands.cc:3068
+#: commands.cc:1513 commands.cc:3171
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "--branch=BRANCH ã¨ããããã«ãã©ã³ããæå®ãã¦ä¸ãã"
-#: commands.cc:1460 commands.cc:3072 commands.cc:3142 commands.cc:3145
+#: commands.cc:1520
#, c-format
-msgid "branch '%s' is empty\n"
-msgstr "ãã©ã³ã '%s' ã¯ç©ºã§ã\n"
-
-#: commands.cc:1462
-#, c-format
msgid "branch '%s' is currently merged:\n"
msgstr "ãã©ã³ã '%s' ã¯ç¾å¨çµ±åæ¸ã¿ã§ã:\n"
-#: commands.cc:1464
+#: commands.cc:1522
#, c-format
msgid "branch '%s' is currently unmerged:\n"
msgstr "ãã©ã³ã '%s' ã¯ç¾å¨æªçµ±åã§ã:\n"
-#: commands.cc:1503
+#: commands.cc:1561
#, c-format
msgid "no epoch for branch %s\n"
msgstr "ãã©ã³ã %s 㯠epoch ãæã¡ã¾ãã\n"
-#: commands.cc:1642
+#: commands.cc:1721
msgid ""
"certs ID\n"
"keys [PATTERN]\n"
@@ -1012,7 +1001,7 @@
"ignored\n"
"missing"
-#: commands.cc:1652
+#: commands.cc:1731
msgid ""
"show database objects, or the current working copy manifest,\n"
"or unknown, intentionally ignored, or missing state files"
@@ -1020,191 +1009,187 @@
"ãã¼ã¿ãã¼ã¹ãªãã¸ã§ã¯ããç¾å¨ã®ä½æ¥ã³ãã¼ã®ãããã§ã¹ãã\n"
"ä¸æãªãç¡è¦ããããã¾ãã¯å¤±ãªãããç¶æ
ã®ãã¡ã¤ã«ã表示"
-#: commands.cc:1689 commands.cc:1715 commands.cc:1739 commands.cc:1757
-#: commands.cc:1776 commands.cc:1795 commands.cc:1813 commands.cc:1829
-#: commands.cc:1849
+#: commands.cc:1768 commands.cc:1794 commands.cc:1818 commands.cc:1836
+#: commands.cc:1855 commands.cc:1874 commands.cc:1892 commands.cc:1920
+#: commands.cc:1938
msgid "packet i/o"
msgstr "ãã±ãã I/O"
-#: commands.cc:1689 commands.cc:1715
+#: commands.cc:1768 commands.cc:1794
msgid "OLDID NEWID"
msgstr "OLDID NEWID"
-#: commands.cc:1690
+#: commands.cc:1769
msgid "write manifest delta packet to stdout"
msgstr "ãããã§ã¹ãå·®åãã±ãããæ¨æºåºåã«åºå"
-#: commands.cc:1704 commands.cc:1706 commands.cc:1770
+#: commands.cc:1783 commands.cc:1785 commands.cc:1849
#, c-format
msgid "no such manifest '%s'"
msgstr "ãããã§ã¹ã '%s' ã¯åå¨ãã¾ãã"
-#: commands.cc:1716
+#: commands.cc:1795
msgid "write file delta packet to stdout"
msgstr "ãã¡ã¤ã«å·®åãã±ãããæ¨æºåºåã«åºå"
-#: commands.cc:1730 commands.cc:1732 commands.cc:1789 commands.cc:2123
+#: commands.cc:1809 commands.cc:1811 commands.cc:1868 commands.cc:2219
#, c-format
msgid "no such file '%s'"
msgstr "ãã¡ã¤ã« '%s' ã¯åå¨ãã¾ãã"
-#: commands.cc:1739 commands.cc:1757 commands.cc:1776 commands.cc:1795
-#: commands.cc:1813 commands.cc:1829
+#: commands.cc:1818 commands.cc:1836 commands.cc:1855 commands.cc:1874
+#: commands.cc:1892 commands.cc:1920
msgid "ID"
msgstr "ID"
-#: commands.cc:1739
+#: commands.cc:1818
msgid "write revision data packet to stdout"
msgstr "ãªãã¸ã§ã³ãã¼ã¿ãã±ãããæ¨æºåºåã«åºå"
-#: commands.cc:1757
+#: commands.cc:1836
msgid "write manifest data packet to stdout"
msgstr "ãããã§ã¹ããã¼ã¿ãã±ãããæ¨æºåºåã«åºå"
-#: commands.cc:1776
+#: commands.cc:1855
msgid "write file data packet to stdout"
msgstr "ãã¡ã¤ã«ãã¼ã¿ãã±ãããæ¨æºåºåã«åºå"
-#: commands.cc:1795
+#: commands.cc:1874
msgid "write cert packets to stdout"
msgstr "証æãã±ãããæ¨æºåºåã«åºå"
-#: commands.cc:1813
+#: commands.cc:1892
msgid "write public key packet to stdout"
msgstr "å
¬ééµãã±ãããæ¨æºåºåã«åºå"
-#: commands.cc:1821
-#, c-format
-msgid "public key '%s' does not exist in database"
+#: commands.cc:1914
+#, fuzzy, c-format
+msgid "public key '%s' does not exist"
msgstr "å
¬ééµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¾ãã"
-#: commands.cc:1829
+#: commands.cc:1920
msgid "write private key packet to stdout"
msgstr "ç§å¯éµãã±ãããæ¨æºåºåã«åºå"
-#: commands.cc:1837
-#, c-format
-msgid "public and private key '%s' do not exist in database"
+#: commands.cc:1928
+#, fuzzy, c-format
+msgid "public and private key '%s' do not exist in keystore"
msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¾ãã"
-#: commands.cc:1850
+#: commands.cc:1939
msgid "read packets from files or stdin"
msgstr "ãã¡ã¤ã«ã¾ãã¯æ¨æºå
¥åãããã±ãããèªã¿è¾¼ã¿"
-#: commands.cc:1858
+#: commands.cc:1947
#, c-format
msgid "no packets found on stdin"
msgstr "æ¨æºå
¥åã«ãã±ãããã¿ã¤ãããã¨ãã§ãã¾ããã§ãã"
-#: commands.cc:1869
+#: commands.cc:1958
#, c-format
msgid "no packets found in given file"
msgid_plural "no packets found in given files"
msgstr[0] "ãã¡ã¤ã«å
ã«ãã±ããã¯å«ã¾ãã¦ãã¾ãã"
msgstr[1] "ãã¡ã¤ã«å
ã«ãã±ããã¯å«ã¾ãã¦ãã¾ãã"
-#: commands.cc:1873
+#: commands.cc:1962
#, c-format
msgid "read %d packet"
msgid_plural "read %d packets"
msgstr[0] "%d ãã±ããèªã¿è¾¼ã¿"
msgstr[1] "%d ãã±ããèªã¿è¾¼ã¿"
-#: commands.cc:1877 commands.cc:1966 commands.cc:1981 commands.cc:1995
-#: commands.cc:2010
+#: commands.cc:1966 commands.cc:2060 commands.cc:2075 commands.cc:2089
+#: commands.cc:2104
msgid "network"
msgstr "ãããã¯ã¼ã¯"
-#: commands.cc:1878
+#: commands.cc:1967
msgid "rebuild the indices used to sync over the network"
msgstr "ãããã¯ã¼ã¯ãä»ãã¦åæããã®ã«ä½¿ãç´¢å¼ãåæ§ç¯"
-#: commands.cc:1912
+#: commands.cc:2004
#, c-format
msgid "setting default server to %s\n"
msgstr "ããã©ã«ãã®ãµã¼ãã¼ã %s ã«è¨å®\n"
-#: commands.cc:1918
+#: commands.cc:2010
#, c-format
msgid "no hostname given"
msgstr "ãã¹ãåãæå®ãã¦ä¸ãã"
-#: commands.cc:1920
+#: commands.cc:2012
#, c-format
msgid "no server given and no default server set"
msgstr "ãµã¼ããæªæå®ã§ãããããã©ã«ãã®ãµã¼ãã¼ãè¨å®ããã¦ãã¾ãã"
-#: commands.cc:1924
+#: commands.cc:2016
#, c-format
msgid "using default server address: %s\n"
msgstr "ããã©ã«ãã®ãµã¼ãã¼ã¢ãã¬ã¹ãå©ç¨: %s\n"
-#: commands.cc:1936
+#: commands.cc:2030
#, c-format
msgid "setting default branch include pattern to '%s'\n"
msgstr "ãã©ã³ãåã«å«ããããã©ã«ããã¿ã¼ã³ã '%s' ã«è¨å®\n"
-#: commands.cc:1942
+#: commands.cc:2036
#, c-format
msgid "setting default branch exclude pattern to '%s'\n"
msgstr "ãã©ã³ãåã«å«ããªãããã©ã«ããã¿ã¼ã³ã '%s' ã«è¨å®\n"
-#: commands.cc:1948
+#: commands.cc:2042
#, c-format
msgid "no branch pattern given"
msgstr "ãã©ã³ãåãæå®ãã¦ä¸ãã"
-#: commands.cc:1950
+#: commands.cc:2044
#, c-format
msgid "no branch pattern given and no default pattern set"
msgstr "ãã©ã³ããã¿ã¼ã³ãæªæå®ããã¤ããã©ã«ããã¿ã¼ã³ãè¨å®ããã¦ãã¾ãã"
-#: commands.cc:1954
+#: commands.cc:2048
#, c-format
msgid "using default branch include pattern: '%s'\n"
msgstr "ãã©ã³ãåã«å«ããããã©ã«ãã®ãã¿ã¼ã³ãå©ç¨: '%s'\n"
-#: commands.cc:1962
+#: commands.cc:2056
#, c-format
msgid "excluding: %s\n"
msgstr "é¤å¤: %s\n"
-#: commands.cc:1966 commands.cc:1981 commands.cc:1995
+#: commands.cc:2060 commands.cc:2075 commands.cc:2089
msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]"
msgstr "[ADDRESS[:PORTNUMBER] [PATTERN]]"
-#: commands.cc:1967
+#: commands.cc:2061
msgid "push branches matching PATTERN to netsync server at ADDRESS"
msgstr "PATTERN ã«åããã©ã³ãã netsync ãµã¼ãã¼ (ADDRESS) ã«ããã·ã¥"
-#: commands.cc:1974 commands.cc:2003 commands.cc:2020
-#, c-format
-msgid "could not guess default signing key"
-msgstr "ããã©ã«ãã®ç½²åéµãæ¨æ¸¬ã§ãã¾ããã§ãã"
-
-#: commands.cc:1982
+#: commands.cc:2076
msgid "pull branches matching PATTERN from netsync server at ADDRESS"
msgstr "PATTERN ã«åããã©ã³ãã netsync ãµã¼ãã¼ (ADDRESS) ããåãè¾¼ã¿"
-#: commands.cc:1989
+#: commands.cc:2083
#, c-format
msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n"
msgstr "å¿åã§åãè¾¼ãã§ãã¾ã; èªè¨¼ãå¿
è¦ãªå ´å㯠-kKEYNAME ã使ã£ã¦ä¸ãã\n"
-#: commands.cc:1996
+#: commands.cc:2090
msgid "sync branches matching PATTERN with netsync server at ADDRESS"
msgstr "PATTERN ã«åããã©ã³ãã netsync ãµã¼ãã¼ (ADDRESS) ã¨åæ"
-#: commands.cc:2010
-msgid "ADDRESS[:PORTNUMBER] PATTERN ..."
-msgstr "ADDRESS[:PORTNUMBER] PATTERN ..."
+#: commands.cc:2104
+#, fuzzy
+msgid "PATTERN ..."
+msgstr "PATH..."
-#: commands.cc:2011
-msgid ""
-"listen on ADDRESS and serve the specified branches to connecting clients"
+#: commands.cc:2105
+#, fuzzy
+msgid "serve the branches specified by PATTERNs to connecting clients"
msgstr "ADDRESS ã§å¾
æ©ããæå®ãã©ã³ããæ¥ç¶ã¯ã©ã¤ã¢ã³ãã«æä¾"
-#: commands.cc:2024
+#: commands.cc:2118
#, c-format
msgid ""
"need permission to store persistent passphrase (see hook persist_phrase_ok())"
@@ -1212,11 +1197,11 @@
"æ°¸ç¶çã«ãã¹ãã¬ã¼ãºãä¿åãã¦ããããã®ãªã権éãå¿
è¦ã§ã (ãã㯠"
"persist_phrase_ok() ãåç
§ãã¦ä¸ãã)"
-#: commands.cc:2034
+#: commands.cc:2130
msgid "database"
msgstr "ãã¼ã¿ãã¼ã¹"
-#: commands.cc:2035
+#: commands.cc:2131
msgid ""
"init\n"
"info\n"
@@ -1248,11 +1233,11 @@
"rebuild\n"
"set_epoch BRANCH EPOCH\n"
-#: commands.cc:2049
+#: commands.cc:2145
msgid "manipulate database state"
msgstr "ãã¼ã¿ãã¼ã¹ã®ç¶æ
ãæä½"
-#: commands.cc:2102
+#: commands.cc:2198
msgid ""
"set FILE ATTR VALUE\n"
"get FILE [ATTR]\n"
@@ -1262,35 +1247,35 @@
"get FILE [ATTR]\n"
"drop FILE"
-#: commands.cc:2103
+#: commands.cc:2199
msgid "set, get or drop file attributes"
msgstr "ãã¡ã¤ã«å±æ§ãè¨å®/åå¾/åé¤"
-#: commands.cc:2191 work.cc:113
+#: commands.cc:2287 work.cc:113
#, c-format
msgid "registering %s file in working copy\n"
msgstr "ä½æ¥ã³ãã¼å
ã® %s ãã¡ã¤ã«ãç»é²\n"
-#: commands.cc:2220
+#: commands.cc:2316
#, c-format
msgid "failed to parse date string '%s': %s"
msgstr "ãã¼ã¿æåå '%s' ã®è§£æã«å¤±æ: %s"
-#: commands.cc:2226
+#: commands.cc:2322
msgid "commit working copy to database"
msgstr "ä½æ¥ã³ãã¼ããã¼ã¿ãã¼ã¹ã«ã³ããã"
-#: commands.cc:2244
+#: commands.cc:2340
#, c-format
msgid "no changes to commit\n"
msgstr "ã³ããããã¹ãå¤æ´ãããã¾ãã\n"
-#: commands.cc:2255
+#: commands.cc:2354
#, c-format
msgid "beginning commit on branch '%s'\n"
msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ã³ãããéå§\n"
-#: commands.cc:2256
+#: commands.cc:2355
#, c-format
msgid ""
"new manifest '%s'\n"
@@ -1299,12 +1284,12 @@
"æ°è¦ãããã§ã¹ã '%s'\n"
"æ°è¦ãªãã¸ã§ã³ '%s'\n"
-#: commands.cc:2263
+#: commands.cc:2362
#, c-format
msgid "--message and --message-file are mutually exclusive"
msgstr "--message 㨠--message-file ãåæã«æå®ãããã¨ã¯ã§ãã¾ãã"
-#: commands.cc:2266
+#: commands.cc:2365
#, c-format
msgid ""
"MT/log is non-empty and --message supplied\n"
@@ -1315,7 +1300,7 @@
"ãããããã MT/log ã移å/åé¤ããããã³ãã³ã\n"
"è¡ãã --message ãåé¤ããã®ã§ã¯ããã¾ããã?"
-#: commands.cc:2271
+#: commands.cc:2370
#, c-format
msgid ""
"MT/log is non-empty and --message-file supplied\n"
@@ -1326,62 +1311,62 @@
"ãããããã MT/log ã移å/åé¤ããããã³ãã³ã\n"
"è¡ãã --message-file ãåé¤ããã®ã§ã¯ããã¾ããã?"
-#: commands.cc:2289
+#: commands.cc:2388
#, c-format
msgid "empty log message; commit canceled"
msgstr "空ã®ãã°ã¡ãã»ã¼ã¸; ã³ãããã¯åãæ¶ããã¾ãã"
-#: commands.cc:2301
+#: commands.cc:2400
#, c-format
msgid "revision %s already in database\n"
msgstr "ãªãã¸ã§ã³ %s ã¯æ¢ã«ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¦ãã¾ã\n"
-#: commands.cc:2306
+#: commands.cc:2405
#, c-format
msgid "inserting new revision %s\n"
msgstr "æ°è¦ãªãã¸ã§ã³ %s ãæ¿å
¥ä¸\n"
-#: commands.cc:2315
+#: commands.cc:2414
#, c-format
msgid "skipping manifest %s, already in database\n"
msgstr "æ¢ã«ãã¼ã¿ãã¼ã¹ã«ãããããã§ã¹ã %s ãã¹ããã\n"
-#: commands.cc:2319
+#: commands.cc:2418
#, c-format
msgid "inserting manifest delta %s -> %s\n"
msgstr "ãããã§ã¹ãå·®å %s -> %s ãæ¿å
¥ä¸\n"
-#: commands.cc:2330
+#: commands.cc:2429
#, c-format
msgid "inserting full manifest %s\n"
msgstr "å®å
¨ãããã§ã¹ã %s ãæ¿å
¥ä¸\n"
-#: commands.cc:2343
+#: commands.cc:2442
#, c-format
msgid "skipping file delta %s, already in database\n"
msgstr "æ¢ã«ãã¼ã¿ãã¼ã¹ã«ãããã¡ã¤ã«å·®å %s ãã¹ããã\n"
-#: commands.cc:2349
+#: commands.cc:2448
#, c-format
msgid "inserting delta %s -> %s\n"
msgstr "å·®å %s -> %s ãæ¿å
¥ä¸\n"
-#: commands.cc:2359 commands.cc:2376
+#: commands.cc:2458 commands.cc:2475
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr "ãã¡ã¤ã« '%s' 㯠commit åã«å¤æ´ããã¾ãã. ä¸æ¢ãã¾ã"
-#: commands.cc:2369
+#: commands.cc:2468
#, c-format
msgid "inserting full version %s\n"
msgstr "å®å
¨ãªãã¼ã¸ã§ã³ %s ãæ¿å
¥ä¸\n"
-#: commands.cc:2403
+#: commands.cc:2502
#, c-format
msgid "committed revision %s\n"
msgstr "ãªãã¸ã§ã³ %s ãã³ããã\n"
-#: commands.cc:2409
+#: commands.cc:2508
#, c-format
msgid ""
"note: this revision creates divergence\n"
@@ -1390,7 +1375,7 @@
"注æ: ãã®ãªãã¸ã§ã³ã«ãã£ã¦åå²ãçãã¾ã\n"
"注æ: åå²ãæã¾ãªããªã 'monotone merge' ãå®è¡ãã¦ä¸ãã"
-#: commands.cc:2572
+#: commands.cc:2675
msgid ""
"show current diffs on stdout.\n"
"If one revision is given, the diff between the working directory and\n"
@@ -1402,7 +1387,7 @@
"å·®åããäºã¤æå®ããã¦ããã°ããããªãã¸ã§ã³éã®å·®åã表示ãã¾ãã\n"
"å½¢å¼ãæå®ããã¦ããªããã°ãããã©ã«ãã§ã¯ unified å½¢å¼ã使ç¨ããã¾ãã"
-#: commands.cc:2588
+#: commands.cc:2691
#, c-format
msgid ""
"--diff-args requires --external\n"
@@ -1411,47 +1396,47 @@
"--diff-args 㯠--external ãå¿
è¦ã¨ãã¾ãã\n"
"--external ã追å ãããã--diff-args ãçãã¦ã¿ã¦ã¯ã©ãã§ãã?"
-#: commands.cc:2622
+#: commands.cc:2725
#, c-format
msgid "current revision has no ancestor"
msgstr "ç¾å¨ã®ãªãã¸ã§ã³ã«ã¯ç¥å
ãããã¾ãã"
-#: commands.cc:2661
+#: commands.cc:2764
#, c-format
msgid "no common ancestor for %s and %s"
msgstr "%s 㨠%s ã«ã¯å
±éã®ç¥å
ãããã¾ãã"
-#: commands.cc:2667
+#: commands.cc:2770
#, c-format
msgid "concatenating un-committed changeset to composite\n"
msgstr "åæã®ããã«ã³ãããããã¦ããªãå¤æ´ã»ãããé£çµ\n"
-#: commands.cc:2704 commands.cc:2721
+#: commands.cc:2807 commands.cc:2824
msgid "LEFT RIGHT"
msgstr "LEFT RIGHT"
-#: commands.cc:2704
+#: commands.cc:2807
msgid "print least common ancestor"
msgstr "æãè¿ãç¥å
ã表示"
-#: commands.cc:2717
+#: commands.cc:2820
msgid "no common ancestor found"
msgstr "å
±éã®ç¥å
ã¯ããã¾ããã§ãã"
-#: commands.cc:2721
+#: commands.cc:2824
msgid "print least common ancestor / dominator"
msgstr "æãè¿ãç¥å
/ æ¯é
è
ã表示"
-#: commands.cc:2735
+#: commands.cc:2838
msgid "no common ancestor/dominator found"
msgstr "å
±éã®ç¥å
/ æ¯é
è
ãã¿ã¤ããã¾ãã"
-#: commands.cc:2760
-#, c-format
-msgid "updating %s to %s\n"
+#: commands.cc:2863
+#, fuzzy, c-format
+msgid "updating %s to %s"
msgstr "%s ã %s ã«æ´æ°ä¸\n"
-#: commands.cc:2784
+#: commands.cc:2887
msgid ""
"update working copy.\n"
"If a revision is given, base the update on that revision. If not,\n"
@@ -1461,12 +1446,12 @@
"ãªãã¸ã§ã³ãæå®ããã¦ããã°ããã«åºã¥ãã¦ãæå®ããã¦ããªããã°\n"
"æ示çã¾ãã¯æé»ã«æå®ããããã©ã³ãã®ææ°çã«åºã¥ãã¦æ´æ°ãã¾ãã"
-#: commands.cc:2809
+#: commands.cc:2912
#, c-format
msgid "this working directory is a new project; cannot update"
msgstr "ãã®ä½æ¥ãã£ã¬ã¯ããªã¯æ°è¦ã®ããã¸ã§ã¯ãã§ã; æ´æ°ã§ãã¾ãã"
-#: commands.cc:2816
+#: commands.cc:2919
#, c-format
msgid ""
"your request matches no descendents of the current revision\n"
@@ -1477,32 +1462,32 @@
"ãããããã --revision=<ä»ã®ãã©ã³ãã®ãªãã¸ã§ã³> ã¨ãããã®ã§ã¯\n"
"ããã¾ããã?"
-#: commands.cc:2821
+#: commands.cc:2924
#, c-format
msgid "multiple update candidates:\n"
msgstr "è¤æ°ã®æ´æ°åè£:\n"
-#: commands.cc:2825
+#: commands.cc:2928
#, c-format
msgid "choose one with 'monotone update -r'\n"
msgstr "'monotone update -r' ã¨ãã¦ä¸ã¤é¸æ\n"
-#: commands.cc:2826
+#: commands.cc:2929
#, c-format
msgid "multiple candidates remain after selection"
msgstr "é¸æãããã®ããå¾ã«è¤æ°ã®åè£ãæ®ã£ã¦ãã¾ã"
-#: commands.cc:2841
+#: commands.cc:2944
#, c-format
msgid "already up to date at %s\n"
msgstr "%s ã¯æ¢ã«ææ°ã§ã\n"
-#: commands.cc:2845
+#: commands.cc:2952
#, c-format
msgid "selected update target %s\n"
msgstr "é¸æãããæ´æ°ã¿ã¼ã²ãã %s\n"
-#: commands.cc:2857
+#: commands.cc:2964
#, c-format
msgid ""
"revision %s is not a member of branch %s\n"
@@ -1511,22 +1496,22 @@
"ãªãã¸ã§ã³ %s ã¯ãã©ã³ã %s ã«å±ãã¦ãã¾ãã\n"
"æ示çã« --branch ãæå®ãã¦å試è¡ãã¦ä¸ãã\n"
-#: commands.cc:2872
+#: commands.cc:2979
#, c-format
msgid "updating along chosen edge %s -> %s\n"
msgstr "é¸æããå
端 %s -> %s ã«å¾ã£ã¦æ´æ°ä¸\n"
-#: commands.cc:2883
+#: commands.cc:2990
#, c-format
msgid "merging working copy with chosen edge %s -> %s\n"
msgstr "ä½æ¥ã³ãã¼ãé¸æããå
端 %s -> %s ã¨çµ±åä¸\n"
-#: commands.cc:2932
+#: commands.cc:3039
#, c-format
msgid "updated to base revision %s\n"
msgstr "åºæºãªãã¸ã§ã³ %s ã«æ´æ°\n"
-#: commands.cc:2998
+#: commands.cc:3105
#, c-format
msgid ""
"common ancestor %s found\n"
@@ -1535,89 +1520,89 @@
"å
±éã®ç¥å
%s ãçºè¦\n"
"3æ¹çµåã試ã¿ã¦ãã¾ã\n"
-#: commands.cc:3009
+#: commands.cc:3116
#, c-format
msgid "no common ancestor found, synthesizing edges\n"
msgstr "å
±éã®ç¥å
ãããã¾ããã§ããã®ã§ãå
端å士ãåæä¸\n"
-#: commands.cc:3059
+#: commands.cc:3162
msgid "merge unmerged heads of branch"
msgstr "çµ±åããã¦ããªããã©ã³ãã®è¤æ°ã®ææ°çãçµ±å"
-#: commands.cc:3073
+#: commands.cc:3176
#, c-format
msgid "branch '%s' is merged\n"
msgstr "ãã©ã³ã '%s' ãçµ±å\n"
-#: commands.cc:3079
+#: commands.cc:3182
#, c-format
msgid "starting with revision 1 / %d\n"
msgstr "ãªãã¸ã§ã³ 1 / %d ã«ã¤ãã¦ä½æ¥éå§\n"
-#: commands.cc:3083
+#: commands.cc:3186
#, c-format
msgid "merging with revision %d / %d\n"
msgstr "ãªãã¸ã§ã³ %d / %d ã«ã¤ãã¦çµ±åä¸\n"
-#: commands.cc:3084 commands.cc:3085 commands.cc:3152 commands.cc:3236
-#: commands.cc:3237
+#: commands.cc:3187 commands.cc:3188 commands.cc:3255 commands.cc:3339
+#: commands.cc:3340
#, c-format
msgid "[source] %s\n"
msgstr "[å
] %s\n"
-#: commands.cc:3102 commands.cc:3189 commands.cc:3256
+#: commands.cc:3205 commands.cc:3292 commands.cc:3359
#, c-format
msgid "[merged] %s\n"
msgstr "[çµ±åæ¸ã¿] %s\n"
-#: commands.cc:3105
+#: commands.cc:3208
#, c-format
msgid "note: your working copies have not been updated\n"
msgstr "注æ: ä½æ¥ã³ãã¼ã¯æ´æ°ããã¦ãã¾ãã\n"
-#: commands.cc:3108
+#: commands.cc:3211
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr "SOURCE-BRANCH DEST-BRANCH"
-#: commands.cc:3109
+#: commands.cc:3212
msgid "merge from one branch to another asymmetrically"
msgstr "ä¸æ¹ã®ãã©ã³ããä»æ¹ã«éåæã«çµ±å"
-#: commands.cc:3143 commands.cc:3146
+#: commands.cc:3246 commands.cc:3249
#, c-format
msgid "branch '%s' is not merged\n"
msgstr "ãã©ã³ã '%s' ã¯çµ±åããã¦ãã¾ãã\n"
-#: commands.cc:3151
+#: commands.cc:3254
#, c-format
msgid "propagating %s -> %s\n"
msgstr "ä¼æä¸ %s -> %s\n"
-#: commands.cc:3153
+#: commands.cc:3256
#, c-format
msgid "[target] %s\n"
msgstr "[å
] %s\n"
-#: commands.cc:3158
+#: commands.cc:3261
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
msgstr "ãã©ã³ã '%s' ã¯ãã©ã³ã '%s' ã«å¯¾ãã¦ææ°ã§ã\n"
-#: commands.cc:3160
+#: commands.cc:3263
#, c-format
msgid "no action taken\n"
msgstr "ä½ããã¾ãã\n"
-#: commands.cc:3164
+#: commands.cc:3267
#, c-format
msgid "no merge necessary; putting %s in branch '%s'\n"
msgstr "çµ±åã¯å¿
è¦ããã¾ãã. %s ããã©ã³ã '%s' å
ã«åãè¾¼ã¿ä¸\n"
-#: commands.cc:3193
+#: commands.cc:3296
msgid "refresh the inodeprint cache"
msgstr "i-node 表示ãã£ãã·ã¥ãæ´æ°"
-#: commands.cc:3201
+#: commands.cc:3304
msgid ""
"LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n"
"LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH"
@@ -1625,57 +1610,69 @@
"LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n"
"LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH"
-#: commands.cc:3203
+#: commands.cc:3306
msgid "merge two explicitly given revisions, placing result in given branch"
msgstr "æ示çã«æå®ããäºã¤ã®ãªãã¸ã§ã³ãçµ±åãçµæã¯æå®ãã©ã³ãã¸ã"
-#: commands.cc:3218 commands.cc:3220
+#: commands.cc:3321 commands.cc:3323
#, c-format
msgid "%s is not an ancestor of %s"
msgstr "%s 㯠%s ã®ç¥å
ã§ã¯ããã¾ãã"
-#: commands.cc:3229
+#: commands.cc:3332
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr "%s 㨠%s ã¯åããªãã¸ã§ã³ã§ã. ä¸æ¢ãã¾ã"
-#: commands.cc:3231 commands.cc:3233
+#: commands.cc:3334 commands.cc:3336
#, c-format
msgid "%s is already an ancestor of %s"
msgstr "%s ã¯æ¢ã« %s ã®ç¥å
ã¨ãªã£ã¦ãã¾ã"
-#: commands.cc:3259
+#: commands.cc:3362
msgid "(revision|manifest|file|key) PARTIAL-ID"
msgstr "(revision|manifest|file|key) PARTIAL-ID"
-#: commands.cc:3260
+#: commands.cc:3363
msgid "complete partial id"
msgstr "é¨å ID ãè£å®"
-#: commands.cc:3269
+#: commands.cc:3372
#, c-format
msgid "non-hex digits in partial id"
msgstr "é¨å ID ã«åå
é²æ°ãå«ã¾ãã¦ãã¾ãã"
-#: commands.cc:3317
-msgid "revert file(s), dir(s) or entire working copy"
+#: commands.cc:3420
+#, fuzzy
+msgid "revert file(s), dir(s) or entire working copy (\".\")"
msgstr "ãã¡ã¤ã«ããã£ã¬ã¯ããªã¾ãã¯å®å
¨ãªä½æ¥ã³ãã¼ã®å¤æ´ãç ´æ£"
-#: commands.cc:3355
+#: commands.cc:3448
#, c-format
-msgid "reverting %s from %s to %s\n"
+msgid "revert adding find_missing entries to %d original args elements\n"
+msgstr ""
+
+#: commands.cc:3457
+#, c-format
+msgid ""
+"after adding everything from find_missing, revert args_copy has %d elements\n"
+msgstr ""
+
+#: commands.cc:3481
+#, fuzzy, c-format
+msgid "reverting %s to %s"
msgstr "%s ã %s ãã %s ã¸æ»ãã¦ãã¾ã\n"
-#: commands.cc:3359
+#: commands.cc:3485
#, c-format
msgid "no file version %s found in database for %s"
msgstr "ãã¼ã¸ã§ã³ %s ã®ãã¡ã¤ã«ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ãã (対象: %s)"
-#: commands.cc:3376
+#: commands.cc:3502
msgid "RCSFILE..."
msgstr "RCSFILE..."
-#: commands.cc:3377
+#: commands.cc:3503
msgid ""
"parse versions in RCS files\n"
"this command doesn't reconstruct or import revisions.you probably want "
@@ -1685,51 +1682,51 @@
"ãã®ã³ãã³ã㯠(CVS ã®) ãªãã¸ã§ã³ãåæ§ç¯ã¾ãã¯åãè¾¼ã¿ã¯ãã¾ããããããã"
"ããªãã®æå¾
ãã¦ããã®ã¯ cvs_import ã§ãããã"
-#: commands.cc:3393
+#: commands.cc:3519
msgid "rcs"
msgstr "RCS é¢é£"
-#: commands.cc:3393
+#: commands.cc:3519
msgid "CVSROOT"
msgstr "CVSROOT"
-#: commands.cc:3393
+#: commands.cc:3519
msgid "import all versions in CVS repository"
msgstr "CVS ãªãã¸ããªå
ã®ãã¹ã¦ã®ãã¼ã¸ã§ã³ãåãè¾¼ã"
-#: commands.cc:3456
+#: commands.cc:3582
msgid "PATH"
msgstr "PATH"
-#: commands.cc:3457
+#: commands.cc:3583
msgid "print annotated copy of the file from REVISION"
msgstr "REVISION ã®æ³¨éä»ãã®ãã¡ã¤ã«ã®ã³ãã¼ã表示"
-#: commands.cc:3474
+#: commands.cc:3600
#, c-format
msgid "no revision for file '%s' in database"
msgstr "ãã¡ã¤ã« '%s' ã«å¯¾ãããªãã¸ã§ã³ã¯ãã¼ã¿ãã¼ã¹å
ã«ã¿ã¤ããã¾ããã§ãã"
-#: commands.cc:3477
+#: commands.cc:3603
#, c-format
msgid "annotate file file_path '%s'\n"
msgstr "注éãã¡ã¤ã« file_path '%s'\n"
-#: commands.cc:3486
+#: commands.cc:3612
#, c-format
msgid "no such file '%s' in revision '%s'\n"
msgstr "ãã¡ã¤ã« '%s' ã¯ãªãã¸ã§ã³ %s å
ã«ã¯ããã¾ãã\n"
-#: commands.cc:3488
+#: commands.cc:3614
#, c-format
msgid "annotate for file_id %s\n"
msgstr "file_id %s ã«å¯¾ãã注é\n"
-#: commands.cc:3493
+#: commands.cc:3619
msgid "[FILE]"
msgstr "[FILE]"
-#: commands.cc:3494
+#: commands.cc:3620
msgid ""
"print history in reverse order (filtering by 'FILE'). If one or more\n"
"revisions are given, use them as a starting point."
@@ -1737,34 +1734,35 @@
"éé ã§å±¥æ´ã表示 ('FILE' ã§ãã£ã«ã¿)ãä¸ã¤ä»¥ä¸ã®ãªãã¸ã§ã³ãæå®ããã¦\n"
"ããã°ãããéå§ç¹ã¨ãã¦å©ç¨ã"
-#: commands.cc:3554
+#: commands.cc:3680
#, c-format
msgid "revision %s does not exist in db, skipping\n"
msgstr "ãªãã¸ã§ã³ %s 㯠db å
ã«ããã¾ãã. ã¹ããããã¾ã\n"
-#: commands.cc:3587
+#: commands.cc:3713
#, c-format
msgid "revision '%s' in '%s' maps to '%s' in %s\n"
msgstr "ãªãã¸ã§ã³ '%s' ('%s' å
) ã '%s' (%s å
) ã«ããã\n"
-#: commands.cc:3661
+#: commands.cc:3787
msgid "DIRECTORY"
msgstr "DIRECTORY"
-#: commands.cc:3661
+#: commands.cc:3787
msgid "setup a new working copy directory"
msgstr "æ°è¦ä½æ¥ã³ãã¼ãã£ã¬ã¯ããªãä½æ"
-#: commands.cc:3667
+#: commands.cc:3793
#, c-format
msgid "need --branch argument for setup"
msgstr "ä½æã«ã¯ --branch å¼æ°ãå¿
è¦ã§ã"
-#: commands.cc:3676
+#: commands.cc:3802
msgid "automation"
msgstr "èªåå"
-#: commands.cc:3677
+#: commands.cc:3803
+#, fuzzy
msgid ""
"interface_version\n"
"heads [BRANCH]\n"
@@ -1785,6 +1783,7 @@
"get_file ID\n"
"get_manifest [ID]\n"
"get_revision [ID]\n"
+"keys\n"
msgstr ""
"interface_version\n"
"heads [BRANCH]\n"
@@ -1806,31 +1805,31 @@
"get_manifest [ID]\n"
"get_revision [ID]\n"
-#: commands.cc:3696
+#: commands.cc:3823
msgid "automation interface"
msgstr "èªååã¤ã³ã¿ã¼ãã§ã¼ã¹"
-#: commands.cc:3710 commands.cc:3726
+#: commands.cc:3837 commands.cc:3853
msgid "vars"
msgstr "å¤æ°"
-#: commands.cc:3710
+#: commands.cc:3837
msgid "DOMAIN NAME VALUE"
msgstr "DOMAIN NAME VALUE"
-#: commands.cc:3711
+#: commands.cc:3838
msgid "set the database variable NAME to VALUE, in domain DOMAIN"
msgstr "ãã¡ã¤ã³ DOMAIN ã®ãã¼ã¿ãã¼ã¹å¤æ° NAME ã VALUE ã«è¨å®"
-#: commands.cc:3726
+#: commands.cc:3853
msgid "DOMAIN NAME"
msgstr "DOMAIN NAME"
-#: commands.cc:3727
+#: commands.cc:3854
msgid "remove the database variable NAME in domain DOMAIN"
msgstr "ãã¡ã¤ã³ DOMAIN ã®ãã¼ã¿ãã¼ã¹å¤æ° NAME ãæ¶å»"
-#: commands.cc:3738
+#: commands.cc:3865
#, c-format
msgid "no var with name %s in domain %s"
msgstr "%s ã¨ããå¤æ°ã¯ãã¡ã¤ã³ %s å
ã«ã¯ããã¾ãã"
@@ -1854,7 +1853,7 @@
msgid "checking %d manifests\n"
msgstr "%d åã®ãããã§ã¹ããæ¤è¨¼ä¸\n"
-#: database_check.cc:136 rcs_import.cc:1259
+#: database_check.cc:136 rcs_import.cc:1258
msgid "manifests"
msgstr "ãããã§ã¹ã"
@@ -1873,8 +1872,8 @@
msgid "checking %d revisions\n"
msgstr "%d åã®ãªãã¸ã§ã³ãæ¤è¨¼ä¸\n"
-#: database_check.cc:192 database_check.cc:380 netsync.cc:3718
-#: rcs_import.cc:1258
+#: database_check.cc:192 database_check.cc:380 netsync.cc:3497
+#: rcs_import.cc:1257
msgid "revisions"
msgstr "ãªãã¸ã§ã³"
@@ -1907,7 +1906,7 @@
msgid "checking %d public keys\n"
msgstr "%d åã®å
¬ééµãæ¤è¨¼ä¸\n"
-#: database_check.cc:324 netsync.cc:3722
+#: database_check.cc:324 netsync.cc:3501
msgid "keys"
msgstr "éµ"
@@ -1916,7 +1915,7 @@
msgid "checking %d revision certs\n"
msgstr "%d åã®ãªãã¸ã§ã³è¨¼æãæ¤è¨¼ä¸\n"
-#: database_check.cc:350 netsync.cc:3720
+#: database_check.cc:350 netsync.cc:3499
msgid "certs"
msgstr "証æ"
@@ -2160,52 +2159,43 @@
msgid "database is good\n"
msgstr "ãã¼ã¿ãã¼ã¹ã¯æ£å¸¸ã§ã\n"
-#: database.cc:80
+#: database.cc:86
#, c-format
msgid ""
-"database schemas do not match: wanted %s, got %s. try migrating database"
+"layout of database %s doesn't match this version of monotone\n"
+"wanted schema %s, got %s\n"
+"try 'monotone db migrate' to upgrade\n"
+"(this is irreversible; you may want to make a backup copy first)"
msgstr ""
-"ãã¼ã¿ãã¼ã¹ã¹ãã¼ããä¸è´ãã¾ãã: çµæã¯æå¾
ãã %s ã§ã¯ãªã%sããã¼ã¿ãã¼"
-"ã¹ãçµ±åãã¦ã¿ã¦ä¸ãã"
-#: database.cc:135 database.cc:197
+#: database.cc:147
#, c-format
-msgid "database %s does not exist"
-msgstr "ãã¼ã¿ãã¼ã¹ %s ã¯åå¨ãã¾ãã"
-
-#: database.cc:136 database.cc:198
-#, c-format
-msgid "%s is a directory, not a database"
-msgstr "%s ã¯ãã¼ã¿ãã¼ã¹ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
-
-#: database.cc:143
-#, c-format
msgid "unable to probe database version in file %s"
msgstr "ãã¡ã¤ã« %s å
ã®ãã¼ã¿ãã¼ã¹ãã¼ã¸ã§ã³ãæ¤åºã§ãã¾ããã§ãã"
-#: database.cc:150
+#: database.cc:154
#, c-format
msgid "database %s is not an sqlite version 3 file, try dump and reload"
msgstr ""
"ãã¼ã¿ãã¼ã¹ %s 㯠SQLite ver. 3 ã®ãã¡ã¤ã«ã§ã¯ããã¾ããããã³ãããå¾å度èª"
"ã¿è¾¼ãã§ã¿ã¦ä¸ãã"
-#: database.cc:172 database.cc:183
+#: database.cc:176 database.cc:187
#, c-format
msgid "sqlite error: %d: %s"
msgstr "SQLite ã¨ã©ã¼: %d: %s"
-#: database.cc:177
+#: database.cc:181
msgid "make sure database and containing directory are writeable"
msgstr ""
"ãã¼ã¿ãã¼ã¹ã¨ãããå«ããã£ã¬ã¯ããªãæ¸ãè¾¼ã¿å¯è½ã§ããã確èªãã¦ä¸ãã"
-#: database.cc:224
+#: database.cc:226
#, c-format
msgid "could not initialize database: %s: already exists"
msgstr "ãã¼ã¿ãã¼ã¹ãåæåã§ãã¾ããã§ãã: %s: æ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:229
+#: database.cc:231
#, c-format
msgid ""
"existing (possibly stale) journal file '%s' has same stem as new database '%"
@@ -2216,12 +2206,12 @@
"ãå¹¹ãæã£ã¦ãã¾ã\n"
"ãã¼ã¿ãã¼ã¹ä½æãä¸æ¢ãã¾ã"
-#: database.cc:348
+#: database.cc:353
#, c-format
msgid "cannot create %s; it already exists"
msgstr "%s ãä½æã§ãã¾ãã; æ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:412
+#: database.cc:417
#, c-format
msgid ""
"schema version : %s\n"
@@ -2262,138 +2252,169 @@
" 証æ : %u\n"
" ç·è¨ : %u\n"
-#: database.cc:465
+#: database.cc:471
#, c-format
msgid "database schema version: %s"
msgstr "åºæºã¹ãã¼ããã¼ã¸ã§ã³: %s"
-#: database.cc:483
+#: database.cc:490
msgid "mcerts"
msgstr "mcerts"
-#: database.cc:484
+#: database.cc:491
msgid "pubkeys"
msgstr "å
¬ééµ"
-#: database.cc:485
+#: database.cc:492
msgid "privkeys"
msgstr "ç§å¯éµ"
-#: database.cc:545
+#: database.cc:536
#, c-format
msgid "statement cache statistics\n"
msgstr "ã¹ãã¼ãã¡ã³ããã£ãã·ã¥çµ±è¨\n"
-#: database.cc:546
+#: database.cc:537
#, c-format
msgid "prepared %d statements\n"
msgstr "%d åã®ããªãã¢ã¼ãã¹ãã¼ãã¡ã³ã\n"
-#: database.cc:551
+#: database.cc:541
#, c-format
msgid "%d executions of %s\n"
msgstr "%d å®è¡ (%s)\n"
-#: database.cc:608
+#: database.cc:594
#, c-format
msgid "prepared statement %s\n"
msgstr "ããªãã¢ã¼ãã¹ãã¼ãã¡ã³ã %s\n"
-#: database.cc:612
+#: database.cc:598
#, c-format
msgid "multiple statements in query: %s\n"
msgstr "ã¯ã¨ãªä¸ã«è¤æ°ã®ã¹ãã¼ãã¡ã³ã: %s\n"
-#: database.cc:618
+#: database.cc:604
#, c-format
msgid "wanted %d columns got %d in query: %s\n"
msgstr "ã¯ã¨ãªã§ %d åè¦æ±ãã¾ãããå¾ãã®ã¯ %d åã§ã: %s\n"
-#: database.cc:624
+#: database.cc:610
#, c-format
msgid "binding %d parameters for %s\n"
msgstr "%d å¤æ°ã %s ã«ãã¤ã³ã\n"
-#: database.cc:638
+#: database.cc:624
#, c-format
msgid "binding %d with value '%s'\n"
msgstr "%d ãå¤ '%s' ã«ãã¤ã³ã\n"
-#: database.cc:654
+#: database.cc:640
#, c-format
msgid "null result in query: %s\n"
msgstr "ã¯ã¨ãªä¸ã«çµæ null ãå«ã¾ãã¦ãã¾ã: %s\n"
-#: database.cc:672
+#: database.cc:658
#, c-format
msgid "wanted %d rows got %s in query: %s\n"
msgstr "ã¯ã¨ãªã§ %d è¡è¦æ±ãã¾ãããå¾ãã®ã¯ %s ã§ã: %s\n"
-#: database.cc:682
+#: database.cc:668
#, c-format
msgid "cannot change filename to %s while db is open"
msgstr "ãã¼ã¿ãã¼ã¹ã使ç¨ä¸ãªã®ã§ãã¡ã¤ã«åã %s ã«å¤æ´ãããã¨ãã§ãã¾ãã"
-#: database.cc:882
+#: database.cc:686
#, c-format
+msgid ""
+"Attempt to start exclusive transaction within non-exclusive transaction."
+msgstr ""
+
+#: database.cc:880
+#, c-format
msgid "version cache expiring %s\n"
msgstr "ãã¼ã¸ã§ã³ãã£ãã·ã¥ã®æå¹æéãåãã¦ãã¾ã: %s\n"
-#: database.cc:904
+#: database.cc:902
#, c-format
msgid "version cache hit on %s\n"
msgstr "ãã¼ã¸ã§ã³ãã£ãã·ã¥ããã: %s\n"
-#: database.cc:949
+#: database.cc:971
#, c-format
msgid "reconstructing %s in %s\n"
msgstr "%s (%s å
)ãåæ§ç¯ä¸\n"
-#: database.cc:1003
+#: database.cc:1077
#, c-format
-msgid "inserting edge: %s <- %s\n"
-msgstr "å
端ãæ¿å
¥: %s <- %s\n"
-
-#: database.cc:1007
-#, c-format
-msgid "skipping merge edge %s <- %s\n"
-msgstr "å
端ã®çµ±å %s <- %s ãã¹ããã\n"
-
-#: database.cc:1053
-#, c-format
msgid "following delta %s -> %s\n"
msgstr "ç¶ãå·®å %s -> %s\n"
-#: database.cc:1417
+#: database.cc:1499
#, c-format
msgid "Killing revision %s locally\n"
msgstr "ãã¼ã«ã«ã«ãªãã¸ã§ã³ %s ãåé¤\n"
-#: database.cc:1429
+#: database.cc:1511
#, c-format
msgid "Deleting all references to branch %s\n"
msgstr "ãã©ã³ã %s ã¸ã®ãã¹ã¦ã®åç
§ãåé¤\n"
-#: database.cc:1442
+#: database.cc:1524
#, c-format
msgid "Deleting all references to tag %s\n"
msgstr "ã¿ã° %s ã¸ã®ãã¹ã¦ã®ãªãã¡ã¬ã³ã¹ãåé¤\n"
-#: database.cc:1592 database.cc:1604
+#: database.cc:1625
#, c-format
msgid "another key with name '%s' already exists"
msgstr "'%s' ã¨ããååã®ä»ã®éµãæ¢ã«åå¨ãã¦ãã¾ã"
-#: database.cc:2453
+#: database.cc:2253
+#, fuzzy, c-format
+msgid "after get_branch_heads for %s, heads has %d entries\n"
+msgstr "ãã©ã³ã %s ã«ã¯ %d åã®ã¨ã³ããªãããã¾ã\n"
+
+#: database.cc:2276
#, c-format
+msgid "processing selector type %d with i->second '%s'\n"
+msgstr ""
+
+#: database.cc:2283
+#, fuzzy, c-format
+msgid "limiting to current branch '%s'\n"
+msgstr "ãã©ã³ã %s ã¸ã®ãã¹ã¦ã®åç
§ãåé¤\n"
+
+#: database.cc:2513
+#, c-format
msgid "no database specified"
msgstr "ãã¼ã¿ãã¼ã¹æªæå®"
-#: database.cc:2464
+#: database.cc:2521
#, c-format
+msgid "database %s does not exist"
+msgstr "ãã¼ã¿ãã¼ã¹ %s ã¯åå¨ãã¾ãã"
+
+#: database.cc:2522
+#, c-format
+msgid "%s is a directory, not a database"
+msgstr "%s ã¯ãã¼ã¿ãã¼ã¹ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
+
+#: database.cc:2547
+#, c-format
msgid "could not open database '%s': %s"
msgstr "ãã¼ã¿ãã¼ã¹ '%s': %s ãéãã¾ããã§ãã"
+#: database.cc:2592
+#, c-format
+msgid "attempting to rollback and close %d databases"
+msgstr ""
+
+#: database.cc:2601
+#, c-format
+msgid "exec_err = %d, close_err = %d"
+msgstr ""
+
#: diff_patch.cc:209
#, c-format
msgid "exchanging preserved extent [%d+%d] with changed extent [%d+%d]\n"
@@ -2466,22 +2487,22 @@
msgid "recording successful merge of %s <-> %s into %s\n"
msgstr "%s <-> %s ãã %s ã¸ã®æåããçµ±åãè¨é²\n"
-#: diff_patch.cc:528
+#: diff_patch.cc:530
#, c-format
msgid "trying to merge %s <-> %s (ancestor: %s)\n"
msgstr "%s <-> %s (ç¥å
: %s) ã®çµ±åã試ãã¦ãã¾ã\n"
-#: diff_patch.cc:533 diff_patch.cc:638
+#: diff_patch.cc:535 diff_patch.cc:640
#, c-format
msgid "files are identical\n"
msgstr "ãã¡ã¤ã«ã¯å
¨ãåãã§ã\n"
-#: diff_patch.cc:575
+#: diff_patch.cc:577
#, c-format
msgid "internal 3-way merged ok\n"
msgstr "å
é¨ä¸å
çµ±åå®äº\n"
-#: diff_patch.cc:589
+#: diff_patch.cc:591
#, c-format
msgid ""
"help required for 3-way merge\n"
@@ -2496,17 +2517,17 @@
"[ å³] %s\n"
"[çµ±åæ¸] %s\n"
-#: diff_patch.cc:606
+#: diff_patch.cc:608
#, c-format
msgid "lua merge3 hook merged ok\n"
msgstr "lua merge3 ããã¯çµ±åå®äº\n"
-#: diff_patch.cc:633
+#: diff_patch.cc:635
#, c-format
msgid "trying to merge %s <-> %s\n"
msgstr "%s <-> %s ã®çµ±åã試ãã¦ãã¾ã\n"
-#: diff_patch.cc:649
+#: diff_patch.cc:651
#, c-format
msgid ""
"help required for 2-way merge\n"
@@ -2519,27 +2540,27 @@
"[ å³] %s\n"
"[çµ±åæ¸] %s\n"
-#: diff_patch.cc:663
+#: diff_patch.cc:665
#, c-format
msgid "lua merge2 hook merged ok\n"
msgstr "lua merge2 ããã¯çµ±åå®äº\n"
-#: diff_patch.cc:694
+#: diff_patch.cc:696
#, c-format
msgid "temporarily recording merge of %s <-> %s into %s\n"
msgstr "ä¸æçã« %s <-> %s ãã %s ã¸ã®çµ±åãè¨é²\n"
-#: diff_patch.cc:711
+#: diff_patch.cc:713
#, c-format
msgid "file '%s' does not exist in working copy"
msgstr "ãã¡ã¤ã« '%s' ã¯ä½æ¥ã³ãã¼ä¸ã«ã¯ããã¾ãã"
-#: diff_patch.cc:712
+#: diff_patch.cc:714
#, c-format
msgid "'%s' in working copy is a directory, not a file"
msgstr "ä½æ¥ã³ãã¼å
ã® '%s' ã¯ãã¡ã¤ã«ã§ã¯ãªããã£ã¬ã¯ããªã§ã"
-#: diff_patch.cc:716
+#: diff_patch.cc:718
#, c-format
msgid "file %s in working copy has id %s, wanted %s"
msgstr "ä½æ¥ã³ãã¼å
ã®ãã¡ã¤ã« %s ã® ID 㯠%s ã§ããã欲ããã®ã¯ %s ã§ã"
@@ -2642,37 +2663,32 @@
msgid "cannot open file %s for reading"
msgstr "ãã¡ã¤ã« %s ãèªã¿è¾¼ã¿ã®ããã«éããã¨ãã§ãã¾ãã"
-#: file_io.cc:324
+#: file_io.cc:347
#, c-format
msgid "Cannot read standard input multiple times"
msgstr "æ¨æºå
¥åãä½åº¦ãèªã¿è¾¼ããã¨ã¯ã§ãã¾ãã"
-#: file_io.cc:354
+#: file_io.cc:378
#, c-format
msgid "file '%s' cannot be overwritten as data; it is a directory"
msgstr "'%s' ã«ãã¼ã¿ãä¸æ¸ãã§ãã¾ããããã£ã¬ã¯ããªã§ã"
-#: file_io.cc:368
+#: file_io.cc:386
#, c-format
msgid "cannot open file %s for writing"
msgstr "ãã¡ã¤ã« %s ãæ¸ãè¾¼ã¿ã®ããã«éããã¨ãã§ãã¾ãã"
-#: file_io.cc:375
+#: file_io.cc:477
#, c-format
-msgid "removing %s failed"
-msgstr "%s ã®åé¤ã«å¤±æ"
-
-#: file_io.cc:437
-#, c-format
msgid "ignoring book keeping entry %s\n"
msgstr "è¨é²ç°¿ç¨ã¨ã³ã㪠%s ãç¡è¦ãã¾ã\n"
-#: file_io.cc:457
+#: file_io.cc:497
#, c-format
msgid "caught runtime error %s constructing file path for %s\n"
msgstr "%s ã«ã¤ãã¦ãã¡ã¤ã«ãã¹ä½æä¸ã«å®è¡æã¨ã©ã¼ %s çºç\n"
-#: file_io.cc:481
+#: file_io.cc:521
#, c-format
msgid "no such file or directory: '%s'"
msgstr "ãã®ãããªãã¡ã¤ã«ã¾ãã¯ãã£ã¬ã¯ããªã¯ããã¾ãã: '%s'"
@@ -2682,42 +2698,42 @@
msgid "running arc4 process on %d bytes of data\n"
msgstr "ãã¼ã¿ %d ãã¤ãç®ã«ã¤ã㦠arc4 ããã»ã¹ãå®è¡ä¸\n"
-#: keys.cc:80
+#: keys.cc:76
#, c-format
msgid "got empty passphrase from get_passphrase() hook"
msgstr "get_passphrase() ããã¯ã¯ç©ºã®ãã¹ãã¬ã¼ãºãè¿ãã¾ãã"
-#: keys.cc:96
+#: keys.cc:92
#, c-format
msgid "empty passphrase not allowed"
msgstr "ãã¹ãã¬ã¼ãºã¯ç©ºã«ã§ãã¾ãã"
-#: keys.cc:103
+#: keys.cc:99
#, c-format
msgid "confirm passphrase for key ID [%s]: "
msgstr "éµ ID [%s] ã®ãã¹ãã¬ã¼ãºã確èª: "
-#: keys.cc:108
+#: keys.cc:104
#, c-format
msgid "empty passphrases not allowed, try again\n"
msgstr "ãã¹ãã¬ã¼ãºã¯ç©ºã«ã§ãã¾ãã. å度試ãã¦ä¸ãã\n"
-#: keys.cc:109 keys.cc:116
+#: keys.cc:105 keys.cc:112
#, c-format
msgid "too many failed passphrases\n"
msgstr "ãã¹ãã¬ã¼ãºã®å
¥åãã¹ãå¤ããã¾ã\n"
-#: keys.cc:115
+#: keys.cc:111
#, c-format
msgid "passphrases do not match, try again\n"
msgstr "ãã¹ãã¬ã¼ãºãä¸è´ãã¾ãããå度試ãã¦ä¸ãã\n"
-#: keys.cc:122
+#: keys.cc:118
#, c-format
msgid "no passphrase given"
msgstr "ãã¹ãã¬ã¼ãºãæå®ãã¦ä¸ãã"
-#: keys.cc:184
+#: keys.cc:177
#, c-format
msgid ""
"generated %d-byte public key\n"
@@ -2726,141 +2742,166 @@
"%d ãã¤ãã®å
¬ééµãçæ\n"
"%d ãã¤ãã®(æå·åããã)ç§å¯éµãçæ\n"
-#: keys.cc:207 keys.cc:263
+#: keys.cc:194
#, c-format
-msgid "building signer from %d-byte decrypted private key\n"
+msgid "base64-decoding %d-byte private key\n"
+msgstr "%d ãã¤ãç§å¯éµã® base64 ãã³ã¼ã\n"
+
+#: keys.cc:199
+#, fuzzy, c-format
+msgid "have %d-byte encrypted private key\n"
msgstr "%d ãã¤ãã®å¾©å·åãããç§å¯éµããç½²åãä½æä¸\n"
-#: keys.cc:256
-#, c-format
-msgid "base64-decoding %d-byte private key\n"
+#: keys.cc:244
+#, fuzzy, c-format
+msgid "base64-decoding %d-byte old private key\n"
msgstr "%d ãã¤ãç§å¯éµã® base64 ãã³ã¼ã\n"
-#: keys.cc:300
+#: keys.cc:255
#, c-format
+msgid "building signer from %d-byte decrypted private key\n"
+msgstr "%d ãã¤ãã®å¾©å·åãããç§å¯éµããç½²åãä½æä¸\n"
+
+#: keys.cc:355
+#, c-format
msgid "produced %d-byte signature\n"
msgstr "%d ãã¤ãã®ç½²åãä½æ\n"
-#: keys.cc:328
+#: keys.cc:383
#, c-format
msgid "building verifier for %d-byte pub key\n"
msgstr "%d ãã¤ãã®å
¬ééµã«ã¤ãã¦èå¥åãæ§ç¯ä¸\n"
-#: keys.cc:350
+#: keys.cc:405
#, c-format
msgid "checking %d-byte (%d decoded) signature\n"
msgstr "%d ãã¤ã (%d ãã³ã¼ã)ã®ç½²åãæ¤è¨¼ä¸\n"
-#: keys.cc:521
+#: keys.cc:531
+#, fuzzy, c-format
+msgid "no key pair '%s' found in key store or get_priv_key hook"
+msgstr ""
+"ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«ã get_priv_key ããã¯å
ã«ãã¿ã¤ããã¾ãã"
+
+#: keys.cc:542
#, c-format
msgid "passphrase for '%s' is incorrect"
msgstr "'%s' ã«å¯¾ãããã¹ãã¬ã¼ãºãééã£ã¦ãã¾ã"
-#: lua.cc:109
+#: lua.cc:119
#, c-format
msgid "lua failure: %s; stack = %s\n"
msgstr "lua 失æ: %s; ã¹ã¿ã㯠= %s\n"
-#: lua.cc:115
-#, c-format
-msgid "Lua::ok(): failed = %i"
+#: lua.cc:126
+#, fuzzy, c-format
+msgid "Lua::ok(): failed"
msgstr "Lua::ok(): 失æ = %i"
-#: lua.cc:124
+#: lua.cc:135
#, c-format
msgid "lua stack: %s"
msgstr "lua ã¹ã¿ãã¯: %s"
-#: lua.cc:204
+#: lua.cc:215
#, c-format
msgid "lua: extracted string = %s"
msgstr "lua: æ½åºæåå = %s"
-#: lua.cc:217
+#: lua.cc:228
#, c-format
msgid "lua: extracted int = %i"
msgstr "lua: æ½åº int = %i"
-#: lua.cc:230
+#: lua.cc:241
#, c-format
msgid "lua: extracted double = %i"
msgstr "lua: æ½åº double = %i"
-#: lua.cc:244
+#: lua.cc:255
#, c-format
msgid "lua: extracted bool = %i"
msgstr "lua: æ½åº bool = %i"
-#: lua.cc:364
+#: lua.cc:375
#, c-format
msgid "loading lua hook %s"
msgstr "lua ãã㯠%s ãèªã¿è¾¼ã¿ä¸"
-#: lua.cc:527 lua.cc:556 lua.cc:571
+#: lua.cc:538 lua.cc:567 lua.cc:582
#, fuzzy, c-format
msgid "%s called with an invalid parameter"
msgstr "Include å¼åºãæã®å¤æ°ãä¸é©åã§ã"
-#: lua.cc:574
+#: lua.cc:585
#, c-format
msgid "Directory '%s' does not exists"
msgstr "ãã£ã¬ã¯ã㪠'%s' ã¯åå¨ãã¾ãã"
-#: lua.cc:575 rcs_import.cc:1249
+#: lua.cc:586 rcs_import.cc:1248
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' ã¯ãã£ã¬ã¯ããªã§ã¯ããã¾ãã"
-#: lua.cc:594 lua.cc:752
+#: lua.cc:605 lua.cc:900
#, c-format
msgid "lua error while loading rcfile '%s'"
msgstr "åæåãã¡ã¤ã« '%s' ãèªã¿è¾¼ã¿ä¸ã« lua ã®ã¨ã©ã¼"
-#: lua.cc:749 lua.cc:762
+#: lua.cc:897 lua.cc:910
#, c-format
msgid "opening rcfile '%s' ...\n"
msgstr "åæåãã¡ã¤ã« '%s' ãéãã¦ãã¾ã...\n"
-#: lua.cc:753 lua.cc:765
+#: lua.cc:901 lua.cc:913
#, c-format
msgid "'%s' is ok\n"
msgstr "'%s' OK\n"
-#: lua.cc:764
+#: lua.cc:912
#, c-format
msgid "lua error while loading '%s'"
msgstr "lua '%s' ãèªã¿è¾¼ã¿ä¸ã«ã¨ã©ã¼"
-#: lua.cc:769
+#: lua.cc:917
#, c-format
msgid "rcfile '%s' does not exist"
msgstr "åæåãã¡ã¤ã« '%s' ã¯åå¨ãã¾ãã"
-#: lua.cc:770
+#: lua.cc:918
#, c-format
msgid "skipping nonexistent rcfile '%s'\n"
msgstr "åå¨ããªãåæåãã¡ã¤ã« '%s' ãã¹ããã\n"
-#: lua.cc:1211
+#: lua.cc:1363
#, c-format
msgid "calling attr_init_function for %s"
msgstr "%s ã«ã¤ã㦠attr_init_function ãå¼åºã"
-#: lua.cc:1215
+#: lua.cc:1367
#, c-format
msgid " calling an attr_init_function for %s"
msgstr " %s ã«ã¤ã㦠attr_init_function ãå¼åºã"
-#: lua.cc:1228
+#: lua.cc:1380
#, c-format
msgid " added attr %s = %s"
msgstr " å±æ§ %s = %s ã追å "
-#: lua.cc:1232
+#: lua.cc:1384
#, c-format
msgid " no attr added"
msgstr " å±æ§è¿½å ãªã"
+#: main.cc:325
+#, fuzzy
+msgid "interrupted"
+msgstr "trusted"
+
+#: main.cc:329
+msgid "terminated by signal"
+msgstr ""
+
#: manifest.cc:55
#, c-format
msgid "scanning file %s\n"
@@ -2872,12 +2913,14 @@
msgstr "%s ãã¿ã¤ããã¾ãã"
#: manifest.cc:201
-#, c-format
+#, fuzzy, c-format
msgid ""
"%d missing files\n"
"to restore consistency, on each missing file run either\n"
"'monotone drop FILE' to remove it permanently, or\n"
"'monotone revert FILE' to restore it\n"
+"or to handle all at once, simple 'monotone drop --missing'\n"
+"or 'monotone revert --missing'"
msgstr ""
"ä¸è²«æ§ãä¿ã¤ããã«å¿
è¦ãª\n"
"ãã¡ã¤ã«ã %d åã¿ã¤ããã¾ãããåã
ã®ãã¡ã¤ã«ã«ã¤ãã¦\n"
@@ -2974,112 +3017,136 @@
msgid "perform the associated file operation"
msgstr "é¢é£ä»ãããããã¡ã¤ã«æä½ãå®è¡"
-#: monotone.cc:79
+#: monotone.cc:71
+msgid "address:port to listen on (default :5253)"
+msgstr ""
+
+#: monotone.cc:72
+msgid "perform the operations for files missing from working directory"
+msgstr ""
+
+#: monotone.cc:73
+msgid "perform the operations for unknown files from working directory"
+msgstr ""
+
+#: monotone.cc:74
+msgid "push the specified key even if it hasn't signed anything"
+msgstr ""
+
+#: monotone.cc:83
msgid "print debug log to stderr while running"
msgstr "å®è¡æãæ¨æºã¨ã©ã¼åºåã«ãããã°ãã°ã表示"
-#: monotone.cc:80
+#: monotone.cc:84
msgid "file to dump debugging log to, on failure"
msgstr "失ææã«ãããã°ãã°ãåºåãããã¡ã¤ã«"
-#: monotone.cc:81
+#: monotone.cc:85
msgid "suppress log and progress messages"
msgstr "ãã°ããã³é²æã示ãã¡ãã»ã¼ã¸ã表示ããªã"
-#: monotone.cc:82
+#: monotone.cc:86
msgid "display help message"
msgstr "ãã«ãã¡ãã»ã¼ã¸ã表示"
-#: monotone.cc:83
+#: monotone.cc:87
msgid "print version number, then exit"
msgstr "ãã¼ã¸ã§ã³çªå·ã表示ããçµäº"
-#: monotone.cc:84
+#: monotone.cc:88
msgid "print detailed version number, then exit"
msgstr "詳細ãªãã¼ã¸ã§ã³çªå·ã表示ããçµäº"
-#: monotone.cc:85
+#: monotone.cc:89
msgid "insert command line arguments taken from the given file"
msgstr "æå®ã®ãã¡ã¤ã«ã®å
容ãã³ãã³ãè¡å¼æ°ã«æ¿å
¥"
-#: monotone.cc:86
+#: monotone.cc:90
msgid "set ticker style (count|dot|none)"
msgstr "ãã£ãã«ã¼ã®ã¹ã¿ã¤ã«ãè¨å® (count|dot|none)"
-#: monotone.cc:87
+#: monotone.cc:91
msgid "do not load standard lua hooks"
msgstr "æ¨æº lua ããã¯ãèªã¿è¾¼ã¾ãªã"
-#: monotone.cc:88
+#: monotone.cc:92
msgid "do not load ~/.monotone/monotonerc or MT/monotonerc lua files"
msgstr ""
"$HOME/.monotone/monotonerc ã¾ã㯠MT/monotonerc lua ãã¡ã¤ã«ãèªã¿è¾¼ã¾ãªã"
-#: monotone.cc:89
+#: monotone.cc:93
msgid "load extra rc file"
msgstr "å¥ã®åæåãã¡ã¤ã«ãèªã¿è¾¼ã"
-#: monotone.cc:90
+#: monotone.cc:94
msgid "set key for signatures"
msgstr "ç½²åã®éµãè¨å®"
-#: monotone.cc:91
+#: monotone.cc:95
msgid "set name of database"
msgstr "ãã¼ã¿ãã¼ã¹åãè¨å®"
-#: monotone.cc:92
+#: monotone.cc:96
msgid "limit search for working copy to specified root"
msgstr "ä½æ¥ã³ãã¼ã®æ¤ç´¢ãæå®ã®ã«ã¼ãä¸ã«å¶é"
-#: monotone.cc:93
+#: monotone.cc:97
msgid "verbose completion output"
msgstr "åé·ãªå®äºã¡ãã»ã¼ã¸"
-#: monotone.cc:199
+#: monotone.cc:98
+msgid "set location of key store"
+msgstr ""
+
+#: monotone.cc:99
+msgid "set location of configuration directory"
+msgstr ""
+
+#: monotone.cc:203
#, c-format
msgid "problem parsing arguments from file %s: %s"
msgstr "ãã¡ã¤ã« %s ããã®å¼æ°ã解æä¸ã«åé¡çºç: %s"
-#: monotone.cc:208
+#: monotone.cc:212
#, c-format
msgid "weird error when stuffing arguments read from %s: %s\n"
msgstr "%s ããå¼æ°ãèªã¿åãä¸ã«äºæãã¬ã¨ã©ã¼çºç: %s\n"
-#: monotone.cc:258
+#: monotone.cc:261
#, c-format
msgid "command line: %s\n"
msgstr "ã³ãã³ãè¡: %s\n"
-#: monotone.cc:261
+#: monotone.cc:264
#, c-format
msgid "set locale: LC_ALL=%s\n"
msgstr "ãã«ã¼ã«è¨å®: LC_ALL=%s\n"
-#: monotone.cc:289
+#: monotone.cc:292
msgid "[OPTION...] command [ARGS...]\n"
msgstr "[OPTION...] command [ARGS...]\n"
-#: monotone.cc:457
+#: monotone.cc:522
#, c-format
msgid "syntax error near the \"%s\" option: %s"
msgstr "\"%s\" ãªãã·ã§ã³ã®è¿ãã«æ§æã¨ã©ã¼: %s"
-#: monotone.cc:496
+#: monotone.cc:561
#, c-format
msgid "monotone %s doesn't use the option %s"
msgstr "monotone %s ã«ã¯ãªãã·ã§ã³ %s ã¯ä½¿ãã¾ãã"
-#: monotone.cc:518
+#: monotone.cc:583
#, c-format
msgid "Removed 'hidden' from option # %d\n"
msgstr "ãªãã·ã§ã³ # %d ãã 'hidden' ãåé¤\n"
-#: monotone.cc:524 monotone.cc:535
+#: monotone.cc:589 monotone.cc:600
#, c-format
msgid "Added 'hidden' to option # %d\n"
msgstr "ãªãã·ã§ã³ # %d ã« 'hidden' ã追å \n"
-#: monotone.cc:531
+#: monotone.cc:596
#, c-format
msgid "Options specific to 'monotone %s':"
msgstr "'monotone %s' ã«ç¹åãããªãã·ã§ã³:"
@@ -3159,248 +3226,161 @@
msgid "expected %s to end at %d, have %d bytes"
msgstr "%s ã«ã¤ãã¦çµç«¯ %dã容é %d ãã¤ãã§ãããã¨ãæå¾
"
-#: netsync.cc:244
+#: netsync.cc:243
#, c-format
msgid "check of '%s' failed"
msgstr "'%s' ã®æ¤è¨¼ã«å¤±æ"
-#: netsync.cc:664
+#: netsync.cc:696
msgid "bytes in"
msgstr "ãã¤ã (å
¥)"
-#: netsync.cc:666
+#: netsync.cc:698
msgid "bytes out"
msgstr "ãã¤ã (åº)"
-#: netsync.cc:670 netsync.cc:687
+#: netsync.cc:702 netsync.cc:719
msgid "revs written"
msgstr "æ¸ãè¾¼ãã ãªãã¸ã§ã³"
-#: netsync.cc:672
+#: netsync.cc:704
msgid "certs in"
msgstr "証æ (å
¥)"
-#: netsync.cc:674 netsync.cc:689
+#: netsync.cc:706 netsync.cc:721
msgid "revs in"
msgstr "ãªãã¸ã§ã³ (å
¥)"
-#: netsync.cc:679
+#: netsync.cc:711
msgid "certs out"
msgstr "証æ (åº)"
-#: netsync.cc:681 netsync.cc:691
+#: netsync.cc:713 netsync.cc:723
msgid "revs out"
msgstr "ãªãã¸ã§ã³ (åº)"
-#: netsync.cc:749
+#: netsync.cc:781
#, c-format
msgid "all epochs processed, opening database valve\n"
msgstr "ãã¹ã¦ã® epoch ãå¦çãã¾ããããã¼ã¿ãã¼ã¹ãã«ããéãã¦ãã¾ã\n"
-#: netsync.cc:837
+#: netsync.cc:878
#, c-format
msgid "dropping outgoing netcmd (because we're in error unwind mode)\n"
msgstr "ã¨ã©ã¼å復ãå¯è½ãªã¢ã¼ãã§ãã®ã§ãå¤åãã® netcmd ãç ´æ£ãã¾ã\n"
-#: netsync.cc:861
+#: netsync.cc:902
#, c-format
msgid "error: %s\n"
msgstr "ã¨ã©ã¼: %s\n"
-#: netsync.cc:869
+#: netsync.cc:910
#, c-format
msgid "analyzing %d entries in manifest\n"
msgstr "ãããã§ã¹ãå
ã® %d ã¨ã³ããªã解æä¸\n"
-#: netsync.cc:913
+#: netsync.cc:949
#, c-format
-msgid "revision %s is attached via database\n"
-msgstr "ãªãã¸ã§ã³ %s ã¯ãã¼ã¿ãã¼ã¹ãä»ãã¦æ·»ä»ããã¦ãã¾ã\n"
+msgid "analyzing %d ancestry edges\n"
+msgstr "%d åã®ç³»ã®ç«¯ã解æä¸\n"
-#: netsync.cc:918
+#: netsync.cc:971
#, c-format
-msgid "checking attachment of %s in ancestry\n"
-msgstr "系統å
ã® %s ã®æ·»ä»ãæ¤è¨¼ä¸\n"
+msgid "intermediate set_difference heads size %d"
+msgstr ""
-#: netsync.cc:925
+#: netsync.cc:1007
#, c-format
-msgid "checking attachment of %s in parent %s\n"
-msgstr "%s ã®æ·»ä»(親 %s å
)ãæ¤è¨¼ä¸\n"
+msgid "Dropping branch certs for unwanted branch %s"
+msgstr "å¸æããªããã©ã³ã %s ã®ãã©ã³ã証æãåé¤"
-#: netsync.cc:929
+#: netsync.cc:1024
#, c-format
-msgid "revision %s is attached via parent %s\n"
-msgstr "ãªãã¸ã§ã³ %s ã¯è¦ª %s ãä»ãã¦æ·»ä»ããã¦ãã¾ã\n"
+msgid "after step 2, heads size %d"
+msgstr ""
-#: netsync.cc:936
+#: netsync.cc:1048
#, c-format
-msgid "decided that revision '%s' is attached\n"
-msgstr "ãªãã¸ã§ã³ '%s' ã¯æ·»ä»ããããã®ã¨æ±ºå®\n"
+msgid "after step 3, heads size %d"
+msgstr ""
-#: netsync.cc:938
-#, c-format
-msgid "decided that revision '%s' is not attached\n"
-msgstr "ãªãã¸ã§ã³ '%s' ã¯æ·»ä»ãããªããã®ã¨æ±ºå®\n"
-
-#: netsync.cc:1006
-#, c-format
-msgid "not requesting (in reverse) initial manifest %s as we already have it\n"
-msgstr "åæãããã§ã¹ã %s ã¯æ¢ã«ããã®ã§ (éæ¹åã«) è¦æ±ãã¾ãã\n"
-
-#: netsync.cc:1009
-#, c-format
-msgid "requesting (in reverse) initial manifest data %s\n"
-msgstr "åæãããã§ã¹ããã¼ã¿ %s ã (éæ¹åã«) è¦æ±ãã¦ãã¾ã\n"
-
-#: netsync.cc:1019
-#, c-format
-msgid ""
-"not requesting (in reverse) manifest delta to %s as we already have it\n"
-msgstr "%s ã®ãããã§ã¹ãå·®åã¯æ¢ã«ããã®ã§(éæ¹åã«)è¦æ±ãã¾ãã\n"
-
-#: netsync.cc:1022
-#, c-format
-msgid "requesting (in reverse) manifest delta %s -> %s\n"
-msgstr "ãããã§ã¹ãå·®å %s -> %s ã(éæ¹åã«)è¦æ±ãã¦ãã¾ã\n"
-
-#: netsync.cc:1049
-#, c-format
-msgid "not requesting (in reverse) initial file %s as we already have it\n"
-msgstr "åæåãã¡ã¤ã« %s ã¯æ¢ã«ããã®ã§ (éæ¹åã«)è¦æ±ãã¾ãã\n"
-
-#: netsync.cc:1052
-#, c-format
-msgid "requesting (in reverse) initial file data %s\n"
-msgstr "åæåãã¡ã¤ã«ãã¼ã¿ %s ã(éæ¹åã«)è¦æ±ãã¦ãã¾ã\n"
-
-#: netsync.cc:1062
-#, c-format
-msgid "not requesting (in reverse) file delta to %s as we already have it\n"
-msgstr "%s ã¸ã®ãã¡ã¤ã«å·®åã¯æ¢ã«ããã®ã§ (éæ¹åã«)è¦æ±ãã¾ãã\n"
-
-#: netsync.cc:1065
-#, c-format
-msgid "requesting (in reverse) file delta %s -> %s on %s\n"
-msgstr "ãã¡ã¤ã«å·®å %s -> %s (対象: %s)ã(éæ¹åã«)è¦æ±ãã¦ãã¾ã\n"
-
-#: netsync.cc:1097
-#, c-format
-msgid "visiting revision '%s' for forward deltas\n"
-msgstr "é æ¹åã®å·®åã«ã¤ãã¦ãªãã¸ã§ã³ '%s' ãè¦ã¦ãã¾ã\n"
-
-#: netsync.cc:1125
-#, c-format
-msgid "not requesting forward manifest delta to '%s' as we already have it\n"
-msgstr "'%s' ã¸ã®é æ¹åã®ãããã§ã¹ãå·®åã¯æ¢ã«ããã®ã§è¦æ±ãã¾ãã\n"
-
-#: netsync.cc:1131
-#, c-format
-msgid "requesting full manifest data %s\n"
-msgstr "å®å
¨ãªãããã§ã¹ããã¼ã¿ %s ãè¦æ±ãã¦ãã¾ã\n"
-
-#: netsync.cc:1136
-#, c-format
-msgid "requesting forward manifest delta %s -> %s\n"
-msgstr "é æ¹åã®ãããã§ã¹ãå·®å %s -> %s ãè¦æ±ãã¦ãã¾ã\n"
-
-#: netsync.cc:1150
-#, c-format
-msgid ""
-"not requesting forward delta %s -> %s on file %s as we already have it\n"
-msgstr "é æ¹åã®å·®å %s -> %s (対象ãã¡ã¤ã« %s) ã¯æ¢ã«ããã®ã§è¦æ±ãã¾ãã\n"
-
-#: netsync.cc:1156
-#, c-format
-msgid "requesting full file data %s\n"
-msgstr "å®å
¨ãªãã¡ã¤ã«ãã¼ã¿ %s ãè¦æ±ãã¦ãã¾ã\n"
-
-#: netsync.cc:1162
-#, c-format
-msgid "requesting forward delta %s -> %s on file %s\n"
-msgstr "åæ¹åã®å·®å %s -> %s (対象ãã¡ã¤ã« %s) ãè¦æ±ãã¦ãã¾ã\n"
-
-#: netsync.cc:1192
-#, c-format
-msgid "analyzing %d ancestry edges\n"
+#: netsync.cc:1068
+#, fuzzy, c-format
+msgid "analyze_ancestry_graph"
msgstr "%d åã®ç³»ã®ç«¯ã解æä¸\n"
-#: netsync.cc:1248
+#: netsync.cc:1071
#, c-format
-msgid "Dropping branch certs for unwanted branch %s"
-msgstr "å¸æããªããã©ã³ã %s ã®ãã©ã³ã証æãåé¤"
+msgid "not all done in analyze_ancestry_graph"
+msgstr ""
-#: netsync.cc:1303
+#: netsync.cc:1077
#, c-format
-msgid "isolated %d heads\n"
-msgstr "å¤ç«ãã %d åã®ææ°ç\n"
+msgid "already analyzed_ancestry in analyze_ancestry_graph"
+msgstr ""
-#: netsync.cc:1330
+#: netsync.cc:1081
#, c-format
-msgid "requesting attached ancestry of revision '%s'\n"
-msgstr "ãªãã¸ã§ã³ '%s' ã«ä»éãã系統ãè¦æ±ãã¦ãã¾ã\n"
+msgid "analyze_ancestry_graph fetching"
+msgstr ""
-#: netsync.cc:1335
+#: netsync.cc:1116
#, c-format
-msgid "requesting detached ancestry of revision '%s'\n"
-msgstr "ãªãã¸ã§ã³ '%s' ããéé¢ãã系統ãè¦æ±ãã¦ãã¾ã\n"
-
-#: netsync.cc:1369
-#, c-format
msgid "read %d bytes from fd %d (peer %s)\n"
msgstr "%d ãã¤ã fd %d (ãã¼ã¢ %s) ããèªã¿è¾¼ã¿\n"
-#: netsync.cc:1372
+#: netsync.cc:1119
#, c-format
msgid "in error unwind mode, so throwing them into the bit bucket\n"
msgstr "ã¨ã©ã¼å復å¯è½ã¢ã¼ãã§ãã®ã§ãããããããããã±ããä¸ã«æ¨ã¦ã¾ã\n"
-#: netsync.cc:1404
+#: netsync.cc:1151
#, c-format
msgid "wrote %d bytes to fd %d (peer %s)\n"
msgstr "%d ãã¤ã fd %d (ãã¼ã¢ %s) ã¸æ¸ãè¾¼ã¿\n"
-#: netsync.cc:1412
+#: netsync.cc:1159
#, c-format
msgid "finished flushing output queue in error unwind mode, disconnecting\n"
msgstr "ã¨ã©ã¼å復å¯è½ã¢ã¼ãã§åºåãã¥ã¼ããã©ãã·ã¥å®äºãåæä¸\n"
-#: netsync.cc:1426
+#: netsync.cc:1173
#, c-format
msgid "queueing 'bye' command\n"
msgstr "'bye' ã³ãã³ãããã¥ã¼ã«è¿½å \n"
-#: netsync.cc:1436
+#: netsync.cc:1183
#, c-format
msgid "queueing 'error' command\n"
msgstr "'error' ã³ãã³ãããã¥ã¼ã«è¿½å \n"
-#: netsync.cc:1449
+#: netsync.cc:1196
#, c-format
msgid "queueing 'done' command for %s level %s\n"
msgstr "'%s' (ã¬ãã« %s) ã«ã¤ã㦠'done' ã³ãã³ãããã¥ã¼ã«è¿½å \n"
-#: netsync.cc:1525
+#: netsync.cc:1265
#, c-format
msgid "queueing request for refinement of %s node '%s', level %d\n"
msgstr "%s ãã¼ã '%s', ã¬ãã« %d ã®å¾®èª¿æ´è¦æ±ããã¥ã¼ã«è¿½å \n"
-#: netsync.cc:1543
+#: netsync.cc:1283
#, c-format
msgid "not queueing request for %s '%s' as we are in pure source role\n"
msgstr ""
"ç´ç²ãªã½ã¼ã¹ã®å½¹å²ãæãã¦ããã®ã§ %s '%s' ã®è¦æ±ã¯ãã¥ã¼ã«è¿½å ãã¾ãã\n"
-#: netsync.cc:1550
+#: netsync.cc:1290
#, c-format
msgid "not queueing request for %s '%s' as we already requested it\n"
msgstr "æ¢ã«è¦æ±æ¸ã¿ã® %s '%s' ã¯ãã¥ã¼ã«è¿½å ãã¾ãã\n"
-#: netsync.cc:1555
+#: netsync.cc:1295
#, c-format
msgid "queueing request for data of %s item '%s'\n"
msgstr "%s ã¢ã¤ãã '%s' ã®ãã¼ã¿è¦æ±ããã¥ã¼ã«è¿½å \n"
-#: netsync.cc:1579
+#: netsync.cc:1319
#, c-format
msgid ""
"not queueing request for %s delta '%s' -> '%s' as we are in pure source "
@@ -3409,43 +3389,43 @@
"ç´ç²ãªã½ã¼ã¹ã®å½¹å²ãæãã¦ããã®ã§ %s å·®å '%s' -> '%s' ã®è¦æ±ããã¥ã¼ã«è¿½å "
"ãã¾ãã\n"
-#: netsync.cc:1586
+#: netsync.cc:1326
#, c-format
msgid ""
"not queueing request for %s delta '%s' -> '%s' as we already requested the "
"target\n"
msgstr "æ¢ã«è¦æ±æ¸ã¿ãªã®ã§ %s å·®å '%s' -> '%s' ã®è¦æ±ããã¥ã¼ã«è¿½å ãã¾ãã\n"
-#: netsync.cc:1591
+#: netsync.cc:1331
#, c-format
msgid "queueing request for contents of %s delta '%s' -> '%s'\n"
msgstr "%s å·®å '%s' -> '%s' ã®å
容ã«ã¤ãã¦è¦æ±ããã¥ã¼ã«è¿½å \n"
-#: netsync.cc:1611
+#: netsync.cc:1351
#, c-format
msgid "not queueing %s data for '%s' as we are in pure sink role\n"
msgstr ""
"ç´ç²ãªã·ã³ã¯ã®å½¹å²ãæãã¦ããã®ã§ %s ãã¼ã¿ (対象: '%s' )ããã¥ã¼ã«è¿½å ãã¾"
"ãã\n"
-#: netsync.cc:1616
+#: netsync.cc:1356
#, c-format
msgid "queueing %d bytes of data for %s item '%s'\n"
msgstr "%d ãã¤ã (%s ã¢ã¤ãã '%s' ã®ãã¼ã¿)ããã¥ã¼ã«è¿½å \n"
-#: netsync.cc:1650
+#: netsync.cc:1390
#, c-format
msgid "not queueing %s delta '%s' -> '%s' as we are in pure sink role\n"
msgstr ""
"ç´ç²ãªã·ã³ã¯ã®å½¹å²ãæãã¦ããã®ã§ %s å·®å '%s' -> '%s' ããã¥ã¼ã«è¿½å ãã¾ã"
"ã\n"
-#: netsync.cc:1655
+#: netsync.cc:1395
#, c-format
msgid "queueing %s delta '%s' -> '%s'\n"
msgstr "%s å·®å '%s' -> '%s' ããã¥ã¼ã«è¿½å \n"
-#: netsync.cc:1673
+#: netsync.cc:1413
#, c-format
msgid ""
"not queueing note of nonexistence of %s item '%s' as we are in pure sink "
@@ -3454,27 +3434,27 @@
"ç´ç²ãªã·ã³ã¯ã®å½¹å²ãæãã¦ããã®ã§ %s ã¢ã¤ãã '%s' ããªããã¨ã«ã¤ãã¦ãã¼ã"
"ããã¥ã¼ã«è¿½å ãã¾ãã\n"
-#: netsync.cc:1678
+#: netsync.cc:1418
#, c-format
msgid "queueing note of nonexistance of %s item '%s'\n"
msgstr "%s ã¢ã¤ãã '%s' ããªããã¨ã«ã¤ãã¦ãã¼ãããã¥ã¼ã«è¿½å \n"
-#: netsync.cc:1690
+#: netsync.cc:1430
#, c-format
msgid "received 'bye' netcmd\n"
msgstr "'bye' netcmd ãåä¿¡\n"
-#: netsync.cc:1698
+#: netsync.cc:1438
#, c-format
msgid "received network error: %s"
msgstr "ãããã¯ã¼ã¯ã¨ã©ã¼ãåä¿¡: %s"
-#: netsync.cc:1715
+#: netsync.cc:1455
#, c-format
msgid "received 'done' for empty %s level %d, marking as complete\n"
msgstr "空㮠%s ã¬ãã« %d ã«ã¤ã㦠'done' åä¿¡, å®äºã¨ãã¦ãã¼ã¯\n"
-#: netsync.cc:1737
+#: netsync.cc:1477
#, c-format
msgid ""
"received 'done' for %s level %d, which had refinements; sending echo of done "
@@ -3483,12 +3463,12 @@
"微調æ´ãå«ã %s ã¬ãã« %d ã«ã¤ã㦠'done' åä¿¡;ã¬ãã« %d ã®å 'done' ã«ã¤ãã¦"
"éä¿¡\n"
-#: netsync.cc:1770
+#: netsync.cc:1510
#, c-format
msgid "server key has name %s, hash %s\n"
msgstr "ãµã¼ãã¼éµã®åå %sãããã·ã¥ %s\n"
-#: netsync.cc:1778
+#: netsync.cc:1518
#, c-format
msgid ""
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -3509,12 +3489,12 @@
"æå¾
å¤ %s\n"
"'monotone unset %s %s' ã¨ããã¨æ¤è¨¼çµæãç¡è¦ããããã«ãªãã¾ã\n"
-#: netsync.cc:1788
+#: netsync.cc:1528
#, c-format
msgid "server key changed"
msgstr "ãµã¼ãã¼éµãå¤æ´ããã¾ãã"
-#: netsync.cc:1793
+#: netsync.cc:1533
#, c-format
msgid ""
"first time connecting to server %s\n"
@@ -3524,47 +3504,47 @@
"ãµã¼ãã¼ %s ã«æ¥ç¶ããã®ã¯åãã¦ã§ã\n"
"å½ç©ã§ãªãã¨ã¯æãã¾ãããéµã®æç´ãäºéãã§ãã¯ãã¦ã¿ãã¨ããã§ããã: %s\n"
-#: netsync.cc:1800
+#: netsync.cc:1540
#, c-format
msgid "saving public key for %s to database\n"
msgstr "%s ã®å
¬ééµããã¼ã¿ãã¼ã¹ã«ä¿åä¸\n"
-#: netsync.cc:1807
+#: netsync.cc:1547
#, c-format
msgid "received 'hello' netcmd from server '%s' with nonce '%s'\n"
msgstr "ãµã¼ãã¼ '%s' ãã nonce '%s' ã¨ä¸ç·ã« 'hello' netcmd ãåä¿¡\n"
-#: netsync.cc:1888
+#: netsync.cc:1628
#, c-format
msgid "rejected attempt at anonymous connection for write\n"
msgstr "å¿åã§ã®æ¥ç¶ããã®æ¸ãè¾¼ã¿ãæå¦\n"
-#: netsync.cc:1895
+#: netsync.cc:1635
#, c-format
msgid "rejected attempt at anonymous connection while running as sink\n"
msgstr "ã·ã³ã¯ã¨ãã¦å®è¡ä¸ã®å¿åã§ã®æ¥ç¶ããã®æ¸ãè¾¼ã¿ãæå¦\n"
-#: netsync.cc:1912
+#: netsync.cc:1652
#, c-format
msgid "anonymous access to branch '%s' denied by server"
msgstr "ãã©ã³ã '%s' ã¸ã®å¿åã¢ã¯ã»ã¹ã¯ãµã¼ãã¼ã«ãã£ã¦æå¦ããã¾ãã"
-#: netsync.cc:1917
+#: netsync.cc:1657
#, c-format
msgid "allowed anonymous read permission for '%s' excluding '%s'\n"
msgstr "å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã\n"
-#: netsync.cc:1949
+#: netsync.cc:1689
#, c-format
msgid "detected replay attack in auth netcmd\n"
msgstr "auth netcmd ä¸ã«ç¹°ãè¿ãæ»æãæ¤åº\n"
-#: netsync.cc:1970
+#: netsync.cc:1714
#, c-format
msgid "remote public key hash '%s' is unknown\n"
msgstr "ãªã¢ã¼ãã®å
¬ééµããã·ã¥ '%s' ã¯ä¸æãªãã®ã§ã\n"
-#: netsync.cc:1986
+#: netsync.cc:1731
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' while running as pure "
@@ -3573,24 +3553,24 @@
"ç´ç²ã·ã³ã¯ã¨ãã¦å®è¡ä¸ã® '%s' ã® '%s' ('%s' ãé¤ã) ã®èªã¿è¾¼ã¿ãæå¦ãã¾ã"
"ã\n"
-#: netsync.cc:2002
+#: netsync.cc:1747
#, c-format
msgid ""
"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n"
msgstr ""
"'%s' ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ããã©ã³ã '%s' ã®ããã«æå¦ãã¾ãã\n"
-#: netsync.cc:2004
+#: netsync.cc:1749
#, c-format
msgid "access to branch '%s' denied by server"
msgstr "ãã©ã³ã '%s' ã¸ã®ã¢ã¯ã»ã¹ã¯ãµã¼ãã¼ã«ãã£ã¦æå¦ããã¾ãã"
-#: netsync.cc:2012
+#: netsync.cc:1757
#, c-format
msgid "allowed '%s' read permission for '%s' excluding '%s'\n"
msgstr "'%s' ã®å¿åã§ã® '%s' ('%s' ãé¤ã)ã®èªã¿è¾¼ã¿ã許å¯ãã¾ãã\n"
-#: netsync.cc:2021
+#: netsync.cc:1766
#, c-format
msgid ""
"denied '%s' write permission for '%s' excluding '%s' while running as pure "
@@ -3599,27 +3579,27 @@
"ç´ç²ã½ã¼ã¹ã¨ãã¦å®è¡ä¸ã® '%s' ã® '%s' ('%s' ãé¤ã) ã¸ã®æ¸ãè¾¼ã¿ãæå¦ãã¾ã"
"ã\n"
-#: netsync.cc:2029
+#: netsync.cc:1774
#, c-format
msgid "denied '%s' write permission for '%s' excluding '%s'\n"
msgstr "'%s' ã® '%s' ('%s' ãé¤ã)ã¸ã®æ¸ãè¾¼ã¿ãæå¦ãã¾ãã\n"
-#: netsync.cc:2035
+#: netsync.cc:1780
#, c-format
msgid "allowed '%s' write permission for '%s' excluding '%s'\n"
msgstr "'%s' ã® '%s' ('%s' ãé¤ã)ã¸ã®æ¸ãè¾¼ã¿ã許å¯ãã¾ãã\n"
-#: netsync.cc:2050
+#: netsync.cc:1795
#, c-format
msgid "client signature OK, accepting authentication\n"
msgstr "ã¯ã©ã¤ã¢ã³ãç½²å OKãèªè¨¼å®äº\n"
-#: netsync.cc:2072
+#: netsync.cc:1817
#, c-format
msgid "bad client signature\n"
msgstr "ä¸æ£ãªã¯ã©ã¤ã¢ã³ãç½²å\n"
-#: netsync.cc:2087
+#: netsync.cc:1832
#, c-format
msgid ""
"received 'confirm' netcmd from server '%s' for pattern '%s' exclude '%s' in %"
@@ -3628,432 +3608,191 @@
"ãµã¼ãã¼ '%s' ãããã¿ã¼ã³ '%s' ('%s' ãé¤ã; %s ã¢ã¼ã)ã¸ã® 'confirm' "
"netcmd ãåä¿¡ãã¾ãã\n"
-#: netsync.cc:2089 netsync.cc:3070 netsync.cc:3101
+#: netsync.cc:1834 netsync.cc:2831 netsync.cc:2862
msgid "source and sink"
msgstr ""
-#: netsync.cc:2090 netsync.cc:3071 netsync.cc:3102
+#: netsync.cc:1835 netsync.cc:2832 netsync.cc:2863
msgid "sink"
msgstr ""
-#: netsync.cc:2090 netsync.cc:3071 netsync.cc:3102
+#: netsync.cc:1835 netsync.cc:2832 netsync.cc:2863
#, fuzzy
msgid "source"
msgstr "[å
] %s\n"
-#: netsync.cc:2103
+#: netsync.cc:1848
#, c-format
msgid "server signature OK, accepting authentication\n"
msgstr "ãµã¼ãã¼ç½²å OKãèªè¨¼å®äº\n"
-#: netsync.cc:2108
+#: netsync.cc:1853
#, c-format
msgid "bad server signature\n"
msgstr "ä¸æ£ãªãµã¼ãã¼ç½²å\n"
-#: netsync.cc:2113
+#: netsync.cc:1858
#, c-format
msgid "unknown server key\n"
msgstr "ä¸æãªãµã¼ãã¼éµ\n"
-#: netsync.cc:2182
+#: netsync.cc:1927
#, c-format
msgid "epoch with hash '%s' does not exist in our database"
msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ããã·ã¥ '%s' ã® epoch ã¯å«ã¾ãã¦ãã¾ãã"
-#: netsync.cc:2192
+#: netsync.cc:1937
#, c-format
msgid "public key '%s' is also called '%s'\n"
msgstr "å
¬ééµ '%s' ã®å¥å㯠'%s' ã§ã\n"
-#: netsync.cc:2211
+#: netsync.cc:1956
#, c-format
msgid "revision '%s' does not exist in our database"
msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ãªãã¸ã§ã³ '%s' ã¯å«ã¾ãã¦ãã¾ãã"
-#: netsync.cc:2225
+#: netsync.cc:1970
#, c-format
msgid "manifest '%s' does not exist in our database"
msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ãããã§ã¹ã '%s' ã¯å«ã¾ãã¦ãã¾ãã"
-#: netsync.cc:2239
+#: netsync.cc:1984
#, c-format
msgid "file '%s' does not exist in our database"
msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯ãã¡ã¤ã« '%s' ã¯å«ã¾ãã¦ãã¾ãã"
-#: netsync.cc:2253
+#: netsync.cc:1998
#, c-format
msgid "cert '%s' does not exist in our database"
msgstr "ãã¡ãã®ãã¼ã¿ãã¼ã¹ã«ã¯è¨¼æ '%s' ã¯å«ã¾ãã¦ãã¾ãã"
-#: netsync.cc:2272
+#: netsync.cc:2017
#, c-format
msgid "received 'refine' netcmd on %s node '%s', level %d\n"
msgstr "%s ãã¼ã '%s'ãã¬ãã« %d 㧠'refine' netcmd ãåä¿¡\n"
-#: netsync.cc:2277
+#: netsync.cc:2022
#, c-format
msgid "no corresponding %s merkle node for prefix '%s', level %d\n"
msgstr ""
"ç¸å½ãã %s merkle ãã¼ã(対象: ãã¬ãã£ã¯ã¹ '%s'ãã¬ãã« %d) ãæã£ã¦ãã¾ã"
"ã\n"
-#: netsync.cc:2287
+#: netsync.cc:2077
#, c-format
-msgid ""
-"(#0) they have an empty slot %d (in a %s node '%s', level %d, we do not "
-"have)\n"
-msgstr ""
-"(#0) ãã¡ãã«ã¯ãªã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ãæã£ã¦ã"
-"ã¾ã\n"
-
-#: netsync.cc:2299
-#, c-format
-msgid ""
-"(#0) they have a live leaf at slot %d (in a %s node '%s', level %d, we do "
-"not have)\n"
-msgstr ""
-"(#0) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ã«çãããªã¼ã"
-"ãæã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2301
-#, c-format
-msgid "(#0) requesting their %s leaf %s\n"
-msgstr "(#0) %s ãªã¼ã %s ãè¦æ±ãã¦ãã¾ã\n"
-
-#: netsync.cc:2308
-#, c-format
-msgid ""
-"(#0) they have a dead leaf at slot %d (in a %s node '%s', level %d, we do "
-"not have)\n"
-msgstr ""
-"(#0) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s å
, ã¬ãã« %d) ã«æ»ãã ãªã¼ãã"
-"ããã¾ã\n"
-
-#: netsync.cc:2316
-#, c-format
-msgid ""
-"(#0) they have a subtree at slot %d (in a %s node '%s', level %d, we do not "
-"have)\n"
-msgstr ""
-"(#0) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ã«ãµãããªã¼ã"
-"æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2332
-#, c-format
msgid "found corresponding %s merkle node for prefix '%s', level %d\n"
msgstr ""
"ç¸å½ãã %s merkle ãã¼ã (対象: ãã¬ãã£ã¯ã¹ '%s', ã¬ãã« %d) ãã¿ã¤ãã¾ã"
"ã\n"
-#: netsync.cc:2346
+#: netsync.cc:2408
#, c-format
-msgid ""
-"(#1) they have an empty slot %d in %s node '%s', level %d, and so do we\n"
-msgstr ""
-"(#1) ãã¡ãã«ããã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ãæã£ã¦ã"
-"ã¾ã\n"
-
-#: netsync.cc:2353
-#, c-format
-msgid ""
-"(#2) they have an empty slot %d in %s node '%s', level %d, we have a live "
-"leaf\n"
-msgstr ""
-"(#2) ãã¡ãå´ã§ã¯çãããªã¼ãã®ãã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
,ã¬ãã« "
-"%d) ãæã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2367
-#, c-format
-msgid ""
-"(#3) they have an empty slot %d in %s node '%s', level %d, we have a dead "
-"leaf\n"
-msgstr ""
-"(#3) ãã¡ãå´ã§ã¯æ»ãã ãªã¼ãã®ãã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ã"
-"ã« %d) ãæã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2374
-#, c-format
-msgid ""
-"(#4) they have an empty slot %d in %s node '%s', level %d, we have a "
-"subtree\n"
-msgstr ""
-"(#4) ãã¡ãã§ã¯ãµãããªã¼ã®ãã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ãã« %"
-"d) ãæã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2401
-#, c-format
-msgid ""
-"(#5) they have a live leaf at slot %d in %s node '%s', level %d, we have "
-"nothing\n"
-msgstr ""
-"(#5) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ã«çãããªã¼ã"
-"ãæã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2412
-#, c-format
-msgid "(#6) they have a live leaf at slot %d in %s node '%s', and so do we\n"
-msgstr ""
-"(#6) ãã¡ãã«ãããã¹ããã %d (%s ãã¼ã '%s' å
) ã«çãããªã¼ããæã£ã¦ãã¾"
-"ã\n"
-
-#: netsync.cc:2422
-#, c-format
-msgid "(#6) we both have live %s leaf '%s'\n"
-msgstr "(#6) 両æ¹ã¨ãçãã %s ãªã¼ã '%s' ãæã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2438
-#, c-format
-msgid ""
-"(#7) they have a live leaf at slot %d in %s node %s, level %d, we have a "
-"dead one\n"
-msgstr ""
-"(#7) ãã¡ãå´ã§ã¯çãã¦ããªããçãããªã¼ããã¹ããã %d (%s ãã¼ã %sãã¬ã"
-"ã« %d) ã«æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2448
-#, c-format
-msgid "(#7) it's the same %s leaf '%s', but ours is dead\n"
-msgstr "(#7) åã %s ãªã¼ã '%s' ã§ãããã¡ãã®ãã®ã¯æ»ãã§ãã¾ã\n"
-
-#: netsync.cc:2461
-#, c-format
-msgid ""
-"(#8) they have a live leaf in slot %d of %s node '%s', level %d, we have a "
-"subtree\n"
-msgstr ""
-"(#8) ãã¡ãã§ã¯ãµãããªã¼ãæã¤ãçãããªã¼ããã¹ããã %d (%s ãã¼ã %sãã¬"
-"ãã« %d) ã«æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2470
-#, c-format
-msgid ""
-"(#8) we have a copy of their live leaf '%s' in slot %d of %s node '%s', "
-"level %d\n"
-msgstr ""
-"(#8) çãããªã¼ã '%s' (ã¹ããã %d, %s ãã¼ã '%s'ãã¬ãã« %d) ã®ã³ãã¼ã"
-"æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2474
-#, c-format
-msgid ""
-"(#8) requesting a copy of their live leaf '%s' in slot %d of %s node '%s', "
-"level %d\n"
-msgstr ""
-"(#8) çãããªã¼ã '%s' (ã¹ããã %d, %s ãã¼ã '%s'ãã¬ãã« %d) ã®ã³ãã¼ããª"
-"ã¯ã¨ã¹ããã¦ãã¾ã\n"
-
-#: netsync.cc:2479
-#, c-format
-msgid ""
-"(#8) sending our subtree for refinement, in slot %d of %s node '%s', level %"
-"d\n"
-msgstr ""
-"(#8) å調æ´ã®ããã«ã¹ããã %d (%s ãã¼ã '%s', ã¬ãã« %d) ã®ãµãããªã¼ãéä¿¡"
-"ãã¦ãã¾ã\n"
-
-#: netsync.cc:2502
-#, c-format
-msgid ""
-"(#9) they have a dead leaf at slot %d in %s node '%s', level %d, we have "
-"nothing\n"
-msgstr ""
-"(#9) ãã¡ãã«ã¯ãªããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ãã« %"
-"d) ã«æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2509
-#, c-format
-msgid ""
-"(#10) they have a dead leaf at slot %d in %s node '%s', level %d, we have a "
-"live one\n"
-msgstr ""
-"(#10) ãã¡ãã§ã¯çãã¦ãããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' å
ãã¬"
-"ãã« %d)ã«æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2519
-#, c-format
-msgid "(#10) we both have %s leaf %s, theirs is dead\n"
-msgstr ""
-"(#10) åæ¹ã¨ã %s ãªã¼ã %s ãæã£ã¦ãã¾ãããå½¼ãã®ãã®ã¯æ»ãã§ãã¾ã\n"
-
-#: netsync.cc:2535
-#, c-format
-msgid ""
-"(#11) they have a dead leaf at slot %d in %s node '%s', level %d, so do we\n"
-msgstr ""
-"(#11) ãã¡ãã«ããããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ãã« %"
-"d)ã«æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2542
-#, c-format
-msgid ""
-"(#12) they have a dead leaf in slot %d of %s node '%s', we have a subtree\n"
-msgstr ""
-"(#12) ãµãããªã¼ãæã£ã¦ãããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' å
)ã«"
-"æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2565
-#, c-format
-msgid ""
-"(#13) they have a subtree at slot %d in %s node '%s', level %d, we have "
-"nothing\n"
-msgstr ""
-"(#13) ãã¡ãã«ã¯ãªããµãããªã¼ãã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ãã« %d)ã«"
-"æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2578
-#, c-format
-msgid ""
-"(#14) they have a subtree at slot %d in %s node '%s', level %d, we have a "
-"live leaf\n"
-msgstr ""
-"(#14) ãã¡ãã«ã¯çãããªã¼ãã®ãããµãããªã¼ãã¹ããã %d (%s ãã¼ã '%s' "
-"å
ãã¬ãã« %d) ã«æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2590
-#, c-format
-msgid "(#14) pushed our leaf '%s' into fake subtree slot %d, level %d\n"
-msgstr ""
-"(#14) ãã¡ãã®ãªã¼ã '%s' ãä»®ã®ãµãããªã¼ã¹ããã %dãã¬ãã« %d ã«æ¿å
¥\n"
-
-#: netsync.cc:2602
-#, c-format
-msgid ""
-"(#15) they have a subtree at slot %d in %s node '%s', level %d, we have a "
-"dead leaf\n"
-msgstr ""
-"(#15) ãã¡ãã«ã¯æ»ãã ãªã¼ãã®ãããµãããªã¼ããã¹ããã %d (%s ãã¼ã '%s'ã"
-"ã¬ãã« %d) ã«æã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2621
-#, c-format
-msgid ""
-"(#16) they have a subtree at slot %d in %s node '%s', level %d, and so do "
-"we\n"
-msgstr ""
-"(#16) ãã¡ãã«ããããµãããªã¼ãã¹ããã %d (%s ãã¼ã '%s'ãã¬ãã« %d)ã«æã£"
-"ã¦ãã¾ã\n"
-
-#: netsync.cc:2631
-#, c-format
-msgid "(#16) we both have %s subtree '%s'\n"
-msgstr "(#16) åæ¹ã¨ã %s ãµãããªã¼ '%s' ãæã£ã¦ãã¾ã\n"
-
-#: netsync.cc:2636
-#, c-format
-msgid "(#16) %s subtrees at slot %d differ, refining ours\n"
-msgstr ""
-"(#16) %s ãµãããªã¼ (ã¹ããã %d) ã¯éã£ã¦ãã¾ãããã¡ãå´ã®ãã®ã調æ´ãã¾"
-"ã\n"
-
-#: netsync.cc:2663
-#, c-format
msgid "received 'send_data' netcmd requesting %s '%s'\n"
msgstr "%s '%s' ãè¦æ±ãã 'send_data' netcmd ãåä¿¡\n"
-#: netsync.cc:2691
+#: netsync.cc:2436
#, c-format
msgid "received 'send_delta' netcmd requesting %s edge '%s' -> '%s'\n"
msgstr "%s å
端 '%s' -> '%s' ãè¦æ±ãã 'send_delta' netcmd ãåä¿¡\n"
-#: netsync.cc:2745
+#: netsync.cc:2490
#, c-format
msgid "delta requested for item type %s\n"
msgstr "ã¢ã¤ãã ã¿ã¤ã %s ã«ã¤ãã¦è¦æ±ãããå·®å\n"
-#: netsync.cc:2768
+#: netsync.cc:2513
#, c-format
msgid "epoch '%s' already exists in our database\n"
msgstr "epoch '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-#: netsync.cc:2775
+#: netsync.cc:2520
#, c-format
msgid "received epoch %s for branch %s\n"
msgstr "epoch %s (ãã©ã³ã %s) ãåä¿¡\n"
-#: netsync.cc:2782
+#: netsync.cc:2527
#, c-format
msgid "branch %s has no epoch; setting epoch to %s\n"
msgstr "ãã©ã³ã %s ã«ã¯ epoch ã¯ããã¾ããã®ã§ãepoch ã %s ã«è¨å®ãã¾ã\n"
-#: netsync.cc:2788
+#: netsync.cc:2533
#, c-format
msgid "branch %s already has an epoch; checking\n"
msgstr "ãã©ã³ã %s ã«ã¯æ¢ã« epoch ãããã¾ããæ¤è¨¼ä¸\n"
-#: netsync.cc:2799
+#: netsync.cc:2544
#, c-format
msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
msgstr ""
"ãã©ã³ã %s ã«ã¤ã㦠epoch ãä¸è´ãã¾ããããµã¼ãã¼å´ '%s', ã¯ã©ã¤ã¢ã³ãå´ '%"
"s'"
-#: netsync.cc:2810
+#: netsync.cc:2555
#, c-format
msgid "public key '%s' already exists in our database\n"
msgstr "å
¬ééµ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-#: netsync.cc:2819
+#: netsync.cc:2564
#, c-format
msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
msgstr "å
¬ééµ '%s' (%s) ã«ã¤ãã¦ããã·ã¥æ¤è¨¼ã«å¤±æãæå¾
å¤ '%s'ãè¨ç®å¤ '%s'"
-#: netsync.cc:2828
+#: netsync.cc:2573
#, c-format
msgid "cert '%s' already exists in our database\n"
msgstr "証æ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-#: netsync.cc:2836
+#: netsync.cc:2581
#, c-format
msgid "hash check failed for revision cert '%s'"
msgstr "ãªãã¸ã§ã³è¨¼æ '%s' ã«ã¤ãã¦ããã·ã¥æ¤è¨¼ã«å¤±æ"
-#: netsync.cc:2852
+#: netsync.cc:2597
#, c-format
msgid "revision '%s' already exists in our database\n"
msgstr "ãªãã¸ã§ã³ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-#: netsync.cc:2855
+#: netsync.cc:2600
#, c-format
msgid "received revision '%s'\n"
msgstr "ãªãã¸ã§ã³ '%s' ãåä¿¡\n"
-#: netsync.cc:2874
+#: netsync.cc:2619
#, c-format
msgid "manifest version '%s' already exists in our database\n"
msgstr "ãã¼ã¸ã§ã³ '%s' ã®ãããã§ã¹ãã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-#: netsync.cc:2889
+#: netsync.cc:2634
#, c-format
msgid "file version '%s' already exists in our database\n"
msgstr "ãã¼ã¸ã§ã³ '%s' ã®ãã¡ã¤ã«ã¯æ¢ã«ãã¼ã¿ãã¼ã¹ã«ããã¾ã\n"
-#: netsync.cc:2959
+#: netsync.cc:2720
#, c-format
msgid "ignoring delta received for item type %s\n"
msgstr "ã¢ã¤ãã ã¿ã¤ã %s ã«ã¤ãã¦åä¿¡ããå·®åãç¡è¦\n"
-#: netsync.cc:2973
+#: netsync.cc:2734
#, c-format
msgid "received 'nonexistant' netcmd for %s '%s'\n"
msgstr "%s '%s' ã«ã¤ã㦠'nonexistant' netcmd ãåä¿¡\n"
-#: netsync.cc:2985
+#: netsync.cc:2746
#, c-format
msgid "Received warning from usher: %s"
msgstr "éçªããè¦åãåä¿¡: %s"
-#: netsync.cc:2987
+#: netsync.cc:2748
#, c-format
msgid "Received greeting from usher: %s"
msgstr "éçªããåãå
¥ãæ¨æ¶ãåä¿¡: %s"
-#: netsync.cc:2992
+#: netsync.cc:2753
#, c-format
msgid "Sent reply."
msgstr "å¿çãéä¿¡"
-#: netsync.cc:3067
+#: netsync.cc:2828
#, c-format
msgid ""
"received 'anonymous' netcmd from client for pattern '%s' excluding '%s' in %"
@@ -4062,7 +3801,7 @@
"ã¯ã©ã¤ã¢ã³ããããã¿ã¼ã³ '%s' ('%s' ãé¤ã; %s ã¢ã¼ã)ã¸ã® 'anonymous' "
"netcmd ãåä¿¡\n"
-#: netsync.cc:3098
+#: netsync.cc:2859
#, c-format
msgid ""
"received 'auth(hmac)' netcmd from client '%s' for pattern '%s' exclude '%s' "
@@ -4071,311 +3810,331 @@
"ã¯ã©ã¤ã¢ã³ã '%s' ãããã¿ã¼ã³ '%s' ('%s' ãé¤ã; ã¢ã¼ã %s) ã«ã¤ã㦠nonce1 "
"'%s' ã¨ã¨ãã« 'auth(hmac)' netcmd ãåä¿¡\n"
-#: netsync.cc:3274
+#: netsync.cc:3031
#, c-format
msgid "processing %d byte input buffer from peer %s\n"
msgstr "%d ãã¤ãã®å
¥åãããã¡ (éä¿¡å
: ãã¼ã¢ %s) ãå¦çä¸\n"
-#: netsync.cc:3277
+#: netsync.cc:3034
#, c-format
msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
msgstr "netcmd dispatch ã®å¾ã§ãã¼ã¢ %s ã®å
¥åãããã¡ãããµãã¾ãã\n"
-#: netsync.cc:3284 netsync.cc:3318 netsync.cc:3345
+#: netsync.cc:3038
+#, fuzzy, c-format
+msgid "failed to process '%s' packet"
+msgstr "ãã¼ã¿æåå '%s' ã®è§£æã«å¤±æ: %s"
+
+#: netsync.cc:3043 netsync.cc:3083 netsync.cc:3110
#, c-format
msgid "protocol error while processing peer %s: '%s'\n"
msgstr "ãã¼ã¢ %s: '%s' ãå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºç\n"
-#: netsync.cc:3304
+#: netsync.cc:3068
#, c-format
msgid "connecting to %s\n"
msgstr "%s ã«æ¥ç¶ä¸\n"
-#: netsync.cc:3331
+#: netsync.cc:3096
#, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting\n"
msgstr "ãã¼ã¢ %s ã® I/O ãå¾
ã£ã¦ããéã«ã¿ã¤ã ã¢ã¦ã, åæä¸\n"
-#: netsync.cc:3353
+#: netsync.cc:3118
#, c-format
msgid "read from fd %d (peer %s) closed OK after goodbye\n"
msgstr "fd %d (ãã¼ã¢ %s) ããã®èªã¿è¾¼ã¿ã¯ goodbye ã®å¾ã§åé¡ãªãéãã¾ãã\n"
-#: netsync.cc:3355
+#: netsync.cc:3120
#, c-format
msgid "read from fd %d (peer %s) failed, disconnecting\n"
msgstr "fd %d (ãã¼ã¢ %s) ããã®èªã¿è¾¼ã¿ã«å¤±æ, åæä¸\n"
-#: netsync.cc:3365
+#: netsync.cc:3130
#, c-format
msgid "write on fd %d (peer %s) closed OK after goodbye\n"
msgstr "fd %d (ãã¼ã¢ %s) ã¸ã®æ¸ãè¾¼ã¿ã¯ goodbye ã®å¾ã§åé¡ãªãéãã¾ãã\n"
-#: netsync.cc:3367
+#: netsync.cc:3132
#, c-format
msgid "write on fd %d (peer %s) failed, disconnecting\n"
msgstr "fd %d (ãã¼ã¢ %s) ããã®æ¸ãè¾¼ã¿ã«å¤±æãåæä¸\n"
-#: netsync.cc:3374
+#: netsync.cc:3139
#, c-format
msgid "got OOB data on fd %d (peer %s), disconnecting\n"
msgstr "fd %d (ãã¼ã¢ %s) 㧠OOB ãã¼ã¿ãåä¿¡ãåæä¸\n"
-#: netsync.cc:3383
+#: netsync.cc:3148
#, c-format
msgid "terminated exchange with %s\n"
msgstr "%s ã¨ã®äº¤æãåæ\n"
-#: netsync.cc:3391
+#: netsync.cc:3156
#, c-format
msgid "successful exchange with %s\n"
msgstr "%s ã¨ã®äº¤æã«æå\n"
-#: netsync.cc:3412
+#: netsync.cc:3177
#, c-format
msgid "fd %d is armed\n"
msgstr "fd %d: armed\n"
-#: netsync.cc:3419
+#: netsync.cc:3184
#, c-format
msgid "protocol error while processing peer %s: '%s', marking as bad\n"
msgstr "ãã¼ã¢ %s: '%s' ãå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºçã誤ãã¨ãã¦å°ä»ã\n"
-#: netsync.cc:3441
+#: netsync.cc:3206
#, fuzzy, c-format
msgid "accepting new connection on %s : %s\n"
msgstr "%s : %d ã§ã®æ°ããæ¥ç¶ãåç\n"
-#: netsync.cc:3447
+#: netsync.cc:3212
#, c-format
msgid "accept() returned a dead client\n"
msgstr "accept() ã¯æ»ãã ã¯ã©ã¤ã¢ã³ããè¿ãã¾ãã\n"
-#: netsync.cc:3451
-#, c-format
-msgid "accepted new client connection from %s\n"
+#: netsync.cc:3216
+#, fuzzy, c-format
+msgid "accepted new client connection from %s : %s\n"
msgstr "%s ããã®æ°ããã¯ã©ã¤ã¢ã³ãæ¥ç¶ãåç\n"
-#: netsync.cc:3478
+#: netsync.cc:3244
#, c-format
msgid "protocol error while processing peer %s: '%s', disconnecting\n"
msgstr "ãã¼ã¢ %s: '%s' ãããå¦çä¸ã«ãããã³ã«ã¨ã©ã¼çºçãåæä¸\n"
-#: netsync.cc:3486
+#: netsync.cc:3252
#, c-format
msgid "fd %d (peer %s) read failed, disconnecting\n"
msgstr "fd %d (ãã¼ã¢ %s) èªã¿è¾¼ã¿å¤±æãåæä¸\n"
-#: netsync.cc:3502
+#: netsync.cc:3268
#, c-format
msgid "fd %d (peer %s) write failed, disconnecting\n"
msgstr "fd %d (ãã¼ã¢ %s) æ¸ãè¾¼ã¿å¤±æãåæä¸\n"
-#: netsync.cc:3526
+#: netsync.cc:3292
#, c-format
msgid "fd %d (peer %s) processing finished, disconnecting\n"
msgstr "fd %d (ãã¼ã¢ %s) å¦ççµäºãåæä¸\n"
-#: netsync.cc:3548
+#: netsync.cc:3314
#, c-format
msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
msgstr "fd %d (ãã¼ã¢ %s) ã¯ã¢ã¤ãã«æéãé·ããã¾ããåæä¸\n"
-#: netsync.cc:3554
+#: netsync.cc:3320
#, c-format
msgid "fd %d (peer %s) exchanged goodbyes and flushed output, disconnecting\n"
msgstr "fd %d (ãã¼ã¢ %s) 㯠goodbye ã交ãåºåããã©ãã·ã¥ãã¾ãããåæä¸\n"
-#: netsync.cc:3585
+#: netsync.cc:3366
#, fuzzy, c-format
msgid "beginning service on %s : %s\n"
msgstr "%s : %d ã§ãµã¼ãã¹ãéå§\n"
-#: netsync.cc:3599
+#: netsync.cc:3378
#, c-format
msgid "session limit %d reached, some connections will be refused\n"
msgstr "ã»ãã·ã§ã³å¶é %d ã«éã£ãã¾ãããããã¤ãã®æ¥ç¶ã¯æå¦ããã¾ã\n"
-#: netsync.cc:3605
+#: netsync.cc:3384
#, c-format
msgid "i/o probe with %d armed\n"
msgstr "%d armed 㧠I/O ããã¼ã\n"
-#: netsync.cc:3615
+#: netsync.cc:3394
#, fuzzy, c-format
msgid "timed out waiting for I/O (listening on %s : %s)\n"
msgstr "I/O (%s : %d ã§ãªã¹ã³ä¸) å¾
æ©ä¸ã«ã¿ã¤ã ã¢ã¦ã\n"
-#: netsync.cc:3631
+#: netsync.cc:3410
#, c-format
msgid "got woken up for action on unknown fd %d\n"
msgstr "ä¸æ㪠fd %d ã¯ã¢ã¯ã·ã§ã³ã®ããã«èµ·ãããã¾ãã\n"
-#: netsync.cc:3646
+#: netsync.cc:3425
#, c-format
msgid "got some OOB data on fd %d (peer %s), disconnecting\n"
msgstr "fd %d (ãã¼ã¢ %s) 㧠OOB ãã¼ã¿ãåä¿¡ããåæä¸\n"
-#: netsync.cc:3708
+#: netsync.cc:3487
#, c-format
msgid "finding items to synchronize:\n"
msgstr "åæã¢ã¤ãã ãæ¤ç´¢ä¸:\n"
-#: netsync.cc:3711
+#: netsync.cc:3490
#, c-format
msgid "including branch %s"
msgstr "ãã©ã³ã %s ãå«ãã¾ã"
-#: netsync.cc:3763
+#: netsync.cc:3549
#, c-format
msgid "setting epoch on %s to zero\n"
msgstr "%s ã® epoch ãé¶ã«è¨å®\n"
-#: netsync.cc:3853 netsync.cc:3858
+#: netsync.cc:3598
+#, fuzzy, c-format
+msgid "Cannot find key '%s'"
+msgstr "注éãã¡ã¤ã« file_path '%s'\n"
+
+#: netsync.cc:3652 netsync.cc:3656
#, c-format
msgid "network error: %s"
msgstr "ãããã¯ã¼ã¯ã¨ã©ã¼: %s"
-#: packet.cc:325
+#: netsync.cc:3710
#, c-format
+msgid "ancestry_fetcher: got %d heads"
+msgstr ""
+
+#: netsync.cc:3820
+#, fuzzy, c-format
+msgid "traversing head %s"
+msgstr "ææ°ç %s ãä¿åãã¦ãã¾ã\n"
+
+#: packet.cc:330
+#, c-format
msgid "writing delayed revision data packet for %s\n"
msgstr "%s ã«ã¤ãã¦é
延ãããªãã¸ã§ã³ãã¼ã¿ãã±ãããæ¸ãè¾¼ã¿ä¸\n"
-#: packet.cc:332
+#: packet.cc:337
#, c-format
msgid "discarding revision data packet %s with unmet dependencies\n"
msgstr "ä¾åé¢ä¿ãæºãããªããªãã¸ã§ã³ãã¼ã¿ãã±ãã %s ãç ´æ£\n"
-#: packet.cc:338
+#: packet.cc:343
#, c-format
msgid "writing delayed manifest data packet for %s\n"
msgstr "%s ã«ã¤ãã¦é
延ãããããã§ã¹ããã¼ã¿ãã±ãããæ¸ãè¾¼ã¿ä¸\n"
-#: packet.cc:345
+#: packet.cc:350
#, c-format
msgid "discarding manifest data packet %s with unmet dependencies\n"
msgstr "ä¾åé¢ä¿ãæºãããªããããã§ã¹ããã¼ã¿ãã±ãã %s ãç ´æ£\n"
-#: packet.cc:351
+#: packet.cc:356
#, c-format
msgid "writing delayed file data packet for %s\n"
msgstr "%s ã«ã¤ãã¦é
延ãã¡ã¤ã«ãã¼ã¿ãã±ãããæ¸ãè¾¼ã¿ä¸\n"
-#: packet.cc:364
-#, c-format
-msgid "writing delayed manifest %s packet for %s -> %s\n"
+#: packet.cc:369
+#, fuzzy, c-format
+msgid "writing delayed manifest %s packet for %s -> %s%s\n"
msgstr "é
延ãããã§ã¹ã %s ãã±ãã(%s -> %s)ãæ¸ãè¾¼ã¿ä¸\n"
-#: packet.cc:377
+#: packet.cc:383
#, c-format
msgid "discarding manifest delta packet %s -> %s with unmet dependencies\n"
msgstr "ä¾åé¢ä¿ãæºãããªããããã§ã¹ãå·®åãã±ãã %s -> %s ãç ´æ£\n"
-#: packet.cc:384
-#, c-format
-msgid "writing delayed file %s packet for %s -> %s\n"
+#: packet.cc:390
+#, fuzzy, c-format
+msgid "writing delayed file %s packet for %s -> %s%s\n"
msgstr "é
延ãããã¡ã¤ã« %s ãã±ãã(%s -> %s)ãæ¸ãè¾¼ã¿ä¸\n"
-#: packet.cc:397
+#: packet.cc:404
#, c-format
msgid "discarding file delta packet %s -> %s with unmet dependencies\n"
msgstr "ä¾åé¢ä¿ãæºãããªããã¡ã¤ã«å·®åãã±ãã %s -> %s ãç ´æ£\n"
-#: packet.cc:404
+#: packet.cc:411
#, c-format
msgid "writing delayed revision cert on %s\n"
msgstr "%s ã®é
延ãªãã¸ã§ã³è¨¼æãæ¸ãè¾¼ã¿ä¸\n"
-#: packet.cc:411
+#: packet.cc:418
#, c-format
msgid "discarding revision cert packet %s with unmet dependencies\n"
msgstr "ä¾åé¢ä¿ãæºãããªããªãã¸ã§ã³è¨¼æãã±ãã %s ãç ´æ£\n"
-#: packet.cc:418
+#: packet.cc:425
#, c-format
msgid "writing delayed public key %s\n"
msgstr "é
延å
¬ééµ %s ãæ¸ãè¾¼ã¿ä¸\n"
-#: packet.cc:431
+#: packet.cc:438
#, c-format
msgid "writing delayed private key %s\n"
msgstr "é
延ç§å¯éµ %s ãæ¸ãè¾¼ã¿ä¸\n"
-#: packet.cc:601
+#: packet.cc:608
#, c-format
msgid "noting acceptence of revision %s\n"
msgstr "ãªãã¸ã§ã³ %s ã«ã¤ãã¦åçãããã®ã¯ããã¾ãã\n"
-#: packet.cc:614
+#: packet.cc:621
#, c-format
msgid "noting acceptence of manifest %s\n"
msgstr "ãããã§ã¹ã %s ã«ã¤ãã¦åçãããã®ã¯ããã¾ãã\n"
-#: packet.cc:627
+#: packet.cc:634
#, c-format
msgid "noting acceptence of file %s\n"
msgstr "ãã¡ã¤ã« %s ã«ã¤ãã¦åçãããã®ã¯ããã¾ãã\n"
-#: packet.cc:649
+#: packet.cc:656
#, c-format
msgid "skipping existing file version %s\n"
msgstr "æ¢åã®ãã¡ã¤ã«ããã¼ã¸ã§ã³ %s ãã¹ããã\n"
-#: packet.cc:677
+#: packet.cc:696
#, c-format
msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n"
msgstr ""
"å·®å '%s' -> '%s' ããåæ§ç¯ããããã¡ã¤ã«ã® ID '%s' ã¯ä¸æ£ãªãã®ã§ã\n"
-#: packet.cc:683
+#: packet.cc:702
#, c-format
msgid "delaying file delta %s -> %s for preimage\n"
msgstr "äºåã¤ã¡ã¼ã¸ã®ããã®ãã¡ã¤ã«å·®å %s -> %s ãé
延\n"
-#: packet.cc:693
+#: packet.cc:712
#, c-format
msgid "skipping delta to existing file version %s\n"
msgstr "æ¢åã®ãã¡ã¤ã«ããã¼ã¸ã§ã³ %s ã¸ã®å·®åãã¹ããã\n"
-#: packet.cc:721
+#: packet.cc:740
#, c-format
msgid "reconstructed file from reverse delta '%s' -> '%s' has wrong id '%s'\n"
msgstr ""
"éæ¹åã®å·®å '%s' -> '%s' ããåæ§ç¯ããããã¡ã¤ã«ã® ID '%s' ã¯ä¸æ£ãªãã®ã§"
"ã\n"
-#: packet.cc:727
+#: packet.cc:746
#, c-format
msgid "delaying reverse file delta %s -> %s for preimage\n"
msgstr "äºåã¤ã¡ã¼ã¸ã®ããã®éæ¹åã®ãã¡ã¤ã«å·®å %s -> %s ãé
延\n"
-#: packet.cc:737
+#: packet.cc:756
#, c-format
msgid "skipping reverse delta to existing file version %s\n"
msgstr "æ¢åã®ãã¡ã¤ã«ããã¼ã¸ã§ã³ %s ã¸ã®éæ¹åã®å·®åãã¹ããã\n"
-#: packet.cc:754
+#: packet.cc:773
#, c-format
msgid "skipping existing manifest version %s\n"
msgstr "æ¢åã®ãããã§ã¹ãããã¼ã¸ã§ã³ %s ãã¹ããã\n"
-#: packet.cc:782
+#: packet.cc:814
#, c-format
msgid "reconstructed manifest from delta '%s' -> '%s' has wrong id '%s'\n"
msgstr ""
"å·®å '%s' -> '%s' ããåæ§ç¯ããããããã§ã¹ãã® ID '%s' ã¯ä¸æ£ãªãã®ã§ã\n"
-#: packet.cc:788
+#: packet.cc:820
#, c-format
msgid "delaying manifest delta %s -> %s for preimage\n"
msgstr "äºåã¤ã¡ã¼ã¸ã®ããã®éæ¹åã®ãã¡ã¤ã«å·®å %s -> %s ãé
延\n"
-#: packet.cc:798
+#: packet.cc:830
#, c-format
msgid "skipping delta to existing manifest version %s\n"
msgstr "æ¢åã®ãããã§ã¹ããã¼ã¸ã§ã³ %s ã¸ã®å·®åãã¹ããã\n"
-#: packet.cc:826
+#: packet.cc:858
#, c-format
msgid ""
"reconstructed manifest from reverse delta '%s' -> '%s' has wrong id '%s'\n"
@@ -4383,111 +4142,126 @@
"éæ¹åã®å·®å '%s' -> '%s' ããåæ§ç¯ããããããã§ã¹ãã® ID '%s' ã¯ä¸æ£ãªãã®"
"ã§ã\n"
-#: packet.cc:832
+#: packet.cc:864
#, c-format
msgid "delaying manifest reverse delta %s -> %s for preimage\n"
msgstr "äºåã¤ã¡ã¼ã¸ã®ããã®ãããã§ã¹ãã®éæ¹åã®å·®å %s -> %s ãé
延\n"
-#: packet.cc:842
+#: packet.cc:874
#, c-format
msgid "skipping reverse delta to existing manifest version %s\n"
msgstr "æ¢åã®ãããã§ã¹ãããã¼ã¸ã§ã³ %s ã¸ã®éæ¹åã®å·®åãã¹ããã\n"
-#: packet.cc:864
+#: packet.cc:896
#, c-format
msgid "delaying revision %s for new manifest %s\n"
msgstr "ãªãã¸ã§ã³ %s (æ°ãããããã§ã¹ã %s) ãé
延\n"
-#: packet.cc:878
+#: packet.cc:910
#, c-format
msgid "delaying revision %s for old manifest %s\n"
msgstr "ãªãã¸ã§ã³ %s (å¤ããããã§ã¹ã %s) ãé
延\n"
-#: packet.cc:888
+#: packet.cc:920
#, c-format
msgid "delaying revision %s for old revision %s\n"
msgstr "ãªãã¸ã§ã³ %s (å¤ããªãã¸ã§ã³ %s) ãé
延\n"
-#: packet.cc:901
+#: packet.cc:933
#, c-format
msgid "delaying revision %s for old file %s\n"
msgstr "ãªãã¸ã§ã³ %s (å¤ããã¡ã¤ã« %s) ãé
延\n"
-#: packet.cc:911
+#: packet.cc:943
#, c-format
msgid "delaying revision %s for new file %s\n"
msgstr "ãªãã¸ã§ã³ %s (æ°ãããã¡ã¤ã« %s) ãé
延\n"
-#: packet.cc:929
+#: packet.cc:961
#, c-format
msgid "skipping existing revision %s\n"
msgstr "æ¢åã®ãªãã¸ã§ã³ %s ãã¹ããã\n"
-#: packet.cc:947
+#: packet.cc:979
#, c-format
msgid "delaying revision cert on %s\n"
msgstr "%s ã®ãªãã¸ã§ã³è¨¼æãé
延\n"
-#: packet.cc:960
+#: packet.cc:992
#, c-format
msgid "skipping existing revision cert %s\n"
msgstr "æ¢åã®ãªãã¸ã§ã³è¨¼æ %s ãã¹ããã\n"
-#: packet.cc:974
+#: packet.cc:1006
#, c-format
msgid "skipping prohibited public key %s\n"
msgstr "ç¦æ¢ãããå
¬ééµ %s ãã¹ããã\n"
-#: packet.cc:987
+#: packet.cc:1019
#, c-format
msgid "key '%s' is not equal to key '%s' in database\n"
msgstr "éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã®éµ '%s' ã¨ä¸è´ãã¾ãã\n"
-#: packet.cc:988
+#: packet.cc:1020
#, c-format
msgid "skipping existing public key %s\n"
msgstr "æ¢åã®å
¬ééµ %s ãã¹ããã\n"
-#: packet.cc:1001
-#, c-format
-msgid "skipping prohibited private key %s\n"
-msgstr "ç¦æ¢ãããç§å¯éµ %s ãã¹ããã\n"
+#: packet.cc:1033
+#, fuzzy, c-format
+msgid "skipping prohibited key pair %s\n"
+msgstr "ç¦æ¢ãããå
¬ééµ %s ãã¹ããã\n"
-#: packet.cc:1010
-#, c-format
-msgid "skipping existing private key %s\n"
-msgstr "æ¢åã®ç§å¯éµ %s ãã¹ããã\n"
+#: packet.cc:1042
+#, fuzzy, c-format
+msgid "skipping existing key pair %s\n"
+msgstr "æ¢åã®å
¬ééµ %s ãã¹ããã\n"
-#: packet.cc:1046
+#: packet.cc:1078
#, c-format
msgid "packet valve opened\n"
msgstr "ãã±ãããã«ã: é\n"
-#: packet.cc:1058
+#: packet.cc:1090
#, c-format
msgid "wrote %i queued packets\n"
msgstr "%i ãã¥ã¼ãã±ããæ¸ãè¾¼ã¿\n"
-#: packet.cc:1307
-#, c-format
-msgid "read data packet\n"
+#: packet.cc:1362
+#, fuzzy, c-format
+msgid "malformed packet"
+msgstr "%d ãã±ããèªã¿è¾¼ã¿"
+
+#: packet.cc:1378
+#, fuzzy, c-format
+msgid "read data packet"
msgstr "ãã¼ã¿ãã±ããèªã¿è¾¼ã¿\n"
-#: packet.cc:1329
-#, c-format
-msgid "read delta packet\n"
+#: packet.cc:1398
+#, fuzzy, c-format
+msgid "read delta packet"
msgstr "å·®åãã±ããèªã¿è¾¼ã¿\n"
-#: packet.cc:1360
-#, c-format
-msgid "read cert packet\n"
+#: packet.cc:1429
+#, fuzzy, c-format
+msgid "read cert packet"
msgstr "証æãã±ããèªã¿è¾¼ã¿\n"
-#: packet.cc:1386
-#, c-format
-msgid "read key data packet\n"
+#: packet.cc:1449 packet.cc:1468
+#, fuzzy, c-format
+msgid "read pubkey data packet"
msgstr "éµãã¼ã¿ãã±ããèªã¿è¾¼ã¿\n"
+#: packet.cc:1458
+#, fuzzy, c-format
+msgid "read keypair data packet"
+msgstr "éµãã¼ã¿ãã±ããèªã¿è¾¼ã¿\n"
+
+#: packet.cc:1481
+#, fuzzy, c-format
+msgid "unknown packet type: '%s'"
+msgstr "ä¸æãªãã¹ '%s'\n"
+
#: rcs_file.cc:343
#, c-format
msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n"
@@ -4642,91 +4416,91 @@
"%s 㯠CVS ãªãã¸ããªã®ã«ã¼ããã£ã¬ã¯ããªã®ããã§ãã\n"
"代ãã« 'cvs_import %s/<ã¢ã¸ã¥ã¼ã«å>' ã§åãè¾¼ãã§ã¿ã¦ä¸ãã"
-#: rcs_import.cc:1236
+#: rcs_import.cc:1235
#, c-format
msgid "need base --branch argument for importing"
msgstr "åãè¾¼ã¿ã«ã¯åºæº --branch å¼æ°ãå¿
è¦ã§ã"
-#: rcs_import.cc:1248
+#: rcs_import.cc:1247
#, c-format
msgid "path %s does not exist"
msgstr "ãã¹ %s ã¯åå¨ãã¾ãã"
-#: rcs_import.cc:1267
+#: rcs_import.cc:1266
#, c-format
msgid "branch %s has %d entries\n"
msgstr "ãã©ã³ã %s ã«ã¯ %d åã®ã¨ã³ããªãããã¾ã\n"
-#: rcs_import.cc:1277
+#: rcs_import.cc:1276
#, c-format
msgid "trunk has %d entries\n"
msgstr "trunk ã«ã¯ %d åã®ã¨ã³ããªãããã¾ã\n"
-#: rcs_import.cc:1284
+#: rcs_import.cc:1283
msgid "tags"
msgstr "ã¿ã°"
-#: rcs_import.cc:1330
+#: rcs_import.cc:1329
#, c-format
msgid "initial cluster on branch %s has %d live entries\n"
msgstr "ãã©ã³ã %s ã®åæã¯ã©ã¹ã¿ã«ã¯ %d åã®çããã¨ã³ããªãããã¾ã\n"
-#: rcs_import.cc:1337
+#: rcs_import.cc:1336
#, c-format
msgid "initial cluster contains %s at %s\n"
msgstr "åæã¯ã©ã¹ã¿ã¯ %s ã %s ã«å«ãã§ãã¾ã\n"
-#: rcs_import.cc:1383
+#: rcs_import.cc:1382
#, c-format
msgid "storing manifest '%s' (base %s)\n"
msgstr "ãããã§ã¹ã '%s' (åºæº %s) ãä¿åãã¦ãã¾ã\n"
-#: rcs_import.cc:1388
+#: rcs_import.cc:1387
#, c-format
msgid "storing head %s\n"
msgstr "ææ°ç %s ãä¿åãã¦ãã¾ã\n"
-#: rcs_import.cc:1403
+#: rcs_import.cc:1402
#, c-format
msgid "skipping delta to null manifest\n"
msgstr "空ãããã§ã¹ãã«ã¤ãã¦ã®å·®åãã¹ããã\n"
-#: rcs_import.cc:1415
+#: rcs_import.cc:1414
#, c-format
msgid "skipping cyclical manifest delta %s -> %s\n"
msgstr "ãããã§ã¹ãã®å¾ªç°å·®å %s -> %s ãã¹ããã\n"
-#: rcs_import.cc:1421
+#: rcs_import.cc:1420
#, c-format
msgid "writing full manifest %s\n"
msgstr "å®å
¨ãªãããã§ã¹ã %s ãæ¸ãè¾¼ã¿ä¸\n"
-#: rcs_import.cc:1431
+#: rcs_import.cc:1430
#, c-format
msgid "storing manifest delta %s -> %s\n"
msgstr "ãããã§ã¹ãå·®å %s -> %s ãä¿åä¸\n"
-#: rcs_import.cc:1493
+#: rcs_import.cc:1492
#, c-format
msgid "adding entry state '%s' on '%s'\n"
msgstr "ã¨ã³ããªç¶æ
'%s' ('%s') ã追å \n"
-#: rcs_import.cc:1500
+#: rcs_import.cc:1499
#, c-format
msgid "applying state delta on '%s' : '%s' -> '%s'\n"
msgstr "'%s' : '%s' -> '%s' ã®ç¶æ
å·®åãé©ç¨ä¸\n"
-#: rcs_import.cc:1511
+#: rcs_import.cc:1510
#, c-format
msgid "deleting entry state '%s' on '%s'\n"
msgstr "ã¨ã³ããªç¶æ
'%s' ('%s') ãåé¤ãã¦ãã¾ã\n"
-#: rcs_import.cc:1530
+#: rcs_import.cc:1529
#, c-format
msgid "BEGIN consume_cluster()\n"
msgstr "BEGIN consume_cluster()\n"
-#: rcs_import.cc:1550
+#: rcs_import.cc:1549
#, c-format
msgid "END consume_cluster('%s') (parent '%s')\n"
msgstr "END consume_cluster('%s') (親 '%s')\n"
@@ -4976,139 +4750,209 @@
msgid "rebuilding revision graph from existing graph\n"
msgstr "æ¢åã®ã°ã©ããããªãã¸ã§ã³ã°ã©ããå度æ§æä¸\n"
-#: revision.cc:1620
+#: revision.cc:1619
#, c-format
msgid "rebuilding revision graph from manifest certs\n"
msgstr "ãããã§ã¹ã証æãããªãã¸ã§ã³ã°ã©ããå度æ§æä¸\n"
-#: sanity.cc:37
+#: sanity.cc:38
#, c-format
msgid "started up on %s\n"
msgstr "%s ã§éå§\n"
-#: sanity.cc:53
+#: sanity.cc:54
#, c-format
-msgid "wrote debugging log to %s"
-msgstr "%s ã«ãããã°ãã°ãæ¸ãè¾¼ã¿"
+msgid "wrote debugging log to %sif reporting a bug, please include this file"
+msgstr ""
-#: sanity.cc:56
-#, c-format
-msgid "failed to write debugging log to %s"
+#: sanity.cc:59
+#, fuzzy, c-format
+msgid "failed to write debugging log to %s\n"
msgstr "%s ã¸ã®ãããã°ãã°ã®æ¸ãè¾¼ã¿ã«å¤±æãã¾ãã"
-#: sanity.cc:107
+#: sanity.cc:110
#, c-format
msgid "fatal: formatter failed on %s:%d: %s"
msgstr "è´å½ç: ãã©ã¼ããã¿å¤±æ %s:%d: %s"
-#: sanity.cc:181
+#: sanity.cc:184
msgid "misuse: "
msgstr "誤ã: "
-#: sanity.cc:192
+#: sanity.cc:196
msgid "error: "
msgstr "ã¨ã©ã¼: "
-#: sanity.cc:230
+#: sanity.cc:234
#, c-format
msgid "ignoring request to give last gasp; already in process of dumping\n"
msgstr "æå¾ã®å¤æ´è¦è«ãç¡è¦ãã¾ããæ¢ã«ãã³ãå¦çä¸ã§ã\n"
-#: sanity.cc:234
+#: sanity.cc:238
#, c-format
msgid "saving current work set: %i items"
msgstr "ç¾å¨ã®ä½æ¥ã»ãããä¿åä¸: %i ã¢ã¤ãã "
-#: sanity.cc:236
+#: sanity.cc:240
#, c-format
msgid "Current work set: %i items\n"
msgstr "ç¾å¨ã®ä½æ¥ã»ãã: %i ã¢ã¤ãã \n"
-#: sanity.cc:250 sanity.cc:256
+#: sanity.cc:254 sanity.cc:260
#, c-format
msgid "ignoring error trigged by saving work set to debug log"
msgstr "ä½æ¥ã»ããã®ä¿åã«ãã£ã¦å¼ãèµ·ããããããã°ãã°ã¸ã®ã¨ã©ã¼ãç¡è¦ãã¾ã"
-#: sanity.cc:260
+#: sanity.cc:264
#, c-format
msgid "finished saving work set"
msgstr "ä½æ¥ã»ããã®ä¿åçµäº"
-#: schema_migration.cc:263
+#: schema_migration.cc:47
+#, fuzzy, c-format
+msgid "executing SQL '%s'"
+msgstr "ã³ãã³ã '%s' ãå®è¡ä¸\n"
+
+#: schema_migration.cc:49
#, c-format
+msgid "result: %i (%s)"
+msgstr ""
+
+#: schema_migration.cc:51
+#, fuzzy, c-format
+msgid "errmsg: %s"
+msgstr "ã¨ã©ã¼: %s\n"
+
+#: schema_migration.cc:184
+#, c-format
+msgid "failure extracting schema from sqlite_master"
+msgstr ""
+
+#: schema_migration.cc:227
+#, c-format
+msgid "error at transaction BEGIN statement"
+msgstr ""
+
+#: schema_migration.cc:254
+#, c-format
+msgid "migration step failed: %s"
+msgstr ""
+
+#: schema_migration.cc:268
+#, c-format
+msgid "mismatched result of migration, got %s, wanted %s"
+msgstr ""
+
+#: schema_migration.cc:271
+#, fuzzy, c-format
+msgid "committing changes to database"
+msgstr "ä½æ¥ã³ãã¼ããã¼ã¿ãã¼ã¹ã«ã³ããã"
+
+#: schema_migration.cc:273
+#, c-format
+msgid "failure on COMMIT"
+msgstr ""
+
+#: schema_migration.cc:275
+#, fuzzy, c-format
+msgid "optimizing database"
+msgstr "ä½æ¥ã³ãã¼ããã¼ã¿ãã¼ã¹ã«ã³ããã"
+
+#: schema_migration.cc:277
+#, c-format
+msgid "error vacuuming after migration"
+msgstr ""
+
+#: schema_migration.cc:280
+#, c-format
+msgid "error running analyze after migration"
+msgstr ""
+
+#: schema_migration.cc:287
+#, c-format
msgid "database schema %s is unknown; cannot perform migration"
msgstr "ä¸æãªãã¼ã¿ãã¼ã¹ã¹ãã¼ã %s; çµ±åã§ãã¾ãã"
-#: schema_migration.cc:268
+#: schema_migration.cc:292
#, c-format
msgid "no migration performed; database schema already up-to-date at %s\n"
msgstr "çµ±åãã¾ãã; ãã¼ã¿ãã¼ã¹ã¹ãã¼ãã¯æ¢ã«ææ°ã«ãªã£ã¦ãã¾ã: %s\n"
+#: schema_migration.cc:842
+#, fuzzy, c-format
+msgid "public and private keys for %s don't match"
+msgstr "å
¬éã¾ãã¯ç§å¯éµ '%s' ã¯ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¾ãã"
+
+#: schema_migration.cc:845
+#, fuzzy, c-format
+msgid "moving key '%s' from database to %s"
+msgstr "å
¬ééµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£\n"
+
#: std_hooks.lua:28
msgid "Press enter when the subprocess has completed"
msgstr ""
-#: std_hooks.lua:192
+#: std_hooks.lua:211
#, c-format
msgid "Error running editor '%s' to enter log message\n"
msgstr ""
-#: std_hooks.lua:529
+#: std_hooks.lua:553
#, fuzzy
msgid "executing external 2-way merge command\n"
msgstr "å
é¨ä¸å
çµ±åå®äº\n"
-#: std_hooks.lua:637
+#: std_hooks.lua:661
#, fuzzy
msgid "executing external 3-way merge command\n"
msgstr "å
é¨ä¸å
çµ±åå®äº\n"
-#: transforms.cc:520
+#: transforms.cc:521
#, c-format
msgid "converting %d bytes from %s to %s\n"
msgstr "%d ãã¤ã: %s ãã %s ã¸å¤æä¸\n"
-#: transforms.cc:526
+#: transforms.cc:527
#, c-format
msgid "failed to convert string from %s to %s: '%s'"
msgstr "æååã®å¤æ (%s ãã %s: '%s' ã¸) ã«å¤±æãã¾ãã"
-#: transforms.cc:651
+#: transforms.cc:667
#, c-format
msgid "converting %d bytes from IDNA ACE to UTF-8\n"
msgstr "IDNA ACE ãã UTF-8 ã¸å¤æä¸ (%d ãã¤ã)\n"
-#: transforms.cc:654 transforms.cc:668
+#: transforms.cc:670 transforms.cc:684
#, c-format
msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
msgstr "UTF-8 ãã IDNA ACE ã¸å¤æä¸ã«ã¨ã©ã¼(%d ãã¤ã): %s"
-#: transforms.cc:665
+#: transforms.cc:681
#, c-format
msgid "converting %d bytes from UTF-8 to IDNA ACE\n"
msgstr "UTF-8 ãã IDNA ACE ã¸å¤æä¸ (%d ãã¤ã)\n"
-#: transforms.cc:813
+#: transforms.cc:829
#, c-format
msgid "doing linesep conversion to %s\n"
msgstr "%s ã«ã¤ãã¦è¡æ«ãå¤æä¸\n"
-#: ui.cc:119
+#: ui.cc:120
#, c-format
msgid "%.1f M"
msgstr "%.1f M"
-#: ui.cc:124
+#: ui.cc:125
#, c-format
msgid "%.1f k"
msgstr "%.1f k"
-#: ui.cc:133
+#: ui.cc:134
#, c-format
msgid "%d"
msgstr "%d"
-#: ui.cc:325
+#: ui.cc:326
#, c-format
msgid ""
"fatal: %s\n"
@@ -5121,7 +4965,7 @@
"ãã®ã¨ã©ã¼ã¡ãã»ã¼ã¸ã¨ 'monotone --full-version' ã®çµæãããã« %s ã«ã¤ãã¦\n"
"ä½ãããã説æãæ·»ãã¦å ±åãã¦ä¸ãã\n"
-#: ui.cc:368
+#: ui.cc:369
msgid "monotone: "
msgstr "monotone: "
@@ -5374,6 +5218,328 @@
msgid "computed binary delta instructions\n"
msgstr "ãã¤ããªå·®åå½ä»¤ã®è¨ç®çµæ\n"
+#~ msgid "no unique private key for cert construction"
+#~ msgstr "証æä½æã®ããã®åºæã®ç§å¯éµãããã¾ãã"
+
+#~ msgid "no default author name for branch '%s'"
+#~ msgstr "ãã©ã³ã '%s' ã«ã¤ãã¦ããã©ã«ãã®ä½æè
åãããã¾ãã"
+
+#~ msgid "key '%s' already exists in database"
+#~ msgstr "éµ '%s' ã¯æ¢ã«ãã¼ã¿ãã¼ã¹å
ã«åå¨ãã¦ãã¾ã"
+
+#~ msgid ""
+#~ "dropping private key '%s' from database\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ç§å¯éµ '%s' ããã¼ã¿ãã¼ã¹ããç ´æ£\n"
+#~ "\n"
+
+#~ 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 ""
+#~ "ç§å¯éµãã¼ã¿ã¯ãã¼ã¿ãã¼ã¹ããåé¤ããã¦ããªã\n"
+#~ "ããããã¾ããã'db dump' 㨠'db load' ã§ç¢ºããããã¨ã\n"
+#~ "ãå§ããã¾ã"
+
+#~ msgid "no unique private key found, and no key specified"
+#~ msgstr "åºæã®ç§å¯éµãã¿ã¤ãããããã¤éµãæå®ããã¦ãã¾ãã"
+
+#~ msgid "branch %s is empty"
+#~ msgstr "ãã©ã³ã %s ã¯ç©ºã§ã"
+
+#~ msgid "could not guess default signing key"
+#~ msgstr "ããã©ã«ãã®ç½²åéµãæ¨æ¸¬ã§ãã¾ããã§ãã"
+
+#~ msgid "ADDRESS[:PORTNUMBER] PATTERN ..."
+#~ msgstr "ADDRESS[:PORTNUMBER] PATTERN ..."
+
+#~ msgid ""
+#~ "database schemas do not match: wanted %s, got %s. try migrating database"
+#~ msgstr ""
+#~ "ãã¼ã¿ãã¼ã¹ã¹ãã¼ããä¸è´ãã¾ãã: çµæã¯æå¾
ãã %s ã§ã¯ãªã%sããã¼ã¿"
+#~ "ãã¼ã¹ãçµ±åãã¦ã¿ã¦ä¸ãã"
+
+#~ msgid "inserting edge: %s <- %s\n"
+#~ msgstr "å
端ãæ¿å
¥: %s <- %s\n"
+
+#~ msgid "skipping merge edge %s <- %s\n"
+#~ msgstr "å
端ã®çµ±å %s <- %s ãã¹ããã\n"
+
+#~ msgid "removing %s failed"
+#~ msgstr "%s ã®åé¤ã«å¤±æ"
+
+#~ msgid "revision %s is attached via database\n"
+#~ msgstr "ãªãã¸ã§ã³ %s ã¯ãã¼ã¿ãã¼ã¹ãä»ãã¦æ·»ä»ããã¦ãã¾ã\n"
+
+#~ msgid "checking attachment of %s in ancestry\n"
+#~ msgstr "系統å
ã® %s ã®æ·»ä»ãæ¤è¨¼ä¸\n"
+
+#~ msgid "checking attachment of %s in parent %s\n"
+#~ msgstr "%s ã®æ·»ä»(親 %s å
)ãæ¤è¨¼ä¸\n"
+
+#~ msgid "revision %s is attached via parent %s\n"
+#~ msgstr "ãªãã¸ã§ã³ %s ã¯è¦ª %s ãä»ãã¦æ·»ä»ããã¦ãã¾ã\n"
+
+#~ msgid "decided that revision '%s' is attached\n"
+#~ msgstr "ãªãã¸ã§ã³ '%s' ã¯æ·»ä»ããããã®ã¨æ±ºå®\n"
+
+#~ msgid "decided that revision '%s' is not attached\n"
+#~ msgstr "ãªãã¸ã§ã³ '%s' ã¯æ·»ä»ãããªããã®ã¨æ±ºå®\n"
+
+#~ msgid ""
+#~ "not requesting (in reverse) initial manifest %s as we already have it\n"
+#~ msgstr "åæãããã§ã¹ã %s ã¯æ¢ã«ããã®ã§ (éæ¹åã«) è¦æ±ãã¾ãã\n"
+
+#~ msgid "requesting (in reverse) initial manifest data %s\n"
+#~ msgstr "åæãããã§ã¹ããã¼ã¿ %s ã (éæ¹åã«) è¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "not requesting (in reverse) manifest delta to %s as we already have it\n"
+#~ msgstr "%s ã®ãããã§ã¹ãå·®åã¯æ¢ã«ããã®ã§(éæ¹åã«)è¦æ±ãã¾ãã\n"
+
+#~ msgid "requesting (in reverse) manifest delta %s -> %s\n"
+#~ msgstr "ãããã§ã¹ãå·®å %s -> %s ã(éæ¹åã«)è¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid "not requesting (in reverse) initial file %s as we already have it\n"
+#~ msgstr "åæåãã¡ã¤ã« %s ã¯æ¢ã«ããã®ã§ (éæ¹åã«)è¦æ±ãã¾ãã\n"
+
+#~ msgid "requesting (in reverse) initial file data %s\n"
+#~ msgstr "åæåãã¡ã¤ã«ãã¼ã¿ %s ã(éæ¹åã«)è¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid "not requesting (in reverse) file delta to %s as we already have it\n"
+#~ msgstr "%s ã¸ã®ãã¡ã¤ã«å·®åã¯æ¢ã«ããã®ã§ (éæ¹åã«)è¦æ±ãã¾ãã\n"
+
+#~ msgid "requesting (in reverse) file delta %s -> %s on %s\n"
+#~ msgstr "ãã¡ã¤ã«å·®å %s -> %s (対象: %s)ã(éæ¹åã«)è¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid "visiting revision '%s' for forward deltas\n"
+#~ msgstr "é æ¹åã®å·®åã«ã¤ãã¦ãªãã¸ã§ã³ '%s' ãè¦ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "not requesting forward manifest delta to '%s' as we already have it\n"
+#~ msgstr "'%s' ã¸ã®é æ¹åã®ãããã§ã¹ãå·®åã¯æ¢ã«ããã®ã§è¦æ±ãã¾ãã\n"
+
+#~ msgid "requesting full manifest data %s\n"
+#~ msgstr "å®å
¨ãªãããã§ã¹ããã¼ã¿ %s ãè¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid "requesting forward manifest delta %s -> %s\n"
+#~ msgstr "é æ¹åã®ãããã§ã¹ãå·®å %s -> %s ãè¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "not requesting forward delta %s -> %s on file %s as we already have it\n"
+#~ msgstr ""
+#~ "é æ¹åã®å·®å %s -> %s (対象ãã¡ã¤ã« %s) ã¯æ¢ã«ããã®ã§è¦æ±ãã¾ãã\n"
+
+#~ msgid "requesting full file data %s\n"
+#~ msgstr "å®å
¨ãªãã¡ã¤ã«ãã¼ã¿ %s ãè¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid "requesting forward delta %s -> %s on file %s\n"
+#~ msgstr "åæ¹åã®å·®å %s -> %s (対象ãã¡ã¤ã« %s) ãè¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid "isolated %d heads\n"
+#~ msgstr "å¤ç«ãã %d åã®ææ°ç\n"
+
+#~ msgid "requesting attached ancestry of revision '%s'\n"
+#~ msgstr "ãªãã¸ã§ã³ '%s' ã«ä»éãã系統ãè¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid "requesting detached ancestry of revision '%s'\n"
+#~ msgstr "ãªãã¸ã§ã³ '%s' ããéé¢ãã系統ãè¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#0) they have an empty slot %d (in a %s node '%s', level %d, we do not "
+#~ "have)\n"
+#~ msgstr ""
+#~ "(#0) ãã¡ãã«ã¯ãªã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ãæã£ã¦"
+#~ "ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#0) they have a live leaf at slot %d (in a %s node '%s', level %d, we do "
+#~ "not have)\n"
+#~ msgstr ""
+#~ "(#0) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ã«çãããªã¼"
+#~ "ããæã£ã¦ãã¾ã\n"
+
+#~ msgid "(#0) requesting their %s leaf %s\n"
+#~ msgstr "(#0) %s ãªã¼ã %s ãè¦æ±ãã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#0) they have a dead leaf at slot %d (in a %s node '%s', level %d, we do "
+#~ "not have)\n"
+#~ msgstr ""
+#~ "(#0) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s å
, ã¬ãã« %d) ã«æ»ãã ãªã¼"
+#~ "ããããã¾ã\n"
+
+#~ msgid ""
+#~ "(#0) they have a subtree at slot %d (in a %s node '%s', level %d, we do "
+#~ "not have)\n"
+#~ msgstr ""
+#~ "(#0) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ã«ãµãããªã¼"
+#~ "ãæã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#1) they have an empty slot %d in %s node '%s', level %d, and so do we\n"
+#~ msgstr ""
+#~ "(#1) ãã¡ãã«ããã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ãæã£ã¦"
+#~ "ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#2) they have an empty slot %d in %s node '%s', level %d, we have a live "
+#~ "leaf\n"
+#~ msgstr ""
+#~ "(#2) ãã¡ãå´ã§ã¯çãããªã¼ãã®ãã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
,ã¬ã"
+#~ "ã« %d) ãæã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#3) they have an empty slot %d in %s node '%s', level %d, we have a dead "
+#~ "leaf\n"
+#~ msgstr ""
+#~ "(#3) ãã¡ãå´ã§ã¯æ»ãã ãªã¼ãã®ãã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
, ã¬"
+#~ "ãã« %d) ãæã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#4) they have an empty slot %d in %s node '%s', level %d, we have a "
+#~ "subtree\n"
+#~ msgstr ""
+#~ "(#4) ãã¡ãã§ã¯ãµãããªã¼ã®ãã空ã®ã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ãã« "
+#~ "%d) ãæã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#5) they have a live leaf at slot %d in %s node '%s', level %d, we have "
+#~ "nothing\n"
+#~ msgstr ""
+#~ "(#5) ãã¡ãã«ã¯ãªãã¹ããã %d (%s ãã¼ã '%s' å
, ã¬ãã« %d) ã«çãããªã¼"
+#~ "ããæã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#6) they have a live leaf at slot %d in %s node '%s', and so do we\n"
+#~ msgstr ""
+#~ "(#6) ãã¡ãã«ãããã¹ããã %d (%s ãã¼ã '%s' å
) ã«çãããªã¼ããæã£ã¦"
+#~ "ãã¾ã\n"
+
+#~ msgid "(#6) we both have live %s leaf '%s'\n"
+#~ msgstr "(#6) 両æ¹ã¨ãçãã %s ãªã¼ã '%s' ãæã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#7) they have a live leaf at slot %d in %s node %s, level %d, we have a "
+#~ "dead one\n"
+#~ msgstr ""
+#~ "(#7) ãã¡ãå´ã§ã¯çãã¦ããªããçãããªã¼ããã¹ããã %d (%s ãã¼ã %sãã¬"
+#~ "ãã« %d) ã«æã£ã¦ãã¾ã\n"
+
+#~ msgid "(#7) it's the same %s leaf '%s', but ours is dead\n"
+#~ msgstr "(#7) åã %s ãªã¼ã '%s' ã§ãããã¡ãã®ãã®ã¯æ»ãã§ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#8) they have a live leaf in slot %d of %s node '%s', level %d, we have "
+#~ "a subtree\n"
+#~ msgstr ""
+#~ "(#8) ãã¡ãã§ã¯ãµãããªã¼ãæã¤ãçãããªã¼ããã¹ããã %d (%s ãã¼ã %sã"
+#~ "ã¬ãã« %d) ã«æã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#8) we have a copy of their live leaf '%s' in slot %d of %s node '%s', "
+#~ "level %d\n"
+#~ msgstr ""
+#~ "(#8) çãããªã¼ã '%s' (ã¹ããã %d, %s ãã¼ã '%s'ãã¬ãã« %d) ã®ã³ãã¼ã"
+#~ "æã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#8) requesting a copy of their live leaf '%s' in slot %d of %s node '%"
+#~ "s', level %d\n"
+#~ msgstr ""
+#~ "(#8) çãããªã¼ã '%s' (ã¹ããã %d, %s ãã¼ã '%s'ãã¬ãã« %d) ã®ã³ãã¼ã"
+#~ "ãªã¯ã¨ã¹ããã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#8) sending our subtree for refinement, in slot %d of %s node '%s', "
+#~ "level %d\n"
+#~ msgstr ""
+#~ "(#8) å調æ´ã®ããã«ã¹ããã %d (%s ãã¼ã '%s', ã¬ãã« %d) ã®ãµãããªã¼ã"
+#~ "éä¿¡ãã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#9) they have a dead leaf at slot %d in %s node '%s', level %d, we have "
+#~ "nothing\n"
+#~ msgstr ""
+#~ "(#9) ãã¡ãã«ã¯ãªããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ãã« "
+#~ "%d) ã«æã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#10) they have a dead leaf at slot %d in %s node '%s', level %d, we have "
+#~ "a live one\n"
+#~ msgstr ""
+#~ "(#10) ãã¡ãã§ã¯çãã¦ãããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' å
ã"
+#~ "ã¬ãã« %d)ã«æã£ã¦ãã¾ã\n"
+
+#~ msgid "(#10) we both have %s leaf %s, theirs is dead\n"
+#~ msgstr ""
+#~ "(#10) åæ¹ã¨ã %s ãªã¼ã %s ãæã£ã¦ãã¾ãããå½¼ãã®ãã®ã¯æ»ãã§ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#11) they have a dead leaf at slot %d in %s node '%s', level %d, so do "
+#~ "we\n"
+#~ msgstr ""
+#~ "(#11) ãã¡ãã«ããããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ã"
+#~ "ã« %d)ã«æã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#12) they have a dead leaf in slot %d of %s node '%s', we have a "
+#~ "subtree\n"
+#~ msgstr ""
+#~ "(#12) ãµãããªã¼ãæã£ã¦ãããæ»ãã ãªã¼ããã¹ããã %d (%s ãã¼ã '%s' "
+#~ "å
)ã«æã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#13) they have a subtree at slot %d in %s node '%s', level %d, we have "
+#~ "nothing\n"
+#~ msgstr ""
+#~ "(#13) ãã¡ãã«ã¯ãªããµãããªã¼ãã¹ããã %d (%s ãã¼ã '%s' å
ãã¬ãã« %d)"
+#~ "ã«æã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#14) they have a subtree at slot %d in %s node '%s', level %d, we have a "
+#~ "live leaf\n"
+#~ msgstr ""
+#~ "(#14) ãã¡ãã«ã¯çãããªã¼ãã®ãããµãããªã¼ãã¹ããã %d (%s ãã¼ã '%s' "
+#~ "å
ãã¬ãã« %d) ã«æã£ã¦ãã¾ã\n"
+
+#~ msgid "(#14) pushed our leaf '%s' into fake subtree slot %d, level %d\n"
+#~ msgstr ""
+#~ "(#14) ãã¡ãã®ãªã¼ã '%s' ãä»®ã®ãµãããªã¼ã¹ããã %dãã¬ãã« %d ã«æ¿å
¥\n"
+
+#~ msgid ""
+#~ "(#15) they have a subtree at slot %d in %s node '%s', level %d, we have a "
+#~ "dead leaf\n"
+#~ msgstr ""
+#~ "(#15) ãã¡ãã«ã¯æ»ãã ãªã¼ãã®ãããµãããªã¼ããã¹ããã %d (%s ãã¼ã '%"
+#~ "s'ãã¬ãã« %d) ã«æã£ã¦ãã¾ã\n"
+
+#~ msgid ""
+#~ "(#16) they have a subtree at slot %d in %s node '%s', level %d, and so do "
+#~ "we\n"
+#~ msgstr ""
+#~ "(#16) ãã¡ãã«ããããµãããªã¼ãã¹ããã %d (%s ãã¼ã '%s'ãã¬ãã« %d)ã«"
+#~ "æã£ã¦ãã¾ã\n"
+
+#~ msgid "(#16) we both have %s subtree '%s'\n"
+#~ msgstr "(#16) åæ¹ã¨ã %s ãµãããªã¼ '%s' ãæã£ã¦ãã¾ã\n"
+
+#~ msgid "(#16) %s subtrees at slot %d differ, refining ours\n"
+#~ msgstr ""
+#~ "(#16) %s ãµãããªã¼ (ã¹ããã %d) ã¯éã£ã¦ãã¾ãããã¡ãå´ã®ãã®ã調æ´ãã¾"
+#~ "ã\n"
+
+#~ msgid "skipping prohibited private key %s\n"
+#~ msgstr "ç¦æ¢ãããç§å¯éµ %s ãã¹ããã\n"
+
+#~ msgid "skipping existing private key %s\n"
+#~ msgstr "æ¢åã®ç§å¯éµ %s ãã¹ããã\n"
+
+#~ msgid "wrote debugging log to %s"
+#~ msgstr "%s ã«ãããã°ãã°ãæ¸ãè¾¼ã¿"
+
#~ msgid "address@hidden:%s]"
#~ msgstr "address@hidden:%s]"
============================================================
--- po/pt_BR.po 2d7e07f3ec6016280b9b73b5107b462fae3f66bf
+++ po/pt_BR.po d364d01614746e1da2256825f652af89b6836197
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Monotone 0.24\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-11 15:12-0300\n"
+"POT-Creation-Date: 2005-12-29 14:41-0800\n"
"PO-Revision-Date: 2005-11-30 13:45-0200\n"
"Last-Translator: Alex Sandro Queiroz e Silva \n"
"Language-Team: Alex Sandro Queiroz e Silva \n"
@@ -471,7 +471,7 @@
msgstr "arquivo pid '%s' já existe"
#: commands.cc:323 commands.cc:1275 commands.cc:1355 commands.cc:1720
-#: commands.cc:2670 commands.cc:3358 commands.cc:3575 commands.cc:3612
+#: commands.cc:2674 commands.cc:3362 commands.cc:3582 commands.cc:3619
msgid "informative"
msgstr "informativo"
@@ -510,8 +510,8 @@
"considere usar 'monotone merge'"
#: commands.cc:459 commands.cc:715 commands.cc:1374 commands.cc:1446
-#: commands.cc:1831 commands.cc:2717 commands.cc:2732 commands.cc:2735
-#: commands.cc:2933 commands.cc:3594
+#: commands.cc:1831 commands.cc:2721 commands.cc:2736 commands.cc:2739
+#: commands.cc:2937 commands.cc:3601
#, c-format
msgid "no such revision '%s'"
msgstr "versão '%s' não existe"
@@ -651,15 +651,18 @@
#: commands.cc:906
#, c-format
msgid "public or private key '%s' does not exist in keystore or database"
-msgstr "chave pública ou privada '%s' não existe no repositório de chaves nem no banco de dados"
+msgstr ""
+"chave pública ou privada '%s' não existe no repositório de chaves nem no "
+"banco de dados"
#: commands.cc:908
#, c-format
msgid ""
"public or private key '%s' does not exist in keystore, and no database was "
"specified"
-msgstr "chave pública ou privada '%s' não existe no repositório de chaves, "
-"e nenhum banco de dados foi especificado"
+msgstr ""
+"chave pública ou privada '%s' não existe no repositório de chaves, e nenhum "
+"banco de dados foi especificado"
#: commands.cc:913
msgid "change passphrase of a private RSA key"
@@ -785,12 +788,12 @@
msgstr "comentário vazio"
#: commands.cc:1129 commands.cc:1166 commands.cc:1200 commands.cc:1332
-#: commands.cc:2198 commands.cc:2321 commands.cc:2882 commands.cc:3415
+#: commands.cc:2198 commands.cc:2321 commands.cc:2886 commands.cc:3419
msgid "working copy"
msgstr "cópia de trabalho"
#: commands.cc:1129 commands.cc:1166 commands.cc:1275 commands.cc:2321
-#: commands.cc:2670 commands.cc:3415
+#: commands.cc:2674 commands.cc:3419
msgid "[PATH]..."
msgstr "[CAMINHO]..."
@@ -810,8 +813,8 @@
msgid "rename entries in the working copy"
msgstr "renomeia entradas na cópia de trabalho"
-#: commands.cc:1229 commands.cc:1242 commands.cc:2803 commands.cc:2820
-#: commands.cc:3495
+#: commands.cc:1229 commands.cc:1242 commands.cc:2807 commands.cc:2824
+#: commands.cc:3502
msgid "debug"
msgstr "depuração"
@@ -877,8 +880,8 @@
msgid "dumping file '%s'\n"
msgstr ""
-#: commands.cc:1397 commands.cc:1505 commands.cc:3158 commands.cc:3207
-#: commands.cc:3292 commands.cc:3299 commands.cc:3780
+#: commands.cc:1397 commands.cc:1505 commands.cc:3162 commands.cc:3211
+#: commands.cc:3296 commands.cc:3303 commands.cc:3787
msgid "tree"
msgstr "árvore"
@@ -904,8 +907,8 @@
msgid "checkout directory '%s' already exists"
msgstr ""
-#: commands.cc:1437 commands.cc:1518 commands.cc:3171 commands.cc:3241
-#: commands.cc:3244
+#: commands.cc:1437 commands.cc:1518 commands.cc:3175 commands.cc:3245
+#: commands.cc:3248
#, c-format
msgid "branch '%s' is empty\n"
msgstr "ramo '%s' está vazio\n"
@@ -940,7 +943,7 @@
msgid "no file %s found in database for %s"
msgstr "nenhum arquivo %s encontrado no banco de dados para %s"
-#: commands.cc:1492 commands.cc:3482
+#: commands.cc:1492 commands.cc:3489
#, c-format
msgid "writing file %s to %s\n"
msgstr "escrevendo arquivo %s em %s\n"
@@ -949,7 +952,7 @@
msgid "show unmerged head revisions of branch"
msgstr "mostra frentes não combinadas do ramo"
-#: commands.cc:1513 commands.cc:3167
+#: commands.cc:1513 commands.cc:3171
#, c-format
msgid "please specify a branch, with --branch=BRANCH"
msgstr "por favor especifique um ramo com --branch=RAMO"
@@ -1334,7 +1337,7 @@
"note: you may (or may not) wish to run 'monotone merge'"
msgstr ""
-#: commands.cc:2671
+#: commands.cc:2675
msgid ""
"show current diffs on stdout.\n"
"If one revision is given, the diff between the working directory and\n"
@@ -1342,66 +1345,66 @@
"them is given. If no format is specified, unified is used by default."
msgstr ""
-#: commands.cc:2687
+#: commands.cc:2691
#, c-format
msgid ""
"--diff-args requires --external\n"
"try adding --external or removing --diff-args?"
msgstr ""
-#: commands.cc:2721
+#: commands.cc:2725
#, c-format
msgid "current revision has no ancestor"
msgstr ""
-#: commands.cc:2760
+#: commands.cc:2764
#, c-format
msgid "no common ancestor for %s and %s"
msgstr ""
-#: commands.cc:2766
+#: commands.cc:2770
#, c-format
msgid "concatenating un-committed changeset to composite\n"
msgstr ""
-#: commands.cc:2803 commands.cc:2820
+#: commands.cc:2807 commands.cc:2824
msgid "LEFT RIGHT"
msgstr ""
-#: commands.cc:2803
+#: commands.cc:2807
msgid "print least common ancestor"
msgstr ""
-#: commands.cc:2816
+#: commands.cc:2820
msgid "no common ancestor found"
msgstr ""
-#: commands.cc:2820
+#: commands.cc:2824
msgid "print least common ancestor / dominator"
msgstr ""
-#: commands.cc:2834
+#: commands.cc:2838
msgid "no common ancestor/dominator found"
msgstr ""
-#: commands.cc:2859
-#, c-format
-msgid "updating %s to %s\n"
-msgstr ""
+#: commands.cc:2863
+#, fuzzy, c-format
+msgid "updating %s to %s"
+msgstr "escrevendo arquivo %s em %s\n"
-#: commands.cc:2883
+#: commands.cc:2887
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:2908
+#: commands.cc:2912
#, c-format
msgid "this working directory is a new project; cannot update"
msgstr ""
-#: commands.cc:2915
+#: commands.cc:2919
#, c-format
msgid ""
"your request matches no descendents of the current revision\n"
@@ -1409,294 +1412,294 @@
"maybe you want --revision="
msgstr ""
-#: commands.cc:2920
+#: commands.cc:2924
#, c-format
msgid "multiple update candidates:\n"
msgstr ""
-#: commands.cc:2924
+#: commands.cc:2928
#, c-format
msgid "choose one with 'monotone update -r'\n"
msgstr ""
-#: commands.cc:2925
+#: commands.cc:2929
#, c-format
msgid "multiple candidates remain after selection"
msgstr ""
-#: commands.cc:2940
+#: commands.cc:2944
#, c-format
msgid "already up to date at %s\n"
msgstr ""
-#: commands.cc:2948
+#: commands.cc:2952
#, c-format
msgid "selected update target %s\n"
msgstr ""
-#: commands.cc:2960
+#: commands.cc:2964
#, c-format
msgid ""
"revision %s is not a member of branch %s\n"
"try again with explicit --branch\n"
msgstr ""
-#: commands.cc:2975
+#: commands.cc:2979
#, c-format
msgid "updating along chosen edge %s -> %s\n"
msgstr ""
-#: commands.cc:2986
+#: commands.cc:2990
#, c-format
msgid "merging working copy with chosen edge %s -> %s\n"
msgstr ""
-#: commands.cc:3035
+#: commands.cc:3039
#, c-format
msgid "updated to base revision %s\n"
msgstr ""
-#: commands.cc:3101
+#: commands.cc:3105
#, c-format
msgid ""
"common ancestor %s found\n"
"trying 3-way merge\n"
msgstr ""
-#: commands.cc:3112
+#: commands.cc:3116
#, c-format
msgid "no common ancestor found, synthesizing edges\n"
msgstr ""
-#: commands.cc:3158
+#: commands.cc:3162
msgid "merge unmerged heads of branch"
msgstr ""
-#: commands.cc:3172
+#: commands.cc:3176
#, c-format
msgid "branch '%s' is merged\n"
msgstr ""
-#: commands.cc:3178
+#: commands.cc:3182
#, c-format
msgid "starting with revision 1 / %d\n"
msgstr ""
-#: commands.cc:3182
+#: commands.cc:3186
#, c-format
msgid "merging with revision %d / %d\n"
msgstr ""
-#: commands.cc:3183 commands.cc:3184 commands.cc:3251 commands.cc:3335
-#: commands.cc:3336
+#: commands.cc:3187 commands.cc:3188 commands.cc:3255 commands.cc:3339
+#: commands.cc:3340
#, c-format
msgid "[source] %s\n"
msgstr ""
-#: commands.cc:3201 commands.cc:3288 commands.cc:3355
+#: commands.cc:3205 commands.cc:3292 commands.cc:3359
#, c-format
msgid "[merged] %s\n"
msgstr ""
-#: commands.cc:3204
+#: commands.cc:3208
#, c-format
msgid "note: your working copies have not been updated\n"
msgstr ""
-#: commands.cc:3207
+#: commands.cc:3211
msgid "SOURCE-BRANCH DEST-BRANCH"
msgstr ""
-#: commands.cc:3208
+#: commands.cc:3212
msgid "merge from one branch to another asymmetrically"
msgstr ""
-#: commands.cc:3242 commands.cc:3245
+#: commands.cc:3246 commands.cc:3249
#, c-format
msgid "branch '%s' is not merged\n"
msgstr ""
-#: commands.cc:3250
+#: commands.cc:3254
#, c-format
msgid "propagating %s -> %s\n"
msgstr ""
-#: commands.cc:3252
+#: commands.cc:3256
#, c-format
msgid "[target] %s\n"
msgstr ""
-#: commands.cc:3257
+#: commands.cc:3261
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
msgstr ""
-#: commands.cc:3259
+#: commands.cc:3263
#, c-format
msgid "no action taken\n"
msgstr ""
-#: commands.cc:3263
+#: commands.cc:3267
#, c-format
msgid "no merge necessary; putting %s in branch '%s'\n"
msgstr ""
-#: commands.cc:3292
+#: commands.cc:3296
msgid "refresh the inodeprint cache"
msgstr ""
-#: commands.cc:3300
+#: commands.cc:3304
msgid ""
"LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n"
"LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH"
msgstr ""
-#: commands.cc:3302
+#: commands.cc:3306
msgid "merge two explicitly given revisions, placing result in given branch"
msgstr ""
-#: commands.cc:3317 commands.cc:3319
+#: commands.cc:3321 commands.cc:3323
#, c-format
msgid "%s is not an ancestor of %s"
msgstr ""
-#: commands.cc:3328
+#: commands.cc:3332
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr ""
-#: commands.cc:3330 commands.cc:3332
+#: commands.cc:3334 commands.cc:3336
#, c-format
msgid "%s is already an ancestor of %s"
msgstr ""
-#: commands.cc:3358
+#: commands.cc:3362
msgid "(revision|manifest|file|key) PARTIAL-ID"
msgstr ""
-#: commands.cc:3359
+#: commands.cc:3363
msgid "complete partial id"
msgstr ""
-#: commands.cc:3368
+#: commands.cc:3372
#, c-format
msgid "non-hex digits in partial id"
msgstr ""
-#: commands.cc:3416
-msgid "revert file(s), dir(s) or entire working copy"
+#: commands.cc:3420
+msgid "revert file(s), dir(s) or entire working copy (\".\")"
msgstr ""
-#: commands.cc:3441
+#: commands.cc:3448
#, c-format
msgid "revert adding find_missing entries to %d original args elements\n"
msgstr ""
-#: commands.cc:3450
+#: commands.cc:3457
#, c-format
msgid ""
"after adding everything from find_missing, revert args_copy has %d elements\n"
msgstr ""
-#: commands.cc:3474
-#, c-format
-msgid "reverting %s from %s to %s\n"
-msgstr ""
+#: commands.cc:3481
+#, fuzzy, c-format
+msgid "reverting %s to %s"
+msgstr "escrevendo arquivo %s em %s\n"
-#: commands.cc:3478
+#: commands.cc:3485
#, c-format
msgid "no file version %s found in database for %s"
msgstr ""
-#: commands.cc:3495
+#: commands.cc:3502
msgid "RCSFILE..."
msgstr ""
-#: commands.cc:3496
+#: commands.cc:3503
msgid ""
"parse versions in RCS files\n"
"this command doesn't reconstruct or import revisions.you probably want "
"cvs_import"
msgstr ""
-#: commands.cc:3512
+#: commands.cc:3519
msgid "rcs"
msgstr ""
-#: commands.cc:3512
+#: commands.cc:3519
msgid "CVSROOT"
msgstr ""
-#: commands.cc:3512
+#: commands.cc:3519
msgid "import all versions in CVS repository"
msgstr ""
-#: commands.cc:3575
+#: commands.cc:3582
msgid "PATH"
msgstr ""
-#: commands.cc:3576
+#: commands.cc:3583
msgid "print annotated copy of the file from REVISION"
msgstr ""
-#: commands.cc:3593
+#: commands.cc:3600
#, c-format
msgid "no revision for file '%s' in database"
msgstr ""
-#: commands.cc:3596
+#: commands.cc:3603
#, c-format
msgid "annotate file file_path '%s'\n"
msgstr ""
-#: commands.cc:3605
+#: commands.cc:3612
#, c-format
msgid "no such file '%s' in revision '%s'\n"
msgstr ""
-#: commands.cc:3607
+#: commands.cc:3614
#, c-format
msgid "annotate for file_id %s\n"
msgstr ""
-#: commands.cc:3612
+#: commands.cc:3619
msgid "[FILE]"
msgstr ""
-#: commands.cc:3613
+#: commands.cc:3620
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:3673
+#: commands.cc:3680
#, c-format
msgid "revision %s does not exist in db, skipping\n"
msgstr ""
-#: commands.cc:3706
+#: commands.cc:3713
#, c-format
msgid "revision '%s' in '%s' maps to '%s' in %s\n"
msgstr ""
-#: commands.cc:3780
+#: commands.cc:3787
msgid "DIRECTORY"
msgstr ""
-#: commands.cc:3780
+#: commands.cc:3787
msgid "setup a new working copy directory"
msgstr ""
-#: commands.cc:3786
+#: commands.cc:3793
#, c-format
msgid "need --branch argument for setup"
msgstr ""
-#: commands.cc:3795
+#: commands.cc:3802
msgid "automation"
msgstr ""
-#: commands.cc:3796
+#: commands.cc:3803
msgid ""
"interface_version\n"
"heads [BRANCH]\n"
@@ -1720,31 +1723,31 @@
"keys\n"
msgstr ""
-#: commands.cc:3816
+#: commands.cc:3823
msgid "automation interface"
msgstr ""
-#: commands.cc:3830 commands.cc:3846
+#: commands.cc:3837 commands.cc:3853
msgid "vars"
msgstr ""
-#: commands.cc:3830
+#: commands.cc:3837
msgid "DOMAIN NAME VALUE"
msgstr ""
-#: commands.cc:3831
+#: commands.cc:3838
msgid "set the database variable NAME to VALUE, in domain DOMAIN"
msgstr ""
-#: commands.cc:3846
+#: commands.cc:3853
msgid "DOMAIN NAME"
msgstr ""
-#: commands.cc:3847
+#: commands.cc:3854
msgid "remove the database variable NAME in domain DOMAIN"
msgstr ""
-#: commands.cc:3858
+#: commands.cc:3865
#, c-format
msgid "no var with name %s in domain %s"
msgstr ""