# # # patch "debian/monotone-server.postinst" # from [cecfb1e1f90520c049b82e1fa83faa4baa33a0d2] # to [269d1124e45a48814992792bace9ee3d6cd6fe9f] # # patch "po/fr.po" # from [3af4145b4ae9e6689ea9651a3bc9c0d153c530a9] # to [7495481508758e16e7d0a8b34b536d655d543268] # # patch "po/ja.po" # from [636a1ccfd6ffff4fc79244bbffb117ed3eea7d52] # to [46751f8d59a4bcc682353e4c37d0172f21778ecb] # # patch "po/pt_BR.po" # from [5a3a39f8673a62b0f47c203373fd53d36481d041] # to [89a55ae90ec38f50bca0c1a8a18c4ed89d517c29] # ============================================================ --- debian/monotone-server.postinst cecfb1e1f90520c049b82e1fa83faa4baa33a0d2 +++ debian/monotone-server.postinst 269d1124e45a48814992792bace9ee3d6cd6fe9f @@ -111,7 +111,7 @@ echo "Please see UPGRADE and README.changesets in /usr/share/doc/monotone for" >&2 echo "information on manually upgrading your database." >&2 - elif dpkg --compare-versions "$MTN_VERSION" lt "0.22"; then + elif dpkg --compare-versions "$MTN_VERSION" lt "0.26"; then # upgradable version of monotone echo "Attempting to migrate monotone database..." >&2 echo "A backup named '`basename $MTN_DB~`' will be created in $MTN_HOME." >&2 ============================================================ --- po/fr.po 3af4145b4ae9e6689ea9651a3bc9c0d153c530a9 +++ po/fr.po 7495481508758e16e7d0a8b34b536d655d543268 @@ -243,7 +243,7 @@ msgstr "" "Project-Id-Version: monotone 0.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-28 23:20+0100\n" +"POT-Creation-Date: 2006-03-10 02:15-0600\n" "PO-Revision-Date: 2006-03-09 23:10+0100\n" "Last-Translator: Benoît Dejean \n" "Language-Team: Benoît Dejean \n" @@ -252,102 +252,108 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../app_state.cc:110 +#: app_state.cc:110 #, c-format msgid "workspace required but not found%s%s" msgstr "éspace de travail requis mais pas trouvé%s%s" -#: ../app_state.cc:118 +#: app_state.cc:118 #, c-format msgid "invalid directory ''" msgstr "dossier pas valable «»" -#: ../app_state.cc:126 +#: app_state.cc:126 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'\n" msgstr "le dossier administratif « %s » existe déjà dans « %s »\n" -#: ../app_state.cc:165 ../app_state.cc:180 +#: app_state.cc:165 app_state.cc:180 #, c-format msgid "unknown path '%s'\n" msgstr "chemin inconnu « %s »\n" -#: ../app_state.cc:363 +#: app_state.cc:341 #, c-format msgid "search root '%s' does not exist" msgstr "le racine de l'éspace de travail « %s » n'existe pas" -#: ../app_state.cc:364 +#: app_state.cc:342 #, c-format msgid "search root '%s' is not a directory\n" msgstr "le racine de l'éspace de travail « %s » n'est pas un dossier\n" -#: ../app_state.cc:399 +#: app_state.cc:377 #, c-format msgid "failed to parse date string '%s': %s" msgstr "échou de comprendre la date « %s » : %s" -#: ../app_state.cc:413 +#: app_state.cc:391 #, c-format msgid "negative depth not allowed\n" msgstr "profondeur négative interdite\n" -#: ../app_state.cc:421 +#: app_state.cc:399 #, c-format msgid "negative or zero last not allowed\n" msgstr "« last » négative ou zéro interdite\n" -#: ../app_state.cc:429 +#: app_state.cc:407 #, c-format msgid "negative or zero next not allowed\n" msgstr "« next » négative ou zéro interdite\n" -#: ../app_state.cc:552 +#: app_state.cc:536 #, c-format msgid "Failed to read options file %s" msgstr "La lecture du fichier d'options « %s » a échouée" -#: ../app_state.cc:569 +#: app_state.cc:553 #, c-format msgid "Failed to write options file %s" msgstr "L'écriture du fichier d'options « %s » a échouée" -#: ../basic_io.cc:27 +#: basic_io.cc:27 #, c-format msgid "error in %s:%d:%d:E: %s" msgstr "erreur dans %s:%d:%d:E : %s" -#: ../cert.cc:58 +#: cert.cc:58 #, c-format msgid "ignoring bad signature by '%s' on '%s'\n" msgstr "ignore mauvaise signature fait par « %s » sur « %s »\n" -#: ../cert.cc:66 +#: cert.cc:66 #, c-format msgid "ignoring unknown signature by '%s' on '%s'\n" msgstr "ignore signature inconnue fait par « %s » sur « %s »\n" -#: ../cert.cc:129 +#: cert.cc:129 #, c-format msgid "trust function disliked %d signers of %s cert on manifest %s\n" -msgstr "function de confiance n'aimait pas %d signataires du certif %s dans le manifeste %s\n" +msgstr "" +"function de confiance n'aimait pas %d signataires du certif %s dans le " +"manifeste %s\n" -#: ../cert.cc:182 +#: cert.cc:182 #, c-format msgid "trust function disliked %d signers of %s cert on revision %s\n" -msgstr "function de confiance n'aimait pas %d signataires du certif %s dans la révision %s\n" +msgstr "" +"function de confiance n'aimait pas %d signataires du certif %s dans la " +"révision %s\n" -#: ../cert.cc:271 +#: cert.cc:271 #, c-format msgid "calculated cert hash '%s' does not match '%s'" -msgstr "la somme de contrôle calculée pour le certif, « %s », ne correspond pas à « %s »" +msgstr "" +"la somme de contrôle calculée pour le certif, « %s », ne correspond pas à « %" +"s »" -#: ../cert.cc:347 ../keys.cc:532 +#: cert.cc:347 keys.cc:532 #, c-format msgid "no key pair '%s' found in key store '%s'" msgstr "aucune paire de clefs « %s » dans l'entrepôt de clefs « %s »" -#: ../cert.cc:424 +#: cert.cc:424 #, c-format msgid "" "you have no private key to make signatures with\n" @@ -356,7 +362,7 @@ "vous n'avez pas de clef privé pour établir des signatures,\n" "vous avez sans doute besoin de faire « genkey  »" -#: ../cert.cc:427 +#: cert.cc:427 #, c-format msgid "" "you have multiple private keys\n" @@ -366,56 +372,62 @@ "choisissez-en une à utiliser pour vos signatures en ajoutant « -" "k » à votre commande" -#: ../cert.cc:444 +#: cert.cc:444 #, c-format msgid "no branch found for empty revision, please provide a branch name" -msgstr "aucune branche trouvée pour la révision vide, veuillez donne le nom d'une branche" +msgstr "" +"aucune branche trouvée pour la révision vide, veuillez donne le nom d'une " +"branche" -#: ../cert.cc:453 +#: cert.cc:453 #, c-format msgid "no branch certs found for revision %s, please provide a branch name" -msgstr "aucun certif de branche trouvé pour la révision %s, veuillez donne le nom d'une branche" +msgstr "" +"aucun certif de branche trouvé pour la révision %s, veuillez donne le nom " +"d'une branche" -#: ../cert.cc:457 +#: cert.cc:457 #, c-format msgid "" "multiple branch certs found for revision %s, please provide a branch name" -msgstr "multiples certifs de branche trouvés pour la révision %s, veuillez donne le nom d'une branche" +msgstr "" +"multiples certifs de branche trouvés pour la révision %s, veuillez donne le " +"nom d'une branche" -#: ../commands.cc:160 +#: commands.cc:160 #, c-format msgid "command '%s' has multiple ambiguous expansions:\n" msgstr "la commande « %s » a plusieurs expansions ambigües : \n" -#: ../commands.cc:203 +#: commands.cc:203 msgid "commands:" msgstr "commandes :" -#: ../commands.cc:254 +#: commands.cc:254 #, c-format msgid "unknown command '%s'\n" msgstr "commande inconnue « %s »\n" -#: ../commands.cc:301 +#: commands.cc:301 #, c-format msgid "pid file '%s' already exists" msgstr "le fichier pid « %s » existe déjà" -#: ../commands.cc:325 ../commands.cc:1333 ../commands.cc:1403 -#: ../commands.cc:1832 ../commands.cc:2754 ../commands.cc:3371 -#: ../commands.cc:3606 ../commands.cc:3645 ../commands.cc:3986 +#: commands.cc:325 commands.cc:1334 commands.cc:1404 commands.cc:1840 +#: commands.cc:2686 commands.cc:3307 commands.cc:3542 commands.cc:3581 +#: commands.cc:3926 msgid "informative" msgstr "information" -#: ../commands.cc:325 +#: commands.cc:325 msgid "command [ARGS...]" msgstr "commande [ARGUMENTS...]" -#: ../commands.cc:325 +#: commands.cc:325 msgid "display command help" msgstr "afficher l'aide de la commande" -#: ../commands.cc:404 +#: commands.cc:404 msgid "" "Enter a description of this change.\n" "Lines beginning with `MT:' are removed automatically.\n" @@ -423,16 +435,16 @@ "Saisissez une description pour cette modification.\n" "Les lignes débutant par « MT: » sont supprimées automatiquement.\n" -#: ../commands.cc: fuzzy,411 +#: commands.cc:411 #, c-format msgid "edit of log message failed" msgstr "l'édition du message du journal a échouée" -#: ../commands.cc:420 +#: commands.cc:420 msgid "note: " msgstr "note : " -#: ../commands.cc:421 +#: commands.cc:421 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -441,60 +453,59 @@ "la branche « %s » a plusieurs heads\n" "vous devriez peut-être lancer « %s merge »" -#: ../commands.cc:482 ../commands.cc:758 ../commands.cc:1421 -#: ../commands.cc:1498 ../commands.cc:1919 ../commands.cc:2804 -#: ../commands.cc:2832 ../commands.cc:2835 ../commands.cc:2971 -#: ../commands.cc:3628 +#: commands.cc:482 commands.cc:758 commands.cc:1422 commands.cc:1506 +#: commands.cc:2736 commands.cc:2764 commands.cc:2767 commands.cc:2903 +#: commands.cc:3564 #, c-format msgid "no such revision '%s'" msgstr "aucune révision « %s »" -#: ../commands.cc:489 +#: commands.cc:489 #, c-format msgid "expanding selection '%s'\n" msgstr "expansion de la sélection « %s »\n" -#: ../commands.cc:497 +#: commands.cc:497 #, c-format msgid "no match for selection '%s'" msgstr "aucune correspondance pour la sélection « %s »" -#: ../commands.cc:503 +#: commands.cc:503 #, c-format msgid "expanded to '%s'\n" msgstr "expansion à « %s »\n" -#: ../commands.cc:520 +#: commands.cc:520 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "la sélection « %s » a plusieurs expansions ambigües : \n" -#: ../commands.cc:538 +#: commands.cc:538 #, c-format msgid "non-hex digits in id" msgstr "chiffre non-héxadécimal dans l'id" -#: ../commands.cc:547 +#: commands.cc:547 #, c-format msgid "partial id '%s' does not have an expansion" msgstr "l'identité partielle « %s » n'a pas d'expansions" -#: ../commands.cc:550 +#: commands.cc:550 #, c-format msgid "partial id '%s' has multiple ambiguous expansions:\n" msgstr "l'identité partielle « %s » a plusieurs expansions ambigües : \n" -#: ../commands.cc:557 +#: commands.cc:557 #, c-format msgid "expanded partial id '%s' to '%s'\n" msgstr "expansion de l'identité partielle « %s » à « %s »\n" -#: ../commands.cc:584 ../netsync.cc:1726 +#: commands.cc:584 netsync.cc:1727 #, c-format msgid "no public key '%s' found in database" msgstr "aucune clef publique « %s » dans la base de données" -#: ../commands.cc:594 +#: commands.cc:594 #, c-format msgid "" "Key : %s\n" @@ -507,119 +518,121 @@ "Nom : %s\n" "Valeur : %s\n" -#: ../commands.cc:628 +#: commands.cc:628 msgid "ok" msgstr "0K" -#: ../commands.cc:631 +#: commands.cc:631 msgid "bad" msgstr "mauvais" -#: ../commands.cc:634 +#: commands.cc:634 msgid "unknown" msgstr "inconnu" -#: ../commands.cc:721 +#: commands.cc:721 #, c-format msgid "(*) - only in %s/" msgstr "(*) - uniquement dans %s/" -#: ../commands.cc:744 +#: commands.cc:744 #, c-format msgid "no keys found\n" msgstr "aucune clef trouvée\n" -#: ../commands.cc:746 +#: commands.cc:746 #, c-format msgid "no keys found matching '%s'\n" msgstr "aucune clef correspondant à « %s »\n" -#: ../commands.cc:764 +#: commands.cc:764 #, 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:904 ../commands.cc:928 ../commands.cc:965 ../commands.cc:986 -#: ../commands.cc:1022 +#: commands.cc:904 commands.cc:928 commands.cc:965 commands.cc:986 +#: commands.cc:1022 msgid "key and cert" msgstr "clef et certif" -#: ../commands.cc:904 ../commands.cc:928 ../commands.cc:965 +#: commands.cc:904 commands.cc:928 commands.cc:965 msgid "KEYID" msgstr "IDCLEF" -#: ../commands.cc:904 +#: commands.cc:904 msgid "generate an RSA key-pair" msgstr "générer une paire de clefs RSA" -#: ../commands.cc:919 +#: commands.cc:919 #, c-format msgid "key '%s' already exists" msgstr "la clef « %s » existe déjà" -#: ../commands.cc:922 +#: commands.cc:922 #, c-format msgid "generating key-pair '%s'" msgstr "génératio de la paire de clef « %s »" -#: ../commands.cc:924 +#: commands.cc:924 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "sauvegarde la paire de clefs « %s » dans « %s »" -#: ../commands.cc:928 +#: commands.cc:928 msgid "drop a public and private key" msgstr "supprimer une clef publique et privée" -#: ../commands.cc:942 +#: commands.cc:942 #, 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:952 +#: commands.cc:952 #, 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:959 +#: commands.cc:959 #, 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:961 +#: commands.cc:961 #, 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 l'entrepôt de clefs, et aucune base de données n'était précisée" +msgstr "" +"la clef publique ou privée « %s » n'existe pas dans l'entrepôt de clefs, et " +"aucune base de données n'était précisée" -#: ../commands.cc:966 +#: commands.cc:966 msgid "change passphrase of a private RSA key" msgstr "changer la phrase de passe pour une clef RSA privée" -#: ../commands.cc:976 +#: commands.cc:976 #, c-format msgid "key '%s' does not exist in the keystore" msgstr "la clef « %s » n'existe pas dans l'entrepôt de clefs" -#: ../commands.cc:983 +#: commands.cc:983 #, c-format msgid "passphrase changed\n" msgstr "la phrase de passe à changée\n" -#: ../commands.cc:986 +#: commands.cc:986 msgid "REVISION CERTNAME [CERTVAL]" msgstr "RÉVISION NOM_DE_CERTIF [VALEUR_DE_CERTIF]" -#: ../commands.cc:987 +#: commands.cc:987 msgid "create a cert for a revision" msgstr "créer un certif pour une révision" -#: ../commands.cc:1022 +#: commands.cc:1022 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "RÉVISION NOM VALEUR SIGNATAIRE1 [SIGNATAIRE2 [...]]" -#: ../commands.cc:1023 +#: commands.cc:1023 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" @@ -627,7 +640,7 @@ "test s'il est possible d'avoir confiance en un certif hypothétique\n" "avec les paramètres actuels" -#: ../commands.cc:1056 +#: commands.cc:1056 #, c-format msgid "" "if a cert on: %s\n" @@ -642,100 +655,100 @@ "était signé par : %s\n" "il serait : %s\n" -#: ../commands.cc:1065 +#: commands.cc:1065 msgid "trusted" msgstr "fiable" -#: ../commands.cc:1065 +#: commands.cc:1065 msgid "UNtrusted" msgstr "NON-fiable" -#: ../commands.cc:1068 ../commands.cc:1081 ../commands.cc:1094 -#: ../commands.cc:1111 ../commands.cc:1162 +#: commands.cc:1068 commands.cc:1081 commands.cc:1094 commands.cc:1111 +#: commands.cc:1162 msgid "review" msgstr "examination" -#: ../commands.cc:1068 +#: commands.cc:1068 msgid "REVISION TAGNAME" msgstr "RÉVISION ÉTIQUETTE" -#: ../commands.cc:1069 -msgid "put a symbolic tag cert on a revision version" +#: commands.cc:1069 +#, fuzzy +msgid "put a symbolic tag cert on a revision" msgstr "mettre une certif-étiquette symbolique sur une révision" -#: ../commands.cc:1081 +#: commands.cc:1081 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: ../commands.cc:1082 +#: commands.cc:1082 msgid "note the results of running a test on a revision" msgstr "note le résultat d'un test sur une révision" -#: ../commands.cc:1094 ../commands.cc:1111 +#: commands.cc:1094 commands.cc:1111 msgid "REVISION" msgstr "RÉVISION" -#: ../commands.cc:1095 +#: commands.cc:1095 msgid "approve of a particular revision" msgstr "approuver une révision particulière" -#: ../commands.cc:1106 +#: commands.cc:1106 #, c-format msgid "need --branch argument for approval" msgstr "il faut un argument --branch pour approuver" -#: ../commands.cc:1112 +#: commands.cc:1112 msgid "disapprove of a particular revision" msgstr "désapprouver une révision en particulier" -#: ../commands.cc:1125 +#: commands.cc:1125 #, c-format msgid "revision '%s' has %d changesets, cannot invert\n" msgstr "la révision %s a %d ensembles de changement, je ne peux pas invertir\n" -#: ../commands.cc:1129 +#: commands.cc:1129 #, c-format msgid "need --branch argument for disapproval" msgstr "il faut un argument --branch pour désapprouver" -#: ../commands.cc:1162 +#: commands.cc:1162 msgid "REVISION [COMMENT]" msgstr "RÉVISION [COMMENTAIRE]" -#: ../commands.cc:1163 +#: commands.cc:1163 msgid "comment on a particular revision" msgstr "commenter une révision en particulier" -#: ../commands.cc:1173 +#: commands.cc:1173 #, c-format msgid "edit comment failed" msgstr "l'édition du commentaire a échouée" -#: ../commands.cc:1176 +#: commands.cc:1176 #, c-format msgid "empty comment" msgstr "commentaire vide" -#: ../commands.cc:1189 ../commands.cc:1217 ../commands.cc:1242 -#: ../commands.cc:1267 ../commands.cc:2255 ../commands.cc:2373 -#: ../commands.cc:2907 ../commands.cc:3419 +#: commands.cc:1189 commands.cc:1218 commands.cc:1243 commands.cc:1268 +#: commands.cc:2187 commands.cc:2305 commands.cc:2839 commands.cc:3355 msgid "workspace" msgstr "éspace de travail" -#: ../commands.cc:1189 ../commands.cc:1217 ../commands.cc:1333 -#: ../commands.cc:2373 ../commands.cc:2754 ../commands.cc:3419 +#: commands.cc:1189 commands.cc:1218 commands.cc:1334 commands.cc:2305 +#: commands.cc:2686 commands.cc:3355 msgid "[PATH]..." msgstr "[CHEMIN]..." -#: ../commands.cc:1190 +#: commands.cc:1190 msgid "add files to workspace" msgstr "ajouter des fichiers à l'éspace de travail" -#: ../commands.cc:1218 +#: commands.cc:1219 msgid "drop files from workspace" msgstr "supprimer des fichiers de l'éspace de travail" -#: ../commands.cc:1243 +#: commands.cc:1244 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -743,15 +756,15 @@ "SOURCE DESTINATION\n" "SOURCE1 [SOURCE2 [...]] DOSSIER_DESTINATION" -#: ../commands.cc:1245 +#: commands.cc:1246 msgid "rename entries in the workspace" msgstr "renommer des entrées dans l'éspace de travail" -#: ../commands.cc:1267 +#: commands.cc:1268 msgid "NEW_ROOT PUT_OLD" msgstr "RACINE_NOUVELLE PLACE_ANCIENNE" -#: ../commands.cc:1268 +#: commands.cc:1269 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -765,83 +778,78 @@ "deviendra le dossier appelé PLACE_ANCIENNE.\n" "Il est fortement recommandé d'employer --execute." -#. fload and fmerge are simple commands for debugging the line -#. merger. -#: ../commands.cc:1287 ../commands.cc:1300 ../commands.cc:1380 -#: ../commands.cc:3526 ../commands.cc:3967 +#: commands.cc:1288 commands.cc:1301 commands.cc:1381 commands.cc:3462 +#: commands.cc:3907 msgid "debug" msgstr "débogue" -#: ../commands.cc:1287 +#: commands.cc:1288 msgid "load file contents into db" msgstr "charger le contenu du fichier dans la base de données" -#: ../commands.cc:1300 +#: commands.cc:1301 msgid " " msgstr " " -#: ../commands.cc:1301 +#: commands.cc:1302 msgid "merge 3 files and output result" msgstr "fusionne 3 fichiers et affiche le résultat" -#: ../commands.cc:1311 +#: commands.cc:1312 #, c-format msgid "ancestor file id does not exist" msgstr "l'id du fichier de l'ancêtre n'existe pas" -#: ../commands.cc:1314 +#: commands.cc:1315 #, c-format msgid "left file id does not exist" msgstr "l'id du fichier gauche n'existe pas" -#: ../commands.cc:1317 +#: commands.cc:1318 #, c-format msgid "right file id does not exist" msgstr "l'id du fichier droit n'existe pas" -#: ../commands.cc:1328 +#: commands.cc:1329 #, c-format msgid "merge failed" msgstr "la fusion a échouée" -#: ../commands.cc:1333 +#: commands.cc:1334 msgid "show status of workspace" msgstr "afficher l'état de l'éspace de travail" -#: ../commands.cc:1380 +#: commands.cc:1381 msgid "[PATH]" msgstr "[CHEMIN]" -#: ../commands.cc:1381 +#: commands.cc:1382 msgid "calculate identity of PATH or stdin" msgstr "calculer l'identité du CHEMIN ou de l'entrée standard" -#: ../commands.cc:1404 +#: commands.cc:1405 msgid "FILENAME" msgstr "FICHIER" -#: ../commands.cc:1405 +#: commands.cc:1406 msgid "write file from database to stdout" msgstr "écrire un fichier de la base de donnée sur la sortie standard" -#: ../commands.cc:1433 ../commands.cc:1435 ../commands.cc:3637 +#: commands.cc:1434 commands.cc:1436 commands.cc:3573 #, c-format msgid "no file '%s' found in revision '%s'\n" msgstr "aucun fichier « %s » dans la révision « %s »\n" -#. should merge support --message, --message-file? It seems somewhat weird, -#. since a single 'merge' command may perform arbitrarily many actual merges. -#: ../commands.cc:1447 ../commands.cc:1569 ../commands.cc:3108 -#: ../commands.cc:3157 ../commands.cc:3168 ../commands.cc:3318 -#: ../commands.cc:3326 ../commands.cc:3880 +#: commands.cc:1448 commands.cc:1577 commands.cc:3040 commands.cc:3093 +#: commands.cc:3104 commands.cc:3254 commands.cc:3262 commands.cc:3816 msgid "tree" msgstr "arborescence" -#: ../commands.cc:1447 +#: commands.cc:1448 msgid "[DIRECTORY]\n" msgstr "[DOSSIER]\n" -#: ../commands.cc:1448 +#: commands.cc:1449 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" @@ -855,64 +863,76 @@ "Si aucun nom de dossier n'est fourni, le nom de la branche sera utilisé\n" "comme nom de dossier" -#. no checkout dir specified, use branch name for dir -#. use branch head revision -#: ../commands.cc:1467 ../commands.cc:1486 +#: commands.cc:1468 commands.cc:1487 #, c-format msgid "need --branch argument for branch-based checkout" msgstr "il faut un argument --branch pour récupérer basé sur une branche" -#: ../commands.cc:1480 +#: commands.cc:1481 #, c-format msgid "checkout directory '%s' already exists" msgstr "le fichier « %s » existe déjà" -#: ../commands.cc:1489 ../commands.cc:1582 ../commands.cc:3121 -#: ../commands.cc:3206 ../commands.cc:3209 -#, c-format -msgid "branch '%s' is empty\n" +#: commands.cc:1490 +#, fuzzy, c-format +msgid "branch '%s' is empty" msgstr "la branche « %s » est vide\n" -#: ../commands.cc:1490 +#: commands.cc:1493 +#, fuzzy, c-format +msgid "branch %s has multiple heads:" +msgstr "la branche %s a plusieurs entrées" + +#: commands.cc:1496 +#, fuzzy, c-format +msgid "choose one with '%s checkout -r'" +msgstr "choisissez en un avec « %s update -r »\n" + +#: commands.cc:1497 #, c-format msgid "branch %s has multiple heads" msgstr "la branche %s a plusieurs entrées" -#: ../commands.cc:1516 +#: commands.cc:1524 #, 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:1550 +#: commands.cc:1558 #, c-format msgid "no file %s found in database for %s" msgstr "aucun fichier « %s » trouvé dans la base de données pour %s" -#: ../commands.cc:1569 +#: commands.cc:1577 msgid "show unmerged head revisions of branch" msgstr "affiche les entrées non fusionné de la branche" -#: ../commands.cc:1577 ../commands.cc:3117 +#: commands.cc:1585 commands.cc:3049 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "veuillez préciser une branche avec --branch=BRANCHE" -#: ../commands.cc:1584 +#: commands.cc:1590 commands.cc:3053 commands.cc:3142 commands.cc:3145 #, c-format +msgid "branch '%s' is empty\n" +msgstr "la branche « %s » est vide\n" + +#: commands.cc:1592 +#, c-format msgid "branch '%s' is currently merged:\n" msgstr "la branche « %s » est actuellement fusionnée :\n" -#: ../commands.cc:1586 +#: commands.cc:1594 #, c-format msgid "branch '%s' is currently unmerged:\n" msgstr "la branche « %s » n'est actuellement pas fusionnée :\n" -#: ../commands.cc:1625 +#: commands.cc:1633 #, c-format msgid "no epoch for branch %s\n" msgstr "la branche %s n'a pas d'époque\n" -#: ../commands.cc:1833 +#: commands.cc:1841 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -938,7 +958,7 @@ "missing\n" "changed" -#: ../commands.cc:1844 +#: commands.cc:1852 msgid "" "show database objects, or the current workspace manifest, or known,\n" "unknown, intentionally ignored, missing, or changed state files" @@ -947,167 +967,143 @@ "travail actuel, ou des fichiers connus, inconnus, intentionnellement\n" "ignorés, manquants ou changés" -#: ../commands.cc:1882 ../commands.cc:1906 ../commands.cc:1925 -#: ../commands.cc:1944 ../commands.cc:1962 ../commands.cc:1990 -#: ../commands.cc:2008 +#: commands.cc:1890 commands.cc:1918 commands.cc:1936 msgid "packet i/o" msgstr "e/s de paquets" -#: ../commands.cc:1882 -msgid "OLDID NEWID" -msgstr "ANCIENID NOUVELID" - -#: ../commands.cc:1883 -msgid "write file delta packet to stdout" -msgstr "écrire le paquet delta pour un fichier sur la sortie standard" - -#: ../commands.cc:1897 ../commands.cc:1899 ../commands.cc:1938 -#, c-format -msgid "no such file '%s'" -msgstr "aucun fichier « %s »" - -#: ../commands.cc:1906 ../commands.cc:1925 ../commands.cc:1944 -#: ../commands.cc:1962 ../commands.cc:1990 +#: commands.cc:1890 commands.cc:1918 msgid "ID" msgstr "ID" -#: ../commands.cc:1906 -msgid "write revision data packet to stdout" -msgstr "écrire un paquet pour une révision sur la sortie standard" - -#: ../commands.cc:1925 -msgid "write file data packet to stdout" -msgstr "écrire un paquet pour un fichier sur la sortie standard" - -#: ../commands.cc:1944 -msgid "write cert packets to stdout" -msgstr "écrire des paquets pour des certifs sur la sortie standard" - -#: ../commands.cc:1962 +#: commands.cc:1890 msgid "write public key packet to stdout" msgstr "écrire un pacquet pour un clef publique sur la sortie standard" -#: ../commands.cc:1984 +#: commands.cc:1912 #, c-format msgid "public key '%s' does not exist" msgstr "la clef publique « %s » n'existe pas" -#: ../commands.cc:1990 +#: commands.cc:1918 msgid "write private key packet to stdout" msgstr "écrire un pacquet pour un clef privée sur la sortie standard" -#: ../commands.cc:1998 +#: commands.cc:1926 #, 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 l'entrepôt de clefs" +msgstr "" +"la clef publique ou privée « %s » n'existe pas dans l'entrepôt de clefs" -#: ../commands.cc:2009 +#: commands.cc:1937 msgid "read packets from files or stdin" msgstr "lecture des paquets depuis des fichiers ou l'entrée standard" -#: ../commands.cc:2017 +#: commands.cc:1945 #, c-format msgid "no packets found on stdin" msgstr "aucun paquet trouvé sur l'entrée standard" -#: ../commands.cc:2028 +#: commands.cc:1956 #, 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:2032 +#: commands.cc:1960 #, c-format msgid "read %d packet" msgid_plural "read %d packets" msgstr[0] "lu %d paquet" msgstr[1] "lu %d paquets" -#: ../commands.cc:2061 +#: commands.cc:1989 #, c-format msgid "setting default server to %s\n" msgstr "mettant l'adresse par défaut du serveur à %s\n" -#: ../commands.cc:2067 +#: commands.cc:1995 #, c-format msgid "no hostname given" msgstr "aucun nom d'hôte fourni" -#: ../commands.cc:2069 +#: commands.cc:1997 #, c-format msgid "no server given and no default server set" msgstr "aucun serveur donné et aucun serveur établi comme défaut" -#: ../commands.cc:2087 +#: commands.cc:2015 #, c-format msgid "setting default branch include pattern to '%s'\n" msgstr "établi le motif de branche à inclure par défaut à « %s »\n" -#: ../commands.cc:2093 +#: commands.cc:2021 #, c-format msgid "setting default branch exclude pattern to '%s'\n" msgstr "établi le motif de branche à exclure par défaut à « %s »\n" -#: ../commands.cc:2099 +#: commands.cc:2027 #, c-format msgid "no branch pattern given" msgstr "aucun motif de branche fourni" -#: ../commands.cc:2101 +#: commands.cc:2029 #, c-format msgid "no branch pattern given and no default pattern set" msgstr "aucun motif de branche donné et aucun motif établi comme défaut" -#: ../commands.cc:2117 ../commands.cc:2132 ../commands.cc:2146 -#: ../commands.cc:2161 +#: commands.cc:2045 commands.cc:2060 commands.cc:2074 commands.cc:2089 msgid "network" msgstr "réseau" -#: ../commands.cc:2117 ../commands.cc:2132 ../commands.cc:2146 +#: commands.cc:2045 commands.cc:2060 commands.cc:2074 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADRESSE[:PORT] [MOTIF]]" -#: ../commands.cc:2118 +#: commands.cc:2046 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "" "envoie les branches correspondant au MOTIF au serveur netsync à l'ADRESSE" -#: ../commands.cc:2133 +#: commands.cc:2061 msgid "pull branches matching PATTERN from netsync server at ADDRESS" -msgstr "récupère les branches correspondant au MOTIF du serveur netsync à ADRESSE" +msgstr "" +"récupère les branches correspondant au MOTIF du serveur netsync à ADRESSE" -#: ../commands.cc:2140 +#: commands.cc:2068 #, 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:2147 +#: commands.cc:2075 msgid "sync branches matching PATTERN with netsync server at ADDRESS" -msgstr "synchronise les branches correspondant au MOTIF au serveur netsync à ADRESSE" +msgstr "" +"synchronise les branches correspondant au MOTIF au serveur netsync à ADRESSE" -#: ../commands.cc:2161 +#: commands.cc:2089 msgid "PATTERN ..." msgstr "CHEMIN ..." -#: ../commands.cc:2162 +#: commands.cc:2090 msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "" "servir les branches spécifiées par les MOTIFs aux clients qui se connectent" -#: ../commands.cc:2175 +#: commands.cc:2103 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" -msgstr "il faut vôtre permission pour garder la phrase de passe de façon persistante (voyez la procédure automatique persiste_phrase_ok())" +msgstr "" +"il faut vôtre permission pour garder la phrase de passe de façon persistante " +"(voyez la procédure automatique persiste_phrase_ok())" -#: ../commands.cc:2187 +#: commands.cc:2115 msgid "database" msgstr "base de données" -#: ../commands.cc:2188 +#: commands.cc:2116 msgid "" "init\n" "info\n" @@ -1139,11 +1135,16 @@ "rosterify\n" "set_epoch BRANCHE ÉPOQUE\n" -#: ../commands.cc:2202 +#: commands.cc:2130 msgid "manipulate database state" msgstr "manipule l'état de la base de données" -#: ../commands.cc:2255 +#: commands.cc:2177 +#, c-format +msgid "The epoch must be %s characters" +msgstr "" + +#: commands.cc:2187 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1153,40 +1154,40 @@ "get CHEMIN [ATTR]\n" "drop CHEMIN [ATTR]" -#: ../commands.cc:2256 +#: commands.cc:2188 msgid "set, get or drop file attributes" msgstr "établis, obtiens ou supprime des attributs de fichiers" -#: ../commands.cc:2272 +#: commands.cc:2204 #, c-format msgid "Unknown path '%s'" msgstr "Chemin inconnu « %s »" -#: ../commands.cc:2301 +#: commands.cc:2233 #, c-format msgid "Path '%s' does not have attribute '%s'\n" msgstr "Le chemin « %s » n'a pas d'attribut « %s »\n" -#: ../commands.cc:2355 +#: commands.cc:2287 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message et --message-file sont mutuellement exclusifs" -#: ../commands.cc:2374 +#: commands.cc:2306 msgid "commit workspace to database" msgstr "confie un éspace de travail à la base de données" -#: ../commands.cc:2392 +#: commands.cc:2324 #, c-format msgid "no changes to commit\n" msgstr "aucun changement à confier\n" -#: ../commands.cc:2406 +#: commands.cc:2338 #, fuzzy, c-format msgid "beginning commit on branch '%s'\n" msgstr "commence à confier sur la branche « %s »\n" -#: ../commands.cc:2415 +#: commands.cc:2347 #, c-format msgid "" "MT/log is non-empty and log message was specified on command line\n" @@ -1198,32 +1199,32 @@ "veuillez déplacé ou supprimer MT/log,\n" "ou supprimer --message/--message-file de la linge de commande" -#: ../commands.cc:2427 +#: commands.cc:2359 #, fuzzy, c-format msgid "empty log message; commit canceled" msgstr "message du journal vide; confidence arrêté" -#: ../commands.cc:2446 +#: commands.cc:2378 #, c-format msgid "log message rejected: %s\n" msgstr "entrée du journal rejetée: %s\n" -#: ../commands.cc:2454 +#: commands.cc:2386 #, 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:2492 ../commands.cc:2509 ../commands.cc:2528 +#: commands.cc:2424 commands.cc:2441 commands.cc:2460 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "le fichier « %s » a été modifié pendant le commit, interruption" -#: ../commands.cc:2554 +#: commands.cc:2486 #, fuzzy, c-format msgid "committed revision %s\n" msgstr "révision confié : %s\n" -#: ../commands.cc:2560 +#: commands.cc:2492 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1232,7 +1233,7 @@ "note: cette révision a créé une divergence\n" "note: peut-être (ou peut-être pas) voullez-vous exécuter « %s merge »" -#: ../commands.cc:2755 +#: commands.cc:2687 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -1245,7 +1246,7 @@ "différence entre eux est affichée. Si aucun format n'est précisé,\n" "le format « unified » est employé par défaut." -#: ../commands.cc:2771 +#: commands.cc:2703 #, c-format msgid "" "--diff-args requires --external\n" @@ -1254,16 +1255,16 @@ "--diff-args requiet --external\n" "essayez d'ajouter --external ou de retirer --diff-args ?" -#: ../commands.cc:2813 +#: commands.cc:2745 #, c-format msgid "current revision has no ancestor" msgstr "la révision actuelle n'existe pas" -#: ../commands.cc:2876 +#: commands.cc:2808 msgid "no changes" msgstr "aucun changement" -#: ../commands.cc:2908 +#: commands.cc:2840 msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" @@ -1278,12 +1279,13 @@ "cette révision. Sinon, met à jour basé sur la révision d'entré de\n" "la branche actuelle." -#: ../commands.cc:2946 +#: commands.cc:2878 #, c-format msgid "this workspace is a new project; cannot update" -msgstr "cet éspace de travail est un nouveau projet, impossible de mettre à jour" +msgstr "" +"cet éspace de travail est un nouveau projet, impossible de mettre à jour" -#: ../commands.cc:2953 +#: commands.cc:2885 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1294,32 +1296,32 @@ "actuelle. Elle ne correspond même pas à la révision actuelle.\n" "Peut-être voulez-vous employer --revision=?" -#: ../commands.cc:2958 -#, c-format -msgid "multiple update candidates:\n" +#: commands.cc:2890 +#, fuzzy, c-format +msgid "multiple update candidates:" msgstr "plusieurs candidats pour la mise à jour :\n" -#: ../commands.cc:2962 -#, c-format -msgid "choose one with '%s update -r'\n" +#: commands.cc:2894 +#, fuzzy, c-format +msgid "choose one with '%s update -r'" msgstr "choisissez en un avec « %s update -r »\n" -#: ../commands.cc:2963 -#, c-format -msgid "multiple candidates remain after selection" +#: commands.cc:2895 +#, fuzzy, c-format +msgid "multiple update candidates remain after selection" msgstr "il reste plusieurs candidats possible après la selection" -#: ../commands.cc:2978 +#: commands.cc:2910 #, c-format msgid "already up to date at %s\n" msgstr "déjà à jour en %s\n" -#: ../commands.cc:2986 +#: commands.cc:2918 #, c-format msgid "selected update target %s\n" msgstr "sélection de la cible %s pour la mise à jour\n" -#: ../commands.cc:2998 +#: commands.cc:2930 #, c-format msgid "" "revision %s is not a member of branch %s\n" @@ -1328,158 +1330,161 @@ "la révision %s n'est pas membre de la branche %s\n" "éssayez de nouveau avec un --branch explicit\n" -#: ../commands.cc:3098 +#: commands.cc:3030 #, c-format msgid "updated to base revision %s\n" msgstr "mise à jour vers la révision de base %s\n" -#: ../commands.cc:3108 +#: commands.cc:3040 #, fuzzy msgid "merge unmerged heads of branch" msgstr "fusionne les entrées non fusionnées" -#: ../commands.cc:3122 -#, c-format -msgid "branch '%s' is merged\n" +#: commands.cc:3056 +#, fuzzy, c-format +msgid "branch '%s' is already merged\n" msgstr "la branche « %s » est fusionnée\n" -#: ../commands.cc:3128 +#: commands.cc:3064 #, c-format msgid "starting with revision 1 / %d\n" msgstr "en commencent avec la révision 1 / %d\n" -#: ../commands.cc:3132 +#: commands.cc:3068 #, c-format msgid "merging with revision %d / %d\n" msgstr "fusionnent avec la révision %d / %d\n" -#. Somewhat redundant, but consistent with output of plain "merge" command. -#: ../commands.cc:3133 ../commands.cc:3134 ../commands.cc:3216 -#: ../commands.cc:3349 ../commands.cc:3350 +#: commands.cc:3069 commands.cc:3070 commands.cc:3152 commands.cc:3285 +#: commands.cc:3286 #, c-format msgid "[source] %s\n" msgstr "[source] %s\n" -#: ../commands.cc:3151 ../commands.cc:3314 ../commands.cc:3368 +#: commands.cc:3087 commands.cc:3250 commands.cc:3304 #, c-format msgid "[merged] %s\n" msgstr "[fusionné] %s\n" -#: ../commands.cc:3154 +#: commands.cc:3090 #, c-format msgid "note: your workspaces have not been updated\n" msgstr "note: vos éspaces de travail ne sont pas à jour\n" -#: ../commands.cc:3157 +#: commands.cc:3093 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION" -#: ../commands.cc:3158 +#: commands.cc:3094 msgid "merge from one branch to another asymmetrically" msgstr "fusionnez d'une branche à une autre asymétriquement" -#: ../commands.cc:3168 +#: commands.cc:3104 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION DOSSIER" -#: ../commands.cc:3169 +#: commands.cc:3105 msgid "merge one branch into a subdirectory in another branch" msgstr "fusionnez une branche dans un sous-dossier d'une autre branche" -#: ../commands.cc:3207 ../commands.cc:3210 +#: commands.cc:3143 commands.cc:3146 #, c-format msgid "branch '%s' is not merged\n" msgstr "la branche « %s » n'est pas fusionnée\n" -#: ../commands.cc:3215 +#: commands.cc:3151 #, c-format msgid "propagating %s -> %s\n" msgstr "propage %s -> %s\n" -#: ../commands.cc:3217 +#: commands.cc:3153 #, c-format msgid "[target] %s\n" msgstr "[cible] %s\n" -#: ../commands.cc:3222 +#: commands.cc:3158 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "la branche « %s » est à jour par rapport à la branche « %s »\n" -#: ../commands.cc:3224 +#: commands.cc:3160 #, c-format msgid "no action taken\n" msgstr "rien n'est fait\n" -#: ../commands.cc:3228 +#: commands.cc:3164 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "fusion pas nécessaire; met %s dans la branch « %s »\n" -#: ../commands.cc:3264 +#: commands.cc:3200 #, c-format msgid "Path %s not found in destination tree." msgstr "Chemin %s pas trouvé dans l'arborescence de destination" -#: ../commands.cc:3318 +#: commands.cc:3254 msgid "refresh the inodeprint cache" msgstr "rafraîchir le cache d'inodeprint" -#: ../commands.cc:3327 +#: commands.cc:3263 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "RÉVISION-GAUCHE RÉVISION-DROITE BRANCHE-DESTINATION" -#: ../commands.cc:3328 +#: commands.cc:3264 msgid "merge two explicitly given revisions, placing result in given branch" -msgstr "fusionne deux révisions données explicitement et met le résultat dans la branche donnée" +msgstr "" +"fusionne deux révisions données explicitement et met le résultat dans la " +"branche donnée" -#: ../commands.cc:3342 +#: commands.cc:3278 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s et %s sont la même révision, j'abandonne" -#: ../commands.cc:3344 ../commands.cc:3346 +#: commands.cc:3280 commands.cc:3282 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s est déjà un ancêtre de %s" -#: ../commands.cc:3371 +#: commands.cc:3307 msgid "(revision|file|key) PARTIAL-ID" msgstr "(revision|file|key) ID-PARTIELLE" -#: ../commands.cc:3372 +#: commands.cc:3308 msgid "complete partial id" msgstr "remplis une identité partielle" -#: ../commands.cc:3381 +#: commands.cc:3317 #, c-format msgid "non-hex digits in partial id" msgstr "chiffres non-héxadécimaux dans l'id partielle" -#: ../commands.cc:3420 +#: commands.cc:3356 msgid "revert file(s), dir(s) or entire workspace (\".\")" -msgstr "retourne les fichiers, dossiers ou l'éspace de travail en entier (\".\") à la révision de base" +msgstr "" +"retourne les fichiers, dossiers ou l'éspace de travail en entier (\".\") à " +"la révision de base" -#: ../commands.cc:3497 +#: commands.cc:3433 #, c-format msgid "reverting %s" msgstr "retourne %s à la révision de base" -#: ../commands.cc:3501 +#: commands.cc:3437 #, c-format msgid "no file version %s found in database for %s" msgstr "aucune version de fichier « %s » trouvé dans la base de données %s" -#: ../commands.cc:3514 +#: commands.cc:3450 #, c-format msgid "recreating %s/" msgstr "re-crée %s/" -#: ../commands.cc:3526 +#: commands.cc:3462 msgid "RCSFILE..." msgstr "FICHIER_RCS..." -#: ../commands.cc:3527 +#: commands.cc:3463 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " @@ -1489,36 +1494,36 @@ "cette command ne reconstruit ou n'importe pas des révisions. Vous voulez\n" "probablement cvs_import" -#: ../commands.cc:3543 +#: commands.cc:3479 msgid "rcs" msgstr "rcs" -#: ../commands.cc:3543 +#: commands.cc:3479 msgid "CVSROOT" msgstr "CVSROOT" -#: ../commands.cc:3543 +#: commands.cc:3479 msgid "import all versions in CVS repository" msgstr "importer toutes les versions d'un dépôt CVS" -#: ../commands.cc:3606 +#: commands.cc:3542 msgid "PATH" msgstr "CHEMIN" -#: ../commands.cc:3607 +#: commands.cc:3543 msgid "print annotated copy of the file from REVISION" msgstr "affiche une copie annotée du fichier venant de RÉVISION" -#: ../commands.cc:3627 +#: commands.cc:3563 #, c-format msgid "no revision for file '%s' in database" msgstr "aucune révision pour le fichier « %s » dans la base de données" -#: ../commands.cc:3645 +#: commands.cc:3581 msgid "[FILE] ..." msgstr "[FICHIER] ..." -#: ../commands.cc:3646 +#: commands.cc:3582 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -1526,34 +1531,37 @@ "Affiche l'histoire en sens inverse (filtré avec « FILE »). Si une\n" "révision ou plus sont données, emploie-les comme débuts." -#: ../commands.cc:3694 +#: commands.cc:3630 #, c-format msgid "Unknown file '%s' for log command" msgstr "Fichier « %s » inconnu donnée à la commande log" -#: ../commands.cc:3712 +#: commands.cc:3648 #, c-format msgid "only one of --last/--next allowed" msgstr "seul un de --last et --next est permit" -#: ../commands.cc:3880 +#: commands.cc:3816 msgid "[DIRECTORY]" msgstr "[DOSSIER]" -#: ../commands.cc:3880 +#: commands.cc:3816 msgid "setup a new workspace directory, default to current" -msgstr "prépare un dossier pour une nouvelle copie de travail, emploie le dossier actuel comme défaut" +msgstr "" +"prépare un dossier pour une nouvelle copie de travail, emploie le dossier " +"actuel comme défaut" -#: ../commands.cc:3886 +#: commands.cc:3822 #, c-format msgid "need --branch argument for setup" msgstr "setup a besoin d'un argument pour --branch" -#: ../commands.cc:3900 +#: commands.cc:3836 msgid "automation" msgstr "automatisation" -#: ../commands.cc:3901 +#: commands.cc:3837 +#, fuzzy msgid "" "interface_version\n" "heads [BRANCH]\n" @@ -1574,6 +1582,10 @@ "get_file FILEID\n" "get_manifest_of [REVID]\n" "get_revision [REVID]\n" +"packet_for_rdata REVID\n" +"packets_for_certs REVID\n" +"packet_for_fdata FILEID\n" +"packet_for_fdelta OLD_FILE NEW_FILE\n" "keys\n" msgstr "" "interface_version\n" @@ -1597,368 +1609,389 @@ "get_revision [ID_RÉV]\n" "keys\n" -#: ../commands.cc:3921 +#: commands.cc:3861 msgid "automation interface" msgstr "interface d'automatisation" -#: ../commands.cc:3935 ../commands.cc:3951 +#: commands.cc:3875 commands.cc:3891 msgid "vars" msgstr "variables" -#: ../commands.cc:3935 +#: commands.cc:3875 msgid "DOMAIN NAME VALUE" msgstr "DOMAINE NOM VALEUR" -#: ../commands.cc:3936 +#: commands.cc:3876 msgid "set the database variable NAME to VALUE, in domain DOMAIN" -msgstr "établir la variable NOM de la base de données dans le domaine DOMAINE avec la valeur VALEUR" +msgstr "" +"établir la variable NOM de la base de données dans le domaine DOMAINE avec " +"la valeur VALEUR" -#: ../commands.cc:3951 +#: commands.cc:3891 msgid "DOMAIN NAME" msgstr "DOMAINE NOM VALEUR" -#: ../commands.cc:3952 +#: commands.cc:3892 msgid "remove the database variable NAME in domain DOMAIN" msgstr "" "supprimer la variable NOM de la base de données dans le domaine DOMAINE" -#: ../commands.cc:3963 +#: commands.cc:3903 #, c-format msgid "no var with name %s in domain %s" msgstr "aucune variable nommée %s dans le domaine %s" -#: ../commands.cc:3967 +#: commands.cc:3907 msgid "REVID" msgstr "ID_RÉVISION" -#: ../commands.cc:3968 +#: commands.cc:3908 msgid "dump the roster associated with the given REVID" msgstr "décharge la list associée avec l'ID_RÉV donnée" -#: ../commands.cc:3986 +#: commands.cc:3926 msgid "REV REV" msgstr "RÉV RÉV" -#: ../commands.cc:3986 +#: commands.cc:3926 msgid "" "Show what conflicts would need to be resolved to merge the given revisions." -msgstr "Montre quels conflits auraient besoin d'être résolus l'ors d'une fusion des révisions données." +msgstr "" +"Montre quels conflits auraient besoin d'être résolus l'ors d'une fusion des " +"révisions données." -#: ../commands.cc:3995 ../commands.cc:3997 +#: commands.cc:3935 commands.cc:3937 #, c-format msgid "%s in an ancestor of %s; no merge is needed." msgstr "%s est un ancêtre de %s; aucune fusion est nécessaire" -#: ../commands.cc:4011 +#: commands.cc:3951 #, c-format msgid "There are %s node_name_conflicts." msgstr "Il y a %s node_name_conflicts." -#: ../commands.cc:4012 +#: commands.cc:3952 #, c-format msgid "There are %s file_content_conflicts." msgstr "Il y a %s file_content_conflicts." -#: ../commands.cc:4013 +#: commands.cc:3953 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Il y a %s node_attr_conflicts." -#: ../commands.cc:4014 +#: commands.cc:3954 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Il y a %s orphaned_node_conflicts." -#: ../commands.cc:4015 +#: commands.cc:3955 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Il y a %s rename_target_conflicts." -#: ../commands.cc:4016 +#: commands.cc:3956 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Il y a %s directory_loop_conflicts." -#: ../database_check.cc:125 +#: database_check.cc:125 msgid "files" msgstr "fichiers" -#: ../database_check.cc:154 +#: database_check.cc:154 msgid "rosters" msgstr "listes" -#: ../database_check.cc:221 +#: database_check.cc:221 msgid "markings" msgstr "marquages" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../database_check.cc:319 ../database_check.cc:507 ../netsync.cc:2759 -#: ../rcs_import.cc:1226 +#: database_check.cc:319 database_check.cc:507 netsync.cc:2760 +#: rcs_import.cc:1226 msgid "revisions" msgstr "révisions" -#: ../database_check.cc:418 +#: database_check.cc:418 msgid "ancestry" msgstr "ancêtre" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../database_check.cc:451 ../netsync.cc:2763 +#: database_check.cc:451 netsync.cc:2764 msgid "keys" msgstr "clefs" -#: ../database_check.cc:477 +#: database_check.cc:477 msgid "certs" msgstr "certifs" -#: ../database_check.cc:543 +#: database_check.cc:543 #, c-format msgid "file %s missing (%d manifest references)\n" msgstr "fichier %s manquant (%d références du manifeste)\n" -#: ../database_check.cc:550 +#: database_check.cc:550 #, c-format msgid "file %s unreferenced\n" msgstr "fichier %s non-référencé\n" -#: ../database_check.cc:571 +#: database_check.cc:571 #, fuzzy, c-format msgid "roster %s unreferenced\n" msgstr "liste %s non-référencé\n" -#: ../database_check.cc:577 +#: database_check.cc:577 #, c-format msgid "roster %s incomplete (%d missing files)\n" msgstr "liste %s incomplet (%d fichiers manquants)\n" -#: ../database_check.cc:584 +#: database_check.cc:584 #, c-format msgid "roster %s incomplete (%d missing revisions)\n" msgstr "liste %s incomplet (%d révisions manquantes)\n" -#: ../database_check.cc:591 +#: database_check.cc:591 #, c-format msgid "roster %s is not parseable (perhaps with unnormalized paths?)\n" -msgstr "liste %s n'est pas analysable (peut-être y-a-t'il des chemins non normalisé?)\n" +msgstr "" +"liste %s n'est pas analysable (peut-être y-a-t'il des chemins non " +"normalisé?)\n" -#: ../database_check.cc:598 +#: database_check.cc:598 #, c-format msgid "roster %s is not in normalized form\n" msgstr "la liste %s n'est pas en forme normalisé\n" -#: ../database_check.cc:623 +#: database_check.cc:623 #, c-format msgid "" "revision %s missing (%d revision references; %d cert references; %d parent " "references; %d child references; %d roster references)\n" -msgstr "révision %s manquante (%d révisions référencées; %d certifs référencés; %d parents référencés; %d enfants référencés; %d listes référencées)\n" +msgstr "" +"révision %s manquante (%d révisions référencées; %d certifs référencés; %d " +"parents référencés; %d enfants référencés; %d listes référencées)\n" -#: ../database_check.cc:631 +#: database_check.cc:631 #, c-format msgid "revision %s incomplete (%d missing manifests)\n" msgstr "révision %s incomplète (%d manifestes manquants)\n" -#: ../database_check.cc:638 +#: database_check.cc:638 #, c-format msgid "revision %s incomplete (%d missing revisions)\n" msgstr "révision %s incomplète (%d révisions manquantes)\n" -#: ../database_check.cc:645 +#: database_check.cc:645 #, c-format msgid "revision %s incomplete (missing roster link)\n" msgstr "révision %s incomplète (le lien à la liste manque)\n" -#: ../database_check.cc:651 +#: database_check.cc:651 #, c-format msgid "revision %s incomplete (missing roster)\n" msgstr "révision %s incomplète (la liste manque)\n" -#: ../database_check.cc:657 +#: database_check.cc:657 #, c-format msgid "revision %s mismatched roster and manifest\n" -msgstr "la liste et la manifeste de la révision %s ne s'entre-correspondent pas\n" +msgstr "" +"la liste et la manifeste de la révision %s ne s'entre-correspondent pas\n" -#: ../database_check.cc:663 +#: database_check.cc:663 #, c-format msgid "revision %s incomplete (incomplete roster)\n" msgstr "révision %s incomplète (liste incomplète)\n" -#: ../database_check.cc:669 +#: database_check.cc:669 #, c-format msgid "" "revision %s mismatched parents (%d ancestry parents; %d revision refs)\n" -msgstr "révision %s a des parents non-correspondents (%d parents; %d révision référencées)\n" +msgstr "" +"révision %s a des parents non-correspondents (%d parents; %d révision " +"référencées)\n" -#: ../database_check.cc:678 +#: database_check.cc:678 #, c-format msgid "revision %s mismatched children (%d ancestry children; %d parents)\n" -msgstr "révision %s a des enfants non-correspondents (%d enfants; %d parents)\n" +msgstr "" +"révision %s a des enfants non-correspondents (%d enfants; %d parents)\n" -#: ../database_check.cc:690 +#: database_check.cc:690 #, c-format msgid "revision %s has bad history (%s)\n" msgstr "la révision %s a une mauvaise histoire (%s)\n" -#: ../database_check.cc:697 +#: database_check.cc:697 #, c-format msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n" -msgstr "la révision %s n'est pas analysable (peut-être a-t'elle des chemins non normalisé?)\n" +msgstr "" +"la révision %s n'est pas analysable (peut-être a-t'elle des chemins non " +"normalisé?)\n" -#: ../database_check.cc:704 +#: database_check.cc:704 #, c-format msgid "revision %s is not in normalized form\n" msgstr "la révision %s n'est pas en forme normalisé\n" -#: ../database_check.cc:728 +#: database_check.cc:728 #, c-format msgid "key %s missing (signed %d certs)\n" msgstr "la clef %s manque (elle a signé %d certifs)\n" -#: ../database_check.cc:761 +#: database_check.cc:761 #, c-format msgid "revision %s unchecked signature in %s cert from missing key %s\n" -msgstr "la révision %s a une signature non contrôlable dans le certif %s, faite avec une clef qui manque %s\n" +msgstr "" +"la révision %s a une signature non contrôlable dans le certif %s, faite avec " +"une clef qui manque %s\n" -#: ../database_check.cc:769 +#: database_check.cc:769 #, c-format msgid "revision %s bad signature in %s cert from key %s\n" -msgstr "la révision %s a une mauvaise signature dans le certif %s, faite avec la clef %s\n" +msgstr "" +"la révision %s a une mauvaise signature dans le certif %s, faite avec la " +"clef %s\n" -#: ../database_check.cc:784 +#: database_check.cc:784 #, c-format msgid "revision %s missing %s cert\n" msgstr "la révision %s manque le certif %s\n" -#: ../database_check.cc:793 +#: database_check.cc:793 #, c-format msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)\n" -msgstr "révision %s a des certifs non-correspondents (%d auteurs %d dates %d entrées de journal)\n" +msgstr "" +"révision %s a des certifs non-correspondents (%d auteurs %d dates %d entrées " +"de journal)\n" -#: ../database_check.cc:874 +#: database_check.cc:874 #, c-format msgid "%d missing files\n" msgstr "%d fichiers manquants\n" -#: ../database_check.cc:876 +#: database_check.cc:876 #, c-format msgid "%d unreferenced files\n" msgstr "%d fichiers non-référencés\n" -#: ../database_check.cc:879 +#: database_check.cc:879 #, c-format msgid "%d unreferenced rosters\n" msgstr "%d listes non-référencés\n" -#: ../database_check.cc:881 +#: database_check.cc:881 #, c-format msgid "%d incomplete rosters\n" msgstr "%d listes incomplets\n" -#: ../database_check.cc:883 +#: database_check.cc:883 #, c-format msgid "%d rosters not parseable (perhaps with invalid paths)\n" -msgstr "%d listes non analysable (peut-être ont-ils des chemins pas valable?)\n" +msgstr "" +"%d listes non analysable (peut-être ont-ils des chemins pas valable?)\n" -#: ../database_check.cc:886 +#: database_check.cc:886 #, c-format msgid "%d rosters not in normalized form\n" msgstr "%d listes pas en forme normalisé\n" -#: ../database_check.cc:889 +#: database_check.cc:889 #, c-format msgid "%d missing revisions\n" msgstr "%d révisions manquantes\n" -#: ../database_check.cc:891 +#: database_check.cc:891 #, c-format msgid "%d incomplete revisions\n" msgstr "%d revisions incomplètes\n" -#: ../database_check.cc:893 +#: database_check.cc:893 #, c-format msgid "%d mismatched parents\n" msgstr "%d parents non correspondents\n" -#: ../database_check.cc:895 +#: database_check.cc:895 #, c-format msgid "%d mismatched children\n" msgstr "%d enfants non correspondents\n" -#: ../database_check.cc:897 +#: database_check.cc:897 #, c-format msgid "%d revisions with bad history\n" msgstr "%d révisions avec une mauvaise histoire\n" -#: ../database_check.cc:899 +#: database_check.cc:899 #, c-format msgid "%d revisions not parseable (perhaps with invalid paths)\n" -msgstr "%d révisions non analysable (peut-être ont-ils des chemins pas valable?)\n" +msgstr "" +"%d révisions non analysable (peut-être ont-ils des chemins pas valable?)\n" -#: ../database_check.cc:902 +#: database_check.cc:902 #, c-format msgid "%d revisions not in normalized form\n" msgstr "%d révisions non normalisés\n" -#: ../database_check.cc:906 +#: database_check.cc:906 #, c-format msgid "%d unreferenced roster links\n" msgstr "%d liens à liste non-référencés\n" -#: ../database_check.cc:909 +#: database_check.cc:909 #, c-format msgid "%d missing rosters\n" msgstr "%d listes manquantes\n" -#: ../database_check.cc:913 +#: database_check.cc:913 #, c-format msgid "%d missing keys\n" msgstr "%d clefs manquantes\n" -#: ../database_check.cc:916 +#: database_check.cc:916 #, c-format msgid "%d missing certs\n" msgstr "%d certifs manquants\n" -#: ../database_check.cc:918 +#: database_check.cc:918 #, c-format msgid "%d mismatched certs\n" msgstr "%d certifs non correspondaets\n" -#: ../database_check.cc:920 +#: database_check.cc:920 #, c-format msgid "%d unchecked signatures due to missing keys\n" msgstr "%d signature non contrôlées à cause de clefs manquantes\n" -#: ../database_check.cc:922 +#: database_check.cc:922 #, c-format msgid "%d bad signatures\n" msgstr "%d mauvaises signatures\n" -#: ../database_check.cc:948 +#: database_check.cc:948 #, c-format msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs\n" -msgstr "contrôle fini: %d fichiers; %d listes; %d révisions; %d clefs; %d certifs\n" +msgstr "" +"contrôle fini: %d fichiers; %d listes; %d révisions; %d clefs; %d certifs\n" -#: ../database_check.cc:954 +#: database_check.cc:954 #, c-format msgid "total problems detected: %d (%d serious)\n" msgstr "problèmes total détectés: %d (%d sérieux)\n" -#: ../database_check.cc:956 +#: database_check.cc:956 #, c-format msgid "serious problems detected" msgstr "problèmes sérieux détectés" -#: ../database_check.cc:958 +#: database_check.cc:958 #, c-format msgid "minor problems detected\n" msgstr "problèmes mineurs détectés\n" -#: ../database_check.cc:960 +#: database_check.cc:960 #, c-format msgid "database is good\n" msgstr "la base de données est bonne\n" -#: ../database.cc:138 +#: database.cc:141 #, c-format msgid "" "layout of database %s doesn't match this version of monotone\n" @@ -1966,12 +1999,14 @@ "try '%s db migrate' to upgrade\n" "(this is irreversible; you may want to make a backup copy first)" msgstr "" -"la disposition de la base de données %s ne correspond pas a cette version de monotone\n" +"la disposition de la base de données %s ne correspond pas a cette version de " +"monotone\n" "voulais le schéma %s, trouvais %s\n" "essaiyez « %s db migrate » pour mettre la base de données à niveau\n" -"(cette opération est irréversible; vous voudrez probablement prendre une copie d'abord)" +"(cette opération est irréversible; vous voudrez probablement prendre une " +"copie d'abord)" -#: ../database.cc:162 +#: database.cc:165 #, c-format msgid "" "database %s contains revisions but no rosters\n" @@ -1990,7 +2025,7 @@ " récupérez de nouveau dans une base de données fraiche.\n" "désolé pour l'inconvenience." -#: ../database.cc:181 +#: database.cc:184 #, c-format msgid "" "database %s contains manifests but no revisions\n" @@ -1998,22 +2033,23 @@ "please see README.changesets for details" msgstr "" "la base de données %s contient des manifestes mais aucune révision\n" -"ceçi est un base de données tr ancienne; eller a besoin d'être mise à niveau\n" +"ceçi est un base de données tr ancienne; eller a besoin d'être mise à " +"niveau\n" "veuillez lire lest détails dans README.changesets" -#: ../database.cc:217 +#: database.cc:220 #, c-format msgid "unable to probe database version in file %s" msgstr "le sondage de la version de la base de données dans « %s » a échouée" -#: ../database.cc:224 +#: database.cc:227 #, 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:251 +#: database.cc:254 msgid "" "make sure database and containing directory are writeable\n" "and you have not run out of disk space" @@ -2021,8 +2057,7 @@ "assurez-vous que la base de données et le dossier la contenant sont\n" "accessibles en écriture et que vous disposez encore d'espace disque" -#. kind of string surgery to avoid ~duplicate strings -#: ../database.cc:257 +#: database.cc:260 #, c-format msgid "" "sqlite error: %d: %s\n" @@ -2031,12 +2066,12 @@ "erreur sqlite : %d : %s\n" "%s" -#: ../database.cc:303 +#: database.cc:306 #, 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:308 +#: database.cc:311 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -2044,12 +2079,12 @@ "cancelling database creation" msgstr "" -#: ../database.cc:451 +#: database.cc:454 #, c-format msgid "cannot create %s; it already exists" msgstr "impossible de créer %s car ceci existe déjà" -#: ../database.cc:511 +#: database.cc:514 #, c-format msgid "" "schema version : %s\n" @@ -2090,72 +2125,73 @@ " certifs : %u\n" " total : %u\n" -#: ../database.cc:566 +#: database.cc:569 #, c-format msgid "database schema version: %s" msgstr "version du schéma de la base de données : %s" -#: ../database.cc:643 +#: database.cc:646 #, c-format msgid "multiple statements in query: %s\n" msgstr "plusieurs instructions dans la requête: %s\n" -#: ../database.cc:649 +#: database.cc:652 #, c-format msgid "wanted %d columns got %d in query: %s\n" msgstr "voulais %d colonnes, reçu %d dans la requête: %s\n" -#: ../database.cc:708 +#: database.cc:711 #, c-format msgid "null result in query: %s\n" msgstr "la requête donnait aucun résultat: %s\n" -#: ../database.cc:726 +#: database.cc:729 #, c-format msgid "wanted %d rows got %s in query: %s\n" msgstr "voulais %d rangs, reçu %s dans la requête: %s\n" -#: ../database.cc:1776 +#: database.cc:1728 #, c-format msgid "another key with name '%s' already exists" msgstr "une autre clef nommée « %s » existe déjà" -#: ../database.cc:2809 +#: database.cc:2784 #, c-format msgid "no database specified" msgstr "aucune base de données n'a été spécifiée" -#: ../database.cc:2817 +#: database.cc:2792 #, c-format msgid "database %s does not exist" msgstr "la base de données %s n'existe pas" -#: ../database.cc:2818 +#: database.cc:2793 #, c-format msgid "%s is a directory, not a database" msgstr "%s est un dossier, pas une base de données" -#: ../database.cc:2843 +#: database.cc:2818 #, c-format msgid "could not open database '%s': %s" msgstr "impossible d'ouvrir la base de données « %s » : %s" -#: ../diff_patch.cc:588 +#: diff_patch.cc:588 #, c-format msgid "file '%s' does not exist in workspace" msgstr "le fichier « %s » n'existe pas dans l'éspace de travail" -#: ../diff_patch.cc:589 +#: diff_patch.cc:589 #, c-format msgid "'%s' in workspace is a directory, not a file" msgstr "« %s » est un dossier, pas un fichier" -#: ../diff_patch.cc:593 +#: diff_patch.cc:593 #, c-format msgid "file %s in workspace has id %s, wanted %s" -msgstr "le fichier « %s » dans l'éspace de travail a l'identité %s, je voulais %s" +msgstr "" +"le fichier « %s » dans l'éspace de travail a l'identité %s, je voulais %s" -#: ../diff_patch.cc:714 +#: diff_patch.cc:714 #, c-format msgid "" "help required for 3-way merge\n" @@ -2170,12 +2206,12 @@ "[ droite] %s\n" "[fusionné] %s\n" -#: ../file_io.cc:116 +#: file_io.cc:116 #, 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 +#: file_io.cc:186 file_io.cc:193 #, c-format msgid "" "could not create directory '%s'\n" @@ -2184,7 +2220,7 @@ "impossible de créer le dossier « %s »\n" "car c'est un fichier" -#: ../file_io.cc:188 +#: file_io.cc:188 #, c-format msgid "" "could not create directory '%s'\n" @@ -2193,17 +2229,17 @@ "impossible de créer le dossier « %s »\n" "%s" -#: ../file_io.cc:192 +#: file_io.cc:192 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le dossier « %s »" -#: ../file_io.cc:205 +#: file_io.cc:205 #, c-format msgid "failed to create directory '%s' for '%s'" msgstr "impossible de créer le dossier « %s » pour « %s »" -#: ../file_io.cc:219 +#: file_io.cc:219 #, c-format msgid "" "could not remove '%s'\n" @@ -2212,421 +2248,438 @@ "impossible de supprimer « %s »\n" "%s" -#: ../file_io.cc:229 +#: file_io.cc:229 #, c-format msgid "file to delete '%s' does not exist" msgstr "le fichier à supprimer « %s » n'existe pas" -#: ../file_io.cc:230 +#: file_io.cc:230 #, c-format msgid "file to delete, '%s', is not a file but a directory" msgstr "le fichier à supprimer « %s » n'est pas un fichier, c'est un dossier" -#: ../file_io.cc:238 +#: file_io.cc:238 #, c-format msgid "directory to delete '%s' does not exist" msgstr "le dossier à supprimer « %s » n'existe pas" -#: ../file_io.cc:239 +#: file_io.cc:239 #, c-format msgid "directory to delete, '%s', is not a directory but a file" msgstr "le dossier à supprimer « %s » n'est pas un dossier, c'est un fichier" -#: ../file_io.cc:246 +#: file_io.cc:246 #, c-format msgid "object to delete, '%s', does not exist" msgstr "l'objet à supprimer « %s » n'existe pas" -#: ../file_io.cc:254 +#: file_io.cc:254 #, c-format msgid "directory to delete, '%s', does not exist" msgstr "le dossier à supprimer « %s » n'existe pas" -#: ../file_io.cc:255 +#: file_io.cc:255 #, c-format msgid "directory to delete, '%s', is a file" msgstr "le dossier à supprimer « %s » est un fichier" -#: ../file_io.cc:264 +#: file_io.cc:264 #, c-format msgid "rename source file '%s' does not exist" msgstr "le chemin à renommer « %s » n'existe pas" -#: ../file_io.cc:265 +#: file_io.cc:265 #, c-format msgid "rename source file '%s' is a directory -- bug in monotone?" -msgstr "le fichier à renommer « %s » est un dossier -- cerait-ce un bogue dans monotone?" +msgstr "" +"le fichier à renommer « %s » est un dossier -- cerait-ce un bogue dans " +"monotone?" -#: ../file_io.cc:268 ../file_io.cc:281 +#: file_io.cc:268 file_io.cc:281 #, c-format msgid "rename target '%s' already exists" msgstr "le nouveau nom « %s » existe déjà" -#: ../file_io.cc:277 +#: file_io.cc:277 #, c-format msgid "rename source dir '%s' does not exist" msgstr "le dossier à renommer « %s » n'existe pas" -#: ../file_io.cc:278 +#: file_io.cc:278 #, c-format msgid "rename source dir '%s' is a file -- bug in monotone?" -msgstr "le dossier à renommer « %s » est un fichier -- cerait-ce un bogue dans monotone?" +msgstr "" +"le dossier à renommer « %s » est un fichier -- cerait-ce un bogue dans " +"monotone?" -#: ../file_io.cc:292 +#: file_io.cc:292 #, c-format msgid "rename source path '%s' does not exist" msgstr "le chemin à renommer « %s » n'existe pas" -#: ../file_io.cc:307 +#: file_io.cc:307 #, c-format msgid "file %s does not exist" msgstr "le fichier %s n'existe pas" -#: ../file_io.cc:308 +#: file_io.cc:308 #, 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:312 +#: file_io.cc:312 #, c-format msgid "cannot open file %s for reading" msgstr "impossible d'ouvrir le fichier %s pour le lire" -#: ../file_io.cc:381 +#: file_io.cc:381 #, c-format msgid "Cannot read standard input multiple times" msgstr "Impossible de lire l'entrée standard plusieurs fois" -#: ../file_io.cc:412 +#: file_io.cc:412 #, c-format msgid "file '%s' cannot be overwritten as data; it is a directory" msgstr "le fichier %s ne peut être re-écrit avec des données; c'est un dossier" -#: ../file_io.cc:420 +#: file_io.cc:420 #, c-format msgid "cannot open file %s for writing" msgstr "impossible d'ouvrir le fichier %s pour l'écrire" -#: ../file_io.cc:530 +#: file_io.cc:530 #, c-format msgid "caught runtime error %s constructing file path for %s\n" -msgstr "attrape une erreur %s en cours d'exécution au milieu de la construction du cheming de fichier pour %s\n" +msgstr "" +"attrape une erreur %s en cours d'exécution au milieu de la construction du " +"cheming de fichier pour %s\n" -#: ../file_io.cc:569 +#: file_io.cc:569 #, c-format msgid "no such file or directory: '%s'" msgstr "aucun fichier ou dossier de ce type : « %s »" -#: ../keys.cc:77 +#: keys.cc:77 #, c-format msgid "got empty passphrase from get_passphrase() hook" msgstr "la phrase de passe obtenue depuis get_passphrase() est vide" -#: ../keys.cc:93 +#: keys.cc:93 #, c-format msgid "empty passphrase not allowed" msgstr "la phrase de passe ne doit pas être vide" -#: ../keys.cc:100 +#: keys.cc:100 #, c-format msgid "confirm passphrase for key ID [%s]: " msgstr "confirmez la phrase de passe pour la clef d'ID [%s] :" -#: ../keys.cc:105 +#: keys.cc:105 #, c-format msgid "empty passphrases not allowed, try again\n" msgstr "la phrase de passe ne doit pas être vide, essayez de nouveau\n" -#: ../keys.cc:106 ../keys.cc:113 +#: keys.cc:106 keys.cc:113 #, c-format msgid "too many failed passphrases\n" msgstr "trop de phrases de passe incorrectes\n" -#: ../keys.cc:112 +#: keys.cc:112 #, c-format msgid "passphrases do not match, try again\n" msgstr "les phrases de passe ne correspondent pas, essayez à nouveau\n" -#: ../keys.cc:119 +#: keys.cc:119 #, c-format msgid "no passphrase given" msgstr "aucune phrase de passe fournie" -#: ../keys.cc:542 +#: keys.cc:542 #, c-format msgid "passphrase for '%s' is incorrect" msgstr "la phrase de passe pour « %s » est incorrecte" -#: ../lua.cc:539 ../lua.cc:568 ../lua.cc:583 +#: lua.cc:539 lua.cc:568 lua.cc:583 #, c-format msgid "%s called with an invalid parameter" msgstr "%s a été appelé avec un paramètre invalide" -#: ../lua.cc:586 +#: lua.cc:586 #, c-format msgid "Directory '%s' does not exists" msgstr "le dossier « %s » n'existe pas" -#: ../lua.cc:587 ../rcs_import.cc:1217 ../work.cc:385 +#: lua.cc:587 rcs_import.cc:1217 work.cc:420 #, c-format msgid "'%s' is not a directory" msgstr "« %s » n'est pas un dossier" -#: ../lua.cc:606 ../lua.cc:908 +#: lua.cc:606 lua.cc:908 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "erreur lua lors du chargement de « %s »" -#: ../lua.cc:705 +#: lua.cc:705 #, c-format msgid "bad input to parse_basic_io" msgstr "mauvaise entrée à parse_basic_io" -#: ../lua.cc:920 +#: lua.cc:920 #, c-format msgid "lua error while loading '%s'" msgstr "erreur lua lors du chargement de « %s »" -#: ../lua.cc:925 +#: lua.cc:925 #, c-format msgid "rcfile '%s' does not exist" msgstr "le fichier rc « %s » n'existe pas" -#: ../main.cc:325 +#: main.cc:325 msgid "interrupted" msgstr "interrompu" -#: ../main.cc:329 +#: main.cc:329 msgid "terminated by signal" msgstr "terminé par un signal" -#: ../merkle_tree.cc:276 +#: merkle_tree.cc:276 #, c-format msgid "node level is %d, exceeds maximum %d" msgstr "niveau de noeud est %d, ce qui dépasse la limite %d" -#: ../merkle_tree.cc:311 +#: merkle_tree.cc:311 #, c-format msgid "mismatched node hash value %s, expected %s" msgstr "la somme de contrôle %s ne correspond pas à la valeur attendue %s" -#: ../monotone.cc:51 +#: monotone.cc:51 msgid "select branch cert for operation" msgstr "choisi certif de branch pour l'opération" -#: ../monotone.cc:52 +#: monotone.cc:52 msgid "select revision id for operation" msgstr "choisi révision pour l'opération" -#: ../monotone.cc:53 +#: monotone.cc:53 msgid "set commit changelog message" msgstr "établissez le message du journal" -#: ../monotone.cc:54 +#: monotone.cc:54 msgid "set filename containing commit changelog message" -msgstr "'etablissez le nom du fichier qui contient l'entrée du journal pour confier" +msgstr "" +"'etablissez le nom du fichier qui contient l'entrée du journal pour confier" -#: ../monotone.cc:55 +#: monotone.cc:55 msgid "override date/time for commit" msgstr "supplante la date/l'heure pour confier" -#: ../monotone.cc:56 +#: monotone.cc:56 msgid "override author for commit" msgstr "supplante l'auteur pour confier" -#: ../monotone.cc:57 +#: monotone.cc:57 msgid "limit the number of levels of directories to descend" msgstr "limite le niveau de dossier à descendre" -#: ../monotone.cc:58 +#: monotone.cc:58 msgid "limit log output to the last number of entries" msgstr "limiter l'affichage du journal au dernier nombre d'entrées spécifié" -#: ../monotone.cc:59 +#: monotone.cc:59 msgid "limit log output to the next number of entries" msgstr "limiter l'affichage du journal au prochain nombre d'entrées spécifié" -#: ../monotone.cc:60 +#: monotone.cc:60 msgid "record process id of server" msgstr "enregistrer l'identifiant du processus serveur" -#: ../monotone.cc:61 +#: monotone.cc:61 msgid "print a brief version of the normal output" msgstr "affiche la version courte de l'affichage normale" -#: ../monotone.cc:62 +#: monotone.cc:62 msgid "print diffs along with logs" msgstr "affiche la différnce en affichant le journal" -#: ../monotone.cc:63 +#: monotone.cc:63 msgid "exclude merges when printing logs" msgstr "exclus les fusions en affichant le journal" -#: ../monotone.cc:64 +#: monotone.cc:64 msgid "use the current arguments as the future default" msgstr "emploie les arguments actuels comme défauts futurs" -#: ../monotone.cc:65 +#: monotone.cc:65 msgid "leave out anything described by its argument" msgstr "exclus tout ce qui est décrit par l'argument" -#: ../monotone.cc:66 +#: monotone.cc:66 msgid "use unified diff format" msgstr "utiliser le format diff unifié" -#: ../monotone.cc:67 +#: monotone.cc:67 msgid "use context diff format" msgstr "utiliser le format diff contextuel" -#: ../monotone.cc:68 +#: monotone.cc:68 msgid "use external diff hook for generating diffs" -msgstr "emploie la procédure automatique de « diff » externe pour créer les différences" +msgstr "" +"emploie la procédure automatique de « diff » externe pour créer les " +"différences" -#: ../monotone.cc:69 +#: monotone.cc:69 msgid "argument to pass external diff hook" msgstr "argument a passer la procédure automatique de « diff » externe" -#: ../monotone.cc:70 +#: monotone.cc:70 msgid "use least common ancestor as ancestor for merge" msgstr "emploi le plus petit ancêtre commun comme ancêtre pour la fusion" -#: ../monotone.cc:71 +#: monotone.cc:71 msgid "perform the associated file operation" msgstr "accomplis les opérations sur les fichiers associés" -#: ../monotone.cc:72 +#: monotone.cc:72 msgid "address:port to listen on (default :4691)" msgstr "écouteur sur adresse:port (défaut :4691)" -#: ../monotone.cc:73 +#: monotone.cc:73 msgid "perform the operations for files missing from workspace" -msgstr "accomplis les opérations sur les fichiers qui manquent dans l'éspace de travail" +msgstr "" +"accomplis les opérations sur les fichiers qui manquent dans l'éspace de " +"travail" -#: ../monotone.cc:74 +#: monotone.cc:74 msgid "perform the operations for unknown files from workspace" -msgstr "accomplis les opérations sur les fichiers inconnus dans l'éspace de travail" +msgstr "" +"accomplis les opérations sur les fichiers inconnus dans l'éspace de travail" -#: ../monotone.cc:75 +#: monotone.cc:75 msgid "push the specified key even if it hasn't signed anything" msgstr "envoie la clef donnée même si rien n'est signé avec elle" -#: ../monotone.cc:76 +#: monotone.cc:76 msgid "when rosterifying, drop attrs entries with the given key" -msgstr "tout en créent des listes, élimine les attributs signé par la clef donnée" +msgstr "" +"tout en créent des listes, élimine les attributs signé par la clef donnée" -#: ../monotone.cc:77 +#: monotone.cc:77 msgid "exclude files when printing logs" msgstr "n'affiche pas les fichiers en affichant le journal" -#: ../monotone.cc:86 +#: monotone.cc:78 +msgid "also operate on the contents of any listed directories" +msgstr "" + +#: monotone.cc:87 msgid "print debug log to stderr while running" msgstr "affiche le journal à déboguer sur la sortie d'erreur standard" -#: ../monotone.cc:87 +#: monotone.cc:88 msgid "file to dump debugging log to, on failure" msgstr "ficher dans lequel verser le journal à déboguer, en cas d'erreur" -#: ../monotone.cc:88 +#: monotone.cc:89 msgid "file to write the log to" msgstr "fichier où écrire le journal" -#: ../monotone.cc:89 +#: monotone.cc:90 msgid "suppress log and progress messages" msgstr "n'affiche pas le journal ou les messages de progrès" -#: ../monotone.cc:90 +#: monotone.cc:91 msgid "display help message" msgstr "afficher le message d'aide" -#: ../monotone.cc:91 +#: monotone.cc:92 msgid "print version number, then exit" msgstr "afficher le numéro de version, puis quitte" -#: ../monotone.cc:92 +#: monotone.cc:93 msgid "print detailed version number, then exit" msgstr "afficher le numéro de version détaillée, puis quitte" -#: ../monotone.cc:93 +#: monotone.cc:94 msgid "insert command line arguments taken from the given file" msgstr "fourre les arguments pris du fichier donné dans la linge de commande" -#: ../monotone.cc:94 +#: monotone.cc:95 msgid "set ticker style (count|dot|none)" msgstr "établis le style d'affichage de progrès (count|dot|none)" -#: ../monotone.cc:95 +#: monotone.cc:96 msgid "do not load standard lua hooks" msgstr "ne pas charger les hooks standards lua" -#: ../monotone.cc:96 +#: monotone.cc:97 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:97 +#: monotone.cc:98 msgid "load extra rc file" msgstr "charger un fichier rc supplémentaire" -#: ../monotone.cc:98 +#: monotone.cc:99 msgid "set key for signatures" msgstr "paramétrer la clef pour les signatures" -#: ../monotone.cc:99 +#: monotone.cc:100 msgid "set name of database" msgstr "paramétrer le nom de la base de données" -#: ../monotone.cc:100 +#: monotone.cc:101 msgid "limit search for workspace to specified root" msgstr "limite la recherche d'un éspace de travail à la racine donnée" # **** Richard stopped here **** -#: ../monotone.cc:101 +#: monotone.cc:102 msgid "verbose completion output" msgstr "affiche plus d'information à la fin de l'exécution" -#: ../monotone.cc:102 +#: monotone.cc:103 msgid "set location of key store" msgstr "paramétrer l'emplacement de l'entrepôt de données" -#: ../monotone.cc:103 +#: monotone.cc:104 msgid "set location of configuration directory" msgstr "paramétrer l'emplacement du dossier de configuration" -#: ../monotone.cc:207 +#: monotone.cc:208 #, c-format msgid "problem parsing arguments from file %s: %s" msgstr "erreur lors de l'analyse d'arguments venant du fichier %s : %s" -#: ../monotone.cc:216 +#: monotone.cc:217 #, c-format msgid "weird error when stuffing arguments read from %s: %s\n" msgstr "erreur bizarre en employent des arguments lu de %s: %s\n" -#: ../monotone.cc:298 +#: monotone.cc:299 msgid "[OPTION...] command [ARGS...]\n" msgstr "[OPTION...] commande [ARGUMENTS...]\n" -#: ../monotone.cc:546 +#: monotone.cc:551 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "erreur de syntaxe près de l'option « %s » : %s" -#: ../monotone.cc:585 +#: monotone.cc:590 #, c-format msgid "monotone %s doesn't use the option %s" msgstr "monotone %s n'utilise pas l'option %s" -#: ../monotone.cc:620 +#: monotone.cc:625 #, c-format msgid "Options specific to '%s %s':" msgstr "Options spécifiques à « %s %s » :" -#: ../mt_version.cc:23 +#: mt_version.cc:23 #, c-format msgid "%s (base revision: %s)" msgstr "%s (révision de base : %s)" -#: ../mt_version.cc:34 +#: mt_version.cc:34 #, c-format msgid "" "Running on: %s\n" @@ -2635,17 +2688,17 @@ "En cours d'exécution sur : %s\n" "Changements depuis la révision de base : %s\n" -#: ../netcmd.cc:40 +#: netcmd.cc:40 #, c-format msgid "unknown item type 0x%x for '%s'" msgstr "type d'élément inconnu 0x%x pour « %s »" -#: ../netcmd.cc:112 +#: netcmd.cc:112 #, c-format msgid "unknown netcmd code 0x%x" msgstr "code de commande netcmd inconnu 0x%x" -#: ../netcmd.cc:117 +#: netcmd.cc:117 #, c-format msgid "" "protocol version mismatch: wanted '%d' got '%d'\n" @@ -2654,20 +2707,20 @@ "discordance de versions de protocol: voulais « %d », reçu « %d »\n" "%s" -#: ../netcmd.cc:122 +#: netcmd.cc:122 msgid "the remote side has a newer, incompatible version of monotone" msgstr "l'autre côté emploi une nouvelle version incompatible de monotone" -#: ../netcmd.cc:123 +#: netcmd.cc:123 msgid "the remote side has an older, incompatible version of monotone" msgstr "l'autre côté emploi une ancienne version incompatible de monotone" -#: ../netcmd.cc:133 +#: netcmd.cc:133 #, c-format msgid "oversized payload of '%d' bytes" msgstr "charge utile surdimensionnée de '%d' octets" -#: ../netcmd.cc:162 +#: netcmd.cc:162 #, c-format msgid "" "bad HMAC checksum (got %s, wanted %s)\n" @@ -2676,83 +2729,78 @@ "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:257 ../netcmd.cc:303 +#: netcmd.cc:257 netcmd.cc:303 #, c-format msgid "unknown role specifier %d" msgstr "rôle donné %d est inconnu" -#: ../netio.hh:38 ../netio.hh:56 +#: 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 +#: netio.hh:84 netio.hh:119 #, c-format msgid "uleb128 decode for '%s' into %d-byte datum overflowed" msgstr "décodage uleb128 de « %s » en donnée de %d octets a débordé" -#: ../netio.hh:139 +#: netio.hh:139 #, c-format msgid "ran out of bytes reading uleb128 value for '%s' at pos %d" -msgstr "pas assez d'octets en lisant la valeur uleb128 pour « %s », à la position %d" +msgstr "" +"pas assez d'octets en lisant la valeur uleb128 pour « %s », à la position %d" -#: ../netio.hh:275 +#: netio.hh:275 #, c-format msgid "decoding variable length string of %d bytes for '%s', maximum is %d" msgstr "décodage d'une linge de %d octets pour « %s » quand le maximum est %d" -#: ../netio.hh:330 +#: netio.hh:330 #, c-format msgid "expected %s to end at %d, have %d bytes" msgstr "je m'attendai à ce que %s finisse à %d, et j'ai %d octets" -#: ../netsync.cc:245 +#: netsync.cc:245 #, c-format msgid "check of '%s' failed" msgstr "la vérification de « %s » a échouée" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:691 +#: netsync.cc:691 msgid "bytes in" msgstr "octets ⇩" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:693 +#: netsync.cc:693 msgid "bytes out" msgstr "octets ⇧" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:697 +#: netsync.cc:697 msgid "certs in" msgstr "certs ⇩" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:699 ../netsync.cc:712 +#: netsync.cc:699 netsync.cc:712 msgid "revs in" msgstr "révs ⇩" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:704 +#: netsync.cc:704 msgid "certs out" msgstr "certs ⇧" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:706 ../netsync.cc:714 +#: netsync.cc:706 netsync.cc:714 msgid "revs out" msgstr "révs ⇧" -#: ../netsync.cc:814 +#: netsync.cc:815 #, c-format msgid "underflow on count of %s items to receive" msgstr "trop peux d'objets %s à recevoir" -#: ../netsync.cc:1160 +#: netsync.cc:1161 #, c-format msgid "received network error: %s" msgstr "erreur de réception réseau : %s" -#: ../netsync.cc:1192 +#: netsync.cc:1193 #, c-format msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -2775,12 +2823,12 @@ "j'attendais %s\n" "« %s unset %s %s » pour passer outre cette verification\n" -#: ../netsync.cc:1202 +#: netsync.cc:1203 #, c-format msgid "server key changed" msgstr "la clef du serveur a changée" -#: ../netsync.cc:1207 +#: netsync.cc:1208 #, c-format msgid "" "first time connecting to server %s\n" @@ -2791,310 +2839,314 @@ "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:1214 +#: netsync.cc:1215 #, c-format msgid "saving public key for %s to database\n" msgstr "sauvegarde la clef publique « %s » dans la base de données\n" -#: ../netsync.cc:1302 +#: netsync.cc:1303 #, c-format msgid "rejected attempt at anonymous connection for write\n" msgstr "essai de connection anonyme pour écrire rejeté\n" -#: ../netsync.cc:1309 +#: netsync.cc:1310 #, c-format msgid "rejected attempt at anonymous connection while running as sink\n" msgstr "essai de connection anonyme en étant un puit rejeté\n" -#: ../netsync.cc:1324 ../netsync.cc:1421 +#: netsync.cc:1325 netsync.cc:1422 #, c-format msgid "not serving branch '%s'" msgstr "la branche « %s » n'est pas servie" -#: ../netsync.cc:1329 +#: netsync.cc:1330 #, c-format msgid "anonymous access to branch '%s' denied by server" msgstr "accès anonyme à la branche « %s » refusé par le serveur" -#: ../netsync.cc:1336 +#: netsync.cc:1337 #, c-format msgid "allowed anonymous read permission for '%s' excluding '%s'\n" -msgstr "permission de lecture anonyme accordée pour « %s » en excluant « %s »\n" +msgstr "" +"permission de lecture anonyme accordée pour « %s » en excluant « %s »\n" -#: ../netsync.cc:1368 +#: netsync.cc:1369 #, c-format msgid "detected replay attack in auth netcmd\n" msgstr "détecté une attaque de repasse dans la phase auth de netcmd\n" -#: ../netsync.cc:1390 +#: netsync.cc:1391 #, c-format msgid "remote public key hash '%s' is unknown\n" msgstr "la somme de contrôle « %s » d'une clef publique reçu est inconnue\n" -#: ../netsync.cc:1407 +#: netsync.cc:1408 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " "sink\n" -msgstr "permission de lecture refusée à « %s » pour « %s » en excluant « %s » et en étant un puit pure\n" +msgstr "" +"permission de lecture refusée à « %s » pour « %s » en excluant « %s » et en " +"étant un puit pure\n" -#: ../netsync.cc:1427 +#: netsync.cc:1428 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n" -msgstr "permission de lecture refusée à « %s » pour « %s » en excluant « %s » à cause de la branche « %s »\n" +msgstr "" +"permission de lecture refusée à « %s » pour « %s » en excluant « %s » à " +"cause de la branche « %s »\n" -#: ../netsync.cc:1430 +#: netsync.cc:1431 #, c-format msgid "access to branch '%s' denied by server" msgstr "accès à la branche « %s » refusé par le serveur" -#. If we're source_and_sink_role, continue even with no branches readable -#. eg. serve --db=empty.db -#: ../netsync.cc:1440 +#: netsync.cc:1441 #, c-format msgid "allowed '%s' read permission for '%s' excluding '%s'\n" -msgstr "permission de lecture accordée à « %s » pour « %s » en excluant « %s »\n" +msgstr "" +"permission de lecture accordée à « %s » pour « %s » en excluant « %s »\n" -#: ../netsync.cc:1449 +#: netsync.cc:1450 #, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " "source\n" -msgstr "permission d'écrire refusée à « %s » pour « %s » en excluant « %s » en étant un source pure\n" +msgstr "" +"permission d'écrire refusée à « %s » pour « %s » en excluant « %s » en étant " +"un source pure\n" -#: ../netsync.cc:1457 +#: netsync.cc:1458 #, c-format msgid "denied '%s' write permission for '%s' excluding '%s'\n" msgstr "permission d'écrire refusée à « %s » pour « %s » en excluant « %s »\n" -#: ../netsync.cc:1463 +#: netsync.cc:1464 #, 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:1503 +#: netsync.cc:1504 #, c-format msgid "bad client signature\n" msgstr "signature du client invalide\n" -#: ../netsync.cc:1519 +#: netsync.cc:1520 #, c-format msgid "Unexpected 'refine' command on non-refined item type\n" msgstr "Commande « refine » inattenue pour type d'objet non raffiné\n" -#: ../netsync.cc:1616 +#: netsync.cc:1617 #, c-format msgid "unknown bye phase %d received" msgstr "phase d'adieu %d inconnue reçue" -#: ../netsync.cc:1631 +#: netsync.cc:1632 #, c-format msgid "Unexpected 'done' command on non-refined item type\n" msgstr "Commande « done » inattenue pour type d'objet non raffiné\n" -#: ../netsync.cc:1711 +#: netsync.cc:1712 #, c-format msgid "epoch with hash '%s' does not exist in our database" -msgstr "l'époque avec la somme de contrôle « %s » n'existe pas dans notre base de données" +msgstr "" +"l'époque avec la somme de contrôle « %s » n'existe pas dans notre base de " +"données" -#: ../netsync.cc:1740 +#: netsync.cc:1741 #, c-format msgid "revision '%s' does not exist in our database" msgstr "la révision « %s » n'existe pas dans notre base de données" -#: ../netsync.cc:1754 +#: netsync.cc:1755 #, c-format msgid "file '%s' does not exist in our database" msgstr "le fichier « %s » n'existe pas dans notre base de données" -#: ../netsync.cc:1768 +#: netsync.cc:1769 #, c-format msgid "cert '%s' does not exist in our database" msgstr "le certif « %s » n'existe pas dans notre base de données" -#. It is safe to call 'error' here, because if we get here, -#. then the current netcmd packet cannot possibly have -#. written anything to the database. -#: ../netsync.cc:1820 +#: netsync.cc:1821 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." -msgstr "Discordance d'époque sur la branche %s. Le serveur a « %s », le client a « %s »." +msgstr "" +"Discordance d'époque sur la branche %s. Le serveur a « %s », le client a « %" +"s »." -#: ../netsync.cc:1841 +#: netsync.cc:1842 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" -msgstr "le contrôle de la somme de contrôle échoué pour la clef publique « %s » (%s); voulais « %s », reçu « %s »" +msgstr "" +"le contrôle de la somme de contrôle échoué pour la clef publique « %s » (%" +"s); voulais « %s », reçu « %s »" -#: ../netsync.cc:1858 +#: netsync.cc:1859 #, c-format msgid "hash check failed for revision cert '%s'" -msgstr "contrôle de la somme de contrôle échoué pour le certif de révision « %s »" +msgstr "" +"contrôle de la somme de contrôle échoué pour le certif de révision « %s »" -#: ../netsync.cc:1933 +#: netsync.cc:1934 #, c-format msgid "Received warning from usher: %s" msgstr "Alerte reçu de usher : %s" -#: ../netsync.cc:2020 ../netsync.cc:2051 +#: netsync.cc:2021 netsync.cc:2052 msgid "source and sink" msgstr "source et puit" -#: ../netsync.cc:2021 ../netsync.cc:2052 +#: netsync.cc:2022 netsync.cc:2053 msgid "source" msgstr "source" -#: ../netsync.cc:2021 ../netsync.cc:2052 +#: netsync.cc:2022 netsync.cc:2053 msgid "sink" msgstr "puit" -#: ../netsync.cc:2206 +#: netsync.cc:2207 #, c-format msgid "input buffer for peer %s is overfull after netcmd dispatch\n" msgstr "" -#: ../netsync.cc:2218 ../netsync.cc:2275 +#: netsync.cc:2219 netsync.cc:2276 #, c-format msgid "protocol error while processing peer %s: '%s'\n" msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n" -#: ../netsync.cc:2224 +#: netsync.cc:2225 #, c-format msgid "error: %s\n" msgstr "erreur : %s\n" -#. FIXME: split into labels and convert to ace here. -#: ../netsync.cc:2254 +#: netsync.cc:2255 #, c-format msgid "connecting to %s\n" msgstr "connection à %s\n" -#: ../netsync.cc:2290 +#: netsync.cc:2291 #, c-format msgid "timed out waiting for I/O with peer %s, disconnecting\n" msgstr "temps mort en attendant E/S du pair %s, déconnection\n" -#: ../netsync.cc:2305 +#: netsync.cc:2306 #, c-format msgid "got OOB data from peer %s, disconnecting\n" msgstr "reçu des données hors-bande du pair %s, déconnection\n" -#. We failed during processing. This should only happen in -#. client voice when we have a decode exception, or received an -#. error from our server (which is translated to a decode -#. exception). We call these cases E() errors. -#: ../netsync.cc:2320 +#: netsync.cc:2321 #, c-format msgid "processing failure while talking to peer %s, disconnecting\n" msgstr "" -#: ../netsync.cc:2337 +#: netsync.cc:2338 #, c-format msgid "successful exchange with %s\n" msgstr "échange réussi avec %s\n" -#: ../netsync.cc:2343 +#: netsync.cc:2344 #, c-format msgid "peer %s disconnected after we informed them of error\n" msgstr "" -#: ../netsync.cc:2348 +#: netsync.cc:2349 #, c-format msgid "I/O failure while talking to peer %s, disconnecting\n" msgstr "" -#: ../netsync.cc:2377 +#: netsync.cc:2378 #, c-format msgid "protocol error while processing peer %s: '%s', marking as bad\n" msgstr "" -#: ../netsync.cc:2409 +#: netsync.cc:2410 #, c-format msgid "accepted new client connection from %s : %s\n" msgstr "nouvelle connection d'un client acceptée de %s : %s\n" -#: ../netsync.cc:2443 +#: netsync.cc:2444 #, c-format msgid "protocol error while processing peer %s: '%s', disconnecting\n" msgstr "" -#: ../netsync.cc:2454 +#: netsync.cc:2455 #, c-format msgid "peer %s read failed in working state (error)\n" msgstr "" -#: ../netsync.cc:2459 +#: netsync.cc:2460 #, c-format msgid "" "peer %s read failed in shutdown state (possibly client misreported error)\n" msgstr "" -#: ../netsync.cc:2465 +#: netsync.cc:2466 #, c-format msgid "peer %s read failed in confirmed state (success)\n" msgstr "" -#: ../netsync.cc:2486 +#: netsync.cc:2487 #, c-format msgid "peer %s write failed in working state (error)\n" msgstr "" -#: ../netsync.cc:2491 +#: netsync.cc:2492 #, c-format msgid "" "peer %s write failed in shutdown state (possibly client misreported error)\n" msgstr "" -#: ../netsync.cc:2497 +#: netsync.cc:2498 #, c-format msgid "peer %s write failed in confirmed state (success)\n" msgstr "" -#: ../netsync.cc:2524 +#: netsync.cc:2525 #, c-format msgid "peer %s processing finished, disconnecting\n" msgstr "traitement du pair %s terminé, déconnection\n" -#: ../netsync.cc:2546 +#: netsync.cc:2547 #, 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" -#: ../netsync.cc:2614 +#: netsync.cc:2615 #, c-format msgid "beginning service on %s : %s\n" msgstr "début du service sur %s : %s\n" -#: ../netsync.cc:2615 +#: netsync.cc:2616 msgid "" msgstr "" -#: ../netsync.cc:2629 +#: netsync.cc:2630 #, c-format msgid "session limit %d reached, some connections will be refused\n" msgstr "" -#: ../netsync.cc:2684 +#: netsync.cc:2685 #, c-format msgid "got OOB from peer %s, disconnecting\n" msgstr "reçu des données hors-bande du pair %s, déconnection\n" -#: ../netsync.cc:2753 +#: netsync.cc:2754 #, c-format msgid "finding items to synchronize:\n" msgstr "recherche d'éléments à synchroniser :\n" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:2761 +#: netsync.cc:2762 msgid "certificates" msgstr "certificats" -#: ../netsync.cc:2870 +#: netsync.cc:2871 #, c-format msgid "Cannot find key '%s'" msgstr "Impossible de trouver la clef « %s »" -#: ../netsync.cc:2910 +#: netsync.cc:2911 #, c-format msgid "" "include branch pattern contains a quote character:\n" @@ -3103,7 +3155,7 @@ "le motif des branches à inclure contient un caractère de citation :\n" "%s\n" -#: ../netsync.cc:2916 +#: netsync.cc:2917 #, c-format msgid "" "exclude branch pattern contains a quote character:\n" @@ -3112,189 +3164,174 @@ "le motif des branches à exclure contient un caractère de citation :\n" "%s\n" -#: ../netsync.cc:2939 ../netsync.cc:2943 +#: netsync.cc:2940 netsync.cc:2944 #, c-format msgid "network error: %s" msgstr "erreur réseau : %s" -#: ../packet.cc:94 +#: packet.cc:94 #, c-format msgid "file preimage '%s' missing in db" msgstr "" -#: ../packet.cc:95 +#: packet.cc:95 #, c-format msgid "dropping delta '%s' -> '%s'" msgstr "supprime le delta « %s » -> « %s »" -#: ../packet.cc:109 +#: packet.cc:109 #, c-format msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n" -msgstr "fichier reconstruit du delta « %s » -> « %s » a une identité incorrected « %s »\n" +msgstr "" +"fichier reconstruit du delta « %s » -> « %s » a une identité incorrected « %" +"s »\n" -#: ../packet.cc:138 +#: packet.cc:138 #, c-format msgid "missing prerequisite revision '%s'\n" msgstr "la révision préalable « %s » manque\n" -#: ../packet.cc:139 ../packet.cc:150 ../packet.cc:166 ../packet.cc:174 +#: packet.cc:139 packet.cc:150 packet.cc:166 packet.cc:174 #, c-format msgid "dropping revision '%s'\n" msgstr "supprime la révision « %s »\n" -#: ../packet.cc:149 +#: packet.cc:149 #, c-format msgid "missing prerequisite file '%s'\n" msgstr "le fichier préalable « %s » manque\n" -#: ../packet.cc:164 +#: packet.cc:164 #, c-format msgid "missing prerequisite file pre-delta '%s'\n" msgstr "" -#: ../packet.cc:172 +#: packet.cc:172 #, c-format msgid "missing prerequisite file post-delta '%s'\n" msgstr "" -#: ../packet.cc:200 +#: packet.cc:200 #, c-format msgid "cert revision '%s' does not exist in db\n" msgstr "la révision de certif « %s » n'existe pas dans la base de données\n" -#: ../packet.cc:202 +#: packet.cc:202 #, c-format msgid "dropping cert\n" msgstr "élimine le certif\n" -#: ../packet.cc:225 +#: packet.cc:225 #, c-format msgid "key '%s' is not equal to key '%s' in database\n" msgstr "" "la clef « %s » n'est pas égale à la clef « %s » dans la base de données\n" -#: ../packet.cc:349 +#: packet.cc:349 #, c-format msgid "malformed packet" msgstr "paquet malformé" -#: ../packet.cc:449 +#: packet.cc:449 #, c-format msgid "unknown packet type: '%s'" msgstr "type de paquet inconnu : « %s »" -#: ../rcs_file.cc:343 +#: rcs_file.cc:343 #, c-format msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n" msgstr "" -#: ../rcs_file.cc:362 +#: rcs_file.cc:362 #, c-format msgid "parse failure %d:%d: expecting word '%s'\n" msgstr "" -#: ../rcs_file.cc:377 +#: rcs_file.cc:377 #, c-format msgid "parse failure %d:%d: expecting word\n" msgstr "" -#: ../rcs_import.cc:703 +#: rcs_import.cc:703 #, c-format msgid "parsing RCS file %s\n" msgstr "analyse du fichier RCS %s\n" -#: ../rcs_import.cc:706 +#: rcs_import.cc:706 #, c-format msgid "parsed RCS file %s OK\n" msgstr "analyse du fichier RCS %s OK\n" -#: ../rcs_import.cc:895 +#: rcs_import.cc:895 #, c-format msgid "error reading RCS file %s: %s\n" msgstr "erreur lors de la lecture du fichier RCS %s : %s\n" -#: ../rcs_import.cc:1192 +#: rcs_import.cc:1192 #, c-format msgid "" "%s appears to be a CVS repository root directory\n" "try importing a module instead, with 'cvs_import %s/" msgstr "" "%s a l'air d'aitre la racine d'un dépôt CVS\n" -"essaie d'importer un module à la place, en employent « cvs_import %s/" +"essaie d'importer un module à la place, en employent « cvs_import %s/" -#: ../rcs_import.cc:1204 +#: rcs_import.cc:1204 #, c-format msgid "need base --branch argument for importing" msgstr "il faut un argument --branch come base pour importer" -#: ../rcs_import.cc:1216 +#: rcs_import.cc:1216 #, c-format msgid "path %s does not exist" msgstr "le chemin %s n'existe pas" -#: ../rcs_import.cc:1251 +#: rcs_import.cc:1251 msgid "tags" msgstr "étiquettes" -#. This kluge exists because in the 0.24-era monotone databases, several -#. bad merges still existed in which one side of the merge is an ancestor -#. of the other side of the merge. In other words, graphs which look like -#. this: -#. -#. a ----------------------> e -#. \ / -#. \---> b -> c -> d ----/ -#. -#. Such merges confuse the roster-building algorithm, because they should -#. never have occurred in the first place: a was not a head at the time -#. of the merge, e should simply have been considered an extension of d. -#. -#. So... we drop the a->e edges entirely. -#. -#. Note: this kluge drops edges which are a struct superset of those -#. dropped by a previous kluge ("3-ancestor") so we have removed that -#. code. -#: ../revision.cc:700 +#: revision.cc:700 #, c-format msgid "scanning for bogus merge edges\n" msgstr "cherche des fusions bogguées\n" -#: ../revision.cc:742 +#: revision.cc:742 #, c-format msgid "optimizing out redundant edge %d -> %d\n" msgstr "" -#: ../revision.cc:751 +#: revision.cc:751 #, c-format msgid "failed to eliminate edge %d -> %d\n" msgstr "" -#: ../revision.cc:762 +#: revision.cc:762 #, c-format msgid "rebuilding %d nodes\n" msgstr "reconstruis %d noeuds\n" -#: ../revision.cc:967 +#: revision.cc:967 #, c-format msgid "Path %s added to child roster multiple times\n" msgstr "" -#: ../revision.cc:980 +#: revision.cc:980 #, c-format msgid "Directory for path %s cannot be added, as there is a file in the way\n" msgstr "" -#: ../revision.cc:991 +#: revision.cc:991 #, c-format msgid "Path %s cannot be added, as there is a directory in the way\n" msgstr "Le chemin %s ne peut être ajouté, un dossier fait obstacle\n" -#: ../revision.cc:994 +#: revision.cc:994 #, c-format msgid "Path %s added twice with differing content\n" msgstr "" -#: ../revision.cc:1264 +#: revision.cc:1264 #, c-format msgid "" "unknown attribute %s on path %s\n" @@ -3303,17 +3340,20 @@ "attribut %s inconnu pour le chemin %s\n" "veuillez contacter %s pour négocier la meilleure façon pour migrer" -#: ../revision.cc:1373 +#: revision.cc:1373 #, c-format msgid "converting existing revision graph to new roster-style revisions\n" -msgstr "convertis graphe de révisions présent à des nouvelles révision en style liste\n" +msgstr "" +"convertis graphe de révisions présent à des nouvelles révision en style " +"liste\n" -#: ../revision.cc:1427 +#: revision.cc:1427 #, c-format msgid "rebuilding revision graph from manifest certs\n" -msgstr "reconstruit le graphe des révisions à partir des certifs de manifeste\n" +msgstr "" +"reconstruit le graphe des révisions à partir des certifs de manifeste\n" -#: ../revision.cc:1530 +#: revision.cc:1530 #, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" @@ -3324,166 +3364,153 @@ "je ne comprend que le format version « 1 »\n" "il faut une version monotone plus nouvelle pour complèter cette opération" -#: ../sanity.cc:116 +#: sanity.cc:116 #, c-format msgid "fatal: formatter failed on %s:%d: %s" msgstr "fatal : le formatteur a échoué à %s:%d : %s" -#: ../sanity.cc:190 +#: sanity.cc:190 msgid "misuse: " msgstr "mauvais usage : " -#: ../sanity.cc:202 +#: sanity.cc:202 msgid "error: " msgstr "erreur :" -#: ../sanity.cc:210 +#: sanity.cc:210 #, c-format msgid "%s:%d: invariant '%s' violated" msgstr "" -#: ../sanity.cc:223 +#: sanity.cc:223 #, c-format msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n" msgstr "" -#: ../sanity.cc:244 +#: sanity.cc:244 #, c-format msgid "Current work set: %i items\n" msgstr "Ensemble de travail actuel: %i objets\n" -#: ../schema_migration.cc:181 +#: schema_migration.cc:181 #, c-format msgid "failure extracting schema from sqlite_master" msgstr "extraction de schéma de sqlite_master échoué" -#: ../schema_migration.cc:217 +#: schema_migration.cc:217 #, c-format msgid "calculating necessary migration steps" msgstr "calcule les étapes à passer pour migrer" -#: ../schema_migration.cc:227 +#: schema_migration.cc:227 #, c-format msgid "error at transaction BEGIN statement" msgstr "" -#: ../schema_migration.cc:228 +#: schema_migration.cc:228 #, c-format msgid "migrating data" msgstr "migration des données" -#: ../schema_migration.cc:254 +#: schema_migration.cc:254 #, c-format msgid "migration step failed: %s" msgstr "l'étape de migration a échoué : %s" -#: ../schema_migration.cc:268 +#: schema_migration.cc:268 #, c-format msgid "mismatched result of migration, got %s, wanted %s" msgstr "discordance de résultats de la migration, reçu %s, voulais %s" -#: ../schema_migration.cc:271 +#: schema_migration.cc:271 #, c-format msgid "committing changes to database" msgstr "confie les changements à la base de données" -#: ../schema_migration.cc:273 +#: schema_migration.cc:273 #, c-format msgid "failure on COMMIT" msgstr "COMMIT échoué" -#: ../schema_migration.cc:275 +#: schema_migration.cc:275 #, c-format msgid "optimizing database" msgstr "optimisation de la base de données" -#: ../schema_migration.cc:277 +#: schema_migration.cc:277 #, c-format msgid "error vacuuming after migration" msgstr "" -#: ../schema_migration.cc:280 +#: schema_migration.cc:280 #, c-format msgid "error running analyze after migration" msgstr "erreur en analysant après la migration" -#: ../schema_migration.cc:287 +#: 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" -#. We really want 'db migrate' on an up-to-date schema to be a no-op -#. (no vacuum or anything, even), so that automated scripts can fire -#. one off optimistically and not have to worry about getting their -#. administrators to do it by hand. -#: ../schema_migration.cc:292 +#: 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" -#: ../schema_migration.cc:842 +#: schema_migration.cc:842 #, c-format msgid "public and private keys for %s don't match" msgstr "la clef publique ou privée « %s » ne correspondent pas l'une a l'autre" -#: ../schema_migration.cc:845 +#: schema_migration.cc:845 #, c-format msgid "moving key '%s' from database to %s" msgstr "déplace la clef « %s » de la base de données à %s" -#: ../std_hooks.lua:28 +#: std_hooks.lua:28 msgid "Press enter when the subprocess has completed" msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé" -#: ../transforms.cc:477 +#: transforms.cc:510 #, c-format msgid "failed to convert string from %s to %s: '%s'" msgstr "impossible de convertir la chaîne de %s en %s : « %s »" -#: ../transforms.cc:624 ../transforms.cc:638 +#: transforms.cc:741 transforms.cc:755 #, c-format msgid "error converting %d UTF-8 bytes to IDNA ACE: %s" msgstr "conversion de %d octets d'UTF-8 en IDNA ACE: %s" -#. xgettext: gibibytes (2^30 bytes) -#: ../ui.cc:108 +#: ui.cc:108 #, c-format msgid "%.1f G" msgstr "%.1f Gi" -#. xgettext: mebibytes (2^20 bytes) -#: ../ui.cc:114 +#: ui.cc:114 #, c-format msgid "%.1f M" msgstr "%.1f Mi" -#. xgettext: kibibytes (2^10 bytes) -#: ../ui.cc:120 +#: ui.cc:120 #, c-format msgid "%.1f k" msgstr "%.1f Ki" -#. We know that we're going to eventually have 'total' displayed -#. twice on screen, plus a slash. So we should pad out this field -#. to that eventual size to avoid spurious re-issuing of the -#. tick titles as we expand to the goal. -#. xgettext: bytes -#: ../ui.cc:137 ../ui.cc:139 +#: ui.cc:137 ui.cc:139 #, c-format msgid "%d/%d" msgstr "%d/%d" -#. xgettext: bytes -#: ../ui.cc:146 +#: ui.cc:146 #, c-format msgid "%d" msgstr "%d" -#: ../ui.cc:369 +#: ui.cc:369 #, c-format msgid "" "fatal: %s\n" @@ -3496,215 +3523,234 @@ "veuillez envoyer un ce message, ce que « monotone --full-version » affiche\n" "et une description de ce que vous vouliez faire à %s.\n" -#: ../ui.cc:422 +#: ui.cc:422 msgid "monotone: " msgstr "monotone: " -#: ../update.cc:65 +#: update.cc:65 #, c-format msgid "failed to decode boolean testresult cert value '%s'\n" -msgstr "ne pouvais pas décoder la valeur booléenne « %s » du certif testresult\n" +msgstr "" +"ne pouvais pas décoder la valeur booléenne « %s » du certif testresult\n" -#: ../update.cc:159 +#: update.cc:159 #, c-format msgid "cannot determine branch for update" msgstr "impossible de déterminer la branche pour la mise à jour" -#: ../vocab.cc:68 +#: vocab.cc:68 #, c-format msgid "hex encoded ID '%s' size != %d" msgstr "" -#: ../vocab.cc:72 +#: vocab.cc:72 #, c-format msgid "bad character '%c' in id name '%s'" msgstr "caractère invalide « %c » dans le nom de l'id « %s »" -#: ../vocab.cc:85 +#: vocab.cc:85 #, c-format msgid "bad character '%c' in ace string '%s'" msgstr "caractère invalude « %c » dans la chaîne ace « %s »" -#: ../vocab.cc:99 +#: vocab.cc:99 #, c-format msgid "bad character '%c' in cert name '%s'" msgstr "caractère invalide « %c » dans le nom du certif « %s »" -#: ../vocab.cc:112 +#: vocab.cc:112 #, c-format msgid "bad character '%c' in key name '%s'" msgstr "caractère invalide « %c » dans le nom de la clef « %s »" -#: ../vocab.cc:130 +#: vocab.cc:130 #, c-format msgid "Invalid key length of %d bytes" msgstr "Longueur de clef invalide de %d octets" -#: ../vocab.cc:148 +#: vocab.cc:148 #, c-format msgid "Invalid hmac length of %d bytes" msgstr "Longueur hmac invalide de %d octets" -#: ../work.cc:117 +#: work.cc:118 #, c-format msgid "skipping ignorable file %s" msgstr "omission du fichier %s qui peut être ignoré" -#: ../work.cc:126 +#: work.cc:127 #, c-format msgid "skipping %s, already accounted for in workspace" msgstr "omission de %s qui existe déjà dans l'éspace de travail" -#: ../work.cc:130 +#: work.cc:131 #, c-format msgid "adding %s to workspace manifest" msgstr "ajouter %s au manifeste de l'éspace de travail" -#: ../work.cc:203 +#: work.cc:221 #, c-format msgid "skipping %s, not currently tracked" msgstr "" -#: ../work.cc:211 +#: work.cc:231 #, c-format msgid "cannot remove %s/, it is not empty" msgstr "impossible de supprimer %s/, il n'est pas vide" -#: ../work.cc:213 +#: work.cc:242 #, c-format msgid "dropping %s from workspace manifest" msgstr "supprimer %s du manifeste de l'éspace de travail" -#: ../work.cc:270 +#: work.cc:305 #, c-format msgid "destination dir %s/ does not exist in current revision" msgstr "le dossier de destination %s/ n'existe pas dans la révision actuelle" -#: ../work.cc:273 +#: work.cc:308 #, c-format msgid "destination %s is an existing file in current revision" msgstr "la destination %s est un fichier qui existe dans la révision actuelle" -#: ../work.cc:283 +#: work.cc:318 #, c-format msgid "empty path %s is not allowed" msgstr "le chemin vide %s n'est pas permit" -#: ../work.cc:297 +#: work.cc:332 #, c-format msgid "%s does not exist in current revision" msgstr "%s n'existe pas dans la révision actuelle" -#: ../work.cc:300 +#: work.cc:335 #, c-format msgid "destination %s already exists in current revision" msgstr "la destination %s existe déjà dans la révision actuelle" -#: ../work.cc:309 +#: work.cc:344 #, c-format msgid "renaming %s to %s in workspace manifest" msgstr "renomme %s à %s dans le manifeste de l'éspace de travail" -#: ../work.cc:334 +#: work.cc:369 #, c-format msgid "%s doesn't exist in workspace, skipping" msgstr "omission de %s qui n'existe pas dans la copie de travail" -#: ../work.cc:338 +#: work.cc:373 #, c-format msgid "destination %s already exists in workspace, skipping" msgstr "omission de %s qui existe déjà dans la copie de travail" -#: ../work.cc:365 +#: work.cc:400 #, c-format msgid "proposed new root directory '%s' is not versioned or does not exist" msgstr "" -#: ../work.cc:367 +#: work.cc:402 #, c-format msgid "proposed new root directory '%s' is not a directory" msgstr "la nouvelle racine proposé « %s » n'est pas un dossier" -#: ../work.cc:372 +#: work.cc:407 #, c-format msgid "proposed new root directory '%s' contains illegal path %s" msgstr "la nouvelle racine proposé « %s » contient le chemin illégal %s" -#: ../work.cc:382 +#: work.cc:417 #, c-format msgid "directory '%s' is not versioned or does not exist" msgstr "le dossier « %s » n'est pas versioné ou n'existe pas" -#: ../work.cc:388 +#: work.cc:423 #, c-format msgid "'%s' is in the way" msgstr "« %s » fait obstacle" -#: ../work.cc:485 +#: work.cc:520 #, c-format msgid "workspace is corrupt: %s does not exist" msgstr "l'éspace de travail est corrompu : %s n'existe pas" -#: ../work.cc:486 +#: work.cc:521 #, c-format msgid "workspace is corrupt: %s is a directory" msgstr "l'éspace de travail est corrompue : %s est un dossier" -#: ../work.cc:496 +#: work.cc:531 #, c-format msgid "Problem with workspace: %s is unreadable" msgstr "Problème avec l'éspace de travail: %s n'est pas lisible" -#: ../work.cc:522 +#: work.cc:557 #, c-format msgid "base revision %s does not exist in database\n" msgstr "la révision de base %s n'existe pas dans la base de données\n" -#: ../work.cc:860 +#: work.cc:894 #, c-format msgid "dropping %s" msgstr "supprime %s" -#: ../work.cc:871 ../work.cc:882 +#: work.cc:905 work.cc:916 #, c-format msgid "path %s already exists" msgstr "le chemin %s existe déjà" -#: ../work.cc:904 ../work.cc:931 -#, c-format -msgid "adding '%s'" +#: work.cc:938 work.cc:965 +#, fuzzy, c-format +msgid "adding %s" msgstr "ajout de « %s »" -#: ../work.cc:920 +#: work.cc:954 #, c-format msgid "path '%s' already exists, cannot create" msgstr "le chemin « %s » existe déjà, ne peux pas le créer" -#: ../work.cc:927 -#, c-format -msgid "renaming '%s' to '%s'" +#: work.cc:961 +#, fuzzy, c-format +msgid "renaming %s to %s" msgstr "renommage de « %s » en « %s »" -#: ../work.cc:962 +#: work.cc:996 #, c-format msgid "file '%s' does not exist" msgstr "le fichier « %s » n'existe pas" -#: ../work.cc:963 +#: work.cc:997 #, c-format msgid "file '%s' is a directory" msgstr "le fichier « %s » est un dossier" -#: ../work.cc:968 +#: work.cc:1002 #, c-format msgid "content of file '%s' has changed, not overwriting" msgstr "le contenu du fichier « %s » a changé, il ne sera pas écrasé" -#: ../work.cc:969 +#: work.cc:1003 #, c-format msgid "updating %s to %s" msgstr "mise à jour de %s en %s" +#~ msgid "OLDID NEWID" +#~ msgstr "ANCIENID NOUVELID" + +#~ msgid "write file delta packet to stdout" +#~ msgstr "écrire le paquet delta pour un fichier sur la sortie standard" + +#~ msgid "no such file '%s'" +#~ msgstr "aucun fichier « %s »" + +#~ msgid "write revision data packet to stdout" +#~ msgstr "écrire un paquet pour une révision sur la sortie standard" + +#~ msgid "write file data packet to stdout" +#~ msgstr "écrire un paquet pour un fichier sur la sortie standard" + +#~ msgid "write cert packets to stdout" +#~ msgstr "écrire des paquets pour des certifs sur la sortie standard" + #~ 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" ============================================================ --- po/ja.po 636a1ccfd6ffff4fc79244bbffb117ed3eea7d52 +++ po/ja.po 46751f8d59a4bcc682353e4c37d0172f21778ecb @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: monotone HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 14:41-0800\n" +"POT-Creation-Date: 2006-03-10 02:15-0600\n" "PO-Revision-Date: 2005-09-21 14:55+0900\n" "Last-Translator: Satoru SATOH \n" "Language-Team: Japanese \n" @@ -16,136 +16,71 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app_state.cc:66 -#, c-format -msgid "initializing from directory %s\n" -msgstr "ディレクトリ %s から初期化中\n" - -#: app_state.cc:87 -#, c-format -msgid "branch name is '%s'\n" -msgstr "ブランチ名は '%s' です\n" - -#: app_state.cc:94 -#, c-format -msgid "setting dump path to %s\n" -msgstr "ダンプパスを %s に設定\n" - -#: app_state.cc:108 -#, c-format -msgid "working copy directory required but not found%s%s" +#: app_state.cc:110 +#, fuzzy, c-format +msgid "workspace required but not found%s%s" msgstr "作業コピーディレクトリが必要ですが、みつかりませんでした: %s%s" -#: app_state.cc:116 +#: app_state.cc:118 #, c-format msgid "invalid directory ''" msgstr "無効なディレクトリ ''" -#: app_state.cc:118 +#: app_state.cc:126 #, c-format -msgid "creating working copy in %s\n" -msgstr "%s 内に作業コピーを作成\n" - -#: app_state.cc:124 -#, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'\n" msgstr "monotone 記録簿用ディレクトリ '%s' は既に '%s' 内に存在しています\n" -#: app_state.cc:127 +#: app_state.cc:165 app_state.cc:180 #, c-format -msgid "creating bookkeeping directory '%s' for working copy in '%s'\n" -msgstr "作業コピーの記録簿用ディレクトリ '%s' を '%s' 内に作成\n" - -#: app_state.cc:158 -#, c-format -msgid "'%s' ignored by restricted path set\n" -msgstr "'%s' は制限パスセットによって無視されました\n" - -#: app_state.cc:163 app_state.cc:181 -#, c-format msgid "unknown path '%s'\n" msgstr "不明なパス '%s'\n" -#: app_state.cc:165 +#: app_state.cc:341 #, c-format -msgid "'%s' added to restricted path set\n" -msgstr "'%s' を制限パスセットに追加しました\n" - -#: app_state.cc:176 -#, c-format -msgid "'%s' ignored by excluded path set\n" -msgstr "'%s' は除外パスセットによって無視されました\n" - -#: app_state.cc:183 -#, c-format -msgid "'%s' added to excluded path set\n" -msgstr "'%s' を除外パスセットに追加しました\n" - -#: app_state.cc:210 -#, c-format -msgid "checking excluded path set for '%s'\n" -msgstr "'%s' について除外パスセットを調べています\n" - -#: 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:236 -#, c-format -msgid "checking restricted path set for '%s'\n" -msgstr "'%s' について制限パスセットを調べています\n" - -#: app_state.cc:244 -#, c-format -msgid "path '%s' found in restricted path set; '%s' included\n" -msgstr "パス '%s' は制限パスセットに含まれています; '%s' は含められます\n" - -#: app_state.cc:332 -#, c-format msgid "search root '%s' does not exist" msgstr "検索ルート '%s' は存在しません" -#: app_state.cc:333 +#: app_state.cc:342 #, c-format msgid "search root '%s' is not a directory\n" msgstr "検索ルート '%s' はディレクトリではありません\n" -#: app_state.cc:335 +#: app_state.cc:377 #, c-format -msgid "set search root to %s\n" -msgstr "検索ルートを %s に設定\n" +msgid "failed to parse date string '%s': %s" +msgstr "データ文字列 '%s' の解析に失敗: %s" -#: app_state.cc:366 +#: app_state.cc:391 #, c-format msgid "negative depth not allowed\n" msgstr "深さの値を負にすることはできません\n" -#: app_state.cc:374 +#: app_state.cc:399 #, c-format msgid "negative or zero last not allowed\n" msgstr "最終値を負または零にすることはできません\n" -#: app_state.cc:497 +#: app_state.cc:407 +#, fuzzy, c-format +msgid "negative or zero next not allowed\n" +msgstr "最終値を負または零にすることはできません\n" + +#: app_state.cc:536 #, c-format msgid "Failed to read options file %s" msgstr "オプションファイル '%s' の解析に失敗" -#: app_state.cc:514 +#: app_state.cc:553 #, c-format msgid "Failed to write options file %s" msgstr "オプションファイル '%s' の書き込みに失敗" -#: basic_io.cc:26 basic_io.cc:27 +#: basic_io.cc:27 #, c-format msgid "error in %s:%d:%d:E: %s" msgstr "エラー %s:%d:%d:E: %s" -#: cert.cc:51 -#, c-format -msgid "cert ok\n" -msgstr "証明 OK\n" - #: cert.cc:58 #, c-format msgid "ignoring bad signature by '%s' on '%s'\n" @@ -156,21 +91,11 @@ msgid "ignoring unknown signature by '%s' on '%s'\n" msgstr "'%s' による '%s' への不明な署名を無視します\n" -#: 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: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: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:182 #, c-format msgid "trust function disliked %d signers of %s cert on revision %s\n" @@ -181,315 +106,79 @@ msgid "calculated cert hash '%s' does not match '%s'" msgstr "計算した証明ハッシュ '%s' は '%s' と一致しません" -#: cert.cc:305 -#, c-format -msgid "cert: signable text %s\n" -msgstr "証明: 署名テキスト %s\n" - -#: cert.cc:365 +#: cert.cc:347 keys.cc:532 #, fuzzy, c-format -msgid "no private key '%s' found in key store or get_priv_key hook" +msgid "no key pair '%s' found in key store '%s'" msgstr "" "秘密鍵 '%s' はデータベース内にも get_priv_key フック内にもみつかりません" -#: 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:461 +#: cert.cc:424 #, c-format msgid "" "you have no private key to make signatures with\n" "perhaps you need to 'genkey '" msgstr "" -#: cert.cc:464 +#: cert.cc:427 #, 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 +#: cert.cc:444 #, c-format msgid "no branch found for empty revision, please provide a branch name" msgstr "リビジョンが空のブランチはありません. ブランチ名を指定して下さい" -#: cert.cc:490 +#: cert.cc:453 #, c-format msgid "no branch certs found for revision %s, please provide a branch name" msgstr "" "リビジョン %s のブランチ証明がみつかりません. ブランチ名を指定して下さい" -#: cert.cc:494 +#: cert.cc:457 #, c-format msgid "" "multiple branch certs found for revision %s, please provide a branch name" msgstr "リビジョン %s のブランチ証明は複数あります. ブランチ名を指定して下さい" -#: change_set.cc:289 +#: commands.cc:160 #, c-format -msgid "tid %d: parent %d, type %s, name %s\n" -msgstr "tid %d: 親 %d、タイプ %s、名前 %s\n" - -#: change_set.cc:315 -#, c-format -msgid "%d -> %d\n" -msgstr "%d -> %d\n" - -#: change_set.cc:1540 -#, c-format -msgid "concatenating change sets\n" -msgstr "変更セットを結合中\n" - -#: change_set.cc:1563 -#, c-format -msgid "concatenating %d and %d deltas\n" -msgstr "%d と %d の差分を結合中\n" - -#: change_set.cc:1573 -#, c-format -msgid "processing delta on %s\n" -msgstr "%s の差分を処理中\n" - -#: change_set.cc:1577 -#, c-format -msgid "delta on %s in first changeset renamed to %s\n" -msgstr "最初の変更セット内の %s についての差分は %s への名称変更です\n" - -#: change_set.cc:1582 -#, c-format -msgid "discarding delta [%s]->[%s] for deleted file '%s'\n" -msgstr "差分 [%s]->[%s] (対象は削除されたファイル '%s') を破棄\n" - -#: change_set.cc:1600 -#, c-format -msgid "fusing deltas on %s : %s -> %s and %s -> %s\n" -msgstr "%s の差分を融合中: %s -> %s と %s -> %s\n" - -#: change_set.cc:1614 -#, c-format -msgid "delta on %s in second changeset copied forward\n" -msgstr "第二の変更セット内の %s の差分のコピーを転送しました\n" - -#: change_set.cc:1628 -#, c-format -msgid "finished concatenation\n" -msgstr "結合終了\n" - -#: change_set.cc:1734 change_set.cc:1741 -#, c-format -msgid "delete of %s dominates rename to %s\n" -msgstr "%s の削除は %s への名称変更を決定付けます\n" - -#: change_set.cc:1751 -#, c-format -msgid "unable to resolve file conflict '%s' -> '%s' vs. '%s'" -msgstr "ファイルの競合 '%s' -> '%s' 対 '%s' を解決できません" - -#: change_set.cc:1755 -#, c-format -msgid "unable to resolve dir conflict '%s' -> '%s' vs. '%s'" -msgstr "ディレクトリの競合 '%s' -> '%s' 対 '%s' を解決できません" - -#: change_set.cc:1760 -#, c-format -msgid "illegal conflict resolution '%s', wanted '%s' or '%s'\n" -msgstr "不法な競合の解決 '%s'. '%s' または '%s' であるべきです\n" - -#: change_set.cc:1816 -#, c-format -msgid "tid %d (%s) clobbered tid %d (%s)\n" -msgstr "tid %d (%s) は tid %d (%s) を上書きします\n" - -#: change_set.cc:1852 -#, c-format -msgid "skipping common change on %s (tid %d)\n" -msgstr "%s (tid %d) への共通の変更をスキップ\n" - -#: change_set.cc:1857 -#, c-format -msgid "skipping neutral change of %s -> %s (tid %d)\n" -msgstr "中立の変更 %s -> %s (tid %d) をスキップ\n" - -#: change_set.cc:1864 -#, c-format -msgid "propagating change on %s -> %s (tid %d)\n" -msgstr "変更を伝播中: %s -> %s (tid %d)\n" - -#: change_set.cc:1880 -#, c-format -msgid "conflict detected, resolved in A's favour\n" -msgstr "競合を検出. A フレーバで解決\n" - -#: change_set.cc:1886 -#, c-format -msgid "conflict detected, resolved in B's favour\n" -msgstr "競合を検出. B フレーバで解決\n" - -#: change_set.cc:2053 -#, c-format -msgid "reusing merge resolution '%s' : '%s' -> '%s'\n" -msgstr "統合解決案 '%s' を再利用 : '%s' -> '%s'\n" - -#: change_set.cc:2062 -#, c-format -msgid "merge of '%s' : '%s' vs. '%s' (no common ancestor) failed" -msgstr "'%s' の統合に失敗: '%s' と '%s' が対立 (共通の祖先なし)" - -#: change_set.cc:2069 -#, c-format -msgid "merge of '%s' : '%s' -> '%s' vs '%s' failed" -msgstr "'%s' の統合に失敗: '%s' -> '%s' と '%s' が対立" - -#: change_set.cc:2073 -#, c-format -msgid "merge of '%s' : '%s' -> '%s' vs '%s' resolved to '%s'\n" -msgstr "'%s' の統合: '%s' -> '%s' と '%s' の対立を '%s' に解決\n" - -#: change_set.cc:2131 -#, c-format -msgid "skipping delta '%s'->'%s' on deleted file '%s'\n" -msgstr "差分 '%s'->'%s' (対象=削除されたファイル '%s') をスキップ\n" - -#: change_set.cc:2139 -#, c-format -msgid "merge is copying delta '%s' : '%s' -> '%s'\n" -msgstr "統合は差分 '%s' : '%s' -> '%s' のコピーです\n" - -#: change_set.cc:2163 -#, c-format -msgid "propagating new file addition delta on '%s' : '%s' -> '%s'\n" -msgstr "'%s' の新規ファイル追加差分を伝播中: '%s' -> '%s'\n" - -#: change_set.cc:2175 -#, c-format -msgid "skipping new file addition delta on '%s' : '' -> '%s'\n" -msgstr "'%s' の新規ファイル追加差分をスキップ: '' -> '%s'\n" - -#: change_set.cc:2183 -#, c-format -msgid "skipping common delta '%s' : '%s' -> '%s'\n" -msgstr "共通の差分 '%s' をスキップ: '%s' -> '%s'\n" - -#: change_set.cc:2189 -#, c-format -msgid "skipping neutral delta on '%s' : %s -> %s\n" -msgstr "中立の差分 '%s' をスキップ: '%s' -> '%s'\n" - -#: change_set.cc:2197 -#, c-format -msgid "propagating unperturbed delta on '%s' : '%s' -> '%s'\n" -msgstr "'%s' の摂動を受けない差分を伝播中: '%s' -> '%s'\n" - -#: change_set.cc:2207 -#, c-format -msgid "merging delta '%s' : '%s' -> '%s' vs. '%s'\n" -msgstr "差分 '%s' を統合中: '%s' -> '%s' 対 '%s'\n" - -#: change_set.cc:2220 -#, c-format -msgid "resolved merge to '%s' : '%s' -> '%s'\n" -msgstr "'%s' への統合を解決しました: '%s' -> '%s'\n" - -#: change_set.cc:2249 -#, c-format -msgid "merging change sets\n" -msgstr "変更セットを統合中\n" - -#: change_set.cc:2311 -#, c-format -msgid "finished merge\n" -msgstr "統合終了\n" - -#: change_set.cc:2330 -#, c-format -msgid "inverting change set\n" -msgstr "変更セットを反転中\n" - -#: change_set.cc:2360 -#, c-format -msgid "converted 'delete %s' to 'add as %s' in inverse\n" -msgstr "'%s の削除' を '%s の追加' (逆方向)に変換しました\n" - -#: change_set.cc:2369 -#, c-format -msgid "converted add %s to delete in inverse\n" -msgstr "%s の追加を削除(逆方向)に変換しました\n" - -#: change_set.cc:2379 -#, c-format -msgid "converting delta %s -> %s on %s\n" -msgstr "差分 %s -> %s (対象 %s) を変換\n" - -#: change_set.cc:2381 -#, c-format -msgid "inverse is delta %s -> %s on %s\n" -msgstr "逆方向の差分は %s -> %s (対象=%s) です\n" - -#: change_set.cc:2447 change_set.cc:2495 -#, c-format -msgid "moving file %s -> %s\n" -msgstr "ファイルを移動 %s -> %s\n" - -#: change_set.cc:2454 change_set.cc:2503 -#, c-format -msgid "moving dir %s -> %s\n" -msgstr "ディレクトリを移動 %s -> %s\n" - -#: commands.cc:136 -#, c-format -msgid "expanding command '%s'\n" -msgstr "コマンド '%s' を展開\n" - -#: commands.cc:153 -#, c-format -msgid "expanded command to '%s'\n" -msgstr "コマンドを '%s' に展開\n" - -#: commands.cc:158 -#, c-format msgid "command '%s' has multiple ambiguous expansions:\n" msgstr "'%s' だけでは曖昧で、展開できるコマンド候補は複数あります:\n" -#: commands.cc:201 +#: commands.cc:203 msgid "commands:" msgstr "コマンド:" -#: commands.cc:246 +#: commands.cc:254 #, c-format -msgid "executing command '%s'\n" -msgstr "コマンド '%s' を実行中\n" - -#: commands.cc:252 -#, c-format msgid "unknown command '%s'\n" msgstr "不明なコマンド '%s'\n" -#: commands.cc:299 +#: commands.cc:301 #, c-format msgid "pid file '%s' already exists" msgstr "PID ファイル '%s' は既に存在しています" -#: commands.cc:323 commands.cc:1275 commands.cc:1355 commands.cc:1720 -#: commands.cc:2674 commands.cc:3362 commands.cc:3582 commands.cc:3619 +#: commands.cc:325 commands.cc:1334 commands.cc:1404 commands.cc:1840 +#: commands.cc:2686 commands.cc:3307 commands.cc:3542 commands.cc:3581 +#: commands.cc:3926 msgid "informative" msgstr "情報" -#: commands.cc:323 +#: commands.cc:325 #, fuzzy msgid "command [ARGS...]" msgstr "[OPTION...] command [ARGS...]\n" -#: commands.cc:323 +#: commands.cc:325 #, fuzzy msgid "display command help" msgstr "ヘルプメッセージを表示" -#: commands.cc:382 +#: commands.cc:404 msgid "" "Enter a description of this change.\n" "Lines beginning with `MT:' are removed automatically.\n" @@ -497,77 +186,77 @@ "この変更の説明を入力して下さい\n" "'MT:' で始まる行は自動的に削除されます\n" -#: commands.cc:389 +#: commands.cc:411 #, c-format msgid "edit of log message failed" msgstr "ログメッセージの編集に失敗しました" -#: commands.cc:398 +#: commands.cc:420 msgid "note: " msgstr "ノート: " -#: commands.cc:399 -#, c-format +#: commands.cc:421 +#, fuzzy, c-format msgid "" "branch '%s' has multiple heads\n" -"perhaps consider 'monotone merge'" +"perhaps consider '%s merge'" msgstr "" "ブランチ '%s' には複数の最新版があります\n" "’monotone merge' を実行した方がよいでしょう" -#: commands.cc:459 commands.cc:715 commands.cc:1374 commands.cc:1446 -#: commands.cc:1831 commands.cc:2721 commands.cc:2736 commands.cc:2739 -#: commands.cc:2937 commands.cc:3601 +#: commands.cc:482 commands.cc:758 commands.cc:1422 commands.cc:1506 +#: commands.cc:2736 commands.cc:2764 commands.cc:2767 commands.cc:2903 +#: commands.cc:3564 #, c-format msgid "no such revision '%s'" msgstr "リビジョン '%s' は存在しません" -#: commands.cc:466 +#: commands.cc:489 #, c-format msgid "expanding selection '%s'\n" msgstr "セレクション '%s' を展開\n" -#: commands.cc:474 +#: commands.cc:497 #, c-format msgid "no match for selection '%s'" msgstr "セレクション '%s' に一致するものがありません" -#: commands.cc:477 +#: commands.cc:503 #, c-format -msgid "selection '%s' has multiple ambiguous expansions: \n" -msgstr "'%s' だけでは曖昧で、展開できるセレクションの候補は複数あります: \n" +msgid "expanded to '%s'\n" +msgstr "'%s' に展開\n" -#: commands.cc:484 +#: commands.cc:520 #, c-format -msgid "expanded to '%s'\n" -msgstr "'%s' に展開\n" +msgid "selection '%s' has multiple ambiguous expansions: \n" +msgstr "'%s' だけでは曖昧で、展開できるセレクションの候補は複数あります: \n" -#: commands.cc:495 +#: commands.cc:538 #, c-format msgid "non-hex digits in id" msgstr "ID に十六進数が含まれていません" -#: commands.cc:504 +#: commands.cc:547 #, c-format msgid "partial id '%s' does not have an expansion" msgstr "部分 ID '%s' を一つの ID に展開することはできません" -#: commands.cc:507 +#: commands.cc:550 #, c-format msgid "partial id '%s' has multiple ambiguous expansions:\n" msgstr "'%s' だけでは曖昧で、展開できる ID の候補は複数あります:\n" -#: commands.cc:514 +#: commands.cc:557 #, c-format msgid "expanded partial id '%s' to '%s'\n" msgstr "部分 ID '%s' を '%s' に展開\n" -#: commands.cc:541 netsync.cc:1942 +#: commands.cc:584 netsync.cc:1727 #, c-format msgid "no public key '%s' found in database" msgstr "データベース内に公開鍵 '%s' はありません" -#: commands.cc:551 +#: commands.cc:594 #, c-format msgid "" "Key : %s\n" @@ -580,125 +269,125 @@ "名前 : %s\n" "値 : %s\n" -#: commands.cc:585 +#: commands.cc:628 msgid "ok" msgstr "OK" -#: commands.cc:588 +#: commands.cc:631 msgid "bad" msgstr "NG" -#: commands.cc:591 +#: commands.cc:634 msgid "unknown" msgstr "不明" -#: commands.cc:678 +#: commands.cc:721 #, c-format msgid "(*) - only in %s/" msgstr "" -#: commands.cc:701 +#: commands.cc:744 #, c-format msgid "no keys found\n" msgstr "鍵がみつかりませんでした\n" -#: commands.cc:703 +#: commands.cc:746 #, c-format msgid "no keys found matching '%s'\n" msgstr "'%s' に一致する鍵はみつかりませんでした\n" -#: commands.cc:721 +#: commands.cc:764 #, c-format msgid "revision %s already has children. We cannot kill it." msgstr "リビジョン %s は既に子を持っていて削除できません" -#: commands.cc:851 commands.cc:875 commands.cc:912 commands.cc:933 -#: commands.cc:969 +#: commands.cc:904 commands.cc:928 commands.cc:965 commands.cc:986 +#: commands.cc:1022 msgid "key and cert" msgstr "鍵と証明" -#: commands.cc:851 commands.cc:875 commands.cc:912 +#: commands.cc:904 commands.cc:928 commands.cc:965 msgid "KEYID" msgstr "KEYID" -#: commands.cc:851 +#: commands.cc:904 msgid "generate an RSA key-pair" msgstr "鍵対を生成" -#: commands.cc:866 +#: commands.cc:919 #, fuzzy, c-format msgid "key '%s' already exists" msgstr "PID ファイル '%s' は既に存在しています" -#: commands.cc:869 +#: commands.cc:922 #, fuzzy, c-format msgid "generating key-pair '%s'" msgstr "鍵対 '%s' を生成\n" -#: commands.cc:871 +#: commands.cc:924 #, fuzzy, c-format msgid "storing key-pair '%s' in %s/" msgstr "鍵対 '%s' をデータベースに保存\n" -#: commands.cc:875 +#: commands.cc:928 msgid "drop a public and private key" msgstr "公開鍵と秘密鍵を破棄" -#: commands.cc:889 +#: commands.cc:942 #, c-format msgid "dropping public key '%s' from database\n" msgstr "公開鍵 '%s' をデータベースから破棄\n" -#: commands.cc:899 +#: commands.cc:952 #, fuzzy, c-format msgid "dropping key pair '%s' from keystore\n" msgstr "公開鍵 '%s' をデータベースから破棄\n" -#: commands.cc:906 +#: commands.cc:959 #, fuzzy, c-format msgid "public or private key '%s' does not exist in keystore or database" msgstr "公開または秘密鍵 '%s' はデータベース内に存在しません" -#: commands.cc:908 +#: commands.cc:961 #, fuzzy, c-format msgid "" "public or private key '%s' does not exist in keystore, and no database was " "specified" msgstr "公開または秘密鍵 '%s' はデータベース内に存在しません" -#: commands.cc:913 +#: commands.cc:966 msgid "change passphrase of a private RSA key" msgstr "秘密 RSA 鍵のパスフレーズを変更" -#: commands.cc:923 +#: commands.cc:976 #, fuzzy, c-format msgid "key '%s' does not exist in the keystore" msgstr "鍵 '%s' はデータベース内にありません" -#: commands.cc:930 +#: commands.cc:983 #, c-format msgid "passphrase changed\n" msgstr "パスフレーズを変更しました\n" -#: commands.cc:933 +#: commands.cc:986 msgid "REVISION CERTNAME [CERTVAL]" msgstr "REVISION CERTNAME [CERTVAL]" -#: commands.cc:934 +#: commands.cc:987 msgid "create a cert for a revision" msgstr "リビジョンの証明を作成" -#: commands.cc:969 +#: commands.cc:1022 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" -#: commands.cc:970 +#: commands.cc:1023 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" msgstr "現在の設定で仮想証明が信頼可能かテスト" -#: commands.cc:1003 +#: commands.cc:1056 #, c-format msgid "" "if a cert on: %s\n" @@ -713,183 +402,198 @@ "署名者 : %s\n" "よっておそらく %s でしょう\n" -#: commands.cc:1012 +#: commands.cc:1065 msgid "trusted" msgstr "trusted" -#: commands.cc:1012 +#: commands.cc:1065 msgid "UNtrusted" msgstr "UNtrusted" -#: commands.cc:1015 commands.cc:1028 commands.cc:1040 commands.cc:1057 -#: commands.cc:1103 +#: commands.cc:1068 commands.cc:1081 commands.cc:1094 commands.cc:1111 +#: commands.cc:1162 msgid "review" msgstr "レビュー" -#: commands.cc:1015 +#: commands.cc:1068 msgid "REVISION TAGNAME" msgstr "REVISION TAGNAME" -#: commands.cc:1016 -msgid "put a symbolic tag cert on a revision version" +#: commands.cc:1069 +#, fuzzy +msgid "put a symbolic tag cert on a revision" msgstr "象徴的なタグ証明をリビジョンバージョンに付加" -#: commands.cc:1028 +#: commands.cc:1081 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: commands.cc:1029 +#: commands.cc:1082 msgid "note the results of running a test on a revision" msgstr "リビジョンのテストの実行結果を記録" -#: commands.cc:1040 commands.cc:1057 +#: commands.cc:1094 commands.cc:1111 msgid "REVISION" msgstr "REVISION" -#: commands.cc:1041 +#: commands.cc:1095 msgid "approve of a particular revision" msgstr "特定のリビジョンを承認" -#: commands.cc:1052 +#: commands.cc:1106 #, c-format msgid "need --branch argument for approval" msgstr "承認には --branch 引数が必要です" -#: commands.cc:1058 +#: commands.cc:1112 msgid "disapprove of a particular revision" msgstr "特定のリビジョンを非承認" -#: commands.cc:1071 +#: commands.cc:1125 #, c-format msgid "revision '%s' has %d changesets, cannot invert\n" msgstr "リビジョン '%s' には %d 個の変更セットがあり、反転できません\n" -#: commands.cc:1075 +#: commands.cc:1129 #, c-format msgid "need --branch argument for disapproval" msgstr "非承認とするには --branch 引数が必要です" -#: commands.cc:1103 +#: commands.cc:1162 msgid "REVISION [COMMENT]" msgstr "REVISION [COMMENT]" -#: commands.cc:1104 +#: commands.cc:1163 msgid "comment on a particular revision" msgstr "特定のリビジョンにコメント" -#: commands.cc:1114 +#: commands.cc:1173 #, c-format msgid "edit comment failed" msgstr "コメント編集に失敗" -#: commands.cc:1117 +#: commands.cc:1176 #, c-format msgid "empty comment" msgstr "空のコメント" -#: commands.cc:1129 commands.cc:1166 commands.cc:1200 commands.cc:1332 -#: commands.cc:2198 commands.cc:2321 commands.cc:2886 commands.cc:3419 -msgid "working copy" -msgstr "作業コピー" +#: commands.cc:1189 commands.cc:1218 commands.cc:1243 commands.cc:1268 +#: commands.cc:2187 commands.cc:2305 commands.cc:2839 commands.cc:3355 +msgid "workspace" +msgstr "" -#: commands.cc:1129 commands.cc:1166 commands.cc:1275 commands.cc:2321 -#: commands.cc:2674 commands.cc:3419 +#: commands.cc:1189 commands.cc:1218 commands.cc:1334 commands.cc:2305 +#: commands.cc:2686 commands.cc:3355 msgid "[PATH]..." msgstr "[PATH]..." -#: commands.cc:1130 -msgid "add files to working copy" +#: commands.cc:1190 +#, fuzzy +msgid "add files to workspace" msgstr "ファイルを作業コピーに追加" -#: commands.cc:1167 -msgid "drop files from working copy" +#: commands.cc:1219 +#, fuzzy +msgid "drop files from workspace" msgstr "ファイルを作業コピーから削除" -#: commands.cc:1200 -msgid "SRC DST" -msgstr "SRC DST" +#: commands.cc:1244 +msgid "" +"SRC DEST\n" +"SRC1 [SRC2 [...]] DEST_DIR" +msgstr "" -#: commands.cc:1201 -msgid "rename entries in the working copy" +#: commands.cc:1246 +#, fuzzy +msgid "rename entries in the workspace" msgstr "作業コピー内のエントリの名称を変更" -#: commands.cc:1229 commands.cc:1242 commands.cc:2807 commands.cc:2824 -#: commands.cc:3502 +#: commands.cc:1268 +msgid "NEW_ROOT PUT_OLD" +msgstr "" + +#: commands.cc:1269 +msgid "" +"rename the root directory\n" +"after this command, the directory that currently has the name NEW_ROOT\n" +"will be the root directory, and the directory that is currently the root\n" +"directory will have name PUT_OLD.\n" +"Using --execute is strongly recommended." +msgstr "" + +#: commands.cc:1288 commands.cc:1301 commands.cc:1381 commands.cc:3462 +#: commands.cc:3907 msgid "debug" msgstr "デバッグ" -#: commands.cc:1229 +#: commands.cc:1288 msgid "load file contents into db" msgstr "ファイルの内容をデータベースに読み込み" -#: commands.cc:1242 +#: commands.cc:1301 msgid " " msgstr "<親> <左> <右>" -#: commands.cc:1243 +#: commands.cc:1302 msgid "merge 3 files and output result" msgstr "三つのファイルを統合し結果を出力" -#: commands.cc:1253 +#: commands.cc:1312 #, c-format msgid "ancestor file id does not exist" msgstr "祖先のファイル ID は存在しません" -#: commands.cc:1256 +#: commands.cc:1315 #, c-format msgid "left file id does not exist" msgstr "左ファイル ID は存在しません" -#: commands.cc:1259 +#: commands.cc:1318 #, c-format msgid "right file id does not exist" msgstr "右ファイル ID は存在しません" -#: commands.cc:1270 +#: commands.cc:1329 #, c-format msgid "merge failed" msgstr "統合失敗" -#: commands.cc:1275 -msgid "show status of working copy" +#: commands.cc:1334 +#, fuzzy +msgid "show status of workspace" msgstr "作業コピーの状態を表示" -#: commands.cc:1332 +#: commands.cc:1381 msgid "[PATH]" msgstr "[PATH]" -#: commands.cc:1333 +#: commands.cc:1382 msgid "calculate identity of PATH or stdin" msgstr "PATH または標準入力を識別" -#: commands.cc:1356 +#: commands.cc:1405 msgid "FILENAME" msgstr "FILENAME" -#: commands.cc:1357 +#: commands.cc:1406 msgid "write file from database to stdout" msgstr "データベースのファイルを標準出力に書き出し" -#: commands.cc:1385 +#: commands.cc:1434 commands.cc:1436 commands.cc:3573 #, c-format msgid "no file '%s' found in revision '%s'\n" msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n" -#: commands.cc:1389 -#, c-format -msgid "dumping file '%s'\n" -msgstr "ファイル '%s' をダンプ\n" - -#: commands.cc:1397 commands.cc:1505 commands.cc:3162 commands.cc:3211 -#: commands.cc:3296 commands.cc:3303 commands.cc:3787 +#: commands.cc:1448 commands.cc:1577 commands.cc:3040 commands.cc:3093 +#: commands.cc:3104 commands.cc:3254 commands.cc:3262 commands.cc:3816 msgid "tree" msgstr "ツリー" -#: commands.cc:1397 +#: commands.cc:1448 msgid "[DIRECTORY]\n" msgstr "[DIRECTORY]\n" -#: commands.cc:1398 +#: commands.cc:1449 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" @@ -902,82 +606,77 @@ "取り出します。ディレクトリが未指定ならディレクトリ名として\n" "ブランチ名を使います" -#: commands.cc:1415 commands.cc:1434 +#: commands.cc:1468 commands.cc:1487 #, c-format msgid "need --branch argument for branch-based checkout" msgstr "ブランチを基準にしたチェックアウトには --branch 引数が必要です" -#: commands.cc:1428 +#: commands.cc:1481 #, c-format msgid "checkout directory '%s' already exists" msgstr "取り出すディレクトリ '%s' は既に存在しています" -#: commands.cc:1437 commands.cc:1518 commands.cc:3175 commands.cc:3245 -#: commands.cc:3248 -#, c-format -msgid "branch '%s' is empty\n" +#: commands.cc:1490 +#, fuzzy, c-format +msgid "branch '%s' is empty" msgstr "ブランチ '%s' は空です\n" -#: commands.cc:1438 -#, c-format -msgid "branch %s has multiple heads" +#: commands.cc:1493 +#, fuzzy, c-format +msgid "branch %s has multiple heads:" msgstr "ブランチ %s には複数の最新版が存在しています" -#: commands.cc:1459 +#: commands.cc:1496 +#, fuzzy, c-format +msgid "choose one with '%s checkout -r'" +msgstr "'monotone update -r' として一つ選択\n" + +#: commands.cc:1497 #, c-format -msgid "found %d %s branch certs on revision %s\n" -msgstr "%d %s ブランチ証明がリビジョン %s でみつかりました\n" +msgid "branch %s has multiple heads" +msgstr "ブランチ %s には複数の最新版が存在しています" -#: commands.cc:1464 +#: commands.cc:1524 #, c-format msgid "revision %s is not a member of branch %s\n" msgstr "リビジョン %s はブランチ %s には属していません\n" -#: commands.cc:1480 +#: commands.cc:1558 #, c-format -msgid "no manifest %s found in database" -msgstr "マニフェスト %s はデータベース内にはみつかりません" - -#: commands.cc:1482 -#, c-format -msgid "checking out revision %s to directory %s\n" -msgstr "リビジョン %s をディレクトリ %s に取り出し中\n" - -#: commands.cc:1488 -#, c-format msgid "no file %s found in database for %s" msgstr "ファイル %s (対象 %s)はデータベース内にはみつかりません" -#: commands.cc:1492 commands.cc:3489 -#, c-format -msgid "writing file %s to %s\n" -msgstr "ファイル %s を %s に書き込み中\n" - -#: commands.cc:1505 +#: commands.cc:1577 msgid "show unmerged head revisions of branch" msgstr "ブランチの統合されていない最新リビジョンを表示" -#: commands.cc:1513 commands.cc:3171 +#: commands.cc:1585 commands.cc:3049 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "--branch=BRANCH というようにブランチを指定して下さい" -#: commands.cc:1520 +#: commands.cc:1590 commands.cc:3053 commands.cc:3142 commands.cc:3145 #, c-format +msgid "branch '%s' is empty\n" +msgstr "ブランチ '%s' は空です\n" + +#: commands.cc:1592 +#, c-format msgid "branch '%s' is currently merged:\n" msgstr "ブランチ '%s' は現在統合済みです:\n" -#: commands.cc:1522 +#: commands.cc:1594 #, c-format msgid "branch '%s' is currently unmerged:\n" msgstr "ブランチ '%s' は現在未統合です:\n" -#: commands.cc:1561 +#: commands.cc:1633 #, c-format msgid "no epoch for branch %s\n" msgstr "ブランチ %s は epoch を持ちません\n" -#: commands.cc:1721 +#: commands.cc:1841 +#, fuzzy msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -988,7 +687,8 @@ "known\n" "unknown\n" "ignored\n" -"missing" +"missing\n" +"changed" msgstr "" "certs ID\n" "keys [PATTERN]\n" @@ -1001,195 +701,135 @@ "ignored\n" "missing" -#: commands.cc:1731 +#: commands.cc:1852 +#, fuzzy msgid "" -"show database objects, or the current working copy manifest,\n" -"or unknown, intentionally ignored, or missing state files" +"show database objects, or the current workspace manifest, or known,\n" +"unknown, intentionally ignored, missing, or changed state files" msgstr "" "データベースオブジェクト、現在の作業コピーのマニフェスト、\n" "不明な、無視された、または失なわれた状態のファイルを表示" -#: 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:1890 commands.cc:1918 commands.cc:1936 msgid "packet i/o" msgstr "パケット I/O" -#: commands.cc:1768 commands.cc:1794 -msgid "OLDID NEWID" -msgstr "OLDID NEWID" - -#: commands.cc:1769 -msgid "write manifest delta packet to stdout" -msgstr "マニフェスト差分パケットを標準出力に出力" - -#: commands.cc:1783 commands.cc:1785 commands.cc:1849 -#, c-format -msgid "no such manifest '%s'" -msgstr "マニフェスト '%s' は存在しません" - -#: commands.cc:1795 -msgid "write file delta packet to stdout" -msgstr "ファイル差分パケットを標準出力に出力" - -#: commands.cc:1809 commands.cc:1811 commands.cc:1868 commands.cc:2219 -#, c-format -msgid "no such file '%s'" -msgstr "ファイル '%s' は存在しません" - -#: commands.cc:1818 commands.cc:1836 commands.cc:1855 commands.cc:1874 -#: commands.cc:1892 commands.cc:1920 +#: commands.cc:1890 commands.cc:1918 msgid "ID" msgstr "ID" -#: commands.cc:1818 -msgid "write revision data packet to stdout" -msgstr "リビジョンデータパケットを標準出力に出力" - -#: commands.cc:1836 -msgid "write manifest data packet to stdout" -msgstr "マニフェストデータパケットを標準出力に出力" - -#: commands.cc:1855 -msgid "write file data packet to stdout" -msgstr "ファイルデータパケットを標準出力に出力" - -#: commands.cc:1874 -msgid "write cert packets to stdout" -msgstr "証明パケットを標準出力に出力" - -#: commands.cc:1892 +#: commands.cc:1890 msgid "write public key packet to stdout" msgstr "公開鍵パケットを標準出力に出力" -#: commands.cc:1914 +#: commands.cc:1912 #, fuzzy, c-format msgid "public key '%s' does not exist" msgstr "公開鍵 '%s' はデータベース内に存在しません" -#: commands.cc:1920 +#: commands.cc:1918 msgid "write private key packet to stdout" msgstr "秘密鍵パケットを標準出力に出力" -#: commands.cc:1928 +#: commands.cc:1926 #, fuzzy, c-format msgid "public and private key '%s' do not exist in keystore" msgstr "公開または秘密鍵 '%s' はデータベース内に存在しません" -#: commands.cc:1939 +#: commands.cc:1937 msgid "read packets from files or stdin" msgstr "ファイルまたは標準入力からパケットを読み込み" -#: commands.cc:1947 +#: commands.cc:1945 #, c-format msgid "no packets found on stdin" msgstr "標準入力にパケットをみつけることができませんでした" -#: commands.cc:1958 +#: commands.cc:1956 #, c-format msgid "no packets found in given file" msgid_plural "no packets found in given files" msgstr[0] "ファイル内にパケットは含まれていません" msgstr[1] "ファイル内にパケットは含まれていません" -#: commands.cc:1962 +#: commands.cc:1960 #, c-format msgid "read %d packet" msgid_plural "read %d packets" msgstr[0] "%d パケット読み込み" msgstr[1] "%d パケット読み込み" -#: commands.cc:1966 commands.cc:2060 commands.cc:2075 commands.cc:2089 -#: commands.cc:2104 -msgid "network" -msgstr "ネットワーク" - -#: commands.cc:1967 -msgid "rebuild the indices used to sync over the network" -msgstr "ネットワークを介して同期するのに使う索引を再構築" - -#: commands.cc:2004 +#: commands.cc:1989 #, c-format msgid "setting default server to %s\n" msgstr "デフォルトのサーバーを %s に設定\n" -#: commands.cc:2010 +#: commands.cc:1995 #, c-format msgid "no hostname given" msgstr "ホスト名を指定して下さい" -#: commands.cc:2012 +#: commands.cc:1997 #, c-format msgid "no server given and no default server set" msgstr "サーバが未指定であり、デフォルトのサーバーも設定されていません" -#: commands.cc:2016 +#: commands.cc:2015 #, c-format -msgid "using default server address: %s\n" -msgstr "デフォルトのサーバーアドレスを利用: %s\n" - -#: commands.cc:2030 -#, c-format msgid "setting default branch include pattern to '%s'\n" msgstr "ブランチ名に含めるデフォルトパターンを '%s' に設定\n" -#: commands.cc:2036 +#: commands.cc:2021 #, c-format msgid "setting default branch exclude pattern to '%s'\n" msgstr "ブランチ名に含めないデフォルトパターンを '%s' に設定\n" -#: commands.cc:2042 +#: commands.cc:2027 #, c-format msgid "no branch pattern given" msgstr "ブランチ名を指定して下さい" -#: commands.cc:2044 +#: commands.cc:2029 #, c-format msgid "no branch pattern given and no default pattern set" msgstr "ブランチパターンが未指定、かつデフォルトパターンも設定されていません" -#: commands.cc:2048 -#, c-format -msgid "using default branch include pattern: '%s'\n" -msgstr "ブランチ名に含めるデフォルトのパターンを利用: '%s'\n" +#: commands.cc:2045 commands.cc:2060 commands.cc:2074 commands.cc:2089 +msgid "network" +msgstr "ネットワーク" -#: commands.cc:2056 -#, c-format -msgid "excluding: %s\n" -msgstr "除外: %s\n" - -#: commands.cc:2060 commands.cc:2075 commands.cc:2089 +#: commands.cc:2045 commands.cc:2060 commands.cc:2074 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADDRESS[:PORTNUMBER] [PATTERN]]" -#: commands.cc:2061 +#: commands.cc:2046 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) にプッシュ" -#: commands.cc:2076 +#: commands.cc:2061 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) から取り込み" -#: commands.cc:2083 +#: commands.cc:2068 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n" msgstr "匿名で取り込んでいます; 認証が必要な場合は -kKEYNAME を使って下さい\n" -#: commands.cc:2090 +#: commands.cc:2075 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) と同期" -#: commands.cc:2104 +#: commands.cc:2089 #, fuzzy msgid "PATTERN ..." msgstr "PATH..." -#: commands.cc:2105 +#: commands.cc:2090 #, fuzzy msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "ADDRESS で待機し、指定ブランチを接続クライアントに提供" -#: commands.cc:2118 +#: commands.cc:2103 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1197,11 +837,12 @@ "永続的にパスフレーズを保存しておきたいのなら権限が必要です (フック " "persist_phrase_ok() を参照して下さい)" -#: commands.cc:2130 +#: commands.cc:2115 msgid "database" msgstr "データベース" -#: commands.cc:2131 +#: commands.cc:2116 +#, fuzzy msgid "" "init\n" "info\n" @@ -1215,7 +856,7 @@ "kill_tag_locally TAG\n" "check\n" "changesetify\n" -"rebuild\n" +"rosterify\n" "set_epoch BRANCH EPOCH\n" msgstr "" "init\n" @@ -1233,152 +874,110 @@ "rebuild\n" "set_epoch BRANCH EPOCH\n" -#: commands.cc:2145 +#: commands.cc:2130 msgid "manipulate database state" msgstr "データベースの状態を操作" -#: commands.cc:2198 +#: commands.cc:2177 +#, c-format +msgid "The epoch must be %s characters" +msgstr "" + +#: commands.cc:2187 +#, fuzzy msgid "" -"set FILE ATTR VALUE\n" -"get FILE [ATTR]\n" -"drop FILE" +"set PATH ATTR VALUE\n" +"get PATH [ATTR]\n" +"drop PATH [ATTR]" msgstr "" "set FILE ATTR VALUE\n" "get FILE [ATTR]\n" "drop FILE" -#: commands.cc:2199 +#: commands.cc:2188 msgid "set, get or drop file attributes" msgstr "ファイル属性を設定/取得/削除" -#: commands.cc:2287 work.cc:113 -#, c-format -msgid "registering %s file in working copy\n" -msgstr "作業コピー内の %s ファイルを登録\n" +#: commands.cc:2204 +#, fuzzy, c-format +msgid "Unknown path '%s'" +msgstr "不明なパス '%s'\n" -#: commands.cc:2316 +#: commands.cc:2233 +#, fuzzy, c-format +msgid "Path '%s' does not have attribute '%s'\n" +msgstr "パス %s は存在しません" + +#: commands.cc:2287 #, c-format -msgid "failed to parse date string '%s': %s" -msgstr "データ文字列 '%s' の解析に失敗: %s" +msgid "--message and --message-file are mutually exclusive" +msgstr "--message と --message-file を同時に指定することはできません" -#: commands.cc:2322 -msgid "commit working copy to database" +#: commands.cc:2306 +#, fuzzy +msgid "commit workspace to database" msgstr "作業コピーをデータベースにコミット" -#: commands.cc:2340 +#: commands.cc:2324 #, c-format msgid "no changes to commit\n" msgstr "コミットすべき変更がありません\n" -#: commands.cc:2354 +#: commands.cc:2338 #, c-format msgid "beginning commit on branch '%s'\n" msgstr "ブランチ '%s' についてコミット開始\n" -#: commands.cc:2355 -#, c-format +#: commands.cc:2347 +#, fuzzy, c-format msgid "" -"new manifest '%s'\n" -"new revision '%s'\n" -msgstr "" -"新規マニフェスト '%s'\n" -"新規リビジョン '%s'\n" - -#: commands.cc:2362 -#, c-format -msgid "--message and --message-file are mutually exclusive" -msgstr "--message と --message-file を同時に指定することはできません" - -#: commands.cc:2365 -#, c-format -msgid "" -"MT/log is non-empty and --message supplied\n" +"MT/log is non-empty and log message was specified on command line\n" "perhaps move or delete MT/log,\n" -"or remove --message from the command line?" +"or remove --message/--message-file from the command line?" msgstr "" -"MT/log は空ではなく、 --message が指定されています.\n" -"もしかしたら MT/log を移動/削除したか、コマンド\n" -"行から --message を削除したのではありませんか?" - -#: commands.cc:2370 -#, c-format -msgid "" -"MT/log is non-empty and --message-file supplied\n" -"perhaps move or delete MT/log,\n" -"or remove --message-file from the command line?" -msgstr "" "MT/log は空ではなく、 --message-file が指定されています.\n" "もしかしたら MT/log を移動/削除したか、コマンド\n" "行から --message-file を削除したのではありませんか?" -#: commands.cc:2388 +#: commands.cc:2359 #, c-format msgid "empty log message; commit canceled" msgstr "空のログメッセージ; コミットは取り消されました" -#: commands.cc:2400 +#: commands.cc:2378 #, c-format -msgid "revision %s already in database\n" -msgstr "リビジョン %s は既にデータベース内に存在しています\n" +msgid "log message rejected: %s\n" +msgstr "" -#: commands.cc:2405 +#: commands.cc:2386 #, c-format -msgid "inserting new revision %s\n" -msgstr "新規リビジョン %s を挿入中\n" +msgid "revision %s already in database\n" +msgstr "リビジョン %s は既にデータベース内に存在しています\n" -#: commands.cc:2414 +#: commands.cc:2424 commands.cc:2441 commands.cc:2460 #, c-format -msgid "skipping manifest %s, already in database\n" -msgstr "既にデータベースにあるマニフェスト %s をスキップ\n" - -#: commands.cc:2418 -#, c-format -msgid "inserting manifest delta %s -> %s\n" -msgstr "マニフェスト差分 %s -> %s を挿入中\n" - -#: commands.cc:2429 -#, c-format -msgid "inserting full manifest %s\n" -msgstr "完全マニフェスト %s を挿入中\n" - -#: commands.cc:2442 -#, c-format -msgid "skipping file delta %s, already in database\n" -msgstr "既にデータベースにあるファイル差分 %s をスキップ\n" - -#: commands.cc:2448 -#, c-format -msgid "inserting delta %s -> %s\n" -msgstr "差分 %s -> %s を挿入中\n" - -#: commands.cc:2458 commands.cc:2475 -#, c-format msgid "file '%s' modified during commit, aborting" msgstr "ファイル '%s' は commit 前に変更されました. 中止します" -#: commands.cc:2468 +#: commands.cc:2486 #, c-format -msgid "inserting full version %s\n" -msgstr "完全なバージョン %s を挿入中\n" - -#: commands.cc:2502 -#, c-format msgid "committed revision %s\n" msgstr "リビジョン %s をコミット\n" -#: commands.cc:2508 -#, c-format +#: commands.cc:2492 +#, fuzzy, c-format msgid "" "note: this revision creates divergence\n" -"note: you may (or may not) wish to run 'monotone merge'" +"note: you may (or may not) wish to run '%s merge'" msgstr "" "注意: このリビジョンによって分岐が生じます\n" "注意: 分岐を望まないなら 'monotone merge' を実行して下さい" -#: commands.cc:2675 +#: commands.cc:2687 +#, fuzzy msgid "" "show current diffs on stdout.\n" -"If one revision is given, the diff between the working directory and\n" +"If one revision is given, the diff between the workspace 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 "" @@ -1387,7 +986,7 @@ "差分を、二つ指定されていればそれらリビジョン間の差分を表示します。\n" "形式が指定されていなければ、デフォルトでは unified 形式が使用されます。" -#: commands.cc:2691 +#: commands.cc:2703 #, c-format msgid "" "--diff-args requires --external\n" @@ -1396,62 +995,31 @@ "--diff-args は --external を必要とします。\n" "--external を追加するか、--diff-args を省いてみてはどうですか?" -#: commands.cc:2725 +#: commands.cc:2745 #, c-format msgid "current revision has no ancestor" msgstr "現在のリビジョンには祖先がありません" -#: commands.cc:2764 -#, c-format -msgid "no common ancestor for %s and %s" -msgstr "%s と %s には共通の祖先がありません" +#: commands.cc:2808 +#, fuzzy +msgid "no changes" +msgstr "コミットすべき変更がありません\n" -#: commands.cc:2770 -#, c-format -msgid "concatenating un-committed changeset to composite\n" -msgstr "合成のためにコミットされていない変更セットを連結\n" - -#: commands.cc:2807 commands.cc:2824 -msgid "LEFT RIGHT" -msgstr "LEFT RIGHT" - -#: commands.cc:2807 -msgid "print least common ancestor" -msgstr "最も近い祖先を表示" - -#: commands.cc:2820 -msgid "no common ancestor found" -msgstr "共通の祖先はありませんでした" - -#: commands.cc:2824 -msgid "print least common ancestor / dominator" -msgstr "最も近い祖先 / 支配者を表示" - -#: commands.cc:2838 -msgid "no common ancestor/dominator found" -msgstr "共通の祖先 / 支配者がみつかりません" - -#: commands.cc:2863 -#, fuzzy, c-format -msgid "updating %s to %s" -msgstr "%s を %s に更新中\n" - -#: commands.cc:2887 +#: commands.cc:2840 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)." +"update workspace.\n" +"This command modifies your workspace to be based off of a\n" +"different revision, preserving uncommitted changes as it does so.\n" +"If a revision is given, update the workspace to that revision.\n" +"If not, update the workspace to the head of the branch." msgstr "" -"作業コピーを更新。\n" -"リビジョンが指定されていればそれに基づいて、指定されていなければ\n" -"明示的または暗黙に指定されたブランチの最新版に基づいて更新します。" -#: commands.cc:2912 -#, c-format -msgid "this working directory is a new project; cannot update" +#: commands.cc:2878 +#, fuzzy, c-format +msgid "this workspace is a new project; cannot update" msgstr "この作業ディレクトリは新規のプロジェクトです; 更新できません" -#: commands.cc:2919 +#: commands.cc:2885 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1462,32 +1030,32 @@ "もしかしたら --revision=<他のブランチのリビジョン> としたいのでは\n" "ありませんか?" -#: commands.cc:2924 -#, c-format -msgid "multiple update candidates:\n" +#: commands.cc:2890 +#, fuzzy, c-format +msgid "multiple update candidates:" msgstr "複数の更新候補:\n" -#: commands.cc:2928 -#, c-format -msgid "choose one with 'monotone update -r'\n" +#: commands.cc:2894 +#, fuzzy, c-format +msgid "choose one with '%s update -r'" msgstr "'monotone update -r' として一つ選択\n" -#: commands.cc:2929 -#, c-format -msgid "multiple candidates remain after selection" +#: commands.cc:2895 +#, fuzzy, c-format +msgid "multiple update candidates remain after selection" msgstr "選択したものより後に複数の候補が残っています" -#: commands.cc:2944 +#: commands.cc:2910 #, c-format msgid "already up to date at %s\n" msgstr "%s は既に最新です\n" -#: commands.cc:2952 +#: commands.cc:2918 #, c-format msgid "selected update target %s\n" msgstr "選択された更新ターゲット %s\n" -#: commands.cc:2964 +#: commands.cc:2930 #, c-format msgid "" "revision %s is not a member of branch %s\n" @@ -1496,183 +1064,159 @@ "リビジョン %s はブランチ %s に属していません\n" "明示的に --branch を指定して再試行して下さい\n" -#: commands.cc:2979 +#: commands.cc:3030 #, c-format -msgid "updating along chosen edge %s -> %s\n" -msgstr "選択した先端 %s -> %s に従って更新中\n" - -#: commands.cc:2990 -#, c-format -msgid "merging working copy with chosen edge %s -> %s\n" -msgstr "作業コピーを選択した先端 %s -> %s と統合中\n" - -#: commands.cc:3039 -#, c-format msgid "updated to base revision %s\n" msgstr "基準リビジョン %s に更新\n" -#: commands.cc:3105 -#, c-format -msgid "" -"common ancestor %s found\n" -"trying 3-way merge\n" -msgstr "" -"共通の祖先 %s を発見\n" -"3方結合を試みています\n" - -#: commands.cc:3116 -#, c-format -msgid "no common ancestor found, synthesizing edges\n" -msgstr "共通の祖先がありませんでしたので、先端同士を同期中\n" - -#: commands.cc:3162 +#: commands.cc:3040 msgid "merge unmerged heads of branch" msgstr "統合されていないブランチの複数の最新版を統合" -#: commands.cc:3176 -#, c-format -msgid "branch '%s' is merged\n" +#: commands.cc:3056 +#, fuzzy, c-format +msgid "branch '%s' is already merged\n" msgstr "ブランチ '%s' を統合\n" -#: commands.cc:3182 +#: commands.cc:3064 #, c-format msgid "starting with revision 1 / %d\n" msgstr "リビジョン 1 / %d について作業開始\n" -#: commands.cc:3186 +#: commands.cc:3068 #, c-format msgid "merging with revision %d / %d\n" msgstr "リビジョン %d / %d について統合中\n" -#: commands.cc:3187 commands.cc:3188 commands.cc:3255 commands.cc:3339 -#: commands.cc:3340 +#: commands.cc:3069 commands.cc:3070 commands.cc:3152 commands.cc:3285 +#: commands.cc:3286 #, c-format msgid "[source] %s\n" msgstr "[元] %s\n" -#: commands.cc:3205 commands.cc:3292 commands.cc:3359 +#: commands.cc:3087 commands.cc:3250 commands.cc:3304 #, c-format msgid "[merged] %s\n" msgstr "[統合済み] %s\n" -#: commands.cc:3208 -#, c-format -msgid "note: your working copies have not been updated\n" +#: commands.cc:3090 +#, fuzzy, c-format +msgid "note: your workspaces have not been updated\n" msgstr "注意: 作業コピーは更新されていません\n" -#: commands.cc:3211 +#: commands.cc:3093 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "SOURCE-BRANCH DEST-BRANCH" -#: commands.cc:3212 +#: commands.cc:3094 msgid "merge from one branch to another asymmetrically" msgstr "一方のブランチを他方に非同期に統合" -#: commands.cc:3246 commands.cc:3249 +#: commands.cc:3104 +#, fuzzy +msgid "SOURCE-BRANCH DEST-BRANCH DIR" +msgstr "SOURCE-BRANCH DEST-BRANCH" + +#: commands.cc:3105 +msgid "merge one branch into a subdirectory in another branch" +msgstr "" + +#: commands.cc:3143 commands.cc:3146 #, c-format msgid "branch '%s' is not merged\n" msgstr "ブランチ '%s' は統合されていません\n" -#: commands.cc:3254 +#: commands.cc:3151 #, c-format msgid "propagating %s -> %s\n" msgstr "伝播中 %s -> %s\n" -#: commands.cc:3256 +#: commands.cc:3153 #, c-format msgid "[target] %s\n" msgstr "[先] %s\n" -#: commands.cc:3261 +#: commands.cc:3158 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "ブランチ '%s' はブランチ '%s' に対して最新です\n" -#: commands.cc:3263 +#: commands.cc:3160 #, c-format msgid "no action taken\n" msgstr "何もしません\n" -#: commands.cc:3267 +#: commands.cc:3164 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "統合は必要ありません. %s をブランチ '%s' 内に取り込み中\n" -#: commands.cc:3296 +#: commands.cc:3200 +#, c-format +msgid "Path %s not found in destination tree." +msgstr "" + +#: commands.cc:3254 msgid "refresh the inodeprint cache" msgstr "i-node 表示キャッシュを更新" -#: commands.cc:3304 -msgid "" -"LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" -"LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" +#: commands.cc:3263 +msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "" -"LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" -"LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" -#: commands.cc:3306 +#: commands.cc:3264 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "明示的に指定した二つのリビジョンを統合。結果は指定ブランチへ。" -#: commands.cc:3321 commands.cc:3323 +#: commands.cc:3278 #, c-format -msgid "%s is not an ancestor of %s" -msgstr "%s は %s の祖先ではありません" - -#: commands.cc:3332 -#, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s と %s は同じリビジョンです. 中止します" -#: commands.cc:3334 commands.cc:3336 +#: commands.cc:3280 commands.cc:3282 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s は既に %s の祖先となっています" -#: commands.cc:3362 -msgid "(revision|manifest|file|key) PARTIAL-ID" +#: commands.cc:3307 +#, fuzzy +msgid "(revision|file|key) PARTIAL-ID" msgstr "(revision|manifest|file|key) PARTIAL-ID" -#: commands.cc:3363 +#: commands.cc:3308 msgid "complete partial id" msgstr "部分 ID を補完" -#: commands.cc:3372 +#: commands.cc:3317 #, c-format msgid "non-hex digits in partial id" msgstr "部分 ID に十六進数が含まれていません" -#: commands.cc:3420 +#: commands.cc:3356 #, fuzzy -msgid "revert file(s), dir(s) or entire working copy (\".\")" +msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "ファイル、ディレクトリまたは完全な作業コピーの変更を破棄" -#: 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 +#: commands.cc:3433 #, fuzzy, c-format -msgid "reverting %s to %s" +msgid "reverting %s" msgstr "%s を %s から %s へ戻しています\n" -#: commands.cc:3485 +#: commands.cc:3437 #, c-format msgid "no file version %s found in database for %s" msgstr "バージョン %s のファイルはデータベース内にみつかりません (対象: %s)" -#: commands.cc:3502 +#: commands.cc:3450 +#, fuzzy, c-format +msgid "recreating %s/" +msgstr "%s を %s から %s へ戻しています\n" + +#: commands.cc:3462 msgid "RCSFILE..." msgstr "RCSFILE..." -#: commands.cc:3503 +#: commands.cc:3463 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " @@ -1682,51 +1226,37 @@ "このコマンドは (CVS の) リビジョンを再構築または取り込みはしません。おそらく" "あなたの期待しているのは cvs_import でしょう。" -#: commands.cc:3519 +#: commands.cc:3479 msgid "rcs" msgstr "RCS 関連" -#: commands.cc:3519 +#: commands.cc:3479 msgid "CVSROOT" msgstr "CVSROOT" -#: commands.cc:3519 +#: commands.cc:3479 msgid "import all versions in CVS repository" msgstr "CVS リポジトリ内のすべてのバージョンを取り込む" -#: commands.cc:3582 +#: commands.cc:3542 msgid "PATH" msgstr "PATH" -#: commands.cc:3583 +#: commands.cc:3543 msgid "print annotated copy of the file from REVISION" msgstr "REVISION の注釈付きのファイルのコピーを表示" -#: commands.cc:3600 +#: commands.cc:3563 #, c-format msgid "no revision for file '%s' in database" msgstr "ファイル '%s' に対するリビジョンはデータベース内にみつかりませんでした" -#: commands.cc:3603 -#, c-format -msgid "annotate file file_path '%s'\n" -msgstr "注釈ファイル file_path '%s'\n" - -#: commands.cc:3612 -#, c-format -msgid "no such file '%s' in revision '%s'\n" -msgstr "ファイル '%s' はリビジョン %s 内にはありません\n" - -#: commands.cc:3614 -#, c-format -msgid "annotate for file_id %s\n" -msgstr "file_id %s に対する注釈\n" - -#: commands.cc:3619 -msgid "[FILE]" +#: commands.cc:3581 +#, fuzzy +msgid "[FILE] ..." msgstr "[FILE]" -#: commands.cc:3620 +#: commands.cc:3582 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -1734,34 +1264,36 @@ "降順で履歴を表示 ('FILE' でフィルタ)。一つ以上のリビジョンが指定されて\n" "いればそれを開始点として利用。" -#: commands.cc:3680 +#: commands.cc:3630 #, c-format -msgid "revision %s does not exist in db, skipping\n" -msgstr "リビジョン %s は db 内にありません. スキップします\n" +msgid "Unknown file '%s' for log command" +msgstr "" -#: commands.cc:3713 +#: commands.cc:3648 #, c-format -msgid "revision '%s' in '%s' maps to '%s' in %s\n" -msgstr "リビジョン '%s' ('%s' 内) を '%s' (%s 内) にマップ\n" +msgid "only one of --last/--next allowed" +msgstr "" -#: commands.cc:3787 -msgid "DIRECTORY" -msgstr "DIRECTORY" +#: commands.cc:3816 +#, fuzzy +msgid "[DIRECTORY]" +msgstr "[DIRECTORY]\n" -#: commands.cc:3787 -msgid "setup a new working copy directory" +#: commands.cc:3816 +#, fuzzy +msgid "setup a new workspace directory, default to current" msgstr "新規作業コピーディレクトリを作成" -#: commands.cc:3793 +#: commands.cc:3822 #, c-format msgid "need --branch argument for setup" msgstr "作成には --branch 引数が必要です" -#: commands.cc:3802 +#: commands.cc:3836 msgid "automation" msgstr "自動化" -#: commands.cc:3803 +#: commands.cc:3837 #, fuzzy msgid "" "interface_version\n" @@ -1780,9 +1312,13 @@ "stdio\n" "certs REV\n" "select SELECTOR\n" -"get_file ID\n" -"get_manifest [ID]\n" -"get_revision [ID]\n" +"get_file FILEID\n" +"get_manifest_of [REVID]\n" +"get_revision [REVID]\n" +"packet_for_rdata REVID\n" +"packets_for_certs REVID\n" +"packet_for_fdata FILEID\n" +"packet_for_fdelta OLD_FILE NEW_FILE\n" "keys\n" msgstr "" "interface_version\n" @@ -1805,397 +1341,430 @@ "get_manifest [ID]\n" "get_revision [ID]\n" -#: commands.cc:3823 +#: commands.cc:3861 msgid "automation interface" msgstr "自動化インターフェース" -#: commands.cc:3837 commands.cc:3853 +#: commands.cc:3875 commands.cc:3891 msgid "vars" msgstr "変数" -#: commands.cc:3837 +#: commands.cc:3875 msgid "DOMAIN NAME VALUE" msgstr "DOMAIN NAME VALUE" -#: commands.cc:3838 +#: commands.cc:3876 msgid "set the database variable NAME to VALUE, in domain DOMAIN" msgstr "ドメイン DOMAIN のデータベース変数 NAME を VALUE に設定" -#: commands.cc:3853 +#: commands.cc:3891 msgid "DOMAIN NAME" msgstr "DOMAIN NAME" -#: commands.cc:3854 +#: commands.cc:3892 msgid "remove the database variable NAME in domain DOMAIN" msgstr "ドメイン DOMAIN のデータベース変数 NAME を消去" -#: commands.cc:3865 +#: commands.cc:3903 #, c-format msgid "no var with name %s in domain %s" msgstr "%s という変数はドメイン %s 内にはありません" -#: database_check.cc:109 -#, c-format -msgid "checking %d files\n" -msgstr "%d 個のファイルを検証中\n" +#: commands.cc:3907 +#, fuzzy +msgid "REVID" +msgstr "REVISION" -#: database_check.cc:111 -msgid "files" -msgstr "ファイル" +#: commands.cc:3908 +msgid "dump the roster associated with the given REVID" +msgstr "" -#: database_check.cc:116 -#, c-format -msgid "checking file %s\n" -msgstr "ファイル %s を検証中\n" +#: commands.cc:3926 +msgid "REV REV" +msgstr "" -#: database_check.cc:134 -#, c-format -msgid "checking %d manifests\n" -msgstr "%d 個のマニフェストを検証中\n" +#: commands.cc:3926 +msgid "" +"Show what conflicts would need to be resolved to merge the given revisions." +msgstr "" -#: database_check.cc:136 rcs_import.cc:1258 -msgid "manifests" -msgstr "マニフェスト" +#: commands.cc:3935 commands.cc:3937 +#, fuzzy, c-format +msgid "%s in an ancestor of %s; no merge is needed." +msgstr "%s は %s の祖先ではありません" -#: database_check.cc:141 +#: commands.cc:3951 #, c-format -msgid "checking manifest %s\n" -msgstr "マニフェスト %s を検証中\n" +msgid "There are %s node_name_conflicts." +msgstr "" -#: database_check.cc:153 +#: commands.cc:3952 #, c-format -msgid "error parsing manifest %s: %s" -msgstr "マニフェスト %s: %s を解析中にエラー" +msgid "There are %s file_content_conflicts." +msgstr "" -#: database_check.cc:190 +#: commands.cc:3953 #, c-format -msgid "checking %d revisions\n" -msgstr "%d 個のリビジョンを検証中\n" +msgid "There are %s node_attr_conflicts." +msgstr "" -#: database_check.cc:192 database_check.cc:380 netsync.cc:3497 -#: rcs_import.cc:1257 -msgid "revisions" -msgstr "リビジョン" - -#: database_check.cc:197 +#: commands.cc:3954 #, c-format -msgid "checking revision %s\n" -msgstr "リビジョン %s を検証中\n" +msgid "There are %s orphaned_node_conflicts." +msgstr "" -#: database_check.cc:209 +#: commands.cc:3955 #, c-format -msgid "error parsing revision %s: %s" -msgstr "リビジョン %s: %s を解析中にエラー" +msgid "There are %s rename_target_conflicts." +msgstr "" -#: database_check.cc:277 +#: commands.cc:3956 #, c-format -msgid "checked %d revisions after starting with %d\n" -msgstr "%d 個のリビジョンを %d からはじめて検証しました\n" +msgid "There are %s directory_loop_conflicts." +msgstr "" -#: database_check.cc:289 -#, c-format -msgid "checking %d ancestry edges\n" -msgstr "%d 個の祖先の端を検証中\n" +#: database_check.cc:125 +msgid "files" +msgstr "ファイル" -#: database_check.cc:291 +#: database_check.cc:154 +msgid "rosters" +msgstr "" + +#: database_check.cc:221 +msgid "markings" +msgstr "" + +#: database_check.cc:319 database_check.cc:507 netsync.cc:2760 +#: rcs_import.cc:1226 +msgid "revisions" +msgstr "リビジョン" + +#: database_check.cc:418 msgid "ancestry" msgstr "祖先" -#: database_check.cc:322 -#, c-format -msgid "checking %d public keys\n" -msgstr "%d 個の公開鍵を検証中\n" - -#: database_check.cc:324 netsync.cc:3501 +#: database_check.cc:451 netsync.cc:2764 msgid "keys" msgstr "鍵" -#: database_check.cc:348 -#, c-format -msgid "checking %d revision certs\n" -msgstr "%d 個のリビジョン証明を検証中\n" - -#: database_check.cc:350 netsync.cc:3499 +#: database_check.cc:477 msgid "certs" msgstr "証明" -#: database_check.cc:378 +#: database_check.cc:543 #, c-format -msgid "checking local history of %d revisions\n" -msgstr "%d 個のリビジョンのローカルの履歴を検証中\n" - -#: database_check.cc:413 -#, c-format msgid "file %s missing (%d manifest references)\n" msgstr "ファイル %s がありません (マニフェスト参照: %d)\n" -#: database_check.cc:420 +#: database_check.cc:550 #, c-format msgid "file %s unreferenced\n" msgstr "ファイル %s は参照されていません\n" -#: database_check.cc:442 -#, c-format -msgid "manifest %s missing (%d revision references)\n" -msgstr "マニフェスト %s がありません (リビジョン参照: %d)\n" +#: database_check.cc:571 +#, fuzzy, c-format +msgid "roster %s unreferenced\n" +msgstr "ファイル %s は参照されていません\n" -#: database_check.cc:449 -#, c-format -msgid "manifest %s unreferenced\n" -msgstr "マニフェスト %s は参照されていません\n" +#: database_check.cc:577 +#, fuzzy, c-format +msgid "roster %s incomplete (%d missing files)\n" +msgstr "マニフェスト %s は不完全です (みつからないファイル: %d)\n" -#: database_check.cc:455 -#, c-format -msgid "manifest %s incomplete (%d missing files)\n" -msgstr "マニフェスト %s は不完全です (みつからないファイル: %d)\n" +#: database_check.cc:584 +#, fuzzy, c-format +msgid "roster %s incomplete (%d missing revisions)\n" +msgstr "リビジョン %s は不完全です (みつからないリビジョン: %d)\n" -#: database_check.cc:462 -#, c-format -msgid "manifest %s is not parseable (perhaps with unnormalized paths?)\n" -msgstr "マニフェスト %s を解析できません (パスが正規化されていないのでは?)\n" +#: database_check.cc:591 +#, fuzzy, c-format +msgid "roster %s is not parseable (perhaps with unnormalized paths?)\n" +msgstr "リビジョン %s を解析できません (パスが正規化されていないのでは?)\n" -#: database_check.cc:469 -#, c-format -msgid "manifest %s is not in normalized form\n" +#: database_check.cc:598 +#, fuzzy, c-format +msgid "roster %s is not in normalized form\n" msgstr "マニフェスト %s は正規化された形式になっていません\n" -#: database_check.cc:493 -#, c-format -msgid "revision %s missing (%d revision references; %d cert references)\n" +#: database_check.cc:623 +#, fuzzy, c-format +msgid "" +"revision %s missing (%d revision references; %d cert references; %d parent " +"references; %d child references; %d roster references)\n" msgstr "リビジョン %s がありません (リビジョン参照: %d, 証明参照: %d)\n" -#: database_check.cc:500 +#: database_check.cc:631 #, c-format msgid "revision %s incomplete (%d missing manifests)\n" msgstr "リビジョン %s は不完全です (みつからないマニフェスト: %d)\n" -#: database_check.cc:507 +#: database_check.cc:638 #, c-format msgid "revision %s incomplete (%d missing revisions)\n" msgstr "リビジョン %s は不完全です (みつからないリビジョン: %d)\n" -#: database_check.cc:514 -#, c-format -msgid "revision %s incomplete (%d incomplete manifests)\n" +#: database_check.cc:645 +#, fuzzy, c-format +msgid "revision %s incomplete (missing roster link)\n" +msgstr "リビジョン %s は不完全です (みつからないリビジョン: %d)\n" + +#: database_check.cc:651 +#, fuzzy, c-format +msgid "revision %s incomplete (missing roster)\n" +msgstr "リビジョン %s は不完全です (みつからないリビジョン: %d)\n" + +#: database_check.cc:657 +#, fuzzy, c-format +msgid "revision %s mismatched roster and manifest\n" +msgstr "リビジョン %s は不完全です (みつからないマニフェスト: %d)\n" + +#: database_check.cc:663 +#, fuzzy, c-format +msgid "revision %s incomplete (incomplete roster)\n" msgstr "リビジョン %s は不完全です (不完全なマニフェスト: %d)\n" -#: database_check.cc:521 +#: database_check.cc:669 #, c-format msgid "" "revision %s mismatched parents (%d ancestry parents; %d revision refs)\n" msgstr "リビジョン %s は親と不一致です (親: %d; リビジョン参照: %d)\n" -#: database_check.cc:530 +#: database_check.cc:678 #, c-format msgid "revision %s mismatched children (%d ancestry children; %d parents)\n" msgstr "リビジョン %s は子と不一致です (子: %d; 親: %d)\n" -#: database_check.cc:542 +#: database_check.cc:690 #, c-format msgid "revision %s has bad history (%s)\n" msgstr "リビジョン %s は不正な履歴 (%s) を持っています\n" -#: database_check.cc:549 +#: database_check.cc:697 #, c-format msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n" msgstr "リビジョン %s を解析できません (パスが正規化されていないのでは?)\n" -#: database_check.cc:556 +#: database_check.cc:704 #, c-format msgid "revision %s is not in normalized form\n" msgstr "リビジョン %s は正規化された形式ではありません\n" -#: database_check.cc:573 +#: database_check.cc:728 #, c-format -msgid "key %s signed %d certs\n" -msgstr "鍵 %s は %d 個の証明の署名に使われています\n" - -#: database_check.cc:580 -#, c-format msgid "key %s missing (signed %d certs)\n" msgstr "鍵 %s がありません (%d 個の証明を署名)\n" -#: database_check.cc:613 +#: database_check.cc:761 #, c-format msgid "revision %s unchecked signature in %s cert from missing key %s\n" msgstr "" "リビジョン %s の %s 証明(失われた鍵 %s) の署名は検証されたものではありませ" "ん\n" -#: database_check.cc:621 +#: database_check.cc:769 #, c-format msgid "revision %s bad signature in %s cert from key %s\n" msgstr "リビジョン %s の %s 証明 (鍵 %s) の不正な署名を無視します\n" -#: database_check.cc:636 +#: database_check.cc:784 #, c-format msgid "revision %s missing %s cert\n" msgstr "リビジョン %s は %s 証明を欠いています\n" -#: database_check.cc:645 +#: database_check.cc:793 #, c-format msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)\n" msgstr "リビジョン %s は証明に合致しません (%d 作者 %d 日時 %d 変更ログ)\n" -#: database_check.cc:717 +#: database_check.cc:874 #, c-format msgid "%d missing files\n" msgstr "みつからないファイル: %d\n" -#: database_check.cc:719 +#: database_check.cc:876 #, c-format msgid "%d unreferenced files\n" msgstr "参照されていないファイル: %d\n" -#: database_check.cc:722 -#, c-format -msgid "%d missing manifests\n" -msgstr "みつからないマニフェスト: %d\n" +#: database_check.cc:879 +#, fuzzy, c-format +msgid "%d unreferenced rosters\n" +msgstr "参照されていないファイル: %d\n" -#: database_check.cc:724 -#, c-format -msgid "%d unreferenced manifests\n" -msgstr "参照されていないマニフェスト: %d\n" - -#: database_check.cc:726 -#, c-format -msgid "%d incomplete manifests\n" +#: database_check.cc:881 +#, fuzzy, c-format +msgid "%d incomplete rosters\n" msgstr "不完全なマニフェスト: %d\n" -#: database_check.cc:728 -#, c-format -msgid "%d manifests not parseable (perhaps with invalid paths)\n" -msgstr "解析できないマニフェスト(不適切なパスを指定していませんか?): %d\n" +#: database_check.cc:883 +#, fuzzy, c-format +msgid "%d rosters not parseable (perhaps with invalid paths)\n" +msgstr "解析できないリビジョン (パスが不適切なのでは?): %d\n" -#: database_check.cc:731 -#, c-format -msgid "%d manifests not in normalized form\n" -msgstr "正規化された形式になっていないマニフェスト: %d\n" +#: database_check.cc:886 +#, fuzzy, c-format +msgid "%d rosters not in normalized form\n" +msgstr "正規化された形式になっていないリビジョン: %d\n" -#: database_check.cc:734 +#: database_check.cc:889 #, c-format msgid "%d missing revisions\n" msgstr "みつからないリビジョン: %d\n" -#: database_check.cc:736 +#: database_check.cc:891 #, c-format msgid "%d incomplete revisions\n" msgstr "不完全なリビジョン: %d\n" -#: database_check.cc:738 +#: database_check.cc:893 #, c-format msgid "%d mismatched parents\n" msgstr "一致しない親: %d\n" -#: database_check.cc:740 +#: database_check.cc:895 #, c-format msgid "%d mismatched children\n" msgstr "一致しない子: %d\n" -#: database_check.cc:742 +#: database_check.cc:897 #, c-format msgid "%d revisions with bad history\n" msgstr "不正な履歴を持つリビジョン: %d\n" -#: database_check.cc:744 +#: database_check.cc:899 #, c-format msgid "%d revisions not parseable (perhaps with invalid paths)\n" msgstr "解析できないリビジョン (パスが不適切なのでは?): %d\n" -#: database_check.cc:747 +#: database_check.cc:902 #, c-format msgid "%d revisions not in normalized form\n" msgstr "正規化された形式になっていないリビジョン: %d\n" -#: database_check.cc:750 +#: database_check.cc:906 +#, fuzzy, c-format +msgid "%d unreferenced roster links\n" +msgstr "参照されていないファイル: %d\n" + +#: database_check.cc:909 +#, fuzzy, c-format +msgid "%d missing rosters\n" +msgstr "みつからない証明: %d\n" + +#: database_check.cc:913 #, c-format msgid "%d missing keys\n" msgstr "みつからない鍵: %d\n" -#: database_check.cc:753 +#: database_check.cc:916 #, c-format msgid "%d missing certs\n" msgstr "みつからない証明: %d\n" -#: database_check.cc:755 +#: database_check.cc:918 #, c-format msgid "%d mismatched certs\n" msgstr "一致しない証明: %d\n" -#: database_check.cc:757 +#: database_check.cc:920 #, c-format msgid "%d unchecked signatures due to missing keys\n" msgstr "鍵がみつからないために検証されていない署名: %d\n" -#: database_check.cc:759 +#: database_check.cc:922 #, c-format msgid "%d bad signatures\n" msgstr "不正な署名: %d\n" -#: database_check.cc:784 -#, c-format -msgid "" -"check complete: %d files; %d manifests; %d revisions; %d keys; %d certs\n" +#: database_check.cc:948 +#, fuzzy, c-format +msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs\n" msgstr "" "検証完了: %d ファイル; %d マニフェスト; %d リビジョン; %d 鍵; %d 証明\n" -#: database_check.cc:790 +#: database_check.cc:954 #, c-format msgid "total problems detected: %d (%d serious)\n" msgstr "検出した障害総計: %d (深刻: %d)\n" -#: database_check.cc:792 +#: database_check.cc:956 #, c-format msgid "serious problems detected" msgstr "深刻な問題を検出しました" -#: database_check.cc:794 +#: database_check.cc:958 #, c-format msgid "minor problems detected\n" msgstr "軽微な問題を検出しました\n" -#: database_check.cc:796 +#: database_check.cc:960 #, c-format msgid "database is good\n" msgstr "データベースは正常です\n" -#: database.cc:86 +#: database.cc:141 #, 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" +"try '%s db migrate' to upgrade\n" "(this is irreversible; you may want to make a backup copy first)" msgstr "" -#: database.cc:147 +#: database.cc:165 #, c-format +msgid "" +"database %s contains revisions but no rosters\n" +"if you are a project leader or doing local testing:\n" +" see the file UPGRADE for instructions on upgrading.\n" +"if you are not a project leader:\n" +" wait for a leader to migrate project data, and then\n" +" pull into a fresh database.\n" +"sorry about the inconvenience." +msgstr "" + +#: database.cc:184 +#, c-format +msgid "" +"database %s contains manifests but no revisions\n" +"this is a very old database; it needs to be upgraded\n" +"please see README.changesets for details" +msgstr "" + +#: database.cc:220 +#, c-format msgid "unable to probe database version in file %s" msgstr "ファイル %s 内のデータベースバージョンを検出できませんでした" -#: database.cc:154 +#: database.cc:227 #, c-format msgid "database %s is not an sqlite version 3 file, try dump and reload" msgstr "" "データベース %s は SQLite ver. 3 のファイルではありません。ダンプした後再度読" "み込んでみて下さい" -#: database.cc:176 database.cc:187 -#, c-format -msgid "sqlite error: %d: %s" -msgstr "SQLite エラー: %d: %s" - -#: database.cc:181 -msgid "make sure database and containing directory are writeable" +#: database.cc:254 +#, fuzzy +msgid "" +"make sure database and containing directory are writeable\n" +"and you have not run out of disk space" msgstr "" "データベースとそれを含むディレクトリが書き込み可能であるか確認して下さい" -#: database.cc:226 +#: database.cc:260 +#, fuzzy, c-format +msgid "" +"sqlite error: %d: %s\n" +"%s" +msgstr "SQLite エラー: %d: %s" + +#: database.cc:306 #, c-format msgid "could not initialize database: %s: already exists" msgstr "データベースを初期化できませんでした: %s: 既に存在しています" -#: database.cc:231 +#: database.cc:311 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -2206,26 +1775,26 @@ "じ幹を持っています\n" "データベース作成を中止します" -#: database.cc:353 +#: database.cc:454 #, c-format msgid "cannot create %s; it already exists" msgstr "%s を作成できません; 既に存在しています" -#: database.cc:417 -#, c-format +#: database.cc:514 +#, fuzzy, c-format msgid "" "schema version : %s\n" "counts:\n" -" full manifests : %u\n" -" manifest deltas : %u\n" +" full rosters : %u\n" +" roster 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 rosters : %u\n" +" roster deltas : %u\n" " full files : %u\n" " file deltas : %u\n" " revisions : %u\n" @@ -2252,258 +1821,73 @@ " 証明 : %u\n" " 総計 : %u\n" -#: database.cc:471 +#: database.cc:569 #, c-format msgid "database schema version: %s" msgstr "基準スキーマバージョン: %s" -#: database.cc:490 -msgid "mcerts" -msgstr "mcerts" - -#: database.cc:491 -msgid "pubkeys" -msgstr "公開鍵" - -#: database.cc:492 -msgid "privkeys" -msgstr "秘密鍵" - -#: database.cc:536 +#: database.cc:646 #, c-format -msgid "statement cache statistics\n" -msgstr "ステートメントキャッシュ統計\n" - -#: database.cc:537 -#, c-format -msgid "prepared %d statements\n" -msgstr "%d 個のプリペアードステートメント\n" - -#: database.cc:541 -#, c-format -msgid "%d executions of %s\n" -msgstr "%d 実行 (%s)\n" - -#: database.cc:594 -#, c-format -msgid "prepared statement %s\n" -msgstr "プリペアードステートメント %s\n" - -#: database.cc:598 -#, c-format msgid "multiple statements in query: %s\n" msgstr "クエリ中に複数のステートメント: %s\n" -#: database.cc:604 +#: database.cc:652 #, c-format msgid "wanted %d columns got %d in query: %s\n" msgstr "クエリで %d 列要求しましたが得たのは %d 列です: %s\n" -#: database.cc:610 +#: database.cc:711 #, c-format -msgid "binding %d parameters for %s\n" -msgstr "%d 変数を %s にバインド\n" - -#: database.cc:624 -#, c-format -msgid "binding %d with value '%s'\n" -msgstr "%d を値 '%s' にバインド\n" - -#: database.cc:640 -#, c-format msgid "null result in query: %s\n" msgstr "クエリ中に結果 null が含まれています: %s\n" -#: database.cc:658 +#: database.cc:729 #, c-format msgid "wanted %d rows got %s in query: %s\n" msgstr "クエリで %d 行要求しましたが得たのは %s です: %s\n" -#: database.cc:668 +#: database.cc:1728 #, c-format -msgid "cannot change filename to %s while db is open" -msgstr "データベースが使用中なのでファイル名を %s に変更することができません" - -#: 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:902 -#, c-format -msgid "version cache hit on %s\n" -msgstr "バージョンキャッシュヒット: %s\n" - -#: database.cc:971 -#, c-format -msgid "reconstructing %s in %s\n" -msgstr "%s (%s 内)を再構築中\n" - -#: database.cc:1077 -#, c-format -msgid "following delta %s -> %s\n" -msgstr "続く差分 %s -> %s\n" - -#: database.cc:1499 -#, c-format -msgid "Killing revision %s locally\n" -msgstr "ローカルにリビジョン %s を削除\n" - -#: database.cc:1511 -#, c-format -msgid "Deleting all references to branch %s\n" -msgstr "ブランチ %s へのすべての参照を削除\n" - -#: database.cc:1524 -#, c-format -msgid "Deleting all references to tag %s\n" -msgstr "タグ %s へのすべてのリファレンスを削除\n" - -#: database.cc:1625 -#, c-format msgid "another key with name '%s' already exists" msgstr "'%s' という名前の他の鍵が既に存在しています" -#: 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 +#: database.cc:2784 #, 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:2521 +#: database.cc:2792 #, c-format msgid "database %s does not exist" msgstr "データベース %s は存在しません" -#: database.cc:2522 +#: database.cc:2793 #, c-format msgid "%s is a directory, not a database" msgstr "%s はデータベースではなくディレクトリです" -#: database.cc:2547 +#: database.cc:2818 #, 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 "" +#: diff_patch.cc:588 +#, fuzzy, c-format +msgid "file '%s' does not exist in workspace" +msgstr "ファイル '%s' は作業コピー中にはありません" -#: database.cc:2601 -#, c-format -msgid "exec_err = %d, close_err = %d" -msgstr "" +#: diff_patch.cc:589 +#, fuzzy, c-format +msgid "'%s' in workspace is a directory, not a file" +msgstr "作業コピー内の '%s' はファイルではなくディレクトリです" -#: diff_patch.cc:209 -#, c-format -msgid "exchanging preserved extent [%d+%d] with changed extent [%d+%d]\n" -msgstr "" -"前に確保したエクステント [%d+%d] を変更されたエクステント [%d+%d] に置き換え" -"ています\n" +#: diff_patch.cc:593 +#, fuzzy, c-format +msgid "file %s in workspace has id %s, wanted %s" +msgstr "作業コピー内のファイル %s の ID は %s ですが、欲しいのは %s です" -#: diff_patch.cc:300 +#: diff_patch.cc:714 #, c-format -msgid "conflicting edits: %s %d[%d] '%s' vs. %s %d[%d] '%s'\n" -msgstr "競合する編集箇所: %s %d[%d] '%s' 対 %s %d[%d] '%s'\n" - -#: diff_patch.cc:328 -#, c-format -msgid "conflicting edits: [%s %d %d] vs. [%s %d %d]\n" -msgstr "競合する編集箇所: [%s %d %d] 対 [%s %d %d]\n" - -#: diff_patch.cc:376 -#, c-format -msgid "calculating left edit script on %d -> %d lines\n" -msgstr "%d -> %d 行について左側を編集するスクリプトを計算中\n" - -#: diff_patch.cc:384 -#, c-format -msgid "calculating right edit script on %d -> %d lines\n" -msgstr "%d -> %d 行について右側を編集するスクリプトを計算中\n" - -#: diff_patch.cc:392 -#, c-format -msgid "calculating left extents on %d edits\n" -msgstr "%d 編集箇所について左エクステントを計算中\n" - -#: diff_patch.cc:397 -#, c-format -msgid "calculating right extents on %d edits\n" -msgstr "%d 編集箇所について右エクステントを計算中\n" - -#: diff_patch.cc:402 -#, c-format -msgid "normalizing %d right extents\n" -msgstr "%d 右エクステントを正規化\n" - -#: diff_patch.cc:405 -#, c-format -msgid "normalizing %d left extents\n" -msgstr "%d 左エクステントを正規化\n" - -#: diff_patch.cc:411 -#, c-format -msgid "conflicting prefixes\n" -msgstr "競合するプレフィクス\n" - -#: diff_patch.cc:417 -#, c-format -msgid "conflicting suffixes\n" -msgstr "競合するサフィックス\n" - -#: diff_patch.cc:421 -#, c-format -msgid "merging %d left, %d right extents\n" -msgstr "%d 左, %d 右エクステントを統合\n" - -#: diff_patch.cc:452 -#, c-format -msgid "conflict detected. no merge.\n" -msgstr "競合を検出、統合しません\n" - -#: diff_patch.cc:472 -#, c-format -msgid "recording successful merge of %s <-> %s into %s\n" -msgstr "%s <-> %s から %s への成功した統合を記録\n" - -#: diff_patch.cc:530 -#, c-format -msgid "trying to merge %s <-> %s (ancestor: %s)\n" -msgstr "%s <-> %s (祖先: %s) の統合を試しています\n" - -#: diff_patch.cc:535 diff_patch.cc:640 -#, c-format -msgid "files are identical\n" -msgstr "ファイルは全く同じです\n" - -#: diff_patch.cc:577 -#, c-format -msgid "internal 3-way merged ok\n" -msgstr "内部三元統合完了\n" - -#: diff_patch.cc:591 -#, c-format msgid "" "help required for 3-way merge\n" "[ancestor] %s\n" @@ -2517,54 +1901,6 @@ "[ 右] %s\n" "[統合済] %s\n" -#: diff_patch.cc:608 -#, c-format -msgid "lua merge3 hook merged ok\n" -msgstr "lua merge3 フック統合完了\n" - -#: diff_patch.cc:635 -#, c-format -msgid "trying to merge %s <-> %s\n" -msgstr "%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 "" -"二元統合には手助けが必要です\n" -"[ 左] %s\n" -"[ 右] %s\n" -"[統合済] %s\n" - -#: diff_patch.cc:665 -#, c-format -msgid "lua merge2 hook merged ok\n" -msgstr "lua merge2 フック統合完了\n" - -#: diff_patch.cc:696 -#, c-format -msgid "temporarily recording merge of %s <-> %s into %s\n" -msgstr "一時的に %s <-> %s から %s への統合を記録\n" - -#: diff_patch.cc:713 -#, c-format -msgid "file '%s' does not exist in working copy" -msgstr "ファイル '%s' は作業コピー中にはありません" - -#: diff_patch.cc:714 -#, c-format -msgid "'%s' in working copy is a directory, not a file" -msgstr "作業コピー内の '%s' はファイルではなくディレクトリです" - -#: diff_patch.cc:718 -#, c-format -msgid "file %s in working copy has id %s, wanted %s" -msgstr "作業コピー内のファイル %s の ID は %s ですが、欲しいのは %s です" - #: file_io.cc:116 #, c-format msgid "expected file '%s', but it is a directory." @@ -2598,301 +1934,195 @@ msgid "failed to create directory '%s' for '%s'" msgstr "ディレクトリ '%s' ('%s' のための)の作成に失敗しました" -#: file_io.cc:213 +#: file_io.cc:219 +#, fuzzy, c-format +msgid "" +"could not remove '%s'\n" +"%s" +msgstr "" +"ディレクトリ '%s' を作成できませんでした\n" +"%s" + +#: file_io.cc:229 #, c-format msgid "file to delete '%s' does not exist" msgstr "削除するファイル '%s' は存在しません" -#: file_io.cc:214 +#: file_io.cc:230 #, c-format msgid "file to delete, '%s', is not a file but a directory" msgstr "削除するファイル '%s' はファイルでなく、ディレクトリです" -#: file_io.cc:222 +#: file_io.cc:238 +#, fuzzy, c-format +msgid "directory to delete '%s' does not exist" +msgstr "削除するディレクトリ '%s' は存在しません" + +#: file_io.cc:239 +#, fuzzy, c-format +msgid "directory to delete, '%s', is not a directory but a file" +msgstr "削除するディレクトリ '%s' はファイルです" + +#: file_io.cc:246 +#, fuzzy, c-format +msgid "object to delete, '%s', does not exist" +msgstr "削除するディレクトリ '%s' は存在しません" + +#: file_io.cc:254 #, c-format msgid "directory to delete, '%s', does not exist" msgstr "削除するディレクトリ '%s' は存在しません" -#: file_io.cc:223 +#: file_io.cc:255 #, c-format msgid "directory to delete, '%s', is a file" msgstr "削除するディレクトリ '%s' はファイルです" -#: file_io.cc:232 +#: file_io.cc:264 #, c-format msgid "rename source file '%s' does not exist" msgstr "名称変更する元のファイル '%s' は存在しません" -#: file_io.cc:233 +#: file_io.cc:265 #, c-format msgid "rename source file '%s' is a directory -- bug in monotone?" msgstr "名称変更元のファイル '%s' はディレクトリです -- monotone のバグ?" -#: file_io.cc:236 file_io.cc:249 +#: file_io.cc:268 file_io.cc:281 #, c-format msgid "rename target '%s' already exists" msgstr "名称変更ターゲット '%s' は既に存在しています" -#: file_io.cc:245 +#: file_io.cc:277 #, c-format msgid "rename source dir '%s' does not exist" msgstr "名称変更元のディレクトリ '%s' は存在しません" -#: file_io.cc:246 +#: file_io.cc:278 #, c-format msgid "rename source dir '%s' is a file -- bug in monotone?" msgstr "名称変更元のディレクトリ '%s' はファイルです -- monotone のバグ?" -#: file_io.cc:260 +#: file_io.cc:292 #, c-format msgid "rename source path '%s' does not exist" msgstr "名称変更元のパス '%s' は存在しません" -#: file_io.cc:275 +#: file_io.cc:307 #, c-format msgid "file %s does not exist" msgstr "ファイル %s は存在しません" -#: file_io.cc:276 +#: file_io.cc:308 #, c-format msgid "file %s cannot be read as data; it is a directory" msgstr "'%s' は期待していたファイルではなく、ディレクトリです" -#: file_io.cc:280 +#: file_io.cc:312 #, c-format msgid "cannot open file %s for reading" msgstr "ファイル %s を読み込みのために開くことができません" -#: file_io.cc:347 +#: file_io.cc:381 #, c-format msgid "Cannot read standard input multiple times" msgstr "標準入力を何度も読み込むことはできません" -#: file_io.cc:378 +#: file_io.cc:412 #, c-format msgid "file '%s' cannot be overwritten as data; it is a directory" msgstr "'%s' にデータを上書きできません。ディレクトリです" -#: file_io.cc:386 +#: file_io.cc:420 #, c-format msgid "cannot open file %s for writing" msgstr "ファイル %s を書き込みのために開くことができません" -#: file_io.cc:477 +#: file_io.cc:530 #, c-format -msgid "ignoring book keeping entry %s\n" -msgstr "記録簿用エントリ %s を無視します\n" - -#: file_io.cc:497 -#, c-format msgid "caught runtime error %s constructing file path for %s\n" msgstr "%s についてファイルパス作成中に実行時エラー %s 発生\n" -#: file_io.cc:521 +#: file_io.cc:569 #, c-format msgid "no such file or directory: '%s'" msgstr "そのようなファイルまたはディレクトリはありません: '%s'" -#: keys.cc:42 +#: keys.cc:77 #, c-format -msgid "running arc4 process on %d bytes of data\n" -msgstr "データ %d バイト目について arc4 プロセスを実行中\n" - -#: keys.cc:76 -#, c-format msgid "got empty passphrase from get_passphrase() hook" msgstr "get_passphrase() フックは空のパスフレーズを返しました" -#: keys.cc:92 +#: keys.cc:93 #, c-format msgid "empty passphrase not allowed" msgstr "パスフレーズは空にできません" -#: keys.cc:99 +#: keys.cc:100 #, c-format msgid "confirm passphrase for key ID [%s]: " msgstr "鍵 ID [%s] のパスフレーズを確認: " -#: keys.cc:104 +#: keys.cc:105 #, c-format msgid "empty passphrases not allowed, try again\n" msgstr "パスフレーズは空にできません. 再度試して下さい\n" -#: keys.cc:105 keys.cc:112 +#: keys.cc:106 keys.cc:113 #, c-format msgid "too many failed passphrases\n" msgstr "パスフレーズの入力ミスが多すぎます\n" -#: keys.cc:111 +#: keys.cc:112 #, c-format msgid "passphrases do not match, try again\n" msgstr "パスフレーズが一致しません。再度試して下さい\n" -#: keys.cc:118 +#: keys.cc:119 #, c-format msgid "no passphrase given" msgstr "パスフレーズを指定して下さい" -#: keys.cc:177 -#, c-format -msgid "" -"generated %d-byte public key\n" -"generated %d-byte (encrypted) private key\n" -msgstr "" -"%d バイトの公開鍵を生成\n" -"%d バイトの(暗号化された)秘密鍵を生成\n" - -#: keys.cc:194 -#, c-format -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:244 -#, fuzzy, c-format -msgid "base64-decoding %d-byte old private key\n" -msgstr "%d バイト秘密鍵の base64 デコード\n" - -#: 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:383 -#, c-format -msgid "building verifier for %d-byte pub key\n" -msgstr "%d バイトの公開鍵について識別子を構築中\n" - -#: keys.cc:405 -#, c-format -msgid "checking %d-byte (%d decoded) signature\n" -msgstr "%d バイト (%d デコード)の署名を検証中\n" - -#: 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:119 -#, c-format -msgid "lua failure: %s; stack = %s\n" -msgstr "lua 失敗: %s; スタック = %s\n" - -#: lua.cc:126 +#: lua.cc:539 lua.cc:568 lua.cc:583 #, fuzzy, c-format -msgid "Lua::ok(): failed" -msgstr "Lua::ok(): 失敗 = %i" - -#: lua.cc:135 -#, c-format -msgid "lua stack: %s" -msgstr "lua スタック: %s" - -#: lua.cc:215 -#, c-format -msgid "lua: extracted string = %s" -msgstr "lua: 抽出文字列 = %s" - -#: lua.cc:228 -#, c-format -msgid "lua: extracted int = %i" -msgstr "lua: 抽出 int = %i" - -#: lua.cc:241 -#, c-format -msgid "lua: extracted double = %i" -msgstr "lua: 抽出 double = %i" - -#: lua.cc:255 -#, c-format -msgid "lua: extracted bool = %i" -msgstr "lua: 抽出 bool = %i" - -#: lua.cc:375 -#, c-format -msgid "loading lua hook %s" -msgstr "lua フック %s を読み込み中" - -#: lua.cc:538 lua.cc:567 lua.cc:582 -#, fuzzy, c-format msgid "%s called with an invalid parameter" msgstr "Include 呼出し時の変数が不適切です" -#: lua.cc:585 +#: lua.cc:586 #, c-format msgid "Directory '%s' does not exists" msgstr "ディレクトリ '%s' は存在しません" -#: lua.cc:586 rcs_import.cc:1248 +#: lua.cc:587 rcs_import.cc:1217 work.cc:420 #, c-format msgid "'%s' is not a directory" msgstr "'%s' はディレクトリではありません" -#: lua.cc:605 lua.cc:900 +#: lua.cc:606 lua.cc:908 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "初期化ファイル '%s' を読み込み中に lua のエラー" -#: lua.cc:897 lua.cc:910 +#: lua.cc:705 #, c-format -msgid "opening rcfile '%s' ...\n" -msgstr "初期化ファイル '%s' を開いています...\n" +msgid "bad input to parse_basic_io" +msgstr "" -#: lua.cc:901 lua.cc:913 +#: lua.cc:920 #, c-format -msgid "'%s' is ok\n" -msgstr "'%s' OK\n" - -#: lua.cc:912 -#, c-format msgid "lua error while loading '%s'" msgstr "lua '%s' を読み込み中にエラー" -#: lua.cc:917 +#: lua.cc:925 #, c-format msgid "rcfile '%s' does not exist" msgstr "初期化ファイル '%s' は存在しません" -#: lua.cc:918 -#, c-format -msgid "skipping nonexistent rcfile '%s'\n" -msgstr "存在しない初期化ファイル '%s' をスキップ\n" - -#: lua.cc:1363 -#, c-format -msgid "calling attr_init_function for %s" -msgstr "%s について attr_init_function を呼出し" - -#: lua.cc:1367 -#, c-format -msgid " calling an attr_init_function for %s" -msgstr " %s について attr_init_function を呼出し" - -#: lua.cc:1380 -#, c-format -msgid " added attr %s = %s" -msgstr " 属性 %s = %s を追加" - -#: lua.cc:1384 -#, c-format -msgid " no attr added" -msgstr " 属性追加なし" - #: main.cc:325 #, fuzzy msgid "interrupted" @@ -2902,37 +2132,12 @@ msgid "terminated by signal" msgstr "" -#: manifest.cc:55 +#: merkle_tree.cc:276 #, c-format -msgid "scanning file %s\n" -msgstr "ファイル %s を走査中\n" - -#: manifest.cc:188 -#, c-format -msgid "missing %s" -msgstr "%s がみつかりません" - -#: 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 "" -"一貫性を保つために必要な\n" -"ファイルが %d 個みつかりません。各々のファイルについて\n" -"'monotone drop FILE' として恒久的にファイルを削除するか、\n" -"'monotone revert FILE' として復活させて下さい。\n" - -#: merkle_tree.cc:281 -#, c-format msgid "node level is %d, exceeds maximum %d" msgstr "ノードレベル %d は最大制限 %d を越えています" -#: merkle_tree.cc:317 +#: merkle_tree.cc:311 #, c-format msgid "mismatched node hash value %s, expected %s" msgstr "一致しないノードハッシュ値 %s、期待されるのは %s です" @@ -2966,189 +2171,195 @@ msgstr "降下するディレクトリの深さを制限" #: monotone.cc:58 -msgid "limit the log output to the given number of entries" +#, fuzzy +msgid "limit log output to the last number of entries" msgstr "ログ出力のエントリの数を制限" #: monotone.cc:59 +#, fuzzy +msgid "limit log output to the next number of entries" +msgstr "ログ出力のエントリの数を制限" + +#: monotone.cc:60 msgid "record process id of server" msgstr "サーバーのプロセス ID を記録" -#: monotone.cc:60 +#: monotone.cc:61 msgid "print a brief version of the normal output" msgstr "通常出力の簡単なバージョンを表示" -#: monotone.cc:61 +#: monotone.cc:62 msgid "print diffs along with logs" msgstr "ログと共に差分を表示" -#: monotone.cc:62 -msgid "skip merges when printing logs" +#: monotone.cc:63 +#, fuzzy +msgid "exclude merges when printing logs" msgstr "ログを表示する際に統合については省略" -#: monotone.cc:63 +#: monotone.cc:64 msgid "use the current arguments as the future default" msgstr "現在の引数を将来のデフォルトとして使用" -#: monotone.cc:64 +#: monotone.cc:65 msgid "leave out anything described by its argument" msgstr "引数によって説明されるすべてを省く" -#: monotone.cc:65 +#: monotone.cc:66 msgid "use unified diff format" msgstr "unified diff 形式を使用" -#: monotone.cc:66 +#: monotone.cc:67 msgid "use context diff format" msgstr "context diff 形式を使用" -#: monotone.cc:67 +#: monotone.cc:68 msgid "use external diff hook for generating diffs" msgstr "差分の生成に外部 diff フックを使用" -#: monotone.cc:68 +#: monotone.cc:69 msgid "argument to pass external diff hook" msgstr "外部 diff フックに渡す引数" -#: monotone.cc:69 +#: monotone.cc:70 msgid "use least common ancestor as ancestor for merge" msgstr "最も近い共通の祖先を統合の祖先として使用" -#: monotone.cc:70 +#: monotone.cc:71 msgid "perform the associated file operation" msgstr "関連付けられたファイル操作を実行" -#: monotone.cc:71 +#: monotone.cc:72 msgid "address:port to listen on (default :4691)" msgstr "" -#: monotone.cc:72 -msgid "perform the operations for files missing from working directory" +#: monotone.cc:73 +msgid "perform the operations for files missing from workspace" msgstr "" -#: monotone.cc:73 -msgid "perform the operations for unknown files from working directory" +#: monotone.cc:74 +msgid "perform the operations for unknown files from workspace" msgstr "" -#: monotone.cc:74 +#: monotone.cc:75 msgid "push the specified key even if it hasn't signed anything" msgstr "" -#: monotone.cc:83 +#: monotone.cc:76 +msgid "when rosterifying, drop attrs entries with the given key" +msgstr "" + +#: monotone.cc:77 +#, fuzzy +msgid "exclude files when printing logs" +msgstr "ログを表示する際に統合については省略" + +#: monotone.cc:78 +msgid "also operate on the contents of any listed directories" +msgstr "" + +#: monotone.cc:87 msgid "print debug log to stderr while running" msgstr "実行時、標準エラー出力にデバッグログを表示" -#: monotone.cc:84 +#: monotone.cc:88 msgid "file to dump debugging log to, on failure" msgstr "失敗時にデバッグログを出力するファイル" -#: monotone.cc:85 +#: monotone.cc:89 +#, fuzzy +msgid "file to write the log to" +msgstr "%s へのデバッグログの書き込みに失敗しました" + +#: monotone.cc:90 msgid "suppress log and progress messages" msgstr "ログおよび進捗を示すメッセージを表示しない" -#: monotone.cc:86 +#: monotone.cc:91 msgid "display help message" msgstr "ヘルプメッセージを表示" -#: monotone.cc:87 +#: monotone.cc:92 msgid "print version number, then exit" msgstr "バージョン番号を表示し、終了" -#: monotone.cc:88 +#: monotone.cc:93 msgid "print detailed version number, then exit" msgstr "詳細なバージョン番号を表示し、終了" -#: monotone.cc:89 +#: monotone.cc:94 msgid "insert command line arguments taken from the given file" msgstr "指定のファイルの内容をコマンド行引数に挿入" -#: monotone.cc:90 +#: monotone.cc:95 msgid "set ticker style (count|dot|none)" msgstr "ティッカーのスタイルを設定 (count|dot|none)" -#: monotone.cc:91 +#: monotone.cc:96 msgid "do not load standard lua hooks" msgstr "標準 lua フックを読み込まない" -#: monotone.cc:92 +#: monotone.cc:97 msgid "do not load ~/.monotone/monotonerc or MT/monotonerc lua files" msgstr "" "$HOME/.monotone/monotonerc または MT/monotonerc lua ファイルを読み込まない" -#: monotone.cc:93 +#: monotone.cc:98 msgid "load extra rc file" msgstr "別の初期化ファイルを読み込む" -#: monotone.cc:94 +#: monotone.cc:99 msgid "set key for signatures" msgstr "署名の鍵を設定" -#: monotone.cc:95 +#: monotone.cc:100 msgid "set name of database" msgstr "データベース名を設定" -#: monotone.cc:96 -msgid "limit search for working copy to specified root" +#: monotone.cc:101 +#, fuzzy +msgid "limit search for workspace to specified root" msgstr "作業コピーの検索を指定のルート下に制限" -#: monotone.cc:97 +#: monotone.cc:102 msgid "verbose completion output" msgstr "冗長な完了メッセージ" -#: monotone.cc:98 +#: monotone.cc:103 msgid "set location of key store" msgstr "" -#: monotone.cc:99 +#: monotone.cc:104 msgid "set location of configuration directory" msgstr "" -#: monotone.cc:203 +#: monotone.cc:208 #, c-format msgid "problem parsing arguments from file %s: %s" msgstr "ファイル %s からの引数を解析中に問題発生: %s" -#: monotone.cc:212 +#: monotone.cc:217 #, c-format msgid "weird error when stuffing arguments read from %s: %s\n" msgstr "%s から引数を読み取り中に予期せぬエラー発生: %s\n" -#: monotone.cc:261 -#, c-format -msgid "command line: %s\n" -msgstr "コマンド行: %s\n" - -#: monotone.cc:264 -#, c-format -msgid "set locale: LC_ALL=%s\n" -msgstr "ロカール設定: LC_ALL=%s\n" - -#: monotone.cc:292 +#: monotone.cc:299 msgid "[OPTION...] command [ARGS...]\n" msgstr "[OPTION...] command [ARGS...]\n" -#: monotone.cc:522 +#: monotone.cc:551 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "\"%s\" オプションの近くに構文エラー: %s" -#: monotone.cc:561 +#: monotone.cc:590 #, c-format msgid "monotone %s doesn't use the option %s" msgstr "monotone %s にはオプション %s は使えません" -#: monotone.cc:583 -#, c-format -msgid "Removed 'hidden' from option # %d\n" -msgstr "オプション # %d から 'hidden' を削除\n" - -#: monotone.cc:589 monotone.cc:600 -#, c-format -msgid "Added 'hidden' to option # %d\n" -msgstr "オプション # %d に 'hidden' を追加\n" - -#: monotone.cc:596 -#, c-format -msgid "Options specific to 'monotone %s':" +#: monotone.cc:625 +#, fuzzy, c-format +msgid "Options specific to '%s %s':" msgstr "'monotone %s' に特化したオプション:" #: mt_version.cc:23 @@ -3165,29 +2376,39 @@ "%s 上で実行\n" "基準リビジョン %s からの変更\n" -#: netcmd.cc:42 +#: netcmd.cc:40 #, c-format msgid "unknown item type 0x%x for '%s'" msgstr "不明なアイテムタイプ 0x%x (対象 '%s')" -#: netcmd.cc:94 +#: netcmd.cc:112 #, c-format -msgid "protocol version mismatch: wanted '%d' got '%d'" +msgid "unknown netcmd code 0x%x" +msgstr "不明な netcmd コード 0x%x" + +#: netcmd.cc:117 +#, fuzzy, c-format +msgid "" +"protocol version mismatch: wanted '%d' got '%d'\n" +"%s" msgstr "" "プロトコルバージョンが一致しません: 期待したのは '%d' ですが得たのは '%d' で" "す" -#: netcmd.cc:119 -#, c-format -msgid "unknown netcmd code 0x%x" -msgstr "不明な netcmd コード 0x%x" +#: netcmd.cc:122 +msgid "the remote side has a newer, incompatible version of monotone" +msgstr "" -#: netcmd.cc:130 +#: netcmd.cc:123 +msgid "the remote side has an older, incompatible version of monotone" +msgstr "" + +#: netcmd.cc:133 #, c-format msgid "oversized payload of '%d' bytes" msgstr "'%d' バイトの長さ超過のペイロード" -#: netcmd.cc:159 +#: netcmd.cc:162 #, c-format msgid "" "bad HMAC checksum (got %s, wanted %s)\n" @@ -3196,7 +2417,7 @@ "不正な HMAC チェックサム (計算値 %s / 期待値 %s)\n" "これは転送中にデータが壊れたことを示唆しています\n" -#: netcmd.cc:235 netcmd.cc:281 +#: netcmd.cc:257 netcmd.cc:303 #, c-format msgid "unknown role specifier %d" msgstr "不明な役割指定子 %d" @@ -3226,251 +2447,48 @@ msgid "expected %s to end at %d, have %d bytes" msgstr "%s について終端 %d、容量 %d バイトであることを期待" -#: netsync.cc:243 +#: netsync.cc:245 #, c-format msgid "check of '%s' failed" msgstr "'%s' の検証に失敗" -#: netsync.cc:696 +#: netsync.cc:691 msgid "bytes in" msgstr "バイト (入)" -#: netsync.cc:698 +#: netsync.cc:693 msgid "bytes out" msgstr "バイト (出)" -#: netsync.cc:702 netsync.cc:719 -msgid "revs written" -msgstr "書き込んだリビジョン" - -#: netsync.cc:704 +#: netsync.cc:697 msgid "certs in" msgstr "証明 (入)" -#: netsync.cc:706 netsync.cc:721 +#: netsync.cc:699 netsync.cc:712 msgid "revs in" msgstr "リビジョン (入)" -#: netsync.cc:711 +#: netsync.cc:704 msgid "certs out" msgstr "証明 (出)" -#: netsync.cc:713 netsync.cc:723 +#: netsync.cc:706 netsync.cc:714 msgid "revs out" msgstr "リビジョン (出)" -#: netsync.cc:781 +#: netsync.cc:815 #, c-format -msgid "all epochs processed, opening database valve\n" -msgstr "すべての epoch を処理しました。データベースバルブを開いています\n" - -#: netsync.cc:878 -#, c-format -msgid "dropping outgoing netcmd (because we're in error unwind mode)\n" -msgstr "エラー回復が可能なモードですので、外向きの netcmd を破棄します\n" - -#: netsync.cc:902 -#, c-format -msgid "error: %s\n" -msgstr "エラー: %s\n" - -#: netsync.cc:910 -#, c-format -msgid "analyzing %d entries in manifest\n" -msgstr "マニフェスト内の %d エントリを解析中\n" - -#: netsync.cc:949 -#, c-format -msgid "analyzing %d ancestry edges\n" -msgstr "%d 個の系の端を解析中\n" - -#: netsync.cc:971 -#, c-format -msgid "intermediate set_difference heads size %d" +msgid "underflow on count of %s items to receive" msgstr "" -#: netsync.cc:1007 +#: netsync.cc:1161 #, c-format -msgid "Dropping branch certs for unwanted branch %s" -msgstr "希望しないブランチ %s のブランチ証明を削除" - -#: 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 -#, fuzzy, c-format -msgid "analyze_ancestry_graph" -msgstr "%d 個の系の端を解析中\n" - -#: 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 バイト fd %d (ピーア %s) から読み込み\n" - -#: netsync.cc:1119 -#, c-format -msgid "in error unwind mode, so throwing them into the bit bucket\n" -msgstr "エラー回復可能モードですので、これらをビットバケット中に捨てます\n" - -#: netsync.cc:1151 -#, c-format -msgid "wrote %d bytes to fd %d (peer %s)\n" -msgstr "%d バイト fd %d (ピーア %s) へ書き込み\n" - -#: netsync.cc:1159 -#, c-format -msgid "finished flushing output queue in error unwind mode, disconnecting\n" -msgstr "エラー回復可能モードで出力キューをフラッシュ完了、切断中\n" - -#: netsync.cc:1173 -#, c-format -msgid "queueing 'bye' command\n" -msgstr "'bye' コマンドをキューに追加\n" - -#: netsync.cc:1183 -#, c-format -msgid "queueing 'error' command\n" -msgstr "'error' コマンドをキューに追加\n" - -#: netsync.cc:1196 -#, c-format -msgid "queueing 'done' command for %s level %s\n" -msgstr "'%s' (レベル %s) について 'done' コマンドをキューに追加\n" - -#: netsync.cc:1265 -#, c-format -msgid "queueing request for refinement of %s node '%s', level %d\n" -msgstr "%s ノード '%s', レベル %d の微調整要求をキューに追加\n" - -#: 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:1290 -#, c-format -msgid "not queueing request for %s '%s' as we already requested it\n" -msgstr "既に要求済みの %s '%s' はキューに追加しません\n" - -#: netsync.cc:1295 -#, c-format -msgid "queueing request for data of %s item '%s'\n" -msgstr "%s アイテム '%s' のデータ要求をキューに追加\n" - -#: netsync.cc:1319 -#, c-format -msgid "" -"not queueing request for %s delta '%s' -> '%s' as we are in pure source " -"role\n" -msgstr "" -"純粋なソースの役割を果しているので %s 差分 '%s' -> '%s' の要求をキューに追加" -"しません\n" - -#: 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:1331 -#, c-format -msgid "queueing request for contents of %s delta '%s' -> '%s'\n" -msgstr "%s 差分 '%s' -> '%s' の内容について要求をキューに追加\n" - -#: 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:1356 -#, c-format -msgid "queueing %d bytes of data for %s item '%s'\n" -msgstr "%d バイト (%s アイテム '%s' のデータ)をキューに追加\n" - -#: 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:1395 -#, c-format -msgid "queueing %s delta '%s' -> '%s'\n" -msgstr "%s 差分 '%s' -> '%s' をキューに追加\n" - -#: netsync.cc:1413 -#, c-format -msgid "" -"not queueing note of nonexistence of %s item '%s' as we are in pure sink " -"role\n" -msgstr "" -"純粋なシンクの役割を果しているので %s アイテム '%s' がないことについてノート" -"をキューに追加しません\n" - -#: netsync.cc:1418 -#, c-format -msgid "queueing note of nonexistance of %s item '%s'\n" -msgstr "%s アイテム '%s' がないことについてノートをキューに追加\n" - -#: netsync.cc:1430 -#, c-format -msgid "received 'bye' netcmd\n" -msgstr "'bye' netcmd を受信\n" - -#: netsync.cc:1438 -#, c-format msgid "received network error: %s" msgstr "ネットワークエラーを受信: %s" -#: netsync.cc:1455 -#, c-format -msgid "received 'done' for empty %s level %d, marking as complete\n" -msgstr "空の %s レベル %d について 'done' 受信, 完了としてマーク\n" - -#: netsync.cc:1477 -#, c-format +#: netsync.cc:1193 +#, fuzzy, c-format msgid "" -"received 'done' for %s level %d, which had refinements; sending echo of done " -"for level %d\n" -msgstr "" -"微調整を含む %s レベル %d について 'done' 受信;レベル %d の各 'done' について" -"送信\n" - -#: netsync.cc:1510 -#, c-format -msgid "server key has name %s, hash %s\n" -msgstr "サーバー鍵の名前 %s、ハッシュ %s\n" - -#: netsync.cc:1518 -#, c-format -msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" "@ WARNING: SERVER IDENTIFICATION HAS CHANGED @\n" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -3478,7 +2496,7 @@ "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" +"'%s unset %s %s' overrides this check\n" msgstr "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" "@ 警告: サーバーの識別 ID が変更されています @\n" @@ -3489,12 +2507,12 @@ "期待値 %s\n" "'monotone unset %s %s' とすると検証結果を無視するようになります\n" -#: netsync.cc:1528 +#: netsync.cc:1203 #, c-format msgid "server key changed" msgstr "サーバー鍵が変更されました" -#: netsync.cc:1533 +#: netsync.cc:1208 #, c-format msgid "" "first time connecting to server %s\n" @@ -3504,47 +2522,47 @@ "サーバー %s に接続するのは初めてです\n" "偽物でないとは思いますが、鍵の指紋を二重チェックしてみるといいでしょう: %s\n" -#: netsync.cc:1540 +#: netsync.cc:1215 #, c-format msgid "saving public key for %s to database\n" msgstr "%s の公開鍵をデータベースに保存中\n" -#: netsync.cc:1547 +#: netsync.cc:1303 #, c-format -msgid "received 'hello' netcmd from server '%s' with nonce '%s'\n" -msgstr "サーバー '%s' から nonce '%s' と一緒に 'hello' netcmd を受信\n" - -#: netsync.cc:1628 -#, c-format msgid "rejected attempt at anonymous connection for write\n" msgstr "匿名での接続からの書き込みを拒否\n" -#: netsync.cc:1635 +#: netsync.cc:1310 #, c-format msgid "rejected attempt at anonymous connection while running as sink\n" msgstr "シンクとして実行中の匿名での接続からの書き込みを拒否\n" -#: netsync.cc:1652 +#: netsync.cc:1325 netsync.cc:1422 +#, fuzzy, c-format +msgid "not serving branch '%s'" +msgstr "%s はブランチ %s 内にはありません\n" + +#: netsync.cc:1330 #, c-format msgid "anonymous access to branch '%s' denied by server" msgstr "ブランチ '%s' への匿名アクセスはサーバーによって拒否されました" -#: netsync.cc:1657 +#: netsync.cc:1337 #, c-format msgid "allowed anonymous read permission for '%s' excluding '%s'\n" msgstr "匿名での '%s' ('%s' を除く)の読み込みを許可しました\n" -#: netsync.cc:1689 +#: netsync.cc:1369 #, c-format msgid "detected replay attack in auth netcmd\n" msgstr "auth netcmd 中に繰り返し攻撃を検出\n" -#: netsync.cc:1714 +#: netsync.cc:1391 #, c-format msgid "remote public key hash '%s' is unknown\n" msgstr "リモートの公開鍵ハッシュ '%s' は不明なものです\n" -#: netsync.cc:1731 +#: netsync.cc:1408 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " @@ -3553,24 +2571,24 @@ "純粋シンクとして実行中の '%s' の '%s' ('%s' を除く) の読み込みを拒否しまし" "た\n" -#: netsync.cc:1747 +#: netsync.cc:1428 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n" msgstr "" "'%s' の '%s' ('%s' を除く)の読み込みをブランチ '%s' のために拒否しました\n" -#: netsync.cc:1749 +#: netsync.cc:1431 #, c-format msgid "access to branch '%s' denied by server" msgstr "ブランチ '%s' へのアクセスはサーバーによって拒否されました" -#: netsync.cc:1757 +#: netsync.cc:1441 #, c-format msgid "allowed '%s' read permission for '%s' excluding '%s'\n" msgstr "'%s' の匿名での '%s' ('%s' を除く)の読み込みを許可しました\n" -#: netsync.cc:1766 +#: netsync.cc:1450 #, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " @@ -3579,686 +2597,314 @@ "純粋ソースとして実行中の '%s' の '%s' ('%s' を除く) への書き込みを拒否しまし" "た\n" -#: netsync.cc:1774 +#: netsync.cc:1458 #, c-format msgid "denied '%s' write permission for '%s' excluding '%s'\n" msgstr "'%s' の '%s' ('%s' を除く)への書き込みを拒否しました\n" -#: netsync.cc:1780 +#: netsync.cc:1464 #, c-format msgid "allowed '%s' write permission for '%s' excluding '%s'\n" msgstr "'%s' の '%s' ('%s' を除く)への書き込みを許可しました\n" -#: netsync.cc:1795 +#: netsync.cc:1504 #, c-format -msgid "client signature OK, accepting authentication\n" -msgstr "クライアント署名 OK、認証完了\n" - -#: netsync.cc:1817 -#, c-format msgid "bad client signature\n" msgstr "不正なクライアント署名\n" -#: netsync.cc:1832 +#: netsync.cc:1520 #, c-format -msgid "" -"received 'confirm' netcmd from server '%s' for pattern '%s' exclude '%s' in %" -"s mode\n" +msgid "Unexpected 'refine' command on non-refined item type\n" msgstr "" -"サーバー '%s' からパターン '%s' ('%s' を除く; %s モード)への 'confirm' " -"netcmd を受信しました\n" -#: netsync.cc:1834 netsync.cc:2831 netsync.cc:2862 -msgid "source and sink" -msgstr "" - -#: netsync.cc:1835 netsync.cc:2832 netsync.cc:2863 -msgid "sink" -msgstr "" - -#: netsync.cc:1835 netsync.cc:2832 netsync.cc:2863 -#, fuzzy -msgid "source" -msgstr "[元] %s\n" - -#: netsync.cc:1848 +#: netsync.cc:1617 #, c-format -msgid "server signature OK, accepting authentication\n" -msgstr "サーバー署名 OK、認証完了\n" +msgid "unknown bye phase %d received" +msgstr "" -#: netsync.cc:1853 +#: netsync.cc:1632 #, c-format -msgid "bad server signature\n" -msgstr "不正なサーバー署名\n" +msgid "Unexpected 'done' command on non-refined item type\n" +msgstr "" -#: netsync.cc:1858 +#: netsync.cc:1712 #, c-format -msgid "unknown server key\n" -msgstr "不明なサーバー鍵\n" - -#: netsync.cc:1927 -#, c-format msgid "epoch with hash '%s' does not exist in our database" msgstr "こちらのデータベースにはハッシュ '%s' の epoch は含まれていません" -#: netsync.cc:1937 +#: netsync.cc:1741 #, c-format -msgid "public key '%s' is also called '%s'\n" -msgstr "公開鍵 '%s' の別名は '%s' です\n" - -#: netsync.cc:1956 -#, c-format msgid "revision '%s' does not exist in our database" msgstr "こちらのデータベースにはリビジョン '%s' は含まれていません" -#: netsync.cc:1970 +#: netsync.cc:1755 #, c-format -msgid "manifest '%s' does not exist in our database" -msgstr "こちらのデータベースにはマニフェスト '%s' は含まれていません" - -#: netsync.cc:1984 -#, c-format msgid "file '%s' does not exist in our database" msgstr "こちらのデータベースにはファイル '%s' は含まれていません" -#: netsync.cc:1998 +#: netsync.cc:1769 #, c-format msgid "cert '%s' does not exist in our database" msgstr "こちらのデータベースには証明 '%s' は含まれていません" -#: netsync.cc:2017 +#: netsync.cc:1821 #, c-format -msgid "received 'refine' netcmd on %s node '%s', level %d\n" -msgstr "%s ノード '%s'、レベル %d で 'refine' netcmd を受信\n" - -#: 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:2077 -#, c-format -msgid "found corresponding %s merkle node for prefix '%s', level %d\n" -msgstr "" -"相当する %s merkle ノード (対象: プレフィクス '%s', レベル %d) をみつけまし" -"た\n" - -#: netsync.cc:2408 -#, c-format -msgid "received 'send_data' netcmd requesting %s '%s'\n" -msgstr "%s '%s' を要求する 'send_data' netcmd を受信\n" - -#: 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:2490 -#, c-format -msgid "delta requested for item type %s\n" -msgstr "アイテムタイプ %s について要求された差分\n" - -#: netsync.cc:2513 -#, c-format -msgid "epoch '%s' already exists in our database\n" -msgstr "epoch '%s' は既にデータベースにあります\n" - -#: netsync.cc:2520 -#, c-format -msgid "received epoch %s for branch %s\n" -msgstr "epoch %s (ブランチ %s) を受信\n" - -#: netsync.cc:2527 -#, c-format -msgid "branch %s has no epoch; setting epoch to %s\n" -msgstr "ブランチ %s には epoch はありませんので、epoch を %s に設定します\n" - -#: netsync.cc:2533 -#, c-format -msgid "branch %s already has an epoch; checking\n" -msgstr "ブランチ %s には既に epoch があります。検証中\n" - -#: netsync.cc:2544 -#, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." msgstr "" "ブランチ %s について epoch が一致しません。サーバー側 '%s', クライアント側 '%" "s'" -#: netsync.cc:2555 +#: netsync.cc:1842 #, c-format -msgid "public key '%s' already exists in our database\n" -msgstr "公開鍵 '%s' は既にデータベースにあります\n" - -#: 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:2573 +#: netsync.cc:1859 #, c-format -msgid "cert '%s' already exists in our database\n" -msgstr "証明 '%s' は既にデータベースにあります\n" - -#: netsync.cc:2581 -#, c-format msgid "hash check failed for revision cert '%s'" msgstr "リビジョン証明 '%s' についてハッシュ検証に失敗" -#: netsync.cc:2597 +#: netsync.cc:1934 #, c-format -msgid "revision '%s' already exists in our database\n" -msgstr "リビジョン '%s' は既にデータベースにあります\n" - -#: netsync.cc:2600 -#, c-format -msgid "received revision '%s'\n" -msgstr "リビジョン '%s' を受信\n" - -#: netsync.cc:2619 -#, c-format -msgid "manifest version '%s' already exists in our database\n" -msgstr "バージョン '%s' のマニフェストは既にデータベースにあります\n" - -#: netsync.cc:2634 -#, c-format -msgid "file version '%s' already exists in our database\n" -msgstr "バージョン '%s' のファイルは既にデータベースにあります\n" - -#: netsync.cc:2720 -#, c-format -msgid "ignoring delta received for item type %s\n" -msgstr "アイテムタイプ %s について受信した差分を無視\n" - -#: netsync.cc:2734 -#, c-format -msgid "received 'nonexistant' netcmd for %s '%s'\n" -msgstr "%s '%s' について 'nonexistant' netcmd を受信\n" - -#: netsync.cc:2746 -#, c-format msgid "Received warning from usher: %s" msgstr "門番から警告を受信: %s" -#: netsync.cc:2748 -#, c-format -msgid "Received greeting from usher: %s" -msgstr "門番から受け入れ挨拶を受信: %s" +#: netsync.cc:2021 netsync.cc:2052 +msgid "source and sink" +msgstr "" -#: netsync.cc:2753 -#, c-format -msgid "Sent reply." -msgstr "応答を送信" +#: netsync.cc:2022 netsync.cc:2053 +#, fuzzy +msgid "source" +msgstr "[元] %s\n" -#: netsync.cc:2828 -#, c-format -msgid "" -"received 'anonymous' netcmd from client for pattern '%s' excluding '%s' in %" -"s mode\n" +#: netsync.cc:2022 netsync.cc:2053 +msgid "sink" msgstr "" -"クライアントからパターン '%s' ('%s' を除く; %s モード)への 'anonymous' " -"netcmd を受信\n" -#: netsync.cc:2859 +#: netsync.cc:2207 #, c-format -msgid "" -"received 'auth(hmac)' netcmd from client '%s' for pattern '%s' exclude '%s' " -"in %s mode with nonce1 '%s'\n" -msgstr "" -"クライアント '%s' からパターン '%s' ('%s' を除く; モード %s) について nonce1 " -"'%s' とともに 'auth(hmac)' netcmd を受信\n" - -#: netsync.cc:3031 -#, c-format -msgid "processing %d byte input buffer from peer %s\n" -msgstr "%d バイトの入力バッファ (送信元: ピーア %s) を処理中\n" - -#: netsync.cc:3034 -#, c-format msgid "input buffer for peer %s is overfull after netcmd dispatch\n" msgstr "netcmd dispatch の後でピーア %s の入力バッファがあふれました\n" -#: netsync.cc:3038 -#, fuzzy, c-format -msgid "failed to process '%s' packet" -msgstr "データ文字列 '%s' の解析に失敗: %s" - -#: netsync.cc:3043 netsync.cc:3083 netsync.cc:3110 +#: netsync.cc:2219 netsync.cc:2276 #, c-format msgid "protocol error while processing peer %s: '%s'\n" msgstr "ピーア %s: '%s' を処理中にプロトコルエラー発生\n" -#: netsync.cc:3068 +#: netsync.cc:2225 #, c-format +msgid "error: %s\n" +msgstr "エラー: %s\n" + +#: netsync.cc:2255 +#, c-format msgid "connecting to %s\n" msgstr "%s に接続中\n" -#: netsync.cc:3096 +#: netsync.cc:2291 #, c-format msgid "timed out waiting for I/O with peer %s, disconnecting\n" msgstr "ピーア %s の I/O を待っている間にタイムアウト, 切断中\n" -#: 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:3120 -#, c-format -msgid "read from fd %d (peer %s) failed, disconnecting\n" -msgstr "fd %d (ピーア %s) からの読み込みに失敗, 切断中\n" - -#: 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:3132 -#, c-format -msgid "write on fd %d (peer %s) failed, disconnecting\n" -msgstr "fd %d (ピーア %s) からの書き込みに失敗、切断中\n" - -#: netsync.cc:3139 -#, c-format -msgid "got OOB data on fd %d (peer %s), disconnecting\n" +#: netsync.cc:2306 +#, fuzzy, c-format +msgid "got OOB data from peer %s, disconnecting\n" msgstr "fd %d (ピーア %s) で OOB データを受信、切断中\n" -#: netsync.cc:3148 -#, c-format -msgid "terminated exchange with %s\n" -msgstr "%s との交換を切断\n" +#: netsync.cc:2321 +#, fuzzy, c-format +msgid "processing failure while talking to peer %s, disconnecting\n" +msgstr "ピーア %s: '%s' からを処理中にプロトコルエラー発生、切断中\n" -#: netsync.cc:3156 +#: netsync.cc:2338 #, c-format msgid "successful exchange with %s\n" msgstr "%s との交換に成功\n" -#: netsync.cc:3177 +#: netsync.cc:2344 #, c-format -msgid "fd %d is armed\n" -msgstr "fd %d: armed\n" +msgid "peer %s disconnected after we informed them of error\n" +msgstr "" -#: netsync.cc:3184 +#: netsync.cc:2349 +#, fuzzy, c-format +msgid "I/O failure while talking to peer %s, disconnecting\n" +msgstr "ピーア %s の I/O を待っている間にタイムアウト, 切断中\n" + +#: netsync.cc:2378 #, c-format msgid "protocol error while processing peer %s: '%s', marking as bad\n" msgstr "ピーア %s: '%s' を処理中にプロトコルエラー発生、誤りとして印付け\n" -#: netsync.cc:3206 +#: netsync.cc:2410 #, fuzzy, c-format -msgid "accepting new connection on %s : %s\n" -msgstr "%s : %d での新しい接続を受理\n" +msgid "accepted new client connection from %s : %s\n" +msgstr "%s からの新しいクライアント接続を受理\n" -#: netsync.cc:3212 +#: netsync.cc:2444 #, c-format -msgid "accept() returned a dead client\n" -msgstr "accept() は死んだクライアントを返しました\n" +msgid "protocol error while processing peer %s: '%s', disconnecting\n" +msgstr "ピーア %s: '%s' からを処理中にプロトコルエラー発生、切断中\n" -#: netsync.cc:3216 +#: netsync.cc:2455 #, fuzzy, c-format -msgid "accepted new client connection from %s : %s\n" -msgstr "%s からの新しいクライアント接続を受理\n" +msgid "peer %s read failed in working state (error)\n" +msgstr "作業コピー内の %s ファイルを登録\n" -#: netsync.cc:3244 +#: netsync.cc:2460 #, c-format -msgid "protocol error while processing peer %s: '%s', disconnecting\n" -msgstr "ピーア %s: '%s' からを処理中にプロトコルエラー発生、切断中\n" +msgid "" +"peer %s read failed in shutdown state (possibly client misreported error)\n" +msgstr "" -#: netsync.cc:3252 +#: netsync.cc:2466 #, c-format -msgid "fd %d (peer %s) read failed, disconnecting\n" -msgstr "fd %d (ピーア %s) 読み込み失敗、切断中\n" +msgid "peer %s read failed in confirmed state (success)\n" +msgstr "" -#: netsync.cc:3268 +#: netsync.cc:2487 +#, fuzzy, c-format +msgid "peer %s write failed in working state (error)\n" +msgstr "作業コピー内の %s ファイルを登録\n" + +#: netsync.cc:2492 #, c-format -msgid "fd %d (peer %s) write failed, disconnecting\n" -msgstr "fd %d (ピーア %s) 書き込み失敗、切断中\n" +msgid "" +"peer %s write failed in shutdown state (possibly client misreported error)\n" +msgstr "" -#: netsync.cc:3292 +#: netsync.cc:2498 #, c-format -msgid "fd %d (peer %s) processing finished, disconnecting\n" +msgid "peer %s write failed in confirmed state (success)\n" +msgstr "" + +#: netsync.cc:2525 +#, fuzzy, c-format +msgid "peer %s processing finished, disconnecting\n" msgstr "fd %d (ピーア %s) 処理終了、切断中\n" -#: netsync.cc:3314 +#: netsync.cc:2547 #, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting\n" msgstr "fd %d (ピーア %s) はアイドル時間が長すぎます。切断中\n" -#: 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:3366 +#: netsync.cc:2615 #, fuzzy, c-format msgid "beginning service on %s : %s\n" msgstr "%s : %d でサービスを開始\n" -#: netsync.cc:3378 +#: netsync.cc:2616 +#, fuzzy +msgid "" +msgstr "自動化インターフェース" + +#: netsync.cc:2630 #, c-format msgid "session limit %d reached, some connections will be refused\n" msgstr "セッション制限 %d に達っしました。いくつかの接続は拒否されます\n" -#: netsync.cc:3384 -#, c-format -msgid "i/o probe with %d armed\n" -msgstr "%d armed で I/O プローブ\n" - -#: netsync.cc:3394 +#: netsync.cc:2685 #, fuzzy, c-format -msgid "timed out waiting for I/O (listening on %s : %s)\n" -msgstr "I/O (%s : %d でリスン中) 待機中にタイムアウト\n" +msgid "got OOB from peer %s, disconnecting\n" +msgstr "fd %d (ピーア %s) で OOB データを受信、切断中\n" -#: netsync.cc:3410 +#: netsync.cc:2754 #, c-format -msgid "got woken up for action on unknown fd %d\n" -msgstr "不明な fd %d はアクションのために起こされました\n" - -#: 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:3487 -#, c-format msgid "finding items to synchronize:\n" msgstr "同期アイテムを検索中:\n" -#: netsync.cc:3490 -#, c-format -msgid "including branch %s" -msgstr "ブランチ %s を含めます" +#: netsync.cc:2762 +msgid "certificates" +msgstr "" -#: netsync.cc:3549 -#, c-format -msgid "setting epoch on %s to zero\n" -msgstr "%s の epoch を零に設定\n" - -#: netsync.cc:3598 +#: netsync.cc:2871 #, fuzzy, c-format msgid "Cannot find key '%s'" msgstr "注釈ファイル file_path '%s'\n" -#: netsync.cc:3652 netsync.cc:3656 +#: netsync.cc:2911 #, c-format -msgid "network error: %s" -msgstr "ネットワークエラー: %s" - -#: netsync.cc:3710 -#, c-format -msgid "ancestry_fetcher: got %d heads" +msgid "" +"include branch pattern contains a quote character:\n" +"%s\n" msgstr "" -#: netsync.cc:3820 -#, fuzzy, c-format -msgid "traversing head %s" -msgstr "最新版 %s を保存しています\n" - -#: packet.cc:330 +#: netsync.cc:2917 #, c-format -msgid "writing delayed revision data packet for %s\n" -msgstr "%s について遅延したリビジョンデータパケットを書き込み中\n" +msgid "" +"exclude branch pattern contains a quote character:\n" +"%s\n" +msgstr "" -#: packet.cc:337 +#: netsync.cc:2940 netsync.cc:2944 #, c-format -msgid "discarding revision data packet %s with unmet dependencies\n" -msgstr "依存関係を満たさないリビジョンデータパケット %s を破棄\n" +msgid "network error: %s" +msgstr "ネットワークエラー: %s" -#: packet.cc:343 +#: packet.cc:94 #, c-format -msgid "writing delayed manifest data packet for %s\n" -msgstr "%s について遅延したマニフェストデータパケットを書き込み中\n" +msgid "file preimage '%s' missing in db" +msgstr "" -#: packet.cc:350 -#, c-format -msgid "discarding manifest data packet %s with unmet dependencies\n" -msgstr "依存関係を満たさないマニフェストデータパケット %s を破棄\n" - -#: packet.cc:356 -#, c-format -msgid "writing delayed file data packet for %s\n" -msgstr "%s について遅延ファイルデータパケットを書き込み中\n" - -#: packet.cc:369 +#: packet.cc:95 #, fuzzy, c-format -msgid "writing delayed manifest %s packet for %s -> %s%s\n" -msgstr "遅延マニフェスト %s パケット(%s -> %s)を書き込み中\n" +msgid "dropping delta '%s' -> '%s'" +msgstr "%s 差分 '%s' -> '%s' をキューに追加\n" -#: packet.cc:383 +#: packet.cc:109 #, c-format -msgid "discarding manifest delta packet %s -> %s with unmet dependencies\n" -msgstr "依存関係を満たさないマニフェスト差分パケット %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:404 -#, c-format -msgid "discarding file delta packet %s -> %s with unmet dependencies\n" -msgstr "依存関係を満たさないファイル差分パケット %s -> %s を破棄\n" - -#: packet.cc:411 -#, c-format -msgid "writing delayed revision cert on %s\n" -msgstr "%s の遅延リビジョン証明を書き込み中\n" - -#: packet.cc:418 -#, c-format -msgid "discarding revision cert packet %s with unmet dependencies\n" -msgstr "依存関係を満たさないリビジョン証明パケット %s を破棄\n" - -#: packet.cc:425 -#, c-format -msgid "writing delayed public key %s\n" -msgstr "遅延公開鍵 %s を書き込み中\n" - -#: packet.cc:438 -#, c-format -msgid "writing delayed private key %s\n" -msgstr "遅延秘密鍵 %s を書き込み中\n" - -#: packet.cc:608 -#, c-format -msgid "noting acceptence of revision %s\n" -msgstr "リビジョン %s について受理したものはありません\n" - -#: packet.cc:621 -#, c-format -msgid "noting acceptence of manifest %s\n" -msgstr "マニフェスト %s について受理したものはありません\n" - -#: packet.cc:634 -#, c-format -msgid "noting acceptence of file %s\n" -msgstr "ファイル %s について受理したものはありません\n" - -#: packet.cc:656 -#, c-format -msgid "skipping existing file version %s\n" -msgstr "既存のファイル、バージョン %s をスキップ\n" - -#: 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:702 -#, c-format -msgid "delaying file delta %s -> %s for preimage\n" -msgstr "事前イメージのためのファイル差分 %s -> %s を遅延\n" +#: packet.cc:138 +#, fuzzy, c-format +msgid "missing prerequisite revision '%s'\n" +msgstr "リビジョン '%s' を受信\n" -#: packet.cc:712 -#, c-format -msgid "skipping delta to existing file version %s\n" -msgstr "既存のファイル、バージョン %s への差分をスキップ\n" +#: packet.cc:139 packet.cc:150 packet.cc:166 packet.cc:174 +#, fuzzy, c-format +msgid "dropping revision '%s'\n" +msgstr "リビジョン '%s' を受信\n" -#: 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:149 +#, fuzzy, c-format +msgid "missing prerequisite file '%s'\n" +msgstr "存在しない初期化ファイル '%s' をスキップ\n" -#: packet.cc:746 +#: packet.cc:164 #, c-format -msgid "delaying reverse file delta %s -> %s for preimage\n" -msgstr "事前イメージのための逆方向のファイル差分 %s -> %s を遅延\n" - -#: packet.cc:756 -#, c-format -msgid "skipping reverse delta to existing file version %s\n" -msgstr "既存のファイル、バージョン %s への逆方向の差分をスキップ\n" - -#: packet.cc:773 -#, c-format -msgid "skipping existing manifest version %s\n" -msgstr "既存のマニフェスト、バージョン %s をスキップ\n" - -#: packet.cc:814 -#, c-format -msgid "reconstructed manifest from delta '%s' -> '%s' has wrong id '%s'\n" +msgid "missing prerequisite file pre-delta '%s'\n" msgstr "" -"差分 '%s' -> '%s' から再構築されたマニフェストの ID '%s' は不正なものです\n" -#: packet.cc:820 +#: packet.cc:172 #, c-format -msgid "delaying manifest delta %s -> %s for preimage\n" -msgstr "事前イメージのための逆方向のファイル差分 %s -> %s を遅延\n" - -#: packet.cc:830 -#, c-format -msgid "skipping delta to existing manifest version %s\n" -msgstr "既存のマニフェストバージョン %s への差分をスキップ\n" - -#: packet.cc:858 -#, c-format -msgid "" -"reconstructed manifest from reverse delta '%s' -> '%s' has wrong id '%s'\n" +msgid "missing prerequisite file post-delta '%s'\n" msgstr "" -"逆方向の差分 '%s' -> '%s' から再構築されたマニフェストの ID '%s' は不正なもの" -"です\n" -#: packet.cc:864 -#, c-format -msgid "delaying manifest reverse delta %s -> %s for preimage\n" -msgstr "事前イメージのためのマニフェストの逆方向の差分 %s -> %s を遅延\n" +#: packet.cc:200 +#, fuzzy, c-format +msgid "cert revision '%s' does not exist in db\n" +msgstr "データベースに基準リビジョン %s は含まれていません\n" -#: packet.cc:874 -#, c-format -msgid "skipping reverse delta to existing manifest version %s\n" -msgstr "既存のマニフェスト、バージョン %s への逆方向の差分をスキップ\n" +#: packet.cc:202 +#, fuzzy, c-format +msgid "dropping cert\n" +msgstr "みつからない証明: %d\n" -#: packet.cc:896 +#: packet.cc:225 #, c-format -msgid "delaying revision %s for new manifest %s\n" -msgstr "リビジョン %s (新しいマニフェスト %s) を遅延\n" - -#: packet.cc:910 -#, c-format -msgid "delaying revision %s for old manifest %s\n" -msgstr "リビジョン %s (古いマニフェスト %s) を遅延\n" - -#: packet.cc:920 -#, c-format -msgid "delaying revision %s for old revision %s\n" -msgstr "リビジョン %s (古いリビジョン %s) を遅延\n" - -#: packet.cc:933 -#, c-format -msgid "delaying revision %s for old file %s\n" -msgstr "リビジョン %s (古いファイル %s) を遅延\n" - -#: packet.cc:943 -#, c-format -msgid "delaying revision %s for new file %s\n" -msgstr "リビジョン %s (新しいファイル %s) を遅延\n" - -#: packet.cc:961 -#, c-format -msgid "skipping existing revision %s\n" -msgstr "既存のリビジョン %s をスキップ\n" - -#: packet.cc:979 -#, c-format -msgid "delaying revision cert on %s\n" -msgstr "%s のリビジョン証明を遅延\n" - -#: packet.cc:992 -#, c-format -msgid "skipping existing revision cert %s\n" -msgstr "既存のリビジョン証明 %s をスキップ\n" - -#: packet.cc:1006 -#, c-format -msgid "skipping prohibited public key %s\n" -msgstr "禁止された公開鍵 %s をスキップ\n" - -#: packet.cc:1019 -#, c-format msgid "key '%s' is not equal to key '%s' in database\n" msgstr "鍵 '%s' はデータベース内の鍵 '%s' と一致しません\n" -#: packet.cc:1020 -#, c-format -msgid "skipping existing public key %s\n" -msgstr "既存の公開鍵 %s をスキップ\n" - -#: packet.cc:1033 +#: packet.cc:349 #, fuzzy, c-format -msgid "skipping prohibited key pair %s\n" -msgstr "禁止された公開鍵 %s をスキップ\n" - -#: packet.cc:1042 -#, fuzzy, c-format -msgid "skipping existing key pair %s\n" -msgstr "既存の公開鍵 %s をスキップ\n" - -#: packet.cc:1078 -#, c-format -msgid "packet valve opened\n" -msgstr "パケットバルブ: 開\n" - -#: packet.cc:1090 -#, c-format -msgid "wrote %i queued packets\n" -msgstr "%i キューパケット書き込み\n" - -#: packet.cc:1362 -#, fuzzy, c-format msgid "malformed packet" msgstr "%d パケット読み込み" -#: packet.cc:1378 +#: packet.cc:449 #, fuzzy, c-format -msgid "read data packet" -msgstr "データパケット読み込み\n" - -#: packet.cc:1398 -#, fuzzy, c-format -msgid "read delta packet" -msgstr "差分パケット読み込み\n" - -#: packet.cc:1429 -#, fuzzy, c-format -msgid "read cert packet" -msgstr "証明パケット読み込み\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" @@ -4277,138 +2923,23 @@ msgid "parse failure %d:%d: expecting word\n" msgstr "解析失敗 %d:%d: 期待される語句\n" -#: rcs_import.cc:247 +#: rcs_import.cc:703 #, c-format -msgid "Calculating time of %s\n" -msgstr "%s の時間を計算しています\n" - -#: rcs_import.cc:281 -#, c-format -msgid "version %s -> tag %s\n" -msgstr "バージョン %s - タグ %s\n" - -#: rcs_import.cc:448 -#, c-format -msgid "skipping identity file edge\n" -msgstr "識別ファイルの先端をスキップ\n" - -#: rcs_import.cc:456 rcs_import.cc:482 -#, c-format -msgid "existing path to %s found, skipping\n" -msgstr "%s への既存のパスを発見、スキップ\n" - -#: rcs_import.cc:474 -#, c-format -msgid "skipping identity manifest edge\n" -msgstr "識別マニフェストの先端をスキップ\n" - -#: rcs_import.cc:592 -#, c-format -msgid "version %s has %d lines\n" -msgstr "バージョン %s には %d 行あります\n" - -#: rcs_import.cc:605 -#, c-format -msgid "following RCS edge %s -> %s\n" -msgstr "次の RCS 先端 %s -> %s\n" - -#: rcs_import.cc:608 -#, c-format -msgid "constructed RCS version %s, inserting into database\n" -msgstr "構築された RCS バージョン %s をデータベースに挿入\n" - -#: rcs_import.cc:651 -#, c-format -msgid "following RCS branch %s = '%s'\n" -msgstr "次の RCS ブランチ %s = '%s' を追跡\n" - -#: rcs_import.cc:661 -#, c-format -msgid "finished RCS branch %s = '%s'\n" -msgstr "RCS ブランチ %s ='%s' を終了\n" - -#: rcs_import.cc:682 rcs_import.cc:730 -#, c-format msgid "parsing RCS file %s\n" msgstr "RCS ファイル %s を解析中\n" -#: rcs_import.cc:684 rcs_import.cc:733 +#: rcs_import.cc:706 #, c-format msgid "parsed RCS file %s OK\n" msgstr "解析した RCS ファイル %s: OK\n" -#: rcs_import.cc:773 +#: rcs_import.cc:895 #, c-format -msgid "importing file '%s'\n" -msgstr "ファイル '%s' を取り込み中\n" - -#: rcs_import.cc:845 -#, c-format -msgid "first version in branch %s would be %s\n" -msgstr "ブランチ %s 内の最初のバージョンは %s でしょう\n" - -#: rcs_import.cc:852 -#, c-format -msgid "file branchpoint for %s at %s\n" -msgstr "%s のファイルブランチ点 %s\n" - -#: rcs_import.cc:922 -#, c-format msgid "error reading RCS file %s: %s\n" msgstr "RCS ファイル %s を読み込み中にエラー: %s\n" -#: rcs_import.cc:926 +#: rcs_import.cc:1192 #, c-format -msgid "skipping non-RCS file %s\n" -msgstr "非 RCS ファイル %s をスキップ\n" - -#: rcs_import.cc:1105 -#, c-format -msgid "examining next commit [t:%d] [p:%s] [a:%s] [c:%s]\n" -msgstr "次のコミット [t:%d] [p:%s] [a:%s] [c:%s] を検査中\n" - -#: rcs_import.cc:1118 -#, c-format -msgid "expiring cluster\n" -msgstr "クラスタを終了中\n" - -#: rcs_import.cc:1134 -#, c-format -msgid "examining cluster %d to see if it touched %d\n" -msgstr "クラスタ %d が %d にふれているか調べています\n" - -#: rcs_import.cc:1142 -#, c-format -msgid "found cluster touching %d: [t:%d] [a:%d] [c:%d]\n" -msgstr "%d: [t:%d] [a:%d] [c:%d] にふれているクラスタをみつけました\n" - -#: rcs_import.cc:1150 -#, c-format -msgid "last modification time is %d\n" -msgstr "最終更新日時は %d です\n" - -#: rcs_import.cc:1166 -#, c-format -msgid "picked existing cluster [t:%d] [a:%d] [c:%d]\n" -msgstr "既存のクラスタ [t:%d] [a:%d] [c:%d] を選択\n" - -#: rcs_import.cc:1180 -#, c-format -msgid "building new cluster [t:%d] [a:%d] [c:%d]\n" -msgstr "新しいクラスタ [t:%d] [a:%d] [c:%d] を作成中\n" - -#: rcs_import.cc:1205 -#, c-format -msgid "finished branch commits, writing all pending clusters\n" -msgstr "ブランチコミットを終了し、すべての待機中のクラスタを書き込んでいます\n" - -#: rcs_import.cc:1211 -#, c-format -msgid "finished writing pending clusters\n" -msgstr "待機中のクラスタへの書き込みを完了\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/" @@ -4416,423 +2947,133 @@ "%s は CVS リポジトリのルートディレクトリのようです。\n" "代りに 'cvs_import %s/<モジュール名>' で取り込んでみて下さい" -#: rcs_import.cc:1235 +#: rcs_import.cc:1204 #, c-format msgid "need base --branch argument for importing" msgstr "取り込みには基準 --branch 引数が必要です" -#: rcs_import.cc:1247 +#: rcs_import.cc:1216 #, c-format msgid "path %s does not exist" msgstr "パス %s は存在しません" -#: rcs_import.cc:1266 -#, c-format -msgid "branch %s has %d entries\n" -msgstr "ブランチ %s には %d 個のエントリがあります\n" - -#: rcs_import.cc:1276 -#, c-format -msgid "trunk has %d entries\n" -msgstr "trunk には %d 個のエントリがあります\n" - -#: rcs_import.cc:1283 +#: rcs_import.cc:1251 msgid "tags" msgstr "タグ" -#: rcs_import.cc:1329 -#, c-format -msgid "initial cluster on branch %s has %d live entries\n" -msgstr "ブランチ %s の初期クラスタには %d 個の生きたエントリがあります\n" - -#: rcs_import.cc:1336 -#, c-format -msgid "initial cluster contains %s at %s\n" -msgstr "初期クラスタは %s を %s に含んでいます\n" - -#: rcs_import.cc:1382 -#, c-format -msgid "storing manifest '%s' (base %s)\n" -msgstr "マニフェスト '%s' (基準 %s) を保存しています\n" - -#: rcs_import.cc:1387 -#, c-format -msgid "storing head %s\n" -msgstr "最新版 %s を保存しています\n" - -#: rcs_import.cc:1402 -#, c-format -msgid "skipping delta to null manifest\n" -msgstr "空マニフェストについての差分をスキップ\n" - -#: rcs_import.cc:1414 -#, c-format -msgid "skipping cyclical manifest delta %s -> %s\n" -msgstr "マニフェストの循環差分 %s -> %s をスキップ\n" - -#: rcs_import.cc:1420 -#, c-format -msgid "writing full manifest %s\n" -msgstr "完全なマニフェスト %s を書き込み中\n" - -#: rcs_import.cc:1430 -#, c-format -msgid "storing manifest delta %s -> %s\n" -msgstr "マニフェスト差分 %s -> %s を保存中\n" - -#: rcs_import.cc:1492 -#, c-format -msgid "adding entry state '%s' on '%s'\n" -msgstr "エントリ状態 '%s' ('%s') を追加\n" - -#: rcs_import.cc:1499 -#, c-format -msgid "applying state delta on '%s' : '%s' -> '%s'\n" -msgstr "'%s' : '%s' -> '%s' の状態差分を適用中\n" - -#: rcs_import.cc:1510 -#, c-format -msgid "deleting entry state '%s' on '%s'\n" -msgstr "エントリ状態 '%s' ('%s') を削除しています\n" - -#: rcs_import.cc:1529 -#, c-format -msgid "BEGIN consume_cluster()\n" -msgstr "BEGIN consume_cluster()\n" - -#: rcs_import.cc:1549 -#, c-format -msgid "END consume_cluster('%s') (parent '%s')\n" -msgstr "END consume_cluster('%s') (親 '%s')\n" - -#: revision.cc:126 -#, c-format -msgid "verifying new revisions (this may take a while)\n" -msgstr "新しいリビジョンを検証中 (しばらく御待ち下さい)\n" - -#: revision.cc:128 -#, c-format -msgid "Verifying revision %s has sane history (to depth %i)\n" -msgstr "リビジョン %s の履歴が正しいか検証しています (深さ %i)\n" - -#: revision.cc:166 -#, c-format -msgid "Examining %s -> %s\n" -msgstr "%s -> %s を検討中\n" - -#: revision.cc:243 -#, c-format -msgid "%s and %s have no common ancestor, so done\n" -msgstr "%s と %s には共通の祖先はありません。完了\n" - -#: revision.cc:249 -#, c-format -msgid "already checked common ancestor, so done\n" -msgstr "既にチェック済の共通の祖先。完了\n" - -#: revision.cc:252 -#, c-format -msgid "%s is a merge; verifying paths to common ancestor %s are sane\n" -msgstr "%s は統合です。共通の祖先 %s へのパスが適切なものか検証しています\n" - -#: revision.cc:310 -#, c-format -msgid "loading parents for node %d\n" -msgstr "ノード %d の親を読み込み中\n" - -#: revision.cc:332 -#, c-format -msgid "parent %s -> node %d\n" -msgstr "親 %s -> ノード %d\n" - -#: revision.cc:482 -#, c-format -msgid "found %d intersecting nodes\n" -msgstr "%d 個の交差ノードがみつかりました\n" - -#: revision.cc:535 -#, c-format -msgid "searching for common ancestor, left=%s right=%s\n" -msgstr "左=%s 右=%s の共通の祖先を検索中\n" - -#: revision.cc:540 -#, c-format -msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n" -msgstr "共通の祖先を走査 [親=%d,祖先=%d,支配=%d]\n" - -#: revision.cc:545 -#, c-format -msgid "found node %d, ancestor of left %s and dominating right %s\n" -msgstr "みつかったノード %d は左 %s と支配している右 %s の祖先です\n" - -#: revision.cc:552 -#, c-format -msgid "found node %d, ancestor of right %s and dominating left %s\n" -msgstr "みつかったノード %d は右 %s と支配している左 %s の祖先です\n" - -#: revision.cc:589 -#, c-format -msgid "searching for least common ancestor, left=%s right=%s\n" -msgstr "最小公倍の祖先を検索中, 左=%s 右=%s\n" - -#: revision.cc:593 -#, c-format -msgid "least common ancestor scan [par=%d,anc=%d]\n" -msgstr "最も近い祖先を走査 [親=%d,祖先=%d]\n" - -#: revision.cc:598 -#, c-format -msgid "found node %d, ancestor of left %s and right %s\n" -msgstr "みつかったノード %d は左 %s、右 %s の祖先です\n" - -#: revision.cc:652 -#, c-format -msgid "checking whether %s is an ancestor of %s\n" -msgstr "%s が %s の祖先かどうか検証しています\n" - -#: revision.cc:764 -#, c-format -msgid "new root: %s\n" -msgstr "新規ルート: %s\n" - -#: revision.cc:779 -#, c-format -msgid "new leaf: %s\n" -msgstr "新規リーフ: %s\n" - -#: revision.cc:921 -#, c-format -msgid "exploring changesets from parents of %s, seeking towards %s\n" -msgstr "%s の親から %s に向って変更セットを調査中\n" - -#: revision.cc:934 -#, c-format -msgid "considering parent %s of %s\n" -msgstr "親 %s (%s) について検討中\n" - -#: revision.cc:960 -#, c-format -msgid "revision %s is relevant, composing with edge to %s\n" -msgstr "リビジョン %s は %s への先端と関連し複合しています\n" - -#: revision.cc:967 -#, c-format -msgid "parent %s of %s is not relevant\n" -msgstr "親 %s (%s) は関連していません\n" - -#: revision.cc:1003 -#, c-format -msgid "adding parents of %s to subgraph\n" -msgstr "%s の親をサブグラフに追加\n" - -#: revision.cc:1013 -#, c-format -msgid "found parent %s of %s\n" -msgstr "親 %s (%s) を発見\n" - -#: revision.cc:1017 -#, c-format -msgid "adding parent %s to next frontier\n" -msgstr "親 %s を次の先端に追加\n" - -#: revision.cc:1032 -#, c-format -msgid "calculating composite changeset between %s and %s\n" -msgstr "%s と %s の間の複合変更セットを見積っています\n" - -#: revision.cc:1050 -#, c-format -msgid "calculating changeset from %s to %s\n" -msgstr "%s から %s への変更セットを見積っています\n" - -#: revision.cc:1054 -#, c-format -msgid "no common ancestor for %s and %s\n" -msgstr "%s と %s の共通の祖先はありません\n" - -#: revision.cc:1055 -#, c-format -msgid "common ancestor is %s\n" -msgstr "共通の祖先は %s です\n" - -#: revision.cc:1086 -#, c-format -msgid "analyzing manifest changes from '%s' -> '%s'\n" -msgstr "'%s' -> '%s' からマニフェストの変更を解析中\n" - -#: revision.cc:1099 -#, c-format -msgid "splitting ancestry for file %s\n" -msgstr "ファイル %s の系統を分離中\n" - -#: revision.cc:1166 -#, c-format -msgid "noting ancestry from child %d -> parent %d\n" -msgstr "子 %d -> 親 %d の系統はありません\n" - -#: revision.cc:1199 -#, c-format -msgid "setting epoch for %s to %s\n" -msgstr "%s の epoch を %s に設定\n" - -#: revision.cc:1255 -#, c-format -msgid "scanning for nodes with 3+ parents\n" +#: revision.cc:700 +#, fuzzy, c-format +msgid "scanning for bogus merge edges\n" msgstr "3 個以上の親を持つノードを走査中\n" -#: revision.cc:1296 -#, c-format -msgid "optimizing out redundant edge %i -> %i\n" +#: revision.cc:742 +#, fuzzy, c-format +msgid "optimizing out redundant edge %d -> %d\n" msgstr "冗長な先端 %i -> %i を最適化中\n" -#: revision.cc:1323 +#: revision.cc:751 +#, fuzzy, c-format +msgid "failed to eliminate edge %d -> %d\n" +msgstr "%s へのデバッグログの書き込みに失敗しました" + +#: revision.cc:762 #, c-format msgid "rebuilding %d nodes\n" msgstr "再構築中: %d ノード\n" -#: revision.cc:1360 +#: revision.cc:967 #, c-format -msgid "node %d = manifest %s\n" -msgstr "ノード %d = マニフェスト %s\n" +msgid "Path %s added to child roster multiple times\n" +msgstr "" -#: revision.cc:1371 +#: revision.cc:980 #, c-format -msgid "loaded '%s' manifest cert for node %s\n" -msgstr "'%s' マニフェスト証明 (ノード %s) を読み込みました\n" +msgid "Directory for path %s cannot be added, as there is a file in the way\n" +msgstr "" -#: revision.cc:1399 -#, c-format -msgid "node %d = revision %s = manifest %s\n" -msgstr "ノード %d = リビジョン %s = マニフェスト %s\n" +#: revision.cc:991 +#, fuzzy, c-format +msgid "Path %s cannot be added, as there is a directory in the way\n" +msgstr "'%s' は期待していたファイルではなく、ディレクトリです" -#: revision.cc:1411 +#: revision.cc:994 #, c-format -msgid "loaded '%s' revision cert for node %s\n" -msgstr "'%s' リビジョン証明 (ノード %s) を読み込みました\n" +msgid "Path %s added twice with differing content\n" +msgstr "" -#: revision.cc:1435 +#: revision.cc:1264 #, c-format -msgid "processing node %d\n" -msgstr "ノード %d を処理中\n" +msgid "" +"unknown attribute %s on path %s\n" +"please contact %s so we can work out the right way to migrate this" +msgstr "" -#: revision.cc:1439 +#: revision.cc:1373 #, c-format -msgid "node %d already processed, skipping\n" -msgstr "ノード %d をスキップ (既に処理済み)\n" +msgid "converting existing revision graph to new roster-style revisions\n" +msgstr "" -#: revision.cc:1453 +#: revision.cc:1427 #, c-format -msgid "node %d is a root node\n" -msgstr "ノード %d はルートノードです\n" - -#: revision.cc:1469 revision.cc:1552 -#, c-format -msgid "parent node %d = revision %s\n" -msgstr "親ノード %d = リビジョン %s\n" - -#: revision.cc:1531 -#, c-format -msgid "processing edge from child %d -> parent %d\n" -msgstr "子 %d -> 親 %d から先端を処理中\n" - -#: revision.cc:1569 -#, c-format -msgid "mapped node %d to revision %s\n" -msgstr "ノード %d をリビジョン %s へ割り当てました\n" - -#: revision.cc:1575 -#, c-format -msgid "skipping already existing revision %s\n" -msgstr "既存のリビジョン %s をスキップ\n" - -#: revision.cc:1587 -#, c-format -msgid "rebuilding revision graph from existing graph\n" -msgstr "既存のグラフからリビジョングラフを再度構成中\n" - -#: revision.cc:1619 -#, c-format msgid "rebuilding revision graph from manifest certs\n" msgstr "マニフェスト証明からリビジョングラフを再度構成中\n" -#: sanity.cc:38 +#: revision.cc:1530 #, c-format -msgid "started up on %s\n" -msgstr "%s で開始\n" - -#: sanity.cc:54 -#, c-format -msgid "wrote debugging log to %sif reporting a bug, please include this file" +msgid "" +"encountered a revision with unknown format, version '%s'\n" +"I only know how to understand the version '1' format\n" +"a newer version of monotone is required to complete this operation" msgstr "" -#: sanity.cc:59 -#, fuzzy, c-format -msgid "failed to write debugging log to %s\n" -msgstr "%s へのデバッグログの書き込みに失敗しました" - -#: sanity.cc:110 +#: sanity.cc:116 #, c-format msgid "fatal: formatter failed on %s:%d: %s" msgstr "致命的: フォーマッタ失敗 %s:%d: %s" -#: sanity.cc:184 +#: sanity.cc:190 msgid "misuse: " msgstr "誤り: " -#: sanity.cc:196 +#: sanity.cc:202 msgid "error: " msgstr "エラー: " -#: sanity.cc:234 +#: sanity.cc:210 #, c-format -msgid "ignoring request to give last gasp; already in process of dumping\n" -msgstr "最後の変更要請を無視します。既にダンプ処理中です\n" +msgid "%s:%d: invariant '%s' violated" +msgstr "" -#: sanity.cc:238 +#: sanity.cc:223 #, c-format -msgid "saving current work set: %i items" -msgstr "現在の作業セットを保存中: %i アイテム" +msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n" +msgstr "" -#: sanity.cc:240 +#: sanity.cc:244 #, c-format msgid "Current work set: %i items\n" msgstr "現在の作業セット: %i アイテム\n" -#: sanity.cc:254 sanity.cc:260 +#: schema_migration.cc:181 #, c-format -msgid "ignoring error trigged by saving work set to debug log" -msgstr "作業セットの保存によって引き起されたデバッグログへのエラーを無視します" - -#: sanity.cc:264 -#, c-format -msgid "finished saving work set" -msgstr "作業セットの保存終了" - -#: schema_migration.cc:47 -#, fuzzy, c-format -msgid "executing SQL '%s'" -msgstr "コマンド '%s' を実行中\n" - -#: schema_migration.cc:49 -#, c-format -msgid "result: %i (%s)" +msgid "failure extracting schema from sqlite_master" msgstr "" -#: schema_migration.cc:51 +#: schema_migration.cc:217 #, fuzzy, c-format -msgid "errmsg: %s" -msgstr "エラー: %s\n" +msgid "calculating necessary migration steps" +msgstr "%s から %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:228 +#, fuzzy, c-format +msgid "migrating data" +msgstr "作業コピーをデータベースにコミット" + #: schema_migration.cc:254 #, c-format msgid "migration step failed: %s" @@ -4892,67 +3133,42 @@ msgid "Press enter when the subprocess has completed" msgstr "" -#: std_hooks.lua:211 +#: transforms.cc:510 #, c-format -msgid "Error running editor '%s' to enter log message\n" -msgstr "" - -#: std_hooks.lua:553 -#, fuzzy -msgid "executing external 2-way merge command\n" -msgstr "内部三元統合完了\n" - -#: std_hooks.lua:661 -#, fuzzy -msgid "executing external 3-way merge command\n" -msgstr "内部三元統合完了\n" - -#: transforms.cc:521 -#, c-format -msgid "converting %d bytes from %s to %s\n" -msgstr "%d バイト: %s から %s へ変換中\n" - -#: transforms.cc:527 -#, c-format msgid "failed to convert string from %s to %s: '%s'" msgstr "文字列の変換 (%s から %s: '%s' へ) に失敗しました" -#: transforms.cc:667 +#: transforms.cc:741 transforms.cc:755 #, c-format -msgid "converting %d bytes from IDNA ACE to UTF-8\n" -msgstr "IDNA ACE から UTF-8 へ変換中 (%d バイト)\n" - -#: 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:681 -#, c-format -msgid "converting %d bytes from UTF-8 to IDNA ACE\n" -msgstr "UTF-8 から IDNA ACE へ変換中 (%d バイト)\n" +#: ui.cc:108 +#, fuzzy, c-format +msgid "%.1f G" +msgstr "%.1f M" -#: transforms.cc:829 +#: ui.cc:114 #, c-format -msgid "doing linesep conversion to %s\n" -msgstr "%s について行末を変換中\n" - -#: ui.cc:120 -#, c-format msgid "%.1f M" msgstr "%.1f M" -#: ui.cc:125 +#: ui.cc:120 #, c-format msgid "%.1f k" msgstr "%.1f k" -#: ui.cc:134 +#: ui.cc:137 ui.cc:139 #, c-format +msgid "%d/%d" +msgstr "" + +#: ui.cc:146 +#, c-format msgid "%d" msgstr "%d" -#: ui.cc:326 +#: ui.cc:369 #, c-format msgid "" "fatal: %s\n" @@ -4965,259 +3181,1709 @@ "このエラーメッセージと 'monotone --full-version' の結果、さらに %s について\n" "何をしたか説明を添えて報告して下さい\n" -#: ui.cc:369 +#: ui.cc:422 msgid "monotone: " msgstr "monotone: " -#: update.cc:66 +#: update.cc:65 #, c-format msgid "failed to decode boolean testresult cert value '%s'\n" msgstr "テスト結果真偽値の証明値 '%s' のデコードに失敗しました\n" -#: update.cc:78 +#: update.cc:159 #, c-format -msgid "Considering update target %s\n" -msgstr "ターゲット %s の更新について計算中\n" - -#: update.cc:88 -#, c-format -msgid "%s not in branch %s\n" -msgstr "%s はブランチ %s 内にはありません\n" - -#: update.cc:97 -#, c-format -msgid "%s is acceptable update candidate\n" -msgstr "%s は受け入れ可能な更新候補です\n" - -#: update.cc:102 -#, c-format -msgid "%s has unacceptable test results\n" -msgstr "%s は受け入れられないテスト結果です\n" - -#: update.cc:160 -#, c-format msgid "cannot determine branch for update" msgstr "更新するブランチを決定できません" -#: vocab.cc:53 +#: vocab.cc:68 #, c-format msgid "hex encoded ID '%s' size != %d" msgstr "十六進エンコード ID '%s' サイズ != %d" -#: vocab.cc:56 +#: vocab.cc:72 #, c-format msgid "bad character '%c' in id name '%s'" msgstr "不正な文字 '%c' (ID 名 '%s' 内)" -#: vocab.cc:69 +#: vocab.cc:85 #, c-format msgid "bad character '%c' in ace string '%s'" msgstr "不正な文字 '%c' (ace 文字列 '%s' 内)" -#: vocab.cc:83 +#: vocab.cc:99 #, c-format msgid "bad character '%c' in cert name '%s'" msgstr "不正な文字 '%c' (証明 '%s' 内)" -#: vocab.cc:96 +#: vocab.cc:112 #, c-format msgid "bad character '%c' in key name '%s'" msgstr "不正な文字 '%c' (キー名 '%s' 内)" -#: vocab.cc:114 +#: vocab.cc:130 #, c-format msgid "Invalid key length of %d bytes" msgstr "不正な鍵長 %d バイト" -#: vocab.cc:132 +#: vocab.cc:148 #, c-format msgid "Invalid hmac length of %d bytes" msgstr "不正な HMAC 長 %d バイト" -#: work.cc:64 -#, c-format -msgid "skipping ignorable file %s\n" +#: work.cc:118 +#, fuzzy, c-format +msgid "skipping ignorable file %s" msgstr "無視可能なファイル %s をスキップ\n" -#: work.cc:70 -#, c-format -msgid "skipping %s, already accounted for in working copy\n" +#: work.cc:127 +#, fuzzy, c-format +msgid "skipping %s, already accounted for in workspace" msgstr "既に作業コピーに追加されている %s をスキップ\n" -#: work.cc:74 -#, c-format -msgid "adding %s to working copy add set\n" +#: work.cc:131 +#, fuzzy, c-format +msgid "adding %s to workspace manifest" msgstr "作業コピー追加セットに %s を追加\n" -#: work.cc:136 -#, c-format -msgid "adding attribute '%s' on file %s to %s\n" -msgstr "属性 '%s' (ファイル %s の)を %s に追加\n" - -#: work.cc:203 -#, c-format -msgid "invalid path ''" -msgstr "不適切なパス ''" - -#: work.cc:207 -#, c-format -msgid "skipping %s, not currently tracked\n" +#: work.cc:221 +#, fuzzy, c-format +msgid "skipping %s, not currently tracked" msgstr "現在追跡対象ではない %s をスキップ\n" -#: work.cc:211 +#: work.cc:231 #, c-format -msgid "adding %s to working copy delete set\n" -msgstr "%s を作業コピー削除セットに追加\n" +msgid "cannot remove %s/, it is not empty" +msgstr "" -#: work.cc:215 +#: work.cc:242 #, c-format -msgid "" -"sorry -- 'drop ' is currently broken.\n" -"try 'find %s -type f | monotone drop address@hidden'\n" +msgid "dropping %s from workspace manifest" msgstr "" -"申し分けありませんが 'drop <ディレクトリ>' は使えません.\n" -"代りに 'find %s -type f | monotone drop address@hidden' を試してみて下さい.\n" -#: work.cc:227 -#, c-format -msgid "dropped attributes for file %s from %s\n" -msgstr "ファイル %s の属性を %s から削除しました\n" +#: work.cc:305 +#, fuzzy, c-format +msgid "destination dir %s/ does not exist in current revision" +msgstr "ファイル %s は現在のリビジョン内にはありません\n" -#: work.cc:253 -#, c-format -msgid "invalid source path ''" -msgstr "不適切なソースパス ''" +#: work.cc:308 +#, fuzzy, c-format +msgid "destination %s is an existing file in current revision" +msgstr "ファイル %s は現在のリビジョン内にはありません\n" -#: work.cc:254 -#, c-format -msgid "invalid destination path ''" -msgstr "不適切な方向パス ''" +#: work.cc:318 +#, fuzzy, c-format +msgid "empty path %s is not allowed" +msgstr "パスフレーズは空にできません" -#: work.cc:265 -#, c-format -msgid "%s does not exist in current revision\n" +#: work.cc:332 +#, fuzzy, c-format +msgid "%s does not exist in current revision" msgstr "ファイル %s は現在のリビジョン内にはありません\n" -#: work.cc:268 -#, c-format -msgid "%s already exists in current revision\n" +#: work.cc:335 +#, fuzzy, c-format +msgid "destination %s already exists in current revision" msgstr "%s は現在のリビジョン内に存在しています\n" -#: work.cc:270 -#, c-format -msgid "adding %s -> %s to working copy rename set\n" -msgstr "%s -> %s を作業コピー名称変更セットに追加\n" +#: work.cc:344 +#, fuzzy, c-format +msgid "renaming %s to %s in workspace manifest" +msgstr "マニフェスト内の %d エントリを解析中\n" -#: work.cc:293 -#, c-format -msgid "%s has existing attributes in %s; clean them up first" -msgstr "%s は既存の %s 内に属性を持っています; まずそれを削除して下さい" +#: work.cc:369 +#, fuzzy, c-format +msgid "%s doesn't exist in workspace, skipping" +msgstr "リビジョン %s は db 内にありません. スキップします\n" -#: work.cc:302 -#, c-format -msgid "moving attributes for %s to %s\n" -msgstr "%s の属性を %s に移動中\n" +#: work.cc:373 +#, fuzzy, c-format +msgid "destination %s already exists in workspace, skipping" +msgstr "リビジョン '%s' は既にデータベースにあります\n" -#: work.cc:321 +#: work.cc:400 #, c-format -msgid "work path is %s\n" -msgstr "作業パスは %s です\n" +msgid "proposed new root directory '%s' is not versioned or does not exist" +msgstr "" -#: work.cc:330 -#, c-format -msgid "checking for un-committed work file %s\n" -msgstr "未コミットの作業ファイル %s を検証中\n" +#: work.cc:402 +#, fuzzy, c-format +msgid "proposed new root directory '%s' is not a directory" +msgstr "検索ルート '%s' はディレクトリではありません\n" -#: work.cc:334 +#: work.cc:407 #, c-format -msgid "read rearrangement from %s\n" -msgstr "%s から再調整読み取り\n" +msgid "proposed new root directory '%s' contains illegal path %s" +msgstr "" -#: work.cc:338 -#, c-format -msgid "no un-committed work file %s\n" -msgstr "未コミットの作業ファイル %s はありません\n" +#: work.cc:417 +#, fuzzy, c-format +msgid "directory '%s' is not versioned or does not exist" +msgstr "ディレクトリ '%s' は存在しません" -#: work.cc:375 -#, c-format -msgid "revision path is %s\n" -msgstr "リビジョンパスは %s です\n" +#: work.cc:423 +#, fuzzy, c-format +msgid "'%s' is in the way" +msgstr "'%s' はディレクトリではありません" -#: work.cc:385 -#, c-format -msgid "working copy is corrupt: %s does not exist" +#: work.cc:520 +#, fuzzy, c-format +msgid "workspace is corrupt: %s does not exist" msgstr "作業コピーは壊れています: %s は存在しません" -#: work.cc:386 -#, c-format -msgid "working copy is corrupt: %s is a directory" +#: work.cc:521 +#, fuzzy, c-format +msgid "workspace is corrupt: %s is a directory" msgstr "作業コピーは壊れています: %s は存在しません" -#: work.cc:389 -#, c-format -msgid "loading revision id from %s\n" -msgstr "%s からリビジョン ID を読み込み\n" - -#: work.cc:396 -#, c-format -msgid "Problem with working directory: %s is unreadable" +#: work.cc:531 +#, fuzzy, c-format +msgid "Problem with workspace: %s is unreadable" msgstr "作業ディレクトリに問題があります: %s を読み込めません" -#: work.cc:405 +#: work.cc:557 #, c-format -msgid "writing revision id to %s\n" -msgstr "リビジョン ID を %s に書き込み中\n" - -#: work.cc:424 -#, c-format msgid "base revision %s does not exist in database\n" msgstr "データベースに基準リビジョン %s は含まれていません\n" -#: work.cc:427 +#: work.cc:894 #, c-format -msgid "old manifest is %s\n" -msgstr "古い manifest は %s です\n" +msgid "dropping %s" +msgstr "" -#: work.cc:430 -#, c-format -msgid "base manifest %s does not exist in database\n" -msgstr "データベースに基準マニフェスト %s は含まれていません\n" +#: work.cc:905 work.cc:916 +#, fuzzy, c-format +msgid "path %s already exists" +msgstr "PID ファイル '%s' は既に存在しています" -#: work.cc:435 -#, c-format -msgid "old manifest has %d entries\n" -msgstr "古いマニフェストには %d 個のエントリがあります\n" +#: work.cc:938 work.cc:965 +#, fuzzy, c-format +msgid "adding %s" +msgstr "%s がみつかりません" -#: work.cc:456 -#, c-format -msgid "user log path is %s\n" -msgstr "ユーザーログパスは %s です\n" +#: work.cc:954 +#, fuzzy, c-format +msgid "path '%s' already exists, cannot create" +msgstr "epoch '%s' は既にデータベースにあります\n" -#: work.cc:505 -#, c-format -msgid "options path is %s\n" -msgstr "オプションパスは %s です\n" +#: work.cc:961 +#, fuzzy, c-format +msgid "renaming %s to %s" +msgstr "%s を %s から %s へ戻しています\n" -#: work.cc:552 -#, c-format -msgid "local dump path is %s\n" -msgstr "ローカルのダンプパスは %s です\n" +#: work.cc:996 +#, fuzzy, c-format +msgid "file '%s' does not exist" +msgstr "初期化ファイル '%s' は存在しません" -#: work.cc:604 -#, c-format -msgid "attribute map path is %s\n" -msgstr "属性マップパスは %s です\n" +#: work.cc:997 +#, fuzzy, c-format +msgid "file '%s' is a directory" +msgstr "'%s' はディレクトリではありません" -#: xdelta.cc:345 -#, c-format -msgid "computing binary delta instructions\n" -msgstr "バイナリ差分命令を計算中\n" +#: work.cc:1002 +#, fuzzy, c-format +msgid "content of file '%s' has changed, not overwriting" +msgstr "ファイル %s を書き込みのために開くことができません" -#: xdelta.cc:347 -#, c-format -msgid "computed binary delta instructions\n" -msgstr "バイナリ差分命令の計算結果\n" +#: work.cc:1003 +#, fuzzy, c-format +msgid "updating %s to %s" +msgstr "%s を %s に更新中\n" +#~ msgid "initializing from directory %s\n" +#~ msgstr "ディレクトリ %s から初期化中\n" + +#~ msgid "branch name is '%s'\n" +#~ msgstr "ブランチ名は '%s' です\n" + +#~ msgid "setting dump path to %s\n" +#~ msgstr "ダンプパスを %s に設定\n" + +#~ msgid "creating working copy in %s\n" +#~ msgstr "%s 内に作業コピーを作成\n" + +#~ msgid "creating bookkeeping directory '%s' for working copy in '%s'\n" +#~ msgstr "作業コピーの記録簿用ディレクトリ '%s' を '%s' 内に作成\n" + +#~ msgid "'%s' ignored by restricted path set\n" +#~ msgstr "'%s' は制限パスセットによって無視されました\n" + +#~ msgid "'%s' added to restricted path set\n" +#~ msgstr "'%s' を制限パスセットに追加しました\n" + +#~ msgid "'%s' ignored by excluded path set\n" +#~ msgstr "'%s' は除外パスセットによって無視されました\n" + +#~ msgid "'%s' added to excluded path set\n" +#~ msgstr "'%s' を除外パスセットに追加しました\n" + +#~ msgid "checking excluded path set for '%s'\n" +#~ msgstr "'%s' について除外パスセットを調べています\n" + +#~ msgid "path '%s' found in excluded path set; '%s' excluded\n" +#~ msgstr "パス '%s' は除外パスセットに含まれています; '%s' は除外されます\n" + +#~ msgid "checking restricted path set for '%s'\n" +#~ msgstr "'%s' について制限パスセットを調べています\n" + +#~ msgid "path '%s' found in restricted path set; '%s' included\n" +#~ msgstr "パス '%s' は制限パスセットに含まれています; '%s' は含められます\n" + +#~ msgid "set search root to %s\n" +#~ msgstr "検索ルートを %s に設定\n" + +#~ msgid "cert ok\n" +#~ msgstr "証明 OK\n" + +#~ 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" + +#~ 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" + +#~ msgid "cert: signable text %s\n" +#~ msgstr "証明: 署名テキスト %s\n" + +#, fuzzy +#~ msgid "no private key '%s' found in key store or get_priv_key hook" +#~ msgstr "" +#~ "秘密鍵 '%s' はデータベース内にも get_priv_key フック内にもみつかりません" + +#, fuzzy +#~ msgid "mismatch between key '%s' in key store and get_key_pair hook" +#~ msgstr "" +#~ "秘密鍵 '%s' はデータベース内のものと get_priv_key フック内のものが一致して" +#~ "いません" + +#~ msgid "tid %d: parent %d, type %s, name %s\n" +#~ msgstr "tid %d: 親 %d、タイプ %s、名前 %s\n" + +#~ msgid "%d -> %d\n" +#~ msgstr "%d -> %d\n" + +#~ msgid "concatenating change sets\n" +#~ msgstr "変更セットを結合中\n" + +#~ msgid "concatenating %d and %d deltas\n" +#~ msgstr "%d と %d の差分を結合中\n" + +#~ msgid "processing delta on %s\n" +#~ msgstr "%s の差分を処理中\n" + +#~ msgid "delta on %s in first changeset renamed to %s\n" +#~ msgstr "最初の変更セット内の %s についての差分は %s への名称変更です\n" + +#~ msgid "discarding delta [%s]->[%s] for deleted file '%s'\n" +#~ msgstr "差分 [%s]->[%s] (対象は削除されたファイル '%s') を破棄\n" + +#~ msgid "fusing deltas on %s : %s -> %s and %s -> %s\n" +#~ msgstr "%s の差分を融合中: %s -> %s と %s -> %s\n" + +#~ msgid "delta on %s in second changeset copied forward\n" +#~ msgstr "第二の変更セット内の %s の差分のコピーを転送しました\n" + +#~ msgid "finished concatenation\n" +#~ msgstr "結合終了\n" + +#~ msgid "delete of %s dominates rename to %s\n" +#~ msgstr "%s の削除は %s への名称変更を決定付けます\n" + +#~ msgid "unable to resolve file conflict '%s' -> '%s' vs. '%s'" +#~ msgstr "ファイルの競合 '%s' -> '%s' 対 '%s' を解決できません" + +#~ msgid "unable to resolve dir conflict '%s' -> '%s' vs. '%s'" +#~ msgstr "ディレクトリの競合 '%s' -> '%s' 対 '%s' を解決できません" + +#~ msgid "illegal conflict resolution '%s', wanted '%s' or '%s'\n" +#~ msgstr "不法な競合の解決 '%s'. '%s' または '%s' であるべきです\n" + +#~ msgid "tid %d (%s) clobbered tid %d (%s)\n" +#~ msgstr "tid %d (%s) は tid %d (%s) を上書きします\n" + +#~ msgid "skipping common change on %s (tid %d)\n" +#~ msgstr "%s (tid %d) への共通の変更をスキップ\n" + +#~ msgid "skipping neutral change of %s -> %s (tid %d)\n" +#~ msgstr "中立の変更 %s -> %s (tid %d) をスキップ\n" + +#~ msgid "propagating change on %s -> %s (tid %d)\n" +#~ msgstr "変更を伝播中: %s -> %s (tid %d)\n" + +#~ msgid "conflict detected, resolved in A's favour\n" +#~ msgstr "競合を検出. A フレーバで解決\n" + +#~ msgid "conflict detected, resolved in B's favour\n" +#~ msgstr "競合を検出. B フレーバで解決\n" + +#~ msgid "reusing merge resolution '%s' : '%s' -> '%s'\n" +#~ msgstr "統合解決案 '%s' を再利用 : '%s' -> '%s'\n" + +#~ msgid "merge of '%s' : '%s' vs. '%s' (no common ancestor) failed" +#~ msgstr "'%s' の統合に失敗: '%s' と '%s' が対立 (共通の祖先なし)" + +#~ msgid "merge of '%s' : '%s' -> '%s' vs '%s' failed" +#~ msgstr "'%s' の統合に失敗: '%s' -> '%s' と '%s' が対立" + +#~ msgid "merge of '%s' : '%s' -> '%s' vs '%s' resolved to '%s'\n" +#~ msgstr "'%s' の統合: '%s' -> '%s' と '%s' の対立を '%s' に解決\n" + +#~ msgid "skipping delta '%s'->'%s' on deleted file '%s'\n" +#~ msgstr "差分 '%s'->'%s' (対象=削除されたファイル '%s') をスキップ\n" + +#~ msgid "merge is copying delta '%s' : '%s' -> '%s'\n" +#~ msgstr "統合は差分 '%s' : '%s' -> '%s' のコピーです\n" + +#~ msgid "propagating new file addition delta on '%s' : '%s' -> '%s'\n" +#~ msgstr "'%s' の新規ファイル追加差分を伝播中: '%s' -> '%s'\n" + +#~ msgid "skipping new file addition delta on '%s' : '' -> '%s'\n" +#~ msgstr "'%s' の新規ファイル追加差分をスキップ: '' -> '%s'\n" + +#~ msgid "skipping common delta '%s' : '%s' -> '%s'\n" +#~ msgstr "共通の差分 '%s' をスキップ: '%s' -> '%s'\n" + +#~ msgid "skipping neutral delta on '%s' : %s -> %s\n" +#~ msgstr "中立の差分 '%s' をスキップ: '%s' -> '%s'\n" + +#~ msgid "propagating unperturbed delta on '%s' : '%s' -> '%s'\n" +#~ msgstr "'%s' の摂動を受けない差分を伝播中: '%s' -> '%s'\n" + +#~ msgid "merging delta '%s' : '%s' -> '%s' vs. '%s'\n" +#~ msgstr "差分 '%s' を統合中: '%s' -> '%s' 対 '%s'\n" + +#~ msgid "resolved merge to '%s' : '%s' -> '%s'\n" +#~ msgstr "'%s' への統合を解決しました: '%s' -> '%s'\n" + +#~ msgid "merging change sets\n" +#~ msgstr "変更セットを統合中\n" + +#~ msgid "finished merge\n" +#~ msgstr "統合終了\n" + +#~ msgid "inverting change set\n" +#~ msgstr "変更セットを反転中\n" + +#~ msgid "converted 'delete %s' to 'add as %s' in inverse\n" +#~ msgstr "'%s の削除' を '%s の追加' (逆方向)に変換しました\n" + +#~ msgid "converted add %s to delete in inverse\n" +#~ msgstr "%s の追加を削除(逆方向)に変換しました\n" + +#~ msgid "converting delta %s -> %s on %s\n" +#~ msgstr "差分 %s -> %s (対象 %s) を変換\n" + +#~ msgid "inverse is delta %s -> %s on %s\n" +#~ msgstr "逆方向の差分は %s -> %s (対象=%s) です\n" + +#~ msgid "moving file %s -> %s\n" +#~ msgstr "ファイルを移動 %s -> %s\n" + +#~ msgid "moving dir %s -> %s\n" +#~ msgstr "ディレクトリを移動 %s -> %s\n" + +#~ msgid "expanding command '%s'\n" +#~ msgstr "コマンド '%s' を展開\n" + +#~ msgid "expanded command to '%s'\n" +#~ msgstr "コマンドを '%s' に展開\n" + +#~ msgid "executing command '%s'\n" +#~ msgstr "コマンド '%s' を実行中\n" + +#~ msgid "working copy" +#~ msgstr "作業コピー" + +#~ msgid "SRC DST" +#~ msgstr "SRC DST" + +#~ msgid "dumping file '%s'\n" +#~ msgstr "ファイル '%s' をダンプ\n" + +#~ msgid "found %d %s branch certs on revision %s\n" +#~ msgstr "%d %s ブランチ証明がリビジョン %s でみつかりました\n" + +#~ msgid "no manifest %s found in database" +#~ msgstr "マニフェスト %s はデータベース内にはみつかりません" + +#~ msgid "checking out revision %s to directory %s\n" +#~ msgstr "リビジョン %s をディレクトリ %s に取り出し中\n" + +#~ msgid "writing file %s to %s\n" +#~ msgstr "ファイル %s を %s に書き込み中\n" + +#~ msgid "OLDID NEWID" +#~ msgstr "OLDID NEWID" + +#~ msgid "write manifest delta packet to stdout" +#~ msgstr "マニフェスト差分パケットを標準出力に出力" + +#~ msgid "no such manifest '%s'" +#~ msgstr "マニフェスト '%s' は存在しません" + +#~ msgid "write file delta packet to stdout" +#~ msgstr "ファイル差分パケットを標準出力に出力" + +#~ msgid "no such file '%s'" +#~ msgstr "ファイル '%s' は存在しません" + +#~ msgid "write revision data packet to stdout" +#~ msgstr "リビジョンデータパケットを標準出力に出力" + +#~ msgid "write manifest data packet to stdout" +#~ msgstr "マニフェストデータパケットを標準出力に出力" + +#~ msgid "write file data packet to stdout" +#~ msgstr "ファイルデータパケットを標準出力に出力" + +#~ msgid "write cert packets to stdout" +#~ msgstr "証明パケットを標準出力に出力" + +#~ msgid "rebuild the indices used to sync over the network" +#~ msgstr "ネットワークを介して同期するのに使う索引を再構築" + +#~ msgid "using default server address: %s\n" +#~ msgstr "デフォルトのサーバーアドレスを利用: %s\n" + +#~ msgid "using default branch include pattern: '%s'\n" +#~ msgstr "ブランチ名に含めるデフォルトのパターンを利用: '%s'\n" + +#~ msgid "excluding: %s\n" +#~ msgstr "除外: %s\n" + +#~ msgid "" +#~ "new manifest '%s'\n" +#~ "new revision '%s'\n" +#~ msgstr "" +#~ "新規マニフェスト '%s'\n" +#~ "新規リビジョン '%s'\n" + +#~ 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 は空ではなく、 --message が指定されています.\n" +#~ "もしかしたら MT/log を移動/削除したか、コマンド\n" +#~ "行から --message を削除したのではありませんか?" + +#~ msgid "inserting new revision %s\n" +#~ msgstr "新規リビジョン %s を挿入中\n" + +#~ msgid "skipping manifest %s, already in database\n" +#~ msgstr "既にデータベースにあるマニフェスト %s をスキップ\n" + +#~ msgid "inserting manifest delta %s -> %s\n" +#~ msgstr "マニフェスト差分 %s -> %s を挿入中\n" + +#~ msgid "inserting full manifest %s\n" +#~ msgstr "完全マニフェスト %s を挿入中\n" + +#~ msgid "skipping file delta %s, already in database\n" +#~ msgstr "既にデータベースにあるファイル差分 %s をスキップ\n" + +#~ msgid "inserting delta %s -> %s\n" +#~ msgstr "差分 %s -> %s を挿入中\n" + +#~ msgid "inserting full version %s\n" +#~ msgstr "完全なバージョン %s を挿入中\n" + +#~ msgid "no common ancestor for %s and %s" +#~ msgstr "%s と %s には共通の祖先がありません" + +#~ msgid "concatenating un-committed changeset to composite\n" +#~ msgstr "合成のためにコミットされていない変更セットを連結\n" + +#~ msgid "LEFT RIGHT" +#~ msgstr "LEFT RIGHT" + +#~ msgid "print least common ancestor" +#~ msgstr "最も近い祖先を表示" + +#~ msgid "no common ancestor found" +#~ msgstr "共通の祖先はありませんでした" + +#~ msgid "print least common ancestor / dominator" +#~ msgstr "最も近い祖先 / 支配者を表示" + +#~ msgid "no common ancestor/dominator found" +#~ msgstr "共通の祖先 / 支配者がみつかりません" + +#~ 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 "" +#~ "作業コピーを更新。\n" +#~ "リビジョンが指定されていればそれに基づいて、指定されていなければ\n" +#~ "明示的または暗黙に指定されたブランチの最新版に基づいて更新します。" + +#~ msgid "updating along chosen edge %s -> %s\n" +#~ msgstr "選択した先端 %s -> %s に従って更新中\n" + +#~ msgid "merging working copy with chosen edge %s -> %s\n" +#~ msgstr "作業コピーを選択した先端 %s -> %s と統合中\n" + +#~ msgid "" +#~ "common ancestor %s found\n" +#~ "trying 3-way merge\n" +#~ msgstr "" +#~ "共通の祖先 %s を発見\n" +#~ "3方結合を試みています\n" + +#~ msgid "no common ancestor found, synthesizing edges\n" +#~ msgstr "共通の祖先がありませんでしたので、先端同士を同期中\n" + +#~ msgid "" +#~ "LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" +#~ "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" +#~ msgstr "" +#~ "LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n" +#~ "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH" + +#~ msgid "annotate file file_path '%s'\n" +#~ msgstr "注釈ファイル file_path '%s'\n" + +#~ msgid "no such file '%s' in revision '%s'\n" +#~ msgstr "ファイル '%s' はリビジョン %s 内にはありません\n" + +#~ msgid "annotate for file_id %s\n" +#~ msgstr "file_id %s に対する注釈\n" + +#~ msgid "revision '%s' in '%s' maps to '%s' in %s\n" +#~ msgstr "リビジョン '%s' ('%s' 内) を '%s' (%s 内) にマップ\n" + +#~ msgid "DIRECTORY" +#~ msgstr "DIRECTORY" + +#~ msgid "checking %d files\n" +#~ msgstr "%d 個のファイルを検証中\n" + +#~ msgid "checking file %s\n" +#~ msgstr "ファイル %s を検証中\n" + +#~ msgid "checking %d manifests\n" +#~ msgstr "%d 個のマニフェストを検証中\n" + +#~ msgid "manifests" +#~ msgstr "マニフェスト" + +#~ msgid "checking manifest %s\n" +#~ msgstr "マニフェスト %s を検証中\n" + +#~ msgid "error parsing manifest %s: %s" +#~ msgstr "マニフェスト %s: %s を解析中にエラー" + +#~ msgid "checking %d revisions\n" +#~ msgstr "%d 個のリビジョンを検証中\n" + +#~ msgid "checking revision %s\n" +#~ msgstr "リビジョン %s を検証中\n" + +#~ msgid "error parsing revision %s: %s" +#~ msgstr "リビジョン %s: %s を解析中にエラー" + +#~ msgid "checked %d revisions after starting with %d\n" +#~ msgstr "%d 個のリビジョンを %d からはじめて検証しました\n" + +#~ msgid "checking %d ancestry edges\n" +#~ msgstr "%d 個の祖先の端を検証中\n" + +#~ msgid "checking %d public keys\n" +#~ msgstr "%d 個の公開鍵を検証中\n" + +#~ msgid "checking %d revision certs\n" +#~ msgstr "%d 個のリビジョン証明を検証中\n" + +#~ msgid "checking local history of %d revisions\n" +#~ msgstr "%d 個のリビジョンのローカルの履歴を検証中\n" + +#~ msgid "manifest %s missing (%d revision references)\n" +#~ msgstr "マニフェスト %s がありません (リビジョン参照: %d)\n" + +#~ msgid "manifest %s unreferenced\n" +#~ msgstr "マニフェスト %s は参照されていません\n" + +#~ msgid "manifest %s is not parseable (perhaps with unnormalized paths?)\n" +#~ msgstr "" +#~ "マニフェスト %s を解析できません (パスが正規化されていないのでは?)\n" + +#~ msgid "key %s signed %d certs\n" +#~ msgstr "鍵 %s は %d 個の証明の署名に使われています\n" + +#~ msgid "%d missing manifests\n" +#~ msgstr "みつからないマニフェスト: %d\n" + +#~ msgid "%d unreferenced manifests\n" +#~ msgstr "参照されていないマニフェスト: %d\n" + +#~ msgid "%d manifests not parseable (perhaps with invalid paths)\n" +#~ msgstr "解析できないマニフェスト(不適切なパスを指定していませんか?): %d\n" + +#~ msgid "%d manifests not in normalized form\n" +#~ msgstr "正規化された形式になっていないマニフェスト: %d\n" + +#~ msgid "mcerts" +#~ msgstr "mcerts" + +#~ msgid "pubkeys" +#~ msgstr "公開鍵" + +#~ msgid "privkeys" +#~ msgstr "秘密鍵" + +#~ msgid "statement cache statistics\n" +#~ msgstr "ステートメントキャッシュ統計\n" + +#~ msgid "prepared %d statements\n" +#~ msgstr "%d 個のプリペアードステートメント\n" + +#~ msgid "%d executions of %s\n" +#~ msgstr "%d 実行 (%s)\n" + +#~ msgid "prepared statement %s\n" +#~ msgstr "プリペアードステートメント %s\n" + +#~ msgid "binding %d parameters for %s\n" +#~ msgstr "%d 変数を %s にバインド\n" + +#~ msgid "binding %d with value '%s'\n" +#~ msgstr "%d を値 '%s' にバインド\n" + +#~ msgid "cannot change filename to %s while db is open" +#~ msgstr "" +#~ "データベースが使用中なのでファイル名を %s に変更することができません" + +#~ msgid "version cache expiring %s\n" +#~ msgstr "バージョンキャッシュの有効期限が切れています: %s\n" + +#~ msgid "version cache hit on %s\n" +#~ msgstr "バージョンキャッシュヒット: %s\n" + +#~ msgid "reconstructing %s in %s\n" +#~ msgstr "%s (%s 内)を再構築中\n" + +#~ msgid "following delta %s -> %s\n" +#~ msgstr "続く差分 %s -> %s\n" + +#~ msgid "Killing revision %s locally\n" +#~ msgstr "ローカルにリビジョン %s を削除\n" + +#~ msgid "Deleting all references to branch %s\n" +#~ msgstr "ブランチ %s へのすべての参照を削除\n" + +#~ msgid "Deleting all references to tag %s\n" +#~ msgstr "タグ %s へのすべてのリファレンスを削除\n" + +#, fuzzy +#~ msgid "after get_branch_heads for %s, heads has %d entries\n" +#~ msgstr "ブランチ %s には %d 個のエントリがあります\n" + +#, fuzzy +#~ msgid "limiting to current branch '%s'\n" +#~ msgstr "ブランチ %s へのすべての参照を削除\n" + +#~ msgid "exchanging preserved extent [%d+%d] with changed extent [%d+%d]\n" +#~ msgstr "" +#~ "前に確保したエクステント [%d+%d] を変更されたエクステント [%d+%d] に置き換" +#~ "えています\n" + +#~ msgid "conflicting edits: %s %d[%d] '%s' vs. %s %d[%d] '%s'\n" +#~ msgstr "競合する編集箇所: %s %d[%d] '%s' 対 %s %d[%d] '%s'\n" + +#~ msgid "conflicting edits: [%s %d %d] vs. [%s %d %d]\n" +#~ msgstr "競合する編集箇所: [%s %d %d] 対 [%s %d %d]\n" + +#~ msgid "calculating left edit script on %d -> %d lines\n" +#~ msgstr "%d -> %d 行について左側を編集するスクリプトを計算中\n" + +#~ msgid "calculating right edit script on %d -> %d lines\n" +#~ msgstr "%d -> %d 行について右側を編集するスクリプトを計算中\n" + +#~ msgid "calculating left extents on %d edits\n" +#~ msgstr "%d 編集箇所について左エクステントを計算中\n" + +#~ msgid "calculating right extents on %d edits\n" +#~ msgstr "%d 編集箇所について右エクステントを計算中\n" + +#~ msgid "normalizing %d right extents\n" +#~ msgstr "%d 右エクステントを正規化\n" + +#~ msgid "normalizing %d left extents\n" +#~ msgstr "%d 左エクステントを正規化\n" + +#~ msgid "conflicting prefixes\n" +#~ msgstr "競合するプレフィクス\n" + +#~ msgid "conflicting suffixes\n" +#~ msgstr "競合するサフィックス\n" + +#~ msgid "merging %d left, %d right extents\n" +#~ msgstr "%d 左, %d 右エクステントを統合\n" + +#~ msgid "conflict detected. no merge.\n" +#~ msgstr "競合を検出、統合しません\n" + +#~ msgid "recording successful merge of %s <-> %s into %s\n" +#~ msgstr "%s <-> %s から %s への成功した統合を記録\n" + +#~ msgid "trying to merge %s <-> %s (ancestor: %s)\n" +#~ msgstr "%s <-> %s (祖先: %s) の統合を試しています\n" + +#~ msgid "files are identical\n" +#~ msgstr "ファイルは全く同じです\n" + +#~ msgid "internal 3-way merged ok\n" +#~ msgstr "内部三元統合完了\n" + +#~ msgid "lua merge3 hook merged ok\n" +#~ msgstr "lua merge3 フック統合完了\n" + +#~ msgid "trying to merge %s <-> %s\n" +#~ msgstr "%s <-> %s の統合を試しています\n" + +#~ msgid "" +#~ "help required for 2-way merge\n" +#~ "[ left] %s\n" +#~ "[ right] %s\n" +#~ "[ merged] %s\n" +#~ msgstr "" +#~ "二元統合には手助けが必要です\n" +#~ "[ 左] %s\n" +#~ "[ 右] %s\n" +#~ "[統合済] %s\n" + +#~ msgid "lua merge2 hook merged ok\n" +#~ msgstr "lua merge2 フック統合完了\n" + +#~ msgid "temporarily recording merge of %s <-> %s into %s\n" +#~ msgstr "一時的に %s <-> %s から %s への統合を記録\n" + +#~ msgid "ignoring book keeping entry %s\n" +#~ msgstr "記録簿用エントリ %s を無視します\n" + +#~ msgid "running arc4 process on %d bytes of data\n" +#~ msgstr "データ %d バイト目について arc4 プロセスを実行中\n" + +#~ msgid "" +#~ "generated %d-byte public key\n" +#~ "generated %d-byte (encrypted) private key\n" +#~ msgstr "" +#~ "%d バイトの公開鍵を生成\n" +#~ "%d バイトの(暗号化された)秘密鍵を生成\n" + +#~ msgid "base64-decoding %d-byte private key\n" +#~ msgstr "%d バイト秘密鍵の base64 デコード\n" + +#, fuzzy +#~ msgid "have %d-byte encrypted private key\n" +#~ msgstr "%d バイトの復号化された秘密鍵から署名を作成中\n" + +#, fuzzy +#~ msgid "base64-decoding %d-byte old private key\n" +#~ msgstr "%d バイト秘密鍵の base64 デコード\n" + +#~ msgid "building signer from %d-byte decrypted private key\n" +#~ msgstr "%d バイトの復号化された秘密鍵から署名を作成中\n" + +#~ msgid "produced %d-byte signature\n" +#~ msgstr "%d バイトの署名を作成\n" + +#~ msgid "building verifier for %d-byte pub key\n" +#~ msgstr "%d バイトの公開鍵について識別子を構築中\n" + +#~ msgid "checking %d-byte (%d decoded) signature\n" +#~ msgstr "%d バイト (%d デコード)の署名を検証中\n" + +#~ msgid "lua failure: %s; stack = %s\n" +#~ msgstr "lua 失敗: %s; スタック = %s\n" + +#, fuzzy +#~ msgid "Lua::ok(): failed" +#~ msgstr "Lua::ok(): 失敗 = %i" + +#~ msgid "lua stack: %s" +#~ msgstr "lua スタック: %s" + +#~ msgid "lua: extracted string = %s" +#~ msgstr "lua: 抽出文字列 = %s" + +#~ msgid "lua: extracted int = %i" +#~ msgstr "lua: 抽出 int = %i" + +#~ msgid "lua: extracted double = %i" +#~ msgstr "lua: 抽出 double = %i" + +#~ msgid "lua: extracted bool = %i" +#~ msgstr "lua: 抽出 bool = %i" + +#~ msgid "loading lua hook %s" +#~ msgstr "lua フック %s を読み込み中" + +#~ msgid "opening rcfile '%s' ...\n" +#~ msgstr "初期化ファイル '%s' を開いています...\n" + +#~ msgid "'%s' is ok\n" +#~ msgstr "'%s' OK\n" + +#~ msgid "calling attr_init_function for %s" +#~ msgstr "%s について attr_init_function を呼出し" + +#~ msgid " calling an attr_init_function for %s" +#~ msgstr " %s について attr_init_function を呼出し" + +#~ msgid " added attr %s = %s" +#~ msgstr " 属性 %s = %s を追加" + +#~ msgid " no attr added" +#~ msgstr " 属性追加なし" + +#~ msgid "scanning file %s\n" +#~ msgstr "ファイル %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 "" +#~ "一貫性を保つために必要な\n" +#~ "ファイルが %d 個みつかりません。各々のファイルについて\n" +#~ "'monotone drop FILE' として恒久的にファイルを削除するか、\n" +#~ "'monotone revert FILE' として復活させて下さい。\n" + +#~ msgid "command line: %s\n" +#~ msgstr "コマンド行: %s\n" + +#~ msgid "set locale: LC_ALL=%s\n" +#~ msgstr "ロカール設定: LC_ALL=%s\n" + +#~ msgid "Removed 'hidden' from option # %d\n" +#~ msgstr "オプション # %d から 'hidden' を削除\n" + +#~ msgid "Added 'hidden' to option # %d\n" +#~ msgstr "オプション # %d に 'hidden' を追加\n" + +#~ msgid "revs written" +#~ msgstr "書き込んだリビジョン" + +#~ msgid "all epochs processed, opening database valve\n" +#~ msgstr "すべての epoch を処理しました。データベースバルブを開いています\n" + +#~ msgid "dropping outgoing netcmd (because we're in error unwind mode)\n" +#~ msgstr "エラー回復が可能なモードですので、外向きの netcmd を破棄します\n" + +#~ msgid "analyzing %d ancestry edges\n" +#~ msgstr "%d 個の系の端を解析中\n" + +#~ msgid "Dropping branch certs for unwanted branch %s" +#~ msgstr "希望しないブランチ %s のブランチ証明を削除" + +#, fuzzy +#~ msgid "analyze_ancestry_graph" +#~ msgstr "%d 個の系の端を解析中\n" + +#~ msgid "read %d bytes from fd %d (peer %s)\n" +#~ msgstr "%d バイト fd %d (ピーア %s) から読み込み\n" + +#~ msgid "in error unwind mode, so throwing them into the bit bucket\n" +#~ msgstr "エラー回復可能モードですので、これらをビットバケット中に捨てます\n" + +#~ msgid "wrote %d bytes to fd %d (peer %s)\n" +#~ msgstr "%d バイト fd %d (ピーア %s) へ書き込み\n" + +#~ msgid "finished flushing output queue in error unwind mode, disconnecting\n" +#~ msgstr "エラー回復可能モードで出力キューをフラッシュ完了、切断中\n" + +#~ msgid "queueing 'bye' command\n" +#~ msgstr "'bye' コマンドをキューに追加\n" + +#~ msgid "queueing 'error' command\n" +#~ msgstr "'error' コマンドをキューに追加\n" + +#~ msgid "queueing 'done' command for %s level %s\n" +#~ msgstr "'%s' (レベル %s) について 'done' コマンドをキューに追加\n" + +#~ msgid "queueing request for refinement of %s node '%s', level %d\n" +#~ msgstr "%s ノード '%s', レベル %d の微調整要求をキューに追加\n" + +#~ msgid "not queueing request for %s '%s' as we are in pure source role\n" +#~ msgstr "" +#~ "純粋なソースの役割を果しているので %s '%s' の要求はキューに追加しません\n" + +#~ msgid "not queueing request for %s '%s' as we already requested it\n" +#~ msgstr "既に要求済みの %s '%s' はキューに追加しません\n" + +#~ msgid "queueing request for data of %s item '%s'\n" +#~ msgstr "%s アイテム '%s' のデータ要求をキューに追加\n" + +#~ msgid "" +#~ "not queueing request for %s delta '%s' -> '%s' as we are in pure source " +#~ "role\n" +#~ msgstr "" +#~ "純粋なソースの役割を果しているので %s 差分 '%s' -> '%s' の要求をキューに追" +#~ "加しません\n" + +#~ msgid "" +#~ "not queueing request for %s delta '%s' -> '%s' as we already requested " +#~ "the target\n" +#~ msgstr "" +#~ "既に要求済みなので %s 差分 '%s' -> '%s' の要求をキューに追加しません\n" + +#~ msgid "queueing request for contents of %s delta '%s' -> '%s'\n" +#~ msgstr "%s 差分 '%s' -> '%s' の内容について要求をキューに追加\n" + +#~ msgid "not queueing %s data for '%s' as we are in pure sink role\n" +#~ msgstr "" +#~ "純粋なシンクの役割を果しているので %s データ (対象: '%s' )をキューに追加し" +#~ "ません\n" + +#~ msgid "queueing %d bytes of data for %s item '%s'\n" +#~ msgstr "%d バイト (%s アイテム '%s' のデータ)をキューに追加\n" + +#~ msgid "not queueing %s delta '%s' -> '%s' as we are in pure sink role\n" +#~ msgstr "" +#~ "純粋なシンクの役割を果しているので %s 差分 '%s' -> '%s' をキューに追加しま" +#~ "せん\n" + +#~ msgid "" +#~ "not queueing note of nonexistence of %s item '%s' as we are in pure sink " +#~ "role\n" +#~ msgstr "" +#~ "純粋なシンクの役割を果しているので %s アイテム '%s' がないことについてノー" +#~ "トをキューに追加しません\n" + +#~ msgid "queueing note of nonexistance of %s item '%s'\n" +#~ msgstr "%s アイテム '%s' がないことについてノートをキューに追加\n" + +#~ msgid "received 'bye' netcmd\n" +#~ msgstr "'bye' netcmd を受信\n" + +#~ msgid "received 'done' for empty %s level %d, marking as complete\n" +#~ msgstr "空の %s レベル %d について 'done' 受信, 完了としてマーク\n" + +#~ msgid "" +#~ "received 'done' for %s level %d, which had refinements; sending echo of " +#~ "done for level %d\n" +#~ msgstr "" +#~ "微調整を含む %s レベル %d について 'done' 受信;レベル %d の各 'done' につ" +#~ "いて送信\n" + +#~ msgid "server key has name %s, hash %s\n" +#~ msgstr "サーバー鍵の名前 %s、ハッシュ %s\n" + +#~ msgid "received 'hello' netcmd from server '%s' with nonce '%s'\n" +#~ msgstr "サーバー '%s' から nonce '%s' と一緒に 'hello' netcmd を受信\n" + +#~ msgid "client signature OK, accepting authentication\n" +#~ msgstr "クライアント署名 OK、認証完了\n" + +#~ msgid "" +#~ "received 'confirm' netcmd from server '%s' for pattern '%s' exclude '%s' " +#~ "in %s mode\n" +#~ msgstr "" +#~ "サーバー '%s' からパターン '%s' ('%s' を除く; %s モード)への 'confirm' " +#~ "netcmd を受信しました\n" + +#~ msgid "server signature OK, accepting authentication\n" +#~ msgstr "サーバー署名 OK、認証完了\n" + +#~ msgid "bad server signature\n" +#~ msgstr "不正なサーバー署名\n" + +#~ msgid "unknown server key\n" +#~ msgstr "不明なサーバー鍵\n" + +#~ msgid "public key '%s' is also called '%s'\n" +#~ msgstr "公開鍵 '%s' の別名は '%s' です\n" + +#~ msgid "manifest '%s' does not exist in our database" +#~ msgstr "こちらのデータベースにはマニフェスト '%s' は含まれていません" + +#~ msgid "received 'refine' netcmd on %s node '%s', level %d\n" +#~ msgstr "%s ノード '%s'、レベル %d で 'refine' netcmd を受信\n" + +#~ msgid "no corresponding %s merkle node for prefix '%s', level %d\n" +#~ msgstr "" +#~ "相当する %s merkle ノード(対象: プレフィクス '%s'、レベル %d) を持っていま" +#~ "せん\n" + +#~ msgid "found corresponding %s merkle node for prefix '%s', level %d\n" +#~ msgstr "" +#~ "相当する %s merkle ノード (対象: プレフィクス '%s', レベル %d) をみつけま" +#~ "した\n" + +#~ msgid "received 'send_data' netcmd requesting %s '%s'\n" +#~ msgstr "%s '%s' を要求する 'send_data' netcmd を受信\n" + +#~ msgid "received 'send_delta' netcmd requesting %s edge '%s' -> '%s'\n" +#~ msgstr "%s 先端 '%s' -> '%s' を要求する 'send_delta' netcmd を受信\n" + +#~ msgid "delta requested for item type %s\n" +#~ msgstr "アイテムタイプ %s について要求された差分\n" + +#~ msgid "received epoch %s for branch %s\n" +#~ msgstr "epoch %s (ブランチ %s) を受信\n" + +#~ msgid "branch %s has no epoch; setting epoch to %s\n" +#~ msgstr "ブランチ %s には epoch はありませんので、epoch を %s に設定します\n" + +#~ msgid "branch %s already has an epoch; checking\n" +#~ msgstr "ブランチ %s には既に epoch があります。検証中\n" + +#~ msgid "public key '%s' already exists in our database\n" +#~ msgstr "公開鍵 '%s' は既にデータベースにあります\n" + +#~ msgid "cert '%s' already exists in our database\n" +#~ msgstr "証明 '%s' は既にデータベースにあります\n" + +#~ msgid "manifest version '%s' already exists in our database\n" +#~ msgstr "バージョン '%s' のマニフェストは既にデータベースにあります\n" + +#~ msgid "file version '%s' already exists in our database\n" +#~ msgstr "バージョン '%s' のファイルは既にデータベースにあります\n" + +#~ msgid "ignoring delta received for item type %s\n" +#~ msgstr "アイテムタイプ %s について受信した差分を無視\n" + +#~ msgid "received 'nonexistant' netcmd for %s '%s'\n" +#~ msgstr "%s '%s' について 'nonexistant' netcmd を受信\n" + +#~ msgid "Received greeting from usher: %s" +#~ msgstr "門番から受け入れ挨拶を受信: %s" + +#~ msgid "Sent reply." +#~ msgstr "応答を送信" + +#~ msgid "" +#~ "received 'anonymous' netcmd from client for pattern '%s' excluding '%s' " +#~ "in %s mode\n" +#~ msgstr "" +#~ "クライアントからパターン '%s' ('%s' を除く; %s モード)への 'anonymous' " +#~ "netcmd を受信\n" + +#~ msgid "" +#~ "received 'auth(hmac)' netcmd from client '%s' for pattern '%s' exclude '%" +#~ "s' in %s mode with nonce1 '%s'\n" +#~ msgstr "" +#~ "クライアント '%s' からパターン '%s' ('%s' を除く; モード %s) について " +#~ "nonce1 '%s' とともに 'auth(hmac)' netcmd を受信\n" + +#~ msgid "processing %d byte input buffer from peer %s\n" +#~ msgstr "%d バイトの入力バッファ (送信元: ピーア %s) を処理中\n" + +#, fuzzy +#~ msgid "failed to process '%s' packet" +#~ msgstr "データ文字列 '%s' の解析に失敗: %s" + +#~ msgid "read from fd %d (peer %s) closed OK after goodbye\n" +#~ msgstr "" +#~ "fd %d (ピーア %s) からの読み込みは goodbye の後で問題なく閉じました\n" + +#~ msgid "read from fd %d (peer %s) failed, disconnecting\n" +#~ msgstr "fd %d (ピーア %s) からの読み込みに失敗, 切断中\n" + +#~ msgid "write on fd %d (peer %s) closed OK after goodbye\n" +#~ msgstr "fd %d (ピーア %s) への書き込みは goodbye の後で問題なく閉じました\n" + +#~ msgid "write on fd %d (peer %s) failed, disconnecting\n" +#~ msgstr "fd %d (ピーア %s) からの書き込みに失敗、切断中\n" + +#~ msgid "terminated exchange with %s\n" +#~ msgstr "%s との交換を切断\n" + +#~ msgid "fd %d is armed\n" +#~ msgstr "fd %d: armed\n" + +#, fuzzy +#~ msgid "accepting new connection on %s : %s\n" +#~ msgstr "%s : %d での新しい接続を受理\n" + +#~ msgid "accept() returned a dead client\n" +#~ msgstr "accept() は死んだクライアントを返しました\n" + +#~ msgid "fd %d (peer %s) read failed, disconnecting\n" +#~ msgstr "fd %d (ピーア %s) 読み込み失敗、切断中\n" + +#~ msgid "fd %d (peer %s) write failed, disconnecting\n" +#~ msgstr "fd %d (ピーア %s) 書き込み失敗、切断中\n" + +#~ msgid "" +#~ "fd %d (peer %s) exchanged goodbyes and flushed output, disconnecting\n" +#~ msgstr "" +#~ "fd %d (ピーア %s) は goodbye を交し出力をフラッシュしました。切断中\n" + +#~ msgid "i/o probe with %d armed\n" +#~ msgstr "%d armed で I/O プローブ\n" + +#, fuzzy +#~ msgid "timed out waiting for I/O (listening on %s : %s)\n" +#~ msgstr "I/O (%s : %d でリスン中) 待機中にタイムアウト\n" + +#~ msgid "got woken up for action on unknown fd %d\n" +#~ msgstr "不明な fd %d はアクションのために起こされました\n" + +#~ msgid "got some OOB data on fd %d (peer %s), disconnecting\n" +#~ msgstr "fd %d (ピーア %s) で OOB データを受信し、切断中\n" + +#~ msgid "including branch %s" +#~ msgstr "ブランチ %s を含めます" + +#~ msgid "setting epoch on %s to zero\n" +#~ msgstr "%s の epoch を零に設定\n" + +#, fuzzy +#~ msgid "traversing head %s" +#~ msgstr "最新版 %s を保存しています\n" + +#~ msgid "writing delayed revision data packet for %s\n" +#~ msgstr "%s について遅延したリビジョンデータパケットを書き込み中\n" + +#~ msgid "discarding revision data packet %s with unmet dependencies\n" +#~ msgstr "依存関係を満たさないリビジョンデータパケット %s を破棄\n" + +#~ msgid "writing delayed manifest data packet for %s\n" +#~ msgstr "%s について遅延したマニフェストデータパケットを書き込み中\n" + +#~ msgid "discarding manifest data packet %s with unmet dependencies\n" +#~ msgstr "依存関係を満たさないマニフェストデータパケット %s を破棄\n" + +#~ msgid "writing delayed file data packet for %s\n" +#~ msgstr "%s について遅延ファイルデータパケットを書き込み中\n" + +#, fuzzy +#~ msgid "writing delayed manifest %s packet for %s -> %s%s\n" +#~ msgstr "遅延マニフェスト %s パケット(%s -> %s)を書き込み中\n" + +#~ msgid "discarding manifest delta packet %s -> %s with unmet dependencies\n" +#~ msgstr "依存関係を満たさないマニフェスト差分パケット %s -> %s を破棄\n" + +#, fuzzy +#~ msgid "writing delayed file %s packet for %s -> %s%s\n" +#~ msgstr "遅延したファイル %s パケット(%s -> %s)を書き込み中\n" + +#~ msgid "discarding file delta packet %s -> %s with unmet dependencies\n" +#~ msgstr "依存関係を満たさないファイル差分パケット %s -> %s を破棄\n" + +#~ msgid "writing delayed revision cert on %s\n" +#~ msgstr "%s の遅延リビジョン証明を書き込み中\n" + +#~ msgid "discarding revision cert packet %s with unmet dependencies\n" +#~ msgstr "依存関係を満たさないリビジョン証明パケット %s を破棄\n" + +#~ msgid "writing delayed public key %s\n" +#~ msgstr "遅延公開鍵 %s を書き込み中\n" + +#~ msgid "writing delayed private key %s\n" +#~ msgstr "遅延秘密鍵 %s を書き込み中\n" + +#~ msgid "noting acceptence of revision %s\n" +#~ msgstr "リビジョン %s について受理したものはありません\n" + +#~ msgid "noting acceptence of manifest %s\n" +#~ msgstr "マニフェスト %s について受理したものはありません\n" + +#~ msgid "noting acceptence of file %s\n" +#~ msgstr "ファイル %s について受理したものはありません\n" + +#~ msgid "skipping existing file version %s\n" +#~ msgstr "既存のファイル、バージョン %s をスキップ\n" + +#~ msgid "delaying file delta %s -> %s for preimage\n" +#~ msgstr "事前イメージのためのファイル差分 %s -> %s を遅延\n" + +#~ msgid "skipping delta to existing file version %s\n" +#~ msgstr "既存のファイル、バージョン %s への差分をスキップ\n" + +#~ msgid "" +#~ "reconstructed file from reverse delta '%s' -> '%s' has wrong id '%s'\n" +#~ msgstr "" +#~ "逆方向の差分 '%s' -> '%s' から再構築されたファイルの ID '%s' は不正なもの" +#~ "です\n" + +#~ msgid "delaying reverse file delta %s -> %s for preimage\n" +#~ msgstr "事前イメージのための逆方向のファイル差分 %s -> %s を遅延\n" + +#~ msgid "skipping reverse delta to existing file version %s\n" +#~ msgstr "既存のファイル、バージョン %s への逆方向の差分をスキップ\n" + +#~ msgid "skipping existing manifest version %s\n" +#~ msgstr "既存のマニフェスト、バージョン %s をスキップ\n" + +#~ msgid "reconstructed manifest from delta '%s' -> '%s' has wrong id '%s'\n" +#~ msgstr "" +#~ "差分 '%s' -> '%s' から再構築されたマニフェストの ID '%s' は不正なもので" +#~ "す\n" + +#~ msgid "delaying manifest delta %s -> %s for preimage\n" +#~ msgstr "事前イメージのための逆方向のファイル差分 %s -> %s を遅延\n" + +#~ msgid "skipping delta to existing manifest version %s\n" +#~ msgstr "既存のマニフェストバージョン %s への差分をスキップ\n" + +#~ msgid "" +#~ "reconstructed manifest from reverse delta '%s' -> '%s' has wrong id '%s'\n" +#~ msgstr "" +#~ "逆方向の差分 '%s' -> '%s' から再構築されたマニフェストの ID '%s' は不正な" +#~ "ものです\n" + +#~ msgid "delaying manifest reverse delta %s -> %s for preimage\n" +#~ msgstr "事前イメージのためのマニフェストの逆方向の差分 %s -> %s を遅延\n" + +#~ msgid "skipping reverse delta to existing manifest version %s\n" +#~ msgstr "既存のマニフェスト、バージョン %s への逆方向の差分をスキップ\n" + +#~ msgid "delaying revision %s for new manifest %s\n" +#~ msgstr "リビジョン %s (新しいマニフェスト %s) を遅延\n" + +#~ msgid "delaying revision %s for old manifest %s\n" +#~ msgstr "リビジョン %s (古いマニフェスト %s) を遅延\n" + +#~ msgid "delaying revision %s for old revision %s\n" +#~ msgstr "リビジョン %s (古いリビジョン %s) を遅延\n" + +#~ msgid "delaying revision %s for old file %s\n" +#~ msgstr "リビジョン %s (古いファイル %s) を遅延\n" + +#~ msgid "delaying revision %s for new file %s\n" +#~ msgstr "リビジョン %s (新しいファイル %s) を遅延\n" + +#~ msgid "skipping existing revision %s\n" +#~ msgstr "既存のリビジョン %s をスキップ\n" + +#~ msgid "delaying revision cert on %s\n" +#~ msgstr "%s のリビジョン証明を遅延\n" + +#~ msgid "skipping existing revision cert %s\n" +#~ msgstr "既存のリビジョン証明 %s をスキップ\n" + +#~ msgid "skipping prohibited public key %s\n" +#~ msgstr "禁止された公開鍵 %s をスキップ\n" + +#~ msgid "skipping existing public key %s\n" +#~ msgstr "既存の公開鍵 %s をスキップ\n" + +#, fuzzy +#~ msgid "skipping prohibited key pair %s\n" +#~ msgstr "禁止された公開鍵 %s をスキップ\n" + +#, fuzzy +#~ msgid "skipping existing key pair %s\n" +#~ msgstr "既存の公開鍵 %s をスキップ\n" + +#~ msgid "packet valve opened\n" +#~ msgstr "パケットバルブ: 開\n" + +#~ msgid "wrote %i queued packets\n" +#~ msgstr "%i キューパケット書き込み\n" + +#, fuzzy +#~ msgid "read data packet" +#~ msgstr "データパケット読み込み\n" + +#, fuzzy +#~ msgid "read delta packet" +#~ msgstr "差分パケット読み込み\n" + +#, fuzzy +#~ msgid "read cert packet" +#~ msgstr "証明パケット読み込み\n" + +#, fuzzy +#~ msgid "read pubkey data packet" +#~ msgstr "鍵データパケット読み込み\n" + +#, fuzzy +#~ msgid "read keypair data packet" +#~ msgstr "鍵データパケット読み込み\n" + +#~ msgid "Calculating time of %s\n" +#~ msgstr "%s の時間を計算しています\n" + +#~ msgid "version %s -> tag %s\n" +#~ msgstr "バージョン %s - タグ %s\n" + +#~ msgid "skipping identity file edge\n" +#~ msgstr "識別ファイルの先端をスキップ\n" + +#~ msgid "existing path to %s found, skipping\n" +#~ msgstr "%s への既存のパスを発見、スキップ\n" + +#~ msgid "skipping identity manifest edge\n" +#~ msgstr "識別マニフェストの先端をスキップ\n" + +#~ msgid "version %s has %d lines\n" +#~ msgstr "バージョン %s には %d 行あります\n" + +#~ msgid "following RCS edge %s -> %s\n" +#~ msgstr "次の RCS 先端 %s -> %s\n" + +#~ msgid "constructed RCS version %s, inserting into database\n" +#~ msgstr "構築された RCS バージョン %s をデータベースに挿入\n" + +#~ msgid "following RCS branch %s = '%s'\n" +#~ msgstr "次の RCS ブランチ %s = '%s' を追跡\n" + +#~ msgid "finished RCS branch %s = '%s'\n" +#~ msgstr "RCS ブランチ %s ='%s' を終了\n" + +#~ msgid "importing file '%s'\n" +#~ msgstr "ファイル '%s' を取り込み中\n" + +#~ msgid "first version in branch %s would be %s\n" +#~ msgstr "ブランチ %s 内の最初のバージョンは %s でしょう\n" + +#~ msgid "file branchpoint for %s at %s\n" +#~ msgstr "%s のファイルブランチ点 %s\n" + +#~ msgid "skipping non-RCS file %s\n" +#~ msgstr "非 RCS ファイル %s をスキップ\n" + +#~ msgid "examining next commit [t:%d] [p:%s] [a:%s] [c:%s]\n" +#~ msgstr "次のコミット [t:%d] [p:%s] [a:%s] [c:%s] を検査中\n" + +#~ msgid "expiring cluster\n" +#~ msgstr "クラスタを終了中\n" + +#~ msgid "examining cluster %d to see if it touched %d\n" +#~ msgstr "クラスタ %d が %d にふれているか調べています\n" + +#~ msgid "found cluster touching %d: [t:%d] [a:%d] [c:%d]\n" +#~ msgstr "%d: [t:%d] [a:%d] [c:%d] にふれているクラスタをみつけました\n" + +#~ msgid "last modification time is %d\n" +#~ msgstr "最終更新日時は %d です\n" + +#~ msgid "picked existing cluster [t:%d] [a:%d] [c:%d]\n" +#~ msgstr "既存のクラスタ [t:%d] [a:%d] [c:%d] を選択\n" + +#~ msgid "building new cluster [t:%d] [a:%d] [c:%d]\n" +#~ msgstr "新しいクラスタ [t:%d] [a:%d] [c:%d] を作成中\n" + +#~ msgid "finished branch commits, writing all pending clusters\n" +#~ msgstr "" +#~ "ブランチコミットを終了し、すべての待機中のクラスタを書き込んでいます\n" + +#~ msgid "finished writing pending clusters\n" +#~ msgstr "待機中のクラスタへの書き込みを完了\n" + +#~ msgid "branch %s has %d entries\n" +#~ msgstr "ブランチ %s には %d 個のエントリがあります\n" + +#~ msgid "trunk has %d entries\n" +#~ msgstr "trunk には %d 個のエントリがあります\n" + +#~ msgid "initial cluster on branch %s has %d live entries\n" +#~ msgstr "ブランチ %s の初期クラスタには %d 個の生きたエントリがあります\n" + +#~ msgid "initial cluster contains %s at %s\n" +#~ msgstr "初期クラスタは %s を %s に含んでいます\n" + +#~ msgid "storing manifest '%s' (base %s)\n" +#~ msgstr "マニフェスト '%s' (基準 %s) を保存しています\n" + +#~ msgid "storing head %s\n" +#~ msgstr "最新版 %s を保存しています\n" + +#~ msgid "skipping delta to null manifest\n" +#~ msgstr "空マニフェストについての差分をスキップ\n" + +#~ msgid "skipping cyclical manifest delta %s -> %s\n" +#~ msgstr "マニフェストの循環差分 %s -> %s をスキップ\n" + +#~ msgid "writing full manifest %s\n" +#~ msgstr "完全なマニフェスト %s を書き込み中\n" + +#~ msgid "storing manifest delta %s -> %s\n" +#~ msgstr "マニフェスト差分 %s -> %s を保存中\n" + +#~ msgid "adding entry state '%s' on '%s'\n" +#~ msgstr "エントリ状態 '%s' ('%s') を追加\n" + +#~ msgid "applying state delta on '%s' : '%s' -> '%s'\n" +#~ msgstr "'%s' : '%s' -> '%s' の状態差分を適用中\n" + +#~ msgid "deleting entry state '%s' on '%s'\n" +#~ msgstr "エントリ状態 '%s' ('%s') を削除しています\n" + +#~ msgid "BEGIN consume_cluster()\n" +#~ msgstr "BEGIN consume_cluster()\n" + +#~ msgid "END consume_cluster('%s') (parent '%s')\n" +#~ msgstr "END consume_cluster('%s') (親 '%s')\n" + +#~ msgid "verifying new revisions (this may take a while)\n" +#~ msgstr "新しいリビジョンを検証中 (しばらく御待ち下さい)\n" + +#~ msgid "Verifying revision %s has sane history (to depth %i)\n" +#~ msgstr "リビジョン %s の履歴が正しいか検証しています (深さ %i)\n" + +#~ msgid "Examining %s -> %s\n" +#~ msgstr "%s -> %s を検討中\n" + +#~ msgid "%s and %s have no common ancestor, so done\n" +#~ msgstr "%s と %s には共通の祖先はありません。完了\n" + +#~ msgid "already checked common ancestor, so done\n" +#~ msgstr "既にチェック済の共通の祖先。完了\n" + +#~ msgid "%s is a merge; verifying paths to common ancestor %s are sane\n" +#~ msgstr "%s は統合です。共通の祖先 %s へのパスが適切なものか検証しています\n" + +#~ msgid "loading parents for node %d\n" +#~ msgstr "ノード %d の親を読み込み中\n" + +#~ msgid "parent %s -> node %d\n" +#~ msgstr "親 %s -> ノード %d\n" + +#~ msgid "found %d intersecting nodes\n" +#~ msgstr "%d 個の交差ノードがみつかりました\n" + +#~ msgid "searching for common ancestor, left=%s right=%s\n" +#~ msgstr "左=%s 右=%s の共通の祖先を検索中\n" + +#~ msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n" +#~ msgstr "共通の祖先を走査 [親=%d,祖先=%d,支配=%d]\n" + +#~ msgid "found node %d, ancestor of left %s and dominating right %s\n" +#~ msgstr "みつかったノード %d は左 %s と支配している右 %s の祖先です\n" + +#~ msgid "found node %d, ancestor of right %s and dominating left %s\n" +#~ msgstr "みつかったノード %d は右 %s と支配している左 %s の祖先です\n" + +#~ msgid "searching for least common ancestor, left=%s right=%s\n" +#~ msgstr "最小公倍の祖先を検索中, 左=%s 右=%s\n" + +#~ msgid "least common ancestor scan [par=%d,anc=%d]\n" +#~ msgstr "最も近い祖先を走査 [親=%d,祖先=%d]\n" + +#~ msgid "found node %d, ancestor of left %s and right %s\n" +#~ msgstr "みつかったノード %d は左 %s、右 %s の祖先です\n" + +#~ msgid "checking whether %s is an ancestor of %s\n" +#~ msgstr "%s が %s の祖先かどうか検証しています\n" + +#~ msgid "new root: %s\n" +#~ msgstr "新規ルート: %s\n" + +#~ msgid "new leaf: %s\n" +#~ msgstr "新規リーフ: %s\n" + +#~ msgid "exploring changesets from parents of %s, seeking towards %s\n" +#~ msgstr "%s の親から %s に向って変更セットを調査中\n" + +#~ msgid "considering parent %s of %s\n" +#~ msgstr "親 %s (%s) について検討中\n" + +#~ msgid "revision %s is relevant, composing with edge to %s\n" +#~ msgstr "リビジョン %s は %s への先端と関連し複合しています\n" + +#~ msgid "parent %s of %s is not relevant\n" +#~ msgstr "親 %s (%s) は関連していません\n" + +#~ msgid "adding parents of %s to subgraph\n" +#~ msgstr "%s の親をサブグラフに追加\n" + +#~ msgid "found parent %s of %s\n" +#~ msgstr "親 %s (%s) を発見\n" + +#~ msgid "adding parent %s to next frontier\n" +#~ msgstr "親 %s を次の先端に追加\n" + +#~ msgid "calculating composite changeset between %s and %s\n" +#~ msgstr "%s と %s の間の複合変更セットを見積っています\n" + +#~ msgid "no common ancestor for %s and %s\n" +#~ msgstr "%s と %s の共通の祖先はありません\n" + +#~ msgid "common ancestor is %s\n" +#~ msgstr "共通の祖先は %s です\n" + +#~ msgid "analyzing manifest changes from '%s' -> '%s'\n" +#~ msgstr "'%s' -> '%s' からマニフェストの変更を解析中\n" + +#~ msgid "splitting ancestry for file %s\n" +#~ msgstr "ファイル %s の系統を分離中\n" + +#~ msgid "noting ancestry from child %d -> parent %d\n" +#~ msgstr "子 %d -> 親 %d の系統はありません\n" + +#~ msgid "setting epoch for %s to %s\n" +#~ msgstr "%s の epoch を %s に設定\n" + +#~ msgid "node %d = manifest %s\n" +#~ msgstr "ノード %d = マニフェスト %s\n" + +#~ msgid "loaded '%s' manifest cert for node %s\n" +#~ msgstr "'%s' マニフェスト証明 (ノード %s) を読み込みました\n" + +#~ msgid "node %d = revision %s = manifest %s\n" +#~ msgstr "ノード %d = リビジョン %s = マニフェスト %s\n" + +#~ msgid "loaded '%s' revision cert for node %s\n" +#~ msgstr "'%s' リビジョン証明 (ノード %s) を読み込みました\n" + +#~ msgid "processing node %d\n" +#~ msgstr "ノード %d を処理中\n" + +#~ msgid "node %d already processed, skipping\n" +#~ msgstr "ノード %d をスキップ (既に処理済み)\n" + +#~ msgid "node %d is a root node\n" +#~ msgstr "ノード %d はルートノードです\n" + +#~ msgid "parent node %d = revision %s\n" +#~ msgstr "親ノード %d = リビジョン %s\n" + +#~ msgid "processing edge from child %d -> parent %d\n" +#~ msgstr "子 %d -> 親 %d から先端を処理中\n" + +#~ msgid "mapped node %d to revision %s\n" +#~ msgstr "ノード %d をリビジョン %s へ割り当てました\n" + +#~ msgid "skipping already existing revision %s\n" +#~ msgstr "既存のリビジョン %s をスキップ\n" + +#~ msgid "rebuilding revision graph from existing graph\n" +#~ msgstr "既存のグラフからリビジョングラフを再度構成中\n" + +#~ msgid "started up on %s\n" +#~ msgstr "%s で開始\n" + +#~ msgid "ignoring request to give last gasp; already in process of dumping\n" +#~ msgstr "最後の変更要請を無視します。既にダンプ処理中です\n" + +#~ msgid "saving current work set: %i items" +#~ msgstr "現在の作業セットを保存中: %i アイテム" + +#~ msgid "ignoring error trigged by saving work set to debug log" +#~ msgstr "" +#~ "作業セットの保存によって引き起されたデバッグログへのエラーを無視します" + +#~ msgid "finished saving work set" +#~ msgstr "作業セットの保存終了" + +#, fuzzy +#~ msgid "executing SQL '%s'" +#~ msgstr "コマンド '%s' を実行中\n" + +#, fuzzy +#~ msgid "errmsg: %s" +#~ msgstr "エラー: %s\n" + +#, fuzzy +#~ msgid "executing external 2-way merge command\n" +#~ msgstr "内部三元統合完了\n" + +#, fuzzy +#~ msgid "executing external 3-way merge command\n" +#~ msgstr "内部三元統合完了\n" + +#~ msgid "converting %d bytes from %s to %s\n" +#~ msgstr "%d バイト: %s から %s へ変換中\n" + +#~ msgid "converting %d bytes from IDNA ACE to UTF-8\n" +#~ msgstr "IDNA ACE から UTF-8 へ変換中 (%d バイト)\n" + +#~ msgid "converting %d bytes from UTF-8 to IDNA ACE\n" +#~ msgstr "UTF-8 から IDNA ACE へ変換中 (%d バイト)\n" + +#~ msgid "doing linesep conversion to %s\n" +#~ msgstr "%s について行末を変換中\n" + +#~ msgid "Considering update target %s\n" +#~ msgstr "ターゲット %s の更新について計算中\n" + +#~ msgid "%s is acceptable update candidate\n" +#~ msgstr "%s は受け入れ可能な更新候補です\n" + +#~ msgid "%s has unacceptable test results\n" +#~ msgstr "%s は受け入れられないテスト結果です\n" + +#~ msgid "adding attribute '%s' on file %s to %s\n" +#~ msgstr "属性 '%s' (ファイル %s の)を %s に追加\n" + +#~ msgid "invalid path ''" +#~ msgstr "不適切なパス ''" + +#~ msgid "adding %s to working copy delete set\n" +#~ msgstr "%s を作業コピー削除セットに追加\n" + +#~ msgid "" +#~ "sorry -- 'drop ' is currently broken.\n" +#~ "try 'find %s -type f | monotone drop address@hidden'\n" +#~ msgstr "" +#~ "申し分けありませんが 'drop <ディレクトリ>' は使えません.\n" +#~ "代りに 'find %s -type f | monotone drop address@hidden' を試してみて下さい.\n" + +#~ msgid "dropped attributes for file %s from %s\n" +#~ msgstr "ファイル %s の属性を %s から削除しました\n" + +#~ msgid "invalid source path ''" +#~ msgstr "不適切なソースパス ''" + +#~ msgid "invalid destination path ''" +#~ msgstr "不適切な方向パス ''" + +#~ msgid "adding %s -> %s to working copy rename set\n" +#~ msgstr "%s -> %s を作業コピー名称変更セットに追加\n" + +#~ msgid "%s has existing attributes in %s; clean them up first" +#~ msgstr "%s は既存の %s 内に属性を持っています; まずそれを削除して下さい" + +#~ msgid "moving attributes for %s to %s\n" +#~ msgstr "%s の属性を %s に移動中\n" + +#~ msgid "work path is %s\n" +#~ msgstr "作業パスは %s です\n" + +#~ msgid "checking for un-committed work file %s\n" +#~ msgstr "未コミットの作業ファイル %s を検証中\n" + +#~ msgid "read rearrangement from %s\n" +#~ msgstr "%s から再調整読み取り\n" + +#~ msgid "no un-committed work file %s\n" +#~ msgstr "未コミットの作業ファイル %s はありません\n" + +#~ msgid "revision path is %s\n" +#~ msgstr "リビジョンパスは %s です\n" + +#~ msgid "loading revision id from %s\n" +#~ msgstr "%s からリビジョン ID を読み込み\n" + +#~ msgid "writing revision id to %s\n" +#~ msgstr "リビジョン ID を %s に書き込み中\n" + +#~ msgid "old manifest is %s\n" +#~ msgstr "古い manifest は %s です\n" + +#~ msgid "base manifest %s does not exist in database\n" +#~ msgstr "データベースに基準マニフェスト %s は含まれていません\n" + +#~ msgid "old manifest has %d entries\n" +#~ msgstr "古いマニフェストには %d 個のエントリがあります\n" + +#~ msgid "user log path is %s\n" +#~ msgstr "ユーザーログパスは %s です\n" + +#~ msgid "options path is %s\n" +#~ msgstr "オプションパスは %s です\n" + +#~ msgid "local dump path is %s\n" +#~ msgstr "ローカルのダンプパスは %s です\n" + +#~ msgid "attribute map path is %s\n" +#~ msgstr "属性マップパスは %s です\n" + +#~ msgid "computing binary delta instructions\n" +#~ msgstr "バイナリ差分命令を計算中\n" + +#~ msgid "computed binary delta instructions\n" +#~ msgstr "バイナリ差分命令の計算結果\n" + #~ msgid "no unique private key for cert construction" #~ msgstr "証明作成のための固有の秘密鍵がありません" ============================================================ --- po/pt_BR.po 5a3a39f8673a62b0f47c203373fd53d36481d041 +++ po/pt_BR.po 89a55ae90ec38f50bca0c1a8a18c4ed89d517c29 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Monotone 0.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-24 09:22-0200\n" +"POT-Creation-Date: 2006-03-10 02:15-0600\n" "PO-Revision-Date: 2006-01-24 13:45-0200\n" "Last-Translator: Alex Sandro Queiroz e Silva \n" "Language-Team: Alex Sandro Queiroz e Silva \n" @@ -16,57 +16,62 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: app_state.cc:109 -#, c-format -msgid "working copy directory required but not found%s%s" +#: app_state.cc:110 +#, fuzzy, c-format +msgid "workspace required but not found%s%s" msgstr "caminho da cópia de trabalho necessário mas não encontrado%s%s" -#: app_state.cc:117 +#: app_state.cc:118 #, c-format msgid "invalid directory ''" msgstr "diretório inválido ''" -#: app_state.cc:125 +#: app_state.cc:126 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'\n" msgstr "" -#: app_state.cc:164 app_state.cc:179 +#: app_state.cc:165 app_state.cc:180 #, c-format msgid "unknown path '%s'\n" msgstr "caminho desconhecido '%s'\n" -#: app_state.cc:362 +#: app_state.cc:341 #, c-format msgid "search root '%s' does not exist" msgstr "raiz de procura '%s' não existe" -#: app_state.cc:363 +#: app_state.cc:342 #, c-format msgid "search root '%s' is not a directory\n" msgstr "raiz de procura '%s' não é um diretório\n" -#: app_state.cc:398 +#: app_state.cc:377 #, c-format msgid "failed to parse date string '%s': %s" msgstr "erro lendo string de data '%s': %s" -#: app_state.cc:412 +#: app_state.cc:391 #, c-format msgid "negative depth not allowed\n" msgstr "profundidade negativa não permitida\n" -#: app_state.cc:420 +#: app_state.cc:399 #, c-format msgid "negative or zero last not allowed\n" msgstr "último negativo ou zero não permitido\n" -#: app_state.cc:543 +#: app_state.cc:407 +#, fuzzy, c-format +msgid "negative or zero next not allowed\n" +msgstr "último negativo ou zero não permitido\n" + +#: app_state.cc:536 #, c-format msgid "Failed to read options file %s" msgstr "Impossível ler arquivo de opções %s" -#: app_state.cc:560 +#: app_state.cc:553 #, c-format msgid "Failed to write options file %s" msgstr "Impossível escrever arquivo de opções %s" @@ -151,39 +156,40 @@ "vários certificados de ramo encontrados para a versão %s, por favor forneça " "o nome de um ramo" -#: commands.cc:159 +#: commands.cc:160 #, c-format msgid "command '%s' has multiple ambiguous expansions:\n" msgstr "comando '%s' tem várias expansões possíveis:\n" -#: commands.cc:202 +#: commands.cc:203 msgid "commands:" msgstr "comandos:" -#: commands.cc:253 +#: commands.cc:254 #, c-format msgid "unknown command '%s'\n" msgstr "comando desconhecido '%s'\n" -#: commands.cc:300 +#: commands.cc:301 #, c-format msgid "pid file '%s' already exists" msgstr "arquivo pid '%s' já existe" -#: commands.cc:324 commands.cc:1294 commands.cc:1364 commands.cc:1739 -#: commands.cc:2648 commands.cc:3209 commands.cc:3440 commands.cc:3479 +#: commands.cc:325 commands.cc:1334 commands.cc:1404 commands.cc:1840 +#: commands.cc:2686 commands.cc:3307 commands.cc:3542 commands.cc:3581 +#: commands.cc:3926 msgid "informative" msgstr "informativo" -#: commands.cc:324 +#: commands.cc:325 msgid "command [ARGS...]" msgstr "comando [ARGS...]" -#: commands.cc:324 +#: commands.cc:325 msgid "display command help" msgstr "exibe ajuda de comando" -#: commands.cc:403 +#: commands.cc:404 msgid "" "Enter a description of this change.\n" "Lines beginning with `MT:' are removed automatically.\n" @@ -191,77 +197,77 @@ "Entre a descrição desta mudança.\n" "Linhas que iniciam com `MT:' serão removidas automaticamente.\n" -#: commands.cc:410 +#: commands.cc:411 #, c-format msgid "edit of log message failed" msgstr "edição de mensagem de registro falhou" -#: commands.cc:419 +#: commands.cc:420 msgid "note: " msgstr "nota: " -#: commands.cc:420 -#, c-format +#: commands.cc:421 +#, fuzzy, c-format msgid "" "branch '%s' has multiple heads\n" -"perhaps consider 'monotone merge'" +"perhaps consider '%s merge'" msgstr "" "ramo '%s' tem múltiplas frentes\n" "considere usar 'monotone merge'" -#: commands.cc:480 commands.cc:736 commands.cc:1382 commands.cc:1457 -#: commands.cc:1823 commands.cc:2698 commands.cc:2726 commands.cc:2729 -#: commands.cc:2865 commands.cc:3462 +#: commands.cc:482 commands.cc:758 commands.cc:1422 commands.cc:1506 +#: commands.cc:2736 commands.cc:2764 commands.cc:2767 commands.cc:2903 +#: commands.cc:3564 #, c-format msgid "no such revision '%s'" msgstr "versão '%s' não existe" -#: commands.cc:487 +#: commands.cc:489 #, c-format msgid "expanding selection '%s'\n" msgstr "expandindo seleção '%s'\n" -#: commands.cc:495 +#: commands.cc:497 #, c-format msgid "no match for selection '%s'" msgstr "sem equivalente para seleção '%s'" -#: commands.cc:498 +#: commands.cc:503 #, c-format -msgid "selection '%s' has multiple ambiguous expansions: \n" -msgstr "seleção '%s' tem múltiplas expansões possíveis: \n" +msgid "expanded to '%s'\n" +msgstr "expandido para '%s'\n" -#: commands.cc:505 +#: commands.cc:520 #, c-format -msgid "expanded to '%s'\n" -msgstr "expandido para '%s'\n" +msgid "selection '%s' has multiple ambiguous expansions: \n" +msgstr "seleção '%s' tem múltiplas expansões possíveis: \n" -#: commands.cc:516 +#: commands.cc:538 #, c-format msgid "non-hex digits in id" msgstr "dígitos não-hexadecimais em id" -#: commands.cc:525 +#: commands.cc:547 #, c-format msgid "partial id '%s' does not have an expansion" msgstr "id parcial '%s' não tem uma expansão" -#: commands.cc:528 +#: commands.cc:550 #, c-format msgid "partial id '%s' has multiple ambiguous expansions:\n" msgstr "id parcial '%s' tem múltiplas expansões possíveis:\n" -#: commands.cc:535 +#: commands.cc:557 #, c-format msgid "expanded partial id '%s' to '%s'\n" msgstr "id parcial '%s' expandido para '%s'\n" -#: commands.cc:562 netsync.cc:1709 +#: commands.cc:584 netsync.cc:1727 #, c-format msgid "no public key '%s' found in database" msgstr "chave pública '%s' não encontrada no banco de dados" -#: commands.cc:572 +#: commands.cc:594 #, c-format msgid "" "Key : %s\n" @@ -274,87 +280,87 @@ "Nome : %s\n" "Valor : %s\n" -#: commands.cc:606 +#: commands.cc:628 msgid "ok" msgstr "ok" -#: commands.cc:609 +#: commands.cc:631 msgid "bad" msgstr "ruim" -#: commands.cc:612 +#: commands.cc:634 msgid "unknown" msgstr "desconhecido" -#: commands.cc:699 +#: commands.cc:721 #, c-format msgid "(*) - only in %s/" msgstr "(*) - apenas em %s/" -#: commands.cc:722 +#: commands.cc:744 #, c-format msgid "no keys found\n" msgstr "nenhuma chave encontrada\n" -#: commands.cc:724 +#: commands.cc:746 #, c-format msgid "no keys found matching '%s'\n" msgstr "nenhuma chave de '%s' encontrada\n" -#: commands.cc:742 +#: commands.cc:764 #, c-format msgid "revision %s already has children. We cannot kill it." msgstr "versão %s já tem filhos. Não podemos removê-la." -#: commands.cc:882 commands.cc:906 commands.cc:943 commands.cc:964 -#: commands.cc:1000 +#: commands.cc:904 commands.cc:928 commands.cc:965 commands.cc:986 +#: commands.cc:1022 msgid "key and cert" msgstr "chave e certificado" -#: commands.cc:882 commands.cc:906 commands.cc:943 +#: commands.cc:904 commands.cc:928 commands.cc:965 msgid "KEYID" msgstr "CHAVEID" -#: commands.cc:882 +#: commands.cc:904 msgid "generate an RSA key-pair" msgstr "gera um par de chaves RSA" -#: commands.cc:897 +#: commands.cc:919 #, c-format msgid "key '%s' already exists" msgstr "chave '%s' já existe" -#: commands.cc:900 +#: commands.cc:922 #, c-format msgid "generating key-pair '%s'" msgstr "gerando par de chaves '%s'" -#: commands.cc:902 +#: commands.cc:924 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "salvando par de chaves '%s' em %s/" -#: commands.cc:906 +#: commands.cc:928 msgid "drop a public and private key" msgstr "remove chaves pública e privada" -#: commands.cc:920 +#: commands.cc:942 #, c-format msgid "dropping public key '%s' from database\n" msgstr "removendo chave pública '%s' do banco de dados\n" -#: commands.cc:930 +#: commands.cc:952 #, c-format msgid "dropping key pair '%s' from keystore\n" msgstr "removendo par de chaves '%s' da coleção\n" -#: commands.cc:937 +#: commands.cc:959 #, 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 na coleção nem no banco de dados" -#: commands.cc:939 +#: commands.cc:961 #, c-format msgid "" "public or private key '%s' does not exist in keystore, and no database was " @@ -363,33 +369,33 @@ "chave pública ou privada '%s' não existe na coleção, e nenhum banco de dados " "foi especificado" -#: commands.cc:944 +#: commands.cc:966 msgid "change passphrase of a private RSA key" msgstr "muda frase secreta de uma chave RSA privada" -#: commands.cc:954 +#: commands.cc:976 #, c-format msgid "key '%s' does not exist in the keystore" msgstr "chave '%s' não existe na coleção" -#: commands.cc:961 +#: commands.cc:983 #, c-format msgid "passphrase changed\n" msgstr "frase secreta mudada\n" -#: commands.cc:964 +#: commands.cc:986 msgid "REVISION CERTNAME [CERTVAL]" msgstr "VERSÃO NOME-CERTIFICADO [VALOR-CERTIFICADO]" -#: commands.cc:965 +#: commands.cc:987 msgid "create a cert for a revision" msgstr "cria um certificado para uma versão" -#: commands.cc:1000 +#: commands.cc:1022 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "VERSÃO NOME VALOR ASSINANTE1 [ASSINANTE2 [...]]" -#: commands.cc:1001 +#: commands.cc:1023 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" @@ -397,7 +403,7 @@ "testa se um certificado hipotético teria confiança\n" "baseado nos parâmetros atuais" -#: commands.cc:1034 +#: commands.cc:1056 #, c-format msgid "" "if a cert on: %s\n" @@ -412,179 +418,198 @@ "fosse assinado por: %s\n" "ele seria: %s\n" -#: commands.cc:1043 +#: commands.cc:1065 msgid "trusted" msgstr "confiável" -#: commands.cc:1043 +#: commands.cc:1065 msgid "UNtrusted" msgstr "NÃO-confiável" -#: commands.cc:1046 commands.cc:1059 commands.cc:1072 commands.cc:1089 -#: commands.cc:1140 +#: commands.cc:1068 commands.cc:1081 commands.cc:1094 commands.cc:1111 +#: commands.cc:1162 msgid "review" msgstr "revisão" -#: commands.cc:1046 +#: commands.cc:1068 msgid "REVISION TAGNAME" msgstr "VERSÃO ETIQUETA" -#: commands.cc:1047 -msgid "put a symbolic tag cert on a revision version" +#: commands.cc:1069 +#, fuzzy +msgid "put a symbolic tag cert on a revision" msgstr "põe uma etiqueta simbólica em uma versão" -#: commands.cc:1059 +#: commands.cc:1081 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: commands.cc:1060 +#: commands.cc:1082 msgid "note the results of running a test on a revision" msgstr "anota os resultados de executar um teste sobre uma versão" -#: commands.cc:1072 commands.cc:1089 +#: commands.cc:1094 commands.cc:1111 msgid "REVISION" msgstr "VERSÂO" -#: commands.cc:1073 +#: commands.cc:1095 msgid "approve of a particular revision" msgstr "aprova a versão especificada" -#: commands.cc:1084 +#: commands.cc:1106 #, c-format msgid "need --branch argument for approval" msgstr "argumento --branch necessário para aprovação" -#: commands.cc:1090 +#: commands.cc:1112 msgid "disapprove of a particular revision" msgstr "desaprova a versão especificada" -#: commands.cc:1103 +#: commands.cc:1125 #, c-format msgid "revision '%s' has %d changesets, cannot invert\n" msgstr "versão '%s' tem %d mudanças, não é possível inverter\n" -#: commands.cc:1107 +#: commands.cc:1129 #, c-format msgid "need --branch argument for disapproval" msgstr "argumento --branch necessário para desaprovação" -#: commands.cc:1140 +#: commands.cc:1162 msgid "REVISION [COMMENT]" msgstr "VERSÃO [COMENTÁRIO]" -#: commands.cc:1141 +#: commands.cc:1163 msgid "comment on a particular revision" msgstr "comenta a versão especificada" -#: commands.cc:1151 +#: commands.cc:1173 #, c-format msgid "edit comment failed" msgstr "edição de comentário falhou" -#: commands.cc:1154 +#: commands.cc:1176 #, c-format msgid "empty comment" msgstr "comentário vazio" -#: commands.cc:1167 commands.cc:1195 commands.cc:1220 commands.cc:1341 -#: commands.cc:2159 commands.cc:2278 commands.cc:2801 commands.cc:3257 -msgid "working copy" -msgstr "cópia de trabalho" +#: commands.cc:1189 commands.cc:1218 commands.cc:1243 commands.cc:1268 +#: commands.cc:2187 commands.cc:2305 commands.cc:2839 commands.cc:3355 +msgid "workspace" +msgstr "" -#: commands.cc:1167 commands.cc:1195 commands.cc:1294 commands.cc:2278 -#: commands.cc:2648 commands.cc:3257 +#: commands.cc:1189 commands.cc:1218 commands.cc:1334 commands.cc:2305 +#: commands.cc:2686 commands.cc:3355 msgid "[PATH]..." msgstr "[CAMINHO]..." -#: commands.cc:1168 -msgid "add files to working copy" +#: commands.cc:1190 +#, fuzzy +msgid "add files to workspace" msgstr "adiciona arquivos à cópia de trabalho" -#: commands.cc:1196 -msgid "drop files from working copy" +#: commands.cc:1219 +#, fuzzy +msgid "drop files from workspace" msgstr "remove arquivos da cópia de trabalho" -#: commands.cc:1221 +#: commands.cc:1244 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" msgstr "" -#: commands.cc:1223 -msgid "rename entries in the working copy" +#: commands.cc:1246 +#, fuzzy +msgid "rename entries in the workspace" msgstr "renomeia entradas na cópia de trabalho" -#: commands.cc:1248 commands.cc:1261 commands.cc:3360 commands.cc:3777 +#: commands.cc:1268 +msgid "NEW_ROOT PUT_OLD" +msgstr "" + +#: commands.cc:1269 +msgid "" +"rename the root directory\n" +"after this command, the directory that currently has the name NEW_ROOT\n" +"will be the root directory, and the directory that is currently the root\n" +"directory will have name PUT_OLD.\n" +"Using --execute is strongly recommended." +msgstr "" + +#: commands.cc:1288 commands.cc:1301 commands.cc:1381 commands.cc:3462 +#: commands.cc:3907 msgid "debug" msgstr "depuração" -#: commands.cc:1248 +#: commands.cc:1288 msgid "load file contents into db" msgstr "carrega o conteúdo do arquivo no banco de dados" -#: commands.cc:1261 +#: commands.cc:1301 msgid " " msgstr " " -#: commands.cc:1262 +#: commands.cc:1302 msgid "merge 3 files and output result" msgstr "combina 3 arquivos e retorna resultado" -#: commands.cc:1272 +#: commands.cc:1312 #, c-format msgid "ancestor file id does not exist" msgstr "id do arquivo ancestral não existe" -#: commands.cc:1275 +#: commands.cc:1315 #, c-format msgid "left file id does not exist" msgstr "id do arquivo esquerdo não existe" -#: commands.cc:1278 +#: commands.cc:1318 #, c-format msgid "right file id does not exist" msgstr "id do arquivo direito não existe" -#: commands.cc:1289 +#: commands.cc:1329 #, c-format msgid "merge failed" msgstr "combinação falhou" -#: commands.cc:1294 -msgid "show status of working copy" +#: commands.cc:1334 +#, fuzzy +msgid "show status of workspace" msgstr "mostra status da cópia de trabalho" -#: commands.cc:1341 +#: commands.cc:1381 msgid "[PATH]" msgstr "[CAMINHO]" -#: commands.cc:1342 +#: commands.cc:1382 msgid "calculate identity of PATH or stdin" msgstr "calcula identidade do CAMINHO ou stdin" -#: commands.cc:1365 +#: commands.cc:1405 msgid "FILENAME" msgstr "ARQUIVO" -#: commands.cc:1366 +#: commands.cc:1406 msgid "write file from database to stdout" msgstr "escreve arquivo do banco de dados em stdout" -#: commands.cc:1394 commands.cc:1396 commands.cc:3471 +#: commands.cc:1434 commands.cc:1436 commands.cc:3573 #, c-format msgid "no file '%s' found in revision '%s'\n" msgstr "nenhum arquivo '%s' encontrado na versão '%s'\n" -#: commands.cc:1408 commands.cc:1527 commands.cc:3019 commands.cc:3068 -#: commands.cc:3157 commands.cc:3164 commands.cc:3690 +#: commands.cc:1448 commands.cc:1577 commands.cc:3040 commands.cc:3093 +#: commands.cc:3104 commands.cc:3254 commands.cc:3262 commands.cc:3816 msgid "tree" msgstr "árvore" -#: commands.cc:1408 +#: commands.cc:1448 msgid "[DIRECTORY]\n" msgstr "[DIRETÓRIO]\n" -#: commands.cc:1409 +#: commands.cc:1449 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" @@ -592,62 +617,77 @@ "If no directory is given, the branch name will be used as directory" msgstr "" -#: commands.cc:1426 commands.cc:1445 +#: commands.cc:1468 commands.cc:1487 #, c-format msgid "need --branch argument for branch-based checkout" msgstr "" -#: commands.cc:1439 +#: commands.cc:1481 #, c-format msgid "checkout directory '%s' already exists" msgstr "" -#: commands.cc:1448 commands.cc:1540 commands.cc:3032 commands.cc:3102 -#: commands.cc:3105 -#, c-format -msgid "branch '%s' is empty\n" +#: commands.cc:1490 +#, fuzzy, c-format +msgid "branch '%s' is empty" msgstr "ramo '%s' está vazio\n" -#: commands.cc:1449 +#: commands.cc:1493 +#, fuzzy, c-format +msgid "branch %s has multiple heads:" +msgstr "ramo %s tem frentes múltiplas" + +#: commands.cc:1496 +#, fuzzy, c-format +msgid "choose one with '%s checkout -r'" +msgstr "escolha um com 'monotone update -r'\n" + +#: commands.cc:1497 #, c-format msgid "branch %s has multiple heads" msgstr "ramo %s tem frentes múltiplas" -#: commands.cc:1475 +#: commands.cc:1524 #, c-format msgid "revision %s is not a member of branch %s\n" msgstr "versão %s não é um membro do ramo %s\n" -#: commands.cc:1509 +#: commands.cc:1558 #, c-format msgid "no file %s found in database for %s" msgstr "nenhum arquivo %s encontrado no banco de dados para %s" -#: commands.cc:1527 +#: commands.cc:1577 msgid "show unmerged head revisions of branch" msgstr "mostra frentes não combinadas do ramo" -#: commands.cc:1535 commands.cc:3028 +#: commands.cc:1585 commands.cc:3049 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "por favor especifique um ramo com --branch=RAMO" -#: commands.cc:1542 +#: commands.cc:1590 commands.cc:3053 commands.cc:3142 commands.cc:3145 #, c-format +msgid "branch '%s' is empty\n" +msgstr "ramo '%s' está vazio\n" + +#: commands.cc:1592 +#, c-format msgid "branch '%s' is currently merged:\n" msgstr "ramo '%s' está atualmente combinado:\n" -#: commands.cc:1544 +#: commands.cc:1594 #, c-format msgid "branch '%s' is currently unmerged:\n" msgstr "ramo '%s' não está combinado atualmente:\n" -#: commands.cc:1583 +#: commands.cc:1633 #, c-format msgid "no epoch for branch %s\n" msgstr "" -#: commands.cc:1740 +#: commands.cc:1841 +#, fuzzy msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -658,7 +698,8 @@ "known\n" "unknown\n" "ignored\n" -"missing" +"missing\n" +"changed" msgstr "" "certs ID\n" "keys [PADRÃO]\n" @@ -671,160 +712,133 @@ "ignored\n" "missing" -#: commands.cc:1750 +#: commands.cc:1852 msgid "" -"show database objects, or the current working copy manifest,\n" -"or unknown, intentionally ignored, or missing state files" +"show database objects, or the current workspace manifest, or known,\n" +"unknown, intentionally ignored, missing, or changed state files" msgstr "" -#: commands.cc:1786 commands.cc:1810 commands.cc:1829 commands.cc:1848 -#: commands.cc:1866 commands.cc:1894 commands.cc:1912 +#: commands.cc:1890 commands.cc:1918 commands.cc:1936 msgid "packet i/o" msgstr "E/S de pacotes" -#: commands.cc:1786 -msgid "OLDID NEWID" -msgstr "VELHO-ID NOVO-ID" - -#: commands.cc:1787 -msgid "write file delta packet to stdout" -msgstr "escreve pacote de delta de arquivo em stdout" - -#: commands.cc:1801 commands.cc:1803 commands.cc:1842 -#, c-format -msgid "no such file '%s'" -msgstr "não há arquivo '%s'" - -#: commands.cc:1810 commands.cc:1829 commands.cc:1848 commands.cc:1866 -#: commands.cc:1894 +#: commands.cc:1890 commands.cc:1918 msgid "ID" msgstr "ID" -#: commands.cc:1810 -msgid "write revision data packet to stdout" -msgstr "escreve pacote de dados da versão em stdout" - -#: commands.cc:1829 -msgid "write file data packet to stdout" -msgstr "escreve pacote de dados do arquivo em stdout" - -#: commands.cc:1848 -msgid "write cert packets to stdout" -msgstr "escreve pacotes de certificado em stdout" - -#: commands.cc:1866 +#: commands.cc:1890 msgid "write public key packet to stdout" msgstr "escreve pacote de chave pública em stdout" -#: commands.cc:1888 +#: commands.cc:1912 #, c-format msgid "public key '%s' does not exist" msgstr "chave pública '%s' não existe" -#: commands.cc:1894 +#: commands.cc:1918 msgid "write private key packet to stdout" msgstr "escreve pacote de chave privada em stdout" -#: commands.cc:1902 +#: commands.cc:1926 #, c-format msgid "public and private key '%s' do not exist in keystore" msgstr "chaves pública e privada '%s' não existem na coleção" -#: commands.cc:1913 +#: commands.cc:1937 msgid "read packets from files or stdin" msgstr "lê pacotes de arquivos ou de stdin" -#: commands.cc:1921 +#: commands.cc:1945 #, c-format msgid "no packets found on stdin" msgstr "nenhum pacote encontrado em stdin" -#: commands.cc:1932 +#: commands.cc:1956 #, c-format msgid "no packets found in given file" msgid_plural "no packets found in given files" msgstr[0] "nenhum pacote encontrado no arquivo dado" msgstr[1] "nenhum pacote encontrado nos arquivos dados" -#: commands.cc:1936 +#: commands.cc:1960 #, c-format msgid "read %d packet" msgid_plural "read %d packets" msgstr[0] "lido %d pacote" msgstr[1] "lidos %d pacotes" -#: commands.cc:1965 +#: commands.cc:1989 #, c-format msgid "setting default server to %s\n" msgstr "configurando servidor padrão para %s\n" -#: commands.cc:1971 +#: commands.cc:1995 #, c-format msgid "no hostname given" msgstr "nenhum nome de host dado" -#: commands.cc:1973 +#: commands.cc:1997 #, c-format msgid "no server given and no default server set" msgstr "nenhum servidor dado e nenhum servidor padrão configurado" -#: commands.cc:1991 +#: commands.cc:2015 #, c-format msgid "setting default branch include pattern to '%s'\n" msgstr "configurando padrão de inclusão de ramos para '%s'\n" -#: commands.cc:1997 +#: commands.cc:2021 #, c-format msgid "setting default branch exclude pattern to '%s'\n" msgstr "configurando padrão de exclusão de ramos para '%s'\n" -#: commands.cc:2003 +#: commands.cc:2027 #, c-format msgid "no branch pattern given" msgstr "nenhum padrão de ramos dado" -#: commands.cc:2005 +#: commands.cc:2029 #, c-format msgid "no branch pattern given and no default pattern set" msgstr "nenhum padrão de ramo dado e nenhum configurado" -#: commands.cc:2021 commands.cc:2036 commands.cc:2050 commands.cc:2065 +#: commands.cc:2045 commands.cc:2060 commands.cc:2074 commands.cc:2089 msgid "network" msgstr "rede" -#: commands.cc:2021 commands.cc:2036 commands.cc:2050 +#: commands.cc:2045 commands.cc:2060 commands.cc:2074 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ENDEREÇO[:PORTA] [PADRÃO]]" -#: commands.cc:2022 +#: commands.cc:2046 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "envia ramos que combinam com PADRÃO para servidor netsync em ENDEREÇO" -#: commands.cc:2037 +#: commands.cc:2061 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "recebe ramos que combinam com PADRÃO do servidor netsync em ENDEREÇO" -#: commands.cc:2044 +#: commands.cc:2068 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n" msgstr "" "recebendo dados anonimamente; user -kNOMEDACHAVE se for necessária " "autenticação\n" -#: commands.cc:2051 +#: commands.cc:2075 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "" "sincroniza ramos que combinam com PADRÃO com o servidor netsync em ENDEREÇO" -#: commands.cc:2065 +#: commands.cc:2089 msgid "PATTERN ..." msgstr "PADRÂO..." -#: commands.cc:2066 +#: commands.cc:2090 msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "serve os ramos especificados por PADRÂO para clientes" -#: commands.cc:2079 +#: commands.cc:2103 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -832,11 +846,11 @@ "é necessária permissão para salvar frase-passe persistentemente (veja gancho " "persist_phrase_ok())" -#: commands.cc:2091 +#: commands.cc:2115 msgid "database" msgstr "banco de dados" -#: commands.cc:2092 +#: commands.cc:2116 msgid "" "init\n" "info\n" @@ -868,11 +882,16 @@ "rosterify\n" "set_epoch RAMO ERA\n" -#: commands.cc:2106 +#: commands.cc:2130 msgid "manipulate database state" msgstr "manipula estado do bando de dados" -#: commands.cc:2159 +#: commands.cc:2177 +#, c-format +msgid "The epoch must be %s characters" +msgstr "" + +#: commands.cc:2187 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -882,40 +901,41 @@ "get CAMINHO [ATRIBUTO]\n" "drop CAMINHO [ATRIBUTO]" -#: commands.cc:2160 +#: commands.cc:2188 msgid "set, get or drop file attributes" msgstr "configura, lê ou descarta atributos de arquivos" -#: commands.cc:2176 +#: commands.cc:2204 #, c-format msgid "Unknown path '%s'" msgstr "caminho desconhecido '%s'" -#: commands.cc:2205 +#: commands.cc:2233 #, c-format msgid "Path '%s' does not have attribute '%s'\n" msgstr "caminho '%s' não tem atributo '%s'\n" -#: commands.cc:2259 +#: commands.cc:2287 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message e --message-file são mutuamente exclusivos" -#: commands.cc:2279 -msgid "commit working copy to database" +#: commands.cc:2306 +#, fuzzy +msgid "commit workspace to database" msgstr "grava mudanças da cópia de trabalho no banco de dados" -#: commands.cc:2297 +#: commands.cc:2324 #, c-format msgid "no changes to commit\n" msgstr "nenhuma mudança para gravar\n" -#: commands.cc:2311 +#: commands.cc:2338 #, c-format msgid "beginning commit on branch '%s'\n" msgstr "iniciando gravação do ramo '%s'\n" -#: commands.cc:2320 +#: commands.cc:2347 #, c-format msgid "" "MT/log is non-empty and log message was specified on command line\n" @@ -927,44 +947,49 @@ "considere mover ou apagar MT/log,\n" "ou remova --message/--message-from-file da linha de comando" -#: commands.cc:2332 +#: commands.cc:2359 #, c-format msgid "empty log message; commit canceled" msgstr "mensagem de registro vazia, gravação cancelada" -#: commands.cc:2349 +#: commands.cc:2378 #, c-format +msgid "log message rejected: %s\n" +msgstr "" + +#: commands.cc:2386 +#, c-format msgid "revision %s already in database\n" msgstr "versão %s já está no banco de dados\n" -#: commands.cc:2387 commands.cc:2404 commands.cc:2423 +#: commands.cc:2424 commands.cc:2441 commands.cc:2460 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "arquivo '%s' modificado durante gravação, abortando" -#: commands.cc:2449 +#: commands.cc:2486 #, c-format msgid "committed revision %s\n" msgstr "versão %s gravada\n" -#: commands.cc:2455 -#, c-format +#: commands.cc:2492 +#, fuzzy, c-format msgid "" "note: this revision creates divergence\n" -"note: you may (or may not) wish to run 'monotone merge'" +"note: you may (or may not) wish to run '%s merge'" msgstr "" "nota: esta versão causa divergência\n" "nota: talvez você queira executar 'monotone merge'" -#: commands.cc:2649 +#: commands.cc:2687 msgid "" "show current diffs on stdout.\n" -"If one revision is given, the diff between the working directory and\n" +"If one revision is given, the diff between the workspace 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:2665 +#: commands.cc:2703 #, c-format msgid "" "--diff-args requires --external\n" @@ -973,30 +998,30 @@ "--diff-args requer --external\n" "adicione --external ou remova --diff-args" -#: commands.cc:2707 +#: commands.cc:2745 #, c-format msgid "current revision has no ancestor" msgstr "versão atual não tem ancestral" -#: commands.cc:2770 +#: commands.cc:2808 msgid "no changes" msgstr "sem mudanças" -#: commands.cc:2802 +#: commands.cc:2840 msgid "" -"update working copy.\n" -"This command modifies your working copy to be based off of a\n" +"update workspace.\n" +"This command modifies your workspace to be based off of a\n" "different revision, preserving uncommitted changes as it does so.\n" -"If a revision is given, update the working copy to that revision.\n" -"If not, update the working copy to the head of the branch." +"If a revision is given, update the workspace to that revision.\n" +"If not, update the workspace to the head of the branch." msgstr "" -#: commands.cc:2840 -#, c-format -msgid "this working directory is a new project; cannot update" +#: commands.cc:2878 +#, fuzzy, c-format +msgid "this workspace is a new project; cannot update" msgstr "esta cópia de trabalho é um novo projeto; impossível atualizar" -#: commands.cc:2847 +#: commands.cc:2885 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1004,32 +1029,32 @@ "maybe you want --revision=" msgstr "" -#: commands.cc:2852 -#, c-format -msgid "multiple update candidates:\n" +#: commands.cc:2890 +#, fuzzy, c-format +msgid "multiple update candidates:" msgstr "múltiplos candidatos para atualização:\n" -#: commands.cc:2856 -#, c-format -msgid "choose one with 'monotone update -r'\n" +#: commands.cc:2894 +#, fuzzy, c-format +msgid "choose one with '%s update -r'" msgstr "escolha um com 'monotone update -r'\n" -#: commands.cc:2857 -#, c-format -msgid "multiple candidates remain after selection" +#: commands.cc:2895 +#, fuzzy, c-format +msgid "multiple update candidates remain after selection" msgstr "ainda há múltiplos candidatos após seleção" -#: commands.cc:2872 +#: commands.cc:2910 #, c-format msgid "already up to date at %s\n" msgstr "já atualizado em %s\n" -#: commands.cc:2880 +#: commands.cc:2918 #, c-format msgid "selected update target %s\n" msgstr "selecionado alvo %s para atualização\n" -#: commands.cc:2892 +#: commands.cc:2930 #, c-format msgid "" "revision %s is not a member of branch %s\n" @@ -1038,140 +1063,160 @@ "versão %s não é um membro do ramo %s\n" "tente de novo com --branch\n" -#: commands.cc:3009 +#: commands.cc:3030 #, c-format msgid "updated to base revision %s\n" msgstr "atualizado para versão-base %s\n" -#: commands.cc:3019 +#: commands.cc:3040 msgid "merge unmerged heads of branch" msgstr "combina diferentes frentes do ramo" -#: commands.cc:3033 -#, c-format -msgid "branch '%s' is merged\n" +#: commands.cc:3056 +#, fuzzy, c-format +msgid "branch '%s' is already merged\n" msgstr "ramo '%s' está combinado\n" -#: commands.cc:3039 +#: commands.cc:3064 #, c-format msgid "starting with revision 1 / %d\n" msgstr "iniciando com versão 1 / %d\n" -#: commands.cc:3043 +#: commands.cc:3068 #, c-format msgid "merging with revision %d / %d\n" msgstr "combinando com versão %d / %d\n" -#: commands.cc:3044 commands.cc:3045 commands.cc:3112 commands.cc:3187 -#: commands.cc:3188 +#: commands.cc:3069 commands.cc:3070 commands.cc:3152 commands.cc:3285 +#: commands.cc:3286 #, c-format msgid "[source] %s\n" msgstr "[fonte] %s\n" -#: commands.cc:3062 commands.cc:3153 commands.cc:3206 +#: commands.cc:3087 commands.cc:3250 commands.cc:3304 #, c-format msgid "[merged] %s\n" msgstr "[combinado] %s\n" -#: commands.cc:3065 -#, c-format -msgid "note: your working copies have not been updated\n" +#: commands.cc:3090 +#, fuzzy, c-format +msgid "note: your workspaces have not been updated\n" msgstr "nota: suas cópias de trabalho não foram atualizadas\n" -#: commands.cc:3068 +#: commands.cc:3093 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "RAMO-FONTE RAMO-DESTINO" -#: commands.cc:3069 +#: commands.cc:3094 msgid "merge from one branch to another asymmetrically" msgstr "combina dois ramos de forma assimétrica" -#: commands.cc:3103 commands.cc:3106 +#: commands.cc:3104 +#, fuzzy +msgid "SOURCE-BRANCH DEST-BRANCH DIR" +msgstr "RAMO-FONTE RAMO-DESTINO" + +#: commands.cc:3105 +msgid "merge one branch into a subdirectory in another branch" +msgstr "" + +#: commands.cc:3143 commands.cc:3146 #, c-format msgid "branch '%s' is not merged\n" msgstr "ramo '%s' não está combinado\n" -#: commands.cc:3111 +#: commands.cc:3151 #, c-format msgid "propagating %s -> %s\n" msgstr "propagando %s -> %s\n" -#: commands.cc:3113 +#: commands.cc:3153 #, c-format msgid "[target] %s\n" msgstr "[alvo] %s\n" -#: commands.cc:3118 +#: commands.cc:3158 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "ramo '%s' está atualizado em relação ao ramo '%s'\n" -#: commands.cc:3120 +#: commands.cc:3160 #, c-format msgid "no action taken\n" msgstr "nenhuma ação tomada\n" -#: commands.cc:3124 +#: commands.cc:3164 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "não há necessidade de combinação; colocando %s no ramo '%s'\n" -#: commands.cc:3157 +#: commands.cc:3200 +#, c-format +msgid "Path %s not found in destination tree." +msgstr "" + +#: commands.cc:3254 msgid "refresh the inodeprint cache" msgstr "atualiza o cache de inodeprint" -#: commands.cc:3165 +#: commands.cc:3263 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "VERSÃO-ESQUERDA VERSÃO-DIREITA RAMO-DESTINO" -#: commands.cc:3166 +#: commands.cc:3264 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" "combina duas versões dadas explicitamente colocando o resuldado no ramo dado" -#: commands.cc:3180 +#: commands.cc:3278 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s e %s são a mesma versão, abortando" -#: commands.cc:3182 commands.cc:3184 +#: commands.cc:3280 commands.cc:3282 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s já é um ancestral de %s" -#: commands.cc:3209 +#: commands.cc:3307 msgid "(revision|file|key) PARTIAL-ID" msgstr "(revision|file|key) ID-PARCIAL" -#: commands.cc:3210 +#: commands.cc:3308 msgid "complete partial id" msgstr "id parcial completo" -#: commands.cc:3219 +#: commands.cc:3317 #, c-format msgid "non-hex digits in partial id" msgstr "dígitos não-hexadecimais no id parcial" -#: commands.cc:3258 -msgid "revert file(s), dir(s) or entire working copy (\".\")" +#: commands.cc:3356 +#, fuzzy +msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "" "reverte arquivo(s), diretório(s) ou a cópia de trabalho inteira (\".\")" -#: commands.cc:3335 +#: commands.cc:3433 #, c-format msgid "reverting %s" msgstr "revertendo %s" -#: commands.cc:3339 +#: commands.cc:3437 #, c-format msgid "no file version %s found in database for %s" msgstr "nenhuma versão %s do arquivo achada no banco de dados para %s" -#: commands.cc:3360 +#: commands.cc:3450 +#, fuzzy, c-format +msgid "recreating %s/" +msgstr "revertendo %s" + +#: commands.cc:3462 msgid "RCSFILE..." msgstr "ARQUIVO-RCS" -#: commands.cc:3361 +#: commands.cc:3463 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " @@ -1181,36 +1226,36 @@ "este comando não reconstrui ou importa versões. Você provavelmente quer " "cvs_import" -#: commands.cc:3377 +#: commands.cc:3479 msgid "rcs" msgstr "rcs" -#: commands.cc:3377 +#: commands.cc:3479 msgid "CVSROOT" msgstr "CVSROOT" -#: commands.cc:3377 +#: commands.cc:3479 msgid "import all versions in CVS repository" msgstr "importa todas as versões do repositório CVS" -#: commands.cc:3440 +#: commands.cc:3542 msgid "PATH" msgstr "CAMINHO" -#: commands.cc:3441 +#: commands.cc:3543 msgid "print annotated copy of the file from REVISION" msgstr "imprime cópia anotada do arquivo da VERSÃO" -#: commands.cc:3461 +#: commands.cc:3563 #, c-format msgid "no revision for file '%s' in database" msgstr "nenhuma versão '%s' do arquivo em banco de dados" -#: commands.cc:3479 +#: commands.cc:3581 msgid "[FILE] ..." msgstr "[ARQUIVO] ..." -#: commands.cc:3480 +#: commands.cc:3582 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -1218,25 +1263,37 @@ "imprime histórico em ordem inversa (filtrado por 'ARQUIVO'). Se uma ou\n" "mais versões forem dadas, usa-as como ponto de partida." -#: commands.cc:3527 +#: commands.cc:3630 #, c-format msgid "Unknown file '%s' for log command" msgstr "Arquivo '%s' desconhecido para comando log" -#: commands.cc:3690 -msgid "setup a new working copy directory, default to current" +#: commands.cc:3648 +#, c-format +msgid "only one of --last/--next allowed" +msgstr "" + +#: commands.cc:3816 +#, fuzzy +msgid "[DIRECTORY]" +msgstr "[DIRETÓRIO]\n" + +#: commands.cc:3816 +#, fuzzy +msgid "setup a new workspace directory, default to current" msgstr "configura um novo diretório de cópia de trabalho, o padrão é o atual" -#: commands.cc:3696 +#: commands.cc:3822 #, c-format msgid "need --branch argument for setup" msgstr "argumento --branch é necessário para configuração" -#: commands.cc:3710 +#: commands.cc:3836 msgid "automation" msgstr "automação" -#: commands.cc:3711 +#: commands.cc:3837 +#, fuzzy msgid "" "interface_version\n" "heads [BRANCH]\n" @@ -1257,6 +1314,10 @@ "get_file FILEID\n" "get_manifest_of [REVID]\n" "get_revision [REVID]\n" +"packet_for_rdata REVID\n" +"packets_for_certs REVID\n" +"packet_for_fdata FILEID\n" +"packet_for_fdelta OLD_FILE NEW_FILE\n" "keys\n" msgstr "" "interface_version\n" @@ -1280,44 +1341,88 @@ "get_revision [VERSÃO]\n" "keys\n" -#: commands.cc:3731 +#: commands.cc:3861 msgid "automation interface" msgstr "interface de automação" -#: commands.cc:3745 commands.cc:3761 +#: commands.cc:3875 commands.cc:3891 msgid "vars" msgstr "variáveis" -#: commands.cc:3745 +#: commands.cc:3875 msgid "DOMAIN NAME VALUE" msgstr "DOMÍNIO NOME VALOR" -#: commands.cc:3746 +#: commands.cc:3876 msgid "set the database variable NAME to VALUE, in domain DOMAIN" msgstr "" "configura a variável do banco de dados NOME para VALOR, no domínio DOMÍNIO" -#: commands.cc:3761 +#: commands.cc:3891 msgid "DOMAIN NAME" msgstr "DOMÍNIO NOME" -#: commands.cc:3762 +#: commands.cc:3892 msgid "remove the database variable NAME in domain DOMAIN" msgstr "remove a variável do banco de dados NOME no domínio DOMAIN" -#: commands.cc:3773 +#: commands.cc:3903 #, c-format msgid "no var with name %s in domain %s" msgstr "nenhuma variável com nome %s no domínio %s" -#: commands.cc:3777 +#: commands.cc:3907 msgid "REVID" msgstr "VERSÂO" -#: commands.cc:3778 +#: commands.cc:3908 msgid "dump the roster associated with the given REVID" msgstr "exibe conteúdo do roster associado com VERSÃO" +#: commands.cc:3926 +msgid "REV REV" +msgstr "" + +#: commands.cc:3926 +msgid "" +"Show what conflicts would need to be resolved to merge the given revisions." +msgstr "" + +#: commands.cc:3935 commands.cc:3937 +#, c-format +msgid "%s in an ancestor of %s; no merge is needed." +msgstr "" + +#: commands.cc:3951 +#, c-format +msgid "There are %s node_name_conflicts." +msgstr "" + +#: commands.cc:3952 +#, c-format +msgid "There are %s file_content_conflicts." +msgstr "" + +#: commands.cc:3953 +#, c-format +msgid "There are %s node_attr_conflicts." +msgstr "" + +#: commands.cc:3954 +#, c-format +msgid "There are %s orphaned_node_conflicts." +msgstr "" + +#: commands.cc:3955 +#, c-format +msgid "There are %s rename_target_conflicts." +msgstr "" + +#: commands.cc:3956 +#, c-format +msgid "There are %s directory_loop_conflicts." +msgstr "" + #: database_check.cc:125 msgid "files" msgstr "arquivos" @@ -1330,7 +1435,7 @@ msgid "markings" msgstr "marcas" -#: database_check.cc:319 database_check.cc:507 netsync.cc:2706 +#: database_check.cc:319 database_check.cc:507 netsync.cc:2760 #: rcs_import.cc:1226 msgid "revisions" msgstr "versões" @@ -1339,11 +1444,11 @@ msgid "ancestry" msgstr "descendência" -#: database_check.cc:451 netsync.cc:2710 +#: database_check.cc:451 netsync.cc:2764 msgid "keys" msgstr "chaves" -#: database_check.cc:477 netsync.cc:2708 +#: database_check.cc:477 msgid "certs" msgstr "certificados" @@ -1595,16 +1700,16 @@ msgid "database is good\n" msgstr "" -#: database.cc:134 +#: database.cc:141 #, 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" +"try '%s db migrate' to upgrade\n" "(this is irreversible; you may want to make a backup copy first)" msgstr "" -#: database.cc:158 +#: database.cc:165 #, c-format msgid "" "database %s contains revisions but no rosters\n" @@ -1616,7 +1721,7 @@ "sorry about the inconvenience." msgstr "" -#: database.cc:177 +#: database.cc:184 #, c-format msgid "" "database %s contains manifests but no revisions\n" @@ -1624,35 +1729,35 @@ "please see README.changesets for details" msgstr "" -#: database.cc:238 +#: database.cc:220 #, c-format msgid "unable to probe database version in file %s" msgstr "" -#: database.cc:245 +#: database.cc:227 #, c-format msgid "database %s is not an sqlite version 3 file, try dump and reload" msgstr "" -#: database.cc:272 +#: database.cc:254 msgid "" "make sure database and containing directory are writeable\n" "and you have not run out of disk space" msgstr "" -#: database.cc:278 +#: database.cc:260 #, c-format msgid "" "sqlite error: %d: %s\n" "%s" msgstr "" -#: database.cc:324 +#: database.cc:306 #, c-format msgid "could not initialize database: %s: already exists" msgstr "" -#: database.cc:329 +#: database.cc:311 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -1660,12 +1765,12 @@ "cancelling database creation" msgstr "" -#: database.cc:451 +#: database.cc:454 #, c-format msgid "cannot create %s; it already exists" msgstr "" -#: database.cc:515 +#: database.cc:514 #, c-format msgid "" "schema version : %s\n" @@ -1703,54 +1808,54 @@ msgid "wanted %d columns got %d in query: %s\n" msgstr "" -#: database.cc:710 +#: database.cc:711 #, c-format msgid "null result in query: %s\n" msgstr "" -#: database.cc:728 +#: database.cc:729 #, c-format msgid "wanted %d rows got %s in query: %s\n" msgstr "" -#: database.cc:1775 +#: database.cc:1728 #, c-format msgid "another key with name '%s' already exists" msgstr "" -#: database.cc:2819 +#: database.cc:2784 #, c-format msgid "no database specified" msgstr "" -#: database.cc:2827 +#: database.cc:2792 #, c-format msgid "database %s does not exist" msgstr "" -#: database.cc:2828 +#: database.cc:2793 #, c-format msgid "%s is a directory, not a database" msgstr "" -#: database.cc:2853 +#: database.cc:2818 #, c-format msgid "could not open database '%s': %s" msgstr "" #: diff_patch.cc:588 -#, c-format -msgid "file '%s' does not exist in working copy" -msgstr "" +#, fuzzy, c-format +msgid "file '%s' does not exist in workspace" +msgstr "arquivo '%s' não existe" #: diff_patch.cc:589 #, c-format -msgid "'%s' in working copy is a directory, not a file" +msgid "'%s' in workspace is a directory, not a file" msgstr "" #: diff_patch.cc:593 #, c-format -msgid "file %s in working copy has id %s, wanted %s" +msgid "file %s in workspace has id %s, wanted %s" msgstr "" #: diff_patch.cc:714 @@ -1879,17 +1984,17 @@ msgid "cannot open file %s for reading" msgstr "" -#: file_io.cc:379 +#: file_io.cc:381 #, c-format msgid "Cannot read standard input multiple times" msgstr "" -#: file_io.cc:410 +#: file_io.cc:412 #, c-format msgid "file '%s' cannot be overwritten as data; it is a directory" msgstr "" -#: file_io.cc:418 +#: file_io.cc:420 #, c-format msgid "cannot open file %s for writing" msgstr "" @@ -1944,37 +2049,37 @@ msgid "passphrase for '%s' is incorrect" msgstr "" -#: lua.cc:538 lua.cc:567 lua.cc:582 +#: lua.cc:539 lua.cc:568 lua.cc:583 #, c-format msgid "%s called with an invalid parameter" msgstr "" -#: lua.cc:585 +#: lua.cc:586 #, c-format msgid "Directory '%s' does not exists" msgstr "" -#: lua.cc:586 rcs_import.cc:1217 +#: lua.cc:587 rcs_import.cc:1217 work.cc:420 #, c-format msgid "'%s' is not a directory" msgstr "" -#: lua.cc:605 lua.cc:907 +#: lua.cc:606 lua.cc:908 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "" -#: lua.cc:704 +#: lua.cc:705 #, c-format msgid "bad input to parse_basic_io" msgstr "" -#: lua.cc:919 +#: lua.cc:920 #, c-format msgid "lua error while loading '%s'" msgstr "" -#: lua.cc:924 +#: lua.cc:925 #, c-format msgid "rcfile '%s' does not exist" msgstr "" @@ -2026,172 +2131,189 @@ msgstr "" #: monotone.cc:58 -msgid "limit the log output to the given number of entries" +msgid "limit log output to the last number of entries" msgstr "" #: monotone.cc:59 -msgid "record process id of server" +msgid "limit log output to the next number of entries" msgstr "" #: monotone.cc:60 -msgid "print a brief version of the normal output" +msgid "record process id of server" msgstr "" #: monotone.cc:61 -msgid "print diffs along with logs" +msgid "print a brief version of the normal output" msgstr "" #: monotone.cc:62 -msgid "include merges when printing logs" +msgid "print diffs along with logs" msgstr "" #: monotone.cc:63 -msgid "use the current arguments as the future default" +msgid "exclude merges when printing logs" msgstr "" #: monotone.cc:64 -msgid "leave out anything described by its argument" +msgid "use the current arguments as the future default" msgstr "" #: monotone.cc:65 -msgid "use unified diff format" +msgid "leave out anything described by its argument" msgstr "" #: monotone.cc:66 -msgid "use context diff format" +msgid "use unified diff format" msgstr "" #: monotone.cc:67 -msgid "use external diff hook for generating diffs" +msgid "use context diff format" msgstr "" #: monotone.cc:68 -msgid "argument to pass external diff hook" +msgid "use external diff hook for generating diffs" msgstr "" #: monotone.cc:69 -msgid "use least common ancestor as ancestor for merge" +msgid "argument to pass external diff hook" msgstr "" #: monotone.cc:70 -msgid "perform the associated file operation" +msgid "use least common ancestor as ancestor for merge" msgstr "" #: monotone.cc:71 -msgid "address:port to listen on (default :4691)" +msgid "perform the associated file operation" msgstr "" #: monotone.cc:72 -msgid "perform the operations for files missing from working directory" +msgid "address:port to listen on (default :4691)" msgstr "" #: monotone.cc:73 -msgid "perform the operations for unknown files from working directory" +msgid "perform the operations for files missing from workspace" msgstr "" #: monotone.cc:74 +msgid "perform the operations for unknown files from workspace" +msgstr "" + +#: monotone.cc:75 msgid "push the specified key even if it hasn't signed anything" msgstr "" -#: monotone.cc:75 +#: monotone.cc:76 msgid "when rosterifying, drop attrs entries with the given key" msgstr "" -#: monotone.cc:84 +#: monotone.cc:77 +msgid "exclude files when printing logs" +msgstr "" + +#: monotone.cc:78 +msgid "also operate on the contents of any listed directories" +msgstr "" + +#: monotone.cc:87 msgid "print debug log to stderr while running" msgstr "" -#: monotone.cc:85 +#: monotone.cc:88 msgid "file to dump debugging log to, on failure" msgstr "" -#: monotone.cc:86 +#: monotone.cc:89 +#, fuzzy +msgid "file to write the log to" +msgstr "erro escrevendo registro de depuração para %s\n" + +#: monotone.cc:90 msgid "suppress log and progress messages" msgstr "" -#: monotone.cc:87 +#: monotone.cc:91 msgid "display help message" msgstr "" -#: monotone.cc:88 +#: monotone.cc:92 msgid "print version number, then exit" msgstr "" -#: monotone.cc:89 +#: monotone.cc:93 msgid "print detailed version number, then exit" msgstr "" -#: monotone.cc:90 +#: monotone.cc:94 msgid "insert command line arguments taken from the given file" msgstr "" -#: monotone.cc:91 +#: monotone.cc:95 msgid "set ticker style (count|dot|none)" msgstr "" -#: monotone.cc:92 +#: monotone.cc:96 msgid "do not load standard lua hooks" msgstr "" -#: monotone.cc:93 +#: monotone.cc:97 msgid "do not load ~/.monotone/monotonerc or MT/monotonerc lua files" msgstr "" -#: monotone.cc:94 +#: monotone.cc:98 msgid "load extra rc file" msgstr "" -#: monotone.cc:95 +#: monotone.cc:99 msgid "set key for signatures" msgstr "" -#: monotone.cc:96 +#: monotone.cc:100 msgid "set name of database" msgstr "" -#: monotone.cc:97 -msgid "limit search for working copy to specified root" +#: monotone.cc:101 +msgid "limit search for workspace to specified root" msgstr "" -#: monotone.cc:98 +#: monotone.cc:102 msgid "verbose completion output" msgstr "" -#: monotone.cc:99 +#: monotone.cc:103 msgid "set location of key store" msgstr "configura localização da coleção de chaves" -#: monotone.cc:100 +#: monotone.cc:104 msgid "set location of configuration directory" msgstr "" -#: monotone.cc:204 +#: monotone.cc:208 #, c-format msgid "problem parsing arguments from file %s: %s" msgstr "" -#: monotone.cc:213 +#: monotone.cc:217 #, c-format msgid "weird error when stuffing arguments read from %s: %s\n" msgstr "" -#: monotone.cc:293 +#: monotone.cc:299 msgid "[OPTION...] command [ARGS...]\n" msgstr "" -#: monotone.cc:527 +#: monotone.cc:551 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "" -#: monotone.cc:566 +#: monotone.cc:590 #, c-format msgid "monotone %s doesn't use the option %s" msgstr "" -#: monotone.cc:601 +#: monotone.cc:625 #, c-format -msgid "Options specific to 'monotone %s':" +msgid "Options specific to '%s %s':" msgstr "" #: mt_version.cc:23 @@ -2211,39 +2333,39 @@ msgid "unknown item type 0x%x for '%s'" msgstr "" -#: netcmd.cc:92 +#: netcmd.cc:112 #, c-format +msgid "unknown netcmd code 0x%x" +msgstr "" + +#: netcmd.cc:117 +#, c-format msgid "" "protocol version mismatch: wanted '%d' got '%d'\n" "%s" msgstr "" -#: netcmd.cc:97 +#: netcmd.cc:122 msgid "the remote side has a newer, incompatible version of monotone" msgstr "" -#: netcmd.cc:98 +#: netcmd.cc:123 msgid "the remote side has an older, incompatible version of monotone" msgstr "" -#: netcmd.cc:118 +#: netcmd.cc:133 #, c-format -msgid "unknown netcmd code 0x%x" -msgstr "" - -#: netcmd.cc:129 -#, c-format msgid "oversized payload of '%d' bytes" msgstr "" -#: netcmd.cc:158 +#: netcmd.cc:162 #, c-format msgid "" "bad HMAC checksum (got %s, wanted %s)\n" "this suggests data was corrupted in transit\n" msgstr "" -#: netcmd.cc:253 netcmd.cc:299 +#: netcmd.cc:257 netcmd.cc:303 #, c-format msgid "unknown role specifier %d" msgstr "" @@ -2273,46 +2395,46 @@ msgid "expected %s to end at %d, have %d bytes" msgstr "" -#: netsync.cc:244 +#: netsync.cc:245 #, c-format msgid "check of '%s' failed" msgstr "" -#: netsync.cc:690 +#: netsync.cc:691 msgid "bytes in" msgstr "" -#: netsync.cc:692 +#: netsync.cc:693 msgid "bytes out" msgstr "" -#: netsync.cc:696 +#: netsync.cc:697 msgid "certs in" msgstr "" -#: netsync.cc:698 netsync.cc:711 +#: netsync.cc:699 netsync.cc:712 msgid "revs in" msgstr "" -#: netsync.cc:703 +#: netsync.cc:704 msgid "certs out" msgstr "" -#: netsync.cc:705 netsync.cc:713 +#: netsync.cc:706 netsync.cc:714 msgid "revs out" msgstr "" -#: netsync.cc:812 +#: netsync.cc:815 #, c-format msgid "underflow on count of %s items to receive" msgstr "" -#: netsync.cc:1158 +#: netsync.cc:1161 #, c-format msgid "received network error: %s" msgstr "" -#: netsync.cc:1190 +#: netsync.cc:1193 #, c-format msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -2322,15 +2444,15 @@ "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" +"'%s unset %s %s' overrides this check\n" msgstr "" -#: netsync.cc:1200 +#: netsync.cc:1203 #, c-format msgid "server key changed" msgstr "" -#: netsync.cc:1205 +#: netsync.cc:1208 #, c-format msgid "" "first time connecting to server %s\n" @@ -2338,287 +2460,315 @@ "their key's fingerprint: %s\n" msgstr "" -#: netsync.cc:1212 +#: netsync.cc:1215 #, c-format msgid "saving public key for %s to database\n" msgstr "" -#: netsync.cc:1300 +#: netsync.cc:1303 #, c-format msgid "rejected attempt at anonymous connection for write\n" msgstr "" -#: netsync.cc:1307 +#: netsync.cc:1310 #, c-format msgid "rejected attempt at anonymous connection while running as sink\n" msgstr "" -#: netsync.cc:1324 +#: netsync.cc:1325 netsync.cc:1422 +#, fuzzy, c-format +msgid "not serving branch '%s'" +msgstr "iniciando gravação do ramo '%s'\n" + +#: netsync.cc:1330 #, c-format msgid "anonymous access to branch '%s' denied by server" msgstr "" -#: netsync.cc:1329 +#: netsync.cc:1337 #, c-format msgid "allowed anonymous read permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:1361 +#: netsync.cc:1369 #, c-format msgid "detected replay attack in auth netcmd\n" msgstr "" -#: netsync.cc:1383 +#: netsync.cc:1391 #, c-format msgid "remote public key hash '%s' is unknown\n" msgstr "" -#: netsync.cc:1400 +#: netsync.cc:1408 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " "sink\n" msgstr "" -#: netsync.cc:1416 +#: netsync.cc:1428 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n" msgstr "" -#: netsync.cc:1418 +#: netsync.cc:1431 #, c-format msgid "access to branch '%s' denied by server" msgstr "" -#: netsync.cc:1426 +#: netsync.cc:1441 #, c-format msgid "allowed '%s' read permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:1435 +#: netsync.cc:1450 #, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " "source\n" msgstr "" -#: netsync.cc:1443 +#: netsync.cc:1458 #, c-format msgid "denied '%s' write permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:1449 +#: netsync.cc:1464 #, c-format msgid "allowed '%s' write permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:1489 +#: netsync.cc:1504 #, c-format msgid "bad client signature\n" msgstr "" -#: netsync.cc:1505 +#: netsync.cc:1520 #, c-format msgid "Unexpected 'refine' command on non-refined item type\n" msgstr "" -#: netsync.cc:1602 +#: netsync.cc:1617 #, c-format msgid "unknown bye phase %d received" msgstr "" -#: netsync.cc:1614 +#: netsync.cc:1632 #, c-format msgid "Unexpected 'done' command on non-refined item type\n" msgstr "" -#: netsync.cc:1694 +#: netsync.cc:1712 #, c-format msgid "epoch with hash '%s' does not exist in our database" msgstr "" -#: netsync.cc:1723 +#: netsync.cc:1741 #, c-format msgid "revision '%s' does not exist in our database" msgstr "" -#: netsync.cc:1737 +#: netsync.cc:1755 #, c-format msgid "file '%s' does not exist in our database" msgstr "" -#: netsync.cc:1751 +#: netsync.cc:1769 #, c-format msgid "cert '%s' does not exist in our database" msgstr "" -#: netsync.cc:1803 +#: netsync.cc:1821 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." msgstr "" -#: netsync.cc:1824 +#: netsync.cc:1842 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" msgstr "" -#: netsync.cc:1841 +#: netsync.cc:1859 #, c-format msgid "hash check failed for revision cert '%s'" msgstr "" -#: netsync.cc:1916 +#: netsync.cc:1934 #, c-format msgid "Received warning from usher: %s" msgstr "" -#: netsync.cc:2003 netsync.cc:2034 +#: netsync.cc:2021 netsync.cc:2052 msgid "source and sink" msgstr "" -#: netsync.cc:2004 netsync.cc:2035 +#: netsync.cc:2022 netsync.cc:2053 msgid "source" msgstr "" -#: netsync.cc:2004 netsync.cc:2035 +#: netsync.cc:2022 netsync.cc:2053 msgid "sink" msgstr "" -#: netsync.cc:2189 +#: netsync.cc:2207 #, c-format msgid "input buffer for peer %s is overfull after netcmd dispatch\n" msgstr "" -#: netsync.cc:2201 netsync.cc:2258 +#: netsync.cc:2219 netsync.cc:2276 #, c-format msgid "protocol error while processing peer %s: '%s'\n" msgstr "" -#: netsync.cc:2207 +#: netsync.cc:2225 #, c-format msgid "error: %s\n" msgstr "" -#: netsync.cc:2237 +#: netsync.cc:2255 #, c-format msgid "connecting to %s\n" msgstr "" -#: netsync.cc:2273 +#: netsync.cc:2291 #, c-format msgid "timed out waiting for I/O with peer %s, disconnecting\n" msgstr "" -#: netsync.cc:2288 +#: netsync.cc:2306 #, c-format msgid "got OOB data from peer %s, disconnecting\n" msgstr "" -#: netsync.cc:2303 +#: netsync.cc:2321 #, c-format msgid "processing failure while talking to peer %s, disconnecting\n" msgstr "" -#: netsync.cc:2320 +#: netsync.cc:2338 #, c-format msgid "successful exchange with %s\n" msgstr "" -#: netsync.cc:2326 +#: netsync.cc:2344 #, c-format msgid "peer %s disconnected after we informed them of error\n" msgstr "" -#: netsync.cc:2331 +#: netsync.cc:2349 #, c-format msgid "I/O failure while talking to peer %s, disconnecting\n" msgstr "" -#: netsync.cc:2360 +#: netsync.cc:2378 #, c-format msgid "protocol error while processing peer %s: '%s', marking as bad\n" msgstr "" -#: netsync.cc:2392 +#: netsync.cc:2410 #, c-format msgid "accepted new client connection from %s : %s\n" msgstr "" -#: netsync.cc:2426 +#: netsync.cc:2444 #, c-format msgid "protocol error while processing peer %s: '%s', disconnecting\n" msgstr "" -#: netsync.cc:2437 +#: netsync.cc:2455 #, c-format msgid "peer %s read failed in working state (error)\n" msgstr "" -#: netsync.cc:2442 +#: netsync.cc:2460 #, c-format msgid "" "peer %s read failed in shutdown state (possibly client misreported error)\n" msgstr "" -#: netsync.cc:2448 +#: netsync.cc:2466 #, c-format msgid "peer %s read failed in confirmed state (success)\n" msgstr "" -#: netsync.cc:2469 +#: netsync.cc:2487 #, c-format msgid "peer %s write failed in working state (error)\n" msgstr "" -#: netsync.cc:2474 +#: netsync.cc:2492 #, c-format msgid "" "peer %s write failed in shutdown state (possibly client misreported error)\n" msgstr "" -#: netsync.cc:2480 +#: netsync.cc:2498 #, c-format msgid "peer %s write failed in confirmed state (success)\n" msgstr "" -#: netsync.cc:2507 +#: netsync.cc:2525 #, c-format msgid "peer %s processing finished, disconnecting\n" msgstr "" -#: netsync.cc:2529 +#: netsync.cc:2547 #, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting\n" msgstr "" -#: netsync.cc:2575 +#: netsync.cc:2615 #, c-format msgid "beginning service on %s : %s\n" msgstr "" -#: netsync.cc:2590 +#: netsync.cc:2616 +#, fuzzy +msgid "" +msgstr "interface de automação" + +#: netsync.cc:2630 #, c-format msgid "session limit %d reached, some connections will be refused\n" msgstr "" -#: netsync.cc:2645 +#: netsync.cc:2685 #, c-format msgid "got OOB from peer %s, disconnecting\n" msgstr "" -#: netsync.cc:2700 +#: netsync.cc:2754 #, c-format msgid "finding items to synchronize:\n" msgstr "" -#: netsync.cc:2817 +#: netsync.cc:2762 +msgid "certificates" +msgstr "" + +#: netsync.cc:2871 #, c-format msgid "Cannot find key '%s'" msgstr "" -#: netsync.cc:2874 netsync.cc:2878 +#: netsync.cc:2911 #, c-format +msgid "" +"include branch pattern contains a quote character:\n" +"%s\n" +msgstr "" + +#: netsync.cc:2917 +#, c-format +msgid "" +"exclude branch pattern contains a quote character:\n" +"%s\n" +msgstr "" + +#: netsync.cc:2940 netsync.cc:2944 +#, c-format msgid "network error: %s" msgstr "" @@ -2795,18 +2945,14 @@ msgid "rebuilding revision graph from manifest certs\n" msgstr "" -#: sanity.cc:54 +#: revision.cc:1530 #, c-format msgid "" -"wrote debugging log to %s\n" -"if reporting a bug, please include this file" +"encountered a revision with unknown format, version '%s'\n" +"I only know how to understand the version '1' format\n" +"a newer version of monotone is required to complete this operation" msgstr "" -#: sanity.cc:59 -#, c-format -msgid "failed to write debugging log to %s\n" -msgstr "erro escrevendo registro de depuração para %s\n" - #: sanity.cc:116 #, c-format msgid "fatal: formatter failed on %s:%d: %s" @@ -2835,73 +2981,78 @@ msgid "Current work set: %i items\n" msgstr "" -#: schema_migration.cc:184 +#: schema_migration.cc:181 #, c-format msgid "failure extracting schema from sqlite_master" msgstr "" -#: schema_migration.cc:220 +#: schema_migration.cc:217 #, c-format msgid "calculating necessary migration steps" msgstr "" -#: schema_migration.cc:230 +#: schema_migration.cc:227 #, c-format msgid "error at transaction BEGIN statement" msgstr "" -#: schema_migration.cc:257 +#: schema_migration.cc:228 #, c-format +msgid "migrating data" +msgstr "" + +#: schema_migration.cc:254 +#, c-format msgid "migration step failed: %s" msgstr "" -#: schema_migration.cc:271 +#: schema_migration.cc:268 #, c-format msgid "mismatched result of migration, got %s, wanted %s" msgstr "" -#: schema_migration.cc:274 +#: schema_migration.cc:271 #, c-format msgid "committing changes to database" msgstr "" -#: schema_migration.cc:276 +#: schema_migration.cc:273 #, c-format msgid "failure on COMMIT" msgstr "" -#: schema_migration.cc:278 +#: schema_migration.cc:275 #, c-format msgid "optimizing database" msgstr "" -#: schema_migration.cc:280 +#: schema_migration.cc:277 #, c-format msgid "error vacuuming after migration" msgstr "" -#: schema_migration.cc:283 +#: schema_migration.cc:280 #, c-format msgid "error running analyze after migration" msgstr "" -#: schema_migration.cc:290 +#: schema_migration.cc:287 #, c-format msgid "database schema %s is unknown; cannot perform migration" msgstr "esquema do banco de dados %s desconhecido; impossível migrar" -#: schema_migration.cc:295 +#: schema_migration.cc:292 #, c-format msgid "no migration performed; database schema already up-to-date at %s\n" msgstr "" "migração não executada, esquema do banco de dados já atualizado com %s\n" -#: schema_migration.cc:845 +#: schema_migration.cc:842 #, c-format msgid "public and private keys for %s don't match" msgstr "chaves pública e privada de %s não combinam" -#: schema_migration.cc:848 +#: schema_migration.cc:845 #, c-format msgid "moving key '%s' from database to %s" msgstr "movendo chave '%s' do banco de dados para %s" @@ -2910,51 +3061,42 @@ msgid "Press enter when the subprocess has completed" msgstr "Por favor pressione quando o subprocesso terminar" -#: std_hooks.lua:211 +#: transforms.cc:510 #, c-format -msgid "Error running editor '%s' to enter log message\n" -msgstr "Erro executando editor '%s' para entrada de mensagem de registro\n" - -#: std_hooks.lua:501 -msgid "executing external 3-way merge command\n" -msgstr "executando comando externo para combinação de 3 arquivos\n" - -#: transforms.cc:477 -#, c-format msgid "failed to convert string from %s to %s: '%s'" msgstr "erro convertendo cadeia de %s para %s: '%s'" -#: transforms.cc:624 transforms.cc:638 +#: transforms.cc:741 transforms.cc:755 #, c-format msgid "error converting %d UTF-8 bytes to IDNA ACE: %s" msgstr "" -#: ui.cc:107 +#: ui.cc:108 #, c-format msgid "%.1f G" msgstr "%.1f G" -#: ui.cc:113 +#: ui.cc:114 #, c-format msgid "%.1f M" msgstr "%.1f M" -#: ui.cc:119 +#: ui.cc:120 #, c-format msgid "%.1f k" msgstr "%.1f k" -#: ui.cc:136 ui.cc:138 +#: ui.cc:137 ui.cc:139 #, c-format msgid "%d/%d" msgstr "%d/%d" -#: ui.cc:145 +#: ui.cc:146 #, c-format msgid "%d" msgstr "%d" -#: ui.cc:368 +#: ui.cc:369 #, c-format msgid "" "fatal: %s\n" @@ -2964,10 +3106,11 @@ msgstr "" "fatal: %s\n" "isto é quase certamente um defeito em monotone.\n" -"por favor envie esta mensagem de erro, a saída de 'monotone --full-version',\n" +"por favor envie esta mensagem de erro, a saída de 'monotone --full-" +"version',\n" "e uma descrição do que você estava fazendo para %s.\n" -#: ui.cc:411 +#: ui.cc:422 msgid "monotone: " msgstr "monotone: " @@ -3016,123 +3159,199 @@ msgid "Invalid hmac length of %d bytes" msgstr "HMAC com tamanho inválido de %d bytes" -#: work.cc:117 -#, c-format -msgid "skipping ignorable file %s\n" +#: work.cc:118 +#, fuzzy, c-format +msgid "skipping ignorable file %s" msgstr "pulando arquivo ignorável %s\n" -#: work.cc:125 -#, c-format -msgid "skipping %s, already accounted for in working copy\n" +#: work.cc:127 +#, fuzzy, c-format +msgid "skipping %s, already accounted for in workspace" msgstr "pulando %s, já encontrado na cópia de trabalho\n" -#: work.cc:129 -#, c-format -msgid "adding %s to working copy add set\n" +#: work.cc:131 +#, fuzzy, c-format +msgid "adding %s to workspace manifest" msgstr "adicionando %s ao conjunto de adições da cópia de trabalho\n" -#: work.cc:202 -#, c-format -msgid "skipping %s, not currently tracked\n" +#: work.cc:221 +#, fuzzy, c-format +msgid "skipping %s, not currently tracked" msgstr "pulando %s, não é versionado atualmente\n" -#: work.cc:210 +#: work.cc:231 #, c-format msgid "cannot remove %s/, it is not empty" msgstr "impossível remover %s/, não está vazio" -#: work.cc:212 +#: work.cc:242 #, c-format -msgid "adding %s to working copy delete set\n" -msgstr "adicionando %s ao conjunto de remoções da cópia de trabalho\n" +msgid "dropping %s from workspace manifest" +msgstr "" -#: work.cc:269 +#: work.cc:305 #, c-format msgid "destination dir %s/ does not exist in current revision" msgstr "diretório de destino %s/ não existe na versão atual" -#: work.cc:272 +#: work.cc:308 #, c-format msgid "destination %s is an existing file in current revision" msgstr "destino %s é um arquivo existente na versão atual" -#: work.cc:282 +#: work.cc:318 #, c-format msgid "empty path %s is not allowed" msgstr "caminho vazio %s não permitido" -#: work.cc:296 +#: work.cc:332 #, c-format msgid "%s does not exist in current revision" msgstr "%s não existe na versão atual" -#: work.cc:299 +#: work.cc:335 #, c-format msgid "destination %s already exists in current revision" msgstr "destino %s já existe na versão atual" -#: work.cc:308 +#: work.cc:344 #, c-format -msgid "adding %s -> %s to working copy rename set" -msgstr "adicionando %s -> %s ao conjunto de renomeações da cópia de trabalho" +msgid "renaming %s to %s in workspace manifest" +msgstr "" -#: work.cc:333 -#, c-format -msgid "%s doesn't exist in working copy, skipping" +#: work.cc:369 +#, fuzzy, c-format +msgid "%s doesn't exist in workspace, skipping" msgstr "%s não existe na cópia de trabalho, pulando" -#: work.cc:337 +#: work.cc:373 +#, fuzzy, c-format +msgid "destination %s already exists in workspace, skipping" +msgstr "destino %s já existe na cópia de trabalho, pulando" + +#: work.cc:400 #, c-format -msgid "destination %s already exists in working copy, skipping" -msgstr "destino %s já existe na cópia de trabalho, pulando" +msgid "proposed new root directory '%s' is not versioned or does not exist" +msgstr "" -#: work.cc:421 +#: work.cc:402 +#, fuzzy, c-format +msgid "proposed new root directory '%s' is not a directory" +msgstr "raiz de procura '%s' não é um diretório\n" + +#: work.cc:407 #, c-format -msgid "working copy is corrupt: %s does not exist" +msgid "proposed new root directory '%s' contains illegal path %s" +msgstr "" + +#: work.cc:417 +#, fuzzy, c-format +msgid "directory '%s' is not versioned or does not exist" +msgstr "diretório '%s' a ser apagado não existe" + +#: work.cc:423 +#, c-format +msgid "'%s' is in the way" +msgstr "" + +#: work.cc:520 +#, fuzzy, c-format +msgid "workspace is corrupt: %s does not exist" msgstr "cópia de trabalho está corrompida: %s não existe" -#: work.cc:422 -#, c-format -msgid "working copy is corrupt: %s is a directory" +#: work.cc:521 +#, fuzzy, c-format +msgid "workspace is corrupt: %s is a directory" msgstr "cópia de trabalho está corrompida: %s é um diretório" -#: work.cc:432 -#, c-format -msgid "Problem with working directory: %s is unreadable" +#: work.cc:531 +#, fuzzy, c-format +msgid "Problem with workspace: %s is unreadable" msgstr "Problema com diretório de trabalho: %s é ilegível" -#: work.cc:458 +#: work.cc:557 #, c-format msgid "base revision %s does not exist in database\n" msgstr "versão-base %s não existe no banco de dados\n" -#: work.cc:775 work.cc:786 +#: work.cc:894 +#, fuzzy, c-format +msgid "dropping %s" +msgstr "descartando versão '%s'\n" + +#: work.cc:905 work.cc:916 #, c-format msgid "path %s already exists" msgstr "caminho '%s' já existe" -#: work.cc:829 +#: work.cc:938 work.cc:965 #, c-format -msgid "renaming '%s' onto existing file: '%s'\n" -msgstr "renomeando '%s' para arquivo existente: '%s'\n" +msgid "adding %s" +msgstr "" -#: work.cc:848 +#: work.cc:954 +#, fuzzy, c-format +msgid "path '%s' already exists, cannot create" +msgstr "caminho '%s' já existe" + +#: work.cc:961 +#, fuzzy, c-format +msgid "renaming %s to %s" +msgstr "atualizando %s para %s" + +#: work.cc:996 #, c-format msgid "file '%s' does not exist" msgstr "arquivo '%s' não existe" -#: work.cc:849 +#: work.cc:997 #, c-format msgid "file '%s' is a directory" msgstr "arquivo '%s' é um diretório" -#: work.cc:854 +#: work.cc:1002 #, c-format msgid "content of file '%s' has changed, not overwriting" msgstr "conteúdo do arquivo '%s' mudou, arquivo não será sobrescrito" -#: work.cc:855 +#: work.cc:1003 #, c-format msgid "updating %s to %s" msgstr "atualizando %s para %s" +#~ msgid "working copy" +#~ msgstr "cópia de trabalho" + +#~ msgid "OLDID NEWID" +#~ msgstr "VELHO-ID NOVO-ID" + +#~ msgid "write file delta packet to stdout" +#~ msgstr "escreve pacote de delta de arquivo em stdout" + +#~ msgid "no such file '%s'" +#~ msgstr "não há arquivo '%s'" + +#~ msgid "write revision data packet to stdout" +#~ msgstr "escreve pacote de dados da versão em stdout" + +#~ msgid "write file data packet to stdout" +#~ msgstr "escreve pacote de dados do arquivo em stdout" + +#~ msgid "write cert packets to stdout" +#~ msgstr "escreve pacotes de certificado em stdout" + +#~ msgid "Error running editor '%s' to enter log message\n" +#~ msgstr "Erro executando editor '%s' para entrada de mensagem de registro\n" + +#~ msgid "executing external 3-way merge command\n" +#~ msgstr "executando comando externo para combinação de 3 arquivos\n" + +#~ msgid "adding %s to working copy delete set\n" +#~ msgstr "adicionando %s ao conjunto de remoções da cópia de trabalho\n" + +#~ msgid "adding %s -> %s to working copy rename set" +#~ msgstr "" +#~ "adicionando %s -> %s ao conjunto de renomeações da cópia de trabalho" + +#~ msgid "renaming '%s' onto existing file: '%s'\n" +#~ msgstr "renomeando '%s' para arquivo existente: '%s'\n"